diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index 2678726..c14c3be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -79,7 +79,7 @@ @ApiOperation("任务分发-获取初始化检定流程") @PostMapping("/handOut/initList") @ResponseBody - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -165,12 +165,29 @@ /** * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） - * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1，） * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 */ + + + /** * 分发员编辑实验室检测列表 */ + @ApiOperation("分发员编辑实验室检测列表") + @PostMapping("/handOut/updateExecutiveList") + @ResponseBody + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.updateExecutiveList(request); + } + + + /** + * 各列表导出 + */ } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index 2678726..c14c3be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -79,7 +79,7 @@ @ApiOperation("任务分发-获取初始化检定流程") @PostMapping("/handOut/initList") @ResponseBody - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -165,12 +165,29 @@ /** * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） - * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1，） * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 */ + + + /** * 分发员编辑实验室检测列表 */ + @ApiOperation("分发员编辑实验室检测列表") + @PostMapping("/handOut/updateExecutiveList") + @ResponseBody + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.updateExecutiveList(request); + } + + + /** + * 各列表导出 + */ } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 385406c..9b49201 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -21,6 +21,12 @@ String SCRAP = "4"; // 处置 String MANAGEMENT = "5"; + // 标准装置-在用 + String STANDARD_USE = "1"; + // 处置 + String STOP = "2"; + // 处置 + String REVOKE = "3"; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index 2678726..c14c3be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -79,7 +79,7 @@ @ApiOperation("任务分发-获取初始化检定流程") @PostMapping("/handOut/initList") @ResponseBody - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -165,12 +165,29 @@ /** * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） - * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1，） * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 */ + + + /** * 分发员编辑实验室检测列表 */ + @ApiOperation("分发员编辑实验室检测列表") + @PostMapping("/handOut/updateExecutiveList") + @ResponseBody + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.updateExecutiveList(request); + } + + + /** + * 各列表导出 + */ } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 385406c..9b49201 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -21,6 +21,12 @@ String SCRAP = "4"; // 处置 String MANAGEMENT = "5"; + // 标准装置-在用 + String STANDARD_USE = "1"; + // 处置 + String STOP = "2"; + // 处置 + String REVOKE = "3"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index 9d2e1c7..e7c492b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -41,11 +41,9 @@ String id = execution.getProcessInstanceBusinessKey(); switch (systemFlowForm.getFormId()){ // 标准装置申请 - /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL:updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.STOP);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE);break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; @@ -82,6 +80,12 @@ } } - private void updateStandardState(String businessKey,String state) { + private void updateStandardState(String id,String state) { + MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",id).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index 2678726..c14c3be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -79,7 +79,7 @@ @ApiOperation("任务分发-获取初始化检定流程") @PostMapping("/handOut/initList") @ResponseBody - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -165,12 +165,29 @@ /** * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） - * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1，） * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 */ + + + /** * 分发员编辑实验室检测列表 */ + @ApiOperation("分发员编辑实验室检测列表") + @PostMapping("/handOut/updateExecutiveList") + @ResponseBody + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.updateExecutiveList(request); + } + + + /** + * 各列表导出 + */ } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 385406c..9b49201 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -21,6 +21,12 @@ String SCRAP = "4"; // 处置 String MANAGEMENT = "5"; + // 标准装置-在用 + String STANDARD_USE = "1"; + // 处置 + String STOP = "2"; + // 处置 + String REVOKE = "3"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index 9d2e1c7..e7c492b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -41,11 +41,9 @@ String id = execution.getProcessInstanceBusinessKey(); switch (systemFlowForm.getFormId()){ // 标准装置申请 - /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL:updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.STOP);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE);break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; @@ -82,6 +80,12 @@ } } - private void updateStandardState(String businessKey,String state) { + private void updateStandardState(String id,String state) { + MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",id).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java index 63c2005..36b5d5e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -20,4 +20,5 @@ List selectExecutiveList(@Param("request") SampleHandOutInitListRequest request); + Long selectMaxTemplateNo(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index 2678726..c14c3be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -79,7 +79,7 @@ @ApiOperation("任务分发-获取初始化检定流程") @PostMapping("/handOut/initList") @ResponseBody - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -165,12 +165,29 @@ /** * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） - * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1，） * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 */ + + + /** * 分发员编辑实验室检测列表 */ + @ApiOperation("分发员编辑实验室检测列表") + @PostMapping("/handOut/updateExecutiveList") + @ResponseBody + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.updateExecutiveList(request); + } + + + /** + * 各列表导出 + */ } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 385406c..9b49201 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -21,6 +21,12 @@ String SCRAP = "4"; // 处置 String MANAGEMENT = "5"; + // 标准装置-在用 + String STANDARD_USE = "1"; + // 处置 + String STOP = "2"; + // 处置 + String REVOKE = "3"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index 9d2e1c7..e7c492b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -41,11 +41,9 @@ String id = execution.getProcessInstanceBusinessKey(); switch (systemFlowForm.getFormId()){ // 标准装置申请 - /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL:updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.STOP);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE);break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; @@ -82,6 +80,12 @@ } } - private void updateStandardState(String businessKey,String state) { + private void updateStandardState(String id,String state) { + MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",id).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java index 63c2005..36b5d5e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -20,4 +20,5 @@ List selectExecutiveList(@Param("request") SampleHandOutInitListRequest request); + Long selectMaxTemplateNo(); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 010260c..c313a73 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -19,7 +19,6 @@ - @@ -41,8 +40,7 @@ blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) @@ -51,8 +49,7 @@ SELECT require_certifications FROM (SELECT * FROM business_lab_executive_info blei - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3) ) blei @@ -60,13 +57,12 @@ @@ -76,8 +72,7 @@ FROM business_lab_executive_info blei JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id - WHERE blei.is_del = 0 - AND blei.measure_dept_id = #{deptId} + WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status = #{status} @@ -123,8 +118,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.measure_person_id = #{userId} + WHERE blei.measure_person_id = #{userId} AND blei.measure_status = #{status} AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index 2678726..c14c3be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -79,7 +79,7 @@ @ApiOperation("任务分发-获取初始化检定流程") @PostMapping("/handOut/initList") @ResponseBody - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -165,12 +165,29 @@ /** * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） - * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1，） * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 */ + + + /** * 分发员编辑实验室检测列表 */ + @ApiOperation("分发员编辑实验室检测列表") + @PostMapping("/handOut/updateExecutiveList") + @ResponseBody + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.updateExecutiveList(request); + } + + + /** + * 各列表导出 + */ } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 385406c..9b49201 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -21,6 +21,12 @@ String SCRAP = "4"; // 处置 String MANAGEMENT = "5"; + // 标准装置-在用 + String STANDARD_USE = "1"; + // 处置 + String STOP = "2"; + // 处置 + String REVOKE = "3"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index 9d2e1c7..e7c492b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -41,11 +41,9 @@ String id = execution.getProcessInstanceBusinessKey(); switch (systemFlowForm.getFormId()){ // 标准装置申请 - /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL:updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.STOP);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE);break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; @@ -82,6 +80,12 @@ } } - private void updateStandardState(String businessKey,String state) { + private void updateStandardState(String id,String state) { + MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",id).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java index 63c2005..36b5d5e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -20,4 +20,5 @@ List selectExecutiveList(@Param("request") SampleHandOutInitListRequest request); + Long selectMaxTemplateNo(); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 010260c..c313a73 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -19,7 +19,6 @@ - @@ -41,8 +40,7 @@ blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) @@ -51,8 +49,7 @@ SELECT require_certifications FROM (SELECT * FROM business_lab_executive_info blei - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3) ) blei @@ -60,13 +57,12 @@ @@ -76,8 +72,7 @@ FROM business_lab_executive_info blei JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id - WHERE blei.is_del = 0 - AND blei.measure_dept_id = #{deptId} + WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status = #{status} @@ -123,8 +118,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.measure_person_id = #{userId} + WHERE blei.measure_person_id = #{userId} AND blei.measure_status = #{status} AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 654889d..98e4e5e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -13,7 +13,6 @@ - @@ -34,4 +33,8 @@ AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index 2678726..c14c3be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -79,7 +79,7 @@ @ApiOperation("任务分发-获取初始化检定流程") @PostMapping("/handOut/initList") @ResponseBody - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -165,12 +165,29 @@ /** * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） - * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1，） * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 */ + + + /** * 分发员编辑实验室检测列表 */ + @ApiOperation("分发员编辑实验室检测列表") + @PostMapping("/handOut/updateExecutiveList") + @ResponseBody + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.updateExecutiveList(request); + } + + + /** + * 各列表导出 + */ } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 385406c..9b49201 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -21,6 +21,12 @@ String SCRAP = "4"; // 处置 String MANAGEMENT = "5"; + // 标准装置-在用 + String STANDARD_USE = "1"; + // 处置 + String STOP = "2"; + // 处置 + String REVOKE = "3"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index 9d2e1c7..e7c492b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -41,11 +41,9 @@ String id = execution.getProcessInstanceBusinessKey(); switch (systemFlowForm.getFormId()){ // 标准装置申请 - /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL:updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.STOP);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE);break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; @@ -82,6 +80,12 @@ } } - private void updateStandardState(String businessKey,String state) { + private void updateStandardState(String id,String state) { + MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",id).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } } } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java index 63c2005..36b5d5e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveTemplateInfoMapper.java @@ -20,4 +20,5 @@ List selectExecutiveList(@Param("request") SampleHandOutInitListRequest request); + Long selectMaxTemplateNo(); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 010260c..c313a73 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -19,7 +19,6 @@ - @@ -41,8 +40,7 @@ blei.require_certifications FROM business_lab_executive_info blei JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status = 3) @@ -51,8 +49,7 @@ SELECT require_certifications FROM (SELECT * FROM business_lab_executive_info blei - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3) ) blei @@ -60,13 +57,12 @@ @@ -76,8 +72,7 @@ FROM business_lab_executive_info blei JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id - WHERE blei.is_del = 0 - AND blei.measure_dept_id = #{deptId} + WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status = #{status} @@ -123,8 +118,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.measure_person_id = #{userId} + WHERE blei.measure_person_id = #{userId} AND blei.measure_status = #{status} AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 654889d..98e4e5e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -13,7 +13,6 @@ - @@ -34,4 +33,8 @@ AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8cd70b9..4e6bf53 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -18,8 +18,10 @@ mfa.model_no, mfa.manager_state, msa.approval_status, - sd.SIMPLE_NAME as apply_unit, - su.`NAME` as apply_person, + msa.apply_unit, + sd.SIMPLE_NAME as apply_unit_name, + su.`NAME` as apply_person_name, + msa.apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, mfa.equipment_specifications, mfa.manufacturing_no, @@ -70,6 +72,12 @@ #{id} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC @@ -51,8 +49,7 @@ SELECT require_certifications FROM (SELECT * FROM business_lab_executive_info blei - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3) ) blei @@ -60,13 +57,12 @@ @@ -76,8 +72,7 @@ FROM business_lab_executive_info blei JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id - WHERE blei.is_del = 0 - AND blei.measure_dept_id = #{deptId} + WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status = #{status} @@ -123,8 +118,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.measure_person_id = #{userId} + WHERE blei.measure_person_id = #{userId} AND blei.measure_status = #{status} AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 654889d..98e4e5e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -13,7 +13,6 @@ - @@ -34,4 +33,8 @@ AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8cd70b9..4e6bf53 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -18,8 +18,10 @@ mfa.model_no, mfa.manager_state, msa.approval_status, - sd.SIMPLE_NAME as apply_unit, - su.`NAME` as apply_person, + msa.apply_unit, + sd.SIMPLE_NAME as apply_unit_name, + su.`NAME` as apply_person_name, + msa.apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, mfa.equipment_specifications, mfa.manufacturing_no, @@ -70,6 +72,12 @@ #{id} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC @@ -51,8 +49,7 @@ SELECT require_certifications FROM (SELECT * FROM business_lab_executive_info blei - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3) ) blei @@ -60,13 +57,12 @@ @@ -76,8 +72,7 @@ FROM business_lab_executive_info blei JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id - WHERE blei.is_del = 0 - AND blei.measure_dept_id = #{deptId} + WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status = #{status} @@ -123,8 +118,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.measure_person_id = #{userId} + WHERE blei.measure_person_id = #{userId} AND blei.measure_status = #{status} AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 654889d..98e4e5e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -13,7 +13,6 @@ - @@ -34,4 +33,8 @@ AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8cd70b9..4e6bf53 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -18,8 +18,10 @@ mfa.model_no, mfa.manager_state, msa.approval_status, - sd.SIMPLE_NAME as apply_unit, - su.`NAME` as apply_person, + msa.apply_unit, + sd.SIMPLE_NAME as apply_unit_name, + su.`NAME` as apply_person_name, + msa.apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, mfa.equipment_specifications, mfa.manufacturing_no, @@ -70,6 +72,12 @@ #{id} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC @@ -51,8 +49,7 @@ SELECT require_certifications FROM (SELECT * FROM business_lab_executive_info blei - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3) ) blei @@ -60,13 +57,12 @@ @@ -76,8 +72,7 @@ FROM business_lab_executive_info blei JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id - WHERE blei.is_del = 0 - AND blei.measure_dept_id = #{deptId} + WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status = #{status} @@ -123,8 +118,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.measure_person_id = #{userId} + WHERE blei.measure_person_id = #{userId} AND blei.measure_status = #{status} AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 654889d..98e4e5e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -13,7 +13,6 @@ - @@ -34,4 +33,8 @@ AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8cd70b9..4e6bf53 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -18,8 +18,10 @@ mfa.model_no, mfa.manager_state, msa.approval_status, - sd.SIMPLE_NAME as apply_unit, - su.`NAME` as apply_person, + msa.apply_unit, + sd.SIMPLE_NAME as apply_unit_name, + su.`NAME` as apply_person_name, + msa.apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, mfa.equipment_specifications, mfa.manufacturing_no, @@ -70,6 +72,12 @@ #{id} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC @@ -51,8 +49,7 @@ SELECT require_certifications FROM (SELECT * FROM business_lab_executive_info blei - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3) ) blei @@ -60,13 +57,12 @@ @@ -76,8 +72,7 @@ FROM business_lab_executive_info blei JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id - WHERE blei.is_del = 0 - AND blei.measure_dept_id = #{deptId} + WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status = #{status} @@ -123,8 +118,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.measure_person_id = #{userId} + WHERE blei.measure_person_id = #{userId} AND blei.measure_status = #{status} AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 654889d..98e4e5e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -13,7 +13,6 @@ - @@ -34,4 +33,8 @@ AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8cd70b9..4e6bf53 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -18,8 +18,10 @@ mfa.model_no, mfa.manager_state, msa.approval_status, - sd.SIMPLE_NAME as apply_unit, - su.`NAME` as apply_person, + msa.apply_unit, + sd.SIMPLE_NAME as apply_unit_name, + su.`NAME` as apply_person_name, + msa.apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, mfa.equipment_specifications, mfa.manufacturing_no, @@ -70,6 +72,12 @@ #{id} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC @@ -51,8 +49,7 @@ SELECT require_certifications FROM (SELECT * FROM business_lab_executive_info blei - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3) ) blei @@ -60,13 +57,12 @@ @@ -76,8 +72,7 @@ FROM business_lab_executive_info blei JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id - WHERE blei.is_del = 0 - AND blei.measure_dept_id = #{deptId} + WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status = #{status} @@ -123,8 +118,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.measure_person_id = #{userId} + WHERE blei.measure_person_id = #{userId} AND blei.measure_status = #{status} AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 654889d..98e4e5e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -13,7 +13,6 @@ - @@ -34,4 +33,8 @@ AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8cd70b9..4e6bf53 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -18,8 +18,10 @@ mfa.model_no, mfa.manager_state, msa.approval_status, - sd.SIMPLE_NAME as apply_unit, - su.`NAME` as apply_person, + msa.apply_unit, + sd.SIMPLE_NAME as apply_unit_name, + su.`NAME` as apply_person_name, + msa.apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, mfa.equipment_specifications, mfa.manufacturing_no, @@ -70,6 +72,12 @@ #{id} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC @@ -51,8 +49,7 @@ SELECT require_certifications FROM (SELECT * FROM business_lab_executive_info blei - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3) ) blei @@ -60,13 +57,12 @@ @@ -76,8 +72,7 @@ FROM business_lab_executive_info blei JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id - WHERE blei.is_del = 0 - AND blei.measure_dept_id = #{deptId} + WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status = #{status} @@ -123,8 +118,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.measure_person_id = #{userId} + WHERE blei.measure_person_id = #{userId} AND blei.measure_status = #{status} AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 654889d..98e4e5e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -13,7 +13,6 @@ - @@ -34,4 +33,8 @@ AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8cd70b9..4e6bf53 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -18,8 +18,10 @@ mfa.model_no, mfa.manager_state, msa.approval_status, - sd.SIMPLE_NAME as apply_unit, - su.`NAME` as apply_person, + msa.apply_unit, + sd.SIMPLE_NAME as apply_unit_name, + su.`NAME` as apply_person_name, + msa.apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, mfa.equipment_specifications, mfa.manufacturing_no, @@ -70,6 +72,12 @@ #{id} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC @@ -51,8 +49,7 @@ SELECT require_certifications FROM (SELECT * FROM business_lab_executive_info blei - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3) ) blei @@ -60,13 +57,12 @@ @@ -76,8 +72,7 @@ FROM business_lab_executive_info blei JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id - WHERE blei.is_del = 0 - AND blei.measure_dept_id = #{deptId} + WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status = #{status} @@ -123,8 +118,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.measure_person_id = #{userId} + WHERE blei.measure_person_id = #{userId} AND blei.measure_status = #{status} AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 654889d..98e4e5e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -13,7 +13,6 @@ - @@ -34,4 +33,8 @@ AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8cd70b9..4e6bf53 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -18,8 +18,10 @@ mfa.model_no, mfa.manager_state, msa.approval_status, - sd.SIMPLE_NAME as apply_unit, - su.`NAME` as apply_person, + msa.apply_unit, + sd.SIMPLE_NAME as apply_unit_name, + su.`NAME` as apply_person_name, + msa.apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, mfa.equipment_specifications, mfa.manufacturing_no, @@ -70,6 +72,12 @@ #{id} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC @@ -51,8 +49,7 @@ SELECT require_certifications FROM (SELECT * FROM business_lab_executive_info blei - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3) ) blei @@ -60,13 +57,12 @@ @@ -76,8 +72,7 @@ FROM business_lab_executive_info blei JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id - WHERE blei.is_del = 0 - AND blei.measure_dept_id = #{deptId} + WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status = #{status} @@ -123,8 +118,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.measure_person_id = #{userId} + WHERE blei.measure_person_id = #{userId} AND blei.measure_status = #{status} AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 654889d..98e4e5e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -13,7 +13,6 @@ - @@ -34,4 +33,8 @@ AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8cd70b9..4e6bf53 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -18,8 +18,10 @@ mfa.model_no, mfa.manager_state, msa.approval_status, - sd.SIMPLE_NAME as apply_unit, - su.`NAME` as apply_person, + msa.apply_unit, + sd.SIMPLE_NAME as apply_unit_name, + su.`NAME` as apply_person_name, + msa.apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, mfa.equipment_specifications, mfa.manufacturing_no, @@ -70,6 +72,12 @@ #{id} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC @@ -51,8 +49,7 @@ SELECT require_certifications FROM (SELECT * FROM business_lab_executive_info blei - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3) ) blei @@ -60,13 +57,12 @@ @@ -76,8 +72,7 @@ FROM business_lab_executive_info blei JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id - WHERE blei.is_del = 0 - AND blei.measure_dept_id = #{deptId} + WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status = #{status} @@ -123,8 +118,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.measure_person_id = #{userId} + WHERE blei.measure_person_id = #{userId} AND blei.measure_status = #{status} AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 654889d..98e4e5e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -13,7 +13,6 @@ - @@ -34,4 +33,8 @@ AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8cd70b9..4e6bf53 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -18,8 +18,10 @@ mfa.model_no, mfa.manager_state, msa.approval_status, - sd.SIMPLE_NAME as apply_unit, - su.`NAME` as apply_person, + msa.apply_unit, + sd.SIMPLE_NAME as apply_unit_name, + su.`NAME` as apply_person_name, + msa.apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, mfa.equipment_specifications, mfa.manufacturing_no, @@ -70,6 +72,12 @@ #{id} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC @@ -51,8 +49,7 @@ SELECT require_certifications FROM (SELECT * FROM business_lab_executive_info blei - WHERE blei.is_del = 0 - AND blei.order_id = #{orderId} + WHERE blei.order_id = #{orderId} AND blei.sample_id = #{sampleId} AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3) ) blei @@ -60,13 +57,12 @@ @@ -76,8 +72,7 @@ FROM business_lab_executive_info blei JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id - WHERE blei.is_del = 0 - AND blei.measure_dept_id = #{deptId} + WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status = #{status} @@ -123,8 +118,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID - WHERE blei.is_del = 0 - AND blei.measure_person_id = #{userId} + WHERE blei.measure_person_id = #{userId} AND blei.measure_status = #{status} AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml index 654889d..98e4e5e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml @@ -13,7 +13,6 @@ - @@ -34,4 +33,8 @@ AND bleti.sample_id = #{request.sampleId} ORDER BY bleti.execute_sequence ASC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8cd70b9..4e6bf53 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -18,8 +18,10 @@ mfa.model_no, mfa.manager_state, msa.approval_status, - sd.SIMPLE_NAME as apply_unit, - su.`NAME` as apply_person, + msa.apply_unit, + sd.SIMPLE_NAME as apply_unit_name, + su.`NAME` as apply_person_name, + msa.apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, mfa.equipment_specifications, mfa.manufacturing_no, @@ -70,6 +72,12 @@ #{id} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC