|
|
|
@ -276,10 +276,6 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> { |
|
|
|
throw new RuntimeException("样本源头编号已存在请核实"); |
|
|
|
throw new RuntimeException("样本源头编号已存在请核实"); |
|
|
|
} |
|
|
|
} |
|
|
|
String businessTypeCode = NegativeApiDto.BusinessType.getCode(item.getBusinessTypeName()); |
|
|
|
String businessTypeCode = NegativeApiDto.BusinessType.getCode(item.getBusinessTypeName()); |
|
|
|
// if (!NegativeApiDto.BusinessType.JCJ_110.getCode().equals(businessTypeCode) && !NegativeApiDto.BusinessType.JCJ_122.getCode().equals(businessTypeCode)) {
|
|
|
|
|
|
|
|
// // 只针对110、122数据进行下发
|
|
|
|
|
|
|
|
// continue;
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
SupDepart dept = departService.getByJwpyCode(item.getDepartCode()); |
|
|
|
SupDepart dept = departService.getByJwpyCode(item.getDepartCode()); |
|
|
|
Negative negative = new Negative(); |
|
|
|
Negative negative = new Negative(); |
|
|
|
BeanUtil.copyProperties(item, negative); |
|
|
|
BeanUtil.copyProperties(item, negative); |
|
|
|
@ -315,11 +311,14 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> { |
|
|
|
.setHandleThreeDepartName(dept.getShortName()) |
|
|
|
.setHandleThreeDepartName(dept.getShortName()) |
|
|
|
.setHandleSecondDepartId(parentDepart.getId()) |
|
|
|
.setHandleSecondDepartId(parentDepart.getId()) |
|
|
|
.setHandleSecondDepartName(parentDepart.getShortName()) |
|
|
|
.setHandleSecondDepartName(parentDepart.getShortName()) |
|
|
|
|
|
|
|
.setSecondInvolveDepartId(parentDepart.getId()) |
|
|
|
|
|
|
|
.setThreeInvolveDepartId(dept.getId()) |
|
|
|
.setFlowKey(FlowNodeEnum.THREE_SIGN.getKey()) |
|
|
|
.setFlowKey(FlowNodeEnum.THREE_SIGN.getKey()) |
|
|
|
.setCurrentProcessingObject(String.format("%s专班", dept.getShortName())); |
|
|
|
.setCurrentProcessingObject(String.format("%s专班", dept.getShortName())); |
|
|
|
} else if (DepartLevelEnum.SECOND.getValue().equals(dept.getLevel())) { |
|
|
|
} else if (DepartLevelEnum.SECOND.getValue().equals(dept.getLevel())) { |
|
|
|
negative.setHandleSecondDepartId(dept.getId()) |
|
|
|
negative.setHandleSecondDepartId(dept.getId()) |
|
|
|
.setHandleSecondDepartName(dept.getShortName()) |
|
|
|
.setHandleSecondDepartName(dept.getShortName()) |
|
|
|
|
|
|
|
.setSecondInvolveDepartId(dept.getId()) |
|
|
|
.setFlowKey(FlowNodeEnum.SECOND_SIGN.getKey()) |
|
|
|
.setFlowKey(FlowNodeEnum.SECOND_SIGN.getKey()) |
|
|
|
.setCurrentProcessingObject(String.format("%s专班", dept.getShortName())); |
|
|
|
.setCurrentProcessingObject(String.format("%s专班", dept.getShortName())); |
|
|
|
} |
|
|
|
} |
|
|
|
|