|
|
|
@ -142,6 +142,10 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic |
|
|
|
Boolean res = complaintCollectionResourceService.createComplaintCollection(Arrays.asList(complaintCollection)); |
|
|
|
Boolean res = complaintCollectionResourceService.createComplaintCollection(Arrays.asList(complaintCollection)); |
|
|
|
Assert.notNull(complaintCollection.getId(), "主表插入后未获取到ID"); |
|
|
|
Assert.notNull(complaintCollection.getId(), "主表插入后未获取到ID"); |
|
|
|
saveThingFilesOrThrow(complaintCollection.getId(), request.getThingFiles()); |
|
|
|
saveThingFilesOrThrow(complaintCollection.getId(), request.getThingFiles()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 同步创建 Negative
|
|
|
|
|
|
|
|
NegativeDto negativeDto = buildNegativeDtoFromComplaintCollection(complaintCollection, request); |
|
|
|
|
|
|
|
negativeService.save(negativeDto); |
|
|
|
return Result.success(res); |
|
|
|
return Result.success(res); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -294,7 +298,7 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic |
|
|
|
return Result.success(complaintCollectionPageVo); |
|
|
|
return Result.success(complaintCollectionPageVo); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Deprecated |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public Result<Boolean> addComplaintCollectionBlame(ComplaintCollectionAndBlameAddRequest request) { |
|
|
|
public Result<Boolean> addComplaintCollectionBlame(ComplaintCollectionAndBlameAddRequest request) { |
|
|
|
@ -942,6 +946,56 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic |
|
|
|
return dto; |
|
|
|
return dto; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 从 ComplaintCollectionAddRequest 构建 NegativeDto,用于同步创建 Negative |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
private NegativeDto buildNegativeDtoFromComplaintCollection(ComplaintCollection complaintCollection, ComplaintCollectionAddRequest request) { |
|
|
|
|
|
|
|
Map<String, String> sourceDict = buildDictLabelMap(SupDictEnum.SFSS_SOURCE_TABLE.getCode()); |
|
|
|
|
|
|
|
NegativeDto dto = new NegativeDto(); |
|
|
|
|
|
|
|
// originId 会自动生成
|
|
|
|
|
|
|
|
dto.setOriginId(complaintCollection.getOriginId()); |
|
|
|
|
|
|
|
dto.setDiscoveryTime(complaintCollection.getDiscoveryTime()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 问题来源
|
|
|
|
|
|
|
|
if (ComplaintCollectionSourceTableEnum.LEADER_ASSIGN.getCode().equals(request.getSourceTable())) { |
|
|
|
|
|
|
|
dto.setProblemSourcesCode(request.getSourceTableSubOne()); |
|
|
|
|
|
|
|
dto.setProblemSources(sourceDict.get(request.getSourceTableSubOne())); |
|
|
|
|
|
|
|
}else { |
|
|
|
|
|
|
|
dto.setProblemSourcesCode(request.getSourceTable()); |
|
|
|
|
|
|
|
dto.setProblemSources(sourceDict.get(request.getSourceTable())); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// 业务类别
|
|
|
|
|
|
|
|
dto.setBusinessTypeCode(request.getBusinessTypeCode()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 涉及单位 - 使用被投诉二级机构
|
|
|
|
|
|
|
|
dto.setInvolveDepartId(request.getSecondDepartId()); |
|
|
|
|
|
|
|
dto.setInvolveDepartName(request.getSecondDepartName()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 内容描述
|
|
|
|
|
|
|
|
dto.setThingDesc(complaintCollection.getThingDesc()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 主办层级
|
|
|
|
|
|
|
|
dto.setHostLevel(request.getHostLevel()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 指定办理单位
|
|
|
|
|
|
|
|
dto.setDepartId(request.getDepartId()); |
|
|
|
|
|
|
|
// dto.setDepartName(request.getDepartName());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 办理时限
|
|
|
|
|
|
|
|
dto.setTimeLimit(request.getTimeLimit()); |
|
|
|
|
|
|
|
dto.setMaxSignDuration(request.getMaxSignDuration()); |
|
|
|
|
|
|
|
dto.setMaxHandleDuration(request.getMaxHandleDuration()); |
|
|
|
|
|
|
|
dto.setMaxExtensionDuration(request.getMaxExtensionDuration()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 审批流程
|
|
|
|
|
|
|
|
dto.setApprovalFlow(request.getApprovalFlow()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 附件
|
|
|
|
|
|
|
|
dto.setThingFiles(request.getThingFiles()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return dto; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private Map<String, String> buildDictLabelMap(String dictType) { |
|
|
|
private Map<String, String> buildDictLabelMap(String dictType) { |
|
|
|
List<SupDictData> list = supDictDataService.listByDictType(dictType); |
|
|
|
List<SupDictData> list = supDictDataService.listByDictType(dictType); |
|
|
|
return list.stream() |
|
|
|
return list.stream() |
|
|
|
|