字段调整

xiangpei

2024-04-26 586510e643625b09f08e7289d90c9d5df1a56304

字段调整

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

@@ -39,5 +39,13 @@
    @TableField("score")
    private BigDecimal score;

    @ApiModelProperty("哪年")
    @TableField("which_year")
    private Integer whichYear;

    @ApiModelProperty("哪月")
    @TableField("which_month")
    private Integer whichMonth;


}

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

@@ -48,5 +48,9 @@
    @TableField("update_by")
    private String updateBy;

    @ApiModelProperty("最近一次核算时间")
    @TableField("latest_time")
    private LocalDateTime latestTime;


}

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

@@ -33,6 +33,12 @@
    /** 考核分数 */
    private BigDecimal score;

    /** 哪年 */
    private Integer whichYear;

    /** 哪月 */
    private Integer whichMonth;

    public static CalculateRecordVO getVoByEntity(@NonNull CalculateRecord entity, CalculateRecordVO vo) {
        if(vo == null) {
            vo = new CalculateRecordVO();

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

@@ -7,13 +7,9 @@
import java.util.List;
import java.time.LocalDateTime;

import com.ycl.platform.domain.form.CalculateRecordForm;
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;

/**
 * 核算报告展示
@@ -39,15 +35,12 @@
    /** 扣减总金额 */
    private BigDecimal deductMoney;

    /** 哪年的 */
    private Integer whichYear;

    /** 哪月的 */
    private Integer whichMonth;

    /** 修改人 */
    private String updateBy;

    /** 最近一次核算时间 */
    private LocalDateTime latestTime;

    /** 明细 */
    private List<CalculateRecordVO> recordList;


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

@@ -11,8 +11,7 @@
        <result column="contract_id" property="contractId"/>
        <result column="calculate_time" property="calculateTime"/>
        <result column="deduct_money" property="deductMoney"/>
        <result column="which_year" property="whichYear"/>
        <result column="which_month" property="whichMonth"/>
        <result column="latest_time" property="latestTime"/>
        <result column="update_by" property="updateBy"/>
    </resultMap>

@@ -25,8 +24,7 @@
        tcr.create_time,
        tcr.update_time,
        tcr.calculate_time,
        tcr.which_year,
        tcr.which_month
        tcr.latest_time
        FROM
        t_calculate_report tcr
        INNER JOIN t_contract tc ON tcr.contract_id = tc.id
@@ -67,11 +65,16 @@
               id,
               create_time  as createTime,
               score,
               deduct_money as deductMoney
               deduct_money as deductMoney,
               which_year as whichYear,
               which_month as whichMonth
        FROM
             t_calculate_record
        WHERE
              contract_id = #{contractId} AND deleted = 0
        ORDER BY
            create_time DESC

    </select>

    <select id="getById" resultMap="DetailResultMap">