From 586510e643625b09f08e7289d90c9d5df1a56304 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 26 四月 2024 14:17:13 +0800 Subject: [PATCH] 字段调整 --- ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java | 6 ++++++ ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java | 8 ++++++++ ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java | 13 +++---------- ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml | 13 ++++++++----- ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateReport.java | 4 ++++ 5 files changed, 29 insertions(+), 15 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java index 26c4d7b..06fc99d 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java +++ b/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; + } diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateReport.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateReport.java index fb44a73..daf7456 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateReport.java +++ b/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; + } diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java index 4870bf9..61523f6 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java +++ b/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(); diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java index 7560cef..d770ebb 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java +++ b/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 @@ /** 鎵e噺鎬婚噾棰� */ private BigDecimal deductMoney; - /** 鍝勾鐨� */ - private Integer whichYear; - - /** 鍝湀鐨� */ - private Integer whichMonth; - /** 淇敼浜� */ private String updateBy; + /** 鏈�杩戜竴娆℃牳绠楁椂闂� */ + private LocalDateTime latestTime; + /** 鏄庣粏 */ private List<CalculateRecordVO> recordList; diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml index 1bf3060..a70a9b1 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml +++ b/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"> -- Gitblit v1.8.0