From ab4e150d41e0200b64a75c59b668a9385b7782fd Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 23 四月 2024 10:18:03 +0800
Subject: [PATCH] 表名修改
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java | 38
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultScoreServiceImpl.java | 42
ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java | 32
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java | 36
ycl-server/src/main/java/com/ycl/platform/service/IDefaultScoreService.java | 32
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultPublishServiceImpl.java | 42
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractPublish.java | 36
ycl-server/src/main/java/com/ycl/platform/service/IDefaultPublishService.java | 32
ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java | 20
ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml | 97 ++-
ycl-server/src/main/resources/mapper/zgyw/ContractPublishMapper.xml | 22
ycl-server/src/main/resources/mapper/zgyw/CalculateMoneyRuleMapper.xml | 81 +++
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java | 108 ++--
ycl-server/src/main/java/com/ycl/platform/service/IDefaultResultService.java | 32
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java | 42
ycl-server/src/main/java/com/ycl/platform/mapper/DefaultScoreMapper.java | 32
ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java | 32
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java | 40
ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java | 20
ycl-server/src/main/java/com/ycl/platform/service/IDefaultRuleService.java | 32
ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java | 20
ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml | 30
ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml | 22
/dev/null | 90 ---
ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java | 32
ycl-server/src/main/java/com/ycl/platform/controller/DefaultPublishController.java | 20
ycl-server/src/main/java/com/ycl/platform/controller/DefaultScoreController.java | 20
ycl-server/src/main/java/com/ycl/platform/mapper/DefaultResultMapper.java | 32
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultResultServiceImpl.java | 40
ycl-server/src/main/java/com/ycl/websocket/NettyConfig.java | 68 ++
ycl-server/src/main/java/com/ycl/platform/mapper/DefaultPublishMapper.java | 32
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateMoneyRule.java | 110 ++++
32 files changed, 777 insertions(+), 587 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateMoneyRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateMoneyRule.java
new file mode 100644
index 0000000..9fba8f0
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateMoneyRule.java
@@ -0,0 +1,110 @@
+package com.ycl.platform.domain.entity;
+
+import annotation.Excel;
+import com.ycl.system.domain.TreeEntity;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * 鏍哥畻瑙勫垯瀵硅薄 t_calculate_rule
+ *
+ * @author ruoyi
+ * @date 2024-04-03
+ */
+public class CalculateMoneyRule extends TreeEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** */
+ private Long id;
+
+ /** */
+ @Excel(name = "")
+ private String name;
+
+ /** */
+ @Excel(name = "")
+ private Long templateId;
+
+ /** 鍗曚綅id */
+ @Excel(name = "鍗曚綅id")
+ private Long unitId;
+
+ /** 姣忓皯1%鎵ｅ綋鏈堟�绘湇鍔¤垂鐨勫灏� */
+ @Excel(name = "姣忓皯1%鎵ｅ綋鏈堟�绘湇鍔¤垂鐨勫灏�")
+ private BigDecimal value;
+
+ /** $column.columnComment */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String description;
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+ public void setTemplateId(Long templateId)
+ {
+ this.templateId = templateId;
+ }
+
+ public Long getTemplateId()
+ {
+ return templateId;
+ }
+ public void setUnitId(Long unitId)
+ {
+ this.unitId = unitId;
+ }
+
+ public Long getUnitId()
+ {
+ return unitId;
+ }
+ public void setValue(BigDecimal value)
+ {
+ this.value = value;
+ }
+
+ public BigDecimal getValue()
+ {
+ return value;
+ }
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("name", getName())
+ .append("templateId", getTemplateId())
+ .append("parentId", getParentId())
+ .append("unitId", getUnitId())
+ .append("value", getValue())
+ .append("description", getDescription())
+ .toString();
+ }
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java
index 9a4b697..3439154 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java
@@ -5,106 +5,118 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import java.math.BigDecimal;
-
/**
- * 鏍哥畻瑙勫垯瀵硅薄 t_calculate_rule
- *
+ * 鍒嗘暟鏍哥畻瑙勫垯瀵硅薄 t_default_rule
+ *
* @author ruoyi
- * @date 2024-04-03
+ * @date 2024-04-01
*/
public class CalculateRule extends TreeEntity
{
private static final long serialVersionUID = 1L;
- /** */
+ /** 涓婚敭 */
private Long id;
- /** */
- @Excel(name = "")
- private String name;
+ /** 瑙勫垯鍚嶇О */
+ @Excel(name = "瑙勫垯鍚嶇О")
+ private String ruleName;
- /** */
- @Excel(name = "")
- private Long templateId;
+ /** 鎵ｅ噺鏂瑰紡 */
+ @Excel(name = "鎵ｅ噺鏂瑰紡")
+ private Long deductCategory;
- /** 鍗曚綅id */
- @Excel(name = "鍗曚綅id")
- private Long unitId;
+ /** 浜哄伐鎵撳垎/绯荤粺鎵撳垎 */
+ private Long deductWay;
- /** 姣忓皯1%鎵ｅ綋鏈堟�绘湇鍔¤垂鐨勫灏� */
- @Excel(name = "姣忓皯1%鎵ｅ綋鏈堟�绘湇鍔¤垂鐨勫灏�")
- private BigDecimal value;
+ /** 瑙勫垯鎻忚堪 */
+ @Excel(name = "瑙勫垯鎻忚堪")
+ private String ruleDesc;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private String description;
+ /** 瑙勫垯鐘舵�� */
+ @Excel(name = "瑙勫垯鐘舵��")
+ private String ruleStatus;
- public void setId(Long id)
+ /** 閫昏緫鍒犻櫎 */
+ private String deleted;
+
+ public void setId(Long id)
{
this.id = id;
}
- public Long getId()
+ public Long getId()
{
return id;
}
- public void setName(String name)
+ public void setRuleName(String ruleName)
{
- this.name = name;
+ this.ruleName = ruleName;
}
- public String getName()
+ public String getRuleName()
{
- return name;
+ return ruleName;
}
- public void setTemplateId(Long templateId)
+ public void setDeductCategory(Long deductCategory)
{
- this.templateId = templateId;
+ this.deductCategory = deductCategory;
}
- public Long getTemplateId()
+ public Long getDeductCategory()
{
- return templateId;
+ return deductCategory;
}
- public void setUnitId(Long unitId)
+ public void setDeductWay(Long deductWay)
{
- this.unitId = unitId;
+ this.deductWay = deductWay;
}
- public Long getUnitId()
+ public Long getDeductWay()
{
- return unitId;
+ return deductWay;
}
- public void setValue(BigDecimal value)
+ public void setRuleDesc(String ruleDesc)
{
- this.value = value;
+ this.ruleDesc = ruleDesc;
}
- public BigDecimal getValue()
+ public String getRuleDesc()
{
- return value;
+ return ruleDesc;
}
- public void setDescription(String description)
+ public void setRuleStatus(String ruleStatus)
{
- this.description = description;
+ this.ruleStatus = ruleStatus;
}
- public String getDescription()
+ public String getRuleStatus()
{
- return description;
+ return ruleStatus;
+ }
+ public void setDeleted(String deleted)
+ {
+ this.deleted = deleted;
+ }
+
+ public String getDeleted()
+ {
+ return deleted;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
- .append("name", getName())
- .append("templateId", getTemplateId())
+ .append("ruleName", getRuleName())
.append("parentId", getParentId())
- .append("unitId", getUnitId())
- .append("value", getValue())
- .append("description", getDescription())
+ .append("deductCategory", getDeductCategory())
+ .append("deductWay", getDeductWay())
+ .append("ruleDesc", getRuleDesc())
+ .append("ruleStatus", getRuleStatus())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .append("deleted", getDeleted())
.toString();
}
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultPublish.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractPublish.java
similarity index 77%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultPublish.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractPublish.java
index 39a0dc9..e81efeb 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultPublish.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractPublish.java
@@ -9,11 +9,11 @@
/**
* 鍚堝悓鑰冩牳鍙戝竷瀵硅薄 t_default_publish
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
-public class DefaultPublish extends BaseEntity
+public class ContractPublish extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -48,75 +48,75 @@
@Excel(name = "瀹℃牳鐘舵��")
private Long auditState;
- public void setId(Long id)
+ public void setId(Long id)
{
this.id = id;
}
- public Long getId()
+ public Long getId()
{
return id;
}
- public void setExamineName(String examineName)
+ public void setExamineName(String examineName)
{
this.examineName = examineName;
}
- public String getExamineName()
+ public String getExamineName()
{
return examineName;
}
- public void setTemplateId(Long templateId)
+ public void setTemplateId(Long templateId)
{
this.templateId = templateId;
}
- public Long getTemplateId()
+ public Long getTemplateId()
{
return templateId;
}
- public void setFrequency(Long frequency)
+ public void setFrequency(Long frequency)
{
this.frequency = frequency;
}
- public Long getFrequency()
+ public Long getFrequency()
{
return frequency;
}
- public void setAlarmScore(BigDecimal alarmScore)
+ public void setAlarmScore(BigDecimal alarmScore)
{
this.alarmScore = alarmScore;
}
- public BigDecimal getAlarmScore()
+ public BigDecimal getAlarmScore()
{
return alarmScore;
}
- public void setDescription(String description)
+ public void setDescription(String description)
{
this.description = description;
}
- public String getDescription()
+ public String getDescription()
{
return description;
}
- public void setState(Long state)
+ public void setState(Long state)
{
this.state = state;
}
- public Long getState()
+ public Long getState()
{
return state;
}
- public void setAuditState(Long auditState)
+ public void setAuditState(Long auditState)
{
this.auditState = auditState;
}
- public Long getAuditState()
+ public Long getAuditState()
{
return auditState;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java
similarity index 78%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultResult.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java
index 42125e6..8f34f5a 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java
@@ -11,11 +11,11 @@
/**
* 鍚堝悓鑰冩牳缁撴灉瀵硅薄 t_default_result
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
-public class DefaultResult extends BaseEntity
+public class ContractResult extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -50,75 +50,75 @@
/** 閫昏緫鍒犻櫎 */
private String deleted;
- public void setId(Long id)
+ public void setId(Long id)
{
this.id = id;
}
- public Long getId()
+ public Long getId()
{
return id;
}
- public void setUnitId(Long unitId)
+ public void setUnitId(Long unitId)
{
this.unitId = unitId;
}
- public Long getUnitId()
+ public Long getUnitId()
{
return unitId;
}
- public void setPublishId(Long publishId)
+ public void setPublishId(Long publishId)
{
this.publishId = publishId;
}
- public Long getPublishId()
+ public Long getPublishId()
{
return publishId;
}
- public void setDefaultScore(BigDecimal defaultScore)
+ public void setDefaultScore(BigDecimal defaultScore)
{
this.defaultScore = defaultScore;
}
- public BigDecimal getDefaultScore()
+ public BigDecimal getDefaultScore()
{
return defaultScore;
}
- public void setAuditState(Long auditState)
+ public void setAuditState(Long auditState)
{
this.auditState = auditState;
}
- public Long getAuditState()
+ public Long getAuditState()
{
return auditState;
}
- public void setPublish(Long publish)
+ public void setPublish(Long publish)
{
this.publish = publish;
}
- public Long getPublish()
+ public Long getPublish()
{
return publish;
}
- public void setCheckTime(Date checkTime)
+ public void setCheckTime(Date checkTime)
{
this.checkTime = checkTime;
}
- public Date getCheckTime()
+ public Date getCheckTime()
{
return checkTime;
}
- public void setDeleted(String deleted)
+ public void setDeleted(String deleted)
{
this.deleted = deleted;
}
- public String getDeleted()
+ public String getDeleted()
{
return deleted;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultScore.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
similarity index 77%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultScore.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
index 81e7b3f..d5924f9 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultScore.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
@@ -9,11 +9,11 @@
/**
* 鍚堝悓鎵撳垎瀵硅薄 t_default_score
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
-public class DefaultScore extends BaseEntity
+public class ContractScore extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -48,84 +48,84 @@
/** */
private String updateUserName;
- public void setId(Long id)
+ public void setId(Long id)
{
this.id = id;
}
- public Long getId()
+ public Long getId()
{
return id;
}
- public void setPublishId(Long publishId)
+ public void setPublishId(Long publishId)
{
this.publishId = publishId;
}
- public Long getPublishId()
+ public Long getPublishId()
{
return publishId;
}
- public void setTemplateId(Long templateId)
+ public void setTemplateId(Long templateId)
{
this.templateId = templateId;
}
- public Long getTemplateId()
+ public Long getTemplateId()
{
return templateId;
}
- public void setNum(String num)
+ public void setNum(String num)
{
this.num = num;
}
- public String getNum()
+ public String getNum()
{
return num;
}
- public void setScore(BigDecimal score)
+ public void setScore(BigDecimal score)
{
this.score = score;
}
- public BigDecimal getScore()
+ public BigDecimal getScore()
{
return score;
}
- public void setCreateUser(Long createUser)
+ public void setCreateUser(Long createUser)
{
this.createUser = createUser;
}
- public Long getCreateUser()
+ public Long getCreateUser()
{
return createUser;
}
- public void setCreateUserName(String createUserName)
+ public void setCreateUserName(String createUserName)
{
this.createUserName = createUserName;
}
- public String getCreateUserName()
+ public String getCreateUserName()
{
return createUserName;
}
- public void setUpdateUser(Long updateUser)
+ public void setUpdateUser(Long updateUser)
{
this.updateUser = updateUser;
}
- public Long getUpdateUser()
+ public Long getUpdateUser()
{
return updateUser;
}
- public void setUpdateUserName(String updateUserName)
+ public void setUpdateUserName(String updateUserName)
{
this.updateUserName = updateUserName;
}
- public String getUpdateUserName()
+ public String getUpdateUserName()
{
return updateUserName;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultRule.java
deleted file mode 100644
index ff3a69b..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultRule.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.ycl.platform.domain.entity;
-
-import annotation.Excel;
-import com.ycl.system.domain.TreeEntity;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
-/**
- * 杩濈害瑙勫垯瀵硅薄 t_default_rule
- *
- * @author ruoyi
- * @date 2024-04-01
- */
-public class DefaultRule extends TreeEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 涓婚敭 */
- private Long id;
-
- /** 瑙勫垯鍚嶇О */
- @Excel(name = "瑙勫垯鍚嶇О")
- private String ruleName;
-
- /** 鎵ｅ噺鏂瑰紡 */
- @Excel(name = "鎵ｅ噺鏂瑰紡")
- private Long deductCategory;
-
- /** 浜哄伐鎵撳垎/绯荤粺鎵撳垎 */
- private Long deductWay;
-
- /** 瑙勫垯鎻忚堪 */
- @Excel(name = "瑙勫垯鎻忚堪")
- private String ruleDesc;
-
- /** 瑙勫垯鐘舵�� */
- @Excel(name = "瑙勫垯鐘舵��")
- private String ruleStatus;
-
- /** 閫昏緫鍒犻櫎 */
- private String deleted;
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
- public void setRuleName(String ruleName)
- {
- this.ruleName = ruleName;
- }
-
- public String getRuleName()
- {
- return ruleName;
- }
- public void setDeductCategory(Long deductCategory)
- {
- this.deductCategory = deductCategory;
- }
-
- public Long getDeductCategory()
- {
- return deductCategory;
- }
- public void setDeductWay(Long deductWay)
- {
- this.deductWay = deductWay;
- }
-
- public Long getDeductWay()
- {
- return deductWay;
- }
- public void setRuleDesc(String ruleDesc)
- {
- this.ruleDesc = ruleDesc;
- }
-
- public String getRuleDesc()
- {
- return ruleDesc;
- }
- public void setRuleStatus(String ruleStatus)
- {
- this.ruleStatus = ruleStatus;
- }
-
- public String getRuleStatus()
- {
- return ruleStatus;
- }
- public void setDeleted(String deleted)
- {
- this.deleted = deleted;
- }
-
- public String getDeleted()
- {
- return deleted;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("ruleName", getRuleName())
- .append("parentId", getParentId())
- .append("deductCategory", getDeductCategory())
- .append("deductWay", getDeductWay())
- .append("ruleDesc", getRuleDesc())
- .append("ruleStatus", getRuleStatus())
- .append("createTime", getCreateTime())
- .append("updateTime", getUpdateTime())
- .append("deleted", getDeleted())
- .toString();
- }
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java
index 625155a..90367a5 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java
@@ -1,7 +1,7 @@
package com.ycl.platform.controller;
import annotation.Log;
-import com.ycl.platform.domain.entity.CalculateRule;
+import com.ycl.platform.domain.entity.CalculateMoneyRule;
import com.ycl.platform.service.ICalculateRuleService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
@@ -32,9 +32,9 @@
*/
@PreAuthorize("@ss.hasPermi('calculate:rule:list')")
@GetMapping("/list")
- public AjaxResult list(CalculateRule calculateRule)
+ public AjaxResult list(CalculateMoneyRule calculateMoneyRule)
{
- List<CalculateRule> list = calculateRuleService.selectCalculateRuleList(calculateRule);
+ List<CalculateMoneyRule> list = calculateRuleService.selectCalculateRuleList(calculateMoneyRule);
return success(list);
}
@@ -44,10 +44,10 @@
@PreAuthorize("@ss.hasPermi('calculate:rule:export')")
@Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, CalculateRule calculateRule)
+ public void export(HttpServletResponse response, CalculateMoneyRule calculateMoneyRule)
{
- List<CalculateRule> list = calculateRuleService.selectCalculateRuleList(calculateRule);
- ExcelUtil<CalculateRule> util = new ExcelUtil<CalculateRule>(CalculateRule.class);
+ List<CalculateMoneyRule> list = calculateRuleService.selectCalculateRuleList(calculateMoneyRule);
+ ExcelUtil<CalculateMoneyRule> util = new ExcelUtil<CalculateMoneyRule>(CalculateMoneyRule.class);
util.exportExcel(response, list, "鏍哥畻瑙勫垯鏁版嵁");
}
@@ -67,9 +67,9 @@
@PreAuthorize("@ss.hasPermi('calculate:rule:add')")
@Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody CalculateRule calculateRule)
+ public AjaxResult add(@RequestBody CalculateMoneyRule calculateMoneyRule)
{
- return toAjax(calculateRuleService.insertCalculateRule(calculateRule));
+ return toAjax(calculateRuleService.insertCalculateRule(calculateMoneyRule));
}
/**
@@ -78,9 +78,9 @@
@PreAuthorize("@ss.hasPermi('calculate:rule:edit')")
@Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody CalculateRule calculateRule)
+ public AjaxResult edit(@RequestBody CalculateMoneyRule calculateMoneyRule)
{
- return toAjax(calculateRuleService.updateCalculateRule(calculateRule));
+ return toAjax(calculateRuleService.updateCalculateRule(calculateMoneyRule));
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultPublishController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultPublishController.java
index 91ad7f3..9a19f4b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultPublishController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultPublishController.java
@@ -1,7 +1,7 @@
package com.ycl.platform.controller;
import annotation.Log;
-import com.ycl.platform.domain.entity.DefaultPublish;
+import com.ycl.platform.domain.entity.ContractPublish;
import com.ycl.platform.service.IDefaultPublishService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
@@ -33,10 +33,10 @@
*/
@PreAuthorize("@ss.hasPermi('system:publish:list')")
@GetMapping("/list")
- public TableDataInfo list(DefaultPublish defaultPublish)
+ public TableDataInfo list(ContractPublish contractPublish)
{
startPage();
- List<DefaultPublish> list = defaultPublishService.selectDefaultPublishList(defaultPublish);
+ List<ContractPublish> list = defaultPublishService.selectDefaultPublishList(contractPublish);
return getDataTable(list);
}
@@ -46,10 +46,10 @@
@PreAuthorize("@ss.hasPermi('system:publish:export')")
@Log(title = "鍚堝悓鑰冩牳鍙戝竷", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, DefaultPublish defaultPublish)
+ public void export(HttpServletResponse response, ContractPublish contractPublish)
{
- List<DefaultPublish> list = defaultPublishService.selectDefaultPublishList(defaultPublish);
- ExcelUtil<DefaultPublish> util = new ExcelUtil<DefaultPublish>(DefaultPublish.class);
+ List<ContractPublish> list = defaultPublishService.selectDefaultPublishList(contractPublish);
+ ExcelUtil<ContractPublish> util = new ExcelUtil<ContractPublish>(ContractPublish.class);
util.exportExcel(response, list, "鍚堝悓鑰冩牳鍙戝竷鏁版嵁");
}
@@ -69,9 +69,9 @@
@PreAuthorize("@ss.hasPermi('system:publish:add')")
@Log(title = "鍚堝悓鑰冩牳鍙戝竷", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody DefaultPublish defaultPublish)
+ public AjaxResult add(@RequestBody ContractPublish contractPublish)
{
- return toAjax(defaultPublishService.insertDefaultPublish(defaultPublish));
+ return toAjax(defaultPublishService.insertDefaultPublish(contractPublish));
}
/**
@@ -80,9 +80,9 @@
@PreAuthorize("@ss.hasPermi('system:publish:edit')")
@Log(title = "鍚堝悓鑰冩牳鍙戝竷", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody DefaultPublish defaultPublish)
+ public AjaxResult edit(@RequestBody ContractPublish contractPublish)
{
- return toAjax(defaultPublishService.updateDefaultPublish(defaultPublish));
+ return toAjax(defaultPublishService.updateDefaultPublish(contractPublish));
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java
index 260fb18..0a60f05 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java
@@ -1,7 +1,7 @@
package com.ycl.platform.controller;
import annotation.Log;
-import com.ycl.platform.domain.entity.DefaultResult;
+import com.ycl.platform.domain.entity.ContractResult;
import com.ycl.platform.service.IDefaultResultService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
@@ -33,10 +33,10 @@
*/
@PreAuthorize("@ss.hasPermi('system:result:list')")
@GetMapping("/list")
- public TableDataInfo list(DefaultResult defaultResult)
+ public TableDataInfo list(ContractResult contractResult)
{
startPage();
- List<DefaultResult> list = defaultResultService.selectDefaultResultList(defaultResult);
+ List<ContractResult> list = defaultResultService.selectDefaultResultList(contractResult);
return getDataTable(list);
}
@@ -46,10 +46,10 @@
@PreAuthorize("@ss.hasPermi('system:result:export')")
@Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, DefaultResult defaultResult)
+ public void export(HttpServletResponse response, ContractResult contractResult)
{
- List<DefaultResult> list = defaultResultService.selectDefaultResultList(defaultResult);
- ExcelUtil<DefaultResult> util = new ExcelUtil<DefaultResult>(DefaultResult.class);
+ List<ContractResult> list = defaultResultService.selectDefaultResultList(contractResult);
+ ExcelUtil<ContractResult> util = new ExcelUtil<ContractResult>(ContractResult.class);
util.exportExcel(response, list, "鍚堝悓鑰冩牳缁撴灉鏁版嵁");
}
@@ -69,9 +69,9 @@
@PreAuthorize("@ss.hasPermi('system:result:add')")
@Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody DefaultResult defaultResult)
+ public AjaxResult add(@RequestBody ContractResult contractResult)
{
- return toAjax(defaultResultService.insertDefaultResult(defaultResult));
+ return toAjax(defaultResultService.insertDefaultResult(contractResult));
}
/**
@@ -80,9 +80,9 @@
@PreAuthorize("@ss.hasPermi('system:result:edit')")
@Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody DefaultResult defaultResult)
+ public AjaxResult edit(@RequestBody ContractResult contractResult)
{
- return toAjax(defaultResultService.updateDefaultResult(defaultResult));
+ return toAjax(defaultResultService.updateDefaultResult(contractResult));
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java
index 06ed1ef..0193cbc 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java
@@ -1,7 +1,7 @@
package com.ycl.platform.controller;
import annotation.Log;
-import com.ycl.platform.domain.entity.DefaultRule;
+import com.ycl.platform.domain.entity.CalculateRule;
import com.ycl.platform.service.IDefaultRuleService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
@@ -32,9 +32,9 @@
*/
@PreAuthorize("@ss.hasPermi('system:rule:list')")
@GetMapping("/list")
- public AjaxResult list(DefaultRule defaultRule)
+ public AjaxResult list(CalculateRule calculateRule)
{
- List<DefaultRule> list = defaultRuleService.selectDefaultRuleList(defaultRule);
+ List<CalculateRule> list = defaultRuleService.selectDefaultRuleList(calculateRule);
return success(list);
}
@@ -44,10 +44,10 @@
@PreAuthorize("@ss.hasPermi('system:rule:export')")
@Log(title = "杩濈害瑙勫垯", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, DefaultRule defaultRule)
+ public void export(HttpServletResponse response, CalculateRule calculateRule)
{
- List<DefaultRule> list = defaultRuleService.selectDefaultRuleList(defaultRule);
- ExcelUtil<DefaultRule> util = new ExcelUtil<DefaultRule>(DefaultRule.class);
+ List<CalculateRule> list = defaultRuleService.selectDefaultRuleList(calculateRule);
+ ExcelUtil<CalculateRule> util = new ExcelUtil<CalculateRule>(CalculateRule.class);
util.exportExcel(response, list, "杩濈害瑙勫垯鏁版嵁");
}
@@ -67,9 +67,9 @@
@PreAuthorize("@ss.hasPermi('system:rule:add')")
@Log(title = "杩濈害瑙勫垯", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody DefaultRule defaultRule)
+ public AjaxResult add(@RequestBody CalculateRule calculateRule)
{
- return toAjax(defaultRuleService.insertDefaultRule(defaultRule));
+ return toAjax(defaultRuleService.insertDefaultRule(calculateRule));
}
/**
@@ -78,9 +78,9 @@
@PreAuthorize("@ss.hasPermi('system:rule:edit')")
@Log(title = "杩濈害瑙勫垯", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody DefaultRule defaultRule)
+ public AjaxResult edit(@RequestBody CalculateRule calculateRule)
{
- return toAjax(defaultRuleService.updateDefaultRule(defaultRule));
+ return toAjax(defaultRuleService.updateDefaultRule(calculateRule));
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultScoreController.java
index 07ef5fc..8525073 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultScoreController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultScoreController.java
@@ -1,7 +1,7 @@
package com.ycl.platform.controller;
import annotation.Log;
-import com.ycl.platform.domain.entity.DefaultScore;
+import com.ycl.platform.domain.entity.ContractScore;
import com.ycl.platform.service.IDefaultScoreService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
@@ -33,10 +33,10 @@
*/
@PreAuthorize("@ss.hasPermi('platform:score:list')")
@GetMapping("/list")
- public TableDataInfo list(DefaultScore defaultScore)
+ public TableDataInfo list(ContractScore contractScore)
{
startPage();
- List<DefaultScore> list = defaultScoreService.selectDefaultScoreList(defaultScore);
+ List<ContractScore> list = defaultScoreService.selectDefaultScoreList(contractScore);
return getDataTable(list);
}
@@ -46,10 +46,10 @@
@PreAuthorize("@ss.hasPermi('platform:score:export')")
@Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, DefaultScore defaultScore)
+ public void export(HttpServletResponse response, ContractScore contractScore)
{
- List<DefaultScore> list = defaultScoreService.selectDefaultScoreList(defaultScore);
- ExcelUtil<DefaultScore> util = new ExcelUtil<DefaultScore>(DefaultScore.class);
+ List<ContractScore> list = defaultScoreService.selectDefaultScoreList(contractScore);
+ ExcelUtil<ContractScore> util = new ExcelUtil<ContractScore>(ContractScore.class);
util.exportExcel(response, list, "鍚堝悓鎵撳垎鏁版嵁");
}
@@ -69,9 +69,9 @@
@PreAuthorize("@ss.hasPermi('platform:score:add')")
@Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody DefaultScore defaultScore)
+ public AjaxResult add(@RequestBody ContractScore contractScore)
{
- return toAjax(defaultScoreService.insertDefaultScore(defaultScore));
+ return toAjax(defaultScoreService.insertDefaultScore(contractScore));
}
/**
@@ -80,9 +80,9 @@
@PreAuthorize("@ss.hasPermi('platform:score:edit')")
@Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody DefaultScore defaultScore)
+ public AjaxResult edit(@RequestBody ContractScore contractScore)
{
- return toAjax(defaultScoreService.updateDefaultScore(defaultScore));
+ return toAjax(defaultScoreService.updateDefaultScore(contractScore));
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java
index a05536a..d484433 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java
@@ -1,53 +1,53 @@
package com.ycl.platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.platform.domain.entity.CalculateRule;
+import com.ycl.platform.domain.entity.CalculateMoneyRule;
import java.util.List;
/**
* 鏍哥畻瑙勫垯Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2024-04-03
*/
-public interface CalculateRuleMapper extends BaseMapper<CalculateRule>
+public interface CalculateRuleMapper extends BaseMapper<CalculateMoneyRule>
{
/**
* 鏌ヨ鏍哥畻瑙勫垯
- *
+ *
* @param id 鏍哥畻瑙勫垯涓婚敭
* @return 鏍哥畻瑙勫垯
*/
- public CalculateRule selectCalculateRuleById(Long id);
+ public CalculateMoneyRule selectCalculateRuleById(Long id);
/**
* 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
- *
- * @param calculateRule 鏍哥畻瑙勫垯
+ *
+ * @param calculateMoneyRule 鏍哥畻瑙勫垯
* @return 鏍哥畻瑙勫垯闆嗗悎
*/
- public List<CalculateRule> selectCalculateRuleList(CalculateRule calculateRule);
+ public List<CalculateMoneyRule> selectCalculateRuleList(CalculateMoneyRule calculateMoneyRule);
/**
* 鏂板鏍哥畻瑙勫垯
- *
- * @param calculateRule 鏍哥畻瑙勫垯
+ *
+ * @param calculateMoneyRule 鏍哥畻瑙勫垯
* @return 缁撴灉
*/
- public int insertCalculateRule(CalculateRule calculateRule);
+ public int insertCalculateRule(CalculateMoneyRule calculateMoneyRule);
/**
* 淇敼鏍哥畻瑙勫垯
- *
- * @param calculateRule 鏍哥畻瑙勫垯
+ *
+ * @param calculateMoneyRule 鏍哥畻瑙勫垯
* @return 缁撴灉
*/
- public int updateCalculateRule(CalculateRule calculateRule);
+ public int updateCalculateRule(CalculateMoneyRule calculateMoneyRule);
/**
* 鍒犻櫎鏍哥畻瑙勫垯
- *
+ *
* @param id 鏍哥畻瑙勫垯涓婚敭
* @return 缁撴灉
*/
@@ -55,7 +55,7 @@
/**
* 鎵归噺鍒犻櫎鏍哥畻瑙勫垯
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultPublishMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultPublishMapper.java
index 15a50d1..9820be5 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultPublishMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultPublishMapper.java
@@ -1,53 +1,53 @@
package com.ycl.platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.platform.domain.entity.DefaultPublish;
+import com.ycl.platform.domain.entity.ContractPublish;
import java.util.List;
/**
* 鍚堝悓鑰冩牳鍙戝竷Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
-public interface DefaultPublishMapper extends BaseMapper<DefaultPublish>
+public interface DefaultPublishMapper extends BaseMapper<ContractPublish>
{
/**
* 鏌ヨ鍚堝悓鑰冩牳鍙戝竷
- *
+ *
* @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭
* @return 鍚堝悓鑰冩牳鍙戝竷
*/
- public DefaultPublish selectDefaultPublishById(Long id);
+ public ContractPublish selectDefaultPublishById(Long id);
/**
* 鏌ヨ鍚堝悓鑰冩牳鍙戝竷鍒楄〃
- *
- * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷
* @return 鍚堝悓鑰冩牳鍙戝竷闆嗗悎
*/
- public List<DefaultPublish> selectDefaultPublishList(DefaultPublish defaultPublish);
+ public List<ContractPublish> selectDefaultPublishList(ContractPublish contractPublish);
/**
* 鏂板鍚堝悓鑰冩牳鍙戝竷
- *
- * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷
* @return 缁撴灉
*/
- public int insertDefaultPublish(DefaultPublish defaultPublish);
+ public int insertDefaultPublish(ContractPublish contractPublish);
/**
* 淇敼鍚堝悓鑰冩牳鍙戝竷
- *
- * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷
* @return 缁撴灉
*/
- public int updateDefaultPublish(DefaultPublish defaultPublish);
+ public int updateDefaultPublish(ContractPublish contractPublish);
/**
* 鍒犻櫎鍚堝悓鑰冩牳鍙戝竷
- *
+ *
* @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭
* @return 缁撴灉
*/
@@ -55,7 +55,7 @@
/**
* 鎵归噺鍒犻櫎鍚堝悓鑰冩牳鍙戝竷
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultResultMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultResultMapper.java
index 9cce6a2..d191816 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultResultMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultResultMapper.java
@@ -1,53 +1,53 @@
package com.ycl.platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.platform.domain.entity.DefaultResult;
+import com.ycl.platform.domain.entity.ContractResult;
import java.util.List;
/**
* 鍚堝悓鑰冩牳缁撴灉Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
-public interface DefaultResultMapper extends BaseMapper<DefaultResult>
+public interface DefaultResultMapper extends BaseMapper<ContractResult>
{
/**
* 鏌ヨ鍚堝悓鑰冩牳缁撴灉
- *
+ *
* @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
* @return 鍚堝悓鑰冩牳缁撴灉
*/
- public DefaultResult selectDefaultResultById(Long id);
+ public ContractResult selectDefaultResultById(Long id);
/**
* 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
- *
- * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param contractResult 鍚堝悓鑰冩牳缁撴灉
* @return 鍚堝悓鑰冩牳缁撴灉闆嗗悎
*/
- public List<DefaultResult> selectDefaultResultList(DefaultResult defaultResult);
+ public List<ContractResult> selectDefaultResultList(ContractResult contractResult);
/**
* 鏂板鍚堝悓鑰冩牳缁撴灉
- *
- * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param contractResult 鍚堝悓鑰冩牳缁撴灉
* @return 缁撴灉
*/
- public int insertDefaultResult(DefaultResult defaultResult);
+ public int insertDefaultResult(ContractResult contractResult);
/**
* 淇敼鍚堝悓鑰冩牳缁撴灉
- *
- * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param contractResult 鍚堝悓鑰冩牳缁撴灉
* @return 缁撴灉
*/
- public int updateDefaultResult(DefaultResult defaultResult);
+ public int updateDefaultResult(ContractResult contractResult);
/**
* 鍒犻櫎鍚堝悓鑰冩牳缁撴灉
- *
+ *
* @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
* @return 缁撴灉
*/
@@ -55,7 +55,7 @@
/**
* 鎵归噺鍒犻櫎鍚堝悓鑰冩牳缁撴灉
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java
index 439ace6..83c7443 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java
@@ -1,53 +1,53 @@
package com.ycl.platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.platform.domain.entity.DefaultRule;
+import com.ycl.platform.domain.entity.CalculateRule;
import java.util.List;
/**
* 杩濈害瑙勫垯Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
-public interface DefaultRuleMapper extends BaseMapper<DefaultRule>
+public interface DefaultRuleMapper extends BaseMapper<CalculateRule>
{
/**
* 鏌ヨ杩濈害瑙勫垯
- *
+ *
* @param id 杩濈害瑙勫垯涓婚敭
* @return 杩濈害瑙勫垯
*/
- public DefaultRule selectDefaultRuleById(Long id);
+ public CalculateRule selectDefaultRuleById(Long id);
/**
* 鏌ヨ杩濈害瑙勫垯鍒楄〃
- *
- * @param defaultRule 杩濈害瑙勫垯
+ *
+ * @param calculateRule 杩濈害瑙勫垯
* @return 杩濈害瑙勫垯闆嗗悎
*/
- public List<DefaultRule> selectDefaultRuleList(DefaultRule defaultRule);
+ public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule);
/**
* 鏂板杩濈害瑙勫垯
- *
- * @param defaultRule 杩濈害瑙勫垯
+ *
+ * @param calculateRule 杩濈害瑙勫垯
* @return 缁撴灉
*/
- public int insertDefaultRule(DefaultRule defaultRule);
+ public int insertDefaultRule(CalculateRule calculateRule);
/**
* 淇敼杩濈害瑙勫垯
- *
- * @param defaultRule 杩濈害瑙勫垯
+ *
+ * @param calculateRule 杩濈害瑙勫垯
* @return 缁撴灉
*/
- public int updateDefaultRule(DefaultRule defaultRule);
+ public int updateDefaultRule(CalculateRule calculateRule);
/**
* 鍒犻櫎杩濈害瑙勫垯
- *
+ *
* @param id 杩濈害瑙勫垯涓婚敭
* @return 缁撴灉
*/
@@ -55,7 +55,7 @@
/**
* 鎵归噺鍒犻櫎杩濈害瑙勫垯
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultScoreMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultScoreMapper.java
index 4439315..dbf2873 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultScoreMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultScoreMapper.java
@@ -3,51 +3,51 @@
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.platform.domain.entity.DefaultScore;
+import com.ycl.platform.domain.entity.ContractScore;
/**
* 鍚堝悓鎵撳垎Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
-public interface DefaultScoreMapper extends BaseMapper<DefaultScore>
+public interface DefaultScoreMapper extends BaseMapper<ContractScore>
{
/**
* 鏌ヨ鍚堝悓鎵撳垎
- *
+ *
* @param id 鍚堝悓鎵撳垎涓婚敭
* @return 鍚堝悓鎵撳垎
*/
- public DefaultScore selectDefaultScoreById(Long id);
+ public ContractScore selectDefaultScoreById(Long id);
/**
* 鏌ヨ鍚堝悓鎵撳垎鍒楄〃
- *
- * @param defaultScore 鍚堝悓鎵撳垎
+ *
+ * @param contractScore 鍚堝悓鎵撳垎
* @return 鍚堝悓鎵撳垎闆嗗悎
*/
- public List<DefaultScore> selectDefaultScoreList(DefaultScore defaultScore);
+ public List<ContractScore> selectDefaultScoreList(ContractScore contractScore);
/**
* 鏂板鍚堝悓鎵撳垎
- *
- * @param defaultScore 鍚堝悓鎵撳垎
+ *
+ * @param contractScore 鍚堝悓鎵撳垎
* @return 缁撴灉
*/
- public int insertDefaultScore(DefaultScore defaultScore);
+ public int insertDefaultScore(ContractScore contractScore);
/**
* 淇敼鍚堝悓鎵撳垎
- *
- * @param defaultScore 鍚堝悓鎵撳垎
+ *
+ * @param contractScore 鍚堝悓鎵撳垎
* @return 缁撴灉
*/
- public int updateDefaultScore(DefaultScore defaultScore);
+ public int updateDefaultScore(ContractScore contractScore);
/**
* 鍒犻櫎鍚堝悓鎵撳垎
- *
+ *
* @param id 鍚堝悓鎵撳垎涓婚敭
* @return 缁撴灉
*/
@@ -55,7 +55,7 @@
/**
* 鎵归噺鍒犻櫎鍚堝悓鎵撳垎
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java
index 5f66ec3..9f543a1 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java
@@ -1,52 +1,52 @@
package com.ycl.platform.service;
-import com.ycl.platform.domain.entity.CalculateRule;
+import com.ycl.platform.domain.entity.CalculateMoneyRule;
import java.util.List;
/**
* 鏍哥畻瑙勫垯Service鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2024-04-03
*/
-public interface ICalculateRuleService
+public interface ICalculateRuleService
{
/**
* 鏌ヨ鏍哥畻瑙勫垯
- *
+ *
* @param id 鏍哥畻瑙勫垯涓婚敭
* @return 鏍哥畻瑙勫垯
*/
- public CalculateRule selectCalculateRuleById(Long id);
+ public CalculateMoneyRule selectCalculateRuleById(Long id);
/**
* 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
- *
- * @param calculateRule 鏍哥畻瑙勫垯
+ *
+ * @param calculateMoneyRule 鏍哥畻瑙勫垯
* @return 鏍哥畻瑙勫垯闆嗗悎
*/
- public List<CalculateRule> selectCalculateRuleList(CalculateRule calculateRule);
+ public List<CalculateMoneyRule> selectCalculateRuleList(CalculateMoneyRule calculateMoneyRule);
/**
* 鏂板鏍哥畻瑙勫垯
- *
- * @param calculateRule 鏍哥畻瑙勫垯
+ *
+ * @param calculateMoneyRule 鏍哥畻瑙勫垯
* @return 缁撴灉
*/
- public int insertCalculateRule(CalculateRule calculateRule);
+ public int insertCalculateRule(CalculateMoneyRule calculateMoneyRule);
/**
* 淇敼鏍哥畻瑙勫垯
- *
- * @param calculateRule 鏍哥畻瑙勫垯
+ *
+ * @param calculateMoneyRule 鏍哥畻瑙勫垯
* @return 缁撴灉
*/
- public int updateCalculateRule(CalculateRule calculateRule);
+ public int updateCalculateRule(CalculateMoneyRule calculateMoneyRule);
/**
* 鎵归噺鍒犻櫎鏍哥畻瑙勫垯
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏍哥畻瑙勫垯涓婚敭闆嗗悎
* @return 缁撴灉
*/
@@ -54,7 +54,7 @@
/**
* 鍒犻櫎鏍哥畻瑙勫垯淇℃伅
- *
+ *
* @param id 鏍哥畻瑙勫垯涓婚敭
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultPublishService.java b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultPublishService.java
index b688726..ea59a71 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultPublishService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultPublishService.java
@@ -1,52 +1,52 @@
package com.ycl.platform.service;
-import com.ycl.platform.domain.entity.DefaultPublish;
+import com.ycl.platform.domain.entity.ContractPublish;
import java.util.List;
/**
* 鍚堝悓鑰冩牳鍙戝竷Service鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
-public interface IDefaultPublishService
+public interface IDefaultPublishService
{
/**
* 鏌ヨ鍚堝悓鑰冩牳鍙戝竷
- *
+ *
* @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭
* @return 鍚堝悓鑰冩牳鍙戝竷
*/
- public DefaultPublish selectDefaultPublishById(Long id);
+ public ContractPublish selectDefaultPublishById(Long id);
/**
* 鏌ヨ鍚堝悓鑰冩牳鍙戝竷鍒楄〃
- *
- * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷
* @return 鍚堝悓鑰冩牳鍙戝竷闆嗗悎
*/
- public List<DefaultPublish> selectDefaultPublishList(DefaultPublish defaultPublish);
+ public List<ContractPublish> selectDefaultPublishList(ContractPublish contractPublish);
/**
* 鏂板鍚堝悓鑰冩牳鍙戝竷
- *
- * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷
* @return 缁撴灉
*/
- public int insertDefaultPublish(DefaultPublish defaultPublish);
+ public int insertDefaultPublish(ContractPublish contractPublish);
/**
* 淇敼鍚堝悓鑰冩牳鍙戝竷
- *
- * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷
* @return 缁撴灉
*/
- public int updateDefaultPublish(DefaultPublish defaultPublish);
+ public int updateDefaultPublish(ContractPublish contractPublish);
/**
* 鎵归噺鍒犻櫎鍚堝悓鑰冩牳鍙戝竷
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鑰冩牳鍙戝竷涓婚敭闆嗗悎
* @return 缁撴灉
*/
@@ -54,7 +54,7 @@
/**
* 鍒犻櫎鍚堝悓鑰冩牳鍙戝竷淇℃伅
- *
+ *
* @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultResultService.java b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultResultService.java
index d7d685a..809631a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultResultService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultResultService.java
@@ -1,52 +1,52 @@
package com.ycl.platform.service;
-import com.ycl.platform.domain.entity.DefaultResult;
+import com.ycl.platform.domain.entity.ContractResult;
import java.util.List;
/**
* 鍚堝悓鑰冩牳缁撴灉Service鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
-public interface IDefaultResultService
+public interface IDefaultResultService
{
/**
* 鏌ヨ鍚堝悓鑰冩牳缁撴灉
- *
+ *
* @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
* @return 鍚堝悓鑰冩牳缁撴灉
*/
- public DefaultResult selectDefaultResultById(Long id);
+ public ContractResult selectDefaultResultById(Long id);
/**
* 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
- *
- * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param contractResult 鍚堝悓鑰冩牳缁撴灉
* @return 鍚堝悓鑰冩牳缁撴灉闆嗗悎
*/
- public List<DefaultResult> selectDefaultResultList(DefaultResult defaultResult);
+ public List<ContractResult> selectDefaultResultList(ContractResult contractResult);
/**
* 鏂板鍚堝悓鑰冩牳缁撴灉
- *
- * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param contractResult 鍚堝悓鑰冩牳缁撴灉
* @return 缁撴灉
*/
- public int insertDefaultResult(DefaultResult defaultResult);
+ public int insertDefaultResult(ContractResult contractResult);
/**
* 淇敼鍚堝悓鑰冩牳缁撴灉
- *
- * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param contractResult 鍚堝悓鑰冩牳缁撴灉
* @return 缁撴灉
*/
- public int updateDefaultResult(DefaultResult defaultResult);
+ public int updateDefaultResult(ContractResult contractResult);
/**
* 鎵归噺鍒犻櫎鍚堝悓鑰冩牳缁撴灉
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鑰冩牳缁撴灉涓婚敭闆嗗悎
* @return 缁撴灉
*/
@@ -54,7 +54,7 @@
/**
* 鍒犻櫎鍚堝悓鑰冩牳缁撴灉淇℃伅
- *
+ *
* @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultRuleService.java
index 36281cf..0743e96 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultRuleService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultRuleService.java
@@ -1,52 +1,52 @@
package com.ycl.platform.service;
-import com.ycl.platform.domain.entity.DefaultRule;
+import com.ycl.platform.domain.entity.CalculateRule;
import java.util.List;
/**
* 杩濈害瑙勫垯Service鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
-public interface IDefaultRuleService
+public interface IDefaultRuleService
{
/**
* 鏌ヨ杩濈害瑙勫垯
- *
+ *
* @param id 杩濈害瑙勫垯涓婚敭
* @return 杩濈害瑙勫垯
*/
- public DefaultRule selectDefaultRuleById(Long id);
+ public CalculateRule selectDefaultRuleById(Long id);
/**
* 鏌ヨ杩濈害瑙勫垯鍒楄〃
- *
- * @param defaultRule 杩濈害瑙勫垯
+ *
+ * @param calculateRule 杩濈害瑙勫垯
* @return 杩濈害瑙勫垯闆嗗悎
*/
- public List<DefaultRule> selectDefaultRuleList(DefaultRule defaultRule);
+ public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule);
/**
* 鏂板杩濈害瑙勫垯
- *
- * @param defaultRule 杩濈害瑙勫垯
+ *
+ * @param calculateRule 杩濈害瑙勫垯
* @return 缁撴灉
*/
- public int insertDefaultRule(DefaultRule defaultRule);
+ public int insertDefaultRule(CalculateRule calculateRule);
/**
* 淇敼杩濈害瑙勫垯
- *
- * @param defaultRule 杩濈害瑙勫垯
+ *
+ * @param calculateRule 杩濈害瑙勫垯
* @return 缁撴灉
*/
- public int updateDefaultRule(DefaultRule defaultRule);
+ public int updateDefaultRule(CalculateRule calculateRule);
/**
* 鎵归噺鍒犻櫎杩濈害瑙勫垯
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑杩濈害瑙勫垯涓婚敭闆嗗悎
* @return 缁撴灉
*/
@@ -54,7 +54,7 @@
/**
* 鍒犻櫎杩濈害瑙勫垯淇℃伅
- *
+ *
* @param id 杩濈害瑙勫垯涓婚敭
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultScoreService.java b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultScoreService.java
index 8ede37d..473328f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultScoreService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultScoreService.java
@@ -1,52 +1,52 @@
package com.ycl.platform.service;
-import com.ycl.platform.domain.entity.DefaultScore;
+import com.ycl.platform.domain.entity.ContractScore;
import java.util.List;
/**
* 鍚堝悓鎵撳垎Service鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
-public interface IDefaultScoreService
+public interface IDefaultScoreService
{
/**
* 鏌ヨ鍚堝悓鎵撳垎
- *
+ *
* @param id 鍚堝悓鎵撳垎涓婚敭
* @return 鍚堝悓鎵撳垎
*/
- public DefaultScore selectDefaultScoreById(Long id);
+ public ContractScore selectDefaultScoreById(Long id);
/**
* 鏌ヨ鍚堝悓鎵撳垎鍒楄〃
- *
- * @param defaultScore 鍚堝悓鎵撳垎
+ *
+ * @param contractScore 鍚堝悓鎵撳垎
* @return 鍚堝悓鎵撳垎闆嗗悎
*/
- public List<DefaultScore> selectDefaultScoreList(DefaultScore defaultScore);
+ public List<ContractScore> selectDefaultScoreList(ContractScore contractScore);
/**
* 鏂板鍚堝悓鎵撳垎
- *
- * @param defaultScore 鍚堝悓鎵撳垎
+ *
+ * @param contractScore 鍚堝悓鎵撳垎
* @return 缁撴灉
*/
- public int insertDefaultScore(DefaultScore defaultScore);
+ public int insertDefaultScore(ContractScore contractScore);
/**
* 淇敼鍚堝悓鎵撳垎
- *
- * @param defaultScore 鍚堝悓鎵撳垎
+ *
+ * @param contractScore 鍚堝悓鎵撳垎
* @return 缁撴灉
*/
- public int updateDefaultScore(DefaultScore defaultScore);
+ public int updateDefaultScore(ContractScore contractScore);
/**
* 鎵归噺鍒犻櫎鍚堝悓鎵撳垎
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鎵撳垎涓婚敭闆嗗悎
* @return 缁撴灉
*/
@@ -54,7 +54,7 @@
/**
* 鍒犻櫎鍚堝悓鎵撳垎淇℃伅
- *
+ *
* @param id 鍚堝悓鎵撳垎涓婚敭
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
index 8ab0e06..19060ea 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
@@ -1,7 +1,7 @@
package com.ycl.platform.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.entity.CalculateRule;
+import com.ycl.platform.domain.entity.CalculateMoneyRule;
import com.ycl.platform.mapper.CalculateRuleMapper;
import com.ycl.platform.service.ICalculateRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,67 +11,67 @@
/**
* 鏍哥畻瑙勫垯Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2024-04-03
*/
@Service
-public class CalculateRuleServiceImpl extends ServiceImpl<CalculateRuleMapper, CalculateRule> implements ICalculateRuleService
+public class CalculateRuleServiceImpl extends ServiceImpl<CalculateRuleMapper, CalculateMoneyRule> implements ICalculateRuleService
{
@Autowired
private CalculateRuleMapper calculateRuleMapper;
/**
* 鏌ヨ鏍哥畻瑙勫垯
- *
+ *
* @param id 鏍哥畻瑙勫垯涓婚敭
* @return 鏍哥畻瑙勫垯
*/
@Override
- public CalculateRule selectCalculateRuleById(Long id)
+ public CalculateMoneyRule selectCalculateRuleById(Long id)
{
return calculateRuleMapper.selectCalculateRuleById(id);
}
/**
* 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
- *
- * @param calculateRule 鏍哥畻瑙勫垯
+ *
+ * @param calculateMoneyRule 鏍哥畻瑙勫垯
* @return 鏍哥畻瑙勫垯
*/
@Override
- public List<CalculateRule> selectCalculateRuleList(CalculateRule calculateRule)
+ public List<CalculateMoneyRule> selectCalculateRuleList(CalculateMoneyRule calculateMoneyRule)
{
- return calculateRuleMapper.selectCalculateRuleList(calculateRule);
+ return calculateRuleMapper.selectCalculateRuleList(calculateMoneyRule);
}
/**
* 鏂板鏍哥畻瑙勫垯
- *
- * @param calculateRule 鏍哥畻瑙勫垯
+ *
+ * @param calculateMoneyRule 鏍哥畻瑙勫垯
* @return 缁撴灉
*/
@Override
- public int insertCalculateRule(CalculateRule calculateRule)
+ public int insertCalculateRule(CalculateMoneyRule calculateMoneyRule)
{
- return calculateRuleMapper.insertCalculateRule(calculateRule);
+ return calculateRuleMapper.insertCalculateRule(calculateMoneyRule);
}
/**
* 淇敼鏍哥畻瑙勫垯
- *
- * @param calculateRule 鏍哥畻瑙勫垯
+ *
+ * @param calculateMoneyRule 鏍哥畻瑙勫垯
* @return 缁撴灉
*/
@Override
- public int updateCalculateRule(CalculateRule calculateRule)
+ public int updateCalculateRule(CalculateMoneyRule calculateMoneyRule)
{
- return calculateRuleMapper.updateCalculateRule(calculateRule);
+ return calculateRuleMapper.updateCalculateRule(calculateMoneyRule);
}
/**
* 鎵归噺鍒犻櫎鏍哥畻瑙勫垯
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏍哥畻瑙勫垯涓婚敭
* @return 缁撴灉
*/
@@ -83,7 +83,7 @@
/**
* 鍒犻櫎鏍哥畻瑙勫垯淇℃伅
- *
+ *
* @param id 鏍哥畻瑙勫垯涓婚敭
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultPublishServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultPublishServiceImpl.java
index 833775c..7bfe9b7 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultPublishServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultPublishServiceImpl.java
@@ -1,7 +1,7 @@
package com.ycl.platform.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.entity.DefaultPublish;
+import com.ycl.platform.domain.entity.ContractPublish;
import com.ycl.platform.mapper.DefaultPublishMapper;
import com.ycl.platform.service.IDefaultPublishService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,69 +12,69 @@
/**
* 鍚堝悓鑰冩牳鍙戝竷Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
@Service
-public class DefaultPublishServiceImpl extends ServiceImpl<DefaultPublishMapper, DefaultPublish> implements IDefaultPublishService
+public class DefaultPublishServiceImpl extends ServiceImpl<DefaultPublishMapper, ContractPublish> implements IDefaultPublishService
{
@Autowired
private DefaultPublishMapper defaultPublishMapper;
/**
* 鏌ヨ鍚堝悓鑰冩牳鍙戝竷
- *
+ *
* @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭
* @return 鍚堝悓鑰冩牳鍙戝竷
*/
@Override
- public DefaultPublish selectDefaultPublishById(Long id)
+ public ContractPublish selectDefaultPublishById(Long id)
{
return defaultPublishMapper.selectDefaultPublishById(id);
}
/**
* 鏌ヨ鍚堝悓鑰冩牳鍙戝竷鍒楄〃
- *
- * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷
* @return 鍚堝悓鑰冩牳鍙戝竷
*/
@Override
- public List<DefaultPublish> selectDefaultPublishList(DefaultPublish defaultPublish)
+ public List<ContractPublish> selectDefaultPublishList(ContractPublish contractPublish)
{
- return defaultPublishMapper.selectDefaultPublishList(defaultPublish);
+ return defaultPublishMapper.selectDefaultPublishList(contractPublish);
}
/**
* 鏂板鍚堝悓鑰冩牳鍙戝竷
- *
- * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷
* @return 缁撴灉
*/
@Override
- public int insertDefaultPublish(DefaultPublish defaultPublish)
+ public int insertDefaultPublish(ContractPublish contractPublish)
{
- defaultPublish.setCreateTime(DateUtils.getNowDate());
- return defaultPublishMapper.insertDefaultPublish(defaultPublish);
+ contractPublish.setCreateTime(DateUtils.getNowDate());
+ return defaultPublishMapper.insertDefaultPublish(contractPublish);
}
/**
* 淇敼鍚堝悓鑰冩牳鍙戝竷
- *
- * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷
* @return 缁撴灉
*/
@Override
- public int updateDefaultPublish(DefaultPublish defaultPublish)
+ public int updateDefaultPublish(ContractPublish contractPublish)
{
- defaultPublish.setUpdateTime(DateUtils.getNowDate());
- return defaultPublishMapper.updateDefaultPublish(defaultPublish);
+ contractPublish.setUpdateTime(DateUtils.getNowDate());
+ return defaultPublishMapper.updateDefaultPublish(contractPublish);
}
/**
* 鎵归噺鍒犻櫎鍚堝悓鑰冩牳鍙戝竷
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鑰冩牳鍙戝竷涓婚敭
* @return 缁撴灉
*/
@@ -86,7 +86,7 @@
/**
* 鍒犻櫎鍚堝悓鑰冩牳鍙戝竷淇℃伅
- *
+ *
* @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultResultServiceImpl.java
index 69d4e81..7c418bf 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultResultServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultResultServiceImpl.java
@@ -1,7 +1,7 @@
package com.ycl.platform.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.entity.DefaultResult;
+import com.ycl.platform.domain.entity.ContractResult;
import com.ycl.platform.mapper.DefaultResultMapper;
import com.ycl.platform.service.IDefaultResultService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,68 +12,68 @@
/**
* 鍚堝悓鑰冩牳缁撴灉Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
@Service
-public class DefaultResultServiceImpl extends ServiceImpl<DefaultResultMapper, DefaultResult> implements IDefaultResultService
+public class DefaultResultServiceImpl extends ServiceImpl<DefaultResultMapper, ContractResult> implements IDefaultResultService
{
@Autowired
private DefaultResultMapper defaultResultMapper;
/**
* 鏌ヨ鍚堝悓鑰冩牳缁撴灉
- *
+ *
* @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
* @return 鍚堝悓鑰冩牳缁撴灉
*/
@Override
- public DefaultResult selectDefaultResultById(Long id)
+ public ContractResult selectDefaultResultById(Long id)
{
return defaultResultMapper.selectDefaultResultById(id);
}
/**
* 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
- *
- * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param contractResult 鍚堝悓鑰冩牳缁撴灉
* @return 鍚堝悓鑰冩牳缁撴灉
*/
@Override
- public List<DefaultResult> selectDefaultResultList(DefaultResult defaultResult)
+ public List<ContractResult> selectDefaultResultList(ContractResult contractResult)
{
- return defaultResultMapper.selectDefaultResultList(defaultResult);
+ return defaultResultMapper.selectDefaultResultList(contractResult);
}
/**
* 鏂板鍚堝悓鑰冩牳缁撴灉
- *
- * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param contractResult 鍚堝悓鑰冩牳缁撴灉
* @return 缁撴灉
*/
@Override
- public int insertDefaultResult(DefaultResult defaultResult)
+ public int insertDefaultResult(ContractResult contractResult)
{
- return defaultResultMapper.insertDefaultResult(defaultResult);
+ return defaultResultMapper.insertDefaultResult(contractResult);
}
/**
* 淇敼鍚堝悓鑰冩牳缁撴灉
- *
- * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param contractResult 鍚堝悓鑰冩牳缁撴灉
* @return 缁撴灉
*/
@Override
- public int updateDefaultResult(DefaultResult defaultResult)
+ public int updateDefaultResult(ContractResult contractResult)
{
- defaultResult.setUpdateTime(DateUtils.getNowDate());
- return defaultResultMapper.updateDefaultResult(defaultResult);
+ contractResult.setUpdateTime(DateUtils.getNowDate());
+ return defaultResultMapper.updateDefaultResult(contractResult);
}
/**
* 鎵归噺鍒犻櫎鍚堝悓鑰冩牳缁撴灉
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鑰冩牳缁撴灉涓婚敭
* @return 缁撴灉
*/
@@ -85,7 +85,7 @@
/**
* 鍒犻櫎鍚堝悓鑰冩牳缁撴灉淇℃伅
- *
+ *
* @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java
index 075fced..94e3799 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java
@@ -1,7 +1,7 @@
package com.ycl.platform.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.entity.DefaultRule;
+import com.ycl.platform.domain.entity.CalculateRule;
import com.ycl.platform.mapper.DefaultRuleMapper;
import com.ycl.platform.service.IDefaultRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,69 +12,69 @@
/**
* 杩濈害瑙勫垯Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
@Service
-public class DefaultRuleServiceImpl extends ServiceImpl<DefaultRuleMapper, DefaultRule> implements IDefaultRuleService
+public class DefaultRuleServiceImpl extends ServiceImpl<DefaultRuleMapper, CalculateRule> implements IDefaultRuleService
{
@Autowired
private DefaultRuleMapper defaultRuleMapper;
/**
* 鏌ヨ杩濈害瑙勫垯
- *
+ *
* @param id 杩濈害瑙勫垯涓婚敭
* @return 杩濈害瑙勫垯
*/
@Override
- public DefaultRule selectDefaultRuleById(Long id)
+ public CalculateRule selectDefaultRuleById(Long id)
{
return defaultRuleMapper.selectDefaultRuleById(id);
}
/**
* 鏌ヨ杩濈害瑙勫垯鍒楄〃
- *
- * @param defaultRule 杩濈害瑙勫垯
+ *
+ * @param calculateRule 杩濈害瑙勫垯
* @return 杩濈害瑙勫垯
*/
@Override
- public List<DefaultRule> selectDefaultRuleList(DefaultRule defaultRule)
+ public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule)
{
- return defaultRuleMapper.selectDefaultRuleList(defaultRule);
+ return defaultRuleMapper.selectDefaultRuleList(calculateRule);
}
/**
* 鏂板杩濈害瑙勫垯
- *
- * @param defaultRule 杩濈害瑙勫垯
+ *
+ * @param calculateRule 杩濈害瑙勫垯
* @return 缁撴灉
*/
@Override
- public int insertDefaultRule(DefaultRule defaultRule)
+ public int insertDefaultRule(CalculateRule calculateRule)
{
- defaultRule.setCreateTime(DateUtils.getNowDate());
- return defaultRuleMapper.insertDefaultRule(defaultRule);
+ calculateRule.setCreateTime(DateUtils.getNowDate());
+ return defaultRuleMapper.insertDefaultRule(calculateRule);
}
/**
* 淇敼杩濈害瑙勫垯
- *
- * @param defaultRule 杩濈害瑙勫垯
+ *
+ * @param calculateRule 杩濈害瑙勫垯
* @return 缁撴灉
*/
@Override
- public int updateDefaultRule(DefaultRule defaultRule)
+ public int updateDefaultRule(CalculateRule calculateRule)
{
- defaultRule.setUpdateTime(DateUtils.getNowDate());
- return defaultRuleMapper.updateDefaultRule(defaultRule);
+ calculateRule.setUpdateTime(DateUtils.getNowDate());
+ return defaultRuleMapper.updateDefaultRule(calculateRule);
}
/**
* 鎵归噺鍒犻櫎杩濈害瑙勫垯
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑杩濈害瑙勫垯涓婚敭
* @return 缁撴灉
*/
@@ -86,7 +86,7 @@
/**
* 鍒犻櫎杩濈害瑙勫垯淇℃伅
- *
+ *
* @param id 杩濈害瑙勫垯涓婚敭
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultScoreServiceImpl.java
index 2292183..b6e9dfd 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultScoreServiceImpl.java
@@ -1,7 +1,7 @@
package com.ycl.platform.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.entity.DefaultScore;
+import com.ycl.platform.domain.entity.ContractScore;
import com.ycl.platform.mapper.DefaultScoreMapper;
import com.ycl.platform.service.IDefaultScoreService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,69 +12,69 @@
/**
* 鍚堝悓鎵撳垎Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
@Service
-public class DefaultScoreServiceImpl extends ServiceImpl<DefaultScoreMapper, DefaultScore> implements IDefaultScoreService
+public class DefaultScoreServiceImpl extends ServiceImpl<DefaultScoreMapper, ContractScore> implements IDefaultScoreService
{
@Autowired
private DefaultScoreMapper defaultScoreMapper;
/**
* 鏌ヨ鍚堝悓鎵撳垎
- *
+ *
* @param id 鍚堝悓鎵撳垎涓婚敭
* @return 鍚堝悓鎵撳垎
*/
@Override
- public DefaultScore selectDefaultScoreById(Long id)
+ public ContractScore selectDefaultScoreById(Long id)
{
return defaultScoreMapper.selectDefaultScoreById(id);
}
/**
* 鏌ヨ鍚堝悓鎵撳垎鍒楄〃
- *
- * @param defaultScore 鍚堝悓鎵撳垎
+ *
+ * @param contractScore 鍚堝悓鎵撳垎
* @return 鍚堝悓鎵撳垎
*/
@Override
- public List<DefaultScore> selectDefaultScoreList(DefaultScore defaultScore)
+ public List<ContractScore> selectDefaultScoreList(ContractScore contractScore)
{
- return defaultScoreMapper.selectDefaultScoreList(defaultScore);
+ return defaultScoreMapper.selectDefaultScoreList(contractScore);
}
/**
* 鏂板鍚堝悓鎵撳垎
- *
- * @param defaultScore 鍚堝悓鎵撳垎
+ *
+ * @param contractScore 鍚堝悓鎵撳垎
* @return 缁撴灉
*/
@Override
- public int insertDefaultScore(DefaultScore defaultScore)
+ public int insertDefaultScore(ContractScore contractScore)
{
- defaultScore.setCreateTime(DateUtils.getNowDate());
- return defaultScoreMapper.insertDefaultScore(defaultScore);
+ contractScore.setCreateTime(DateUtils.getNowDate());
+ return defaultScoreMapper.insertDefaultScore(contractScore);
}
/**
* 淇敼鍚堝悓鎵撳垎
- *
- * @param defaultScore 鍚堝悓鎵撳垎
+ *
+ * @param contractScore 鍚堝悓鎵撳垎
* @return 缁撴灉
*/
@Override
- public int updateDefaultScore(DefaultScore defaultScore)
+ public int updateDefaultScore(ContractScore contractScore)
{
- defaultScore.setUpdateTime(DateUtils.getNowDate());
- return defaultScoreMapper.updateDefaultScore(defaultScore);
+ contractScore.setUpdateTime(DateUtils.getNowDate());
+ return defaultScoreMapper.updateDefaultScore(contractScore);
}
/**
* 鎵归噺鍒犻櫎鍚堝悓鎵撳垎
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鎵撳垎涓婚敭
* @return 缁撴灉
*/
@@ -86,7 +86,7 @@
/**
* 鍒犻櫎鍚堝悓鎵撳垎淇℃伅
- *
+ *
* @param id 鍚堝悓鎵撳垎涓婚敭
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/websocket/NettyConfig.java b/ycl-server/src/main/java/com/ycl/websocket/NettyConfig.java
new file mode 100644
index 0000000..f2ef8e1
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/websocket/NettyConfig.java
@@ -0,0 +1,68 @@
+package com.ycl.websocket;
+
+import io.netty.channel.Channel;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.group.DefaultChannelGroup;
+import io.netty.util.concurrent.GlobalEventExecutor;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author锛歺p
+ * @date锛�2024/4/18 16:10
+ */
+public class NettyConfig {
+
+ /**
+ * 瀹氫箟鍏ㄥ眬鍗曞埄channel缁� 绠＄悊鎵�鏈塩hannel
+ */
+ private static volatile ChannelGroup channelGroup = null;
+
+
+ /**
+ * 瀛樻斁璇锋眰ID涓巆hannel鐨勫搴斿叧绯�
+ */
+ private static volatile ConcurrentHashMap<String, Channel> channelMap = null;
+
+
+ /**
+ * 瀹氫箟涓ゆ妸閿�
+ */
+ private static final Object lock1 = new Object();
+ private static final Object lock2 = new Object();
+
+
+
+
+ public static ChannelGroup getChannelGroup() {
+ if (null == channelGroup) {
+ synchronized (lock1) {
+ if (null == channelGroup) {
+ channelGroup = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE);
+ }
+ }
+ }
+ return channelGroup;
+ }
+
+
+ public static ConcurrentHashMap<String, Channel> getChannelMap() {
+ if (null == channelMap) {
+ synchronized (lock2) {
+ if (null == channelMap) {
+ channelMap = new ConcurrentHashMap<>();
+ }
+ }
+ }
+ return channelMap;
+ }
+
+
+ public static Channel getChannel(String userId) {
+ if (null == channelMap) {
+ return getChannelMap().get(userId);
+ }
+ return channelMap.get(userId);
+ }
+
+}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateMoneyRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateMoneyRuleMapper.xml
new file mode 100644
index 0000000..2fa36dd
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateMoneyRuleMapper.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.platform.mapper.CalculateRuleMapper">
+
+ <resultMap type="com.ycl.platform.domain.entity.CalculateMoneyRule" id="CalculateRuleResult">
+ <result property="id" column="id" />
+ <result property="name" column="name" />
+ <result property="templateId" column="template_id" />
+ <result property="parentId" column="parent_id" />
+ <result property="unitId" column="unit_id" />
+ <result property="value" column="value" />
+ <result property="description" column="description" />
+ </resultMap>
+
+ <sql id="selectCalculateRuleVo">
+ select id, name, template_id, parent_id, unit_id, value, description from t_calculate_money_rule
+ </sql>
+
+ <select id="selectCalculateRuleList" resultMap="CalculateRuleResult">
+ <include refid="selectCalculateRuleVo"/>
+ <where>
+ <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
+ <if test="templateId != null "> and template_id = #{templateId}</if>
+ <if test="parentId != null "> and parent_id = #{parentId}</if>
+ <if test="unitId != null "> and unit_id = #{unitId}</if>
+ <if test="value != null "> and value = #{value}</if>
+ <if test="description != null and description != ''"> and description = #{description}</if>
+ </where>
+ </select>
+
+ <select id="selectCalculateRuleById" resultMap="CalculateRuleResult">
+ <include refid="selectCalculateRuleVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertCalculateRule" useGeneratedKeys="true" keyProperty="id">
+ insert into t_calculate_money_rule
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="name != null">name,</if>
+ <if test="templateId != null">template_id,</if>
+ <if test="parentId != null">parent_id,</if>
+ <if test="unitId != null">unit_id,</if>
+ <if test="value != null">value,</if>
+ <if test="description != null">description,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="name != null">#{name},</if>
+ <if test="templateId != null">#{templateId},</if>
+ <if test="parentId != null">#{parentId},</if>
+ <if test="unitId != null">#{unitId},</if>
+ <if test="value != null">#{value},</if>
+ <if test="description != null">#{description},</if>
+ </trim>
+ </insert>
+
+ <update id="updateCalculateRule">
+ update t_calculate_money_rule
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="name != null">name = #{name},</if>
+ <if test="templateId != null">template_id = #{templateId},</if>
+ <if test="parentId != null">parent_id = #{parentId},</if>
+ <if test="unitId != null">unit_id = #{unitId},</if>
+ <if test="value != null">value = #{value},</if>
+ <if test="description != null">description = #{description},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteCalculateRuleById" parameterType="Long">
+ delete from t_calculate_money_rule where id = #{id}
+ </delete>
+
+ <delete id="deleteCalculateRuleByIds" parameterType="String">
+ delete from t_calculate_money_rule where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
index ae065f9..4d9f21e 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
@@ -2,80 +2,89 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.platform.mapper.CalculateRuleMapper">
-
- <resultMap type="com.ycl.platform.domain.entity.CalculateRule" id="CalculateRuleResult">
+<mapper namespace="com.ycl.platform.mapper.DefaultRuleMapper">
+
+ <resultMap type="com.ycl.platform.domain.entity.CalculateRule" id="DefaultRuleResult">
<result property="id" column="id" />
- <result property="name" column="name" />
- <result property="templateId" column="template_id" />
+ <result property="ruleName" column="rule_name" />
<result property="parentId" column="parent_id" />
- <result property="unitId" column="unit_id" />
- <result property="value" column="value" />
- <result property="description" column="description" />
+ <result property="deductCategory" column="deduct_category" />
+ <result property="deductWay" column="deduct_way" />
+ <result property="ruleDesc" column="rule_desc" />
+ <result property="ruleStatus" column="rule_status" />
+ <result property="createTime" column="create_time" />
+ <result property="updateTime" column="update_time" />
+ <result property="deleted" column="deleted" />
</resultMap>
- <sql id="selectCalculateRuleVo">
- select id, name, template_id, parent_id, unit_id, value, description from t_calculate_rule
+ <sql id="selectDefaultRuleVo">
+ select id, rule_name, parent_id, deduct_category, deduct_way, rule_desc, rule_status, create_time, update_time, deleted from t_calculate_rule
</sql>
- <select id="selectCalculateRuleList" resultMap="CalculateRuleResult">
- <include refid="selectCalculateRuleVo"/>
- <where>
- <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
- <if test="templateId != null "> and template_id = #{templateId}</if>
- <if test="parentId != null "> and parent_id = #{parentId}</if>
- <if test="unitId != null "> and unit_id = #{unitId}</if>
- <if test="value != null "> and value = #{value}</if>
- <if test="description != null and description != ''"> and description = #{description}</if>
+ <select id="selectDefaultRuleList" resultMap="DefaultRuleResult">
+ <include refid="selectDefaultRuleVo"/>
+ <where>
+ <if test="ruleName != null and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
+ <if test="deductCategory != null "> and deduct_category = #{deductCategory}</if>
+ <if test="ruleStatus != null and ruleStatus != ''"> and rule_status = #{ruleStatus}</if>
</where>
</select>
-
- <select id="selectCalculateRuleById" resultMap="CalculateRuleResult">
- <include refid="selectCalculateRuleVo"/>
+
+ <select id="selectDefaultRuleById" resultMap="DefaultRuleResult">
+ <include refid="selectDefaultRuleVo"/>
where id = #{id}
</select>
-
- <insert id="insertCalculateRule" useGeneratedKeys="true" keyProperty="id">
+
+ <insert id="insertDefaultRule" useGeneratedKeys="true" keyProperty="id">
insert into t_calculate_rule
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="name != null">name,</if>
- <if test="templateId != null">template_id,</if>
+ <if test="ruleName != null and ruleName != ''">rule_name,</if>
<if test="parentId != null">parent_id,</if>
- <if test="unitId != null">unit_id,</if>
- <if test="value != null">value,</if>
- <if test="description != null">description,</if>
+ <if test="deductCategory != null">deduct_category,</if>
+ <if test="deductWay != null">deduct_way,</if>
+ <if test="ruleDesc != null">rule_desc,</if>
+ <if test="ruleStatus != null">rule_status,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="deleted != null">deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="name != null">#{name},</if>
- <if test="templateId != null">#{templateId},</if>
+ <if test="ruleName != null and ruleName != ''">#{ruleName},</if>
<if test="parentId != null">#{parentId},</if>
- <if test="unitId != null">#{unitId},</if>
- <if test="value != null">#{value},</if>
- <if test="description != null">#{description},</if>
+ <if test="deductCategory != null">#{deductCategory},</if>
+ <if test="deductWay != null">#{deductWay},</if>
+ <if test="ruleDesc != null">#{ruleDesc},</if>
+ <if test="ruleStatus != null">#{ruleStatus},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="deleted != null">#{deleted},</if>
</trim>
</insert>
- <update id="updateCalculateRule">
+ <update id="updateDefaultRule" >
update t_calculate_rule
<trim prefix="SET" suffixOverrides=",">
- <if test="name != null">name = #{name},</if>
- <if test="templateId != null">template_id = #{templateId},</if>
+ <if test="ruleName != null and ruleName != ''">rule_name = #{ruleName},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
- <if test="unitId != null">unit_id = #{unitId},</if>
- <if test="value != null">value = #{value},</if>
- <if test="description != null">description = #{description},</if>
+ <if test="deductCategory != null">deduct_category = #{deductCategory},</if>
+ <if test="deductWay != null">deduct_way = #{deductWay},</if>
+ <if test="ruleDesc != null">rule_desc = #{ruleDesc},</if>
+ <if test="ruleStatus != null">rule_status = #{ruleStatus},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="deleted != null">deleted = #{deleted},</if>
</trim>
where id = #{id}
</update>
- <delete id="deleteCalculateRuleById" parameterType="Long">
+ <delete id="deleteDefaultRuleById" >
delete from t_calculate_rule where id = #{id}
</delete>
- <delete id="deleteCalculateRuleByIds" parameterType="String">
- delete from t_calculate_rule where id in
+ <delete id="deleteDefaultRuleByIds" >
+ delete from t_calculate_rule where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultPublishMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractPublishMapper.xml
similarity index 92%
rename from ycl-server/src/main/resources/mapper/zgyw/DefaultPublishMapper.xml
rename to ycl-server/src/main/resources/mapper/zgyw/ContractPublishMapper.xml
index c8e6803..a6f8aca 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/DefaultPublishMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ContractPublishMapper.xml
@@ -3,8 +3,8 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.DefaultPublishMapper">
-
- <resultMap type="com.ycl.platform.domain.entity.DefaultPublish" id="DefaultPublishResult">
+
+ <resultMap type="com.ycl.platform.domain.entity.ContractPublish" id="DefaultPublishResult">
<result property="id" column="id" />
<result property="examineName" column="examine_name" />
<result property="templateId" column="template_id" />
@@ -18,12 +18,12 @@
</resultMap>
<sql id="selectDefaultPublishVo">
- select id, examine_name, template_id, frequency, alarm_score, description, state, audit_state, create_time, update_time from t_default_publish
+ select id, examine_name, template_id, frequency, alarm_score, description, state, audit_state, create_time, update_time from t_contract_publish
</sql>
<select id="selectDefaultPublishList" resultMap="DefaultPublishResult">
<include refid="selectDefaultPublishVo"/>
- <where>
+ <where>
<if test="examineName != null and examineName != ''"> and examine_name like concat('%', #{examineName}, '%')</if>
<if test="templateId != null "> and template_id = #{templateId}</if>
<if test="frequency != null "> and frequency = #{frequency}</if>
@@ -31,14 +31,14 @@
<if test="auditState != null "> and audit_state = #{auditState}</if>
</where>
</select>
-
+
<select id="selectDefaultPublishById" resultMap="DefaultPublishResult">
<include refid="selectDefaultPublishVo"/>
where id = #{id}
</select>
-
+
<insert id="insertDefaultPublish" useGeneratedKeys="true" keyProperty="id">
- insert into t_default_publish
+ insert into t_contract_publish
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="examineName != null">examine_name,</if>
<if test="templateId != null">template_id,</if>
@@ -64,7 +64,7 @@
</insert>
<update id="updateDefaultPublish" >
- update t_default_publish
+ update t_contract_publish
<trim prefix="SET" suffixOverrides=",">
<if test="examineName != null">examine_name = #{examineName},</if>
<if test="templateId != null">template_id = #{templateId},</if>
@@ -80,13 +80,13 @@
</update>
<delete id="deleteDefaultPublishById" >
- delete from t_default_publish where id = #{id}
+ delete from t_contract_publish where id = #{id}
</delete>
<delete id="deleteDefaultPublishByIds" >
- delete from t_default_publish where id in
+ delete from t_contract_publish where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
similarity index 84%
rename from ycl-server/src/main/resources/mapper/zgyw/DefaultResultMapper.xml
rename to ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
index 687461b..6778a6d 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/DefaultResultMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
@@ -3,12 +3,12 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.DefaultResultMapper">
-
- <resultMap type="com.ycl.platform.domain.entity.DefaultResult" id="DefaultResultResult">
+
+ <resultMap type="com.ycl.platform.domain.entity.ContractResult" id="DefaultResultResult">
<result property="id" column="id" />
<result property="unitId" column="unit_id" />
<result property="publishId" column="publish_id" />
- <result property="defaultScore" column="default_score" />
+ <result property="contractScore" column="default_score" />
<result property="auditState" column="audit_state" />
<result property="publish" column="publish" />
<result property="checkTime" column="check_time" />
@@ -17,12 +17,12 @@
</resultMap>
<sql id="selectDefaultResultVo">
- select id, unit_id, publish_id, default_score, audit_state, publish, check_time, update_time, deleted from t_default_result
+ select id, unit_id, publish_id, default_score, audit_state, publish, check_time, update_time, deleted from t_contract_result
</sql>
<select id="selectDefaultResultList" resultMap="DefaultResultResult">
<include refid="selectDefaultResultVo"/>
- <where>
+ <where>
<if test="unitId != null "> and unit_id = #{unitId}</if>
<if test="publishId != null "> and publish_id = #{publishId}</if>
<if test="auditState != null "> and audit_state = #{auditState}</if>
@@ -30,18 +30,18 @@
<if test="checkTime != null "> and check_time = #{checkTime}</if>
</where>
</select>
-
+
<select id="selectDefaultResultById" resultMap="DefaultResultResult">
<include refid="selectDefaultResultVo"/>
where id = #{id}
</select>
-
+
<insert id="insertDefaultResult" useGeneratedKeys="true" keyProperty="id">
- insert into t_default_result
+ insert into t_contract_result
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="unitId != null">unit_id,</if>
<if test="publishId != null">publish_id,</if>
- <if test="defaultScore != null">default_score,</if>
+ <if test="contractScore != null">default_score,</if>
<if test="auditState != null">audit_state,</if>
<if test="publish != null">publish,</if>
<if test="checkTime != null">check_time,</if>
@@ -51,7 +51,7 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="unitId != null">#{unitId},</if>
<if test="publishId != null">#{publishId},</if>
- <if test="defaultScore != null">#{defaultScore},</if>
+ <if test="contractScore != null">#{contractScore},</if>
<if test="auditState != null">#{auditState},</if>
<if test="publish != null">#{publish},</if>
<if test="checkTime != null">#{checkTime},</if>
@@ -61,11 +61,11 @@
</insert>
<update id="updateDefaultResult" >
- update t_default_result
+ update t_contract_result
<trim prefix="SET" suffixOverrides=",">
<if test="unitId != null">unit_id = #{unitId},</if>
<if test="publishId != null">publish_id = #{publishId},</if>
- <if test="defaultScore != null">default_score = #{defaultScore},</if>
+ <if test="contractScore != null">default_score = #{contractScore},</if>
<if test="auditState != null">audit_state = #{auditState},</if>
<if test="publish != null">publish = #{publish},</if>
<if test="checkTime != null">check_time = #{checkTime},</if>
@@ -76,13 +76,13 @@
</update>
<delete id="deleteDefaultResultById">
- delete from t_default_result where id = #{id}
+ delete from t_contract_result where id = #{id}
</delete>
<delete id="deleteDefaultResultByIds" >
- delete from t_default_result where id in
+ delete from t_contract_result where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml
similarity index 92%
rename from ycl-server/src/main/resources/mapper/zgyw/DefaultScoreMapper.xml
rename to ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml
index 6e6c83d..523f5af 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/DefaultScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml
@@ -3,8 +3,8 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.DefaultScoreMapper">
-
- <resultMap type="com.ycl.platform.domain.entity.DefaultScore" id="DefaultScoreResult">
+
+ <resultMap type="com.ycl.platform.domain.entity.ContractScore" id="DefaultScoreResult">
<result property="id" column="id" />
<result property="publishId" column="publish_id" />
<result property="templateId" column="template_id" />
@@ -19,24 +19,24 @@
</resultMap>
<sql id="selectDefaultScoreVo">
- select id, publish_id, template_id, num, score, create_user, create_user_name, update_user, update_user_name, create_time, update_time from t_default_score
+ select id, publish_id, template_id, num, score, create_user, create_user_name, update_user, update_user_name, create_time, update_time from t_contract_score
</sql>
<select id="selectDefaultScoreList" resultMap="DefaultScoreResult">
<include refid="selectDefaultScoreVo"/>
- <where>
+ <where>
<if test="publishId != null "> and publish_id = #{publishId}</if>
<if test="templateId != null "> and template_id = #{templateId}</if>
</where>
</select>
-
+
<select id="selectDefaultScoreById" resultMap="DefaultScoreResult">
<include refid="selectDefaultScoreVo"/>
where id = #{id}
</select>
-
+
<insert id="insertDefaultScore" useGeneratedKeys="true" keyProperty="id">
- insert into t_default_score
+ insert into t_contract_score
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="publishId != null">publish_id,</if>
<if test="templateId != null">template_id,</if>
@@ -64,7 +64,7 @@
</insert>
<update id="updateDefaultScore">
- update t_default_score
+ update t_contract_score
<trim prefix="SET" suffixOverrides=",">
<if test="publishId != null">publish_id = #{publishId},</if>
<if test="templateId != null">template_id = #{templateId},</if>
@@ -81,13 +81,13 @@
</update>
<delete id="deleteDefaultScoreById">
- delete from t_default_score where id = #{id}
+ delete from t_contract_score where id = #{id}
</delete>
<delete id="deleteDefaultScoreByIds">
- delete from t_default_score where id in
+ delete from t_contract_score where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultRuleMapper.xml
deleted file mode 100644
index 795032e..0000000
--- a/ycl-server/src/main/resources/mapper/zgyw/DefaultRuleMapper.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.platform.mapper.DefaultRuleMapper">
-
- <resultMap type="com.ycl.platform.domain.entity.DefaultRule" id="DefaultRuleResult">
- <result property="id" column="id" />
- <result property="ruleName" column="rule_name" />
- <result property="parentId" column="parent_id" />
- <result property="deductCategory" column="deduct_category" />
- <result property="deductWay" column="deduct_way" />
- <result property="ruleDesc" column="rule_desc" />
- <result property="ruleStatus" column="rule_status" />
- <result property="createTime" column="create_time" />
- <result property="updateTime" column="update_time" />
- <result property="deleted" column="deleted" />
- </resultMap>
-
- <sql id="selectDefaultRuleVo">
- select id, rule_name, parent_id, deduct_category, deduct_way, rule_desc, rule_status, create_time, update_time, deleted from t_default_rule
- </sql>
-
- <select id="selectDefaultRuleList" resultMap="DefaultRuleResult">
- <include refid="selectDefaultRuleVo"/>
- <where>
- <if test="ruleName != null and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
- <if test="deductCategory != null "> and deduct_category = #{deductCategory}</if>
- <if test="ruleStatus != null and ruleStatus != ''"> and rule_status = #{ruleStatus}</if>
- </where>
- </select>
-
- <select id="selectDefaultRuleById" resultMap="DefaultRuleResult">
- <include refid="selectDefaultRuleVo"/>
- where id = #{id}
- </select>
-
- <insert id="insertDefaultRule" useGeneratedKeys="true" keyProperty="id">
- insert into t_default_rule
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ruleName != null and ruleName != ''">rule_name,</if>
- <if test="parentId != null">parent_id,</if>
- <if test="deductCategory != null">deduct_category,</if>
- <if test="deductWay != null">deduct_way,</if>
- <if test="ruleDesc != null">rule_desc,</if>
- <if test="ruleStatus != null">rule_status,</if>
- <if test="createTime != null">create_time,</if>
- <if test="updateTime != null">update_time,</if>
- <if test="deleted != null">deleted,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ruleName != null and ruleName != ''">#{ruleName},</if>
- <if test="parentId != null">#{parentId},</if>
- <if test="deductCategory != null">#{deductCategory},</if>
- <if test="deductWay != null">#{deductWay},</if>
- <if test="ruleDesc != null">#{ruleDesc},</if>
- <if test="ruleStatus != null">#{ruleStatus},</if>
- <if test="createTime != null">#{createTime},</if>
- <if test="updateTime != null">#{updateTime},</if>
- <if test="deleted != null">#{deleted},</if>
- </trim>
- </insert>
-
- <update id="updateDefaultRule" >
- update t_default_rule
- <trim prefix="SET" suffixOverrides=",">
- <if test="ruleName != null and ruleName != ''">rule_name = #{ruleName},</if>
- <if test="parentId != null">parent_id = #{parentId},</if>
- <if test="deductCategory != null">deduct_category = #{deductCategory},</if>
- <if test="deductWay != null">deduct_way = #{deductWay},</if>
- <if test="ruleDesc != null">rule_desc = #{ruleDesc},</if>
- <if test="ruleStatus != null">rule_status = #{ruleStatus},</if>
- <if test="createTime != null">create_time = #{createTime},</if>
- <if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="deleted != null">deleted = #{deleted},</if>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteDefaultRuleById" >
- delete from t_default_rule where id = #{id}
- </delete>
-
- <delete id="deleteDefaultRuleByIds" >
- delete from t_default_rule where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-</mapper>
\ No newline at end of file
--
Gitblit v1.8.0