diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
index 8377cdb..4c6d76d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
@@ -8,8 +8,8 @@
public enum QualityTableEnum {
//质量监督
SUPERVISION_RECORD("biz_quality_supervision_record", "监督记录", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_01, 15),
- SUPERVISION_RECORD_REP("biz_quality_supervision_record", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
- NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 15),
+ SUPERVISION_RECORD_REP("biz_quality_supervision_rep", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
+ NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 13),
//纠正 预防
CORRECTIVE_RECORD("biz_quality_corrective_record", "纠正措施处理单", "file_code", QualityFileNoEnum.TYPE_207, QualityFileTypeEnum.TYPE_01, 13),
PREVENT_RECORD("biz_quality_prevent_record", "预防措施表", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 13),
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
index 8377cdb..4c6d76d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
@@ -8,8 +8,8 @@
public enum QualityTableEnum {
//质量监督
SUPERVISION_RECORD("biz_quality_supervision_record", "监督记录", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_01, 15),
- SUPERVISION_RECORD_REP("biz_quality_supervision_record", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
- NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 15),
+ SUPERVISION_RECORD_REP("biz_quality_supervision_rep", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
+ NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 13),
//纠正 预防
CORRECTIVE_RECORD("biz_quality_corrective_record", "纠正措施处理单", "file_code", QualityFileNoEnum.TYPE_207, QualityFileTypeEnum.TYPE_01, 13),
PREVENT_RECORD("biz_quality_prevent_record", "预防措施表", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 13),
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java
index d6eb69b..10b478e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java
@@ -6,6 +6,6 @@
import java.util.function.BiFunction;
public interface IBaseSelectMaxMapper {
- @Select("SELECT IFNULL(max(RIGHT(${likeId}, 3)), 0) from ${tableName} where ${likeId} like #{idVal}")
+ @Select("SELECT IFNULL(max(RIGHT(${likeId}, 3)), 0) from ${tableName} where ${likeId} like CONCAT(#{idVal},'%')")
Long selectMaxNo(@Param("tableName") String tableName, @Param("likeId") String likeId, @Param("idVal") String idVal);
}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
index 8377cdb..4c6d76d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
@@ -8,8 +8,8 @@
public enum QualityTableEnum {
//质量监督
SUPERVISION_RECORD("biz_quality_supervision_record", "监督记录", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_01, 15),
- SUPERVISION_RECORD_REP("biz_quality_supervision_record", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
- NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 15),
+ SUPERVISION_RECORD_REP("biz_quality_supervision_rep", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
+ NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 13),
//纠正 预防
CORRECTIVE_RECORD("biz_quality_corrective_record", "纠正措施处理单", "file_code", QualityFileNoEnum.TYPE_207, QualityFileTypeEnum.TYPE_01, 13),
PREVENT_RECORD("biz_quality_prevent_record", "预防措施表", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 13),
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java
index d6eb69b..10b478e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java
@@ -6,6 +6,6 @@
import java.util.function.BiFunction;
public interface IBaseSelectMaxMapper {
- @Select("SELECT IFNULL(max(RIGHT(${likeId}, 3)), 0) from ${tableName} where ${likeId} like #{idVal}")
+ @Select("SELECT IFNULL(max(RIGHT(${likeId}, 3)), 0) from ${tableName} where ${likeId} like CONCAT(#{idVal},'%')")
Long selectMaxNo(@Param("tableName") String tableName, @Param("likeId") String likeId, @Param("idVal") String idVal);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
index 4deb086..1fb6d91 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
@@ -118,8 +118,8 @@
and sup_dep_id = #{request.supDepId}
-
- and is_non_conformance = #{request.isNonConformance}
+
+ and exists(select 1 from biz_quality_rep_rel c INNER JOIN biz_quality_supervision_record d on c.sup_record_id = d.id where c.rep_id = a.id)
and sub_time >= #{request.subTimeStart}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
index 8377cdb..4c6d76d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
@@ -8,8 +8,8 @@
public enum QualityTableEnum {
//质量监督
SUPERVISION_RECORD("biz_quality_supervision_record", "监督记录", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_01, 15),
- SUPERVISION_RECORD_REP("biz_quality_supervision_record", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
- NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 15),
+ SUPERVISION_RECORD_REP("biz_quality_supervision_rep", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
+ NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 13),
//纠正 预防
CORRECTIVE_RECORD("biz_quality_corrective_record", "纠正措施处理单", "file_code", QualityFileNoEnum.TYPE_207, QualityFileTypeEnum.TYPE_01, 13),
PREVENT_RECORD("biz_quality_prevent_record", "预防措施表", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 13),
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java
index d6eb69b..10b478e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java
@@ -6,6 +6,6 @@
import java.util.function.BiFunction;
public interface IBaseSelectMaxMapper {
- @Select("SELECT IFNULL(max(RIGHT(${likeId}, 3)), 0) from ${tableName} where ${likeId} like #{idVal}")
+ @Select("SELECT IFNULL(max(RIGHT(${likeId}, 3)), 0) from ${tableName} where ${likeId} like CONCAT(#{idVal},'%')")
Long selectMaxNo(@Param("tableName") String tableName, @Param("likeId") String likeId, @Param("idVal") String idVal);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
index 4deb086..1fb6d91 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
@@ -118,8 +118,8 @@
and sup_dep_id = #{request.supDepId}
-
- and is_non_conformance = #{request.isNonConformance}
+
+ and exists(select 1 from biz_quality_rep_rel c INNER JOIN biz_quality_supervision_record d on c.sup_record_id = d.id where c.rep_id = a.id)
and sub_time >= #{request.subTimeStart}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java
index c4caebc..d4df377 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java
@@ -47,7 +47,7 @@
//历史转数组
List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList());
List userDtos = dto.getUserIds().stream().map(QualityUserInfoDTO::getUserId).collect(Collectors.toList());
- Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(QualityUserInfoDTO::getId, (userDTO -> userDTO)));
+ Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(QualityUserInfoDTO::getUserId, (userDTO -> userDTO)));
//过滤移除名单
List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList());
//过滤新增名单
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
index 8377cdb..4c6d76d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
@@ -8,8 +8,8 @@
public enum QualityTableEnum {
//质量监督
SUPERVISION_RECORD("biz_quality_supervision_record", "监督记录", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_01, 15),
- SUPERVISION_RECORD_REP("biz_quality_supervision_record", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
- NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 15),
+ SUPERVISION_RECORD_REP("biz_quality_supervision_rep", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
+ NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 13),
//纠正 预防
CORRECTIVE_RECORD("biz_quality_corrective_record", "纠正措施处理单", "file_code", QualityFileNoEnum.TYPE_207, QualityFileTypeEnum.TYPE_01, 13),
PREVENT_RECORD("biz_quality_prevent_record", "预防措施表", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 13),
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java
index d6eb69b..10b478e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/IBaseSelectMaxMapper.java
@@ -6,6 +6,6 @@
import java.util.function.BiFunction;
public interface IBaseSelectMaxMapper {
- @Select("SELECT IFNULL(max(RIGHT(${likeId}, 3)), 0) from ${tableName} where ${likeId} like #{idVal}")
+ @Select("SELECT IFNULL(max(RIGHT(${likeId}, 3)), 0) from ${tableName} where ${likeId} like CONCAT(#{idVal},'%')")
Long selectMaxNo(@Param("tableName") String tableName, @Param("likeId") String likeId, @Param("idVal") String idVal);
}
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
index 4deb086..1fb6d91 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
@@ -118,8 +118,8 @@
and sup_dep_id = #{request.supDepId}
-
- and is_non_conformance = #{request.isNonConformance}
+
+ and exists(select 1 from biz_quality_rep_rel c INNER JOIN biz_quality_supervision_record d on c.sup_record_id = d.id where c.rep_id = a.id)
and sub_time >= #{request.subTimeStart}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java
index c4caebc..d4df377 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java
@@ -47,7 +47,7 @@
//历史转数组
List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList());
List userDtos = dto.getUserIds().stream().map(QualityUserInfoDTO::getUserId).collect(Collectors.toList());
- Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(QualityUserInfoDTO::getId, (userDTO -> userDTO)));
+ Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(QualityUserInfoDTO::getUserId, (userDTO -> userDTO)));
//过滤移除名单
List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList());
//过滤新增名单
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java
index 03671ce..070b161 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java
@@ -15,6 +15,7 @@
import com.casic.missiles.enums.quality.QualityTableEnum;
import com.casic.missiles.enums.system.ApprovalStatusEnum;
import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper;
+import com.casic.missiles.model.exception.ServiceException;
import com.casic.missiles.model.quality.BizQualityReviewForm;
import com.casic.missiles.model.quality.BizQualityWorkRegistration;
import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule;
@@ -89,12 +90,18 @@
entity.setCreator(user.getId());
entity.setLogTime(new Date());
entity.setCreatorName(user.getName());
+ //文件名称校验
+ if(count(new LambdaQueryWrapper().eq(BizQualityWorkRegistration::getFileName,entity.getFileName()))>0){
+ throw new ServiceException(500,"该工作审核登记表已存在");
+ }
- //生成文件编码
- String labCode = entity.getBizLabCode();
- String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode));
- entity.setFileCode(newCode);
- entity.setSysCode(newCode);
+ saveEntity(entity,QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode));
+ checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId());
+// //生成文件编码
+// String labCode = entity.getBizLabCode();
+// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION,);
+// entity.setFileCode(newCode);
+// entity.setSysCode(newCode);
entity.setApprovalStatus(ApprovalStatusEnum.DRAFT);
//生成年度编码
@@ -109,12 +116,14 @@
public boolean updateById(BizQualityWorkRegistration entity) {
BizQualityWorkRegistration oldPlan = getById(entity.getId());
- if (!oldPlan.getBizLabCode().equals(entity.getBizLabCode())) {
- String labCode = entity.getBizLabCode();
- String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode));
- entity.setFileCode(newCode);
- entity.setSysCode(newCode);
- }
+ updateEntity(entity,oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode));
+// if (!oldPlan.getBizLabCode().equals(entity.getBizLabCode())) {
+// String labCode = entity.getBizLabCode();
+// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode));
+// entity.setFileCode(newCode);
+// entity.setSysCode(newCode);
+// }
+ checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId());
entity.setUpdateTime(new Date());
super.updateById(entity);
internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity);