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 edc0169..2678726 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 @@ -62,7 +62,7 @@ @ApiOperation("任务分发-详情") @PostMapping("/handOut/detail") @ResponseBody - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) { + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -118,7 +118,7 @@ * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完） */ @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）") - @PostMapping("/myExecutive/List") + @PostMapping("/myExecutive/list") @ResponseBody public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -135,7 +135,7 @@ @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") @ResponseBody - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -143,15 +143,34 @@ } /** - * 实验室检测-负责人/检定人检测完按钮（检测中->检测完） + * 实验室检测-负责人/检定人扫描检完（检测中->检测完） */ + @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）") + @PostMapping("/myExecutive/complete") + @ResponseBody + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.sampleExecutiveComplete(requestList); + } /** - * 实验室检测-部门检测/我的检测 编辑 + * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书） */ /** * 实验室检测-部门检测/我的检测 详情 */ + /** + * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） + * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 + */ + + /** + * 分发员编辑实验室检测列表 + */ + } 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 edc0169..2678726 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 @@ -62,7 +62,7 @@ @ApiOperation("任务分发-详情") @PostMapping("/handOut/detail") @ResponseBody - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) { + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -118,7 +118,7 @@ * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完） */ @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）") - @PostMapping("/myExecutive/List") + @PostMapping("/myExecutive/list") @ResponseBody public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -135,7 +135,7 @@ @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") @ResponseBody - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -143,15 +143,34 @@ } /** - * 实验室检测-负责人/检定人检测完按钮（检测中->检测完） + * 实验室检测-负责人/检定人扫描检完（检测中->检测完） */ + @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）") + @PostMapping("/myExecutive/complete") + @ResponseBody + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.sampleExecutiveComplete(requestList); + } /** - * 实验室检测-部门检测/我的检测 编辑 + * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书） */ /** * 实验室检测-部门检测/我的检测 详情 */ + /** + * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） + * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 + */ + + /** + * 分发员编辑实验室检测列表 + */ + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** 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 edc0169..2678726 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 @@ -62,7 +62,7 @@ @ApiOperation("任务分发-详情") @PostMapping("/handOut/detail") @ResponseBody - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) { + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -118,7 +118,7 @@ * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完） */ @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）") - @PostMapping("/myExecutive/List") + @PostMapping("/myExecutive/list") @ResponseBody public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -135,7 +135,7 @@ @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") @ResponseBody - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -143,15 +143,34 @@ } /** - * 实验室检测-负责人/检定人检测完按钮（检测中->检测完） + * 实验室检测-负责人/检定人扫描检完（检测中->检测完） */ + @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）") + @PostMapping("/myExecutive/complete") + @ResponseBody + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.sampleExecutiveComplete(requestList); + } /** - * 实验室检测-部门检测/我的检测 编辑 + * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书） */ /** * 实验室检测-部门检测/我的检测 详情 */ + /** + * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） + * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 + */ + + /** + * 分发员编辑实验室检测列表 + */ + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index b1badb1..07ec083 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -18,7 +18,6 @@ import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * @Description: 审批操作按钮功能 @@ -46,7 +45,7 @@ Assert.isFalse(StringUtils.isEmpty(processId), () -> { throw new BusinessException(BusinessExceptionEnum.PROCESS_ID_NULL); }); - Map> resultList = approvalOperateService.approvalLog(processId); + List> resultList = approvalOperateService.approvalLog(processId); return ReturnUtil.success(resultList); } 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 edc0169..2678726 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 @@ -62,7 +62,7 @@ @ApiOperation("任务分发-详情") @PostMapping("/handOut/detail") @ResponseBody - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) { + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -118,7 +118,7 @@ * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完） */ @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）") - @PostMapping("/myExecutive/List") + @PostMapping("/myExecutive/list") @ResponseBody public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -135,7 +135,7 @@ @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") @ResponseBody - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -143,15 +143,34 @@ } /** - * 实验室检测-负责人/检定人检测完按钮（检测中->检测完） + * 实验室检测-负责人/检定人扫描检完（检测中->检测完） */ + @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）") + @PostMapping("/myExecutive/complete") + @ResponseBody + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.sampleExecutiveComplete(requestList); + } /** - * 实验室检测-部门检测/我的检测 编辑 + * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书） */ /** * 实验室检测-部门检测/我的检测 详情 */ + /** + * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） + * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 + */ + + /** + * 分发员编辑实验室检测列表 + */ + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index b1badb1..07ec083 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -18,7 +18,6 @@ import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * @Description: 审批操作按钮功能 @@ -46,7 +45,7 @@ Assert.isFalse(StringUtils.isEmpty(processId), () -> { throw new BusinessException(BusinessExceptionEnum.PROCESS_ID_NULL); }); - Map> resultList = approvalOperateService.approvalLog(processId); + List> resultList = approvalOperateService.approvalLog(processId); return ReturnUtil.success(resultList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 88b6416..d65122b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -96,18 +96,8 @@ /** * 计量组织详情 - * 主要人员、仪器、标准装置；基础信息列表取即可 + * 基础信息列表取即可； + * 主要人员（计量人员中查询）、仪器（即测量设备，测量设备中接口查询）、标准装置（标准装置中接口查询）； */ -// @ApiOperation("计量组织详情") -// @PostMapping("/detail") -// @ResponseBody -// public ReturnDTO organizeDetail(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// -// // TODO: 2022/11/27 后续关联仪器、标准装置信息 -// return ReturnUtil.success(); -// } } 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 edc0169..2678726 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 @@ -62,7 +62,7 @@ @ApiOperation("任务分发-详情") @PostMapping("/handOut/detail") @ResponseBody - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) { + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -118,7 +118,7 @@ * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完） */ @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）") - @PostMapping("/myExecutive/List") + @PostMapping("/myExecutive/list") @ResponseBody public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -135,7 +135,7 @@ @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") @ResponseBody - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -143,15 +143,34 @@ } /** - * 实验室检测-负责人/检定人检测完按钮（检测中->检测完） + * 实验室检测-负责人/检定人扫描检完（检测中->检测完） */ + @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）") + @PostMapping("/myExecutive/complete") + @ResponseBody + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.sampleExecutiveComplete(requestList); + } /** - * 实验室检测-部门检测/我的检测 编辑 + * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书） */ /** * 实验室检测-部门检测/我的检测 详情 */ + /** + * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） + * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 + */ + + /** + * 分发员编辑实验室检测列表 + */ + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index b1badb1..07ec083 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -18,7 +18,6 @@ import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * @Description: 审批操作按钮功能 @@ -46,7 +45,7 @@ Assert.isFalse(StringUtils.isEmpty(processId), () -> { throw new BusinessException(BusinessExceptionEnum.PROCESS_ID_NULL); }); - Map> resultList = approvalOperateService.approvalLog(processId); + List> resultList = approvalOperateService.approvalLog(processId); return ReturnUtil.success(resultList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 88b6416..d65122b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -96,18 +96,8 @@ /** * 计量组织详情 - * 主要人员、仪器、标准装置；基础信息列表取即可 + * 基础信息列表取即可； + * 主要人员（计量人员中查询）、仪器（即测量设备，测量设备中接口查询）、标准装置（标准装置中接口查询）； */ -// @ApiOperation("计量组织详情") -// @PostMapping("/detail") -// @ResponseBody -// public ReturnDTO organizeDetail(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// -// // TODO: 2022/11/27 后续关联仪器、标准装置信息 -// return ReturnUtil.success(); -// } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a934826..d85eb2b 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,4 +36,5 @@ logging: level.root: info level.com.casic: debug - level.org.springframework.web: info \ No newline at end of file + level.org.springframework.web: info + level.org.flowable: debug #flowable日志，可查看SQL执行 \ No newline at end of file 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 edc0169..2678726 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 @@ -62,7 +62,7 @@ @ApiOperation("任务分发-详情") @PostMapping("/handOut/detail") @ResponseBody - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) { + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -118,7 +118,7 @@ * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完） */ @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）") - @PostMapping("/myExecutive/List") + @PostMapping("/myExecutive/list") @ResponseBody public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -135,7 +135,7 @@ @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") @ResponseBody - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -143,15 +143,34 @@ } /** - * 实验室检测-负责人/检定人检测完按钮（检测中->检测完） + * 实验室检测-负责人/检定人扫描检完（检测中->检测完） */ + @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）") + @PostMapping("/myExecutive/complete") + @ResponseBody + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.sampleExecutiveComplete(requestList); + } /** - * 实验室检测-部门检测/我的检测 编辑 + * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书） */ /** * 实验室检测-部门检测/我的检测 详情 */ + /** + * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） + * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 + */ + + /** + * 分发员编辑实验室检测列表 + */ + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index b1badb1..07ec083 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -18,7 +18,6 @@ import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * @Description: 审批操作按钮功能 @@ -46,7 +45,7 @@ Assert.isFalse(StringUtils.isEmpty(processId), () -> { throw new BusinessException(BusinessExceptionEnum.PROCESS_ID_NULL); }); - Map> resultList = approvalOperateService.approvalLog(processId); + List> resultList = approvalOperateService.approvalLog(processId); return ReturnUtil.success(resultList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 88b6416..d65122b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -96,18 +96,8 @@ /** * 计量组织详情 - * 主要人员、仪器、标准装置；基础信息列表取即可 + * 基础信息列表取即可； + * 主要人员（计量人员中查询）、仪器（即测量设备，测量设备中接口查询）、标准装置（标准装置中接口查询）； */ -// @ApiOperation("计量组织详情") -// @PostMapping("/detail") -// @ResponseBody -// public ReturnDTO organizeDetail(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// -// // TODO: 2022/11/27 后续关联仪器、标准装置信息 -// return ReturnUtil.success(); -// } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a934826..d85eb2b 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,4 +36,5 @@ logging: level.root: info level.com.casic: debug - level.org.springframework.web: info \ No newline at end of file + level.org.springframework.web: info + level.org.flowable: debug #flowable日志，可查看SQL执行 \ No newline at end of file diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 4f241f9..9e3d9fd 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -52,7 +52,8 @@ FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), QRCODE_FAILED(2409, "二维码生成失败"), - RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"); + RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), + COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"); private Integer code; private String message; 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 edc0169..2678726 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 @@ -62,7 +62,7 @@ @ApiOperation("任务分发-详情") @PostMapping("/handOut/detail") @ResponseBody - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) { + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -118,7 +118,7 @@ * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完） */ @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）") - @PostMapping("/myExecutive/List") + @PostMapping("/myExecutive/list") @ResponseBody public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -135,7 +135,7 @@ @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") @ResponseBody - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -143,15 +143,34 @@ } /** - * 实验室检测-负责人/检定人检测完按钮（检测中->检测完） + * 实验室检测-负责人/检定人扫描检完（检测中->检测完） */ + @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）") + @PostMapping("/myExecutive/complete") + @ResponseBody + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.sampleExecutiveComplete(requestList); + } /** - * 实验室检测-部门检测/我的检测 编辑 + * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书） */ /** * 实验室检测-部门检测/我的检测 详情 */ + /** + * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） + * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 + */ + + /** + * 分发员编辑实验室检测列表 + */ + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index b1badb1..07ec083 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -18,7 +18,6 @@ import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * @Description: 审批操作按钮功能 @@ -46,7 +45,7 @@ Assert.isFalse(StringUtils.isEmpty(processId), () -> { throw new BusinessException(BusinessExceptionEnum.PROCESS_ID_NULL); }); - Map> resultList = approvalOperateService.approvalLog(processId); + List> resultList = approvalOperateService.approvalLog(processId); return ReturnUtil.success(resultList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 88b6416..d65122b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -96,18 +96,8 @@ /** * 计量组织详情 - * 主要人员、仪器、标准装置；基础信息列表取即可 + * 基础信息列表取即可； + * 主要人员（计量人员中查询）、仪器（即测量设备，测量设备中接口查询）、标准装置（标准装置中接口查询）； */ -// @ApiOperation("计量组织详情") -// @PostMapping("/detail") -// @ResponseBody -// public ReturnDTO organizeDetail(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// -// // TODO: 2022/11/27 后续关联仪器、标准装置信息 -// return ReturnUtil.success(); -// } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a934826..d85eb2b 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,4 +36,5 @@ logging: level.root: info level.com.casic: debug - level.org.springframework.web: info \ No newline at end of file + level.org.springframework.web: info + level.org.flowable: debug #flowable日志，可查看SQL执行 \ No newline at end of file diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 4f241f9..9e3d9fd 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -52,7 +52,8 @@ FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), QRCODE_FAILED(2409, "二维码生成失败"), - RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"); + RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), + COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index d170c33..e4cd952 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -28,5 +28,7 @@ Page selectListByUserIdAndStatus(Page page, @Param("request") SampleLabExecutiveListRequest request, @Param("userId") Long userId, @Param("status") String status); - int updateForSampleReceive(@Param("list") List list, @Param("userId") Long userId); + int updateForSampleOperate(@Param("list") List list, @Param("userId") Long userId, @Param("status") String status); + + List selectListForSampleOperate(@Param("list") List requestList, @Param("userId") Long userId, @Param("status") String status); } 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 edc0169..2678726 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 @@ -62,7 +62,7 @@ @ApiOperation("任务分发-详情") @PostMapping("/handOut/detail") @ResponseBody - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) { + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -118,7 +118,7 @@ * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完） */ @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）") - @PostMapping("/myExecutive/List") + @PostMapping("/myExecutive/list") @ResponseBody public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -135,7 +135,7 @@ @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") @ResponseBody - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -143,15 +143,34 @@ } /** - * 实验室检测-负责人/检定人检测完按钮（检测中->检测完） + * 实验室检测-负责人/检定人扫描检完（检测中->检测完） */ + @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）") + @PostMapping("/myExecutive/complete") + @ResponseBody + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.sampleExecutiveComplete(requestList); + } /** - * 实验室检测-部门检测/我的检测 编辑 + * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书） */ /** * 实验室检测-部门检测/我的检测 详情 */ + /** + * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） + * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 + */ + + /** + * 分发员编辑实验室检测列表 + */ + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index b1badb1..07ec083 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -18,7 +18,6 @@ import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * @Description: 审批操作按钮功能 @@ -46,7 +45,7 @@ Assert.isFalse(StringUtils.isEmpty(processId), () -> { throw new BusinessException(BusinessExceptionEnum.PROCESS_ID_NULL); }); - Map> resultList = approvalOperateService.approvalLog(processId); + List> resultList = approvalOperateService.approvalLog(processId); return ReturnUtil.success(resultList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 88b6416..d65122b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -96,18 +96,8 @@ /** * 计量组织详情 - * 主要人员、仪器、标准装置；基础信息列表取即可 + * 基础信息列表取即可； + * 主要人员（计量人员中查询）、仪器（即测量设备，测量设备中接口查询）、标准装置（标准装置中接口查询）； */ -// @ApiOperation("计量组织详情") -// @PostMapping("/detail") -// @ResponseBody -// public ReturnDTO organizeDetail(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// -// // TODO: 2022/11/27 后续关联仪器、标准装置信息 -// return ReturnUtil.success(); -// } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a934826..d85eb2b 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,4 +36,5 @@ logging: level.root: info level.com.casic: debug - level.org.springframework.web: info \ No newline at end of file + level.org.springframework.web: info + level.org.flowable: debug #flowable日志，可查看SQL执行 \ No newline at end of file diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 4f241f9..9e3d9fd 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -52,7 +52,8 @@ FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), QRCODE_FAILED(2409, "二维码生成失败"), - RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"); + RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), + COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index d170c33..e4cd952 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -28,5 +28,7 @@ Page selectListByUserIdAndStatus(Page page, @Param("request") SampleLabExecutiveListRequest request, @Param("userId") Long userId, @Param("status") String status); - int updateForSampleReceive(@Param("list") List list, @Param("userId") Long userId); + int updateForSampleOperate(@Param("list") List list, @Param("userId") Long userId, @Param("status") String status); + + List selectListForSampleOperate(@Param("list") List requestList, @Param("userId") Long userId, @Param("status") String status); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java index 92102d3..7892868 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -27,5 +27,5 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); - int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); } 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 edc0169..2678726 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 @@ -62,7 +62,7 @@ @ApiOperation("任务分发-详情") @PostMapping("/handOut/detail") @ResponseBody - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) { + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -118,7 +118,7 @@ * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完） */ @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）") - @PostMapping("/myExecutive/List") + @PostMapping("/myExecutive/list") @ResponseBody public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -135,7 +135,7 @@ @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") @ResponseBody - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -143,15 +143,34 @@ } /** - * 实验室检测-负责人/检定人检测完按钮（检测中->检测完） + * 实验室检测-负责人/检定人扫描检完（检测中->检测完） */ + @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）") + @PostMapping("/myExecutive/complete") + @ResponseBody + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.sampleExecutiveComplete(requestList); + } /** - * 实验室检测-部门检测/我的检测 编辑 + * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书） */ /** * 实验室检测-部门检测/我的检测 详情 */ + /** + * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） + * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 + */ + + /** + * 分发员编辑实验室检测列表 + */ + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index b1badb1..07ec083 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -18,7 +18,6 @@ import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * @Description: 审批操作按钮功能 @@ -46,7 +45,7 @@ Assert.isFalse(StringUtils.isEmpty(processId), () -> { throw new BusinessException(BusinessExceptionEnum.PROCESS_ID_NULL); }); - Map> resultList = approvalOperateService.approvalLog(processId); + List> resultList = approvalOperateService.approvalLog(processId); return ReturnUtil.success(resultList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 88b6416..d65122b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -96,18 +96,8 @@ /** * 计量组织详情 - * 主要人员、仪器、标准装置；基础信息列表取即可 + * 基础信息列表取即可； + * 主要人员（计量人员中查询）、仪器（即测量设备，测量设备中接口查询）、标准装置（标准装置中接口查询）； */ -// @ApiOperation("计量组织详情") -// @PostMapping("/detail") -// @ResponseBody -// public ReturnDTO organizeDetail(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// -// // TODO: 2022/11/27 后续关联仪器、标准装置信息 -// return ReturnUtil.success(); -// } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a934826..d85eb2b 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,4 +36,5 @@ logging: level.root: info level.com.casic: debug - level.org.springframework.web: info \ No newline at end of file + level.org.springframework.web: info + level.org.flowable: debug #flowable日志，可查看SQL执行 \ No newline at end of file diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 4f241f9..9e3d9fd 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -52,7 +52,8 @@ FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), QRCODE_FAILED(2409, "二维码生成失败"), - RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"); + RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), + COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index d170c33..e4cd952 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -28,5 +28,7 @@ Page selectListByUserIdAndStatus(Page page, @Param("request") SampleLabExecutiveListRequest request, @Param("userId") Long userId, @Param("status") String status); - int updateForSampleReceive(@Param("list") List list, @Param("userId") Long userId); + int updateForSampleOperate(@Param("list") List list, @Param("userId") Long userId, @Param("status") String status); + + List selectListForSampleOperate(@Param("list") List requestList, @Param("userId") Long userId, @Param("status") String status); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java index 92102d3..7892868 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -27,5 +27,5 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); - int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java index 44d6ea7..9728204 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java @@ -14,4 +14,5 @@ List stateManageList(@Param("request") StateManageRequest request); StateManageResponse selectById(@Param("id") Long id); + } 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 edc0169..2678726 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 @@ -62,7 +62,7 @@ @ApiOperation("任务分发-详情") @PostMapping("/handOut/detail") @ResponseBody - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) { + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -118,7 +118,7 @@ * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完） */ @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）") - @PostMapping("/myExecutive/List") + @PostMapping("/myExecutive/list") @ResponseBody public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -135,7 +135,7 @@ @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") @ResponseBody - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -143,15 +143,34 @@ } /** - * 实验室检测-负责人/检定人检测完按钮（检测中->检测完） + * 实验室检测-负责人/检定人扫描检完（检测中->检测完） */ + @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）") + @PostMapping("/myExecutive/complete") + @ResponseBody + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.sampleExecutiveComplete(requestList); + } /** - * 实验室检测-部门检测/我的检测 编辑 + * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书） */ /** * 实验室检测-部门检测/我的检测 详情 */ + /** + * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） + * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 + */ + + /** + * 分发员编辑实验室检测列表 + */ + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index b1badb1..07ec083 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -18,7 +18,6 @@ import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * @Description: 审批操作按钮功能 @@ -46,7 +45,7 @@ Assert.isFalse(StringUtils.isEmpty(processId), () -> { throw new BusinessException(BusinessExceptionEnum.PROCESS_ID_NULL); }); - Map> resultList = approvalOperateService.approvalLog(processId); + List> resultList = approvalOperateService.approvalLog(processId); return ReturnUtil.success(resultList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 88b6416..d65122b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -96,18 +96,8 @@ /** * 计量组织详情 - * 主要人员、仪器、标准装置；基础信息列表取即可 + * 基础信息列表取即可； + * 主要人员（计量人员中查询）、仪器（即测量设备，测量设备中接口查询）、标准装置（标准装置中接口查询）； */ -// @ApiOperation("计量组织详情") -// @PostMapping("/detail") -// @ResponseBody -// public ReturnDTO organizeDetail(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// -// // TODO: 2022/11/27 后续关联仪器、标准装置信息 -// return ReturnUtil.success(); -// } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a934826..d85eb2b 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,4 +36,5 @@ logging: level.root: info level.com.casic: debug - level.org.springframework.web: info \ No newline at end of file + level.org.springframework.web: info + level.org.flowable: debug #flowable日志，可查看SQL执行 \ No newline at end of file diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 4f241f9..9e3d9fd 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -52,7 +52,8 @@ FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), QRCODE_FAILED(2409, "二维码生成失败"), - RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"); + RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), + COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index d170c33..e4cd952 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -28,5 +28,7 @@ Page selectListByUserIdAndStatus(Page page, @Param("request") SampleLabExecutiveListRequest request, @Param("userId") Long userId, @Param("status") String status); - int updateForSampleReceive(@Param("list") List list, @Param("userId") Long userId); + int updateForSampleOperate(@Param("list") List list, @Param("userId") Long userId, @Param("status") String status); + + List selectListForSampleOperate(@Param("list") List requestList, @Param("userId") Long userId, @Param("status") String status); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java index 92102d3..7892868 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -27,5 +27,5 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); - int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java index 44d6ea7..9728204 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java @@ -14,4 +14,5 @@ List stateManageList(@Param("request") StateManageRequest request); StateManageResponse selectById(@Param("id") Long id); + } 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 c7590bf..010260c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -156,17 +156,24 @@ ORDER BY blei.update_time DESC - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + 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 edc0169..2678726 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 @@ -62,7 +62,7 @@ @ApiOperation("任务分发-详情") @PostMapping("/handOut/detail") @ResponseBody - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) { + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -118,7 +118,7 @@ * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完） */ @ApiOperation("实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）") - @PostMapping("/myExecutive/List") + @PostMapping("/myExecutive/list") @ResponseBody public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { @@ -135,7 +135,7 @@ @ApiOperation("实验室检测-我的检测-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") @ResponseBody - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } @@ -143,15 +143,34 @@ } /** - * 实验室检测-负责人/检定人检测完按钮（检测中->检测完） + * 实验室检测-负责人/检定人扫描检完（检测中->检测完） */ + @ApiOperation("实验室检测-负责人/检定人扫描检完（检测中->检测完）") + @PostMapping("/myExecutive/complete") + @ResponseBody + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + return labExecutiveInfoService.sampleExecutiveComplete(requestList); + } /** - * 实验室检测-部门检测/我的检测 编辑 + * 实验室检测-部门检测/我的检测 编辑（只能修改应出具证书） */ /** * 实验室检测-部门检测/我的检测 详情 */ + /** + * 实验室检测-部门检测/我的检测 退回（待检测/检测中->退回） + * 退回后会将下一个要执行的实验室检测状态更新为待分配 + * 可能出现最后一个检测的实验室退回，这样的情况是否需要把样品状态改为检测完，还是等分发员再增加实验室或增加个分发员点击完成的按钮 + */ + + /** + * 分发员编辑实验室检测列表 + */ + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index b1badb1..07ec083 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -18,7 +18,6 @@ import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * @Description: 审批操作按钮功能 @@ -46,7 +45,7 @@ Assert.isFalse(StringUtils.isEmpty(processId), () -> { throw new BusinessException(BusinessExceptionEnum.PROCESS_ID_NULL); }); - Map> resultList = approvalOperateService.approvalLog(processId); + List> resultList = approvalOperateService.approvalLog(processId); return ReturnUtil.success(resultList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java index 88b6416..d65122b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterOrganizeController.java @@ -96,18 +96,8 @@ /** * 计量组织详情 - * 主要人员、仪器、标准装置；基础信息列表取即可 + * 基础信息列表取即可； + * 主要人员（计量人员中查询）、仪器（即测量设备，测量设备中接口查询）、标准装置（标准装置中接口查询）； */ -// @ApiOperation("计量组织详情") -// @PostMapping("/detail") -// @ResponseBody -// public ReturnDTO organizeDetail(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// -// // TODO: 2022/11/27 后续关联仪器、标准装置信息 -// return ReturnUtil.success(); -// } } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a934826..d85eb2b 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,4 +36,5 @@ logging: level.root: info level.com.casic: debug - level.org.springframework.web: info \ No newline at end of file + level.org.springframework.web: info + level.org.flowable: debug #flowable日志，可查看SQL执行 \ No newline at end of file diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 4f241f9..9e3d9fd 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -52,7 +52,8 @@ FLOW_NO_JOIN_FLOWABLE(2408, "该流程暂未接入Flowable,请重试"), HANDLE_FAILED(500, "操作失败"), QRCODE_FAILED(2409, "二维码生成失败"), - RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"); + RECEIVE_SAMPLE_NOT_EXIST(2410, "待检测中不存在扫描收入的样品"), + COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index d170c33..e4cd952 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -28,5 +28,7 @@ Page selectListByUserIdAndStatus(Page page, @Param("request") SampleLabExecutiveListRequest request, @Param("userId") Long userId, @Param("status") String status); - int updateForSampleReceive(@Param("list") List list, @Param("userId") Long userId); + int updateForSampleOperate(@Param("list") List list, @Param("userId") Long userId, @Param("status") String status); + + List selectListForSampleOperate(@Param("list") List requestList, @Param("userId") Long userId, @Param("status") String status); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java index 92102d3..7892868 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -27,5 +27,5 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); - int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java index 44d6ea7..9728204 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java @@ -14,4 +14,5 @@ List stateManageList(@Param("request") StateManageRequest request); StateManageResponse selectById(@Param("id") Long id); + } 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 c7590bf..010260c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -156,17 +156,24 @@ ORDER BY blei.update_time DESC - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind - - UPDATE business_lab_executive_info blei - SET measure_status = 3 + + UPDATE business_lab_executive_info + SET measure_status = #{status} WHERE measure_person_id = #{userId} - AND order_id IN + AND (order_id, sample_id) IN - #{item.orderId} - - AND sample_id IN - - #{item.sampleId} + (#{item.orderId}, #{item.sampleId}) + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4e20fc..bb789a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -25,8 +25,8 @@ bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country, csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.mesure_content, csi.measure_period, - csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period, + csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind