Revert "新考核"

fuliqi

2024-04-02 32b4f6188f32e6c08e813efa98a25d94eacdc0c6

Revert "新考核"

This reverts commit d60aee1468e17e2deeb21a228791ad36ca535f3f.

 document/×Ô¹±ÏîÄ¿ÈÎÎñ·ÖÅä.xlsx

Binary files differ

 document/ÐèÇóÈ·ÈÏÊé3.27.docx

Binary files differ

 pom.xml

@@ -126,6 +126,12 @@
    </dependencyManagement>

    <dependencies>
        <!-- Activiti7 -->
        <dependency>
            <groupId>org.activiti</groupId>
            <artifactId>activiti-spring-boot-starter</artifactId>
            <version>7.0.0.GA</version>
        </dependency>
        <!-- jpa -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -142,10 +148,6 @@
            <version>${mybatis.spring.version}</version>
        </dependency>

        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-mongodb</artifactId>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
@@ -245,6 +247,7 @@

    <build>
        <plugins>

            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>

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

New file
@@ -0,0 +1,102 @@
package com.ycl.platform.domain.entity;


import annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.ycl.system.entity.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

import java.math.BigDecimal;

/**
 * æ ¸ç®—规则对象 t_accounting_rules
 *
 * @author gonghl
 * @date 2024-03-21
 */
public class AccountingRules extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * $column.columnComment
     */
    private Integer id;

    /**
     * è§„则名称
     */
    @Excel(name = "规则名称")
    private String rulesName;

    /**
     * åˆåŒåç§°
     */
    @Excel(name = "合同名称")
    private String contractName;

    /**
     * é‡‘额
     */
    @Excel(name = "金额")
    private BigDecimal amount;

    /**
     * é€»è¾‘删除
     */
    @TableLogic
    private String deleted;

    public void setId(Integer id) {
        this.id = id;
    }

    public Integer getId() {
        return id;
    }

    public void setRulesName(String rulesName) {
        this.rulesName = rulesName;
    }

    public String getRulesName() {
        return rulesName;
    }

    public void setContractName(String contractName) {
        this.contractName = contractName;
    }

    public String getContractName() {
        return contractName;
    }

    public void setAmount(BigDecimal amount) {
        this.amount = amount;
    }

    public BigDecimal getAmount() {
        return amount;
    }

    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("rulesName", getRulesName())
                .append("contractName", getContractName())
                .append("amount", getAmount())
                .append("createTime", getCreateTime())
                .append("updateTime", getUpdateTime())
                .append("deleted", getDeleted())
                .toString();
    }
}

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

File was deleted

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

File was deleted

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

@@ -1,140 +1,56 @@
package com.ycl.platform.domain.entity;

import annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.entity.BaseEntity;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDateTime;
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è€ƒæ ¸ç»“果对象 t_check_result
 * 
 * @author ruoyi
 * @date 2024-04-01
 * è€ƒæ ¸ç»“æžœ
 *
 * @author xp
 * @since 2024-03-07
 */
public class CheckResult extends BaseEntity
{
@Data
@Accessors(chain = true)
@TableName("t_check_result")
@ApiModel(value = "CheckResult对象", description = "考核结果")
public class CheckResult extends AbsEntity {

    private static final long serialVersionUID = 1L;

    /**  */
    private Long id;
    @ApiModelProperty("考核对象")
    @TableField("check_unit_id")
    private Integer checkUnitId;

    /** è€ƒæ ¸å¯¹è±¡ */
    @Excel(name = "考核对象")
    private Long deptId;
    @ApiModelProperty("考核发布")
    @TableField("check_publish_id")
    private Integer checkPublishId;

    /** è€ƒæ ¸å‘布 */
    @Excel(name = "考核发布")
    private Long publishId;

    /** è€ƒæ ¸ç±»åž‹ */
    @Excel(name = "考核类型")
    private Long examineCategory;

    /** è€ƒæ ¸åˆ†æ•° */
    @Excel(name = "考核分数")
    @ApiModelProperty("最终分数")
    @TableField("check_score")
    private BigDecimal checkScore;

    /** æ˜¯å¦å‘布 */
    @Excel(name = "是否发布")
    private Long publish;
    @ApiModelProperty("系统打分")
    @TableField("system_score")
    private BigDecimal systemScore;

    /** è€ƒæ ¸æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "考核时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date checkTime;
    @ApiModelProperty("人工打分")
    @TableField("manual_score")
    private BigDecimal manualScore;

    /** é€»è¾‘删除 */
    private String deleted;
    @ApiModelProperty("考核时间")
    @TableField("check_time")
    private LocalDateTime checkTime;

    public void setId(Long id) 
    {
        this.id = id;
    }
    @ApiModelProperty("是否发布")
    @TableField("publish")
    private Integer publish;

    public Long getId() 
    {
        return id;
    }
    public void setDeptId(Long deptId) 
    {
        this.deptId = deptId;
    }

    public Long getDeptId() 
    {
        return deptId;
    }
    public void setPublishId(Long publishId) 
    {
        this.publishId = publishId;
    }

    public Long getPublishId() 
    {
        return publishId;
    }
    public void setExamineCategory(Long examineCategory) 
    {
        this.examineCategory = examineCategory;
    }

    public Long getExamineCategory() 
    {
        return examineCategory;
    }
    public void setCheckScore(BigDecimal checkScore) 
    {
        this.checkScore = checkScore;
    }

    public BigDecimal getCheckScore() 
    {
        return checkScore;
    }
    public void setPublish(Long publish) 
    {
        this.publish = publish;
    }

    public Long getPublish() 
    {
        return publish;
    }
    public void setCheckTime(Date checkTime) 
    {
        this.checkTime = checkTime;
    }

    public Date getCheckTime() 
    {
        return checkTime;
    }
    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("deptId", getDeptId())
            .append("publishId", getPublishId())
            .append("examineCategory", getExamineCategory())
            .append("checkScore", getCheckScore())
            .append("publish", getPublish())
            .append("checkTime", getCheckTime())
            .append("updateTime", getUpdateTime())
            .append("deleted", getDeleted())
            .toString();
    }
}

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

@@ -1,150 +1,69 @@
package com.ycl.platform.domain.entity;

import annotation.Excel;
import com.ycl.system.entity.BaseEntity;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

import java.util.Date;

/**
 * è€ƒæ ¸è§„则对象 t_check_rule
 * 
 * @author ruoyi
 * @date 2024-04-01
 * è€ƒæ ¸è§„则
 *
 * @author xp
 * @since 2024-03-06
 */
public class CheckRule extends BaseEntity
{
@Data
@Accessors(chain = true)
@TableName("t_check_rule")
@ApiModel(value = "CheckRule对象", description = "考核规则")
public class CheckRule extends AbsEntity {

    private static final long serialVersionUID = 1L;

    /**  */
    private Long id;

    /** è§„则名称 */
    @Excel(name = "规则名称")
    @ApiModelProperty("规则名称")
    @TableField("rule_name")
    private String ruleName;

    /** è§„则细则 */
    @Excel(name = "规则细则")
    @ApiModelProperty("规则描述")
    @TableField("rule_detail")
    private String ruleDetail;

    /** è§„则类型 */
    @Excel(name = "规则类型")
    private Long ruleCategory;
    @ApiModelProperty("天网视频点位数")
    @TableField("video_point_num")
    private Integer videoPointNum;

    /** è€ƒæ ¸ç±»åž‹ */
    @Excel(name = "考核类型")
    private Long examineCategory;
    @ApiModelProperty("车辆卡口点位数")
    @TableField("vehicle_checkpoint_num")
    private Integer vehicleCheckpointNum;

    /** è§„则描述 */
    @Excel(name = "规则描述")
    private String ruleDescription;
    @ApiModelProperty("人脸卡口点位数")
    @TableField("face_chceckpoint_num")
    private Integer faceChceckpointNum;

    /** å®¡æ ¸çŠ¶æ€ */
    @Excel(name = "审核状态")
    private Long auditState;
    @ApiModelProperty("运维类别")
    @TableField("category")
    private Integer category;
    @ApiModelProperty("考核类别")
    @TableField("examine_category")
    private Integer examineCategory;

    /** å¯ç”¨çŠ¶æ€ */
    @Excel(name = "启用状态")
    private Long state;

    /** é€»è¾‘删除 */
    private String deleted;
    @ApiModelProperty("审核状态")
    @TableField("audit_state")
    private Integer auditState;
    @ApiModelProperty("审核人")
    @TableField("audit_user")
    private String auditUser;
    @ApiModelProperty("审核时间")
    @TableField("audit_time")
    private Date auditTime;
    @ApiModelProperty("审核意见")
    @TableField("audit_description")
    private String auditDescription;

    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 setRuleDetail(String ruleDetail) 
    {
        this.ruleDetail = ruleDetail;
    }

    public String getRuleDetail() 
    {
        return ruleDetail;
    }
    public void setRuleCategory(Long ruleCategory) 
    {
        this.ruleCategory = ruleCategory;
    }

    public Long getRuleCategory() 
    {
        return ruleCategory;
    }
    public void setExamineCategory(Long examineCategory) 
    {
        this.examineCategory = examineCategory;
    }

    public Long getExamineCategory() 
    {
        return examineCategory;
    }
    public void setRuleDescription(String ruleDescription) 
    {
        this.ruleDescription = ruleDescription;
    }

    public String getRuleDescription() 
    {
        return ruleDescription;
    }
    public void setAuditState(Long auditState) 
    {
        this.auditState = auditState;
    }

    public Long getAuditState() 
    {
        return auditState;
    }
    public void setState(Long state) 
    {
        this.state = state;
    }

    public Long getState() 
    {
        return state;
    }
    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("ruleDetail", getRuleDetail())
            .append("ruleCategory", getRuleCategory())
            .append("examineCategory", getExamineCategory())
            .append("ruleDescription", getRuleDescription())
            .append("auditState", getAuditState())
            .append("state", getState())
            .append("createTime", getCreateTime())
            .append("updateTime", getUpdateTime())
            .append("deleted", getDeleted())
            .toString();
    }
}

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

File was deleted

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

@@ -1,190 +1,55 @@
package com.ycl.platform.domain.entity;

import annotation.Excel;
import com.ycl.system.entity.BaseEntity;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

import java.math.BigDecimal;
import java.util.Date;

/**
 * è€ƒæ ¸æ¨¡æ¿å¯¹è±¡ t_check_template
 * 
 * @author ruoyi
 * @date 2024-04-01
 * è€ƒæ ¸æ¨¡æ¿
 *
 * @author xp
 * @since 2024-03-06
 */
public class CheckTemplate extends BaseEntity
{
@Data
@Accessors(chain = true)
@TableName("t_check_template")
@ApiModel(value = "CheckTemplate对象", description = "考核模板")
public class CheckTemplate extends AbsEntity {

    private static final long serialVersionUID = 1L;

    /**  */
    private Long id;

    /** æ¨¡æ¿åç§° */
    @Excel(name = "模板名称")
    /**
     * æ¨¡æ¿åç§°
     */
    @TableField("template_name")
    private String templateName;

    /** è°ƒæ•´ç³»æ•° */
    @Excel(name = "调整系数")
    private Long adjustCoefficient;
    @ApiModelProperty("调整系数")
    @TableField("adjust_coefficient")
    private BigDecimal adjustCoefficient;

    /** è°ƒæ•´æ–¹å¼ï¼šä¹˜é™¤ */
    @Excel(name = "调整方式：乘除")
    /**
     * è°ƒæ•´ç³»æ•°çš„方式：乘除
     */
    @TableField("adjust_way")
    private String adjustWay;

    /** è€ƒæ ¸ç±»åž‹ */
    @Excel(name = "考核类型")
    private Long examineCategory;

    /** å¯ç”¨/停用 */
    @Excel(name = "启用/停用")
    @ApiModelProperty("状态")
    @TableField("status")
    private String status;

    /** åŒºåŽ¿ */
    @Excel(name = "区县")
    private String deptId;
    @ApiModelProperty("单位id")
    @TableField("unit_id")
    private Integer unitId;

    /** åˆ›å»ºäººid */
    private Long createUser;

    /** åˆ›å»ºäººå§“名 */
    @Excel(name = "创建人姓名")
    private String createUserName;

    /**  */
    private Long updateUser;

    /**  */
    @Excel(name = "")
    private String updateUserName;

    /** é€»è¾‘删除 */
    private String deleted;

    public void setId(Long id) 
    {
        this.id = id;
    }

    public Long getId() 
    {
        return id;
    }
    public void setTemplateName(String templateName) 
    {
        this.templateName = templateName;
    }

    public String getTemplateName() 
    {
        return templateName;
    }
    public void setAdjustCoefficient(Long adjustCoefficient) 
    {
        this.adjustCoefficient = adjustCoefficient;
    }

    public Long getAdjustCoefficient() 
    {
        return adjustCoefficient;
    }
    public void setAdjustWay(String adjustWay) 
    {
        this.adjustWay = adjustWay;
    }

    public String getAdjustWay() 
    {
        return adjustWay;
    }
    public void setExamineCategory(Long examineCategory) 
    {
        this.examineCategory = examineCategory;
    }

    public Long getExamineCategory() 
    {
        return examineCategory;
    }
    public void setStatus(String status) 
    {
        this.status = status;
    }

    public String getStatus() 
    {
        return status;
    }
    public void setDeptId(String deptId) 
    {
        this.deptId = deptId;
    }

    public String getDeptId() 
    {
        return deptId;
    }
    public void setCreateUser(Long createUser) 
    {
        this.createUser = createUser;
    }

    public Long getCreateUser() 
    {
        return createUser;
    }
    public void setCreateUserName(String createUserName) 
    {
        this.createUserName = createUserName;
    }

    public String getCreateUserName() 
    {
        return createUserName;
    }
    public void setUpdateUser(Long updateUser) 
    {
        this.updateUser = updateUser;
    }

    public Long getUpdateUser() 
    {
        return updateUser;
    }
    public void setUpdateUserName(String updateUserName) 
    {
        this.updateUserName = updateUserName;
    }

    public String getUpdateUserName() 
    {
        return updateUserName;
    }
    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("templateName", getTemplateName())
            .append("adjustCoefficient", getAdjustCoefficient())
            .append("adjustWay", getAdjustWay())
            .append("examineCategory", getExamineCategory())
            .append("status", getStatus())
            .append("deptId", getDeptId())
            .append("createTime", getCreateTime())
            .append("updateTime", getUpdateTime())
            .append("createUser", getCreateUser())
            .append("createUserName", getCreateUserName())
            .append("updateUser", getUpdateUser())
            .append("updateUserName", getUpdateUserName())
            .append("deleted", getDeleted())
            .toString();
    }
    @ApiModelProperty("考核类型")
    @TableField("examine_category")
    private String examineCategory;
}

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

@@ -1,109 +1,44 @@
package com.ycl.platform.domain.entity;

import annotation.Excel;
import com.ycl.system.entity.BaseEntity;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.experimental.Accessors;

import java.math.BigDecimal;

/**
 * è€ƒæ ¸æ¨¡æ¿-规则中间对象 t_check_template_rule
 * 
 * @author ruoyi
 * @date 2024-04-01
 * @author：xp
 * @date：2024/3/8 9:18
 */
public class CheckTemplateRule extends BaseEntity
{
    private static final long serialVersionUID = 1L;
@Data
@Accessors(chain = true)
@TableName("t_check_template_rule")
@ApiModel(value = "CheckTemplate对象", description = "考核模板")
public class CheckTemplateRule {

    /**  */
    private Long id;
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /** è€ƒæ ¸æ¨¡æ¿ */
    @Excel(name = "考核模板")
    private Long checkTemplateId;
    /**
     * æ¨¡æ¿ID
     */
    @TableField("check_template_id")
    private Integer checkTemplateId;

    /** è€ƒæ ¸è§„则 */
    @Excel(name = "考核规则")
    private Long checkRuleId;
    /**
     * è§„则ID
     */
    @TableField("check_rule_id")
    private Integer checkRuleId;

    /** è§„则权重 */
    @Excel(name = "规则权重")
    /**
     * æƒé‡
     */
    @TableField("weight")
    private BigDecimal weight;

    /** æ»¡åˆ† */
    @Excel(name = "满分")
    private BigDecimal maxScore;

    /** å®¡æ ¸çŠ¶æ€ */
    @Excel(name = "审核状态")
    private Long auditState;

    public void setId(Long id) 
    {
        this.id = id;
    }

    public Long getId() 
    {
        return id;
    }
    public void setCheckTemplateId(Long checkTemplateId) 
    {
        this.checkTemplateId = checkTemplateId;
    }

    public Long getCheckTemplateId() 
    {
        return checkTemplateId;
    }
    public void setCheckRuleId(Long checkRuleId) 
    {
        this.checkRuleId = checkRuleId;
    }

    public Long getCheckRuleId() 
    {
        return checkRuleId;
    }
    public void setWeight(BigDecimal weight) 
    {
        this.weight = weight;
    }

    public BigDecimal getWeight() 
    {
        return weight;
    }
    public void setMaxScore(BigDecimal maxScore) 
    {
        this.maxScore = maxScore;
    }

    public BigDecimal getMaxScore() 
    {
        return maxScore;
    }
    public void setAuditState(Long auditState) 
    {
        this.auditState = auditState;
    }

    public Long getAuditState() 
    {
        return auditState;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("checkTemplateId", getCheckTemplateId())
            .append("checkRuleId", getCheckRuleId())
            .append("weight", getWeight())
            .append("maxScore", getMaxScore())
            .append("auditState", getAuditState())
            .toString();
    }
}

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

New file
@@ -0,0 +1,57 @@
package com.ycl.platform.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è¿è§„审核
 *
 * @author xp
 * @since 2024-03-05
 */
@Data
@Accessors(chain = true)
@TableName("t_default_auditing")
@ApiModel(value = "DefaultAuditing对象", description = "违规审核")
public class DefaultAuditing extends AbsEntity {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("违规")
    @TableField("default_id")
    private Integer defaultId;

    @TableField("score")
    private BigDecimal score;

    @TableField("check_publish_id")
    private Integer checkPublishId;

    @ApiModelProperty("审核状态")
    @TableField("auditing_status")
    private String auditingStatus;

    @ApiModelProperty("审核说明")
    @TableField("remark")
    private String remark;

    @ApiModelProperty("审核时间")
    @TableField("auditing_time")
    private LocalDateTime auditingTime;

    @ApiModelProperty("审核人")
    @TableField("auditing_user")
    private Integer auditingUser;

    @ApiModelProperty("创建人")
    @TableField("create_by")
    private String createBy;
}

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

File was deleted

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

File was deleted

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

@@ -1,122 +1,43 @@
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 com.ycl.platform.base.AbsEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.ycl.platform.base.AbsEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è¿çº¦è§„则对象 t_default_rule
 * 
 * @author ruoyi
 * @date 2024-04-01
 * è¿çº¦è§„则
 *
 * @author xp
 * @since 2024-03-05
 */
public class DefaultRule extends TreeEntity
{
@Data
@Accessors(chain = true)
@TableName("t_default_rule")
@ApiModel(value = "DefaultRule对象", description = "违约规则")
public class DefaultRule extends AbsEntity {

    private static final long serialVersionUID = 1L;

    /** ä¸»é”® */
    private Long id;

    /** è§„则名称 */
    @Excel(name = "规则名称")
    @ApiModelProperty("规则名称")
    @TableField("rule_name")
    private String ruleName;

    /** æ‰£å‡æ–¹å¼ */
    @Excel(name = "扣减方式")
    private Long deductCategory;
    @ApiModelProperty("规则详情JSON")
    @TableField("rule_detail")
    private String ruleDetail;

    /** äººå·¥æ‰“分/系统打分 */
    private Long deductWay;

    /** è§„则描述 */
    @Excel(name = "规则描述")
    @ApiModelProperty("规则描述")
    @TableField("rule_desc")
    private String ruleDesc;

    /** è§„则状态 */
    @Excel(name = "规则状态")
    @ApiModelProperty("规则状态：启用、未启用")
    @TableField("rule_status")
    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();
    }
}

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

File was deleted

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

File was deleted

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

File was deleted

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

New file
@@ -0,0 +1,229 @@
package com.ycl.platform.domain.entity;

import annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.entity.BaseEntity;
import lombok.Data;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;

import java.math.BigDecimal;
import java.util.Date;

/**
 * è€ƒæ ¸å‘布对象 t_check_publish
 * 
 * @author ruoyi
 * @date 2024-03-07
 */
@Data
public class TCheckPublish extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** ä¸»é”® */
    private Long id;

    /** è€ƒæ ¸å */
    @Excel(name = "考核名")
    private String examineName;

    /** è€ƒæ ¸æ¨¡æ¿id */
    @Excel(name = "考核模板id")
    private Long templateId;

    /** è€ƒæ ¸èŒƒå›´ 1/2 åˆ†å±€/市局 */
    @Excel(name = "考核范围 1/2 åˆ†å±€/市局")
    private Long examineRange;

    /** è€ƒæ ¸é¢‘率 1/2 æœˆåº¦è€ƒæ ¸/季度考核 */
    @Excel(name = "考核频率 1/2 æœˆåº¦è€ƒæ ¸/季度考核")
    private Long frequency;

    /** è€ƒæ ¸çŠ¶æ€ 0/1 å¯ç”¨ / åœç”¨ */
    @Excel(name = "考核状态 0/1 å¯ç”¨ / åœç”¨")
    private Long state;

