Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -10,7 +10,7 @@
     <select id="getListPage" resultType="java.util.Map">
         select ur.sequence_nbr as sequenceNbr,
         ur.audit_status as auditStatus,
-        ur.reg_date as regDate,
+        date_format(reg_date,'%Y-%m-%d') as regDate,
         ur.use_unit_name as useUnitName,
         ur.status,
         ur.receive_org_name as receiveOrgName,

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -103,10 +103,10 @@ public class JgUseRegistrationController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @ApiOperation(httpMethod = "GET", value = "详情", notes = "详情")
     @GetMapping(value = "/getDetail")
-    public ResponseModel<Map<String, Object>> getDetail(@RequestParam("record") String record) {
-        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDetail(record));
+    public ResponseModel<Map<String, Object>> getDetail(@RequestParam("record") String record, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDetail(record, sequenceNbr));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -94,6 +94,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
         inspectionLambda.eq(InspectionDetectionInfo::getRecord, map.get("equipId"));
         // 更新检验检测信息
+        inspectionDetectionInfo.setInspectReport(null);
         inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
         // 使用登记信息
         JgUseRegistration jgUseRegistration = new JgUseRegistration();
@@ -373,18 +374,21 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         this.update(jgUseRegistration, lambda);
     }
 
-    public Map<String, Object> getDetail(String id) {
+    public Map<String, Object> getDetail(String id, Long sequenceNbr) {
         Map<String, Object> detail = this.baseMapper.getDetail(id);
         Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(id);
         Map<String, Object> useDetail = this.baseMapper.getUseDetail(id);
         detail.putAll(inspectDetail);
         detail.putAll(useDetail);
-        detail.putAll(useDetail);
         detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
         detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
         detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
         detail.put("insUseMaintainExplanin", JSON.parse(String.valueOf(detail.get("insUseMaintainExplanin"))));
         detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+        if (!ObjectUtils.isEmpty(sequenceNbr)){
+            JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
+            detail.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode());
+        }
         return detail;
     }