WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务清单-设计符合性流程。

Browse Source
This commit is contained in:
wangzhijiang
2022-05-10 17:39:18 +08:00
parent e8b6c35c02
commit da9f10106d
9 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
+13
View File
@@ -231,4 +231,17 @@ public class ProjectTaskInventoryEO implements Serializable {
/**中英文切换**/ /**中英文切换**/
@TableField(exist = false) @TableField(exist = false)
private String cut; 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;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
-2
View File
@@ -10,7 +10,6 @@ import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.service.IProjectLawsInventoryEOService;
import com.jero.modules.system.entity.SysUser;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -19,7 +18,6 @@ import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException; import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+7 -2
View File
@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -61,8 +62,11 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
projectTaskInventoryDetailEO.setCreateTime(now); projectTaskInventoryDetailEO.setCreateTime(now);
projectTaskInventoryDetailEO.setUpdateTime(now); projectTaskInventoryDetailEO.setUpdateTime(now);
List<ProjectTaskInventoryDetailEO> list = new ArrayList<>(); List<ProjectTaskInventoryDetailEO> list = new ArrayList<>();
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
List<String> userIdList = Arrays.asList(projectTaskInventoryDetailEO.getUserIds().split(",")); List<String> userIdList = Arrays.asList(projectTaskInventoryDetailEO.getUserIds().split(","));
//过滤掉当前操作人。
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 -> { userIdList.forEach(userId -> {
ProjectTaskInventoryDetailEO taskInventoryDetailEO = new ProjectTaskInventoryDetailEO(); ProjectTaskInventoryDetailEO taskInventoryDetailEO = new ProjectTaskInventoryDetailEO();
BeanUtils.copyProperties(projectTaskInventoryDetailEO,taskInventoryDetailEO); BeanUtils.copyProperties(projectTaskInventoryDetailEO,taskInventoryDetailEO);
@@ -81,6 +85,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
sendMessage(projectTaskInventoryDetailEO,userIdList); sendMessage(projectTaskInventoryDetailEO,userIdList);
} }
} }
}
/** /**
* 更新 * 更新
@@ -92,7 +97,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
public void editById(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) { public void editById(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO) {
Date now = new Date(); Date now = new Date();
projectTaskInventoryDetailEO.setUpdateTime(now); projectTaskInventoryDetailEO.setUpdateTime(now);
saveOrUpdate(projectTaskInventoryDetailEO); this.baseMapper.updateById(projectTaskInventoryDetailEO);
} }
/** /**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+2 -2
View File
@@ -543,7 +543,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
public void disposeData(List<ProjectTaskInventoryEO> result,String cut){ public void disposeData(List<ProjectTaskInventoryEO> result,String cut){
if(CollectionUtils.isNotEmpty(result)){ if(CollectionUtils.isNotEmpty(result)){
for (ProjectTaskInventoryEO projectTaskInventoryEO : result) { for (ProjectTaskInventoryEO projectTaskInventoryEO : result) {
if(StringUtils.isNotEmpty(projectTaskInventoryEO.getDesignStatus())){ /*if(StringUtils.isNotEmpty(projectTaskInventoryEO.getDesignStatus())){
String textByValue = DesignComplianceStatusEnum.getTextByValue(projectTaskInventoryEO.getDesignStatus(), cut); String textByValue = DesignComplianceStatusEnum.getTextByValue(projectTaskInventoryEO.getDesignStatus(), cut);
projectTaskInventoryEO.setDesignStatus(textByValue); projectTaskInventoryEO.setDesignStatus(textByValue);
} }
@@ -568,7 +568,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
if(StringUtils.isNotEmpty(projectTaskInventoryEO.getVerifyFlowTaskStatus())){ if(StringUtils.isNotEmpty(projectTaskInventoryEO.getVerifyFlowTaskStatus())){
String textByValue = ReviewResultEnum.getTextByValue(projectTaskInventoryEO.getVerifyFlowTaskStatus(), cut); String textByValue = ReviewResultEnum.getTextByValue(projectTaskInventoryEO.getVerifyFlowTaskStatus(), cut);
projectTaskInventoryEO.setVerifyFlowTaskStatus(textByValue); projectTaskInventoryEO.setVerifyFlowTaskStatus(textByValue);
} }*/
} }
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java
+1 -1
View File
@@ -40,8 +40,8 @@ public class SendMessageUtils {
SendMessageUtils.sysAnnouncementService = sysAnnouncementService; SendMessageUtils.sysAnnouncementService = sysAnnouncementService;
} }
@Autowired
private static IFeishuService iFeishuService; private static IFeishuService iFeishuService;
@Autowired
public void setIFeishuService(IFeishuService iFeishuService){ public void setIFeishuService(IFeishuService iFeishuService){
SendMessageUtils.iFeishuService = iFeishuService; SendMessageUtils.iFeishuService = iFeishuService;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java
+4 -4
View File
@@ -108,8 +108,8 @@ public class workFlowController {
@AutoLog(value = "流程实例明细列表") @AutoLog(value = "流程实例明细列表")
@ApiOperation(value="流程实例明细列表", notes="流程实例明细列表") @ApiOperation(value="流程实例明细列表", notes="流程实例明细列表")
@GetMapping("/get_list_by_instance") @GetMapping("/get_list_by_instance")
public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){ public List<Map<String, Object>> 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,sortWord,shunxu); return workFlowFeignClient.get_list_by_instance(prcNum,cut,prcType,sortWord,shunxu);
} }
@AutoLog(value = "获取图片") @AutoLog(value = "获取图片")
@@ -143,8 +143,8 @@ public class workFlowController {
@AutoLog(value = "根据流程实例id查询流程历史") @AutoLog(value = "根据流程实例id查询流程历史")
@ApiOperation(value="根据流程实例id查询流程历史", notes="根据流程实例id查询流程历史") @ApiOperation(value="根据流程实例id查询流程历史", notes="根据流程实例id查询流程历史")
@GetMapping("/queryProcessHistoryByPrcId") @GetMapping("/queryProcessHistoryByPrcId")
public List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam(value="sortWord",required = false)String sortWord,@RequestParam(value="shunxu",required = false) String shunxu){ public List<Map<String, Object>> 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,sortWord,shunxu); return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,cut,prcType,sortWord,shunxu);
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java
+2
View File
@@ -47,4 +47,6 @@ public class TaskCommonQuery {
@ApiModelProperty(value = "高级搜索字符串") @ApiModelProperty(value = "高级搜索字符串")
private String advanceSearchVOStr; private String advanceSearchVOStr;
private String cut;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java
+2 -2
View File
@@ -87,7 +87,7 @@ public interface WorkFlowFeignClient {
* @return * @return
*/ */
@RequestMapping(value = "/bat-wkflow/task/get_list_by_instance",method = RequestMethod.GET) @RequestMapping(value = "/bat-wkflow/task/get_list_by_instance",method = RequestMethod.GET)
List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu); List<Map<String, Object>> 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 * @return
*/ */
@RequestMapping(value = "/bat-wkflow/task/queryProcessHistoryByPrcId",method = RequestMethod.GET) @RequestMapping(value = "/bat-wkflow/task/queryProcessHistoryByPrcId",method = RequestMethod.GET)
List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu); List<Map<String, Object>> 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);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java
+4 -4
View File
@@ -103,8 +103,8 @@ public class WorkFlowFeignClientImpl{
* @param shunxu * @param shunxu
* @return * @return
*/ */
public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ public List<Map<String, Object>> 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,sortWord,shunxu); return workFlowFeignClient.get_list_by_instance(prcNum,cut,prcType,sortWord,shunxu);
} }
/** /**
@@ -145,7 +145,7 @@ public class WorkFlowFeignClientImpl{
* @param shunxu * @param shunxu
* @return * @return
*/ */
public List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ public List<Map<String, Object>> 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,sortWord,shunxu); return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,cut,prcType,sortWord,shunxu);
} }
} }