diff --git a/src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java b/src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java index 0ea6848a..4dbdd39b 100644 --- a/src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java +++ b/src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java @@ -232,4 +232,11 @@ public class ErfExpApplyData implements Serializable { private Date expectedFinishEndDate; private String pendingStatus; + + /** + * 下达时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date submitTime; } diff --git a/src/main/java/com/xujie/sys/modules/erf/entity/ErfExpApply.java b/src/main/java/com/xujie/sys/modules/erf/entity/ErfExpApply.java index 4275dd84..9d30f890 100644 --- a/src/main/java/com/xujie/sys/modules/erf/entity/ErfExpApply.java +++ b/src/main/java/com/xujie/sys/modules/erf/entity/ErfExpApply.java @@ -165,4 +165,11 @@ public class ErfExpApply implements Serializable { */ @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; + + /** + * 下达时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date submitTime; } diff --git a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java index 0b5d4457..d7f337b4 100644 --- a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java @@ -152,6 +152,7 @@ public class ErfExpApplyServiceImpl extends ServiceImpl + @@ -64,7 +65,8 @@ creator_user_id, creator_name, create_time, - update_time + update_time, + submit_time FROM erf_exp_apply @@ -130,7 +132,8 @@ creator_user_id, creator_name, create_time, - update_time + update_time, + submit_time FROM erf_exp_apply WHERE apply_no = #{applyNo} @@ -164,7 +167,8 @@ a.creator_user_id, a.creator_name, a.create_time, - a.update_time + a.update_time, + a.submit_time FROM erf_exp_apply a INNER JOIN erf_flow_node_instance n ON a.apply_no = n.apply_no