    /** æŠ¥è­¦åˆ†æ•°é˜ˆå€¼ */
    @Excel(name = "报警分数阈值")
    private BigDecimal alarmScore;

    private Long createUser;
    @Excel(name = "创建人")
    private String createUserName;
    @Excel(name = "修改人")
    private String updateUserName;

    private Long updateUser;
    /** å®¡æ ¸çŠ¶æ€ */
    private Short auditState;
    @Excel(name = "审核人")
    private String auditUser;
    @Excel(name = "审核时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date auditTime;
    @Excel(name  = "审核意见")
    private String auditDescription;
    /** æè¿° */
    @Excel(name = "描述")
    private String description;

    public String getAuditUser() {
        return auditUser;
    }

    public void setAuditUser(String auditUser) {
        this.auditUser = auditUser;
    }

    public Date getAuditTime() {
        return auditTime;
    }

    public void setAuditTime(Date auditTime) {
        this.auditTime = auditTime;
    }

    public String getAuditDescription() {
        return auditDescription;
    }

    public void setAuditDescription(String auditDescription) {
        this.auditDescription = auditDescription;
    }

    public Short getAuditState() {
        return auditState;
    }

    public void setAuditState(Short auditState) {
        this.auditState = auditState;
    }

    public String getExamineName() {
        return examineName;
    }

    public void setExamineName(String examineName) {
        this.examineName = examineName;
    }

    public BigDecimal getAlarmScore() {
        return alarmScore;
    }

    public void setAlarmScore(BigDecimal alarmScore) {
        this.alarmScore = alarmScore;
    }

    public void setId(Long id)
    {
        this.id = id;
    }

    public Long getId() 
    {
        return id;
    }
    public void setTemplateId(Long templateId) 
    {
        this.templateId = templateId;
    }

    public Long getTemplateId() 
    {
        return templateId;
    }

    public Long getExamineRange() {
        return examineRange;
    }

    public void setExamineRange(Long examineRange) {
        this.examineRange = examineRange;
    }

    public String getCreateUserName() {
        return createUserName;
    }

    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }

    public String getUpdateUserName() {
        return updateUserName;
    }

    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }

    public void setFrequency(Long frequency)
    {
        this.frequency = frequency;
    }

    public Long getFrequency() 
    {
        return frequency;
    }
    public void setState(Long state) 
    {
        this.state = state;
    }

    public Long getState() 
    {
        return state;
    }
    public void setCreateUser(Long createUser) 
    {
        this.createUser = createUser;
    }

    public Long getCreateUser() 
    {
        return createUser;
    }
    public void setUpdateUser(Long updateUser) 
    {
        this.updateUser = updateUser;
    }

    public Long getUpdateUser() 
    {
        return updateUser;
    }
    public void setDescription(String description) 
    {
        this.description = description;
    }

    public String getDescription() 
    {
        return description;
    }

    @Override
    public String toString() {
        return "TCheckPublish{" +
                "id=" + id +
                ", examineName='" + examineName + '\'' +
                ", templateId=" + templateId +
                ", examineRange=" + examineRange +
                ", frequency=" + frequency +
                ", state=" + state +
                ", alarmScore=" + alarmScore +
                ", createUser=" + createUser +
                ", createUserName='" + createUserName + '\'' +
                ", updateUserName='" + updateUserName + '\'' +
                ", updateUser=" + updateUser +
                ", auditState=" + auditState +
                ", auditUser='" + auditUser + '\'' +
                ", auditTime=" + auditTime +
                ", auditDescription='" + auditDescription + '\'' +
                ", description='" + description + '\'' +
                '}';
    }
}

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

New file
@@ -0,0 +1,104 @@
package com.ycl.platform.domain.entity;

import annotation.Excel;
import com.ycl.system.entity.BaseEntity;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;

import java.math.BigDecimal;

/**
 * è€ƒæ ¸è®¡åˆ†å¯¹è±¡ t_examine_score
 * 
 * @author ruoyi
 * @date 2024-03-13
 */
public class TExamineScore extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** $column.columnComment */
    private Long id;

    /** åˆ†å€¼ */
    @Excel(name = "分值")
    private BigDecimal score;

    /** å•ä½id */
    @Excel(name = "单位id")
    private Long unitId;

    /** è€ƒæ ¸id */
    @Excel(name = "考核id")
    private Long examineId;

    @Excel(name = "考核类型")
    private Long examineCategory;
    @Excel(name = "规则类型")
    private Long ruleCategory;

    public Long getRuleCategory() {
        return ruleCategory;
    }

    public void setRuleCategory(Long ruleCategory) {
        this.ruleCategory = ruleCategory;
    }

    public Long getExamineCategory() {
        return examineCategory;
    }

    public void setExamineCategory(Long examineCategory) {
        this.examineCategory = examineCategory;
    }

    public void setId(Long id)
    {
        this.id = id;
    }

    public Long getId() 
    {
        return id;
    }
    public void setScore(BigDecimal score) 
    {
        this.score = score;
    }

    public BigDecimal getScore() 
    {
        return score;
    }
    public void setUnitId(Long unitId) 
    {
        this.unitId = unitId;
    }

    public Long getUnitId() 
    {
        return unitId;
    }
    public void setExamineId(Long examineId) 
    {
        this.examineId = examineId;
    }

    public Long getExamineId() 
    {
        return examineId;
    }

    @Override
    public String toString() {
        return "TExamineScore{" +
                "id=" + id +
                ", score=" + score +
                ", unitId=" + unitId +
                ", examineId=" + examineId +
                ", examineCategory=" + examineCategory +
                ", ruleCategory=" + ruleCategory +
                '}';
    }
}

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java

New file
@@ -0,0 +1,65 @@
package com.ycl.platform.domain.form;

import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.CheckResult;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import org.springframework.lang.NonNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è€ƒæ ¸ç»“果表单
 *
 * @author xp
 * @since 2024-03-07
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "CheckResult表单", description = "考核结果表单")
public class CheckResultForm extends AbsForm {

