【丽水】先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改

陈昶聿

3 天以前 3d4740d76f50222ce00587abea81b56afa35f6db

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java

@@ -315,7 +315,9 @@
        List<ServiceSubtaskRes> serviceSubtaskResList = new ArrayList<>();
        for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
            ServiceSubtaskRes serviceSubtaskRes = DtoConversionUtils.sourceToTarget(serviceSubtask, ServiceSubtaskRes.class);
            serviceSubtaskRes.setContinueContent(JSONObject.parseObject(serviceSubtask.getContinueContent()));
            if(ObjectUtils.isNotEmpty(serviceSubtask.getContinueContent())){
                serviceSubtaskRes.setContinueContent(serviceSubtask.getContinueContent());
            }
            serviceSubtaskResList.add(serviceSubtaskRes);
        }
        return serviceSubtaskResList;
@@ -618,7 +620,8 @@
                            serviceTaskdept.setDeptCode(deptCode);
                            serviceTaskdept.setDeptType("1");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                            //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改
                            serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
                        }
                    }
                    if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
@@ -627,7 +630,8 @@
                            serviceTaskdept.setDeptCode(districtcode);
                            serviceTaskdept.setDeptType("2");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                            //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改
                            serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
                        }
                    }
                }
@@ -760,15 +764,8 @@
                            serviceTaskdept.setDeptCode(deptCode);
                            serviceTaskdept.setDeptType("1");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            ServiceTaskdept st = new ServiceTaskdept();
                            st.setDeptCode(deptCode);
                            st.setTaskId(serviceTask.getTaskid());
                            List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st);
                            if (CollectionUtils.isEmpty(serviceTaskdepts)) {
                                serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                            } else {
                                serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept);
                            }
                            //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改
                            serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
                        }
                    }
                    if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
@@ -783,15 +780,7 @@
                            serviceTaskdept.setDeptType("2");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改
                            ServiceTaskdept st = new ServiceTaskdept();
                            st.setDeptCode(districtcode);
                            st.setTaskId(serviceTask.getTaskid());
                            List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st);
                            if (CollectionUtils.isEmpty(serviceTaskdepts)) {
                                serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                            } else {
                                serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept);
                            }
                            serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
                        }
                    }
                } else if (serviceTaskVO.getAppltype().equals("3")) {