考核模块需求修改

fuliqi

2024-03-26 2090500dab57f9c898b3d8f0d580046d311fd0eb

考核模块需求修改

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

@@ -49,5 +49,7 @@
    @TableField("unit_id")
    private Integer unitId;


    @ApiModelProperty("考核类型")
    @TableField("examine_category")
    private String examineCategory;
}

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

@@ -32,15 +32,28 @@
    @Excel(name = "考核id")
    private Long examineId;

    /** 操作类型 1/2 系统打分/人工打分 */
    @Excel(name = "操作类型 1/2 系统打分/人工打分")
    private Long operateCategory;
    @Excel(name = "考核类型")
    private Long examineCategory;
    @Excel(name = "规则类型")
    private Long ruleCategory;

    /** 积分类型 */
    @Excel(name = "积分类型")
    private Long scoreCategory;
    public Long getRuleCategory() {
        return ruleCategory;
    }

    public void setId(Long id) 
    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;
    }
@@ -76,36 +89,16 @@
    {
        return examineId;
    }
    public void setOperateCategory(Long operateCategory) 
    {
        this.operateCategory = operateCategory;
    }

    public Long getOperateCategory() 
    {
        return operateCategory;
    }
    public void setScoreCategory(Long scoreCategory) 
    {
        this.scoreCategory = scoreCategory;
    }

    public Long getScoreCategory() 
    {
        return scoreCategory;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("score", getScore())
            .append("unitId", getUnitId())
            .append("examineId", getExamineId())
            .append("operateCategory", getOperateCategory())
            .append("scoreCategory", getScoreCategory())
            .append("createTime", getCreateTime())
            .append("createBy", getCreateBy())
            .toString();
        return "TExamineScore{" +
                "id=" + id +
                ", score=" + score +
                ", unitId=" + unitId +
                ", examineId=" + examineId +
                ", examineCategory=" + examineCategory +
                ", ruleCategory=" + ruleCategory +
                '}';
    }
}

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

@@ -43,6 +43,9 @@
    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) {

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

@@ -32,16 +32,20 @@
    @Excel(name = "考核id")
    private Long examineId;

    /** 操作类型 1/2 系统打分/人工打分 */
    @Excel(name = "操作类型 1/2 系统打分/人工打分")
    private Long operateCategory;

    /** 积分类型 */
    @Excel(name = "积分类型")
    private Long scoreCategory;
    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;
@@ -95,23 +99,13 @@
    {
        return examineId;
    }
    public void setOperateCategory(Long operateCategory) 
    {
        this.operateCategory = operateCategory;

    public String getExamineCategory() {
        return examineCategory;
    }

    public Long getOperateCategory() 
    {
        return operateCategory;
    }
    public void setScoreCategory(Long scoreCategory) 
    {
        this.scoreCategory = scoreCategory;
    }

    public Long getScoreCategory() 
    {
        return scoreCategory;
    public void setExamineCategory(String examineCategory) {
        this.examineCategory = examineCategory;
    }

    @Override
@@ -121,8 +115,8 @@
                ", score=" + score +
                ", unitId=" + unitId +
                ", examineId=" + examineId +
                ", operateCategory=" + operateCategory +
                ", scoreCategory=" + scoreCategory +
                ", examineCategory='" + examineCategory + '\'' +
                ", ruleCategory='" + ruleCategory + '\'' +
                ", unitName='" + unitName + '\'' +
                ", examineName='" + examineName + '\'' +
                '}';

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

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

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

@@ -9,18 +9,18 @@
        <result property="score"    column="score"    />
        <result property="unitId"    column="unit_id"    />
        <result property="examineId"    column="examine_id"    />
        <result property="operateCategory"    column="operate_category"    />
        <result property="scoreCategory"    column="score_category"    />
        <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, operate_category, score_category, create_time, create_by from t_examine_score
        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.operate_category, tes.score_category,tes.create_time, tes.create_by
        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
@@ -28,8 +28,8 @@
            <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="operateCategory != null "> and operate_category = #{operateCategory}</if>
            <if test="scoreCategory != null "> and score_category = #{scoreCategory}</if>
            <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
            <if test="ruleCategory != null "> and rule_category = #{ruleCategory</if>
        </where>
    </select>
    
@@ -44,8 +44,8 @@
            <if test="score != null">score,</if>
            <if test="unitId != null">unit_id,</if>
            <if test="examineId != null">examine_id,</if>
            <if test="operateCategory != null">operate_category,</if>
            <if test="scoreCategory != null">score_category,</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>
@@ -53,8 +53,8 @@
            <if test="score != null">#{score},</if>
            <if test="unitId != null">#{unitId},</if>
            <if test="examineId != null">#{examineId},</if>
            <if test="operateCategory != null">#{operateCategory},</if>
            <if test="scoreCategory != null">#{scoreCategory},</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>
@@ -66,8 +66,8 @@
            <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="operateCategory != null">operate_category = #{operateCategory},</if>
            <if test="scoreCategory != null">score_category = #{scoreCategory},</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>