Skip to content

A
amos-boot-biz
Commit f7ce3b16 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents cd011d9e b4265de6
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 22 deletions
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/TaskModelServiceImpl.java
View file @ f7ce3b16
......@@ -71,7 +71,7 @@ public class TaskModelServiceImpl {
public void deleteTaskModel(String id) {
List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(id).getResult();
if (result.size() > 0) {
if (!result.isEmpty()) {
List<Long> idList = result.stream().map(TaskV2Model::getSequenceNbr).collect(Collectors.toList());
String ids = idList.stream().map(Object::toString).collect(Collectors.joining(","));
Systemctl.taskV2Client.delete(ids);
......@@ -86,10 +86,10 @@ public class TaskModelServiceImpl {
List<TaskV2Model> taskV2Models = new ArrayList<>();
for (TaskModelDto obj : list) {
//判断是否是暂存 新增若无下一节点执行人即为暂存
boolean flag = StringUtils.isEmpty(obj.getNextExecuteUser()) ? true : false;
boolean flag = StringUtils.isEmpty(obj.getNextExecuteUser());
if (flag) {
List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(obj.getRelationId()).getResult();
if (CollectionUtil.isNotEmpty(result) && result.size() > 0) {
if (CollectionUtil.isNotEmpty(result) && !result.isEmpty()) {
TaskV2Model taskV2Model = result.get(0);
taskV2Model.setTaskContent(obj.getTaskContent());
Systemctl.taskV2Client.update(taskV2Model, taskV2Model.getSequenceNbr());
......@@ -172,10 +172,8 @@ public class TaskModelServiceImpl {
**/
public TaskV2Model updateTaskModel(Map<String, Object> params) {
String exeUserId = RequestContext.getExeUserId();
List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(params.get("relationId").toString()).getResult();
List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
if (collect == null || collect.size() == 0) {
List<TaskV2Model> collect = Systemctl.taskV2Client.selectListByRelationId(params.get("relationId").toString()).getResult();
if (collect == null || collect.isEmpty()) {
return null;
}
collect.get(0).setFlowStatus(Integer.valueOf(params.get("flowStatus").toString()));
......@@ -236,8 +234,7 @@ public class TaskModelServiceImpl {
*/
public void rollbackTask(String id, JSONObject obj) {
this.removeNoUsedKey(obj);
List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(id).getResult();
List<TaskV2Model> list = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
List<TaskV2Model> list = Systemctl.taskV2Client.selectListByRelationId(id).getResult();
TaskV2Model model = list.get(0);
Systemctl.taskV2Client.delete(String.valueOf(model.getSequenceNbr()));
......@@ -427,9 +424,8 @@ public class TaskModelServiceImpl {
flowTaskVo.setAssignee(assignee);
ProcessTaskDTO processTaskDTO = cmWorkflowService.assign(flowTaskVo);
//修改待办
List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(instanceId).getResult();
List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
if (collect.size() == 0) {
List<TaskV2Model> collect = Systemctl.taskV2Client.selectListByRelationId(instanceId).getResult();
if (collect.isEmpty()) {
return null;
}
TaskV2Model taskV2Model = collect.get(0);
......@@ -503,9 +499,8 @@ public class TaskModelServiceImpl {
flowTaskVo.setAssignee(assignee);
ProcessTaskDTO processTaskDTO = cmWorkflowService.assign(flowTaskVo);
//修改待办
List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(instanceId).getResult();
List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
if (collect.size() == 0) {
List<TaskV2Model> collect = Systemctl.taskV2Client.selectListByRelationId(instanceId).getResult();
if (collect.isEmpty()) {
return null;
}
TaskV2Model taskV2Model = collect.get(0);
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
View file @ f7ce3b16
......@@ -407,7 +407,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
this.buildRoleList(Collections.singletonList(processTaskDTO), roleList, roleListAll);
List<WorkflowResultDto> workflowResultDtos = taskModelService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
String executorRoleIds = workflowResultDtos.get(0).getExecutorRoleIds();
String executorRoleIds = workflowResultDtos.get(0).getNextExecutorRoleIds();
if (processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() > 0) {
taskName1 = processTaskDTO.getNextTask().get(0).getName();
nextTaskId = processTaskDTO.getNextTask().get(0).getId();
......@@ -945,7 +945,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
model.setProcessDescription(processDescription);
}
String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
String executorRoleIds = workflowResultDtos.get(0).getExecutorRoleIds();
String executorRoleIds = workflowResultDtos.get(0).getNextExecutorRoleIds();
nextTaskName = workflowResultDtos.get(0).getNextTaskName();
nextTaskId = workflowResultDtos.get(0).getNextTaskId();
model.setNextExecuteIds(String.join(",", roleList));
......@@ -1014,7 +1014,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
model.setProcessDescription(processDescription);
}
String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
String executorRoleIds = workflowResultDtos.get(0).getExecutorRoleIds();
String executorRoleIds = workflowResultDtos.get(0).getNextExecutorRoleIds();
nextTaskName = workflowResultDtos.get(0).getNextTaskName();
nextTaskId = workflowResultDtos.get(0).getNextTaskId();
model.setNextExecuteIds(String.join(",", roleList));
......@@ -1450,7 +1450,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
re.put("projectContraptionId", projectContraptionSeq);
re.put("projectContraptionNo", projectContraption.getProjectContraptionNo());
re.put("pipelineLength", projectContraption.getPipelineLength());
re.put("useRegistrationCode ", projectContraption.getUseRegistrationCode());
re.put("useRegistrationCode", projectContraption.getUseRegistrationCode());
this.setInstallAddress(projectContraption, re);
this.setUseAddress(projectContraption, re);
return re;
......@@ -1482,7 +1482,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
jsonObject.put("projectContraptionId", applicationModel.getProjectContraptionId());
jsonObject.put("projectContraptionNo", projectContraption.getProjectContraptionNo());
jsonObject.put("pipelineLength", calTotalLength(equList));
jsonObject.put("useRegistrationCode ", projectContraption.getUseRegistrationCode());
jsonObject.put("useRegistrationCode", projectContraption.getUseRegistrationCode());
this.setInstallAddress(projectContraption, jsonObject);
this.setUseAddress(projectContraption, jsonObject);
return jsonObject;
......@@ -1517,7 +1517,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
jsonObject.put("projectContraptionId", applicationModel.getProjectContraptionId());
jsonObject.put("projectContraptionNo", projectContraption.getProjectContraptionNo());
jsonObject.put("pipelineLength", calTotalLength(equList));
jsonObject.put("useRegistrationCode ", projectContraption.getUseRegistrationCode());
jsonObject.put("useRegistrationCode", projectContraption.getUseRegistrationCode());
this.setInstallAddress(projectContraption, jsonObject);
this.setUseAddress(projectContraption, jsonObject);
return jsonObject;
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgProjectContraptionMapper.xml
View file @ f7ce3b16
......@@ -206,7 +206,7 @@
<otherwise>
and pc.use_unit_credit_code=#{companyCode}
and pc.is_into_management = true
and exists (select 1 from idx_biz_jg_project_inspection pi where pi."PROJECT_CONTRAPTION_ID" = pc.sequence_nbr)
and exists (select 1 from idx_biz_jg_use_info ibjui, idx_biz_jg_inspection_detection_info di where ibjui."RECORD" = di."RECORD" and ibjui.project_contraption_id=pc.sequence_nbr limit 1)
</otherwise>
</choose>
</otherwise>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment