diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java new file mode 100644 index 0000000..2a000c7 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java @@ -0,0 +1,55 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 内审管理工作快捷操作 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityAuditManagementStageOptTypeEnum { + INTERNAL_AUDIT_TEAM(1, "内审组建立", "内审组建立"), + AUDIT_PLAN_PUBLICITY(2, "内审组计划公示", "内审组计划公示"), + INTERNAL_AUDIT_REVIEW(3, "《内部审核检查表》编制", "《内部审核检查表》编制"), + FIRST_MEETING(4, "首次会议", "首次会议"), + SITE_AUDIT(5, "现场审核", "现场审核"), + AUDIT_TEAM_INTERNAL_MEETING(6, "内审组内部会议", "内审组内部会议"), + EXCHANGE_OF_VIEWS(7, "交换意见", "交换意见"), + CLOSING_MEETING(8, "末次会议", "末次会议"), + MEASURE_DEVELOPMENT(9, "措施制定", "措施制定"), + IMPLEMENTATION_MEASURES(10, "措施实施", "措施制定"), + EFFECT_VERIFICATION(11, "效果验证", "效果验证"), + RECORD_ARCHIVING(12, "记录存档", "记录存档"); + + private Integer code; + private String remarks; + private String typeName; + + QualityAuditManagementStageOptTypeEnum(Integer code, String remarks, String typeName) { + this.code = code; + this.remarks = remarks; + this.typeName = typeName; + } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java new file mode 100644 index 0000000..2a000c7 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java @@ -0,0 +1,55 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 内审管理工作快捷操作 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityAuditManagementStageOptTypeEnum { + INTERNAL_AUDIT_TEAM(1, "内审组建立", "内审组建立"), + AUDIT_PLAN_PUBLICITY(2, "内审组计划公示", "内审组计划公示"), + INTERNAL_AUDIT_REVIEW(3, "《内部审核检查表》编制", "《内部审核检查表》编制"), + FIRST_MEETING(4, "首次会议", "首次会议"), + SITE_AUDIT(5, "现场审核", "现场审核"), + AUDIT_TEAM_INTERNAL_MEETING(6, "内审组内部会议", "内审组内部会议"), + EXCHANGE_OF_VIEWS(7, "交换意见", "交换意见"), + CLOSING_MEETING(8, "末次会议", "末次会议"), + MEASURE_DEVELOPMENT(9, "措施制定", "措施制定"), + IMPLEMENTATION_MEASURES(10, "措施实施", "措施制定"), + EFFECT_VERIFICATION(11, "效果验证", "效果验证"), + RECORD_ARCHIVING(12, "记录存档", "记录存档"); + + private Integer code; + private String remarks; + private String typeName; + + QualityAuditManagementStageOptTypeEnum(Integer code, String remarks, String typeName) { + this.code = code; + this.remarks = remarks; + this.typeName = typeName; + } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } +} diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml index ea89d52..147fd84 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -147,6 +147,15 @@ and creator_name like concat('%',#{request.creatorName},'%') + + and approval_status = #{request.approvalStatus} + + + and id in + + #{id} + + diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java new file mode 100644 index 0000000..2a000c7 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java @@ -0,0 +1,55 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 内审管理工作快捷操作 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityAuditManagementStageOptTypeEnum { + INTERNAL_AUDIT_TEAM(1, "内审组建立", "内审组建立"), + AUDIT_PLAN_PUBLICITY(2, "内审组计划公示", "内审组计划公示"), + INTERNAL_AUDIT_REVIEW(3, "《内部审核检查表》编制", "《内部审核检查表》编制"), + FIRST_MEETING(4, "首次会议", "首次会议"), + SITE_AUDIT(5, "现场审核", "现场审核"), + AUDIT_TEAM_INTERNAL_MEETING(6, "内审组内部会议", "内审组内部会议"), + EXCHANGE_OF_VIEWS(7, "交换意见", "交换意见"), + CLOSING_MEETING(8, "末次会议", "末次会议"), + MEASURE_DEVELOPMENT(9, "措施制定", "措施制定"), + IMPLEMENTATION_MEASURES(10, "措施实施", "措施制定"), + EFFECT_VERIFICATION(11, "效果验证", "效果验证"), + RECORD_ARCHIVING(12, "记录存档", "记录存档"); + + private Integer code; + private String remarks; + private String typeName; + + QualityAuditManagementStageOptTypeEnum(Integer code, String remarks, String typeName) { + this.code = code; + this.remarks = remarks; + this.typeName = typeName; + } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } +} diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml index ea89d52..147fd84 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -147,6 +147,15 @@ and creator_name like concat('%',#{request.creatorName},'%') + + and approval_status = #{request.approvalStatus} + + + and id in + + #{id} + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml index 30b2611..67a6585 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -139,6 +139,15 @@ and creator_name like concat('%',#{request.creatorName},'%') + + and approval_status = #{request.approvalStatus} + + + and id in + + #{id} + + diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java new file mode 100644 index 0000000..2a000c7 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java @@ -0,0 +1,55 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 内审管理工作快捷操作 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityAuditManagementStageOptTypeEnum { + INTERNAL_AUDIT_TEAM(1, "内审组建立", "内审组建立"), + AUDIT_PLAN_PUBLICITY(2, "内审组计划公示", "内审组计划公示"), + INTERNAL_AUDIT_REVIEW(3, "《内部审核检查表》编制", "《内部审核检查表》编制"), + FIRST_MEETING(4, "首次会议", "首次会议"), + SITE_AUDIT(5, "现场审核", "现场审核"), + AUDIT_TEAM_INTERNAL_MEETING(6, "内审组内部会议", "内审组内部会议"), + EXCHANGE_OF_VIEWS(7, "交换意见", "交换意见"), + CLOSING_MEETING(8, "末次会议", "末次会议"), + MEASURE_DEVELOPMENT(9, "措施制定", "措施制定"), + IMPLEMENTATION_MEASURES(10, "措施实施", "措施制定"), + EFFECT_VERIFICATION(11, "效果验证", "效果验证"), + RECORD_ARCHIVING(12, "记录存档", "记录存档"); + + private Integer code; + private String remarks; + private String typeName; + + QualityAuditManagementStageOptTypeEnum(Integer code, String remarks, String typeName) { + this.code = code; + this.remarks = remarks; + this.typeName = typeName; + } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } +} diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml index ea89d52..147fd84 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -147,6 +147,15 @@ and creator_name like concat('%',#{request.creatorName},'%') + + and approval_status = #{request.approvalStatus} + + + and id in + + #{id} + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml index 30b2611..67a6585 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -139,6 +139,15 @@ and creator_name like concat('%',#{request.creatorName},'%') + + and approval_status = #{request.approvalStatus} + + + and id in + + #{id} + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationMapper.xml index 510cbd7..3e1e27e 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationMapper.xml @@ -38,7 +38,7 @@ year_no as yearNo , log_time as logTime , approval_status as approvalStatus , - process_id as processId + process_id as processId,is_show as isShow a @@ -58,7 +58,7 @@ a.year_no as yearNo , a.log_time as logTime , a.approval_status as approvalStatus , - a.process_id as processId + a.process_id as processId,a.is_show as isShow @@ -91,9 +91,15 @@ and creator_name like concat('%',#{request.creatorName},'%') - + and approval_status = #{request.approvalStatus} + + and id in + + #{id} + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityWorkRegistrationVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityWorkRegistrationVO.java index 24aa96b..f1993ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityWorkRegistrationVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityWorkRegistrationVO.java @@ -44,11 +44,7 @@ */ @ApiModelProperty(value = "创建者名称", dataType = "String") private String creatorName; - /** - * 审批状态 - */ - @ApiModelProperty(value = "审批状态", dataType = "String") - private String approvalStatus; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); @@ -70,8 +66,8 @@ if (StrUtil.isNotEmpty(creatorName)) { query.like("creator_name", creatorName); } - if (StrUtil.isNotEmpty(approvalStatus)) { - query.eq("approval_status", approvalStatus); + if (StrUtil.isNotEmpty(getApprovalStatus())) { + query.eq("approval_status", getApprovalStatus()); } return query; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java new file mode 100644 index 0000000..2a000c7 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java @@ -0,0 +1,55 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 内审管理工作快捷操作 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityAuditManagementStageOptTypeEnum { + INTERNAL_AUDIT_TEAM(1, "内审组建立", "内审组建立"), + AUDIT_PLAN_PUBLICITY(2, "内审组计划公示", "内审组计划公示"), + INTERNAL_AUDIT_REVIEW(3, "《内部审核检查表》编制", "《内部审核检查表》编制"), + FIRST_MEETING(4, "首次会议", "首次会议"), + SITE_AUDIT(5, "现场审核", "现场审核"), + AUDIT_TEAM_INTERNAL_MEETING(6, "内审组内部会议", "内审组内部会议"), + EXCHANGE_OF_VIEWS(7, "交换意见", "交换意见"), + CLOSING_MEETING(8, "末次会议", "末次会议"), + MEASURE_DEVELOPMENT(9, "措施制定", "措施制定"), + IMPLEMENTATION_MEASURES(10, "措施实施", "措施制定"), + EFFECT_VERIFICATION(11, "效果验证", "效果验证"), + RECORD_ARCHIVING(12, "记录存档", "记录存档"); + + private Integer code; + private String remarks; + private String typeName; + + QualityAuditManagementStageOptTypeEnum(Integer code, String remarks, String typeName) { + this.code = code; + this.remarks = remarks; + this.typeName = typeName; + } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } +} diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml index ea89d52..147fd84 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -147,6 +147,15 @@ and creator_name like concat('%',#{request.creatorName},'%') + + and approval_status = #{request.approvalStatus} + + + and id in + + #{id} + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml index 30b2611..67a6585 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -139,6 +139,15 @@ and creator_name like concat('%',#{request.creatorName},'%') + + and approval_status = #{request.approvalStatus} + + + and id in + + #{id} + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationMapper.xml index 510cbd7..3e1e27e 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationMapper.xml @@ -38,7 +38,7 @@ year_no as yearNo , log_time as logTime , approval_status as approvalStatus , - process_id as processId + process_id as processId,is_show as isShow a @@ -58,7 +58,7 @@ a.year_no as yearNo , a.log_time as logTime , a.approval_status as approvalStatus , - a.process_id as processId + a.process_id as processId,a.is_show as isShow @@ -91,9 +91,15 @@ and creator_name like concat('%',#{request.creatorName},'%') - + and approval_status = #{request.approvalStatus} + + and id in + + #{id} + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityWorkRegistrationVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityWorkRegistrationVO.java index 24aa96b..f1993ea 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityWorkRegistrationVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityWorkRegistrationVO.java @@ -44,11 +44,7 @@ */ @ApiModelProperty(value = "创建者名称", dataType = "String") private String creatorName; - /** - * 审批状态 - */ - @ApiModelProperty(value = "审批状态", dataType = "String") - private String approvalStatus; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); @@ -70,8 +66,8 @@ if (StrUtil.isNotEmpty(creatorName)) { query.like("creator_name", creatorName); } - if (StrUtil.isNotEmpty(approvalStatus)) { - query.eq("approval_status", approvalStatus); + if (StrUtil.isNotEmpty(getApprovalStatus())) { + query.eq("approval_status", getApprovalStatus()); } return query; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 62c22cc..8431fb9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -1,7 +1,9 @@ package com.casic.missiles.model.quality; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.model.quality.base.BaseApprovalEntity; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; @@ -34,6 +36,7 @@ /** * 创建时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; @@ -41,6 +44,7 @@ /** * 修改时间 */ + @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") private Date updateTime; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 5929740..1419296 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -17,6 +17,7 @@ import com.casic.missiles.service.quality.IBizQualityRegistrationScheduleUserService; import com.casic.missiles.service.quality.IBizQualityWorkRegistrationScheduleService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; import java.util.Date; @@ -48,6 +49,7 @@ return this.baseMapper.selectBizQualityWorkRegistrationSchedulePage(page, query); } + @Transactional @Override public List saveBizQualityWorkRegistrationSchedules(BizQualityWorkRegistration entity) { if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { @@ -63,7 +65,6 @@ scheduleUserService.saveList(schedule.getScheduleUserList(), schedule.getId()); scheduleFileService.saveList(schedule.getScheduleFileList(), schedule.getId()); } - //更新内审进度关联附件 } return null; } @@ -87,5 +88,4 @@ query.eq(BizQualityWorkRegistrationSchedule::getWorkRegistrationId, id); remove(query); } - -} +} \ No newline at end of file diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java new file mode 100644 index 0000000..2a000c7 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageOptTypeEnum.java @@ -0,0 +1,55 @@ +package com.casic.missiles.enums.quality; + +/** + * @Description: 内审管理工作快捷操作 + * @Author: lwh + * @Date: 2023/8/10 19:40 + */ +public enum QualityAuditManagementStageOptTypeEnum { + INTERNAL_AUDIT_TEAM(1, "内审组建立", "内审组建立"), + AUDIT_PLAN_PUBLICITY(2, "内审组计划公示", "内审组计划公示"), + INTERNAL_AUDIT_REVIEW(3, "《内部审核检查表》编制", "《内部审核检查表》编制"), + FIRST_MEETING(4, "首次会议", "首次会议"), + SITE_AUDIT(5, "现场审核", "现场审核"), + AUDIT_TEAM_INTERNAL_MEETING(6, "内审组内部会议", "内审组内部会议"), + EXCHANGE_OF_VIEWS(7, "交换意见", "交换意见"), + CLOSING_MEETING(8, "末次会议", "末次会议"), + MEASURE_DEVELOPMENT(9, "措施制定", "措施制定"), + IMPLEMENTATION_MEASURES(10, "措施实施", "措施制定"), + EFFECT_VERIFICATION(11, "效果验证", "效果验证"), + RECORD_ARCHIVING(12, "记录存档", "记录存档"); + + private Integer code; + private String remarks; + private String typeName; + + QualityAuditManagementStageOptTypeEnum(Integer code, String remarks, String typeName) { + this.code = code; + this.remarks = remarks; + this.typeName = typeName; + } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } +} diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml index ea89d52..147fd84 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -147,6 +147,15 @@ and creator_name like concat('%',#{request.creatorName},'%') + + and approval_status = #{request.approvalStatus} + + + and id in + + #{id} + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml index 30b2611..67a6585 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityPreventRecordMapper.xml @@ -139,6 +139,15 @@ and creator_name like concat('%',#{request.creatorName},'%') + + and approval_status = #{request.approvalStatus} + + + and id in + + #{id} + + diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationMapper.xml index 510cbd7..3e1e27e 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationMapper.xml @@ -38,7 +38,7 @@ year_no as yearNo , log_time as logTime , approval_status as approvalStatus , - process_id as processId + process_id as processId,is_show as isShow a @@ -58,7 +58,7 @@ a.year_no as yearNo , a.log_time as logTime , a.approval_status as approvalStatus , - a.process_id as processId + a.process_id as processId,a.is_show as isShow