diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml index c20e6f4..7c8ed19 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml @@ -49,7 +49,7 @@ FROM biz_equipment_standard_info_approval WHERE 1=1 - and standard_no like concat('%',#{request.standardNo},'%') + and standardCertNo like concat('%',#{request.standardNo},'%') and approval_status = #{request.approvalStatus} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml index c20e6f4..7c8ed19 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml @@ -49,7 +49,7 @@ FROM biz_equipment_standard_info_approval WHERE 1=1 - and standard_no like concat('%',#{request.standardNo},'%') + and standardCertNo like concat('%',#{request.standardNo},'%') and approval_status = #{request.approvalStatus} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml index 3a15b79..76157ce 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml @@ -42,7 +42,7 @@ FROM biz_equipment_standard_info WHERE 1=1 - and standard_no like concat('%',#{request.standardNo},'%') + and standardCertNo like concat('%',#{request.standardNo},'%') and standard_name like concat('%',#{request.standardName},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml index c20e6f4..7c8ed19 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml @@ -49,7 +49,7 @@ FROM biz_equipment_standard_info_approval WHERE 1=1 - and standard_no like concat('%',#{request.standardNo},'%') + and standardCertNo like concat('%',#{request.standardNo},'%') and approval_status = #{request.approvalStatus} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml index 3a15b79..76157ce 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml @@ -42,7 +42,7 @@ FROM biz_equipment_standard_info WHERE 1=1 - and standard_no like concat('%',#{request.standardNo},'%') + and standardCertNo like concat('%',#{request.standardNo},'%') and standard_name like concat('%',#{request.standardName},'%') diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 1ba1cc2..a963734 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -114,9 +114,14 @@ public ReturnDTO save(StandardAddRequest request) { //该用户存在该设备的草稿箱或审批中状态其他审批 BizEquipmentStandardInfoApproval standardInfoApproval = request.getStandardInfoApproval(); - //展示用雪花算法代替关联的标准代码 - String standardNo = String.valueOf(snowflakeUtil.nextId()); - standardInfoApproval.setStandardNo(standardNo); + //如果前端入参标准代码为空,说明是新建保存,否则是编辑后保存,不需要再次生成标准代码 + if (StringUtils.isBlank(standardInfoApproval.getStandardNo())) { + //暂时用雪花算法代替关联的标准代码 + String standardNo = String.valueOf(snowflakeUtil.nextId()); + standardInfoApproval.setStandardNo(standardNo); + } else { + standardInfoApproval.setStandardNo(standardInfoApproval.getStandardNo()); + } if (presentApprovalCount(standardInfoApproval, request.getUserId()) > 0) { throw new BusinessException(BusinessExceptionEnum.STANDARD_SAVE_REJECT); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml index c20e6f4..7c8ed19 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoApprovalMapper.xml @@ -49,7 +49,7 @@ FROM biz_equipment_standard_info_approval WHERE 1=1 - and standard_no like concat('%',#{request.standardNo},'%') + and standardCertNo like concat('%',#{request.standardNo},'%') and approval_status = #{request.approvalStatus} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml index 3a15b79..76157ce 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardInfoMapper.xml @@ -42,7 +42,7 @@ FROM biz_equipment_standard_info WHERE 1=1 - and standard_no like concat('%',#{request.standardNo},'%') + and standardCertNo like concat('%',#{request.standardNo},'%') and standard_name like concat('%',#{request.standardName},'%') diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 1ba1cc2..a963734 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -114,9 +114,14 @@ public ReturnDTO save(StandardAddRequest request) { //该用户存在该设备的草稿箱或审批中状态其他审批 BizEquipmentStandardInfoApproval standardInfoApproval = request.getStandardInfoApproval(); - //展示用雪花算法代替关联的标准代码 - String standardNo = String.valueOf(snowflakeUtil.nextId()); - standardInfoApproval.setStandardNo(standardNo); + //如果前端入参标准代码为空,说明是新建保存,否则是编辑后保存,不需要再次生成标准代码 + if (StringUtils.isBlank(standardInfoApproval.getStandardNo())) { + //暂时用雪花算法代替关联的标准代码 + String standardNo = String.valueOf(snowflakeUtil.nextId()); + standardInfoApproval.setStandardNo(standardNo); + } else { + standardInfoApproval.setStandardNo(standardInfoApproval.getStandardNo()); + } if (presentApprovalCount(standardInfoApproval, request.getUserId()) > 0) { throw new BusinessException(BusinessExceptionEnum.STANDARD_SAVE_REJECT); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java index 78c7be4..70671b2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffVerifierServiceImpl.java @@ -189,6 +189,6 @@ } List ids = verifierList.stream().map(BizResourceStaffVerifier::getStaffId).collect(Collectors.toList()); List staffInfoList = staffInfoMapper.selectBatchIds(ids); - return ReturnUtil.success(staffInfoList.stream().map(BizResourceStaffInfo::getStaffName).distinct().collect(Collectors.joining(","))); + return ReturnUtil.success(staffInfoList); } }