Commit 4cd028f5 authored by suhuiguang's avatar suhuiguang

feat(jyjc):检验检测业务管理

1.详情
parent f9722c0c
......@@ -103,6 +103,4 @@ public class JyjcBizManageController extends BaseController {
return ResponseHelper.buildResponse(jyjcBizManageService.getOne(appSeq));
}
}
......@@ -235,9 +235,9 @@ public class JyjcBizManageServiceImpl {
public Boolean detectionRegionEdit(String appSeq, String newDetectionRegion) {
JyjcOpeningApplication openingApplication = openingApplicationService.getById(appSeq);
openingApplication.setDetectionRegion(Arrays.stream(newDetectionRegion.split(",")).collect(Collectors.toList()));
if(openingApplication.getExclusionRegion() != null){
if (openingApplication.getExclusionRegion() != null) {
// 如果省局维护后的区域,去掉了一部分,则把市局停用区域字段也去掉
openingApplication.setExclusionRegion(openingApplication.getExclusionRegion().stream().filter(e-> openingApplication.getDetectionRegion().contains(e)).collect(Collectors.toList()));
openingApplication.setExclusionRegion(openingApplication.getExclusionRegion().stream().filter(e -> openingApplication.getDetectionRegion().contains(e)).collect(Collectors.toList()));
}
openingApplicationService.saveOrUpdate(openingApplication);
return Boolean.TRUE;
......@@ -249,6 +249,39 @@ public class JyjcBizManageServiceImpl {
}
public Map<String, Object> getOne(String appSeq) {
return null;
Map<String, Object> res = new HashMap<>();
JyjcOpeningApplication openingApplication = openingApplicationService.getById(appSeq);
JyjcInspectionHistory jyjcInspectionHistory = inspectionHistoryService.getBySSeq(openingApplication.getSequenceNbr());
if (jyjcInspectionHistory != null) {
JSONObject hisData = jyjcInspectionHistory.getHistoryData();
BeanUtil.copyProperties(hisData, res);
res.remove("baseUnitLicences");
res.put("licences", getLicenceInfo(hisData, openingApplication));
}
res.put("detectionRegion", openingApplication.getDetectionRegion());
res.put("exclusionRegion", openingApplication.getExclusionRegion());
res.put("status", openingApplication.getStatus());
res.put("applicationSeq", openingApplication.getApplicationSeq());
return res;
}
private List<Map<String, Object>> getLicenceInfo(JSONObject hisData, JyjcOpeningApplication openingApplication) {
List<BaseUnitLicence> baseUnitLicences = new ArrayList<>();
List<BaseEnterpriseCertDto> certDtos = hisData.getJSONArray(BizCommonConstant.UNIT_LICENCE_KEY).toJavaList(BaseEnterpriseCertDto.class);
certDtos.forEach(certDto -> {
List<Long> certSeqList = openingApplicationService.getCertFromHisData(openingApplication, certDto);
if (!certSeqList.isEmpty()) {
List<BaseUnitLicence> baseUnitLicenceOne = baseUnitLicenceMapper.selectList(new LambdaQueryWrapper<BaseUnitLicence>().in(BaseUnitLicence::getEnterpriseCertSeq, certSeqList));
baseUnitLicences.addAll(baseUnitLicenceOne);
}
});
List<Map<String, Object>> licences = baseUnitLicences.stream().map(e -> {
Map<String, Object> map = new HashMap<>();
BeanUtil.copyProperties(e, map);
map.put("licenceState", String.valueOf(e.getLicenceState()));
map.put("qualificationCertificateAttachment", JSONObject.parseArray(e.getQualificationCertificateAttachment()));
return map;
}).collect(Collectors.toList());
return licences;
}
}
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