Browse Source

下达时间

master
han\hanst 4 weeks ago
parent
commit
368710256c
  1. 7
      src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java
  2. 7
      src/main/java/com/xujie/sys/modules/erf/entity/ErfExpApply.java
  3. 1
      src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
  4. 10
      src/main/resources/mapper/erf/ErfExpApplyMapper.xml

7
src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java

@ -232,4 +232,11 @@ public class ErfExpApplyData implements Serializable {
private Date expectedFinishEndDate; private Date expectedFinishEndDate;
private String pendingStatus; private String pendingStatus;
/**
* 下达时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date submitTime;
} }

7
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) @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime; private Date updateTime;
/**
* 下达时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date submitTime;
} }

1
src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java

@ -152,6 +152,7 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
// 更新申请单状态updateTime由MyBatis-Plus自动填充 // 更新申请单状态updateTime由MyBatis-Plus自动填充
entity.setStatus("已下达"); entity.setStatus("已下达");
entity.setSubmitTime(new Date());
entity.setCurrentStep("技术经理审批"); entity.setCurrentStep("技术经理审批");
this.updateById(entity); this.updateById(entity);

10
src/main/resources/mapper/erf/ErfExpApplyMapper.xml

@ -32,6 +32,7 @@
<result column="creator_name" property="creatorName"/> <result column="creator_name" property="creatorName"/>
<result column="create_time" property="createTime"/> <result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/> <result column="update_time" property="updateTime"/>
<result column="submit_time" property="submitTime"/>
</resultMap> </resultMap>
<!-- 查询申请单列表 --> <!-- 查询申请单列表 -->
@ -64,7 +65,8 @@
creator_user_id, creator_user_id,
creator_name, creator_name,
create_time, create_time,
update_time
update_time,
submit_time
FROM erf_exp_apply FROM erf_exp_apply
<where> <where>
<if test="data.applyNo != null and data.applyNo != ''"> <if test="data.applyNo != null and data.applyNo != ''">
@ -130,7 +132,8 @@
creator_user_id, creator_user_id,
creator_name, creator_name,
create_time, create_time,
update_time
update_time,
submit_time
FROM erf_exp_apply FROM erf_exp_apply
WHERE apply_no = #{applyNo} WHERE apply_no = #{applyNo}
</select> </select>
@ -164,7 +167,8 @@
a.creator_user_id, a.creator_user_id,
a.creator_name, a.creator_name,
a.create_time, a.create_time,
a.update_time
a.update_time,
a.submit_time
FROM erf_exp_apply a FROM erf_exp_apply a
INNER JOIN erf_flow_node_instance n ON a.apply_no = n.apply_no INNER JOIN erf_flow_node_instance n ON a.apply_no = n.apply_no
<where> <where>

Loading…
Cancel
Save