emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
@@ -83,18 +83,12 @@ @Override public ResultVO updateWorkApprove(Long uid, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) { Date nowDate = new Date(); //查询是否存在 EmergencyWorkApproveInfoDetailDO EmergencyWorkApproveInfoDetailDO = workApproveInfoService.selectWorkApproveById(EmergencyWorkApproveReqDTO.getId()); if (EmergencyWorkApproveInfoDetailDO == null) { throw new EmergencyException(EmergencyResultCodes.TEAM_NOT_EXIST); } else { EmergencyWorkApproveInfo EmergencyWorkApproveInfo = new EmergencyWorkApproveInfo(); BeanUtils.copyProperties(EmergencyWorkApproveReqDTO, EmergencyWorkApproveInfo); EmergencyWorkApproveInfo.setUpdateUid(uid); EmergencyWorkApproveInfo.setGmtModitify(nowDate); workApproveInfoService.updateWorkApprove(EmergencyWorkApproveInfo); return new ResultVO(ResultCodes.OK); } EmergencyWorkApproveInfo EmergencyWorkApproveInfo = new EmergencyWorkApproveInfo(); BeanUtils.copyProperties(EmergencyWorkApproveReqDTO, EmergencyWorkApproveInfo); EmergencyWorkApproveInfo.setUpdateUid(uid); EmergencyWorkApproveInfo.setGmtModitify(nowDate); workApproveInfoService.updateWorkApprove(EmergencyWorkApproveInfo); return new ResultVO(ResultCodes.OK); } @Override incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentWorkApproveController.java
对比新文件 @@ -0,0 +1,67 @@ package com.gkhy.safePlatform.incidentManage.controller; import com.gkhy.safePlatform.commons.co.ContextCacheUser; import com.gkhy.safePlatform.commons.query.PageQuery; import com.gkhy.safePlatform.commons.utils.PageUtils; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentWorkApproveReqDTO; import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApproveDetailRespDTO; import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApprovePageRespDTO; import com.gkhy.safePlatform.incidentManage.query.AccidentWorkApproveQuery; import com.gkhy.safePlatform.incidentManage.service.AccidentWorkApproveService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.web.bind.annotation.*; import java.util.List; @RestController @RequestMapping("/accidentWorkApprove") public class AccidentWorkApproveController { @Autowired private AccidentWorkApproveService workApproveService; /** * 应急预案列表 */ @RequestMapping(value = "/page/list" ,method = RequestMethod.POST) private ResultVO<List<AccidentWorkApprovePageRespDTO>> list (@RequestBody PageQuery<AccidentWorkApproveQuery> pageQuery){ PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize()); return workApproveService.selectWorkApproveList(pageQuery); } /** * 应急预案新增 */ @RequestMapping(value = "/add",method = RequestMethod.POST) public ResultVO addWorkApprove(Authentication authentication, @RequestBody AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO) { ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); return workApproveService.addWorkApprove(currentUser.getUid(), AccidentWorkApproveReqDTO); } /** * 应急预案详情 */ @RequestMapping(value = "/info/{id}",method = RequestMethod.GET) public ResultVO<AccidentWorkApproveDetailRespDTO> getWorkApproveById(@PathVariable("id")Long id){ return workApproveService.getWorkApproveById(id); } /** * 应急预案修改 */ @RequestMapping(value = "/update",method = RequestMethod.POST) public ResultVO updateWorkApprove(Authentication authentication, @RequestBody AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO) { ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); return workApproveService.updateWorkApprove(currentUser.getUid(), AccidentWorkApproveReqDTO); } /** * 应急预案删除/批量删除 */ @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET) public ResultVO batchDeleteWorkApprove(@PathVariable("ids")String ids){ return workApproveService.batchDeleteWorkApprove(ids); } } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfo.java
对比新文件 @@ -0,0 +1,173 @@ package com.gkhy.safePlatform.incidentManage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @TableName("work_approve") public class AccidentWorkApproveInfo { @TableId(type = IdType.AUTO) private Long id; private Boolean delFlag; private Date gmtCreate; private Date gmtModitify; private Long createUid; private Long updateUid; //流程名称 private String workName; //流程标题 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; } public void setId(Long id) { this.id = id; } public Boolean getDelFlag() { return delFlag; } public void setDelFlag(Boolean delFlag) { this.delFlag = delFlag; } public Date getGmtCreate() { return gmtCreate; } public void setGmtCreate(Date gmtCreate) { this.gmtCreate = gmtCreate; } public Date getGmtModitify() { return gmtModitify; } public void setGmtModitify(Date gmtModitify) { this.gmtModitify = gmtModitify; } public Long getCreateUid() { return createUid; } public void setCreateUid(Long createUid) { this.createUid = createUid; } public Long getUpdateUid() { return updateUid; } public void setUpdateUid(Long updateUid) { this.updateUid = updateUid; } public String getWorkName() { return workName; } public void setWorkName(String workName) { this.workName = workName; } public String getTitle() { return title; } public void setTitle(String title) { this.title = title; } public Long getSubmitPersonId() { return submitPersonId; } public void setSubmitPersonId(Long submitPersonId) { this.submitPersonId = submitPersonId; } public Long getApprovePersonId() { return approvePersonId; } public void setApprovePersonId(Long approvePersonId) { this.approvePersonId = approvePersonId; } public Integer getApproveStatus() { return approveStatus; } 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; } } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoDetailDO.java
对比新文件 @@ -0,0 +1,133 @@ package com.gkhy.safePlatform.incidentManage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @TableName("work_approve") public class AccidentWorkApproveInfoDetailDO { @TableId(type = IdType.AUTO) private Long id; private Date gmtCreate; //流程名称 private String workName; //流程标题 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; } public void setId(Long id) { this.id = id; } public Date getGmtCreate() { return gmtCreate; } public void setGmtCreate(Date gmtCreate) { this.gmtCreate = gmtCreate; } public String getWorkName() { return workName; } public void setWorkName(String workName) { this.workName = workName; } public String getTitle() { return title; } public void setTitle(String title) { this.title = title; } public Long getSubmitPersonId() { return submitPersonId; } public void setSubmitPersonId(Long submitPersonId) { this.submitPersonId = submitPersonId; } public Long getApprovePersonId() { return approvePersonId; } public void setApprovePersonId(Long approvePersonId) { this.approvePersonId = approvePersonId; } public Integer getApproveStatus() { return approveStatus; } 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; } } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoPageDO.java
对比新文件 @@ -0,0 +1,75 @@ package com.gkhy.safePlatform.incidentManage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; @TableName("work_approve") public class AccidentWorkApproveInfoPageDO { @TableId(type = IdType.AUTO) private Long id; private Date gmtCreate; //流程名称 private String workName; //流程标题 private String title; //提交人ID/外键 private Long submitPersonId; //审批状态 1:未审批 2:审批中 3:审批完成 private Integer approveStatus; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public Date getGmtCreate() { return gmtCreate; } public void setGmtCreate(Date gmtCreate) { this.gmtCreate = gmtCreate; } public String getWorkName() { return workName; } public void setWorkName(String workName) { this.workName = workName; } public String getTitle() { return title; } public void setTitle(String title) { this.title = title; } public Long getSubmitPersonId() { return submitPersonId; } public void setSubmitPersonId(Long submitPersonId) { this.submitPersonId = submitPersonId; } public Integer getApproveStatus() { return approveStatus; } public void setApproveStatus(Integer approveStatus) { this.approveStatus = approveStatus; } } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/ApproveStatus.java
对比新文件 @@ -0,0 +1,24 @@ package com.gkhy.safePlatform.incidentManage.enums; public enum ApproveStatus { NOT_APPROVE(1), UNDER_APPROVE(2), COMPLETED_APPROVE(3); private Integer status; public Integer getStatus() { return status; } public void setStatus(Integer status) { this.status = status; } ApproveStatus(Integer status) { this.status = status; } } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentWorkApproveReqDTO.java
对比新文件 @@ -0,0 +1,116 @@ package com.gkhy.safePlatform.incidentManage.model.dto.req; public class AccidentWorkApproveReqDTO { private Long id; //流程名称 private String workName; //流程标题 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; } public void setId(Long id) { this.id = id; } public String getWorkName() { return workName; } public void setWorkName(String workName) { this.workName = workName; } public String getTitle() { return title; } public void setTitle(String title) { this.title = title; } public Long getSubmitPersonId() { return submitPersonId; } public void setSubmitPersonId(Long submitPersonId) { this.submitPersonId = submitPersonId; } public Long getApprovePersonId() { return approvePersonId; } public void setApprovePersonId(Long approvePersonId) { this.approvePersonId = approvePersonId; } public Integer getApproveStatus() { return approveStatus; } 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; } } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApproveDetailRespDTO.java
对比新文件 @@ -0,0 +1,132 @@ package com.gkhy.safePlatform.incidentManage.model.dto.resp; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; public class AccidentWorkApproveDetailRespDTO { private Long id; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date gmtCreate; //流程名称 private String workName; //流程标题 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; } public void setId(Long id) { this.id = id; } public String getWorkName() { return workName; } public void setWorkName(String workName) { this.workName = workName; } public String getTitle() { return title; } public void setTitle(String title) { this.title = title; } public Long getSubmitPersonId() { return submitPersonId; } public void setSubmitPersonId(Long submitPersonId) { this.submitPersonId = submitPersonId; } public Long getApprovePersonId() { return approvePersonId; } public void setApprovePersonId(Long approvePersonId) { this.approvePersonId = approvePersonId; } public Integer getApproveStatus() { return approveStatus; } 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; } public Date getGmtCreate() { return gmtCreate; } public void setGmtCreate(Date gmtCreate) { this.gmtCreate = gmtCreate; } } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApprovePageRespDTO.java
对比新文件 @@ -0,0 +1,71 @@ package com.gkhy.safePlatform.incidentManage.model.dto.resp; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; public class AccidentWorkApprovePageRespDTO { private Long id; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date gmtCreate; //流程名称 private String workName; //流程标题 private String title; //提交人ID/外键 private Long submitPersonId; //审批状态 1:未审批 2:审批中 3:审批完成 private Integer approveStatus; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public Date getGmtCreate() { return gmtCreate; } public void setGmtCreate(Date gmtCreate) { this.gmtCreate = gmtCreate; } public String getWorkName() { return workName; } public void setWorkName(String workName) { this.workName = workName; } public String getTitle() { return title; } public void setTitle(String title) { this.title = title; } public Long getSubmitPersonId() { return submitPersonId; } public void setSubmitPersonId(Long submitPersonId) { this.submitPersonId = submitPersonId; } public Integer getApproveStatus() { return approveStatus; } public void setApproveStatus(Integer approveStatus) { this.approveStatus = approveStatus; } } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentWorkApproveQuery.java
对比新文件 @@ -0,0 +1,30 @@ package com.gkhy.safePlatform.incidentManage.query; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; public class AccidentWorkApproveQuery { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; public Date getStartTime() { return startTime; } public void setStartTime(Date startTime) { this.startTime = startTime; } public Date getEndTime() { return endTime; } public void setEndTime(Date endTime) { this.endTime = endTime; } } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentWorkApproveDBQuery.java
对比新文件 @@ -0,0 +1,30 @@ package com.gkhy.safePlatform.incidentManage.query.db; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; public class AccidentWorkApproveDBQuery { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; public Date getStartTime() { return startTime; } public void setStartTime(Date startTime) { this.startTime = startTime; } public Date getEndTime() { return endTime; } public void setEndTime(Date endTime) { this.endTime = endTime; } } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/repository/AccidentWorkApproveInfoRepository.java
对比新文件 @@ -0,0 +1,27 @@ package com.gkhy.safePlatform.incidentManage.repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo; import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoDetailDO; import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO; import com.gkhy.safePlatform.incidentManage.query.db.AccidentWorkApproveDBQuery; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @Repository public interface AccidentWorkApproveInfoRepository extends BaseMapper<AccidentWorkApproveInfo> { List<AccidentWorkApproveInfoPageDO> selectWorkApproveList(Page<AccidentWorkApproveInfoPageDO> page, @Param("query") AccidentWorkApproveDBQuery AccidentWorkApproveDBQuery); void addWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo); AccidentWorkApproveInfoDetailDO selectWorkApproveById(@Param("id") Long id); void updateWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo); void deleteWorkApproveById(@Param("id") Long id); } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentWorkApproveService.java
对比新文件 @@ -0,0 +1,25 @@ package com.gkhy.safePlatform.incidentManage.service; import com.gkhy.safePlatform.commons.query.PageQuery; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.commons.vo.SearchResultVO; import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentWorkApproveReqDTO; import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApproveDetailRespDTO; import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApprovePageRespDTO; import com.gkhy.safePlatform.incidentManage.query.AccidentWorkApproveQuery; import java.util.List; public interface AccidentWorkApproveService { SearchResultVO<List<AccidentWorkApprovePageRespDTO>> selectWorkApproveList(PageQuery<AccidentWorkApproveQuery> query); ResultVO addWorkApprove(Long valueOf, AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO); ResultVO<AccidentWorkApproveDetailRespDTO> getWorkApproveById(Long id); ResultVO updateWorkApprove(Long uid, AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO); ResultVO batchDeleteWorkApprove(String ids); } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentWorkApproveInfoService.java
对比新文件 @@ -0,0 +1,24 @@ package com.gkhy.safePlatform.incidentManage.service.baseService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo; import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoDetailDO; import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO; import com.gkhy.safePlatform.incidentManage.query.db.AccidentWorkApproveDBQuery; import java.util.List; public interface AccidentWorkApproveInfoService extends IService<AccidentWorkApproveInfo> { List<AccidentWorkApproveInfoPageDO> selectWorkApproveList(Page<AccidentWorkApproveInfoPageDO> page, AccidentWorkApproveDBQuery AccidentWorkApproveDBQuery); void addWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo); AccidentWorkApproveInfoDetailDO selectWorkApproveById(Long id); void updateWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo); void deleteWorkApproveById(Long teamId); } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/impl/AccidentWorkApproveServiceImpl.java
对比新文件 @@ -0,0 +1,48 @@ package com.gkhy.safePlatform.incidentManage.service.baseService.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo; import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoDetailDO; import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO; import com.gkhy.safePlatform.incidentManage.query.db.AccidentWorkApproveDBQuery; import com.gkhy.safePlatform.incidentManage.repository.AccidentWorkApproveInfoRepository; import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentWorkApproveInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service("AccidentWorkApproveInfoService") public class AccidentWorkApproveServiceImpl extends ServiceImpl<AccidentWorkApproveInfoRepository, AccidentWorkApproveInfo> implements AccidentWorkApproveInfoService { @Autowired private AccidentWorkApproveInfoRepository AccidentWorkApproveInfoRepository; @Override public List<AccidentWorkApproveInfoPageDO> selectWorkApproveList(Page<AccidentWorkApproveInfoPageDO> page, AccidentWorkApproveDBQuery AccidentWorkApproveDBQuery) { return AccidentWorkApproveInfoRepository.selectWorkApproveList(page, AccidentWorkApproveDBQuery); } @Override public void addWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo) { AccidentWorkApproveInfoRepository.addWorkApprove(AccidentWorkApproveInfo); } @Override public AccidentWorkApproveInfoDetailDO selectWorkApproveById(Long id) { return AccidentWorkApproveInfoRepository.selectWorkApproveById(id); } @Override public void updateWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo) { AccidentWorkApproveInfoRepository.updateWorkApprove(AccidentWorkApproveInfo); } @Override public void deleteWorkApproveById(Long teamId) { AccidentWorkApproveInfoRepository.deleteWorkApproveById(teamId); } } incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentWorkApproveServiceImpl.java
对比新文件 @@ -0,0 +1,111 @@ package com.gkhy.safePlatform.incidentManage.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gkhy.safePlatform.commons.enums.ResultCodes; import com.gkhy.safePlatform.commons.query.PageQuery; import com.gkhy.safePlatform.commons.utils.BeanCopyUtils; import com.gkhy.safePlatform.commons.utils.StringUtils; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.commons.vo.SearchResultVO; import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo; import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoDetailDO; import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO; import com.gkhy.safePlatform.incidentManage.enums.ApproveStatus; import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentWorkApproveReqDTO; import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApproveDetailRespDTO; import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApprovePageRespDTO; import com.gkhy.safePlatform.incidentManage.query.AccidentWorkApproveQuery; import com.gkhy.safePlatform.incidentManage.query.db.AccidentWorkApproveDBQuery; import com.gkhy.safePlatform.incidentManage.service.AccidentWorkApproveService; import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentWorkApproveInfoService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; @Service("AccidentWorkApproveService") public class AccidentWorkApproveServiceImpl implements AccidentWorkApproveService { @Autowired private AccidentWorkApproveInfoService workApproveInfoService; @Override public SearchResultVO<List<AccidentWorkApprovePageRespDTO>> selectWorkApproveList(PageQuery<AccidentWorkApproveQuery> query) { Long pageIndex = query.getPageIndex(); Long pageSize = query.getPageSize(); Page<AccidentWorkApproveInfoPageDO> page = new Page<>(pageIndex, pageSize); AccidentWorkApproveDBQuery AccidentWorkApproveDBQuery = new AccidentWorkApproveDBQuery(); if (query.getSearchParams() != null) { BeanUtils.copyProperties(query.getSearchParams(), AccidentWorkApproveDBQuery); } List<AccidentWorkApproveInfoPageDO> AccidentWorkApproveInfoPageDOList = workApproveInfoService.selectWorkApproveList(page, AccidentWorkApproveDBQuery); List<AccidentWorkApprovePageRespDTO> respList = BeanCopyUtils.copyBeanList(AccidentWorkApproveInfoPageDOList, AccidentWorkApprovePageRespDTO.class); return new SearchResultVO<>( true, pageIndex, pageSize, page.getTotal(), respList, ResultCodes.OK ); } @Override public ResultVO addWorkApprove(Long uid, AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO) { Date nowDate = new Date(); //1.新增应急队伍 AccidentWorkApproveInfo AccidentWorkApproveInfo = new AccidentWorkApproveInfo(); BeanUtils.copyProperties(AccidentWorkApproveReqDTO, AccidentWorkApproveInfo); AccidentWorkApproveInfo.setDelFlag(false); AccidentWorkApproveInfo.setCreateUid(uid); AccidentWorkApproveInfo.setGmtCreate(nowDate); AccidentWorkApproveInfo.setApproveStatus(ApproveStatus.NOT_APPROVE.getStatus()); workApproveInfoService.addWorkApprove(AccidentWorkApproveInfo); return new ResultVO(ResultCodes.OK); } @Override public ResultVO<AccidentWorkApproveDetailRespDTO> getWorkApproveById(Long id) { AccidentWorkApproveInfoDetailDO AccidentWorkApproveInfoDetailDO = workApproveInfoService.selectWorkApproveById(id); AccidentWorkApproveDetailRespDTO AccidentWorkApproveDetailRespDTO = new AccidentWorkApproveDetailRespDTO(); BeanUtils.copyProperties(AccidentWorkApproveInfoDetailDO, AccidentWorkApproveDetailRespDTO); return new ResultVO<>(ResultCodes.OK, AccidentWorkApproveDetailRespDTO); } @Override public ResultVO updateWorkApprove(Long uid, AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO) { Date nowDate = new Date(); AccidentWorkApproveInfo AccidentWorkApproveInfo = new AccidentWorkApproveInfo(); BeanUtils.copyProperties(AccidentWorkApproveReqDTO, AccidentWorkApproveInfo); AccidentWorkApproveInfo.setUpdateUid(uid); AccidentWorkApproveInfo.setGmtModitify(nowDate); workApproveInfoService.updateWorkApprove(AccidentWorkApproveInfo); return new ResultVO(ResultCodes.OK); } @Override public ResultVO batchDeleteWorkApprove(String ids) { if (!StringUtils.isBlank(ids)) { String[] idArr = ids.split(","); for (String id : idArr) { deleteWorkApprove(Long.valueOf(id)); } } return new ResultVO(ResultCodes.OK); } private void deleteWorkApprove(Long id) { workApproveInfoService.deleteWorkApproveById(id); } } incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentWorkApproveInfoMapper.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.incidentManage.repository.AccidentWorkApproveInfoRepository"> <resultMap type="com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO" id="accidentWorkApproveInfoPageDOResult"> <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="accidentWorkApproveInfoPageDOResult"> select id,`work_name`,`title`,`submit_person_id`,`approve_status`,gmt_create from accident_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.incidentManage.entity.AccidentWorkApproveInfo" keyProperty="id" useGeneratedKeys="true"> insert into accident_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.incidentManage.entity.AccidentWorkApproveInfoDetailDO" 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 accident_work_approve where del_flag = 0 and id = #{id} </select> <update id="updateWorkApprove" parameterType="com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo"> update accident_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 accident_work_approve set del_flag = 1 where id = #{id} </update> </mapper>