goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetDutyWorkApproveController.java
对比新文件 @@ -0,0 +1,155 @@ package com.gkhy.safePlatform.targetDuty.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gkhy.safePlatform.commons.co.ContextCacheUser; import com.gkhy.safePlatform.targetDuty.entity.ExamineMng; import com.gkhy.safePlatform.targetDuty.entity.TargetDutyWorkApprove; import com.gkhy.safePlatform.targetDuty.service.TargetDutyWorkApproveService; import com.gkhy.safePlatform.targetDuty.utils.DateUtils; import org.springframework.security.core.Authentication; import org.springframework.web.bind.annotation.*; 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.commons.enums.ResultCodes; import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetDutyWorkApproveQueryCriteria; import java.sql.Timestamp; import java.util.Arrays; import java.util.Date; import java.util.stream.Collectors; import javax.annotation.Resource; import java.io.Serializable; import java.util.List; /** * 目标责任管理工作流审批表(TargetDutyWorkApprove)表控制层 * * @author xurui * @since 2022-08-11 10:13:37 */ @RestController @RequestMapping("targetDutyWorkApprove") public class TargetDutyWorkApproveController { /** * 服务对象 */ @Resource private TargetDutyWorkApproveService targetDutyWorkApproveService; /** * 分页查询所有数据 * * @param pageQuery 查询实体 * @return 所有数据 */ @PostMapping(value = "/page/list") public ResultVO selectAll(@RequestBody PageQuery<TargetDutyWorkApproveQueryCriteria> pageQuery){ PageUtils.checkCheck(pageQuery); return this.targetDutyWorkApproveService.queryAll(pageQuery); } /** * 通过主键查询单条数据 * * @param id 主键 * @return 单条数据 */ @GetMapping(value = "/selectOne/{id}") public ResultVO selectOne(@PathVariable Serializable id) { return new ResultVO<>(ResultCodes.OK,this.targetDutyWorkApproveService.getById(id)); } /** * 新增数据 * * @param targetDutyWorkApprove 实体对象 * @return 修改结果 */ @PostMapping(value = "/add") public ResultVO add(Authentication authentication, @RequestBody TargetDutyWorkApprove targetDutyWorkApprove) { ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); targetDutyWorkApproveService.addInfo(currentUser,targetDutyWorkApprove); return new ResultVO<>(ResultCodes.OK); } /** * 修改数据 * * @param targetDutyWorkApprove 实体对象 * @return 修改结果 */ @PostMapping(value = "/update") public ResultVO update(Authentication authentication, @RequestBody TargetDutyWorkApprove targetDutyWorkApprove) { ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); targetDutyWorkApproveService.updateInfo(currentUser,targetDutyWorkApprove); return new ResultVO<>(ResultCodes.OK); } /** * 删除数据 * * @param ids 主键结合 * @return 删除结果 */ @RequestMapping(value = "/delete",method = RequestMethod.POST) public ResultVO delete(@RequestBody Long[] ids) { if(ids == null){ return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL); } List<Long> idList = Arrays.asList(ids); this.targetDutyWorkApproveService.removeByIds(idList); return new ResultVO<>(ResultCodes.OK); } /** * 分页查询检查记录 * * @param pageQuery 查询实体 * @return 所有数据 */ @PostMapping(value = "/page/listCheckData") public ResultVO listCheckData(@RequestBody PageQuery<TargetDutyWorkApproveQueryCriteria> pageQuery){ PageUtils.checkCheck(pageQuery); return this.targetDutyWorkApproveService.listCheckData(pageQuery); } public static void main(String[] args) { TargetDutyWorkApprove examineTemplateSaveOrUpdate = new TargetDutyWorkApprove(); examineTemplateSaveOrUpdate.setDelFlag(0); examineTemplateSaveOrUpdate.setGmtCreate(new Timestamp(new java.util.Date().getTime())); examineTemplateSaveOrUpdate.setGmtModitify(new Timestamp(new java.util.Date().getTime())); examineTemplateSaveOrUpdate.setCreateUid(0L); examineTemplateSaveOrUpdate.setUpdateUid(0L); examineTemplateSaveOrUpdate.setWorkName("312"); examineTemplateSaveOrUpdate.setTitle("23"); examineTemplateSaveOrUpdate.setSubmitPersonId(0L); examineTemplateSaveOrUpdate.setSubmitPersonName("312"); examineTemplateSaveOrUpdate.setApprovePersonId(1L); examineTemplateSaveOrUpdate.setApprovePersonName("312"); examineTemplateSaveOrUpdate.setApproveStatus(1); examineTemplateSaveOrUpdate.setApproveResult(1); examineTemplateSaveOrUpdate.setApproveMemo("312"); examineTemplateSaveOrUpdate.setRelateType(1); examineTemplateSaveOrUpdate.setRelateId(0L); examineTemplateSaveOrUpdate.setRelateDesc("312312"); examineTemplateSaveOrUpdate.setSort(0); examineTemplateSaveOrUpdate.setCreateTime(new Date()); examineTemplateSaveOrUpdate.setUpdateTime(new Date()); System.out.println(JSONObject.toJSONString(examineTemplateSaveOrUpdate)); } } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutyWorkApprove.java
对比新文件 @@ -0,0 +1,224 @@ package com.gkhy.safePlatform.targetDuty.entity; import java.sql.Timestamp; import com.gkhy.safePlatform.targetDuty.entity.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.fasterxml.jackson.annotation.JsonFormat; /** * 目标责任管理工作流审批表(TargetDutyWorkApprove)表实体类 * * @author xurui * @since 2022-08-11 13:37:37 */ @SuppressWarnings("serial") @TableName("target_duty_work_approve") public class TargetDutyWorkApprove extends BaseDomain { @TableId(type = IdType.AUTO) private Long id; public Long getId() { return id; } public void setId(Long id) { this.id = id; } //删除标识:0正常1删除 private Integer delFlag; public Integer getDelFlag() { return delFlag; } public void setDelFlag(Integer delFlag) { this.delFlag = delFlag; } //创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Timestamp gmtCreate; public Timestamp getGmtCreate() { return gmtCreate; } public void setGmtCreate(Timestamp gmtCreate) { this.gmtCreate = gmtCreate; } //更新时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Timestamp gmtModitify; public Timestamp getGmtModitify() { return gmtModitify; } public void setGmtModitify(Timestamp gmtModitify) { this.gmtModitify = gmtModitify; } //创建人uid private Long createUid; public Long getCreateUid() { return createUid; } public void setCreateUid(Long createUid) { this.createUid = createUid; } //更新人uid private Long updateUid; public Long getUpdateUid() { return updateUid; } public void setUpdateUid(Long updateUid) { this.updateUid = updateUid; } //流程名称 private String workName; public String getWorkName() { return workName; } public void setWorkName(String workName) { this.workName = workName; } //流程标题 private String title; public String getTitle() { return title; } public void setTitle(String title) { this.title = title; } //提交人ID/外键 private Long submitPersonId; public Long getSubmitPersonId() { return submitPersonId; } public void setSubmitPersonId(Long submitPersonId) { this.submitPersonId = submitPersonId; } //提交人名称/外键 private String submitPersonName; public String getSubmitPersonName() { return submitPersonName; } public void setSubmitPersonName(String submitPersonName) { this.submitPersonName = submitPersonName; } //审批人ID/外键 private Long approvePersonId; public Long getApprovePersonId() { return approvePersonId; } public void setApprovePersonId(Long approvePersonId) { this.approvePersonId = approvePersonId; } //审批人名称/外键 private String approvePersonName; public String getApprovePersonName() { return approvePersonName; } public void setApprovePersonName(String approvePersonName) { this.approvePersonName = approvePersonName; } //审批状态 1:未审批 2:审批中 3:审批完成 private Integer approveStatus; public Integer getApproveStatus() { return approveStatus; } public void setApproveStatus(Integer approveStatus) { this.approveStatus = approveStatus; } //审批结果 0:不通过 1:通过 private Integer approveResult; public Integer getApproveResult() { return approveResult; } public void setApproveResult(Integer approveResult) { this.approveResult = approveResult; } //审批意见 private String approveMemo; public String getApproveMemo() { return approveMemo; } public void setApproveMemo(String approveMemo) { this.approveMemo = approveMemo; } //关联业务类型 1:目标检查 2:目标上报 private Integer relateType; public Integer getRelateType() { return relateType; } public void setRelateType(Integer relateType) { this.relateType = relateType; } //关联的审批对象表ID private Long relateId; public Long getRelateId() { return relateId; } public void setRelateId(Long relateId) { this.relateId = relateId; } //关联业务json private String relateDesc; public String getRelateDesc() { return relateDesc; } public void setRelateDesc(String relateDesc) { this.relateDesc = relateDesc; } //排序 private Integer sort; public Integer getSort() { return sort; } public void setSort(Integer sort) { this.sort = sort; } //下一级的工作流ID private Long childId; public Long getChildId() { return childId; } public void setChildId(Long childId) { this.childId = childId; } } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetDutyWorkApproveQueryCriteria.java
对比新文件 @@ -0,0 +1,43 @@ package com.gkhy.safePlatform.targetDuty.model.dto.req; import java.sql.Timestamp; import java.util.Date; import java.util.List; import com.gkhy.safePlatform.targetDuty.annotation.Query; public class TargetDutyWorkApproveQueryCriteria { //关联业务类型 1:目标检查 2:目标上报 @Query() private Integer relateType; //关联的审批对象表ID @Query() private Long relateId; @Query(type = Query.Type.BETWEEN) private List<Timestamp> gmtCreate; 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 List<Timestamp> getGmtCreate() { return gmtCreate; } public void setGmtCreate(List<Timestamp> gmtCreate) { this.gmtCreate = gmtCreate; } } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ExamineTemplateDto.java
@@ -22,7 +22,7 @@ //设定人/外键 private Long setPersonId; //设定人名称 private Long setPersonName; private String setPersonName; //设定部门ID/外键 private Long setPersonDepartmentId; //设定部门名称 @@ -140,11 +140,11 @@ this.updateTime = updateTime; } public Long getSetPersonName() { public String getSetPersonName() { return setPersonName; } public void setSetPersonName(Long setPersonName) { public void setSetPersonName(String setPersonName) { this.setPersonName = setPersonName; } } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ListCheckDataDto.java
对比新文件 @@ -0,0 +1,98 @@ package com.gkhy.safePlatform.targetDuty.model.dto.resp; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.gkhy.safePlatform.targetDuty.entity.BaseDomain; import java.sql.Timestamp; @SuppressWarnings("serial") public class ListCheckDataDto { //考核指标值 private String value; public String getValue() { return value; } public void setValue(String value) { this.value = value; } //制定日期 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Timestamp makeDate; public Timestamp getMakeDate() { return makeDate; } public void setMakeDate(Timestamp makeDate) { this.makeDate = makeDate; } //责任部门/外键 private Long dutyDepartmentId; //责任部门名称 private String dutyDepartmentName; public Long getDutyDepartmentId() { return dutyDepartmentId; } public void setDutyDepartmentId(Long dutyDepartmentId) { this.dutyDepartmentId = dutyDepartmentId; } //制定人部门/外键 private Long makerDepartmentId; //制定人部门名称 private String makerDepartmentName; public String getDutyDepartmentName() { return dutyDepartmentName; } public void setDutyDepartmentName(String dutyDepartmentName) { this.dutyDepartmentName = dutyDepartmentName; } public String getMakerDepartmentName() { return makerDepartmentName; } public void setMakerDepartmentName(String makerDepartmentName) { this.makerDepartmentName = makerDepartmentName; } public Long getMakerDepartmentId() { return makerDepartmentId; } public void setMakerDepartmentId(Long makerDepartmentId) { this.makerDepartmentId = makerDepartmentId; } //创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Timestamp gmtCreate; public Timestamp getGmtCreate() { return gmtCreate; } public void setGmtCreate(Timestamp gmtCreate) { this.gmtCreate = gmtCreate; } //关联业务json private String relateDesc; public String getRelateDesc() { return relateDesc; } public void setRelateDesc(String relateDesc) { this.relateDesc = relateDesc; } } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/RewardPunishmentDetailDto.java
@@ -72,6 +72,17 @@ this.id = id; } //备注信息 private String memo; public String getMemo() { return memo; } public void setMemo(String memo) { this.memo = memo; } public Long getRewardPunishmentStandardId() { return rewardPunishmentStandardId; } @@ -107,4 +118,8 @@ public void setRewardPunishmentStandardName(String rewardPunishmentStandardName) { this.rewardPunishmentStandardName = rewardPunishmentStandardName; } public String getRewardPunishmentStandardName() { return rewardPunishmentStandardName; } } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetDutyWorkApproveDto.java
对比新文件 @@ -0,0 +1,202 @@ package com.gkhy.safePlatform.targetDuty.model.dto.resp; import com.fasterxml.jackson.annotation.JsonFormat; import java.sql.Timestamp; import java.io.Serializable; public class TargetDutyWorkApproveDto implements Serializable { private Long id; //删除标识:0正常1删除 private Integer delFlag; //创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Timestamp gmtCreate; //更新时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Timestamp gmtModitify; //创建人uid private Long createUid; //更新人uid private Long updateUid; //流程名称 private String workName; //流程标题 private String title; //提交人ID/外键 private Long submitPersonId; //提交人名称/外键 private String submitPersonName; //审批人ID/外键 private Long approvePersonId; //审批人名称/外键 private String approvePersonName; //审批状态 1:未审批 2:审批中 3:审批完成 private Integer approveStatus; //审批结果 0:不通过 1:通过 private Integer approveResult; //审批意见 private String approveMemo; //关联业务类型 1:目标检查 2:目标上报 private Integer relateType; //关联的审批对象表ID private Long relateId; //关联业务说明 private String relateDesc; //排序 private Integer sort; public Long getId() { return id; } public void setId(Long id) { this.id = id; } //删除标识:0正常1删除 public Integer getDelFlag() { return delFlag; } public void setDelFlag(Integer delFlag) { this.delFlag = delFlag; } //创建时间 public Timestamp getGmtCreate() { return gmtCreate; } public void setGmtCreate(Timestamp gmtCreate) { this.gmtCreate = gmtCreate; } //更新时间 public Timestamp getGmtModitify() { return gmtModitify; } public void setGmtModitify(Timestamp gmtModitify) { this.gmtModitify = gmtModitify; } //创建人uid public Long getCreateUid() { return createUid; } public void setCreateUid(Long createUid) { this.createUid = createUid; } //更新人uid 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; } //提交人ID/外键 public Long getSubmitPersonId() { return submitPersonId; } public void setSubmitPersonId(Long submitPersonId) { this.submitPersonId = submitPersonId; } //提交人名称/外键 public String getSubmitPersonName() { return submitPersonName; } public void setSubmitPersonName(String submitPersonName) { this.submitPersonName = submitPersonName; } //审批人ID/外键 public Long getApprovePersonId() { return approvePersonId; } public void setApprovePersonId(Long approvePersonId) { this.approvePersonId = approvePersonId; } //审批人名称/外键 public String getApprovePersonName() { return approvePersonName; } public void setApprovePersonName(String approvePersonName) { this.approvePersonName = approvePersonName; } //审批状态 1:未审批 2:审批中 3:审批完成 public Integer getApproveStatus() { return approveStatus; } public void setApproveStatus(Integer approveStatus) { this.approveStatus = approveStatus; } //审批结果 0:不通过 1:通过 public Integer getApproveResult() { return approveResult; } public void setApproveResult(Integer approveResult) { this.approveResult = approveResult; } //审批意见 public String getApproveMemo() { return approveMemo; } public void setApproveMemo(String approveMemo) { this.approveMemo = approveMemo; } //关联业务类型 1:目标检查 2:目标上报 public Integer getRelateType() { return relateType; } public void setRelateType(Integer relateType) { this.relateType = relateType; } //关联的审批对象表ID 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 Integer getSort() { return sort; } public void setSort(Integer sort) { this.sort = sort; } } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/RewardPunishmentDetailRepository.java
@@ -20,12 +20,12 @@ @Repository public interface RewardPunishmentDetailRepository extends BaseMapper<RewardPunishmentDetail> { @Select("<script> select a.id,a.person_id,a.create_time ,b.standard_type ,b.content ,b.q_name ,b.reason " + @Select("<script> select a.id,a.person_id,a.person_name,a.create_time ,a.memo,b.standard_type ,b.content ,b.q_name ,b.reason " + "from reward_punishment_detail a left join reward_punishment_standard b on a.reward_punishment_standard_id=b.id where 1=1 " + "<if test =\"personId !='' and personId !=null\">and a.person_id =#{personId}</if> </script> ") IPage<RewardPunishmentDetailDto> queryAll(IPage<RewardPunishmentDetailDto> page, @Param("personId") String personId); @Select("<script> select a.id,a.person_id,a.create_time ,b.standard_type ,b.content ,b.q_name ,b.reason " + @Select("<script> select a.id,a.person_id,a.person_name,a.create_time ,a.memo,b.standard_type ,b.content ,b.q_name ,b.reason " + "from reward_punishment_detail a left join reward_punishment_standard b on a.reward_punishment_standard_id=b.id where 1=1 " + "<if test =\"personId !='' and personId !=null\">and a.person_id =#{personId}</if> </script> ") List<RewardPunishmentDetail> queryAll( @Param("personId")String personId); goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/TargetDutyWorkApproveRepository.java
对比新文件 @@ -0,0 +1,24 @@ package com.gkhy.safePlatform.targetDuty.repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.gkhy.safePlatform.targetDuty.entity.TargetDutyWorkApprove; import com.gkhy.safePlatform.targetDuty.model.dto.resp.ListCheckDataDto; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; /** * 目标责任管理工作流审批表(TargetDutyWorkApprove)表数据库访问层 * * @author xurui * @since 2022-08-11 10:13:37 */ @Repository public interface TargetDutyWorkApproveRepository extends BaseMapper<TargetDutyWorkApprove> { @Select("<script> select c.duty_department_id,c.value,c.maker_department_id,c.make_date,a.relate_desc,a.gmt_create " + "from target_duty_work_approve a INNER JOIN target_divide_detail c on a.relate_id = c.target_id where 1=1 " + "AND a.approve_status = 3 AND a.approve_result = 1 AND a.relate_type = 1 AND a.del_flag = 0 AND a.relate_id =#{relateId} ORDER BY a.gmt_create DESC </script> ") IPage<ListCheckDataDto> listCheckData(IPage<ListCheckDataDto> page, @Param("relateId") Long relateId); } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetDutyWorkApproveService.java
对比新文件 @@ -0,0 +1,29 @@ package com.gkhy.safePlatform.targetDuty.service; import com.baomidou.mybatisplus.extension.service.IService; import com.gkhy.safePlatform.commons.co.ContextCacheUser; import com.gkhy.safePlatform.targetDuty.entity.TargetDutyWorkApprove; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.commons.query.PageQuery; import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetDutyWorkApproveQueryCriteria; import java.util.List; /** * 目标责任管理工作流审批表(TargetDutyWorkApprove)表服务接口 * * @author xurui * @since 2022-08-11 10:13:37 */ public interface TargetDutyWorkApproveService extends IService<TargetDutyWorkApprove> { ResultVO queryAll(PageQuery<TargetDutyWorkApproveQueryCriteria> pageQuery); List<TargetDutyWorkApprove> queryAll(TargetDutyWorkApproveQueryCriteria criteria); void updateInfo(ContextCacheUser currentUser, TargetDutyWorkApprove targetDutyWorkApprove); void addInfo(ContextCacheUser currentUser, TargetDutyWorkApprove targetDutyWorkApprove); ResultVO listCheckData(PageQuery<TargetDutyWorkApproveQueryCriteria> pageQuery); } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDutyWorkApproveServiceImpl.java
对比新文件 @@ -0,0 +1,177 @@ package com.gkhy.safePlatform.targetDuty.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gkhy.safePlatform.commons.co.ContextCacheUser; import com.gkhy.safePlatform.targetDuty.enums.TargetDutyResultCodes; import com.gkhy.safePlatform.targetDuty.excepiton.TargetDutyException; import com.gkhy.safePlatform.targetDuty.model.dto.resp.ListCheckDataDto; import com.gkhy.safePlatform.targetDuty.repository.TargetDutyWorkApproveRepository; import com.gkhy.safePlatform.targetDuty.entity.TargetDutyWorkApprove; import com.gkhy.safePlatform.targetDuty.service.CommonService; import com.gkhy.safePlatform.targetDuty.service.TargetDutyWorkApproveService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import com.gkhy.safePlatform.commons.enums.ResultCodes; 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.targetDuty.model.dto.req.TargetDutyWorkApproveQueryCriteria; import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetDutyWorkApproveDto; import com.gkhy.safePlatform.targetDuty.utils.QueryHelpPlus; import com.gkhy.safePlatform.commons.utils.BeanCopyUtils; import javax.annotation.Resource; import java.sql.Timestamp; import java.util.*; /** * 目标责任管理工作流审批表(TargetDutyWorkApprove)表服务实现类 * * @author xurui * @since 2022-08-11 10:13:37 */ @Service("targetDutyWorkApproveService") public class TargetDutyWorkApproveServiceImpl extends ServiceImpl<TargetDutyWorkApproveRepository, TargetDutyWorkApprove> implements TargetDutyWorkApproveService { @Autowired private TargetDutyWorkApproveRepository targetDutyWorkApproveRepository; @Resource private CommonService commonService; @Override public ResultVO queryAll(PageQuery<TargetDutyWorkApproveQueryCriteria> pageQuery) { Long pageIndex = pageQuery.getPageIndex(); Long pageSize = pageQuery.getPageSize(); IPage<TargetDutyWorkApprove> page = new Page<>(pageIndex, pageSize); QueryWrapper queryWrapper = QueryHelpPlus.getPredicate(TargetDutyWorkApprove.class, pageQuery.getSearchParams()); queryWrapper.eq("delFlag","0"); page = baseMapper.selectPage(page,queryWrapper); List<TargetDutyWorkApproveDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetDutyWorkApproveDto.class); return new SearchResultVO<>( true, pageIndex, pageSize,page.getPages(), page.getTotal(), respList, ResultCodes.OK ); } @Override public List<TargetDutyWorkApprove> queryAll(TargetDutyWorkApproveQueryCriteria criteria) { return baseMapper.selectList(QueryHelpPlus.getPredicate(TargetDutyWorkApprove.class, criteria)); } @Override public void updateInfo(ContextCacheUser currentUser, TargetDutyWorkApprove targetDutyWorkApprove) { Date nowDate = new Date(); Long uid = currentUser.getUid(); String uName = currentUser.getRealName(); //新增下级审批记录 TargetDutyWorkApprove addInfo = new TargetDutyWorkApprove(); if (targetDutyWorkApprove.getApproveStatus() == 2){ BeanUtils.copyProperties(targetDutyWorkApprove, addInfo); addInfo.setId(null); addInfo.setDelFlag(0); addInfo.setCreateUid(uid); addInfo.setGmtCreate(new Timestamp(nowDate.getTime())); addInfo.setSubmitPersonId(uid); addInfo.setSubmitPersonName(uName); addInfo.setApproveResult(null); addInfo.setApproveMemo(null); addInfo.setSort(addInfo.getSort()+1); targetDutyWorkApproveRepository.insert(addInfo); } // 更新原审批记录 TargetDutyWorkApprove updateInfo = new TargetDutyWorkApprove(); updateInfo.setId(targetDutyWorkApprove.getId()); updateInfo.setUpdateUid(uid); updateInfo.setGmtModitify(new Timestamp(nowDate.getTime())); updateInfo.setApproveStatus(targetDutyWorkApprove.getApproveStatus()); updateInfo.setApproveResult(targetDutyWorkApprove.getApproveResult()); updateInfo.setApproveMemo(targetDutyWorkApprove.getApproveMemo()); updateInfo.setChildId(addInfo.getId()); targetDutyWorkApproveRepository.updateById(updateInfo); } @Override public void addInfo(ContextCacheUser currentUser, TargetDutyWorkApprove targetDutyWorkApprove) { // 业务类型 if (targetDutyWorkApprove.getRelateType()==null){ throw new TargetDutyException(TargetDutyResultCodes.APPROVE_RELATE_ID_NULL); } // 业务主表id if (targetDutyWorkApprove.getRelateId()==null){ throw new TargetDutyException(TargetDutyResultCodes.APPROVE_RELATE_TYPE_NULL); } // 审批人 if (targetDutyWorkApprove.getApprovePersonId()==null){ throw new TargetDutyException(TargetDutyResultCodes.APPROVE_PERSON_NULL); } // 审批状态 if (targetDutyWorkApprove.getApproveStatus()==null){ throw new TargetDutyException(TargetDutyResultCodes.APPROVE_STATUS_NULL); } Date nowDate = new Date(); Long uid = currentUser.getUid(); String uName = currentUser.getRealName(); //1.新增应急审批 TargetDutyWorkApprove info = new TargetDutyWorkApprove(); BeanUtils.copyProperties(targetDutyWorkApprove, info); info.setDelFlag(0); info.setCreateUid(uid); info.setGmtCreate(new Timestamp(nowDate.getTime())); info.setSubmitPersonId(uid); info.setSubmitPersonName(uName); info.setSort(1); targetDutyWorkApproveRepository.insert(info); } @Override public ResultVO listCheckData(PageQuery<TargetDutyWorkApproveQueryCriteria> pageQuery) { Long pageIndex = pageQuery.getPageIndex(); Long pageSize = pageQuery.getPageSize(); IPage<ListCheckDataDto> page = new Page<>(pageIndex, pageSize); page = targetDutyWorkApproveRepository.listCheckData(page,pageQuery.getSearchParams().getRelateId()); List<ListCheckDataDto> respList = page.getRecords(); // --------------------------- 获取部门信息----------------------- //收集所用到的部门ID Set<Long> collectDepIdSet = new HashSet(); respList.forEach(f->{ collectDepIdSet.add(f.getDutyDepartmentId()); collectDepIdSet.add(f.getMakerDepartmentId()); }); //获取部门名集合 Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet); respList.forEach(f->{ f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId())); f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId())); }); return new SearchResultVO<>( true, pageIndex, pageSize,page.getPages(), page.getTotal(), respList, ResultCodes.OK ); } }