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

根据projectId查询编辑时下拉数据 - 多个领域用户，去重。

Browse Source 
流程调用-任务清单接口修改。
This commit is contained in:
wangzhijiang
2022-05-06 11:41:59 +08:00
parent 5a0b6e1e93
commit 1c9d6bb86f
5 changed files with 65 additions and 4 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/ProjectTaskInventoryDetailEO.java
+5
View File
@@ -71,6 +71,11 @@ public class ProjectTaskInventoryDetailEO implements Serializable {
@ApiModelProperty(value = "待办id")
private java.lang.String taskId;
/**任务节点定义key**/
@Excel(name = "任务节点定义key", width = 15)
@ApiModelProperty(value = "任务节点定义key")
private String taskDefinitionKey;
/**流程实例id*/
@Excel(name = "流程实例id", width = 15)
@ApiModelProperty(value = "流程实例id")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
+15
View File
@@ -74,6 +74,11 @@ public class ProjectTaskInventoryEO implements Serializable {
@ApiModelProperty(value = "设计符合性流程状态")
private String designStatus;
/**设计符合性流程-任务状态*/
@Excel(name = "设计符合性流程-任务状态", width = 15)
@ApiModelProperty(value = "设计符合性流程-任务状态")
private String designFlowTaskStatus;
/**设计符合性流程 流程实例id*/
@Excel(name = "设计符合性流程 流程实例id", width = 15)
@ApiModelProperty(value = "设计符合性流程 流程实例id")
@@ -84,6 +89,11 @@ public class ProjectTaskInventoryEO implements Serializable {
@ApiModelProperty(value = "prehomo确认流程状态")
private String prehomoStatus;
/**prehomo确认流程-任务状态*/
@Excel(name = "prehomo确认流程-任务状态", width = 15)
@ApiModelProperty(value = "prehomo确认流程-任务状态")
private String prehomoFlowTaskStatus;
/**prehomo流程 流程实例id*/
@Excel(name = "prehomo流程 流程实例id", width = 15)
@ApiModelProperty(value = "prehomo流程 流程实例id")
@@ -94,6 +104,11 @@ public class ProjectTaskInventoryEO implements Serializable {
@ApiModelProperty(value = "验证符合性流程状态")
private String verifyStatus;
/**验证符合性流程-任务状态*/
@Excel(name = "验证符合性流程-任务状态", width = 15)
@ApiModelProperty(value = "验证符合性流程-任务状态")
private String verifyFlowTaskStatus;
/**验证符合性流程 流程实例id*/
@Excel(name = "验证符合性流程 流程实例id", width = 15)
@ApiModelProperty(value = "验证符合性流程 流程实例id")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java
+2
View File
@@ -19,6 +19,8 @@ public enum OperatorTypeEnum {
TASK_AFFIRM_QUERY("任务确认流程，查询法规清单信息","taskAffirmQuery"),
ADD_TASK_INVENTORY_DETAIL("添加法规清单明细信息","addTaskInventoryDetail"),
QUERY_TASK_INVENTORY_DETAIL("查询法规清单明细信息","queryTaskInventoryDetail"),
UPDATE_TASK_INVENTORY_DETAIL("更新法规清单明细信息","updateTaskInventoryDetail"),
;
String name;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+16
View File
@@ -334,6 +334,22 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
new TreeSet<>(Comparator.comparing(o -> (String)o.get("value")))), ArrayList::new
)
);
lawEngineerList = lawEngineerList.stream().collect(
Collectors.collectingAndThen(Collectors.toCollection(() ->
new TreeSet<>(Comparator.comparing(o -> (String)o.get("value")))), ArrayList::new
)
);
certificationEngineerList = certificationEngineerList.stream().collect(
Collectors.collectingAndThen(Collectors.toCollection(() ->
new TreeSet<>(Comparator.comparing(o -> (String)o.get("value")))), ArrayList::new
)
);
engineeringInterfacePersonList = engineeringInterfacePersonList.stream().collect(
Collectors.collectingAndThen(Collectors.toCollection(() ->
new TreeSet<>(Comparator.comparing(o -> (String)o.get("value")))), ArrayList::new
)
);
result.put("lawEngineerList",lawEngineerList);
result.put("certificationEngineerList",certificationEngineerList);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+27 -4
View File
@@ -20,10 +20,7 @@ import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Date;
import java.util.*;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -204,8 +201,34 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO = null;
for (Object detail : taskInventoryDetailList) {
projectTaskInventoryDetailEO = JSONObject.parseObject(JSONObject.toJSONString(detail),ProjectTaskInventoryDetailEO.class);
// 当前流程 当前用户 的数据删掉 确保唯一。
QueryWrapper<ProjectTaskInventoryDetailEO> deleteWrapper = new QueryWrapper<>();
deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,projectTaskInventoryDetailEO.getActiProcInstId());
deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getUserId,projectTaskInventoryDetailEO.getUserId());
deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getFlowType,projectTaskInventoryDetailEO.getFlowType());
projectTaskInventoryDetailEOMapper.delete(deleteWrapper);
projectTaskInventoryDetailEOMapper.insert(projectTaskInventoryDetailEO);
}
}else if(StringUtils.equals(operatorType,OperatorTypeEnum.QUERY_TASK_INVENTORY_DETAIL.getValue())){
String userId = jsonObject.getString("userId");
String flowType = jsonObject.getString("flowType");
String actiProcInstId = jsonObject.getString("actiProcInstId");
QueryWrapper<ProjectTaskInventoryDetailEO> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getUserId,userId);
queryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getFlowType,flowType);
queryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,actiProcInstId);
queryWrapper.isNull("task_id");
List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOS = projectTaskInventoryDetailEOMapper.selectList(queryWrapper);
Result<List<ProjectTaskInventoryDetailEO>> objectResult = new Result<>();
objectResult.setResult(projectTaskInventoryDetailEOS);
objectResult.setSuccess(true);
return objectResult;
}else if(StringUtils.equals(operatorType,OperatorTypeEnum.UPDATE_TASK_INVENTORY_DETAIL.getValue())){
ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO = JSONObject.parseObject(jsonObject.toString(), ProjectTaskInventoryDetailEO.class);
this.projectTaskInventoryDetailEOMapper.updateById(projectTaskInventoryDetailEO);
}
return new Result<>().success("调用成功！");