Commit 8245468d authored by 刘林's avatar 刘林

fix(jg):移装变更接口修改

parent 66b7e492
...@@ -149,7 +149,8 @@ public class JgChangeRegistrationReformController extends BaseController { ...@@ -149,7 +149,8 @@ public class JgChangeRegistrationReformController extends BaseController {
@RequestParam(value = "EQU_LIST_CODE", required = false) String EQU_LIST_CODE, @RequestParam(value = "EQU_LIST_CODE", required = false) String EQU_LIST_CODE,
@RequestParam(value = "EQU_CATEGORY_CODE", required = false) String EQU_CATEGORY_CODE, @RequestParam(value = "EQU_CATEGORY_CODE", required = false) String EQU_CATEGORY_CODE,
@RequestParam(value = "equList", required = false) String equList, @RequestParam(value = "equList", required = false) String equList,
@RequestParam(value = "receiveCompanyCode") String receiveCompanyCode @RequestParam(value = "receiveCompanyCode") String receiveCompanyCode,
@RequestParam(value = "certificateStatus", required = false) String certificateStatus
) { ) {
JgUseRegistrationManageDto dto = new JgUseRegistrationManageDto(); JgUseRegistrationManageDto dto = new JgUseRegistrationManageDto();
Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>(); Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
...@@ -182,7 +183,7 @@ public class JgChangeRegistrationReformController extends BaseController { ...@@ -182,7 +183,7 @@ public class JgChangeRegistrationReformController extends BaseController {
dto.setReceiveCompanyCode(codes[0]); dto.setReceiveCompanyCode(codes[0]);
} }
} }
dto.setCertificateStatus("已登记"); dto.setEquCategoryCode(!ObjectUtils.isEmpty(certificateStatus) ? certificateStatus : "已登记");
return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getUseRegistrationCodeData(page, dto)); return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getUseRegistrationCodeData(page, dto));
} }
} }
...@@ -2205,7 +2205,8 @@ private SafetyProblemTracingMapper safetyProblemTracingMapper; ...@@ -2205,7 +2205,8 @@ private SafetyProblemTracingMapper safetyProblemTracingMapper;
inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName())); inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
inspectionDetectionInfo.setRecord(record); inspectionDetectionInfo.setRecord(record);
inspectionDetectionInfo.setRecDate(date); inspectionDetectionInfo.setRecDate(date);
inspectionDetectionInfo.setInspectConclusion(null); inspectionDetectionInfo.setInspectType("ZZJDJY");
inspectionDetectionInfo.setInspectConclusion("6040");
inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ"))); inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo); iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
} }
......
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