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 7259c17..0471153 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -146,6 +146,9 @@ and creator = #{request.createUserId} + + and approval_status = #{request.approvalStatus} + and creator_name like concat('%',#{request.creatorName},'%') 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 7259c17..0471153 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -146,6 +146,9 @@ and creator = #{request.createUserId} + + and approval_status = #{request.approvalStatus} + and creator_name like concat('%',#{request.creatorName},'%') diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index f6c86d0..95b6b11 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -33,6 +33,7 @@ import com.casic.missiles.mapper.quality.BizQualityCorrectiveRectifFileMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.model.quality.base.DefaultManageReviewRelFile; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -211,7 +212,10 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - super.submit(request); + ReturnDTO returnDTO = super.submit(request); + if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { + return returnDTO; + } UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", request.getId()); updateWrapper.set("sub_time", new Date()); 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 7259c17..0471153 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityCorrectiveRecordMapper.xml @@ -146,6 +146,9 @@ and creator = #{request.createUserId} + + and approval_status = #{request.approvalStatus} + and creator_name like concat('%',#{request.creatorName},'%') diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index f6c86d0..95b6b11 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -33,6 +33,7 @@ import com.casic.missiles.mapper.quality.BizQualityCorrectiveRectifFileMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.model.quality.base.DefaultManageReviewRelFile; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -211,7 +212,10 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - super.submit(request); + ReturnDTO returnDTO = super.submit(request); + if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { + return returnDTO; + } UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", request.getId()); updateWrapper.set("sub_time", new Date()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 6391f0e..5efbfe2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -29,6 +29,7 @@ import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.model.quality.base.DefaultManageReviewRelFile; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -132,7 +133,10 @@ updateWrapper.set("sub_time", new Date()); this.update(updateWrapper); - super.submit(request); + ReturnDTO returnDTO = super.submit(request); + if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { + return returnDTO; + } BizQualityPreventRecord entity = getById(request.getId());