emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfo.java
@@ -9,6 +9,16 @@ @TableName("work_approve") public class EmergencyWorkApproveInfo { private Integer sort ; public Integer getSort() { return sort; } public void setSort(Integer sort) { this.sort = sort; } @TableId(type = IdType.AUTO) private Long id;
@@ -9,6 +9,16 @@ @TableName("work_approve") public class EmergencyWorkApproveInfoDetailDO { private Integer sort ; public Integer getSort() { return sort; } public void setSort(Integer sort) { this.sort = sort; } @TableId(type = IdType.AUTO) private Long id;
@@ -9,6 +9,16 @@ @TableName("work_approve") public class EmergencyWorkApproveInfoPageDO { private Integer sort ; public Integer getSort() { return sort; } public void setSort(Integer sort) { this.sort = sort; } @TableId(type = IdType.AUTO) private Long id;
@@ -2,6 +2,16 @@ public class EmergencyWorkApproveReqDTO { private Integer sort ; public Integer getSort() { return sort; } public void setSort(Integer sort) { this.sort = sort; } private Long id; //流程名称 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java
@@ -6,6 +6,16 @@ public class EmergencyWorkApproveDetailRespDTO { private Integer sort ; public Integer getSort() { return sort; } public void setSort(Integer sort) { this.sort = sort; } private Long id; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
@@ -6,6 +6,16 @@ public class EmergencyWorkApprovePageRespDTO { private Integer sort ; public Integer getSort() { return sort; } public void setSort(Integer sort) { this.sort = sort; } private Long id; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date gmtCreate; emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
@@ -87,6 +87,7 @@ EmergencyWorkApproveInfo.setGmtCreate(nowDate); EmergencyWorkApproveInfo.setSubmitPersonId(uid); EmergencyWorkApproveInfo.setSubmitPersonName(uName); EmergencyWorkApproveInfo.setSort(1); workApproveInfoService.addWorkApprove(EmergencyWorkApproveInfo); return new ResultVO(ResultCodes.OK); } @@ -120,6 +121,7 @@ newEmergencyWorkApproveInfo.setSubmitPersonName(uName); newEmergencyWorkApproveInfo.setApproveResult(null); newEmergencyWorkApproveInfo.setApproveMemo(null); newEmergencyWorkApproveInfo.setSort(newEmergencyWorkApproveInfo.getSort()+1); workApproveInfoService.addWorkApprove(newEmergencyWorkApproveInfo); } return new ResultVO(ResultCodes.OK); emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml
@@ -15,16 +15,17 @@ <result column="approve_status" property="approveStatus"/> <result column="approve_result" property="approveResult"/> <result column="approve_memo" property="approveMemo"/> <result column="sort" property="sort"/> </resultMap> <select id="selectWorkApproveList" resultMap="emergencyWorkApproveInfoPageDOResult"> select id,`work_name`,`title`,`submit_person_id`,submit_person_name,approve_person_id,approve_person_name, select id,`work_name`,`title`,`submit_person_id`,submit_person_name,approve_person_id,approve_person_name,sort , `approve_status`,approve_result ,approve_memo ,gmt_create from emergency_work_approve where del_flag = 0 and relate_type = #{query.relateType} and relate_id = #{query.relateId} <if test="query.startTime != null "> and gmt_create <![CDATA[ >= ]]> #{query.startTime}</if> <if test="query.endTime != null "> and gmt_create <![CDATA[ <= ]]> #{query.endTime}</if> order by gmt_create desc order by sort desc </select> <insert id="addWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo" @@ -50,6 +51,7 @@ <if test="relateType != null ">relate_type,</if> <if test="relateId != null ">relate_id,</if> <if test="relateDesc != null and relateDesc != ''">relate_desc,</if> <if test="sort != null ">sort,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null ">#{id},</if> @@ -71,6 +73,7 @@ <if test="relateType != null ">#{relateType},</if> <if test="relateId != null ">#{relateId},</if> <if test="relateDesc != null and relateDesc != ''">#{relateDesc},</if> <if test="sort != null ">#{sort},</if> </trim> </insert> @@ -87,19 +90,20 @@ <result column="relate_type" property="relateType"/> <result column="relate_id" property="relateId"/> <result column="relate_desc" property="relateDesc"/> <result column="sort" property="sort"/> </resultMap> <select id="selectWorkApproveById" resultMap="WorkApproveInfoDetailDOResult"> select id,gmt_create ,work_name,title,`submit_person_id`,`approve_person_id`,`approve_status`,approve_result,`approve_memo`, select id,gmt_create ,work_name,title,`submit_person_id`,`approve_person_id`,`approve_status`,approve_result,`approve_memo`,sort , `relate_type`,relate_id,`relate_desc` from emergency_work_approve where del_flag = 0 and id = #{id} </select> <select id="selectWorkApproveByRelateTypeAndRelateId" resultMap="WorkApproveInfoDetailDOResult"> select id,`work_name`,`title`,`submit_person_id`,submit_person_name,approve_person_id,approve_person_name, select id,`work_name`,`title`,`submit_person_id`,submit_person_name,approve_person_id,approve_person_name,sort , `approve_status`,approve_result ,approve_memo ,gmt_create from emergency_work_approve where del_flag = 0 and relate_type = #{type} and relate_id = #{id} order by gmt_create desc order by sort desc </select> <update id="updateWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo"> @@ -120,6 +124,7 @@ <if test="relateType != null ">relate_type = #{relateType},</if> <if test="relateId != null ">relate_id = #{relateId},</if> <if test="relateDesc != null and relateDesc != ''">relate_desc = #{relateDesc},</if> <if test="sort != null and sort != ''">sort = #{sort},</if> </trim> where id = #{id} </update>
