emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyWorkApproveController.java
@@ -43,7 +43,7 @@ /** * 应急预案详情 */ @RequestMapping(value = "//{id}",method = RequestMethod.GET) @RequestMapping(value = "/info/{id}",method = RequestMethod.GET) public ResultVO<EmergencyWorkApproveDetailRespDTO> getWorkApproveById(@PathVariable("id")Long id){ return workApproveService.getWorkApproveById(id); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java
@@ -20,20 +20,8 @@ private String title; //提交人ID/外键 private Long submitPersonId; //审批人ID/外键 private Long approvePersonId; //审批状态 1:未审批 2:审批中 3:审批完成 private Integer approveStatus; //审批意见 private Boolean approveResult; //审批意见 private String approveMemo; //关联业务类型 private Integer relateType; //关联的审批对象表ID private Long relateId; //关联业务说明 private String relateDesc; public Long getId() { return id; @@ -75,13 +63,6 @@ this.submitPersonId = submitPersonId; } public Long getApprovePersonId() { return approvePersonId; } public void setApprovePersonId(Long approvePersonId) { this.approvePersonId = approvePersonId; } public Integer getApproveStatus() { return approveStatus; @@ -91,43 +72,4 @@ this.approveStatus = approveStatus; } public Boolean getApproveResult() { return approveResult; } public void setApproveResult(Boolean approveResult) { this.approveResult = approveResult; } public String getApproveMemo() { return approveMemo; } public void setApproveMemo(String approveMemo) { this.approveMemo = approveMemo; } public Integer getRelateType() { return relateType; } public void setRelateType(Integer relateType) { this.relateType = relateType; } public Long getRelateId() { return relateId; } public void setRelateId(Long relateId) { this.relateId = relateId; } public String getRelateDesc() { return relateDesc; } public void setRelateDesc(String relateDesc) { this.relateDesc = relateDesc; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java
@@ -6,7 +6,6 @@ public class EmergencySuppliesPageRespDTO { @TableId(type = IdType.AUTO) private Long id; private String name; emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java
@@ -1,8 +1,16 @@ package com.gkhy.safePlatform.emergency.model.dto.resp; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; public class EmergencyWorkApproveDetailRespDTO { private Long id; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date gmtCreate; //流程名称 private String workName; @@ -113,4 +121,12 @@ public void setRelateDesc(String relateDesc) { this.relateDesc = relateDesc; } public Date getGmtCreate() { return gmtCreate; } public void setGmtCreate(Date gmtCreate) { this.gmtCreate = gmtCreate; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
@@ -1,8 +1,15 @@ package com.gkhy.safePlatform.emergency.model.dto.resp; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; public class EmergencyWorkApprovePageRespDTO { private Long id; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date gmtCreate; //流程名称 private String workName; @@ -10,20 +17,8 @@ private String title; //提交人ID/外键 private Long submitPersonId; //审批人ID/外键 private Long approvePersonId; //审批状态 1:未审批 2:审批中 3:审批完成 private Integer approveStatus; //审批意见 private Boolean approveResult; //审批意见 private String approveMemo; //关联业务类型 1:目标检查 2:目标上报 private Integer relateType; //关联的审批对象表ID private Long relateId; //关联业务说明 private String relateDesc; public Long getId() { return id; @@ -33,6 +28,13 @@ this.id = id; } public Date getGmtCreate() { return gmtCreate; } public void setGmtCreate(Date gmtCreate) { this.gmtCreate = gmtCreate; } public String getWorkName() { return workName; @@ -58,13 +60,6 @@ this.submitPersonId = submitPersonId; } public Long getApprovePersonId() { return approvePersonId; } public void setApprovePersonId(Long approvePersonId) { this.approvePersonId = approvePersonId; } public Integer getApproveStatus() { return approveStatus; @@ -72,45 +67,5 @@ public void setApproveStatus(Integer approveStatus) { this.approveStatus = approveStatus; } public Boolean getApproveResult() { return approveResult; } public void setApproveResult(Boolean approveResult) { this.approveResult = approveResult; } public String getApproveMemo() { return approveMemo; } public void setApproveMemo(String approveMemo) { this.approveMemo = approveMemo; } public Integer getRelateType() { return relateType; } public void setRelateType(Integer relateType) { this.relateType = relateType; } public Long getRelateId() { return relateId; } public void setRelateId(Long relateId) { this.relateId = relateId; } public String getRelateDesc() { return relateDesc; } public void setRelateDesc(String relateDesc) { this.relateDesc = relateDesc; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java
@@ -7,13 +7,24 @@ public class EmergencyWorkApproveQuery { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date gmtCreate; private Date startTime; public Date getGmtCreate() { return gmtCreate; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; public Date getStartTime() { return startTime; } public void setGmtCreate(Date gmtCreate) { this.gmtCreate = gmtCreate; public void setStartTime(Date startTime) { this.startTime = startTime; } public Date getEndTime() { return endTime; } public void setEndTime(Date endTime) { this.endTime = endTime; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyWorkApproveDBQuery.java
@@ -7,13 +7,24 @@ public class EmergencyWorkApproveDBQuery { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date gmtCreate; private Date startTime; public Date getGmtCreate() { return gmtCreate; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; public Date getStartTime() { return startTime; } public void setGmtCreate(Date gmtCreate) { this.gmtCreate = gmtCreate; public void setStartTime(Date startTime) { this.startTime = startTime; } public Date getEndTime() { return endTime; } public void setEndTime(Date endTime) { this.endTime = endTime; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyWorkApproveServiceImpl.java
@@ -17,31 +17,31 @@ public class EmergencyWorkApproveServiceImpl extends ServiceImpl<EmergencyWorkApproveInfoRepository, EmergencyWorkApproveInfo> implements EmergencyWorkApproveInfoService { @Autowired private EmergencyWorkApproveInfoRepository EmergencyWorkApproveInfoRepository; private EmergencyWorkApproveInfoRepository emergencyWorkApproveInfoRepository; @Override public List<EmergencyWorkApproveInfoPageDO> selectWorkApproveList(Page<EmergencyWorkApproveInfoPageDO> page, EmergencyWorkApproveDBQuery EmergencyWorkApproveDBQuery) { return EmergencyWorkApproveInfoRepository.selectWorkApproveList(page, EmergencyWorkApproveDBQuery); return emergencyWorkApproveInfoRepository.selectWorkApproveList(page, EmergencyWorkApproveDBQuery); } @Override public void addWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo) { EmergencyWorkApproveInfoRepository.addWorkApprove(EmergencyWorkApproveInfo); emergencyWorkApproveInfoRepository.addWorkApprove(EmergencyWorkApproveInfo); } @Override public EmergencyWorkApproveInfoDetailDO selectWorkApproveById(Long id) { return EmergencyWorkApproveInfoRepository.selectWorkApproveById(id); return emergencyWorkApproveInfoRepository.selectWorkApproveById(id); } @Override public void updateWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo) { EmergencyWorkApproveInfoRepository.updateWorkApprove(EmergencyWorkApproveInfo); emergencyWorkApproveInfoRepository.updateWorkApprove(EmergencyWorkApproveInfo); } @Override public void deleteWorkApproveById(Long teamId) { EmergencyWorkApproveInfoRepository.deleteWorkApproveById(teamId); emergencyWorkApproveInfoRepository.deleteWorkApproveById(teamId); } emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml
对比新文件 @@ -0,0 +1,111 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.gkhy.safePlatform.emergency.repository.EmergencyWorkApproveInfoRepository"> <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO" id="emergencyWorkApproveInfoPageDOResult"> <id column="id" property="id" jdbcType="BIGINT"/> <result column="gmt_create" property="gmtCreate"/> <result column="work_name" property="workName"/> <result column="title" property="title"/> <result column="submit_person_id" property="submitPersonId"/> <result column="approve_status" property="approveStatus"/> </resultMap> <select id="selectWorkApproveList" resultMap="emergencyWorkApproveInfoPageDOResult"> select id,`work_name`,`title`,`submit_person_id`,`approve_status`,gmt_create from emergency_work_approve where del_flag = 0 <if test="query.startTime != null "> and gmt_create <![CDATA[ >= ]]> #{query.startTime}</if> <if test="query.endTime != null "> and gmt_create <![CDATA[ <= ]]> #{query.endTime}</if> </select> <insert id="addWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo" keyProperty="id" useGeneratedKeys="true"> insert into emergency_work_approve <trim prefix="(" suffix=")" suffixOverrides=","> <if test="id != null ">id,</if> <if test="delFlag != null ">del_flag,</if> <if test="gmtCreate != null ">gmt_create,</if> <if test="gmtModitify != null ">gmt_moditify,</if> <if test="createUid != null ">create_uid,</if> <if test="updateUid != null ">update_uid,</if> <if test="workName != null and workName != ''">work_name,</if> <if test="title != null and title != ''">title,</if> <if test="submitPersonId != null ">submit_person_id,</if> <if test="approvePersonId != null ">approve_person_id,</if> <if test="approveStatus != null ">approve_status,</if> <if test="approveResult != null ">approve_result,</if> <if test="approveMemo != null and approveMemo != ''">approve_memo,</if> <if test="relateType != null ">relate_type,</if> <if test="relateId != null ">relate_id,</if> <if test="relateDesc != null and relateDesc != ''">relate_desc,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null ">#{id},</if> <if test="delFlag != null ">#{delFlag},</if> <if test="gmtCreate != null ">#{gmtCreate},</if> <if test="gmtModitify != null ">#{gmtModitify},</if> <if test="createUid != null ">#{createUid},</if> <if test="updateUid != null ">#{updateUid},</if> <if test="workName != null and workName != ''">#{workName},</if> <if test="title != null and title != ''">#{title},</if> <if test="submitPersonId != null ">#{submitPersonId},</if> <if test="approvePersonId != null ">#{approvePersonId},</if> <if test="approveStatus != null ">#{approveStatus},</if> <if test="approveResult != null ">#{approveResult},</if> <if test="approveMemo != null and approveMemo != ''">#{approveMemo},</if> <if test="relateType != null ">#{relateType},</if> <if test="relateId != null ">#{relateId},</if> <if test="relateDesc != null and relateDesc != ''">#{relateDesc},</if> </trim> </insert> <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO" id="WorkApproveInfoDetailDOResult"> <id column="id" property="id" jdbcType="BIGINT"/> <result column="work_name" property="workName"/> <result column="title" property="title"/> <result column="submit_person_id" property="submitPersonId"/> <result column="approve_person_id" property="approvePersonId"/> <result column="approve_status" property="approveStatus"/> <result column="approve_result" property="approveResult"/> <result column="approve_memo" property="approveMemo"/> <result column="relate_type" property="relateType"/> <result column="relate_id" property="relateId"/> <result column="relate_desc" property="relateDesc"/> </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`, `relate_type`,relate_id,`relate_desc` from emergency_work_approve where del_flag = 0 and id = #{id} </select> <update id="updateWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo"> update emergency_work_approve <trim prefix="SET" suffixOverrides=","> <if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if> <if test="updateUid != null ">update_uid = #{updateUid},</if> <if test="workName != null and workName != ''">work_name = #{workName},</if> <if test="title != null and title != ''">title = #{title},</if> <if test="submitPersonId != null ">submit_person_id = #{submitPersonId},</if> <if test="approvePersonId != null ">approve_person_id = #{approvePersonId},</if> <if test="approveStatus != null ">approve_status = #{approveStatus},</if> <if test="approveResult != null ">approve_result = #{approveResult},</if> <if test="approveMemo != null and approveMemo != ''">approve_memo = #{approveMemo},</if> <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> </trim> where id = #{id} </update> <update id="deleteWorkApproveById"> update emergency_work_approve set del_flag = 1 where id = #{id} </update> </mapper> emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoRepository.xml
文件已删除 incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/WorkInjuryDeclarationInfoMapper.xml
@@ -115,7 +115,7 @@ FROM work_injury_declaration a LEFT JOIN accident_express b ON a.accident_express_id = b.id WHERE del_flag = 0 and id = #{id} WHERE a.del_flag = 0 and a.id = #{id} </select> <update id="updateWorkInjuryDeclaration" parameterType="com.gkhy.safePlatform.incidentManage.entity.WorkInjuryDeclarationInfo"> pom.xml
@@ -121,6 +121,11 @@ <artifactId>poi-ooxml</artifactId> <version>${poi.version}</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>${commons.utils.version}</version> </dependency> <dependency> <groupId>com.alibaba.cloud</groupId> @@ -182,12 +187,6 @@ <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> <version>${poi.version}</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>${commons.utils.version}</version> </dependency> <!-- redis连接 -->