    @NotNull(message = "考核对象不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("考核对象")
    private Integer checkUnitId;

    @NotNull(message = "考核发布不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("考核发布")
    private Integer checkPublishId;

    @NotNull(message = "最终分数不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("最终分数")
    private BigDecimal checkScore;

    @NotNull(message = "系统打分不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("系统打分")
    private BigDecimal systemScore;

    @NotNull(message = "人工打分不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("人工打分")
    private BigDecimal manualScore;

    @NotNull(message = "考核时间不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("考核时间")
    private LocalDateTime checkTime;

    @ApiModelProperty("是否发布")
    private Integer publish;

    public static CheckResult getEntityByForm(@NonNull CheckResultForm form, CheckResult entity) {
        if(entity == null) {
          entity = new CheckResult();
        }
        BeanUtils.copyProperties(form, entity);
        return entity;
    }

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckRuleForm.java

New file
@@ -0,0 +1,56 @@
package com.ycl.platform.domain.form;

import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.CheckRule;
import java.time.LocalDateTime;
import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import org.springframework.lang.NonNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è€ƒæ ¸è§„则表单
 *
 * @author xp
 * @since 2024-03-06
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "CheckRule表单", description = "考核规则表单")
public class CheckRuleForm extends AbsForm {

    @NotBlank(message = "规则名称不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("规则名称")
    private String ruleName;

    @NotBlank(message = "规则描述不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("规则描述")
    private String ruleDetail;

    @NotNull(message = "天网视频点位数不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("天网视频点位数")
    private Integer videoPointNum;

    @NotNull(message = "车辆卡口点位数不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("车辆卡口点位数")
    private Integer vehicleCheckpointNum;

    @NotNull(message = "人脸卡口点位数不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("人脸卡口点位数")
    private Integer faceChceckpointNum;

    public static CheckRule getEntityByForm(@NonNull CheckRuleForm form, CheckRule entity) {
        if(entity == null) {
          entity = new CheckRule();
        }
        BeanUtils.copyProperties(form, entity);
        return entity;
    }

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java

New file
@@ -0,0 +1,62 @@
package com.ycl.platform.domain.form;

import com.ycl.platform.domain.vo.RuleItemVO;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.CheckTemplate;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;

import jakarta.validation.constraints.NotEmpty;
import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import org.springframework.lang.NonNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è€ƒæ ¸æ¨¡æ¿è¡¨å•
 *
 * @author xp
 * @since 2024-03-06
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "CheckTemplate表单", description = "考核模板表单")
public class CheckTemplateForm extends AbsForm {

    @NotNull(message = "模板名称不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("模板名称")
    private String templateName;

    @NotNull(message = "调整系数不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("调整系数")
    private BigDecimal adjustCoefficient;

    @NotNull(message = "调整系数计算方式不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("调整系数计算方式")
    private String adjustWay;

    @NotBlank(message = "状态不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("状态")
    private String status;

    @NotEmpty(message = "考核规则不能为空")
    @ApiModelProperty("考核规则")
    private List<RuleItemVO> ruleFormList;

    public static CheckTemplate getEntityByForm(@NonNull CheckTemplateForm form, CheckTemplate entity) {
        if(entity == null) {
          entity = new CheckTemplate();
        }
        BeanUtils.copyProperties(form, entity);
        return entity;
    }

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditForm.java

New file
@@ -0,0 +1,27 @@
package com.ycl.platform.domain.form;

import com.ycl.platform.base.AbsForm;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;

/**
 * è¿çº¦å®¡æ ¸è¡¨å•
 *
 * @author：xp
 * @date：2024/3/6 8:59
 */
@Data
public class DefaultAuditForm extends AbsForm {

    /**
     * å®¡æ ¸ç»“æžœ
     */
    @NotBlank(message = "审核结果不能为空")
    private String auditingResult;

    /**
     * å®¡æ ¸è¯´æ˜Ž
     */
    private String remark;

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditingForm.java

New file
@@ -0,0 +1,56 @@
package com.ycl.platform.domain.form;

import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.DefaultAuditing;
import java.time.LocalDateTime;
import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import org.springframework.lang.NonNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è¿è§„审核表单
 *
 * @author xp
 * @since 2024-03-05
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "DefaultAuditing表单", description = "违规审核表单")
public class DefaultAuditingForm extends AbsForm {

    @NotNull(message = "违规不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("违规")
    private Integer defaultId;

    @NotBlank(message = "审核状态不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("审核状态")
    private String auditingStatus;

    @NotBlank(message = "审核说明不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("审核说明")
    private String remark;

    @NotNull(message = "审核时间不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("审核时间")
    private LocalDateTime auditingTime;

    @NotNull(message = "审核人不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("审核人")
    private Integer auditingUser;

    public static DefaultAuditing getEntityByForm(@NonNull DefaultAuditingForm form, DefaultAuditing entity) {
        if(entity == null) {
          entity = new DefaultAuditing();
        }
        BeanUtils.copyProperties(form, entity);
        return entity;
    }

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleForm.java

New file
@@ -0,0 +1,47 @@
package com.ycl.platform.domain.form;

import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.DefaultRule;
import java.time.LocalDateTime;
import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import org.springframework.lang.NonNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è¿çº¦è§„则表单
 *
 * @author xp
 * @since 2024-03-05
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "DefaultRule表单", description = "违约规则表单")
public class DefaultRuleForm extends AbsForm {

    @NotBlank(message = "规则名称不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("规则名称")
    private String ruleName;

    @NotBlank(message = "规则设置不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("规则详情JSON")
    private String ruleDetail;

    @ApiModelProperty("规则描述")
    private String ruleDesc;

    public static DefaultRule getEntityByForm(@NonNull DefaultRuleForm form, DefaultRule entity) {
        if(entity == null) {
          entity = new DefaultRule();
        }
        BeanUtils.copyProperties(form, entity);
        return entity;
    }

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleSetForm.java

New file
@@ -0,0 +1,22 @@
package com.ycl.platform.domain.form;

import lombok.Data;

/**
 * å¯ç”¨åœç”¨-违约规则
 *
 * @author：xp
 * @date：2024/3/6 11:16
 */
@Data
public class DefaultRuleSetForm {

    private Integer id;

    /**
     * true å¯ç”¨
     * false åœç”¨
     */
    private Boolean flag;

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/ManualScoreForm.java

New file
@@ -0,0 +1,41 @@
package com.ycl.platform.domain.form;

import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.CheckResult;
import com.ycl.system.domain.group.Add;
import com.ycl.system.domain.group.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.beans.BeanUtils;
import org.springframework.lang.NonNull;

import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
 * äººå·¥æ‰“分表单
 *
 * @author xp
 * @since 2024-03-07
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "CheckResult表单", description = "人工打分表单")
public class ManualScoreForm extends AbsForm {

    @NotNull(message = "人工打分不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("人工打分")
    private BigDecimal manualScore;

    public static CheckResult getEntityByForm(@NonNull ManualScoreForm form, CheckResult entity) {
        if(entity == null) {
          entity = new CheckResult();
        }
        BeanUtils.copyProperties(form, entity);
        return entity;
    }

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckResultQuery.java

New file
@@ -0,0 +1,60 @@
package com.ycl.platform.domain.query;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;

import java.util.Date;
import java.util.List;
import java.util.Objects;

import org.springframework.lang.NonNull;
import jakarta.validation.constraints.NotBlank;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import utils.DateUtils;

/**
 * è€ƒæ ¸ç»“果查询
 *
 * @author xp
 * @since 2024-03-07
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "CheckResult查询", description = "考核结果查询")
public class CheckResultQuery extends AbsQuery {

    /**
     * è€ƒæ ¸å¯¹è±¡
     */
    private String checkUnitName;

    /**
     * è€ƒæ ¸é¢‘率
     */
    private String frequency;

    /**
     * è€ƒæ ¸èŒƒå›´
     */
    private String examineRange;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date start;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date end;

    public void setTime() {
        if (Objects.nonNull(start)) {
            start = DateUtils.getDayStart(start);
        }
        if (Objects.nonNull(end)) {
            end = DateUtils.getDayEnd(end);
        }
    }

}


 ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java

New file
@@ -0,0 +1,46 @@
package com.ycl.platform.domain.query;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;

import java.util.Date;
import java.util.List;
import org.springframework.lang.NonNull;
import jakarta.validation.constraints.NotBlank;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è€ƒæ ¸è§„则查询
 *
 * @author xp
 * @since 2024-03-06
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "CheckRule查询", description = "考核规则查询")
public class CheckRuleQuery extends AbsQuery {

    /**
     * è§„则名称
     */
    private String ruleName;

    /**
     * å¼€å§‹æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date start;

    /**
     * ç»“束时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date end;

    /** å®¡æ ¸çŠ¶æ€ */
    private Integer auditState;
}


 ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java

New file
@@ -0,0 +1,43 @@
package com.ycl.platform.domain.query;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;

import java.util.Date;
import java.util.List;
import org.springframework.lang.NonNull;
import jakarta.validation.constraints.NotBlank;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è€ƒæ ¸æ¨¡æ¿æŸ¥è¯¢
 *
 * @author xp
 * @since 2024-03-06
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "CheckTemplate查询", description = "考核模板查询")
public class CheckTemplateQuery extends AbsQuery {

    /**
     * æ¨¡æ¿åç§°
     */
    private String templateName;

    /**
     * çŠ¶æ€
     */
    private String status;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date start;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date end;

}


 ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultAuditingQuery.java

New file
@@ -0,0 +1,69 @@
package com.ycl.platform.domain.query;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;

import java.util.Date;
import java.util.List;
import java.util.Objects;

import org.springframework.lang.NonNull;
import jakarta.validation.constraints.NotBlank;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import utils.DateUtils;

/**
 * è¿è§„审核查询
 *
 * @author xp
 * @since 2024-03-05
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "DefaultAuditing查询", description = "违规审核查询")
public class DefaultAuditingQuery extends AbsQuery {

    /**
     * è¿è§„单位
     */
    private Integer unitId;

    /**
     * å®¡æ ¸æ—¶é—´èŒƒå›´
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date auditingStartTime;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date auditingEndTime;

    /**
     * åˆ›å»ºæ—¶é—´èŒƒå›´
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createStartTime;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createEndTime;

    /**
     * è®¾ç½®æ—¶é—´ï¼Œä½¿å…¶åŒ…含今天
     */
    public void setTime() {
        if (Objects.nonNull(auditingStartTime)) {
            auditingStartTime = DateUtils.getDayStart(auditingStartTime);
        }
        if (Objects.nonNull(auditingEndTime)) {
            auditingEndTime = DateUtils.getDayEnd(auditingEndTime);
        }
        if (Objects.nonNull(createStartTime)) {
            createStartTime = DateUtils.getDayStart(createStartTime);
        }
        if (Objects.nonNull(createEndTime)) {
            createEndTime = DateUtils.getDayEnd(createEndTime);
        }
    }

}


 ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultRuleQuery.java

New file
@@ -0,0 +1,44 @@
package com.ycl.platform.domain.query;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;

import java.util.Date;
import java.util.List;
import org.springframework.lang.NonNull;
import jakarta.validation.constraints.NotBlank;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è¿çº¦è§„则查询
 *
 * @author xp
 * @since 2024-03-05
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "DefaultRule查询", description = "违约规则查询")
public class DefaultRuleQuery extends AbsQuery {

    /**
     * è§„则名称
     */
    private String ruleName;

    /**
     * å¼€å§‹æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date start;

    /**
     * ç»“束时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date end;

}


 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java

New file
@@ -0,0 +1,64 @@
package com.ycl.platform.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.CheckResult;

import java.math.BigDecimal;
import java.util.List;
import java.time.LocalDateTime;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è€ƒæ ¸ç»“果展示
 *
 * @author xp
 * @since 2024-03-07
 */
@Data
@Accessors(chain = true)
public class CheckResultVO extends AbsVo {

    /** è€ƒæ ¸å¯¹è±¡ */
    private Integer checkUnitId;
    private String checkUnitName;

    /** è€ƒæ ¸ */
    private String examineName;

    /** è€ƒæ ¸é¢‘率 */
    private String frequency;

    /** è€ƒæ ¸èŒƒå›´ */
    private String examineRange;

    /** æœ€ç»ˆåˆ†æ•° */
    private BigDecimal checkScore;

    /** ç³»ç»Ÿæ‰“分 */
    private BigDecimal systemScore;

    /** äººå·¥æ‰“分 */
    private BigDecimal manualScore;

    /** è€ƒæ ¸æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime checkTime;

    /** æ˜¯å¦å‘布 */
    private Integer publish;

    public static CheckResultVO getVoByEntity(@NonNull CheckResult entity, CheckResultVO vo) {
        if(vo == null) {
            vo = new CheckResultVO();
        }
        BeanUtils.copyProperties(entity, vo);
        return vo;
    }

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java

New file
@@ -0,0 +1,62 @@
package com.ycl.platform.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.CheckRule;

import java.util.Date;
import java.util.List;
import java.time.LocalDateTime;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è€ƒæ ¸è§„则展示
 *
 * @author xp
 * @since 2024-03-06
 */
@Data
@Accessors(chain = true)
public class CheckRuleVO extends AbsVo {

    /** è§„则名称 */
    private String ruleName;

    /** è§„则描述 */
    private String ruleDetail;

    /** å¤©ç½‘视频点位数 */
    private Integer videoPointNum;

    /** è½¦è¾†å¡å£ç‚¹ä½æ•° */
    private Integer vehicleCheckpointNum;

    /** äººè„¸å¡å£ç‚¹ä½æ•° */
    private Integer faceChceckpointNum;

    private Integer category;
    private Integer examineCategory;
    /** å®¡æ ¸çŠ¶æ€ */
    private Integer auditState;
    /** å®¡æ ¸äºº */
    private String auditUser;
    /** å®¡æ ¸æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date auditTime;
    /** å®¡æ ¸æ„è§ */
    private String auditDescription;
    public static CheckRuleVO getVoByEntity(@NonNull CheckRule entity, CheckRuleVO vo) {
        if(vo == null) {
            vo = new CheckRuleVO();
        }
        BeanUtils.copyProperties(entity, vo);
        return vo;
    }

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java

New file
@@ -0,0 +1,58 @@
package com.ycl.platform.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.CheckTemplate;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.time.LocalDateTime;

import com.ycl.platform.domain.form.CheckTemplateForm;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è€ƒæ ¸æ¨¡æ¿å±•ç¤º
 *
 * @author xp
 * @since 2024-03-06
 */
@Data
@Accessors(chain = true)
public class CheckTemplateVO extends AbsVo {

    /** æ¨¡æ¿åç§° */
    private String templateName;

    /** è°ƒæ•´ç³»æ•° */
    private BigDecimal adjustCoefficient;

    /** è°ƒæ•´ç³»æ•°çš„方式：乘除 */
    private String adjustWay;

    /** çŠ¶æ€ */
    private String status;

    /** è§„则列表 */
    private List<RuleItemVO> ruleFormList;
    /** å•ä½å */
    private String unitName;
    private Integer unitId;
    /** è€ƒæ ¸ç±»åž‹ */
    private String examineCategory;

    public static CheckTemplateVO getVoByEntity(@NonNull CheckTemplate entity, CheckTemplateVO vo) {
        if(vo == null) {
            vo = new CheckTemplateVO();
        }
        BeanUtils.copyProperties(entity, vo);
        return vo;
    }

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java

New file
@@ -0,0 +1,70 @@
package com.ycl.platform.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.DefaultAuditing;

import java.math.BigDecimal;
import java.util.List;
import java.time.LocalDateTime;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è¿è§„审核展示
 *
 * @author xp
 * @since 2024-03-05
 */
@Data
@Accessors(chain = true)
public class DefaultAuditingVO extends AbsVo {

    /** è¿è§„ */
    private Integer defaultId;

    /** è¿è§„扣分 */
    private BigDecimal score;

    /** è€ƒæ ¸å‘布ID */
    private Integer checkPublishId;

    /**
     * è¿çº¦è§„则名
     */
    private String defaultRuleName;

    /**
     * è¿çº¦è¿ç»´å•ä½
     */
    private String unitName;

    /** å®¡æ ¸çŠ¶æ€ */
    private String auditingStatus;

    /** å®¡æ ¸è¯´æ˜Ž */
    private String remark;

    /** å®¡æ ¸æ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime auditingTime;

    /** å®¡æ ¸äºº */
    private Integer auditingUser;
    private String auditingUserName;

    private String createBy;
    public static DefaultAuditingVO getVoByEntity(@NonNull DefaultAuditing entity, DefaultAuditingVO vo) {
        if(vo == null) {
            vo = new DefaultAuditingVO();
        }
        BeanUtils.copyProperties(entity, vo);
        return vo;
    }

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultRuleVO.java

New file
@@ -0,0 +1,44 @@
package com.ycl.platform.domain.vo;

import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.DefaultRule;
import java.util.List;
import java.time.LocalDateTime;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

/**
 * è¿çº¦è§„则展示
 *
 * @author xp
 * @since 2024-03-05
 */
@Data
@Accessors(chain = true)
public class DefaultRuleVO extends AbsVo {

    /** è§„则名称 */
    private String ruleName;

    /** è§„则详情JSON */
    private String ruleDetail;

    /** è§„则描述 */
    private String ruleDesc;

    /** è§„则状态：启用、未启用 */
    private String ruleStatus;

    public static DefaultRuleVO getVoByEntity(@NonNull DefaultRule entity, DefaultRuleVO vo) {
        if(vo == null) {
            vo = new DefaultRuleVO();
        }
        BeanUtils.copyProperties(entity, vo);
        return vo;
    }

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/Rule.java

New file
@@ -0,0 +1,18 @@
package com.ycl.platform.domain.vo;

import lombok.Data;

/**
 * @author：xp
 * @date：2024/3/6 10:49
 */
@Data
public class Rule {

    /** è¶…时未处理工单数 */
    private Integer overTime;

    /** å·¥å•å¤„理失败数 */
    private Integer failNum;

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/RuleItemVO.java

New file
@@ -0,0 +1,24 @@
package com.ycl.platform.domain.vo;

import lombok.Data;

import java.math.BigDecimal;

/**
 * @author：xp
 * @date：2024/3/7 9:24
 */
@Data
public class RuleItemVO {

    /**
     * è§„则
     */
    private Integer ruleId;

    /**
     * æƒé‡
     */
    private BigDecimal weight;

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TExamineScoreVO.java

New file
@@ -0,0 +1,124 @@
package com.ycl.platform.domain.vo;

import annotation.Excel;
import com.ycl.system.entity.BaseEntity;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;

import java.math.BigDecimal;

/**
 * è€ƒæ ¸è®¡åˆ†å¯¹è±¡ t_examine_score
 * 
 * @author ruoyi
 * @date 2024-03-13
 */
public class TExamineScoreVO extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** $column.columnComment */
    private Long id;

    /** åˆ†å€¼ */
    @Excel(name = "分值")
    private BigDecimal score;

    /** å•ä½id */
    @Excel(name = "单位id")
    private Long unitId;

    /** è€ƒæ ¸id */
    @Excel(name = "考核id")
    private Long examineId;

    private String examineCategory;
    private String ruleCategory;

    private String unitName;

    private String examineName;

    public String getRuleCategory() {
        return ruleCategory;
    }

    public void setRuleCategory(String ruleCategory) {
        this.ruleCategory = ruleCategory;
    }

    public String getUnitName() {
        return unitName;
    }

    public void setUnitName(String unitName) {
        this.unitName = unitName;
    }

    public String getExamineName() {
        return examineName;
    }

    public void setExamineName(String examineName) {
        this.examineName = examineName;
    }

    public void setId(Long id)
    {
        this.id = id;
    }

    public Long getId() 
    {
        return id;
    }
    public void setScore(BigDecimal score) 
    {
        this.score = score;
    }

    public BigDecimal getScore() 
    {
        return score;
    }
    public void setUnitId(Long unitId) 
    {
        this.unitId = unitId;
    }

    public Long getUnitId() 
    {
        return unitId;
    }
    public void setExamineId(Long examineId) 
    {
        this.examineId = examineId;
    }

    public Long getExamineId() 
    {
        return examineId;
    }

    public String getExamineCategory() {
        return examineCategory;
    }

    public void setExamineCategory(String examineCategory) {
        this.examineCategory = examineCategory;
    }

    @Override
    public String toString() {
        return "TExamineScoreVO{" +
                "id=" + id +
                ", score=" + score +
                ", unitId=" + unitId +
                ", examineId=" + examineId +
                ", examineCategory='" + examineCategory + '\'' +
                ", ruleCategory='" + ruleCategory + '\'' +
                ", unitName='" + unitName + '\'' +
                ", examineName='" + examineName + '\'' +
                '}';
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/AccountingRulesController.java

New file
@@ -0,0 +1,91 @@
package com.ycl.platform.controller;

import annotation.Log;
import com.ycl.platform.domain.entity.AccountingRules;
import com.ycl.platform.service.IAccountingRulesService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * æ ¸ç®—规则Controller
 *
 * @author gonghl
 * @date 2024-03-21
 */
@RestController
@RequestMapping("/platform/rules")
public class AccountingRulesController extends BaseController {
    @Autowired
    private IAccountingRulesService accountingRulesService;

    /**
     * æŸ¥è¯¢æ ¸ç®—规则列表
     */
//    @PreAuthorize("@ss.hasPermi('platform:rules:list')")
    @GetMapping("/list")
    public TableDataInfo list(AccountingRules accountingRules) {
        startPage();
        List<AccountingRules> list = accountingRulesService.selectAccountingRulesList(accountingRules);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæ ¸ç®—规则列表
     */
//    @PreAuthorize("@ss.hasPermi('platform:rules:export')")
    @Log(title = "核算规则", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, AccountingRules accountingRules) {
        List<AccountingRules> list = accountingRulesService.selectAccountingRulesList(accountingRules);
        ExcelUtil<AccountingRules> util = new ExcelUtil<AccountingRules>(AccountingRules.class);
        util.exportExcel(response, list, "核算规则数据");
    }

    /**
     * èŽ·å–核算规则详细信息
     */
//    @PreAuthorize("@ss.hasPermi('platform:rules:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Integer id) {
        return success(accountingRulesService.selectAccountingRulesById(id));
    }

    /**
     * æ–°å¢žæ ¸ç®—规则
     */
//    @PreAuthorize("@ss.hasPermi('platform:rules:add')")
    @Log(title = "核算规则", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody AccountingRules accountingRules) {
        return toAjax(accountingRulesService.insertAccountingRules(accountingRules));
    }

    /**
     * ä¿®æ”¹æ ¸ç®—规则
     */
//    @PreAuthorize("@ss.hasPermi('platform:rules:edit')")
    @Log(title = "核算规则", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody AccountingRules accountingRules) {
        return toAjax(accountingRulesService.updateAccountingRules(accountingRules));
    }

    /**
     * åˆ é™¤æ ¸ç®—规则
     */
//    @PreAuthorize("@ss.hasPermi('platform:rules:remove')")
    @Log(title = "核算规则", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Integer[] ids) {
        return toAjax(accountingRulesService.deleteAccountingRulesByIds(ids));
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/controller/CheckPublishController.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java

@@ -1,98 +1,88 @@
package com.ycl.platform.controller;

import annotation.Log;
import com.ycl.platform.domain.entity.CheckResult;
import com.ycl.platform.service.ICheckResultService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import com.ycl.platform.domain.form.ManualScoreForm;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
import org.springframework.validation.annotation.Validated;
import jakarta.validation.constraints.NotEmpty;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.ycl.platform.service.CheckResultService;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.CheckResultForm;
import com.ycl.platform.domain.query.CheckResultQuery;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * è€ƒæ ¸ç»“æžœController
 * è€ƒæ ¸ç»“æžœ å‰ç«¯æŽ§åˆ¶å™¨
 *
 * @author ruoyi
 * @date 2024-04-01
 * @author xp
 * @since 2024-03-07
 */
@Validated
@RequiredArgsConstructor
@Api(value = "考核结果", tags = "考核结果管理")
@RestController
@RequestMapping("/check/result")
public class CheckResultController extends BaseController
{
    @Autowired
    private ICheckResultService checkResultService;
@RequestMapping("/check-result")
public class CheckResultController {

    /**
     * æŸ¥è¯¢è€ƒæ ¸ç»“果列表
     */
    @PreAuthorize("@ss.hasPermi('system:result:list')")
    @GetMapping("/list")
    public TableDataInfo list(CheckResult checkResult)
    {
        startPage();
        List<CheckResult> list = checkResultService.selectCheckResultList(checkResult);
        return getDataTable(list);
    }
    private final CheckResultService checkResultService;

    /**
     * å¯¼å‡ºè€ƒæ ¸ç»“果列表
     */
    @PreAuthorize("@ss.hasPermi('system:result:export')")
    @Log(title = "考核结果", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, CheckResult checkResult)
    {
        List<CheckResult> list = checkResultService.selectCheckResultList(checkResult);
        ExcelUtil<CheckResult> util = new ExcelUtil<CheckResult>(CheckResult.class);
        util.exportExcel(response, list, "考核结果数据");
    }

    /**
     * èŽ·å–考核结果详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:result:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(checkResultService.selectCheckResultById(id));
    }

    /**
     * æ–°å¢žè€ƒæ ¸ç»“æžœ
     */
    @PreAuthorize("@ss.hasPermi('system:result:add')")
    @Log(title = "考核结果", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody CheckResult checkResult)
    {
        return toAjax(checkResultService.insertCheckResult(checkResult));
    @ApiOperation(value = "添加", notes = "添加")
    public Result add(@RequestBody @Validated(Add.class) CheckResultForm form) {
        return checkResultService.add(form);
    }

    /**
     * ä¿®æ”¹è€ƒæ ¸ç»“æžœ
     */
    @PreAuthorize("@ss.hasPermi('system:result:edit')")
    @Log(title = "考核结果", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody CheckResult checkResult)
    {
        return toAjax(checkResultService.updateCheckResult(checkResult));
    @ApiOperation(value = "修改", notes = "修改")
    public Result update(@RequestBody @Validated(Update.class) CheckResultForm form) {
        return checkResultService.update(form);
    }

    /**
     * åˆ é™¤è€ƒæ ¸ç»“æžœ
     */
    @PreAuthorize("@ss.hasPermi('system:result:remove')")
    @Log(title = "考核结果", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(checkResultService.deleteCheckResultByIds(ids));
    @DeleteMapping("/{id}")
    @ApiOperation(value = "ID删除", notes = "ID删除")
    public Result removeById(@PathVariable("id") String id) {
        return checkResultService.removeById(id);
    }

    @PutMapping("/publish/{id}")
    @ApiOperation(value = "ID发布", notes = "ID发布")
    public Result publishById(@PathVariable("id") String id) {
        return checkResultService.publishById(id);
    }

    @DeleteMapping("/batch")
    @ApiOperation(value = "批量删除", notes = "批量删除")
    public Result remove(@RequestBody @NotEmpty(message = "请选择数据") List<String> ids) {
        return checkResultService.remove(ids);
    }

    @PostMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(@RequestBody CheckResultQuery query) {
        return checkResultService.page(query);
    }

    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    public Result detail(@PathVariable("id") String id) {
        return checkResultService.detail(id);
    }

    @GetMapping("/list")
    @ApiOperation(value = "列表", notes = "列表")
    public Result list() {
        return checkResultService.all();
    }

    @PostMapping("/manual-score")
    @ApiOperation(value = "人工打分", notes = "人工打分")
    public Result manualScore(@RequestBody ManualScoreForm form) {
        return checkResultService.manualScore(form);
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java

@@ -1,99 +1,73 @@
package com.ycl.platform.controller;

import annotation.Log;
import com.ycl.platform.domain.entity.CheckRule;
import com.ycl.platform.service.ICheckRuleService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
import jakarta.validation.constraints.NotEmpty;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.ycl.platform.service.CheckRuleService;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.CheckRuleForm;
import com.ycl.platform.domain.query.CheckRuleQuery;
import org.springframework.web.bind.annotation.*;

import java.util.List;


/**
 * è€ƒæ ¸è§„则Controller
 * è€ƒæ ¸è§„则 å‰ç«¯æŽ§åˆ¶å™¨
 *
 * @author ruoyi
 * @date 2024-04-01
 * @author xp
 * @since 2024-03-06
 */
@Validated
@RequiredArgsConstructor
@Api(value = "考核规则", tags = "考核规则管理")
@RestController
@RequestMapping("/check/rule")
public class CheckRuleController extends BaseController
{
    @Autowired
    private ICheckRuleService checkRuleService;
@RequestMapping("/check-rule")
public class CheckRuleController {

    /**
     * æŸ¥è¯¢è€ƒæ ¸è§„则列表
     */
    @PreAuthorize("@ss.hasPermi('system:rule:list')")
    @GetMapping("/list")
    public TableDataInfo list(CheckRule checkRule)
    {
        startPage();
        List<CheckRule> list = checkRuleService.selectCheckRuleList(checkRule);
        return getDataTable(list);
    }
    private final CheckRuleService checkRuleService;

    /**
     * å¯¼å‡ºè€ƒæ ¸è§„则列表
     */
    @PreAuthorize("@ss.hasPermi('system:rule:export')")
    @Log(title = "考核规则", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, CheckRule checkRule)
    {
        List<CheckRule> list = checkRuleService.selectCheckRuleList(checkRule);
        ExcelUtil<CheckRule> util = new ExcelUtil<CheckRule>(CheckRule.class);
        util.exportExcel(response, list, "考核规则数据");
    }

    /**
     * èŽ·å–考核规则详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:rule:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(checkRuleService.selectCheckRuleById(id));
    }

    /**
     * æ–°å¢žè€ƒæ ¸è§„则
     */
    @PreAuthorize("@ss.hasPermi('system:rule:add')")
    @Log(title = "考核规则", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody CheckRule checkRule)
    {
        return toAjax(checkRuleService.insertCheckRule(checkRule));
    @ApiOperation(value = "添加", notes = "添加")
    public Result add(@RequestBody @Validated(Add.class) CheckRuleForm form) {
        return checkRuleService.add(form);
    }

    /**
     * ä¿®æ”¹è€ƒæ ¸è§„则
     */
    @PreAuthorize("@ss.hasPermi('system:rule:edit')")
    @Log(title = "考核规则", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody CheckRule checkRule)
    {
        return toAjax(checkRuleService.updateCheckRule(checkRule));
    @ApiOperation(value = "修改", notes = "修改")
    public Result update(@RequestBody @Validated(Update.class) CheckRuleForm form) {
        return checkRuleService.update(form);
    }

    /**
     * åˆ é™¤è€ƒæ ¸è§„则
     */
    @PreAuthorize("@ss.hasPermi('system:rule:remove')")
    @Log(title = "考核规则", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(checkRuleService.deleteCheckRuleByIds(ids));
    @DeleteMapping("/{id}")
    @ApiOperation(value = "ID删除", notes = "ID删除")
    public Result removeById(@PathVariable("id") String id) {
        return checkRuleService.removeById(id);
    }

    @DeleteMapping("/batch")
    @ApiOperation(value = "批量删除", notes = "批量删除")
    public Result remove(@RequestBody @NotEmpty(message = "请选择数据") List<String> ids) {
        return checkRuleService.remove(ids);
    }

    @PostMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(@RequestBody CheckRuleQuery query) {
        return checkRuleService.page(query);
    }

    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    public Result detail(@PathVariable("id") String id) {
        return checkRuleService.detail(id);
    }

    @GetMapping("/list")
    @ApiOperation(value = "列表", notes = "列表")
    public Result list() {
        return checkRuleService.all();
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java

@@ -1,98 +1,75 @@
package com.ycl.platform.controller;

import annotation.Log;
import com.ycl.platform.domain.entity.CheckTemplate;
import com.ycl.platform.service.ICheckTemplateService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
import org.springframework.validation.annotation.Validated;
import jakarta.validation.constraints.NotEmpty;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.ycl.platform.service.CheckTemplateService;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.CheckTemplateForm;
import com.ycl.platform.domain.query.CheckTemplateQuery;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * è€ƒæ ¸æ¨¡æ¿Controller
 * è€ƒæ ¸æ¨¡æ¿ å‰ç«¯æŽ§åˆ¶å™¨
 *
 * @author ruoyi
 * @date 2024-04-01
 * @author xp
 * @since 2024-03-06
 */
@Validated
@RequiredArgsConstructor
@Api(value = "考核模板", tags = "考核模板管理")
@RestController
@RequestMapping("/check/template")
public class CheckTemplateController extends BaseController
{
    @Autowired
    private ICheckTemplateService checkTemplateService;
@RequestMapping("/check-template")
public class CheckTemplateController {

    /**
     * æŸ¥è¯¢è€ƒæ ¸æ¨¡æ¿åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('system:template:list')")
    @GetMapping("/list")
    public TableDataInfo list(CheckTemplate checkTemplate)
    {
        startPage();
        List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplate);
        return getDataTable(list);
    }
    private final CheckTemplateService checkTemplateService;

    /**
     * å¯¼å‡ºè€ƒæ ¸æ¨¡æ¿åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('system:template:export')")
    @Log(title = "考核模板", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, CheckTemplate checkTemplate)
    {
        List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplate);
        ExcelUtil<CheckTemplate> util = new ExcelUtil<CheckTemplate>(CheckTemplate.class);
        util.exportExcel(response, list, "考核模板数据");
    }

    /**
     * èŽ·å–考核模板详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:template:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(checkTemplateService.selectCheckTemplateById(id));
    }

    /**
     * æ–°å¢žè€ƒæ ¸æ¨¡æ¿
     */
    @PreAuthorize("@ss.hasPermi('system:template:add')")
    @Log(title = "考核模板", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody CheckTemplate checkTemplate)
    {
        return toAjax(checkTemplateService.insertCheckTemplate(checkTemplate));
    @ApiOperation(value = "添加", notes = "添加")
    public Result add(@RequestBody @Validated(Add.class) CheckTemplateForm form) {
        return checkTemplateService.add(form);
    }

    /**
     * ä¿®æ”¹è€ƒæ ¸æ¨¡æ¿
     */
    @PreAuthorize("@ss.hasPermi('system:template:edit')")
    @Log(title = "考核模板", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody CheckTemplate checkTemplate)
    {
        return toAjax(checkTemplateService.updateCheckTemplate(checkTemplate));
    @ApiOperation(value = "修改", notes = "修改")
    public Result update(@RequestBody @Validated(Update.class) CheckTemplateForm form) {
        return checkTemplateService.update(form);
    }

    /**
     * åˆ é™¤è€ƒæ ¸æ¨¡æ¿
     */
    @PreAuthorize("@ss.hasPermi('system:template:remove')")
    @Log(title = "考核模板", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(checkTemplateService.deleteCheckTemplateByIds(ids));
    @DeleteMapping("/{id}")
    @ApiOperation(value = "ID删除", notes = "ID删除")
    public Result removeById(@PathVariable("id") String id) {
        return checkTemplateService.removeById(id);
    }

    @DeleteMapping("/batch")
    @ApiOperation(value = "批量删除", notes = "批量删除")
    public Result remove(@RequestBody @NotEmpty(message = "请选择数据") List<String> ids) {
        return checkTemplateService.remove(ids);
    }

    @PostMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(@RequestBody CheckTemplateQuery query) {
        return checkTemplateService.page(query);
    }

    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    public Result detail(@PathVariable("id") String id) {
        return checkTemplateService.detail(id);
    }

    @GetMapping("/list")
    @ApiOperation(value = "列表", notes = "列表")
    public Result list() {
        return checkTemplateService.all();
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/DefaultAuditingController.java

New file
@@ -0,0 +1,82 @@
package com.ycl.platform.controller;

import com.ycl.platform.domain.form.DefaultAuditForm;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
import org.springframework.validation.annotation.Validated;
import jakarta.validation.constraints.NotEmpty;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.ycl.platform.service.DefaultAuditingService;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.DefaultAuditingForm;
import com.ycl.platform.domain.query.DefaultAuditingQuery;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

/**
 * è¿è§„审核 å‰ç«¯æŽ§åˆ¶å™¨
 *
 * @author xp
 * @since 2024-03-05
 */
@Validated
@RequiredArgsConstructor
@Api(value = "违规审核", tags = "违规审核管理")
@RestController
@RequestMapping("/default-auditing")
public class DefaultAuditingController {

    private final DefaultAuditingService defaultAuditingService;

    @PostMapping
    @ApiOperation(value = "添加", notes = "添加")
    public Result add(@RequestBody @Validated(Add.class) DefaultAuditingForm form) {
        return defaultAuditingService.add(form);
    }

    @PutMapping
    @ApiOperation(value = "修改", notes = "修改")
    public Result update(@RequestBody @Validated(Update.class) DefaultAuditingForm form) {
        return defaultAuditingService.update(form);
    }

    @DeleteMapping("/{id}")
    @ApiOperation(value = "ID删除", notes = "ID删除")
    public Result removeById(@PathVariable("id") String id) {
        return defaultAuditingService.removeById(id);
    }

    @DeleteMapping("/batch")
    @ApiOperation(value = "批量删除", notes = "批量删除")
    public Result remove(@RequestBody @NotEmpty(message = "请选择数据") List<String> ids) {
        return defaultAuditingService.remove(ids);
    }

    @PostMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(@RequestBody DefaultAuditingQuery query) {
        return defaultAuditingService.page(query);
    }

    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    public Result detail(@PathVariable("id") String id) {
        return defaultAuditingService.detail(id);
    }

    @GetMapping("/list")
    @ApiOperation(value = "列表", notes = "列表")
    public Result list() {
        return defaultAuditingService.all();
    }

    @PostMapping("/auditing")
    @ApiOperation(value = "审核", notes = "审核")
    public Result auditing(@RequestBody @Validated DefaultAuditForm form) {
        return defaultAuditingService.auditing(form);
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/DefaultPublishController.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java

@@ -1,96 +1,82 @@
package com.ycl.platform.controller;

import annotation.Log;
import com.ycl.platform.domain.entity.DefaultRule;
import com.ycl.platform.service.IDefaultRuleService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import com.ycl.platform.domain.form.DefaultRuleSetForm;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
import org.springframework.validation.annotation.Validated;
import jakarta.validation.constraints.NotEmpty;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.ycl.platform.service.DefaultRuleService;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.DefaultRuleForm;
import com.ycl.platform.domain.query.DefaultRuleQuery;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * è¿çº¦è§„则Controller
 * è¿çº¦è§„则 å‰ç«¯æŽ§åˆ¶å™¨
 *
 * @author ruoyi
 * @date 2024-04-01
 * @author xp
 * @since 2024-03-05
 */
@Validated
@RequiredArgsConstructor
@Api(value = "违约规则", tags = "违约规则管理")
@RestController
@RequestMapping("/default/rule")
public class DefaultRuleController extends BaseController
{
    @Autowired
    private IDefaultRuleService defaultRuleService;
@RequestMapping("/default-rule")
public class DefaultRuleController {

    /**
     * æŸ¥è¯¢è¿çº¦è§„则列表
     */
    @PreAuthorize("@ss.hasPermi('system:rule:list')")
    @GetMapping("/list")
    public AjaxResult list(DefaultRule defaultRule)
    {
        List<DefaultRule> list = defaultRuleService.selectDefaultRuleList(defaultRule);
        return success(list);
    }
    private final DefaultRuleService defaultRuleService;

    /**
     * å¯¼å‡ºè¿çº¦è§„则列表
     */
    @PreAuthorize("@ss.hasPermi('system:rule:export')")
    @Log(title = "违约规则", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, DefaultRule defaultRule)
    {
        List<DefaultRule> list = defaultRuleService.selectDefaultRuleList(defaultRule);
        ExcelUtil<DefaultRule> util = new ExcelUtil<DefaultRule>(DefaultRule.class);
        util.exportExcel(response, list, "违约规则数据");
    }

    /**
     * èŽ·å–违约规则详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:rule:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(defaultRuleService.selectDefaultRuleById(id));
    }

    /**
     * æ–°å¢žè¿çº¦è§„则
     */
    @PreAuthorize("@ss.hasPermi('system:rule:add')")
    @Log(title = "违约规则", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody DefaultRule defaultRule)
    {
        return toAjax(defaultRuleService.insertDefaultRule(defaultRule));
    @ApiOperation(value = "添加", notes = "添加")
    public Result add(@RequestBody @Validated(Add.class) DefaultRuleForm form) {
        return defaultRuleService.add(form);
    }

    /**
     * ä¿®æ”¹è¿çº¦è§„则
     */
    @PreAuthorize("@ss.hasPermi('system:rule:edit')")
    @Log(title = "违约规则", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody DefaultRule defaultRule)
    {
        return toAjax(defaultRuleService.updateDefaultRule(defaultRule));
    @ApiOperation(value = "修改", notes = "修改")
    public Result update(@RequestBody @Validated(Update.class) DefaultRuleForm form) {
        return defaultRuleService.update(form);
    }

    /**
     * åˆ é™¤è¿çº¦è§„则
     */
    @PreAuthorize("@ss.hasPermi('system:rule:remove')")
    @Log(title = "违约规则", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(defaultRuleService.deleteDefaultRuleByIds(ids));
    @PostMapping("/set")
    @ApiOperation(value = "启用/停用", notes = "启用/停用")
    public Result set(@RequestBody DefaultRuleSetForm form) {
        return defaultRuleService.set(form);
    }

    @DeleteMapping("/{id}")
    @ApiOperation(value = "ID删除", notes = "ID删除")
    public Result removeById(@PathVariable("id") String id) {
        return defaultRuleService.removeById(id);
    }

    @DeleteMapping("/batch")
    @ApiOperation(value = "批量删除", notes = "批量删除")
    public Result remove(@RequestBody @NotEmpty(message = "请选择数据") List<String> ids) {
        return defaultRuleService.remove(ids);
    }

    @PostMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(@RequestBody DefaultRuleQuery query) {
        return defaultRuleService.page(query);
    }

    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    public Result detail(@PathVariable("id") String id) {
        return defaultRuleService.detail(id);
    }

    @GetMapping("/list")
    @ApiOperation(value = "列表", notes = "列表")
    public Result list() {
        return defaultRuleService.all();
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/DefaultScoreController.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/controller/DefaultTemplateController.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java

New file
@@ -0,0 +1,106 @@
package com.ycl.platform.controller;

import annotation.Log;
import com.ycl.platform.domain.entity.TCheckPublish;
import com.ycl.platform.service.ITCheckPublishService;
import com.ycl.system.AjaxResult;
import com.ycl.system.Result;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * è€ƒæ ¸å‘布Controller
 *
 * @author ruoyi
 * @date 2024-03-07
 */
@RestController
@RequestMapping("/system/publish")
public class TCheckPublishController extends BaseController
{
    @Autowired
    private ITCheckPublishService tCheckPublishService;

    /**
     * æŸ¥è¯¢è€ƒæ ¸å‘布列表
     */
//    @PreAuthorize("@ss.hasPermi('system:publish:list')")
    @GetMapping("/list")
    public TableDataInfo list(TCheckPublish tCheckPublish)
    {
        startPage();
        List<TCheckPublish> list = tCheckPublishService.selectTCheckPublishList(tCheckPublish);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºè€ƒæ ¸å‘布列表
     */
//    @PreAuthorize("@ss.hasPermi('system:publish:export')")
    @Log(title = "考核发布", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, TCheckPublish tCheckPublish)
    {
        List<TCheckPublish> list = tCheckPublishService.selectTCheckPublishList(tCheckPublish);
        ExcelUtil<TCheckPublish> util = new ExcelUtil<TCheckPublish>(TCheckPublish.class);
        util.exportExcel(response, list, "考核发布数据");
    }

    /**
     * èŽ·å–考核发布详细信息
     */
//    @PreAuthorize("@ss.hasPermi('system:publish:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(tCheckPublishService.selectTCheckPublishById(id));
    }

    /**
     * æ–°å¢žè€ƒæ ¸å‘布
     */
//    @PreAuthorize("@ss.hasPermi('system:publish:add')")
    @Log(title = "考核发布", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody TCheckPublish tCheckPublish)
    {
        return toAjax(tCheckPublishService.insertTCheckPublish(tCheckPublish));
    }

    /**
     * ä¿®æ”¹è€ƒæ ¸å‘布
     */
//    @PreAuthorize("@ss.hasPermi('system:publish:edit')")
    @Log(title = "考核发布", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody TCheckPublish tCheckPublish)
    {
        return toAjax(tCheckPublishService.updateTCheckPublish(tCheckPublish));
    }

    /**
     * åˆ é™¤è€ƒæ ¸å‘布
     */
//    @PreAuthorize("@ss.hasPermi('system:publish:remove')")
    @Log(title = "考核发布", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(tCheckPublishService.deleteTCheckPublishByIds(ids));
    }

    @GetMapping("/all")
    @ApiOperation(value = "下拉列表", notes = "下拉列表")
    public Result all() {
        return tCheckPublishService.all();
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java

New file
@@ -0,0 +1,99 @@
package com.ycl.platform.controller;

import annotation.Log;
import com.ycl.platform.domain.entity.TExamineScore;
import com.ycl.platform.domain.vo.TExamineScoreVO;
import com.ycl.platform.service.ITExamineScoreService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * è€ƒæ ¸è®¡åˆ†Controller
 *
 * @author ruoyi
 * @date 2024-03-13
 */
@RestController
@RequestMapping("/platform/score")
public class TExamineScoreController extends BaseController
{
    @Autowired
    private ITExamineScoreService tExamineScoreService;

    /**
     * æŸ¥è¯¢è€ƒæ ¸è®¡åˆ†åˆ—表
     */
//    @PreAuthorize("@ss.hasPermi('platform:score:list')")
    @GetMapping("/list")
    public TableDataInfo list(TExamineScore tExamineScore)
    {
        startPage();
        List<TExamineScoreVO> list = tExamineScoreService.selectTExamineScoreList(tExamineScore);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºè€ƒæ ¸è®¡åˆ†åˆ—表
     */
//    @PreAuthorize("@ss.hasPermi('platform:score:export')")
    @Log(title = "考核计分", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, TExamineScore tExamineScore)
    {
        List<TExamineScoreVO> list = tExamineScoreService.selectTExamineScoreList(tExamineScore);
        ExcelUtil<TExamineScoreVO> util = new ExcelUtil<TExamineScoreVO>(TExamineScoreVO.class);
        util.exportExcel(response, list, "考核计分数据");
    }

    /**
     * èŽ·å–考核计分详细信息
     */
//    @PreAuthorize("@ss.hasPermi('platform:score:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(tExamineScoreService.selectTExamineScoreById(id));
    }

    /**
     * æ–°å¢žè€ƒæ ¸è®¡åˆ†
     */
//    @PreAuthorize("@ss.hasPermi('platform:score:add')")
    @Log(title = "考核计分", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody TExamineScore tExamineScore)
    {
        return toAjax(tExamineScoreService.insertTExamineScore(tExamineScore));
    }

    /**
     * ä¿®æ”¹è€ƒæ ¸è®¡åˆ†
     */
//    @PreAuthorize("@ss.hasPermi('platform:score:edit')")
    @Log(title = "考核计分", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody TExamineScore tExamineScore)
    {
        return toAjax(tExamineScoreService.updateTExamineScore(tExamineScore));
    }

    /**
     * åˆ é™¤è€ƒæ ¸è®¡åˆ†
     */
//    @PreAuthorize("@ss.hasPermi('platform:score:remove')")
    @Log(title = "考核计分", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(tExamineScoreService.deleteTExamineScoreByIds(ids));
    }
}

 ycl-server/src/main/java/com/ycl/platform/mapper/AccountingRulesMapper.java

New file
@@ -0,0 +1,62 @@
package com.ycl.platform.mapper;


import com.ycl.platform.domain.entity.AccountingRules;

import java.util.List;

/**
 * æ ¸ç®—规则Mapper接口
 *
 * @author gonghl
 * @date 2024-03-21
 */
public interface AccountingRulesMapper {
    /**
     * æŸ¥è¯¢æ ¸ç®—规则
     *
     * @param id æ ¸ç®—规则主键
     * @return æ ¸ç®—规则
     */
    public AccountingRules selectAccountingRulesById(Integer id);

    /**
     * æŸ¥è¯¢æ ¸ç®—规则列表
     *
     * @param accountingRules æ ¸ç®—规则
     * @return æ ¸ç®—规则集合
     */
    public List<AccountingRules> selectAccountingRulesList(AccountingRules accountingRules);

    /**
     * æ–°å¢žæ ¸ç®—规则
     *
     * @param accountingRules æ ¸ç®—规则
     * @return ç»“æžœ
     */
    public int insertAccountingRules(AccountingRules accountingRules);

    /**
     * ä¿®æ”¹æ ¸ç®—规则
     *
     * @param accountingRules æ ¸ç®—规则
     * @return ç»“æžœ
     */
    public int updateAccountingRules(AccountingRules accountingRules);

    /**
     * åˆ é™¤æ ¸ç®—规则
     *
     * @param id æ ¸ç®—规则主键
     * @return ç»“æžœ
     */
    public int deleteAccountingRulesById(Integer id);

    /**
     * æ‰¹é‡åˆ é™¤æ ¸ç®—规则
     *
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteAccountingRulesByIds(Integer[] ids);
}

 ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/mapper/CheckPublishMapper.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/mapper/CheckResultMapper.java

@@ -1,62 +1,29 @@
package com.ycl.platform.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.platform.domain.entity.CheckResult;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.query.CheckResultQuery;
import com.ycl.platform.domain.vo.CheckResultVO;
import com.ycl.platform.domain.form.CheckResultForm;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * è€ƒæ ¸ç»“æžœMapper接口
 * 
 * @author ruoyi
 * @date 2024-04-01
 * è€ƒæ ¸ç»“æžœ Mapper æŽ¥å£
 *
 * @author xp
 * @since 2024-03-07
 */
public interface CheckResultMapper 
{
    /**
     * æŸ¥è¯¢è€ƒæ ¸ç»“æžœ
     * 
     * @param id è€ƒæ ¸ç»“果主键
     * @return è€ƒæ ¸ç»“æžœ
     */
    public CheckResult selectCheckResultById(Long id);
@Mapper
public interface CheckResultMapper extends BaseMapper<CheckResult> {

    /**
     * æŸ¥è¯¢è€ƒæ ¸ç»“果列表
     * 
     * @param checkResult è€ƒæ ¸ç»“æžœ
     * @return è€ƒæ ¸ç»“果集合
     * åˆ†é¡µ
     * @param page
     * @param query
     */
    public List<CheckResult> selectCheckResultList(CheckResult checkResult);

    /**
     * æ–°å¢žè€ƒæ ¸ç»“æžœ
     * 
     * @param checkResult è€ƒæ ¸ç»“æžœ
     * @return ç»“æžœ
     */
    public int insertCheckResult(CheckResult checkResult);

    /**
     * ä¿®æ”¹è€ƒæ ¸ç»“æžœ
     * 
     * @param checkResult è€ƒæ ¸ç»“æžœ
     * @return ç»“æžœ
     */
    public int updateCheckResult(CheckResult checkResult);

    /**
     * åˆ é™¤è€ƒæ ¸ç»“æžœ
     * 
     * @param id è€ƒæ ¸ç»“果主键
     * @return ç»“æžœ
     */
    public int deleteCheckResultById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸ç»“æžœ
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteCheckResultByIds(Long[] ids);
    Page page(IPage page, @Param("query") CheckResultQuery query);
}

 ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java

@@ -1,62 +1,19 @@
package com.ycl.platform.mapper;

import com.ycl.platform.domain.entity.CheckRule;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.vo.CheckRuleVO;
import com.ycl.platform.domain.form.CheckRuleForm;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;

/**
 * è€ƒæ ¸è§„则Mapper接口
 * 
 * @author ruoyi
 * @date 2024-04-01
 * è€ƒæ ¸è§„则 Mapper æŽ¥å£
 *
 * @author xp
 * @since 2024-03-06
 */
public interface CheckRuleMapper 
{
    /**
     * æŸ¥è¯¢è€ƒæ ¸è§„则
     * 
     * @param id è€ƒæ ¸è§„则主键
     * @return è€ƒæ ¸è§„则
     */
    public CheckRule selectCheckRuleById(Long id);
@Mapper
public interface CheckRuleMapper extends BaseMapper<CheckRule> {

    /**
     * æŸ¥è¯¢è€ƒæ ¸è§„则列表
     * 
     * @param checkRule è€ƒæ ¸è§„则
     * @return è€ƒæ ¸è§„则集合
     */
    public List<CheckRule> selectCheckRuleList(CheckRule checkRule);

    /**
     * æ–°å¢žè€ƒæ ¸è§„则
     * 
     * @param checkRule è€ƒæ ¸è§„则
     * @return ç»“æžœ
     */
    public int insertCheckRule(CheckRule checkRule);

    /**
     * ä¿®æ”¹è€ƒæ ¸è§„则
     * 
     * @param checkRule è€ƒæ ¸è§„则
     * @return ç»“æžœ
     */
    public int updateCheckRule(CheckRule checkRule);

    /**
     * åˆ é™¤è€ƒæ ¸è§„则
     * 
     * @param id è€ƒæ ¸è§„则主键
     * @return ç»“æžœ
     */
    public int deleteCheckRuleById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸è§„则
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteCheckRuleByIds(Long[] ids);
}

 ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java

@@ -1,62 +1,19 @@
package com.ycl.platform.mapper;

import com.ycl.platform.domain.entity.CheckTemplate;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.vo.CheckTemplateVO;
import com.ycl.platform.domain.form.CheckTemplateForm;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;

/**
 * è€ƒæ ¸æ¨¡æ¿Mapper接口
 * 
 * @author ruoyi
 * @date 2024-04-01
 * è€ƒæ ¸æ¨¡æ¿ Mapper æŽ¥å£
 *
 * @author xp
 * @since 2024-03-06
 */
public interface CheckTemplateMapper 
{
    /**
     * æŸ¥è¯¢è€ƒæ ¸æ¨¡æ¿
     * 
     * @param id è€ƒæ ¸æ¨¡æ¿ä¸»é”®
     * @return è€ƒæ ¸æ¨¡æ¿
     */
    public CheckTemplate selectCheckTemplateById(Long id);
@Mapper
public interface CheckTemplateMapper extends BaseMapper<CheckTemplate> {

    /**
     * æŸ¥è¯¢è€ƒæ ¸æ¨¡æ¿åˆ—表
     * 
     * @param checkTemplate è€ƒæ ¸æ¨¡æ¿
     * @return è€ƒæ ¸æ¨¡æ¿é›†åˆ
     */
    public List<CheckTemplate> selectCheckTemplateList(CheckTemplate checkTemplate);

    /**
     * æ–°å¢žè€ƒæ ¸æ¨¡æ¿
     * 
     * @param checkTemplate è€ƒæ ¸æ¨¡æ¿
     * @return ç»“æžœ
     */
    public int insertCheckTemplate(CheckTemplate checkTemplate);

    /**
     * ä¿®æ”¹è€ƒæ ¸æ¨¡æ¿
     * 
     * @param checkTemplate è€ƒæ ¸æ¨¡æ¿
     * @return ç»“æžœ
     */
    public int updateCheckTemplate(CheckTemplate checkTemplate);

    /**
     * åˆ é™¤è€ƒæ ¸æ¨¡æ¿
     * 
     * @param id è€ƒæ ¸æ¨¡æ¿ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteCheckTemplateById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸æ¨¡æ¿
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteCheckTemplateByIds(Long[] ids);
}

 ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateRuleMapper.java

@@ -1,62 +1,13 @@
package com.ycl.platform.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.entity.CheckTemplateRule;

import java.util.List;
import org.apache.ibatis.annotations.Mapper;

/**
 * è€ƒæ ¸æ¨¡æ¿-规则中间Mapper接口
 * 
 * @author ruoyi
 * @date 2024-04-01
 * @author：xp
 * @date：2024/3/8 9:18
 */
public interface CheckTemplateRuleMapper 
{
    /**
     * æŸ¥è¯¢è€ƒæ ¸æ¨¡æ¿-规则中间
     * 
     * @param id è€ƒæ ¸æ¨¡æ¿-规则中间主键
     * @return è€ƒæ ¸æ¨¡æ¿-规则中间
     */
    public CheckTemplateRule selectCheckTemplateRuleById(Long id);

    /**
     * æŸ¥è¯¢è€ƒæ ¸æ¨¡æ¿-规则中间列表
     * 
     * @param checkTemplateRule è€ƒæ ¸æ¨¡æ¿-规则中间
     * @return è€ƒæ ¸æ¨¡æ¿-规则中间集合
     */
    public List<CheckTemplateRule> selectCheckTemplateRuleList(CheckTemplateRule checkTemplateRule);

    /**
     * æ–°å¢žè€ƒæ ¸æ¨¡æ¿-规则中间
     * 
     * @param checkTemplateRule è€ƒæ ¸æ¨¡æ¿-规则中间
     * @return ç»“æžœ
     */
    public int insertCheckTemplateRule(CheckTemplateRule checkTemplateRule);

    /**
     * ä¿®æ”¹è€ƒæ ¸æ¨¡æ¿-规则中间
     * 
     * @param checkTemplateRule è€ƒæ ¸æ¨¡æ¿-规则中间
     * @return ç»“æžœ
     */
    public int updateCheckTemplateRule(CheckTemplateRule checkTemplateRule);

    /**
     * åˆ é™¤è€ƒæ ¸æ¨¡æ¿-规则中间
     * 
     * @param id è€ƒæ ¸æ¨¡æ¿-规则中间主键
     * @return ç»“æžœ
     */
    public int deleteCheckTemplateRuleById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸æ¨¡æ¿-规则中间
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteCheckTemplateRuleByIds(Long[] ids);
@Mapper
public interface CheckTemplateRuleMapper extends BaseMapper<CheckTemplateRule> {
}

 ycl-server/src/main/java/com/ycl/platform/mapper/DefaultAuditingMapper.java

New file
@@ -0,0 +1,25 @@
package com.ycl.platform.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.platform.domain.entity.DefaultAuditing;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.query.DefaultAuditingQuery;
import com.ycl.platform.domain.vo.DefaultAuditingVO;
import com.ycl.platform.domain.form.DefaultAuditingForm;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * è¿è§„审核 Mapper æŽ¥å£
 *
 * @author xp
 * @since 2024-03-05
 */
@Mapper
public interface DefaultAuditingMapper extends BaseMapper<DefaultAuditing> {

    Page page(IPage page, @Param("query") DefaultAuditingQuery query);
}


 ycl-server/src/main/java/com/ycl/platform/mapper/DefaultPublishMapper.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/mapper/DefaultResultMapper.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java

@@ -1,62 +1,19 @@
package com.ycl.platform.mapper;

import com.ycl.platform.domain.entity.DefaultRule;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.vo.DefaultRuleVO;
import com.ycl.platform.domain.form.DefaultRuleForm;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;

/**
 * è¿çº¦è§„则Mapper接口
 * 
 * @author ruoyi
 * @date 2024-04-01
 * è¿çº¦è§„则 Mapper æŽ¥å£
 *
 * @author xp
 * @since 2024-03-05
 */
public interface DefaultRuleMapper 
{
    /**
     * æŸ¥è¯¢è¿çº¦è§„则
     * 
     * @param id è¿çº¦è§„则主键
     * @return è¿çº¦è§„则
     */
    public DefaultRule selectDefaultRuleById(Long id);
@Mapper
public interface DefaultRuleMapper extends BaseMapper<DefaultRule> {

    /**
     * æŸ¥è¯¢è¿çº¦è§„则列表
     * 
     * @param defaultRule è¿çº¦è§„则
     * @return è¿çº¦è§„则集合
     */
    public List<DefaultRule> selectDefaultRuleList(DefaultRule defaultRule);

    /**
     * æ–°å¢žè¿çº¦è§„则
     * 
     * @param defaultRule è¿çº¦è§„则
     * @return ç»“æžœ
     */
    public int insertDefaultRule(DefaultRule defaultRule);

    /**
     * ä¿®æ”¹è¿çº¦è§„则
     * 
     * @param defaultRule è¿çº¦è§„则
     * @return ç»“æžœ
     */
    public int updateDefaultRule(DefaultRule defaultRule);

    /**
     * åˆ é™¤è¿çº¦è§„则
     * 
     * @param id è¿çº¦è§„则主键
     * @return ç»“æžœ
     */
    public int deleteDefaultRuleById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤è¿çº¦è§„则
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteDefaultRuleByIds(Long[] ids);
}

 ycl-server/src/main/java/com/ycl/platform/mapper/DefaultScoreMapper.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateMapper.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateRuleMapper.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/mapper/TCheckPublishMapper.java

New file
@@ -0,0 +1,62 @@
package com.ycl.platform.mapper;

import com.ycl.platform.domain.entity.TCheckPublish;

import java.util.List;

/**
 * è€ƒæ ¸å‘布Mapper接口
 * 
 * @author ruoyi
 * @date 2024-03-07
 */
public interface TCheckPublishMapper 
{
    /**
     * æŸ¥è¯¢è€ƒæ ¸å‘布
     * 
     * @param id è€ƒæ ¸å‘布主键
     * @return è€ƒæ ¸å‘布
     */
    public TCheckPublish selectTCheckPublishById(Long id);

    /**
     * æŸ¥è¯¢è€ƒæ ¸å‘布列表
     * 
     * @param tCheckPublish è€ƒæ ¸å‘布
     * @return è€ƒæ ¸å‘布集合
     */
    public List<TCheckPublish> selectTCheckPublishList(TCheckPublish tCheckPublish);

    /**
     * æ–°å¢žè€ƒæ ¸å‘布
     * 
     * @param tCheckPublish è€ƒæ ¸å‘布
     * @return ç»“æžœ
     */
    public int insertTCheckPublish(TCheckPublish tCheckPublish);

    /**
     * ä¿®æ”¹è€ƒæ ¸å‘布
     * 
     * @param tCheckPublish è€ƒæ ¸å‘布
     * @return ç»“æžœ
     */
    public int updateTCheckPublish(TCheckPublish tCheckPublish);

    /**
     * åˆ é™¤è€ƒæ ¸å‘布
     * 
     * @param id è€ƒæ ¸å‘布主键
     * @return ç»“æžœ
     */
    public int deleteTCheckPublishById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸å‘布
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteTCheckPublishByIds(Long[] ids);
}

 ycl-server/src/main/java/com/ycl/platform/mapper/TExamineScoreMapper.java

New file
@@ -0,0 +1,63 @@
package com.ycl.platform.mapper;

import com.ycl.platform.domain.entity.TExamineScore;
import com.ycl.platform.domain.vo.TExamineScoreVO;

import java.util.List;

/**
 * è€ƒæ ¸è®¡åˆ†Mapper接口
 * 
 * @author ruoyi
 * @date 2024-03-13
 */
public interface TExamineScoreMapper 
{
    /**
     * æŸ¥è¯¢è€ƒæ ¸è®¡åˆ†
     * 
     * @param id è€ƒæ ¸è®¡åˆ†ä¸»é”®
     * @return è€ƒæ ¸è®¡åˆ†
     */
    public TExamineScore selectTExamineScoreById(Long id);

    /**
     * æŸ¥è¯¢è€ƒæ ¸è®¡åˆ†åˆ—表
     * 
     * @param tExamineScore è€ƒæ ¸è®¡åˆ†
     * @return è€ƒæ ¸è®¡åˆ†é›†åˆ
     */
    public List<TExamineScoreVO> selectTExamineScoreList(TExamineScore tExamineScore);

    /**
     * æ–°å¢žè€ƒæ ¸è®¡åˆ†
     * 
     * @param tExamineScore è€ƒæ ¸è®¡åˆ†
     * @return ç»“æžœ
     */
    public int insertTExamineScore(TExamineScore tExamineScore);

    /**
     * ä¿®æ”¹è€ƒæ ¸è®¡åˆ†
     * 
     * @param tExamineScore è€ƒæ ¸è®¡åˆ†
     * @return ç»“æžœ
     */
    public int updateTExamineScore(TExamineScore tExamineScore);

    /**
     * åˆ é™¤è€ƒæ ¸è®¡åˆ†
     * 
     * @param id è€ƒæ ¸è®¡åˆ†ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteTExamineScoreById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸è®¡åˆ†
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteTExamineScoreByIds(Long[] ids);
}

 ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java

New file
@@ -0,0 +1,81 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.entity.CheckResult;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.form.ManualScoreForm;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.CheckResultForm;
import com.ycl.platform.domain.query.CheckResultQuery;
import java.util.List;

/**
 * è€ƒæ ¸ç»“æžœ æœåŠ¡ç±»
 *
 * @author xp
 * @since 2024-03-07
 */
public interface CheckResultService extends IService<CheckResult> {

    /**
     * æ·»åŠ 
     * @param form
     * @return
     */
    Result add(CheckResultForm form);

    /**
     * ä¿®æ”¹
     * @param form
     * @return
     */
    Result update(CheckResultForm form);

    /**
     * æ‰¹é‡åˆ é™¤
     * @param ids
     * @return
     */
    Result remove(List<String> ids);

    /**
     * id删除
     * @param id
     * @return
     */
    Result removeById(String id);

    /**
     * åˆ†é¡µæŸ¥è¯¢
     * @param query
     * @return
     */
    Result page(CheckResultQuery query);

    /**
     * æ ¹æ®id查找
     * @param id
     * @return
     */
    Result detail(String id);

    /**
     * åˆ—表
     * @return
     */
    Result all();

    /**
     * äººå·¥æ‰“分
     * @param form
     * @return
     */
    Result manualScore(ManualScoreForm form);

    /**
     * id发布
     * @param id
     * @return
     */
    Result publishById(String id);

}

 ycl-server/src/main/java/com/ycl/platform/service/CheckRuleService.java

New file
@@ -0,0 +1,65 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.entity.CheckRule;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.CheckRuleForm;
import com.ycl.platform.domain.query.CheckRuleQuery;
import java.util.List;

/**
 * è€ƒæ ¸è§„则 æœåŠ¡ç±»
 *
 * @author xp
 * @since 2024-03-06
 */
public interface CheckRuleService extends IService<CheckRule> {

    /**
     * æ·»åŠ 
     * @param form
     * @return
     */
    Result add(CheckRuleForm form);

    /**
     * ä¿®æ”¹
     * @param form
     * @return
     */
    Result update(CheckRuleForm form);

    /**
     * æ‰¹é‡åˆ é™¤
     * @param ids
     * @return
     */
    Result remove(List<String> ids);

    /**
     * id删除
     * @param id
     * @return
     */
    Result removeById(String id);

    /**
     * åˆ†é¡µæŸ¥è¯¢
     * @param query
     * @return
     */
    Result page(CheckRuleQuery query);

    /**
     * æ ¹æ®id查找
     * @param id
     * @return
     */
    Result detail(String id);

    /**
     * åˆ—表
     * @return
     */
    Result all();
}

 ycl-server/src/main/java/com/ycl/platform/service/CheckTemplateService.java

New file
@@ -0,0 +1,65 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.entity.CheckTemplate;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.CheckTemplateForm;
import com.ycl.platform.domain.query.CheckTemplateQuery;
import java.util.List;

/**
 * è€ƒæ ¸æ¨¡æ¿ æœåŠ¡ç±»
 *
 * @author xp
 * @since 2024-03-06
 */
public interface CheckTemplateService extends IService<CheckTemplate> {

    /**
     * æ·»åŠ 
     * @param form
     * @return
     */
    Result add(CheckTemplateForm form);

    /**
     * ä¿®æ”¹
     * @param form
     * @return
     */
    Result update(CheckTemplateForm form);

    /**
     * æ‰¹é‡åˆ é™¤
     * @param ids
     * @return
     */
    Result remove(List<String> ids);

    /**
     * id删除
     * @param id
     * @return
     */
    Result removeById(String id);

    /**
     * åˆ†é¡µæŸ¥è¯¢
     * @param query
     * @return
     */
    Result page(CheckTemplateQuery query);

    /**
     * æ ¹æ®id查找
     * @param id
     * @return
     */
    Result detail(String id);

    /**
     * åˆ—表
     * @return
     */
    Result all();
}

 ycl-server/src/main/java/com/ycl/platform/service/DefaultAuditingService.java

New file
@@ -0,0 +1,73 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.entity.DefaultAuditing;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.form.DefaultAuditForm;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.DefaultAuditingForm;
import com.ycl.platform.domain.query.DefaultAuditingQuery;
import java.util.List;

/**
 * è¿è§„审核 æœåŠ¡ç±»
 *
 * @author xp
 * @since 2024-03-05
 */
public interface DefaultAuditingService extends IService<DefaultAuditing> {

    /**
     * æ·»åŠ 
     * @param form
     * @return
     */
    Result add(DefaultAuditingForm form);

    /**
     * ä¿®æ”¹
     * @param form
     * @return
     */
    Result update(DefaultAuditingForm form);

    /**
     * æ‰¹é‡åˆ é™¤
     * @param ids
     * @return
     */
    Result remove(List<String> ids);

    /**
     * id删除
     * @param id
     * @return
     */
    Result removeById(String id);

    /**
     * åˆ†é¡µæŸ¥è¯¢
     * @param query
     * @return
     */
    Result page(DefaultAuditingQuery query);

    /**
     * æ ¹æ®id查找
     * @param id
     * @return
     */
    Result detail(String id);

    /**
     * åˆ—表
     * @return
     */
    Result all();

    /**
     * å®¡æ ¸
     * @param form
     * @return
     */
    Result auditing(DefaultAuditForm form);
}

 ycl-server/src/main/java/com/ycl/platform/service/DefaultRuleService.java

New file
@@ -0,0 +1,73 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.entity.DefaultRule;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.form.DefaultRuleSetForm;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.DefaultRuleForm;
import com.ycl.platform.domain.query.DefaultRuleQuery;
import java.util.List;

/**
 * è¿çº¦è§„则 æœåŠ¡ç±»
 *
 * @author xp
 * @since 2024-03-05
 */
public interface DefaultRuleService extends IService<DefaultRule> {

    /**
     * æ·»åŠ 
     * @param form
     * @return
     */
    Result add(DefaultRuleForm form);

    /**
     * ä¿®æ”¹
     * @param form
     * @return
     */
    Result update(DefaultRuleForm form);

    /**
     * æ‰¹é‡åˆ é™¤
     * @param ids
     * @return
     */
    Result remove(List<String> ids);

    /**
     * id删除
     * @param id
     * @return
     */
    Result removeById(String id);

    /**
     * åˆ†é¡µæŸ¥è¯¢
     * @param query
     * @return
     */
    Result page(DefaultRuleQuery query);

    /**
     * æ ¹æ®id查找
     * @param id
     * @return
     */
    Result detail(String id);

    /**
     * åˆ—表
     * @return
     */
    Result all();

    /**
     * å¯ç”¨/停用
     * @param form
     * @return
     */
    Result set(DefaultRuleSetForm form);
}

 ycl-server/src/main/java/com/ycl/platform/service/IAccountingRulesService.java

New file
@@ -0,0 +1,62 @@
package com.ycl.platform.service;


import com.ycl.platform.domain.entity.AccountingRules;

import java.util.List;

/**
 * æ ¸ç®—规则Service接口
 *
 * @author gonghl
 * @date 2024-03-21
 */
public interface IAccountingRulesService {
    /**
     * æŸ¥è¯¢æ ¸ç®—规则
     *
     * @param id æ ¸ç®—规则主键
     * @return æ ¸ç®—规则
     */
    public AccountingRules selectAccountingRulesById(Integer id);

    /**
     * æŸ¥è¯¢æ ¸ç®—规则列表
     *
     * @param accountingRules æ ¸ç®—规则
     * @return æ ¸ç®—规则集合
     */
    public List<AccountingRules> selectAccountingRulesList(AccountingRules accountingRules);

    /**
     * æ–°å¢žæ ¸ç®—规则
     *
     * @param accountingRules æ ¸ç®—规则
     * @return ç»“æžœ
     */
    public int insertAccountingRules(AccountingRules accountingRules);

    /**
     * ä¿®æ”¹æ ¸ç®—规则
     *
     * @param accountingRules æ ¸ç®—规则
     * @return ç»“æžœ
     */
    public int updateAccountingRules(AccountingRules accountingRules);

    /**
     * æ‰¹é‡åˆ é™¤æ ¸ç®—规则
     *
     * @param ids éœ€è¦åˆ é™¤çš„核算规则主键集合
     * @return ç»“æžœ
     */
    public int deleteAccountingRulesByIds(Integer[] ids);

    /**
     * åˆ é™¤æ ¸ç®—规则信息
     *
     * @param id æ ¸ç®—规则主键
     * @return ç»“æžœ
     */
    public int deleteAccountingRulesById(Integer id);
}

 ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/ICheckPublishService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/ICheckResultService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/ICheckRuleService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateRuleService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/IDefaultPublishService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/IDefaultResultService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/IDefaultRuleService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/IDefaultScoreService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateRuleService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/ITCheckPublishService.java

New file
@@ -0,0 +1,66 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.entity.TCheckPublish;
import com.ycl.system.Result;

import java.util.List;

/**
 * è€ƒæ ¸å‘布Service接口
 * 
 * @author ruoyi
 * @date 2024-03-07
 */
public interface ITCheckPublishService 
{
    /**
     * æŸ¥è¯¢è€ƒæ ¸å‘布
     * 
     * @param id è€ƒæ ¸å‘布主键
     * @return è€ƒæ ¸å‘布
     */
    public TCheckPublish selectTCheckPublishById(Long id);

    /**
     * æŸ¥è¯¢è€ƒæ ¸å‘布列表
     * 
     * @param tCheckPublish è€ƒæ ¸å‘布
     * @return è€ƒæ ¸å‘布集合
     */
    public List<TCheckPublish> selectTCheckPublishList(TCheckPublish tCheckPublish);

    /**
     * æ–°å¢žè€ƒæ ¸å‘布
     * 
     * @param tCheckPublish è€ƒæ ¸å‘布
     * @return ç»“æžœ
     */
    public int insertTCheckPublish(TCheckPublish tCheckPublish);

    /**
     * ä¿®æ”¹è€ƒæ ¸å‘布
     * 
     * @param tCheckPublish è€ƒæ ¸å‘布
     * @return ç»“æžœ
     */
    public int updateTCheckPublish(TCheckPublish tCheckPublish);

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸å‘布
     * 
     * @param ids éœ€è¦åˆ é™¤çš„考核发布主键集合
     * @return ç»“æžœ
     */
    public int deleteTCheckPublishByIds(Long[] ids);

    /**
     * åˆ é™¤è€ƒæ ¸å‘布信息
     * 
     * @param id è€ƒæ ¸å‘布主键
     * @return ç»“æžœ
     */
    public int deleteTCheckPublishById(Long id);

    Result all();

}

 ycl-server/src/main/java/com/ycl/platform/service/ITExamineScoreService.java

New file
@@ -0,0 +1,63 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.entity.TExamineScore;
import com.ycl.platform.domain.vo.TExamineScoreVO;

import java.util.List;

/**
 * è€ƒæ ¸è®¡åˆ†Service接口
 * 
 * @author ruoyi
 * @date 2024-03-13
 */
public interface ITExamineScoreService 
{
    /**
     * æŸ¥è¯¢è€ƒæ ¸è®¡åˆ†
     * 
     * @param id è€ƒæ ¸è®¡åˆ†ä¸»é”®
     * @return è€ƒæ ¸è®¡åˆ†
     */
    public TExamineScore selectTExamineScoreById(Long id);

    /**
     * æŸ¥è¯¢è€ƒæ ¸è®¡åˆ†åˆ—表
     * 
     * @param tExamineScore è€ƒæ ¸è®¡åˆ†
     * @return è€ƒæ ¸è®¡åˆ†é›†åˆ
     */
    public List<TExamineScoreVO> selectTExamineScoreList(TExamineScore tExamineScore);

    /**
     * æ–°å¢žè€ƒæ ¸è®¡åˆ†
     * 
     * @param tExamineScore è€ƒæ ¸è®¡åˆ†
     * @return ç»“æžœ
     */
    public int insertTExamineScore(TExamineScore tExamineScore);

    /**
     * ä¿®æ”¹è€ƒæ ¸è®¡åˆ†
     * 
     * @param tExamineScore è€ƒæ ¸è®¡åˆ†
     * @return ç»“æžœ
     */
    public int updateTExamineScore(TExamineScore tExamineScore);

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸è®¡åˆ†
     * 
     * @param ids éœ€è¦åˆ é™¤çš„考核计分主键集合
     * @return ç»“æžœ
     */
    public int deleteTExamineScoreByIds(Long[] ids);

    /**
     * åˆ é™¤è€ƒæ ¸è®¡åˆ†ä¿¡æ¯
     * 
     * @param id è€ƒæ ¸è®¡åˆ†ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteTExamineScoreById(Long id);
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/AccountingRulesServiceImpl.java

New file
@@ -0,0 +1,91 @@
package com.ycl.platform.service.impl;

import com.ycl.platform.domain.entity.AccountingRules;
import com.ycl.platform.mapper.AccountingRulesMapper;
import com.ycl.platform.service.IAccountingRulesService;
import com.ycl.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æ ¸ç®—规则Service业务层处理
 *
 * @author gonghl
 * @date 2024-03-21
 */
@Service
public class AccountingRulesServiceImpl implements IAccountingRulesService {
    @Autowired
    private AccountingRulesMapper accountingRulesMapper;

    /**
     * æŸ¥è¯¢æ ¸ç®—规则
     *
     * @param id æ ¸ç®—规则主键
     * @return æ ¸ç®—规则
     */
    @Override
    public AccountingRules selectAccountingRulesById(Integer id) {
        return accountingRulesMapper.selectAccountingRulesById(id);
    }

    /**
     * æŸ¥è¯¢æ ¸ç®—规则列表
     *
     * @param accountingRules æ ¸ç®—规则
     * @return æ ¸ç®—规则
     */
    @Override
    public List<AccountingRules> selectAccountingRulesList(AccountingRules accountingRules) {
        return accountingRulesMapper.selectAccountingRulesList(accountingRules);
    }

    /**
     * æ–°å¢žæ ¸ç®—规则
     *
     * @param accountingRules æ ¸ç®—规则
     * @return ç»“æžœ
     */
    @Override
    public int insertAccountingRules(AccountingRules accountingRules) {
        accountingRules.setCreateTime(DateUtils.getNowDate());
        accountingRules.setDeleted("0");
        return accountingRulesMapper.insertAccountingRules(accountingRules);
    }

    /**
     * ä¿®æ”¹æ ¸ç®—规则
     *
     * @param accountingRules æ ¸ç®—规则
     * @return ç»“æžœ
     */
    @Override
    public int updateAccountingRules(AccountingRules accountingRules) {
        accountingRules.setUpdateTime(DateUtils.getNowDate());
        return accountingRulesMapper.updateAccountingRules(accountingRules);
    }

    /**
     * æ‰¹é‡åˆ é™¤æ ¸ç®—规则
     *
     * @param ids éœ€è¦åˆ é™¤çš„核算规则主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteAccountingRulesByIds(Integer[] ids) {
        return accountingRulesMapper.deleteAccountingRulesByIds(ids);
    }

    /**
     * åˆ é™¤æ ¸ç®—规则信息
     *
     * @param id æ ¸ç®—规则主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteAccountingRulesById(Integer id) {
        return accountingRulesMapper.deleteAccountingRulesById(id);
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckPublishServiceImpl.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java

@@ -1,96 +1,169 @@
package com.ycl.platform.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.CheckResult;
import com.ycl.platform.domain.form.ManualScoreForm;
import com.ycl.platform.mapper.CheckResultMapper;
import com.ycl.platform.service.ICheckResultService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;

import com.ycl.platform.service.CheckResultService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.form.CheckResultForm;
import com.ycl.platform.domain.vo.CheckResultVO;
import com.ycl.platform.domain.query.CheckResultQuery;
import java.util.List;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import org.springframework.stereotype.Service;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.ArrayList;
import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.util.StringUtils;

/**
 * è€ƒæ ¸ç»“æžœService业务层处理
 * 
 * @author ruoyi
 * @date 2024-04-01
 * è€ƒæ ¸ç»“æžœ æœåŠ¡å®žçŽ°ç±»
 *
 * @author xp
 * @since 2024-03-07
 */
@Service
public class CheckResultServiceImpl implements ICheckResultService 
{
    @Autowired
    private CheckResultMapper checkResultMapper;
@RequiredArgsConstructor
public class CheckResultServiceImpl extends ServiceImpl<CheckResultMapper, CheckResult> implements CheckResultService {

    private final CheckResultMapper checkResultMapper;

    /**
     * æŸ¥è¯¢è€ƒæ ¸ç»“æžœ
     * 
     * @param id è€ƒæ ¸ç»“果主键
     * @return è€ƒæ ¸ç»“æžœ
     * æ·»åŠ 
     * @param form
     * @return
     */
    @Override
    public CheckResult selectCheckResultById(Long id)
    {
        return checkResultMapper.selectCheckResultById(id);
    public Result add(CheckResultForm form) {
        CheckResult entity = CheckResultForm.getEntityByForm(form, null);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
        return Result.error("添加失败");
    }

    /**
     * æŸ¥è¯¢è€ƒæ ¸ç»“果列表
     * 
     * @param checkResult è€ƒæ ¸ç»“æžœ
     * @return è€ƒæ ¸ç»“æžœ
     * ä¿®æ”¹
     * @param form
     * @return
     */
    @Override
    public List<CheckResult> selectCheckResultList(CheckResult checkResult)
    {
        return checkResultMapper.selectCheckResultList(checkResult);
    public Result update(CheckResultForm form) {

        CheckResult entity = baseMapper.selectById(form.getId());

        // ä¸ºç©ºæŠ›IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
        }
        return Result.error("修改失败");
    }

    /**
     * æ–°å¢žè€ƒæ ¸ç»“æžœ
     * 
     * @param checkResult è€ƒæ ¸ç»“æžœ
     * @return ç»“æžœ
     * æ‰¹é‡åˆ é™¤
     * @param ids
     * @return
     */
    @Override
    public int insertCheckResult(CheckResult checkResult)
    {
        return checkResultMapper.insertCheckResult(checkResult);
    public Result remove(List<String> ids) {
        if(baseMapper.deleteBatchIds(ids) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }

    /**
     * ä¿®æ”¹è€ƒæ ¸ç»“æžœ
     * 
     * @param checkResult è€ƒæ ¸ç»“æžœ
     * @return ç»“æžœ
     * id删除
     * @param id
     * @return
     */
    @Override
    public int updateCheckResult(CheckResult checkResult)
    {
        checkResult.setUpdateTime(DateUtils.getNowDate());
        return checkResultMapper.updateCheckResult(checkResult);
    public Result removeById(String id) {
        if(baseMapper.deleteById(id) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸ç»“æžœ
     * 
     * @param ids éœ€è¦åˆ é™¤çš„考核结果主键
     * @return ç»“æžœ
     * åˆ†é¡µæŸ¥è¯¢
     * @param query
     * @return
     */
    @Override
    public int deleteCheckResultByIds(Long[] ids)
    {
        return checkResultMapper.deleteCheckResultByIds(ids);
    public Result page(CheckResultQuery query) {
        query.setTime();
        IPage page = PageUtil.getPage(query, CheckResult.class);
        baseMapper.page(page, query);
        return Result.ok().data(page.getRecords()).total(page.getTotal());
    }

    /**
     * åˆ é™¤è€ƒæ ¸ç»“果信息
     * 
     * @param id è€ƒæ ¸ç»“果主键
     * @return ç»“æžœ
     * æ ¹æ®id查找
     * @param id
     * @return
     */
    @Override
    public int deleteCheckResultById(Long id)
    {
        return checkResultMapper.deleteCheckResultById(id);
    public Result detail(String id) {

        CheckResult entity = baseMapper.selectById(id);
        Assert.notNull(entity, "记录不存在");
        CheckResultVO vo = CheckResultVO.getVoByEntity(entity, null);
        return Result.ok().data(vo);
    }

    /**
     * åˆ—表
     * @return
     */
    @Override
    public Result all() {
        List<CheckResult> entities = baseMapper.selectList(null);
        List<CheckResultVO> vos = entities.stream()
                .map(
                        entity -> CheckResultVO.getVoByEntity(entity, null)
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }

    @Override
    public Result manualScore(ManualScoreForm form) {
        CheckResult checkResult = baseMapper.selectById(form.getId());
        if (Objects.isNull(checkResult)) {
            throw new ServiceException("考核结果不存在");
        }
        checkResult.setManualScore(form.getManualScore());
        checkResult.setCheckScore(form.getManualScore().add(checkResult.getSystemScore()));
        baseMapper.updateById(checkResult);
        return Result.ok();
    }

    @Override
    public Result publishById(String id) {
        CheckResult checkResult = baseMapper.selectById(id);
        if(Objects.equals(1, checkResult.getPublish())) {
            checkResult.setPublish(0);
        } else {
            checkResult.setPublish(1);
        }
        if(baseMapper.updateById(checkResult) > 0) {
            return Result.ok("发布成功");
        }
        return Result.error("发布失败");
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java

@@ -1,97 +1,161 @@
package com.ycl.platform.service.impl;

import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.CheckRule;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.mapper.CheckRuleMapper;
import com.ycl.platform.service.ICheckRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;

import com.ycl.platform.service.CheckRuleService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.form.CheckRuleForm;
import com.ycl.platform.domain.vo.CheckRuleVO;
import com.ycl.platform.domain.query.CheckRuleQuery;
import java.util.List;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
import org.springframework.stereotype.Service;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.ArrayList;
import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.util.StringUtils;

/**
 * è€ƒæ ¸è§„则Service业务层处理
 * 
 * @author ruoyi
 * @date 2024-04-01
 * è€ƒæ ¸è§„则 æœåŠ¡å®žçŽ°ç±»
 *
 * @author xp
 * @since 2024-03-06
 */
@Service
public class CheckRuleServiceImpl implements ICheckRuleService 
{
    @Autowired
    private CheckRuleMapper checkRuleMapper;
@RequiredArgsConstructor
public class CheckRuleServiceImpl extends ServiceImpl<CheckRuleMapper, CheckRule> implements CheckRuleService {

    private final CheckRuleMapper checkRuleMapper;

    /**
     * æŸ¥è¯¢è€ƒæ ¸è§„则
     * 
     * @param id è€ƒæ ¸è§„则主键
     * @return è€ƒæ ¸è§„则
     * æ·»åŠ 
     * @param form
     * @return
     */
    @Override
    public CheckRule selectCheckRuleById(Long id)
    {
        return checkRuleMapper.selectCheckRuleById(id);
    public Result add(CheckRuleForm form) {
        CheckRule entity = CheckRuleForm.getEntityByForm(form, null);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
        return Result.error("添加失败");
    }

    /**
     * æŸ¥è¯¢è€ƒæ ¸è§„则列表
     * 
     * @param checkRule è€ƒæ ¸è§„则
     * @return è€ƒæ ¸è§„则
     * ä¿®æ”¹
     * @param form
     * @return
     */
    @Override
    public List<CheckRule> selectCheckRuleList(CheckRule checkRule)
    {
        return checkRuleMapper.selectCheckRuleList(checkRule);
    public Result update(CheckRuleForm form) {

        CheckRule entity = baseMapper.selectById(form.getId());

        // ä¸ºç©ºæŠ›IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
        }
        return Result.error("修改失败");
    }

    /**
     * æ–°å¢žè€ƒæ ¸è§„则
     * 
     * @param checkRule è€ƒæ ¸è§„则
     * @return ç»“æžœ
     * æ‰¹é‡åˆ é™¤
     * @param ids
     * @return
     */
    @Override
    public int insertCheckRule(CheckRule checkRule)
    {
        checkRule.setCreateTime(DateUtils.getNowDate());
        return checkRuleMapper.insertCheckRule(checkRule);
    public Result remove(List<String> ids) {
        if(baseMapper.deleteBatchIds(ids) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }

    /**
     * ä¿®æ”¹è€ƒæ ¸è§„则
     * 
     * @param checkRule è€ƒæ ¸è§„则
     * @return ç»“æžœ
     * id删除
     * @param id
     * @return
     */
    @Override
    public int updateCheckRule(CheckRule checkRule)
    {
        checkRule.setUpdateTime(DateUtils.getNowDate());
        return checkRuleMapper.updateCheckRule(checkRule);
    public Result removeById(String id) {
        if(baseMapper.deleteById(id) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸è§„则
     * 
     * @param ids éœ€è¦åˆ é™¤çš„考核规则主键
     * @return ç»“æžœ
     * åˆ†é¡µæŸ¥è¯¢
     * @param query
     * @return
     */
    @Override
    public int deleteCheckRuleByIds(Long[] ids)
    {
        return checkRuleMapper.deleteCheckRuleByIds(ids);
    public Result page(CheckRuleQuery query) {

        IPage<CheckRule> page =  new LambdaQueryChainWrapper<>(baseMapper)
                .like(StringUtils.hasText(query.getRuleName()), CheckRule::getRuleName, query.getRuleName())
                .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
                        CheckRule::getCreateTime,
                        DateUtils.getDayStart(query.getStart()),
                        DateUtils.getDayEnd(query.getEnd()))
                .eq(Objects.nonNull(query.getAuditState()),CheckRule::getAuditState, query.getAuditState())
                .orderByDesc(CheckRule::getCreateTime)
                .page(PageUtil.getPage(query, CheckRule.class));

        List<CheckRuleVO> vos = page.getRecords().stream()
                .map(
                        entity -> CheckRuleVO.getVoByEntity(entity, null)
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos).total(page.getTotal());
    }

    /**
     * åˆ é™¤è€ƒæ ¸è§„则信息
     * 
     * @param id è€ƒæ ¸è§„则主键
     * @return ç»“æžœ
     * æ ¹æ®id查找
     * @param id
     * @return
     */
    @Override
    public int deleteCheckRuleById(Long id)
    {
        return checkRuleMapper.deleteCheckRuleById(id);
    public Result detail(String id) {

        CheckRule entity = baseMapper.selectById(id);
        Assert.notNull(entity, "记录不存在");
        CheckRuleVO vo = CheckRuleVO.getVoByEntity(entity, null);
        return Result.ok().data(vo);
    }

    /**
     * åˆ—表
     * @return
     */
    @Override
    public Result all() {
        List<CheckRule> entities = baseMapper.selectList(null);
        List<BaseSelect> vos = entities.stream()
                .map(
                        entity -> {
                            BaseSelect vo = new BaseSelect();
                            vo.setId(entity.getId());
                            vo.setValue(entity.getRuleName());
                            return vo;
                        }
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateRuleServiceImpl.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java

@@ -1,97 +1,203 @@
package com.ycl.platform.service.impl;

import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.CheckTemplate;
import com.ycl.platform.domain.entity.CheckTemplateRule;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.domain.vo.RuleItemVO;
import com.ycl.platform.mapper.CheckTemplateMapper;
import com.ycl.platform.service.ICheckTemplateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;

import com.ycl.platform.mapper.CheckTemplateRuleMapper;
import com.ycl.platform.service.CheckTemplateService;
import com.ycl.platform.service.YwUnitService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.form.CheckTemplateForm;
import com.ycl.platform.domain.vo.CheckTemplateVO;
import com.ycl.platform.domain.query.CheckTemplateQuery;
import java.util.List;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.ArrayList;
import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.util.StringUtils;

/**
 * è€ƒæ ¸æ¨¡æ¿Service业务层处理
 * 
 * @author ruoyi
 * @date 2024-04-01
 * è€ƒæ ¸æ¨¡æ¿ æœåŠ¡å®žçŽ°ç±»
 *
 * @author xp
 * @since 2024-03-06
 */
@Service
public class CheckTemplateServiceImpl implements ICheckTemplateService 
{
@RequiredArgsConstructor
public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateMapper, CheckTemplate> implements CheckTemplateService {

    private final CheckTemplateMapper checkTemplateMapper;
    private final CheckTemplateRuleMapper checkTemplateRuleMapper;
    @Autowired
    private CheckTemplateMapper checkTemplateMapper;

    private YwUnitService unitService;
    /**
     * æŸ¥è¯¢è€ƒæ ¸æ¨¡æ¿
     * 
     * @param id è€ƒæ ¸æ¨¡æ¿ä¸»é”®
     * @return è€ƒæ ¸æ¨¡æ¿
     * æ·»åŠ 
     * @param form
     * @return
     */
    @Override
    public CheckTemplate selectCheckTemplateById(Long id)
    {
        return checkTemplateMapper.selectCheckTemplateById(id);
    @Transactional(rollbackFor = Exception.class)
    public Result add(CheckTemplateForm form) {
        CheckTemplate entity = CheckTemplateForm.getEntityByForm(form, null);
        baseMapper.insert(entity);
        form.getRuleFormList().stream().forEach(rule -> {
            CheckTemplateRule checkTemplateRule = new CheckTemplateRule();
            checkTemplateRule.setCheckTemplateId(entity.getId());
            checkTemplateRule.setCheckRuleId(rule.getRuleId());
            checkTemplateRule.setWeight(rule.getWeight());
            checkTemplateRuleMapper.insert(checkTemplateRule);
        });
        return Result.ok("添加成功");
    }

    /**
     * æŸ¥è¯¢è€ƒæ ¸æ¨¡æ¿åˆ—表
     * 
     * @param checkTemplate è€ƒæ ¸æ¨¡æ¿
     * @return è€ƒæ ¸æ¨¡æ¿
     * ä¿®æ”¹
     * @param form
     * @return
     */
    @Override
    public List<CheckTemplate> selectCheckTemplateList(CheckTemplate checkTemplate)
    {
        return checkTemplateMapper.selectCheckTemplateList(checkTemplate);
    @Transactional(rollbackFor = Exception.class)
    public Result update(CheckTemplateForm form) {

        CheckTemplate entity = baseMapper.selectById(form.getId());
        // ä¸ºç©ºæŠ›IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        baseMapper.updateById(entity);

        // å…ˆåˆ é™¤åŽŸå…ˆçš„对应关系
        new LambdaUpdateChainWrapper<>(checkTemplateRuleMapper)
                .eq(CheckTemplateRule::getCheckTemplateId, form.getId())
                .remove();
        // å†é‡æ–°æ·»åŠ 
        form.getRuleFormList().stream().forEach(rule -> {
            CheckTemplateRule checkTemplateRule = new CheckTemplateRule();
            checkTemplateRule.setCheckTemplateId(entity.getId());
            checkTemplateRule.setCheckRuleId(rule.getRuleId());
            checkTemplateRule.setWeight(rule.getWeight());
            checkTemplateRuleMapper.insert(checkTemplateRule);
        });
        return Result.ok("修改成功");
    }

    /**
     * æ–°å¢žè€ƒæ ¸æ¨¡æ¿
     * 
     * @param checkTemplate è€ƒæ ¸æ¨¡æ¿
     * @return ç»“æžœ
     * æ‰¹é‡åˆ é™¤
     * @param ids
     * @return
     */
    @Override
    public int insertCheckTemplate(CheckTemplate checkTemplate)
    {
        checkTemplate.setCreateTime(DateUtils.getNowDate());
        return checkTemplateMapper.insertCheckTemplate(checkTemplate);
    @Transactional(rollbackFor = Exception.class)
    public Result remove(List<String> ids) {
        baseMapper.deleteBatchIds(ids);
        new LambdaUpdateChainWrapper<>(checkTemplateRuleMapper)
                .in(CheckTemplateRule::getCheckTemplateId, ids)
                .remove();
        return Result.ok("删除成功");
    }

    /**
     * ä¿®æ”¹è€ƒæ ¸æ¨¡æ¿
     * 
     * @param checkTemplate è€ƒæ ¸æ¨¡æ¿
     * @return ç»“æžœ
     * id删除
     * @param id
     * @return
     */
    @Override
    public int updateCheckTemplate(CheckTemplate checkTemplate)
    {
        checkTemplate.setUpdateTime(DateUtils.getNowDate());
        return checkTemplateMapper.updateCheckTemplate(checkTemplate);
    @Transactional(rollbackFor = Exception.class)
    public Result removeById(String id) {
        baseMapper.deleteById(id);
        new LambdaUpdateChainWrapper<>(checkTemplateRuleMapper)
                .eq(CheckTemplateRule::getCheckTemplateId, id)
                .remove();
        return Result.ok("删除成功");
    }

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸æ¨¡æ¿
     * 
     * @param ids éœ€è¦åˆ é™¤çš„考核模板主键
     * @return ç»“æžœ
     * åˆ†é¡µæŸ¥è¯¢
     * @param query
     * @return
     */
    @Override
    public int deleteCheckTemplateByIds(Long[] ids)
    {
        return checkTemplateMapper.deleteCheckTemplateByIds(ids);
    public Result page(CheckTemplateQuery query) {
        IPage<CheckTemplate> page = new LambdaQueryChainWrapper<>(baseMapper)
                .like(StringUtils.hasText(query.getTemplateName()), CheckTemplate::getTemplateName, query.getTemplateName())
                .eq(StringUtils.hasText(query.getStatus()), CheckTemplate::getStatus, query.getStatus())
                .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
                        CheckTemplate::getCreateTime,
                        DateUtils.getDayStart(query.getStart()),
                        DateUtils.getDayEnd(query.getEnd()))
                .orderByDesc(CheckTemplate::getCreateTime)
                .page(PageUtil.getPage(query, CheckTemplate.class));

        List<CheckTemplateVO> vos = page.getRecords().stream()
                .map(
                        entity -> CheckTemplateVO.getVoByEntity(entity, null)
//                                .setUnitName(unitService.getById(entity.getUnitId()).getUnitName())
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos).total(page.getTotal());
    }

    /**
     * åˆ é™¤è€ƒæ ¸æ¨¡æ¿ä¿¡æ¯
     * 
     * @param id è€ƒæ ¸æ¨¡æ¿ä¸»é”®
     * @return ç»“æžœ
     * æ ¹æ®id查找
     * @param id
     * @return
     */
    @Override
    public int deleteCheckTemplateById(Long id)
    {
        return checkTemplateMapper.deleteCheckTemplateById(id);
    public Result detail(String id) {

        CheckTemplate entity = baseMapper.selectById(id);
        Assert.notNull(entity, "记录不存在");
        CheckTemplateVO vo = CheckTemplateVO.getVoByEntity(entity, null);

        // æŸ¥è€ƒæ ¸è§„则
        List<CheckTemplateRule> ruleList = new LambdaQueryChainWrapper<>(checkTemplateRuleMapper)
                .eq(CheckTemplateRule::getCheckTemplateId, entity.getId())
                .list();
        List<RuleItemVO> ruleVOS = ruleList.stream().map(rule -> {
            RuleItemVO ruleItemVO = new RuleItemVO();
            ruleItemVO.setRuleId(rule.getCheckRuleId());
            ruleItemVO.setWeight(rule.getWeight());
            return ruleItemVO;
        }).collect(Collectors.toList());
        vo.setRuleFormList(ruleVOS);

        return Result.ok().data(vo);
    }

    /**
     * åˆ—表
     * @return
     */
    @Override
    public Result all() {
        List<CheckTemplate> entities = baseMapper.selectList(null);
        List<BaseSelect> vos = entities.stream()
                .map(
                        entity -> {
                            BaseSelect baseSelect = new BaseSelect();
                            baseSelect.setId(entity.getId());
                            baseSelect.setValue(entity.getTemplateName());
                            return baseSelect;
                        }
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java

New file
@@ -0,0 +1,161 @@
package com.ycl.platform.service.impl;

import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.DefaultAuditing;
import com.ycl.platform.domain.form.DefaultAuditForm;
import com.ycl.platform.mapper.DefaultAuditingMapper;
import com.ycl.platform.service.DefaultAuditingService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.form.DefaultAuditingForm;
import com.ycl.platform.domain.vo.DefaultAuditingVO;
import com.ycl.platform.domain.query.DefaultAuditingQuery;

import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import org.springframework.stereotype.Service;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.ArrayList;
import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;

/**
 * è¿è§„审核 æœåŠ¡å®žçŽ°ç±»
 *
 * @author xp
 * @since 2024-03-05
 */
@Service
@RequiredArgsConstructor
public class DefaultAuditingServiceImpl extends ServiceImpl<DefaultAuditingMapper, DefaultAuditing> implements DefaultAuditingService {

    private final DefaultAuditingMapper defaultAuditingMapper;

    /**
     * æ·»åŠ 
     * @param form
     * @return
     */
    @Override
    public Result add(DefaultAuditingForm form) {
        DefaultAuditing entity = DefaultAuditingForm.getEntityByForm(form, null);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
        return Result.error("添加失败");
    }

    /**
     * ä¿®æ”¹
     * @param form
     * @return
     */
    @Override
    public Result update(DefaultAuditingForm form) {

        DefaultAuditing entity = baseMapper.selectById(form.getId());

        // ä¸ºç©ºæŠ›IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
        }
        return Result.error("修改失败");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     * @param ids
     * @return
     */
    @Override
    public Result remove(List<String> ids) {
        if(baseMapper.deleteBatchIds(ids) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }

    /**
     * id删除
     * @param id
     * @return
     */
    @Override
    public Result removeById(String id) {
        if(baseMapper.deleteById(id) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }

    /**
     * åˆ†é¡µæŸ¥è¯¢
     * @param query
     * @return
     */
    @Override
    public Result page(DefaultAuditingQuery query) {
        query.setTime();
        IPage page = PageUtil.getPage(query, DefaultAuditing.class);
        baseMapper.page(page, query);
        return Result.ok().data(page.getRecords()).total(page.getTotal());
    }

    /**
     * æ ¹æ®id查找
     * @param id
     * @return
     */
    @Override
    public Result detail(String id) {

        DefaultAuditing entity = baseMapper.selectById(id);
        Assert.notNull(entity, "记录不存在");
        DefaultAuditingVO vo = DefaultAuditingVO.getVoByEntity(entity, null);
        return Result.ok().data(vo);
    }

    /**
     * åˆ—表
     * @return
     */
    @Override
    public Result all() {
        List<DefaultAuditing> entities = baseMapper.selectList(null);
        List<DefaultAuditingVO> vos = entities.stream()
                .map(
                        entity -> DefaultAuditingVO.getVoByEntity(entity, null)
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }

    @Override
    public Result auditing(DefaultAuditForm form) {
        DefaultAuditing defaultAuditing = baseMapper.selectById(form.getId());
        if (Objects.isNull(defaultAuditing)) {
            throw new ServiceException("该违约不存在");
        }
        if ("pass".equals(form.getAuditingResult())) {
            defaultAuditing.setAuditingStatus("审核通过");
        } else {
            defaultAuditing.setAuditingStatus("审核未通过");
        }
        BeanUtils.copyProperties(form, defaultAuditing);
        defaultAuditing.setAuditingTime(LocalDateTime.now());
        baseMapper.updateById(defaultAuditing);
        return Result.ok("操作成功");
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultPublishServiceImpl.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultResultServiceImpl.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java

@@ -1,97 +1,180 @@
package com.ycl.platform.service.impl;

import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.DefaultRule;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.domain.form.DefaultRuleSetForm;
import com.ycl.platform.mapper.DefaultRuleMapper;
import com.ycl.platform.service.IDefaultRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;

import com.ycl.platform.service.DefaultRuleService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.form.DefaultRuleForm;
import com.ycl.platform.domain.vo.DefaultRuleVO;
import com.ycl.platform.domain.query.DefaultRuleQuery;
import java.util.List;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
import org.springframework.stereotype.Service;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.ArrayList;
import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

/**
 * è¿çº¦è§„则Service业务层处理
 * 
 * @author ruoyi
 * @date 2024-04-01
 * è¿çº¦è§„则 æœåŠ¡å®žçŽ°ç±»
 *
 * @author xp
 * @since 2024-03-05
 */
@Service
public class DefaultRuleServiceImpl implements IDefaultRuleService 
{
    @Autowired
    private DefaultRuleMapper defaultRuleMapper;
@RequiredArgsConstructor
public class DefaultRuleServiceImpl extends ServiceImpl<DefaultRuleMapper, DefaultRule> implements DefaultRuleService {

    private final DefaultRuleMapper defaultRuleMapper;

    /**
     * æŸ¥è¯¢è¿çº¦è§„则
     * 
     * @param id è¿çº¦è§„则主键
     * @return è¿çº¦è§„则
     * æ·»åŠ 
     * @param form
     * @return
     */
    @Override
    public DefaultRule selectDefaultRuleById(Long id)
    {
        return defaultRuleMapper.selectDefaultRuleById(id);
    public Result add(DefaultRuleForm form) {
        DefaultRule entity = DefaultRuleForm.getEntityByForm(form, null);
        entity.setRuleStatus("未启用");
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
        return Result.error("添加失败");
    }

    /**
     * æŸ¥è¯¢è¿çº¦è§„则列表
     * 
     * @param defaultRule è¿çº¦è§„则
     * @return è¿çº¦è§„则
     * ä¿®æ”¹
     * @param form
     * @return
     */
    @Override
    public List<DefaultRule> selectDefaultRuleList(DefaultRule defaultRule)
    {
        return defaultRuleMapper.selectDefaultRuleList(defaultRule);
    public Result update(DefaultRuleForm form) {

        DefaultRule entity = baseMapper.selectById(form.getId());

        // ä¸ºç©ºæŠ›IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
        }
        return Result.error("修改失败");
    }

    /**
     * æ–°å¢žè¿çº¦è§„则
     * 
     * @param defaultRule è¿çº¦è§„则
     * @return ç»“æžœ
     * æ‰¹é‡åˆ é™¤
     * @param ids
     * @return
     */
    @Override
    public int insertDefaultRule(DefaultRule defaultRule)
    {
        defaultRule.setCreateTime(DateUtils.getNowDate());
        return defaultRuleMapper.insertDefaultRule(defaultRule);
    public Result remove(List<String> ids) {
        if(baseMapper.deleteBatchIds(ids) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }

    /**
     * ä¿®æ”¹è¿çº¦è§„则
     * 
     * @param defaultRule è¿çº¦è§„则
     * @return ç»“æžœ
     * id删除
     * @param id
     * @return
     */
    @Override
    public int updateDefaultRule(DefaultRule defaultRule)
    {
        defaultRule.setUpdateTime(DateUtils.getNowDate());
        return defaultRuleMapper.updateDefaultRule(defaultRule);
    public Result removeById(String id) {
        if(baseMapper.deleteById(id) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }

    /**
     * æ‰¹é‡åˆ é™¤è¿çº¦è§„则
     * 
     * @param ids éœ€è¦åˆ é™¤çš„违约规则主键
     * @return ç»“æžœ
     * åˆ†é¡µæŸ¥è¯¢
     * @param query
     * @return
     */
    @Override
    public int deleteDefaultRuleByIds(Long[] ids)
    {
        return defaultRuleMapper.deleteDefaultRuleByIds(ids);
    public Result page(DefaultRuleQuery query) {

        IPage<DefaultRule> page = new LambdaQueryChainWrapper<>(baseMapper)
                .like(StringUtils.hasText(query.getRuleName()), DefaultRule::getRuleName, query.getRuleName())
                .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
                        DefaultRule::getCreateTime,
                        DateUtils.getDayStart(query.getStart()),
                        DateUtils.getDayEnd(query.getEnd()))
                .orderByDesc(DefaultRule::getCreateTime)
                .page(PageUtil.getPage(query, DefaultRule.class));

        List<DefaultRuleVO> vos = page.getRecords().stream()
                .map(
                        entity -> DefaultRuleVO.getVoByEntity(entity, null)
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos).total(page.getTotal());
    }

    /**
     * åˆ é™¤è¿çº¦è§„则信息
     * 
     * @param id è¿çº¦è§„则主键
     * @return ç»“æžœ
     * æ ¹æ®id查找
     * @param id
     * @return
     */
    @Override
    public int deleteDefaultRuleById(Long id)
    {
        return defaultRuleMapper.deleteDefaultRuleById(id);
    public Result detail(String id) {

        DefaultRule entity = baseMapper.selectById(id);
        Assert.notNull(entity, "记录不存在");
        DefaultRuleVO vo = DefaultRuleVO.getVoByEntity(entity, null);
        return Result.ok().data(vo);
    }

    /**
     * åˆ—表
     * @return
     */
    @Override
    public Result all() {
        List<DefaultRule> entities = baseMapper.selectList(null);
        List<DefaultRuleVO> vos = entities.stream()
                .map(
                        entity -> DefaultRuleVO.getVoByEntity(entity, null)
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }

    @Override
    public Result set(DefaultRuleSetForm form) {
        DefaultRule defaultRule = baseMapper.selectById(form.getId());
        if (Objects.isNull(defaultRule)) {
            throw new ServiceException("违约规则不存在");
        }
        if (form.getFlag()) {
            // å¯ç”¨ä¹‹å‰æ£€æŸ¥æ˜¯å¦å·²ç»æœ‰å¯ç”¨çš„规则了，保持一个开启
            List<DefaultRule> useList = new LambdaQueryChainWrapper<>(baseMapper)
                    .eq(DefaultRule::getRuleStatus, "启用")
                    .list();
            if (! CollectionUtils.isEmpty(useList)) {
                throw new ServiceException("已经有规则被启用了，只能同时启用一个规则");
            }
            defaultRule.setRuleStatus("启用");
        } else {
            defaultRule.setRuleStatus("未启用");
        }
        baseMapper.updateById(defaultRule);
        return Result.ok("操作成功");
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultScoreServiceImpl.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateRuleServiceImpl.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateServiceImpl.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/impl/TCheckPublishServiceImpl.java

New file
@@ -0,0 +1,131 @@
package com.ycl.platform.service.impl;

import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.TCheckPublish;
import com.ycl.platform.mapper.TCheckPublishMapper;
import com.ycl.platform.service.ITCheckPublishService;
import com.ycl.system.Result;
import com.ycl.system.entity.SysDept;
import com.ycl.system.entity.SysUser;
import com.ycl.system.mapper.SysUserMapper;
import com.ycl.system.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import utils.DateUtils;

import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * è€ƒæ ¸å‘布Service业务层处理
 * 
 * @author ruoyi
 * @date 2024-03-07
 */
@Service
public class TCheckPublishServiceImpl implements ITCheckPublishService
{
    @Autowired
    private TCheckPublishMapper tCheckPublishMapper;
    @Autowired
    private SysUserMapper userMapper;
    /**
     * æŸ¥è¯¢è€ƒæ ¸å‘布
     * 
     * @param id è€ƒæ ¸å‘布主键
     * @return è€ƒæ ¸å‘布
     */
    @Override
    public TCheckPublish selectTCheckPublishById(Long id)
    {
        return tCheckPublishMapper.selectTCheckPublishById(id);
    }

    /**
     * æŸ¥è¯¢è€ƒæ ¸å‘布列表
     * 
     * @param tCheckPublish è€ƒæ ¸å‘布
     * @return è€ƒæ ¸å‘布
     */
    @Override
    public List<TCheckPublish> selectTCheckPublishList(TCheckPublish tCheckPublish)
    {
        return tCheckPublishMapper.selectTCheckPublishList(tCheckPublish);
    }

    /**
     * æ–°å¢žè€ƒæ ¸å‘布
     * 
     * @param tCheckPublish è€ƒæ ¸å‘布
     * @return ç»“æžœ
     */
    @Override
    public int insertTCheckPublish(TCheckPublish tCheckPublish)
    {
        Date nowDate = DateUtils.getNowDate();
        tCheckPublish.setCreateTime(nowDate);
        tCheckPublish.setUpdateTime(nowDate);
        LoginUser user = (LoginUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        tCheckPublish.setCreateUser(user.getUserId());
        tCheckPublish.setCreateUserName(user.getUsername());
        tCheckPublish.setUpdateUser(user.getUserId());
        tCheckPublish.setUpdateUserName(user.getUsername());
        return tCheckPublishMapper.insertTCheckPublish(tCheckPublish);
    }

    /**
     * ä¿®æ”¹è€ƒæ ¸å‘布
     * 
     * @param tCheckPublish è€ƒæ ¸å‘布
     * @return ç»“æžœ
     */
    @Override
    public int updateTCheckPublish(TCheckPublish tCheckPublish)
    {
        tCheckPublish.setUpdateTime(DateUtils.getNowDate());
        LoginUser user = (LoginUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        tCheckPublish.setUpdateUser(user.getUserId());
        tCheckPublish.setUpdateUserName(user.getUsername());
        return tCheckPublishMapper.updateTCheckPublish(tCheckPublish);
    }

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸å‘布
     * 
     * @param ids éœ€è¦åˆ é™¤çš„考核发布主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteTCheckPublishByIds(Long[] ids)
    {
        return tCheckPublishMapper.deleteTCheckPublishByIds(ids);
    }

    /**
     * åˆ é™¤è€ƒæ ¸å‘布信息
     * 
     * @param id è€ƒæ ¸å‘布主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteTCheckPublishById(Long id)
    {
        return tCheckPublishMapper.deleteTCheckPublishById(id);
    }
    /**
     * ä¸‹æ‹‰åˆ—表
     * */
    @Override
    public Result all() {
        List<BaseSelect> vos = tCheckPublishMapper.selectTCheckPublishList(new TCheckPublish()).stream().map(checkPublish -> {
                    BaseSelect baseSelect = new BaseSelect();
                    baseSelect.setId(Integer.parseInt(checkPublish.getId() + ""));
                    baseSelect.setValue(checkPublish.getExamineName());
                    return baseSelect;
                }
        ).collect(Collectors.toList());
        return Result.ok().data(vos);
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/TExamineScoreServiceImpl.java

New file
@@ -0,0 +1,99 @@
package com.ycl.platform.service.impl;

import com.ycl.platform.domain.entity.TExamineScore;
import com.ycl.platform.domain.vo.TExamineScoreVO;
import com.ycl.platform.mapper.TExamineScoreMapper;
import com.ycl.platform.service.ITExamineScoreService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;

import java.util.List;

/**
 * è€ƒæ ¸è®¡åˆ†Service业务层处理
 * 
 * @author ruoyi
 * @date 2024-03-13
 */
@Service
public class TExamineScoreServiceImpl implements ITExamineScoreService 
{
    @Autowired
    private TExamineScoreMapper tExamineScoreMapper;

    /**
     * æŸ¥è¯¢è€ƒæ ¸è®¡åˆ†
     * 
     * @param id è€ƒæ ¸è®¡åˆ†ä¸»é”®
     * @return è€ƒæ ¸è®¡åˆ†
     */
    @Override
    public TExamineScore selectTExamineScoreById(Long id)
    {
        return tExamineScoreMapper.selectTExamineScoreById(id);
    }

    /**
     * æŸ¥è¯¢è€ƒæ ¸è®¡åˆ†åˆ—表
     * 
     * @param tExamineScore è€ƒæ ¸è®¡åˆ†
     * @return è€ƒæ ¸è®¡åˆ†
     */
    @Override
    public List<TExamineScoreVO> selectTExamineScoreList(TExamineScore tExamineScore)
    {


        return tExamineScoreMapper.selectTExamineScoreList(tExamineScore);
    }

    /**
     * æ–°å¢žè€ƒæ ¸è®¡åˆ†
     * 
     * @param tExamineScore è€ƒæ ¸è®¡åˆ†
     * @return ç»“æžœ
     */
    @Override
    public int insertTExamineScore(TExamineScore tExamineScore)
    {
        tExamineScore.setCreateTime(DateUtils.getNowDate());
        return tExamineScoreMapper.insertTExamineScore(tExamineScore);
    }

    /**
     * ä¿®æ”¹è€ƒæ ¸è®¡åˆ†
     * 
     * @param tExamineScore è€ƒæ ¸è®¡åˆ†
     * @return ç»“æžœ
     */
    @Override
    public int updateTExamineScore(TExamineScore tExamineScore)
    {
        return tExamineScoreMapper.updateTExamineScore(tExamineScore);
    }

    /**
     * æ‰¹é‡åˆ é™¤è€ƒæ ¸è®¡åˆ†
     * 
     * @param ids éœ€è¦åˆ é™¤çš„考核计分主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteTExamineScoreByIds(Long[] ids)
    {
        return tExamineScoreMapper.deleteTExamineScoreByIds(ids);
    }

    /**
     * åˆ é™¤è€ƒæ ¸è®¡åˆ†ä¿¡æ¯
     * 
     * @param id è€ƒæ ¸è®¡åˆ†ä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteTExamineScoreById(Long id)
    {
        return tExamineScoreMapper.deleteTExamineScoreById(id);
    }
}

 ycl-server/src/main/resources/application-dev.yml

@@ -116,11 +116,3 @@
  # è¯·æ±‚前缀
  pathMapping: /dev-api

# MongoDB配置
spring:
  data:
    mongodb:
      host: 42.193.1.25
      database: zgyw
      port: 27017


 ycl-server/src/main/resources/mapper/ycl/YwThresholdMapper.xml

 ycl-server/src/main/resources/mapper/zgyw/AccountingRulesMapper.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.AccountingRulesMapper">

    <resultMap type="com.ycl.platform.domain.entity.AccountingRules" id="AccountingRulesResult">
        <result property="id" column="id"/>
        <result property="rulesName" column="rules_name"/>
        <result property="contractName" column="contract_name"/>
        <result property="amount" column="amount"/>
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
        <result property="deleted" column="deleted"/>
    </resultMap>

    <sql id="selectAccountingRulesVo">
        select id, rules_name, contract_name, amount, create_time, update_time, deleted
        from t_accounting_rules
    </sql>

    <select id="selectAccountingRulesList" parameterType="com.ycl.platform.domain.entity.AccountingRules" resultMap="AccountingRulesResult">
        <include refid="selectAccountingRulesVo"/>
        <where>
            <if test="rulesName != null  and rulesName != ''">and rules_name like concat('%', #{rulesName}, '%')</if>
            <if test="contractName != null  and contractName != ''">and contract_name like concat('%', #{contractName}, '%')</if>
            <if test="deleted != null  and deleted != ''">and deleted = #{deleted}</if>
        </where>
    </select>

    <select id="selectAccountingRulesById" parameterType="Integer" resultMap="AccountingRulesResult">
        <include refid="selectAccountingRulesVo"/>
        where id = #{id}
    </select>

    <insert id="insertAccountingRules" parameterType="com.ycl.platform.domain.entity.AccountingRules" useGeneratedKeys="true" keyProperty="id">
        insert into t_accounting_rules
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="rulesName != null">rules_name,</if>
            <if test="contractName != null">contract_name,</if>
            <if test="amount != null">amount,</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="rulesName != null">#{rulesName},</if>
            <if test="contractName != null">#{contractName},</if>
            <if test="amount != null">#{amount},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="deleted != null">#{deleted},</if>
        </trim>
    </insert>

    <update id="updateAccountingRules" parameterType="com.ycl.platform.domain.entity.AccountingRules">
        update t_accounting_rules
        <trim prefix="SET" suffixOverrides=",">
            <if test="rulesName != null">rules_name = #{rulesName},</if>
            <if test="contractName != null">contract_name = #{contractName},</if>
            <if test="amount != null">amount = #{amount},</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="deleteAccountingRulesById" parameterType="Integer">
        delete
        from t_accounting_rules
        where id = #{id}
    </delete>

    <delete id="deleteAccountingRulesByIds" parameterType="String">
        delete from t_accounting_rules where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>

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

File was deleted

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

File was deleted

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

@@ -1,88 +1,54 @@
<?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">
<?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.CheckResultMapper">
    
    <resultMap type="com.ycl.platform.domain.entity.CheckResult" id="CheckResultResult">
        <result property="id"    column="id"    />
        <result property="deptId"    column="dept_id"    />
        <result property="publishId"    column="publish_id"    />
        <result property="examineCategory"    column="examine_category"    />
        <result property="checkScore"    column="check_score"    />
        <result property="publish"    column="publish"    />
        <result property="checkTime"    column="check_time"    />
        <result property="updateTime"    column="update_time"    />
        <result property="deleted"    column="deleted"    />

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.CheckResultVO">
        <result column="id" property="id" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="unit_name" property="checkUnitName" />
        <result column="examine_name" property="examineName" />
        <result column="check_score" property="checkScore" />
        <result column="system_score" property="systemScore" />
        <result column="manual_score" property="manualScore" />
        <result column="check_time" property="checkTime" />
        <result column="frequency" property="frequency" />
        <result column="examine_range" property="examineRange" />
        <result column="publish" property="publish" />
    </resultMap>

    <sql id="selectCheckResultVo">
        select id, dept_id, publish_id, examine_category, check_score, publish, check_time, update_time, deleted from t_check_result
    </sql>

    <select id="selectCheckResultList" resultMap="CheckResultResult">
        <include refid="selectCheckResultVo"/>
        <where>  
            <if test="deptId != null "> and dept_id = #{deptId}</if>
            <if test="publishId != null "> and publish_id = #{publishId}</if>
            <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
            <if test="publish != null "> and publish = #{publish}</if>
            <if test="checkTime != null "> and check_time = #{checkTime}</if>
    <select id="page" resultMap="BaseResultMap">
        SELECT
               tcr.id,
               tyu.unit_name,
               tcp.examine_name,
               tcp.examine_range,
               tcp.frequency,
               tcr.check_time,
               tcr.check_score,
               tcr.system_score,
               tcr.manual_score,
               tcr.publish
        FROM
             t_check_result tcr
                 INNER JOIN t_check_publish tcp ON tcr.check_publish_id = tcp.id
                 INNER JOIN t_yw_unit tyu ON tcr.check_unit_id = tyu.id
        <where>
                AND tcr.deleted = 0
            <if test="query.checkUnitName != null and query.checkUnitName != ''">
                AND tyu.unit_name like concat('%', #{query.checkUnitName}, '%')
            </if>
            <if test="query.frequency != null and query.frequency != ''">
                AND tcp.frequency = #{query.frequency}
            </if>
            <if test="query.frequency != null and query.frequency != ''">
                AND tcp.examine_range = #{query.examineRange}
            </if>
            <if test="query.start != null and query.end != null">
                AND tcr.check_time BETWEEN #{query.start} AND #{query.end}
            </if>
        </where>
    </select>
    
    <select id="selectCheckResultById"  resultMap="CheckResultResult">
        <include refid="selectCheckResultVo"/>
        where id = #{id}
    </select>
        
    <insert id="insertCheckResult" useGeneratedKeys="true" keyProperty="id">
        insert into t_check_result
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="deptId != null">dept_id,</if>
            <if test="publishId != null">publish_id,</if>
            <if test="examineCategory != null">examine_category,</if>
            <if test="checkScore != null">check_score,</if>
            <if test="publish != null">publish,</if>
            <if test="checkTime != null">check_time,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="deleted != null">deleted,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="deptId != null">#{deptId},</if>
            <if test="publishId != null">#{publishId},</if>
            <if test="examineCategory != null">#{examineCategory},</if>
            <if test="checkScore != null">#{checkScore},</if>
            <if test="publish != null">#{publish},</if>
            <if test="checkTime != null">#{checkTime},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="deleted != null">#{deleted},</if>
         </trim>
    </insert>

    <update id="updateCheckResult" >
        update t_check_result
        <trim prefix="SET" suffixOverrides=",">
            <if test="deptId != null">dept_id = #{deptId},</if>
            <if test="publishId != null">publish_id = #{publishId},</if>
            <if test="examineCategory != null">examine_category = #{examineCategory},</if>
            <if test="checkScore != null">check_score = #{checkScore},</if>
            <if test="publish != null">publish = #{publish},</if>
            <if test="checkTime != null">check_time = #{checkTime},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="deleted != null">deleted = #{deleted},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteCheckResultById" >
        delete from t_check_result where id = #{id}
    </delete>

    <delete id="deleteCheckResultByIds" >
        delete from t_check_result where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>
</mapper>

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

@@ -1,97 +1,17 @@
<?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">
<?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.CheckRuleMapper">
    
    <resultMap type="com.ycl.platform.domain.entity.CheckRule" id="CheckRuleResult">
        <result property="id"    column="id"    />
        <result property="ruleName"    column="rule_name"    />
        <result property="ruleDetail"    column="rule_detail"    />
        <result property="ruleCategory"    column="rule_category"    />
        <result property="examineCategory"    column="examine_category"    />
        <result property="ruleDescription"    column="rule_description"    />
        <result property="auditState"    column="audit_state"    />
        <result property="state"    column="state"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateTime"    column="update_time"    />
        <result property="deleted"    column="deleted"    />

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.CheckRuleVO">
        <result column="id" property="id" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="rule_name" property="ruleName" />
        <result column="rule_detail" property="ruleDetail" />
        <result column="video_point_num" property="videoPointNum" />
        <result column="vehicle_checkpoint_num" property="vehicleCheckpointNum" />
        <result column="face_chceckpoint_num" property="faceChceckpointNum" />
    </resultMap>

    <sql id="selectCheckRuleVo">
        select id, rule_name, rule_detail, rule_category, examine_category, rule_description, audit_state, state, create_time, update_time, deleted from t_check_rule
    </sql>

    <select id="selectCheckRuleList" resultMap="CheckRuleResult">
        <include refid="selectCheckRuleVo"/>
        <where>  
            <if test="ruleName != null  and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
            <if test="ruleCategory != null "> and rule_category = #{ruleCategory}</if>
            <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
            <if test="ruleDescription != null  and ruleDescription != ''"> and rule_description = #{ruleDescription}</if>
            <if test="auditState != null "> and audit_state = #{auditState}</if>
            <if test="state != null "> and state = #{state}</if>
        </where>
    </select>
    
    <select id="selectCheckRuleById" resultMap="CheckRuleResult">
        <include refid="selectCheckRuleVo"/>
        where id = #{id}
    </select>
        
    <insert id="insertCheckRule" useGeneratedKeys="true" keyProperty="id">
        insert into t_check_rule
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="ruleName != null and ruleName != ''">rule_name,</if>
            <if test="ruleDetail != null">rule_detail,</if>
            <if test="ruleCategory != null">rule_category,</if>
            <if test="examineCategory != null">examine_category,</if>
            <if test="ruleDescription != null">rule_description,</if>
            <if test="auditState != null">audit_state,</if>
            <if test="state != null">state,</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="ruleDetail != null">#{ruleDetail},</if>
            <if test="ruleCategory != null">#{ruleCategory},</if>
            <if test="examineCategory != null">#{examineCategory},</if>
            <if test="ruleDescription != null">#{ruleDescription},</if>
            <if test="auditState != null">#{auditState},</if>
            <if test="state != null">#{state},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="deleted != null">#{deleted},</if>
         </trim>
    </insert>

    <update id="updateCheckRule" >
        update t_check_rule
        <trim prefix="SET" suffixOverrides=",">
            <if test="ruleName != null and ruleName != ''">rule_name = #{ruleName},</if>
            <if test="ruleDetail != null">rule_detail = #{ruleDetail},</if>
            <if test="ruleCategory != null">rule_category = #{ruleCategory},</if>
            <if test="examineCategory != null">examine_category = #{examineCategory},</if>
            <if test="ruleDescription != null">rule_description = #{ruleDescription},</if>
            <if test="auditState != null">audit_state = #{auditState},</if>
            <if test="state != null">state = #{state},</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="deleteCheckRuleById" >
        delete from t_check_rule where id = #{id}
    </delete>

    <delete id="deleteCheckRuleByIds" >
        delete from t_check_rule where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>
</mapper>

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

File was deleted

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

@@ -1,109 +1,15 @@
<?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">
<?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.CheckTemplateMapper">
    
    <resultMap type="com.ycl.platform.domain.entity.CheckTemplate" id="CheckTemplateResult">
        <result property="id"    column="id"    />
        <result property="templateName"    column="template_name"    />
        <result property="adjustCoefficient"    column="adjust_coefficient"    />
        <result property="adjustWay"    column="adjust_way"    />
        <result property="examineCategory"    column="examine_category"    />
        <result property="status"    column="status"    />
        <result property="deptId"    column="dept_id"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateTime"    column="update_time"    />
        <result property="createUser"    column="create_user"    />
        <result property="createUserName"    column="create_user_name"    />
        <result property="updateUser"    column="update_user"    />
        <result property="updateUserName"    column="update_user_name"    />
        <result property="deleted"    column="deleted"    />

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.CheckTemplateVO">
        <result column="id" property="id" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="adjust_coefficient" property="adjustCoefficient" />
        <result column="adjust_way" property="adjustWay" />
        <result column="status" property="status" />
    </resultMap>

    <sql id="selectCheckTemplateVo">
        select id, template_name, adjust_coefficient, adjust_way, examine_category, status, dept_id, create_time, update_time, create_user, create_user_name, update_user, update_user_name, deleted from t_check_template
    </sql>

    <select id="selectCheckTemplateList" resultMap="CheckTemplateResult">
        <include refid="selectCheckTemplateVo"/>
        <where>  
            <if test="templateName != null  and templateName != ''"> and template_name like concat('%', #{templateName}, '%')</if>
            <if test="adjustCoefficient != null "> and adjust_coefficient = #{adjustCoefficient}</if>
            <if test="adjustWay != null  and adjustWay != ''"> and adjust_way = #{adjustWay}</if>
            <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
            <if test="status != null  and status != ''"> and status = #{status}</if>
            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
        </where>
    </select>
    
    <select id="selectCheckTemplateById" resultMap="CheckTemplateResult">
        <include refid="selectCheckTemplateVo"/>
        where id = #{id}
    </select>
        
    <insert id="insertCheckTemplate" useGeneratedKeys="true" keyProperty="id">
        insert into t_check_template
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="templateName != null and templateName != ''">template_name,</if>
            <if test="adjustCoefficient != null">adjust_coefficient,</if>
            <if test="adjustWay != null and adjustWay != ''">adjust_way,</if>
            <if test="examineCategory != null">examine_category,</if>
            <if test="status != null">status,</if>
            <if test="deptId != null">dept_id,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="createUser != null">create_user,</if>
            <if test="createUserName != null">create_user_name,</if>
            <if test="updateUser != null">update_user,</if>
            <if test="updateUserName != null">update_user_name,</if>
            <if test="deleted != null">deleted,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="templateName != null and templateName != ''">#{templateName},</if>
            <if test="adjustCoefficient != null">#{adjustCoefficient},</if>
            <if test="adjustWay != null and adjustWay != ''">#{adjustWay},</if>
            <if test="examineCategory != null">#{examineCategory},</if>
            <if test="status != null">#{status},</if>
            <if test="deptId != null">#{deptId},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="createUser != null">#{createUser},</if>
            <if test="createUserName != null">#{createUserName},</if>
            <if test="updateUser != null">#{updateUser},</if>
            <if test="updateUserName != null">#{updateUserName},</if>
            <if test="deleted != null">#{deleted},</if>
         </trim>
    </insert>

    <update id="updateCheckTemplate">
        update t_check_template
        <trim prefix="SET" suffixOverrides=",">
            <if test="templateName != null and templateName != ''">template_name = #{templateName},</if>
            <if test="adjustCoefficient != null">adjust_coefficient = #{adjustCoefficient},</if>
            <if test="adjustWay != null and adjustWay != ''">adjust_way = #{adjustWay},</if>
            <if test="examineCategory != null">examine_category = #{examineCategory},</if>
            <if test="status != null">status = #{status},</if>
            <if test="deptId != null">dept_id = #{deptId},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="createUser != null">create_user = #{createUser},</if>
            <if test="createUserName != null">create_user_name = #{createUserName},</if>
            <if test="updateUser != null">update_user = #{updateUser},</if>
            <if test="updateUserName != null">update_user_name = #{updateUserName},</if>
            <if test="deleted != null">deleted = #{deleted},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteCheckTemplateById" parameterType="Long">
        delete from t_check_template where id = #{id}
    </delete>

    <delete id="deleteCheckTemplateByIds" parameterType="String">
        delete from t_check_template where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>
</mapper>

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

File was deleted

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

New file
@@ -0,0 +1,54 @@
<?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.DefaultAuditingMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.DefaultAuditingVO">
        <result column="id" property="id" />
        <result column="create_time" property="createTime" />
        <result column="score" property="score" />
        <result column="check_publish_id" property="checkPublishId" />
        <result column="default_id" property="defaultId" />
        <result column="auditing_status" property="auditingStatus" />
        <result column="remark" property="remark" />
        <result column="auditing_time" property="auditingTime" />
        <result column="nick_name" property="auditingUserName" />
        <result column="rule_name" property="defaultRuleName" />
        <result column="unit_name" property="unitName" />
        <result column="create_by" property="createBy" />
    </resultMap>

    <select id="page" resultMap="BaseResultMap">
        SELECT
               tda.id,
               tda.score,
               tda.check_publish_id,
               tda.create_time,
               tda.default_id,
               tda.auditing_status,
               tda.remark,
               tda.auditing_time,
               tda.auditing_user,
               su.nick_name,
               tda.create_by,
               (SELECT unit_name FROM t_yw_unit WHERE id = tdr.unit_id AND deleted = 0) as unit_name,
               (SELECT rule_name FROM t_default_rule WHERE id = tdr.default_rule_id AND deleted = 0) as rule_name
        FROM
             t_default_auditing tda
              INNER JOIN t_default_record tdr ON tda.default_id = tdr.id AND tda.deleted = 0 AND tdr.deleted = 0
              LEFT JOIN sys_user su ON tda.auditing_user = su.user_id
        <where>

            <if test="query.unitId != null and query.unitId != ''">
                AND tdr.unit_id = #{query.unitId}
            </if>
            <if test="query.auditingStartTime != null and query.auditingEndTime != null">
                AND tda.auditing_time BETWEEN #{query.auditingStartTime} AND #{query.auditingEndTime}
            </if>
            <if test="query.createStartTime != null and query.createEndTime != null">
                AND tda.create_time BETWEEN #{query.createStartTime} AND #{query.createEndTime}
            </if>
        </where>
    </select>

</mapper>

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

File was deleted

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

File was deleted

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

@@ -1,90 +1,15 @@
<?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">
<?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 id="BaseResultMap" type="com.ycl.platform.domain.vo.DefaultRuleVO">
        <result column="id" property="id" />
        <result column="create_time" property="createTime" />
        <result column="rule_name" property="ruleName" />
        <result column="rule_detail" property="ruleDetail" />
        <result column="rule_desc" property="ruleDesc" />
        <result column="rule_status" property="ruleStatus" />
    </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>
</mapper>

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

File was deleted

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

File was deleted

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

File was deleted

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

New file
@@ -0,0 +1,133 @@
<?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.TCheckPublishMapper">
    
    <resultMap type="com.ycl.platform.domain.entity.TCheckPublish" id="TCheckPublishResult">
        <result property="id"    column="id"    />
        <result property="examineName"    column="examine_name"    />
        <result property="templateId"    column="template_id"    />
        <result property="examineRange"    column="examine_range"    />
        <result property="frequency"    column="frequency"    />
        <result property="state"    column="state"    />
        <result property="createTime"    column="create_time"    />
        <result property="createUser"    column="create_user"    />
        <result property="createUserName"    column="create_user_name"    />
        <result property="updateTime"    column="update_time"    />
        <result property="updateUser"    column="update_user"    />
        <result property="updateUserName"    column="update_user_name"    />
        <result property="description"    column="description"    />
        <result property="alarmScore"    column="alarm_score"    />
        <result property="auditState"    column="audit_state"    />
        <result property="auditUser"    column="audit_user"    />
        <result property="auditDescription"    column="audit_description"    />
        <result property="auditTime"    column="audit_time"    />
    </resultMap>

    <sql id="selectTCheckPublishVo">
        select id , examine_name, template_id , examine_range , frequency , state , create_time , create_user , update_time ,
               update_user , description,create_user_name,update_user_name,alarm_score ,audit_state,audit_user,audit_description,audit_time
        from t_check_publish
    </sql>

    <select id="selectTCheckPublishList" parameterType="com.ycl.platform.domain.entity.TCheckPublish" resultMap="TCheckPublishResult">
        <include refid="selectTCheckPublishVo"/>
        <where>  
            <if test="templateId != null "> and template_id = #{templateId}</if>
            <if test="examineName != null  and examineName != '' "> and examine_name = #{examineName}</if>
            <if test="examineRange != null "> and examine_range = #{examineRange}</if>
            <if test="frequency != null "> and frequency = #{frequency}</if>
            <if test="state != null "> and state = #{state}</if>
            <if test="createUser != null "> and create_user = #{createUser}</if>
            <if test="updateUser != null "> and update_user = #{updateUser}</if>
            <if test="description != null  and description != ''"> and description = #{description}</if>
            <if test="alarmScore != null"> and alarm_score = #{alarmScore}</if>
            <if test="auditState != null"> and audit_state = #{auditState}</if>
        </where>
    </select>
    
    <select id="selectTCheckPublishById" parameterType="Long" resultMap="TCheckPublishResult">
        <include refid="selectTCheckPublishVo"/>
        where id = #{id}
    </select>
        
    <insert id="insertTCheckPublish" parameterType="com.ycl.platform.domain.entity.TCheckPublish">
        insert into t_check_publish
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="examineName != null and examineName != ''">examine_name,</if>
            <if test="templateId != null">template_id,</if>
            <if test="examineRange != null">examine_range,</if>
            <if test="frequency != null">frequency,</if>
            <if test="state != null">state,</if>
            <if test="createTime != null">create_time,</if>
            <if test="createUser != null">create_user,</if>
            <if test="createUserName != null and createUserName!= ''">create_user_name,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="updateUser != null">update_user,</if>
            <if test="updateUserName != null and updateUserName!= ''">update_user_name,</if>
            <if test="description != null">description,</if>
            <if test="alarmScore != null">alarm_score,</if>
            <if test="auditState != null">alarm_state,</if>
            <if test="auditUser != null and auditUser!=''">alarm_user,</if>
            <if test="auditDescription != null auditDescription!=''">alarm_description,</if>
            <if test="auditTime != null">alarm_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="examineName != null and examineName != ''">#{examineName},</if>
            <if test="templateId != null">#{templateId},</if>
            <if test="examineRange != null">#{examineRange},</if>
            <if test="frequency != null">#{frequency},</if>
            <if test="state != null">#{state},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="createUser != null">#{createUser},</if>
            <if test="createUserName != null and createUserName!= ''">#{createUserName},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="updateUser != null">#{updateUser},</if>
            <if test="updateUserName != null and updateUserName!= ''">#{updateUserName},</if>
            <if test="description != null">#{description},</if>
            <if test="alarmScore != null">#{alarmScore},</if>
            <if test="auditState != null">#{alarmState),</if>
            <if test="auditUser != null and auditUser!=''">#{auditUser},</if>
            <if test="auditDescription != null auditDescription!=''">#{auditDescription},</if>
            <if test="auditTime != null">#{auditTime},</if>
         </trim>
    </insert>

    <update id="updateTCheckPublish" parameterType="com.ycl.platform.domain.entity.TCheckPublish">
        update t_check_publish
        <trim prefix="SET" suffixOverrides=",">
            <if test="examineName != null and examineName != ''">examine_name = #{examineName},</if>
            <if test="templateId != null">template_id = #{templateId},</if>
            <if test="examineRange != null">examine_range = #{examineRange},</if>
            <if test="frequency != null">frequency = #{frequency},</if>
            <if test="state != null">state = #{state},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="createUser != null">create_user = #{createUser},</if>
            <if test="createUserName != null and createUserName!= ''">create_user_name = #{createUserName},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="updateUser != null">update_user = #{updateUser},</if>
            <if test="updateUserName != null and updateUserName!= ''">update_user_name = #{updateUserName},</if>
            <if test="description != null">description = #{description},</if>
            <if test="alarmScore != null">alarm_score = #{alarmScore},</if>
            <if test="auditState != null">audit_state = #{alarmState),</if>
            <if test="auditUser != null and auditUser!=''">audit_user = #{auditUser},</if>
            <if test="auditDescription != null auditDescription!=''">audit_description = #{auditDescription},</if>
            <if test="auditTime != null">audit_time = #{auditTime},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteTCheckPublishById" parameterType="Long">
        delete from t_check_publish where id = #{id}
    </delete>

    <delete id="deleteTCheckPublishByIds" parameterType="String">
        delete from t_check_publish where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>

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

New file
@@ -0,0 +1,87 @@
<?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.TExamineScoreMapper">
    
    <resultMap type="com.ycl.platform.domain.entity.TExamineScore" id="TExamineScoreResult">
        <result property="id"    column="id"    />
        <result property="score"    column="score"    />
        <result property="unitId"    column="unit_id"    />
        <result property="examineId"    column="examine_id"    />
        <result property="examineCategory"    column="examine_category"    />
        <result property="ruleCategory"    column="rule_category"    />
        <result property="createTime"    column="create_time"    />
        <result property="createBy"    column="create_by"    />
    </resultMap>

    <sql id="selectTExamineScoreVo">
        select id, score, unit_id, examine_id, examine_category, rule_category, create_time, create_by from t_examine_score
    </sql>

    <select id="selectTExamineScoreList" resultType="com.ycl.platform.domain.vo.TExamineScoreVO">
        select tes.id, tes.score, tyu.unit_name, tcp.examine_name, tes.examine_category,tes.rule_category,tes.create_time, tes.create_by
        from t_examine_score tes
        left join t_check_publish tcp on tes.examine_id = tcp.id
        left join t_yw_unit tyu on tes.unit_id = tyu.id
        <where>
            <if test="score != null "> and score = #{score}</if>
            <if test="unitId != null "> and unit_id = #{unitId}</if>
            <if test="examineId != null "> and examine_id = #{examineId}</if>
            <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
            <if test="ruleCategory != null "> and rule_category = #{ruleCategory</if>
        </where>
    </select>
    
    <select id="selectTExamineScoreById" parameterType="Long" resultMap="TExamineScoreResult">
        <include refid="selectTExamineScoreVo"/>
        where id = #{id}
    </select>
        
    <insert id="insertTExamineScore" useGeneratedKeys="true" keyProperty="id">
        insert into t_examine_score
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="score != null">score,</if>
            <if test="unitId != null">unit_id,</if>
            <if test="examineId != null">examine_id,</if>
            <if test="examineCategory != null">examine_category,</if>
            <if test="ruleCategory != null">rule_category,</if>
            <if test="createTime != null">create_time,</if>
            <if test="createBy != null">create_by,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="score != null">#{score},</if>
            <if test="unitId != null">#{unitId},</if>
            <if test="examineId != null">#{examineId},</if>
            <if test="examineCategory != null">#{examineCategory},</if>
            <if test="ruleCategory != null">#{ruleCategory},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="createBy != null">#{createBy},</if>
         </trim>
    </insert>

    <update id="updateTExamineScore">
        update t_examine_score
        <trim prefix="SET" suffixOverrides=",">
            <if test="score != null">score = #{score},</if>
            <if test="unitId != null">unit_id = #{unitId},</if>
            <if test="examineId != null">examine_id = #{examineId},</if>
            <if test="examineCategory != null">examine_category = #{examineCategory},</if>
            <if test="ruleCategory != null">rule_category = #{ruleCategory},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteTExamineScoreById" parameterType="Long">
        delete from t_examine_score where id = #{id}
    </delete>

    <delete id="deleteTExamineScoreByIds" parameterType="String">
        delete from t_examine_score where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>