diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java index 602d8e90a..469c17fef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java @@ -231,4 +231,17 @@ public class ProjectTaskInventoryEO implements Serializable { /**中英文切换**/ @TableField(exist = false) private String cut; + + /**设计符合性流程-结束前三天发送消息标识0未发 1已发**/ + private String designSendMsgFlag; + /**设计符合性流程-结束当天发送消息标识0未发 1已发**/ + private String designSendMsgCurrentFlag; + /**prehomo确认流程-结束前三天发送消息标识0未发 1已发**/ + private String prehomoSendMsgFlag; + /**prehomo确认流程-结束当天发送消息标识0未发 1已发**/ + private String prehomoSendMsgCurrentFlag; + /**验证符合性流程-结束前三天发送消息标识0未发 1已发**/ + private String verifySendMsgFlag; + /**验证符合性流程-结束当天发送消息标识0未发 1已发**/ + private String verifySendMsgCurrentFlag; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index cae7a657c..5bb417eb4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -10,7 +10,6 @@ import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.service.IProjectLawsInventoryEOService; -import com.jero.modules.system.entity.SysUser; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -19,7 +18,6 @@ import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.springframework.beans.factory.annotation.Autowired; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java index d590e58ae..7ee6a67b2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -61,24 +62,28 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl list = new ArrayList<>(); - + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List userIdList = Arrays.asList(projectTaskInventoryDetailEO.getUserIds().split(",")); - userIdList.forEach(userId -> { - ProjectTaskInventoryDetailEO taskInventoryDetailEO = new ProjectTaskInventoryDetailEO(); - BeanUtils.copyProperties(projectTaskInventoryDetailEO,taskInventoryDetailEO); - taskInventoryDetailEO.setUserId(userId); - list.add(taskInventoryDetailEO); - }); + //过滤掉当前操作人。 + userIdList = userIdList.stream().distinct().filter(userId-> !org.apache.commons.lang3.StringUtils.equals(userId,currentUser.getId())).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(userIdList)){ + userIdList.forEach(userId -> { + ProjectTaskInventoryDetailEO taskInventoryDetailEO = new ProjectTaskInventoryDetailEO(); + BeanUtils.copyProperties(projectTaskInventoryDetailEO,taskInventoryDetailEO); + taskInventoryDetailEO.setUserId(userId); + list.add(taskInventoryDetailEO); + }); - //先删后加,确保一个用户只有一个任务。 - QueryWrapper deleteWrapper = new QueryWrapper<>(); - deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,projectTaskInventoryDetailEO.getActiProcInstId()); - deleteWrapper.lambda().in(ProjectTaskInventoryDetailEO::getUserId,userIdList); - this.baseMapper.delete(deleteWrapper); + //先删后加,确保一个用户只有一个任务。 + QueryWrapper deleteWrapper = new QueryWrapper<>(); + deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,projectTaskInventoryDetailEO.getActiProcInstId()); + deleteWrapper.lambda().in(ProjectTaskInventoryDetailEO::getUserId,userIdList); + this.baseMapper.delete(deleteWrapper); - super.saveBatch(list); + super.saveBatch(list); - sendMessage(projectTaskInventoryDetailEO,userIdList); + sendMessage(projectTaskInventoryDetailEO,userIdList); + } } } @@ -92,7 +97,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl result,String cut){ if(CollectionUtils.isNotEmpty(result)){ for (ProjectTaskInventoryEO projectTaskInventoryEO : result) { - if(StringUtils.isNotEmpty(projectTaskInventoryEO.getDesignStatus())){ + /*if(StringUtils.isNotEmpty(projectTaskInventoryEO.getDesignStatus())){ String textByValue = DesignComplianceStatusEnum.getTextByValue(projectTaskInventoryEO.getDesignStatus(), cut); projectTaskInventoryEO.setDesignStatus(textByValue); } @@ -568,7 +568,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl> get_list_by_instance(@RequestParam("prcNum") String prcNum,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){ - return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu); + public List> get_list_by_instance(@RequestParam("prcNum") String prcNum,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){ + return workFlowFeignClient.get_list_by_instance(prcNum,cut,prcType,sortWord,shunxu); } @AutoLog(value = "获取图片") @@ -143,8 +143,8 @@ public class workFlowController { @AutoLog(value = "根据流程实例id查询流程历史") @ApiOperation(value="根据流程实例id查询流程历史", notes="根据流程实例id查询流程历史") @GetMapping("/queryProcessHistoryByPrcId") - public List> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){ - return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,sortWord,shunxu); + public List> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){ + return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,cut,prcType,sortWord,shunxu); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java index dc34d7814..e5f56b9ed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java @@ -47,4 +47,6 @@ public class TaskCommonQuery { @ApiModelProperty(value = "高级搜索字符串") private String advanceSearchVOStr; + + private String cut; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index 7231bd33a..ce81e57d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -87,7 +87,7 @@ public interface WorkFlowFeignClient { * @return */ @RequestMapping(value = "/bat-wkflow/task/get_list_by_instance",method = RequestMethod.GET) - List> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu); + List> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam("cut") String cut,@RequestParam("prcType") String prcType,@RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu); /** * 获取图片 @@ -125,6 +125,6 @@ public interface WorkFlowFeignClient { * @return */ @RequestMapping(value = "/bat-wkflow/task/queryProcessHistoryByPrcId",method = RequestMethod.GET) - List> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu); + List> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId, @RequestParam("cut") String cut,@RequestParam("prcType") String prcType,@RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java index b76158465..a79bf2d65 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java @@ -103,8 +103,8 @@ public class WorkFlowFeignClientImpl{ * @param shunxu * @return */ - public List> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ - return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu); + public List> get_list_by_instance(@RequestParam("prcNum") String prcNum,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ + return workFlowFeignClient.get_list_by_instance(prcNum,cut,prcType,sortWord,shunxu); } /** @@ -145,7 +145,7 @@ public class WorkFlowFeignClientImpl{ * @param shunxu * @return */ - public List> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ - return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,sortWord,shunxu); + public List> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ + return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,cut,prcType,sortWord,shunxu); } }