表名修改

xiangpei

2024-04-23 ab4e150d41e0200b64a75c59b668a9385b7782fd

表名修改

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateMoneyRule.java

New file
@@ -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();
    }
}

 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();
    }
}

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractPublish.java

File was renamed from ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultPublish.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;
    }

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java

File was renamed from ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultResult.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;
    }

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java

File was renamed from ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultScore.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;
    }

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultRule.java

File was deleted

 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));
    }

    /**

 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));
    }

    /**

 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));
    }

    /**

 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));
    }

    /**

 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));
    }

    /**

 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 结果
     */

 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 结果
     */

 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 结果
     */

 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 结果
     */

 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 结果
     */

 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 结果
     */

 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 结果
     */

 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 结果
     */

 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 结果
     */

 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 结果
     */

 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 结果
     */

 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 结果
     */

 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 结果
     */

 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 结果
     */

 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 结果
     */

 ycl-server/src/main/java/com/ycl/websocket/NettyConfig.java

New file
@@ -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：xp
 * @date：2024/4/18 16:10
 */
public class NettyConfig {

    /**
     * 定义全局单利channel组 管理所有channel
     */
    private static volatile ChannelGroup channelGroup = null;


    /**
     * 存放请求ID与channel的对应关系
     */
    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);
    }

}

 ycl-server/src/main/resources/mapper/zgyw/CalculateMoneyRuleMapper.xml

New file
@@ -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>

 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>
</mapper>

 ycl-server/src/main/resources/mapper/zgyw/ContractPublishMapper.xml

File was renamed from ycl-server/src/main/resources/mapper/zgyw/DefaultPublishMapper.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>
</mapper>

 ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml

File was renamed from ycl-server/src/main/resources/mapper/zgyw/DefaultResultMapper.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>
</mapper>

 ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml

File was renamed from ycl-server/src/main/resources/mapper/zgyw/DefaultScoreMapper.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>
</mapper>

 ycl-server/src/main/resources/mapper/zgyw/DefaultRuleMapper.xml

File was deleted