diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh index fb3b8d8..b312cdc 100644 --- a/casic-metering-api/src/main/build/bin/start.sh +++ b/casic-metering-api/src/main/build/bin/start.sh @@ -1 +1 @@ -nohup java -jar ./lib/casic-metering-api-1.0.0.jar > /dev/null 2>&1 & \ No newline at end of file +nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 & \ No newline at end of file diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh index fb3b8d8..b312cdc 100644 --- a/casic-metering-api/src/main/build/bin/start.sh +++ b/casic-metering-api/src/main/build/bin/start.sh @@ -1 +1 @@ -nohup java -jar ./lib/casic-metering-api-1.0.0.jar > /dev/null 2>&1 & \ No newline at end of file +nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 & \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b77d2d1..a44a156 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -92,11 +92,11 @@ return dispatchService.forcedTerminate(deviceReceiveDTO); } - @ApiOperation("设备批量改变状态") - @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { - return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); - } +// @ApiOperation("设备批量改变状态") +// @PostMapping("/status/batchChange") +// public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { +// return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); +// } @ApiOperation("标签绑定") @PostMapping("/label/bind") diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh index fb3b8d8..b312cdc 100644 --- a/casic-metering-api/src/main/build/bin/start.sh +++ b/casic-metering-api/src/main/build/bin/start.sh @@ -1 +1 @@ -nohup java -jar ./lib/casic-metering-api-1.0.0.jar > /dev/null 2>&1 & \ No newline at end of file +nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 & \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b77d2d1..a44a156 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -92,11 +92,11 @@ return dispatchService.forcedTerminate(deviceReceiveDTO); } - @ApiOperation("设备批量改变状态") - @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { - return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); - } +// @ApiOperation("设备批量改变状态") +// @PostMapping("/status/batchChange") +// public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { +// return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); +// } @ApiOperation("标签绑定") @PostMapping("/label/bind") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index 81a7738..41e8b09 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -102,7 +102,7 @@ super.exportExcel(SampleHandOutListResponse.class, list, ExportEnum.HANDOUT_EXPORT.getSheetName()); } - @ApiOperation("新建任务单、设备收发(扫描收入、扫描检完（我的任务扫描增加任务同）、扫描归还)、我的任务(扫描收入、扫描检完)、实验室任务(扫描检完)、交接单(扫描增加)等标签识别获取样品列表") + @ApiOperation("新建任务单、设备收发(扫描收入、扫描检完（我的任务“扫描增加待分发任务”按钮同）、扫描归还)、我的任务(扫描收入、扫描检完、我的任务“扫描增加实验室任务”按钮)、实验室任务(扫描检完)、交接单(扫描增加)等标签识别获取样品列表") @PostMapping("/sample/label/readList") public ReturnDTO> sampleLabelReadList(@RequestBody SampleLabelReadListRequest request) throws Exception { return labExecutiveInfoService.sampleLabelReadList(request); diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh index fb3b8d8..b312cdc 100644 --- a/casic-metering-api/src/main/build/bin/start.sh +++ b/casic-metering-api/src/main/build/bin/start.sh @@ -1 +1 @@ -nohup java -jar ./lib/casic-metering-api-1.0.0.jar > /dev/null 2>&1 & \ No newline at end of file +nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 & \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b77d2d1..a44a156 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -92,11 +92,11 @@ return dispatchService.forcedTerminate(deviceReceiveDTO); } - @ApiOperation("设备批量改变状态") - @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { - return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); - } +// @ApiOperation("设备批量改变状态") +// @PostMapping("/status/batchChange") +// public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { +// return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); +// } @ApiOperation("标签绑定") @PostMapping("/label/bind") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index 81a7738..41e8b09 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -102,7 +102,7 @@ super.exportExcel(SampleHandOutListResponse.class, list, ExportEnum.HANDOUT_EXPORT.getSheetName()); } - @ApiOperation("新建任务单、设备收发(扫描收入、扫描检完（我的任务扫描增加任务同）、扫描归还)、我的任务(扫描收入、扫描检完)、实验室任务(扫描检完)、交接单(扫描增加)等标签识别获取样品列表") + @ApiOperation("新建任务单、设备收发(扫描收入、扫描检完（我的任务“扫描增加待分发任务”按钮同）、扫描归还)、我的任务(扫描收入、扫描检完、我的任务“扫描增加实验室任务”按钮)、实验室任务(扫描检完)、交接单(扫描增加)等标签识别获取样品列表") @PostMapping("/sample/label/readList") public ReturnDTO> sampleLabelReadList(@RequestBody SampleLabelReadListRequest request) throws Exception { return labExecutiveInfoService.sampleLabelReadList(request); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index bdcffbc..fcabdb4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -89,7 +89,7 @@ return labExecutiveInfoService.sampleReceive(requestList); } - @ApiOperation("我的任务-扫描增加任务到检测中（委托书样品->待检测->检测中）") + @ApiOperation("我的任务-扫描增加任务到检测中（任务分发管理中待分发->检测中 / 实验室任务待检测->检测中）") @PostMapping("/myExecutive/add") public ReturnDTO sampleAdd(@RequestBody @Valid List requestList) { return labExecutiveInfoService.sampleAdd(requestList); diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh index fb3b8d8..b312cdc 100644 --- a/casic-metering-api/src/main/build/bin/start.sh +++ b/casic-metering-api/src/main/build/bin/start.sh @@ -1 +1 @@ -nohup java -jar ./lib/casic-metering-api-1.0.0.jar > /dev/null 2>&1 & \ No newline at end of file +nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 & \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b77d2d1..a44a156 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -92,11 +92,11 @@ return dispatchService.forcedTerminate(deviceReceiveDTO); } - @ApiOperation("设备批量改变状态") - @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { - return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); - } +// @ApiOperation("设备批量改变状态") +// @PostMapping("/status/batchChange") +// public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { +// return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); +// } @ApiOperation("标签绑定") @PostMapping("/label/bind") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index 81a7738..41e8b09 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -102,7 +102,7 @@ super.exportExcel(SampleHandOutListResponse.class, list, ExportEnum.HANDOUT_EXPORT.getSheetName()); } - @ApiOperation("新建任务单、设备收发(扫描收入、扫描检完（我的任务扫描增加任务同）、扫描归还)、我的任务(扫描收入、扫描检完)、实验室任务(扫描检完)、交接单(扫描增加)等标签识别获取样品列表") + @ApiOperation("新建任务单、设备收发(扫描收入、扫描检完（我的任务“扫描增加待分发任务”按钮同）、扫描归还)、我的任务(扫描收入、扫描检完、我的任务“扫描增加实验室任务”按钮)、实验室任务(扫描检完)、交接单(扫描增加)等标签识别获取样品列表") @PostMapping("/sample/label/readList") public ReturnDTO> sampleLabelReadList(@RequestBody SampleLabelReadListRequest request) throws Exception { return labExecutiveInfoService.sampleLabelReadList(request); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index bdcffbc..fcabdb4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -89,7 +89,7 @@ return labExecutiveInfoService.sampleReceive(requestList); } - @ApiOperation("我的任务-扫描增加任务到检测中（委托书样品->待检测->检测中）") + @ApiOperation("我的任务-扫描增加任务到检测中（任务分发管理中待分发->检测中 / 实验室任务待检测->检测中）") @PostMapping("/myExecutive/add") public ReturnDTO sampleAdd(@RequestBody @Valid List requestList) { return labExecutiveInfoService.sampleAdd(requestList); diff --git a/casic-metering-dao/src/main/resources/mapper/system/DeptExtendMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/DeptExtendMapper.xml index 859940d..035d7fc 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/DeptExtendMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/DeptExtendMapper.xml @@ -5,7 +5,7 @@ sd.id AS "id", sd.id as "deptId", sd.num AS "num", sd.pid AS "pid", sd.pids AS "pids", sd.simple_name AS "simpleName", sd.full_name AS "fullName", sd.tips AS "tips", sd.version AS "version", sd.dept_type as "deptType", sd.ip_segment as ipSegment, - GROUP_CONCAT(ss.id) as directorId, GROUP_CONCAT(ss.name) AS directorName + GROUP_CONCAT(ss.id) as directorId, GROUP_CONCAT(ss.name) AS directorName, sd.SYNC_ID AS "syncId" diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java index 272e2c2..0d2434a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java @@ -14,7 +14,8 @@ public class SampleLabelReadListRequest { @ApiModelProperty(value = "场景编码（1：设备收发场景，2：任务单场景，3：我的任务场景，4：实验室任务场景，5：交接单场景）", dataType = "String") private String sceneNo; - @ApiModelProperty(value = "场景下的状态（场景1（1：待收入状态，2：已收入状态，3：待归还状态，4：已超期状态）；场景3（1：待检测状态,2：检测中状态）；场景4（1：检测中状态））", dataType = "String") + @ApiModelProperty(value = "场景下的状态（场景1（1：待收入状态，2：已收入状态，3：待归还状态，4：已超期状态）；" + + "场景3（1：待检测状态，2：检测中状态，3：待分配状态（用于将实验室任务扫描到我的任务））；场景4（1：检测中状态））", dataType = "String") private String status; @ApiModelProperty(value = "扫码集合", dataType = "Set") private Set strSet; diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh index fb3b8d8..b312cdc 100644 --- a/casic-metering-api/src/main/build/bin/start.sh +++ b/casic-metering-api/src/main/build/bin/start.sh @@ -1 +1 @@ -nohup java -jar ./lib/casic-metering-api-1.0.0.jar > /dev/null 2>&1 & \ No newline at end of file +nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 & \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b77d2d1..a44a156 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -92,11 +92,11 @@ return dispatchService.forcedTerminate(deviceReceiveDTO); } - @ApiOperation("设备批量改变状态") - @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { - return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); - } +// @ApiOperation("设备批量改变状态") +// @PostMapping("/status/batchChange") +// public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { +// return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); +// } @ApiOperation("标签绑定") @PostMapping("/label/bind") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index 81a7738..41e8b09 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -102,7 +102,7 @@ super.exportExcel(SampleHandOutListResponse.class, list, ExportEnum.HANDOUT_EXPORT.getSheetName()); } - @ApiOperation("新建任务单、设备收发(扫描收入、扫描检完（我的任务扫描增加任务同）、扫描归还)、我的任务(扫描收入、扫描检完)、实验室任务(扫描检完)、交接单(扫描增加)等标签识别获取样品列表") + @ApiOperation("新建任务单、设备收发(扫描收入、扫描检完（我的任务“扫描增加待分发任务”按钮同）、扫描归还)、我的任务(扫描收入、扫描检完、我的任务“扫描增加实验室任务”按钮)、实验室任务(扫描检完)、交接单(扫描增加)等标签识别获取样品列表") @PostMapping("/sample/label/readList") public ReturnDTO> sampleLabelReadList(@RequestBody SampleLabelReadListRequest request) throws Exception { return labExecutiveInfoService.sampleLabelReadList(request); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index bdcffbc..fcabdb4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -89,7 +89,7 @@ return labExecutiveInfoService.sampleReceive(requestList); } - @ApiOperation("我的任务-扫描增加任务到检测中（委托书样品->待检测->检测中）") + @ApiOperation("我的任务-扫描增加任务到检测中（任务分发管理中待分发->检测中 / 实验室任务待检测->检测中）") @PostMapping("/myExecutive/add") public ReturnDTO sampleAdd(@RequestBody @Valid List requestList) { return labExecutiveInfoService.sampleAdd(requestList); diff --git a/casic-metering-dao/src/main/resources/mapper/system/DeptExtendMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/DeptExtendMapper.xml index 859940d..035d7fc 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/DeptExtendMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/DeptExtendMapper.xml @@ -5,7 +5,7 @@ sd.id AS "id", sd.id as "deptId", sd.num AS "num", sd.pid AS "pid", sd.pids AS "pids", sd.simple_name AS "simpleName", sd.full_name AS "fullName", sd.tips AS "tips", sd.version AS "version", sd.dept_type as "deptType", sd.ip_segment as ipSegment, - GROUP_CONCAT(ss.id) as directorId, GROUP_CONCAT(ss.name) AS directorName + GROUP_CONCAT(ss.id) as directorId, GROUP_CONCAT(ss.name) AS directorName, sd.SYNC_ID AS "syncId" diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java index 272e2c2..0d2434a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java @@ -14,7 +14,8 @@ public class SampleLabelReadListRequest { @ApiModelProperty(value = "场景编码（1：设备收发场景，2：任务单场景，3：我的任务场景，4：实验室任务场景，5：交接单场景）", dataType = "String") private String sceneNo; - @ApiModelProperty(value = "场景下的状态（场景1（1：待收入状态，2：已收入状态，3：待归还状态，4：已超期状态）；场景3（1：待检测状态,2：检测中状态）；场景4（1：检测中状态））", dataType = "String") + @ApiModelProperty(value = "场景下的状态（场景1（1：待收入状态，2：已收入状态，3：待归还状态，4：已超期状态）；" + + "场景3（1：待检测状态，2：检测中状态，3：待分配状态（用于将实验室任务扫描到我的任务））；场景4（1：检测中状态））", dataType = "String") private String status; @ApiModelProperty(value = "扫码集合", dataType = "Set") private Set strSet; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java index b9e6bb5..86139c3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java @@ -21,6 +21,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessOrderInfoMapper; import com.casic.missiles.mapper.business.BizBusinessOrderSampleRelationMapper; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; import com.casic.missiles.mapper.business.BusinessOrderListResponseMapper; import com.casic.missiles.mapper.eqpt.EqptEquipmentInfoMapper; import com.casic.missiles.mapper.system.DeptExtendMapper; @@ -64,6 +65,7 @@ private final EqptEquipmentInfoMapper eqptEquipmentInfoMapper; private final IBaseExportService iBaseExportService; private final DeptExtendMapper deptExtendMapper; + private final BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @Override public Page orderListPage(Page page, OrderListRequest request) throws Exception { @@ -173,9 +175,10 @@ labExecutiveInfo.setIsAuto(0);//默认手动检定 // labExecutiveInfo.setRequireCertifications(); labExecutiveInfo.setCreateUser(ShiroKit.getUser().getId()); + int insertFlag = labExecutiveInfoMapper.insert(labExecutiveInfo); //更新样品状态为检测中 int updateFlag = sampleRelationMapper.updateByOrderIdAndSampleId(id, orderSampleRelation.getSampleId(), SampleStatusEnum.IN_MEASURE, null); - if (updateFlag < 1) { + if (updateFlag < 1 || insertFlag < 1) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index aa80a2c..a83cebb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -76,12 +76,12 @@ private DeptExtendMapper deptExtendMapper; @Override - public Page handOutListPage(Page page, SampleHandOutListRequest handOutListRequest) throws Exception{ + public Page handOutListPage(Page page, SampleHandOutListRequest handOutListRequest) throws Exception { //查询委托书和样品关联表中的各状态的样品 Page handOutList = orderSampleRelationMapper.selectSampleListByStatus(page, handOutListRequest); log.info("任务分发-当前查询样品状态为：{}", handOutListRequest.getSampleStatus()); List records = handOutList.getRecords(); - if(CollectionUtils.isEmpty(records)){ + if (CollectionUtils.isEmpty(records)) { return new Page<>(); } records.parallelStream().forEach(handOut -> { @@ -174,10 +174,10 @@ } @Override - public SampleHandOutDetailResponse handOutListDetail(SampleHandOutDetailRequest request) throws Exception{ + public SampleHandOutDetailResponse handOutListDetail(SampleHandOutDetailRequest request) throws Exception { //根据样品id和委托书id查询样品、委托书、委托方 SampleHandOutDetailResponse sampleDetail = orderSampleRelationMapper.selectSampleDetail(request.getOrderId(), request.getSampleId()); - if(Objects.isNull(sampleDetail)){ + if (Objects.isNull(sampleDetail)) { throw new BusinessException(BusinessExceptionEnum.NON_EXIST_ORDER_OR_SAMPLE); } //根据样品id和委托书id查询检定流程、退回信息 @@ -194,7 +194,7 @@ @Override public List handOutInitList(SampleHandOutInitListRequest handOutInitListRequest) { - if(StringUtils.isEmpty(handOutInitListRequest.getCategory())){ + if (StringUtils.isEmpty(handOutInitListRequest.getCategory())) { return new ArrayList<>(); } //根据委托书id获取委托方部门所属是西昌/海口 @@ -225,7 +225,7 @@ List labExecutiveInfos = new ArrayList<>(); for (int i = 0; i < sortedList.size(); i++) { BusinessLabExecutiveInfo labExecutiveInfo = new BusinessLabExecutiveInfo(); - if(0 == i){ + if (0 == i) { //将第一个置为待分配(负责人可查看) labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_ALLOCATE); } @@ -242,14 +242,14 @@ } //更新样品状态为检测中 int updateFlag = orderSampleRelationMapper.updateByOrderIdAndSampleId(orderId, sampleId, SampleStatusEnum.IN_MEASURE, null); - if(this.saveBatch(labExecutiveInfos) && updateFlag > 0){ + if (this.saveBatch(labExecutiveInfos) && updateFlag > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override - public Page deptLabExecutiveListPage(Page page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{ + public Page deptLabExecutiveListPage(Page page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { //本级部门主管可见本部门的检测 //根据用户id查询，用户角色中TIPS为director即为主管，取用户的部门id AuthUser user = ShiroKit.getUser(); @@ -257,7 +257,7 @@ throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); Map resultMap = SysDeptAndUserUtil.getDirectDeptByUserId(user.getId()); - if(CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))){ + if (CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))) { return new Page<>(); } Long deptId = (Long) resultMap.get("deptId"); @@ -282,12 +282,12 @@ List statusList = new ArrayList<>(); statusList.add(MeasureStatusEnum.TO_MEASURE); statusList.add(MeasureStatusEnum.IN_MEASURE); - resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId,null, statusList); + resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId, null, statusList); resultPage.getRecords().parallelStream().forEach(lab -> { lab.setCurrentSegmentId(deptId); lab.setCurrentSegment(deptName); //查询证书报告表 - if(MeasureStatusEnum.IN_MEASURE.equals(lab.getMeasureStatus())){ + if (MeasureStatusEnum.IN_MEASURE.equals(lab.getMeasureStatus())) { Integer alreadyCertificateNum = getAlreadyCertificateNum(lab.getOrderId(), lab.getSampleId(), deptId); lab.setAlreadyCertifications(alreadyCertificateNum); } @@ -301,7 +301,7 @@ enrichLabExecutiveRecords(resultPage); break; } - if(!CollectionUtils.isEmpty(resultPage.getRecords())){ + if (!CollectionUtils.isEmpty(resultPage.getRecords())) { for (SampleLabExecutiveListResponse record : resultPage.getRecords()) { DictCodeUtils.convertDictCodeToName(record); } @@ -333,7 +333,7 @@ } @Override - public Page myLabExecutiveListPage(Page page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{ + public Page myLabExecutiveListPage(Page page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -341,7 +341,7 @@ //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id BizResourceStaffInfo meterStaff = getMeterStaffInfo(user); // if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); - if(Objects.isNull(meterStaff)) return new Page<>(); + if (Objects.isNull(meterStaff)) return new Page<>(); Long userId = meterStaff.getId(); String measureStatus = labExecutiveListRequest.getMeasureStatus(); @@ -377,7 +377,7 @@ enrichLabExecutiveRecords(resultPage); break; } - if(!CollectionUtils.isEmpty(resultPage.getRecords())){ + if (!CollectionUtils.isEmpty(resultPage.getRecords())) { for (SampleLabExecutiveListResponse record : resultPage.getRecords()) { DictCodeUtils.convertDictCodeToName(record); } @@ -413,7 +413,7 @@ //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id AuthUser user = ShiroKit.getUser(); BizResourceStaffInfo meterStaff = getMeterStaffInfo(user); - if(Objects.isNull(meterStaff)) return new ArrayList<>(); + if (Objects.isNull(meterStaff)) return new ArrayList<>(); Long userId = meterStaff.getId(); Page page = getSampleLabExecutiveListResponsePage(); Page page1 = getSampleLabExecutiveListResponsePage(); @@ -445,16 +445,16 @@ }); //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id BizResourceStaffInfo meterStaff = getMeterStaffInfo(user); - if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + if (Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); Long userId = meterStaff.getId(); //查询扫描样品中为该用户待检测中的样品列表 List preList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.TO_MEASURE); - if(CollectionUtils.isEmpty(preList)){ + if (CollectionUtils.isEmpty(preList)) { throw new BusinessException(BusinessExceptionEnum.RECEIVE_SAMPLE_NOT_EXIST); } int updateFlag = labExecutiveInfoMapper.updateForSampleInMeasureOperate(preList, userId, MeasureStatusEnum.IN_MEASURE); - if(updateFlag > 0){ + if (updateFlag > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.RECEIVE_SAMPLE_NOT_EXIST); @@ -468,20 +468,23 @@ }); //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id BizResourceStaffInfo meterStaff = getMeterStaffInfo(user); - if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + if (Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); Long userId = meterStaff.getId(); List existSampleList = new ArrayList<>(); for (SampleOperateRequest request : requestList) { //检查样品是否已在检测流程中，提示 QueryWrapper wrapper = new QueryWrapper<>(); - List statusList = Arrays.asList(MeasureStatusEnum.TO_ALLOCATE, MeasureStatusEnum.TO_MEASURE, MeasureStatusEnum.IN_MEASURE, MeasureStatusEnum.MEASURE_COMPLETE); + List statusList = Arrays.asList(MeasureStatusEnum.TO_MEASURE, MeasureStatusEnum.IN_MEASURE, MeasureStatusEnum.MEASURE_COMPLETE); wrapper.eq("order_id", request.getOrderId()); wrapper.eq("sample_id", request.getSampleId()); wrapper.in("measure_status", statusList); - if(labExecutiveInfoMapper.selectCount(wrapper) > 0){ + if (labExecutiveInfoMapper.selectCount(wrapper) > 0) { existSampleList.add(request.getSampleId()); continue; } + //删除从实验室待检测中扫描过来的任务的情况中原有的检测节点 + wrapper.eq("measure_status", MeasureStatusEnum.TO_ALLOCATE); + this.baseMapper.delete(wrapper); //增加检测节点 BusinessLabExecutiveInfo labExecutiveInfo = new BusinessLabExecutiveInfo(); labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.IN_MEASURE); @@ -497,7 +500,7 @@ int insertFlag = this.baseMapper.insert(labExecutiveInfo); //更新样品状态为检测中 int updateFlag = orderSampleRelationMapper.updateByOrderIdAndSampleId(request.getOrderId(), request.getSampleId(), SampleStatusEnum.IN_MEASURE, null); - if(insertFlag <= 0 || updateFlag <= 0){ + if (insertFlag <= 0 || updateFlag <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } @@ -514,16 +517,16 @@ }); //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id BizResourceStaffInfo meterStaff = getMeterStaffInfo(user); - if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + if (Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); Long userId = meterStaff.getId(); //查询扫描样品中为该用户检测中的样品列表 List preList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.IN_MEASURE); - if(CollectionUtils.isEmpty(preList)){ + if (CollectionUtils.isEmpty(preList)) { throw new BusinessException(BusinessExceptionEnum.COMPLETE_SAMPLE_NOT_EXIST); } int updateFlag = labExecutiveInfoMapper.updateForSampleMeasureCompleteOperate(preList, userId, MeasureStatusEnum.MEASURE_COMPLETE); - if(updateFlag > 0){ + if (updateFlag > 0) { preList.forEach(pre -> { //是否全部实验室完成，所有实验室无检测完外的其他状态或空才是样品的检测完（有终止状态会把样品状态直接更新为待归还，有退回的状态会从表中删除加入到log表） QueryWrapper wrapper = new QueryWrapper<>(); @@ -534,18 +537,18 @@ StringUtils.isEmpty(lab.getMeasureStatus()) || !StringUtils.equals(MeasureStatusEnum.MEASURE_COMPLETE, lab.getMeasureStatus()) ).collect(Collectors.toList()); //全部实验室检测完成 - if(CollectionUtils.isEmpty(unExecutiveInfos)){ + if (CollectionUtils.isEmpty(unExecutiveInfos)) { //更新样品状态为检测完 orderSampleRelationMapper.updateByOrderIdAndSampleId(pre.getOrderId(), pre.getSampleId(), SampleStatusEnum.MEASURE_COMPLETE, null); //委托书中所有样品检测完更新委托书接收状态为检测完成，未检测完的数量为0则表示全部检完 updateOrderStatusComplete(pre); - }else { + } else { //更新下一个审批的实验室为待分配 //注：分发员不可以调整待分配/检测中等有状态的节点（只能调整无状态的） Optional minSeqLab = labExecutiveInfos.stream().filter(dto -> StringUtils.isEmpty(dto.getMeasureStatus()) ).sorted(Comparator.comparing(BusinessLabExecutiveInfo::getMeasureStatus)).findFirst(); - if(minSeqLab.isPresent()){ + if (minSeqLab.isPresent()) { BusinessLabExecutiveInfo labExecutiveInfo = minSeqLab.get(); labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_ALLOCATE); labExecutiveInfoMapper.updateById(labExecutiveInfo); @@ -568,7 +571,7 @@ statusList.add(SampleStatusEnum.IN_MEASURE); wrapper1.in("sample_status", statusList); //同一事务中可查到更新后的数量 - if(orderSampleRelationMapper.selectCount(wrapper1) == 0){ + if (orderSampleRelationMapper.selectCount(wrapper1) == 0) { BizBusinessOrderInfo businessOrder = new BizBusinessOrderInfo(); businessOrder.setId(pre.getOrderId()); businessOrder.setReceiveStatus(OrderStatusDictEnum.COMPLETE); @@ -593,8 +596,9 @@ List addList = new ArrayList<>(); for (UpdateExecutiveListDTO executiveDTO : executiveList) { //待分配状态分发员可更新检定员 - if(StringUtils.isNotEmpty(executiveDTO.getMeasureStatus()) && !MeasureStatusEnum.TO_ALLOCATE.equals(executiveDTO.getMeasureStatus())) continue; - if(Objects.isNull(executiveDTO.getId())){ + if (StringUtils.isNotEmpty(executiveDTO.getMeasureStatus()) && !MeasureStatusEnum.TO_ALLOCATE.equals(executiveDTO.getMeasureStatus())) + continue; + if (Objects.isNull(executiveDTO.getId())) { BusinessLabExecutiveInfo labExecutiveInfo = new BusinessLabExecutiveInfo(); labExecutiveInfo.setId(executiveDTO.getId()); labExecutiveInfo.setOrderId(request.getOrderId()); @@ -604,7 +608,7 @@ labExecutiveInfo.setMeasureSequence(executiveDTO.getMeasureSequence()); labExecutiveInfo.setRequireCertifications(executiveDTO.getRequireCertifications()); addList.add(labExecutiveInfo); - }else{ + } else { BusinessLabExecutiveInfo labExecutiveInfo = new BusinessLabExecutiveInfo(); labExecutiveInfo.setId(executiveDTO.getId()); labExecutiveInfo.setMeasureDeptId(executiveDTO.getMeasureSegmentId()); @@ -626,16 +630,16 @@ throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); BizResourceStaffInfo meterStaff = getMeterStaffInfo(user); - if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + if (Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); Long userId = meterStaff.getId(); - if(request.getMeasurePersonId() != userId){ + if (request.getMeasurePersonId() != userId) { throw new BusinessException(BusinessExceptionEnum.CANNOT_CHANGE_MEASURE_INFO); } BusinessLabExecutiveInfo executiveInfo = new BusinessLabExecutiveInfo(); executiveInfo.setId(request.getId()); executiveInfo.setRequireCertifications(request.getRequireCertifications()); - if(labExecutiveInfoMapper.updateById(executiveInfo) > 0){ + if (labExecutiveInfoMapper.updateById(executiveInfo) > 0) { return ReturnUtil.success(); } log.info("更新实验室应出具证书信息失败，主键id：{}", request.getId()); @@ -643,10 +647,10 @@ } @Override - public ExecutiveDetailResponse executiveDetail(ExecutiveDetailRequest request) throws Exception{ + public ExecutiveDetailResponse executiveDetail(ExecutiveDetailRequest request) throws Exception { //根据样品id和委托书id查询样品、委托书、委托方 SampleHandOutDetailResponse sampleDetail = orderSampleRelationMapper.selectSampleDetail(request.getOrderId(), request.getSampleId()); - if(Objects.isNull(sampleDetail)){ + if (Objects.isNull(sampleDetail)) { throw new BusinessException(BusinessExceptionEnum.NON_EXIST_ORDER_OR_SAMPLE); } ExecutiveDetailResponse detailResponse = ConvertUtils.sourceToTarget(sampleDetail, ExecutiveDetailResponse.class); @@ -666,7 +670,7 @@ throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); BizResourceStaffInfo meterStaff = getMeterStaffInfo(user); - if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + if (Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); Long userId = meterStaff.getId(); //删除实验室检测列表中退回数据 @@ -674,14 +678,14 @@ //退回操作记录表中增加数据 BusinessLabExecutiveOperateLog operateLog = getBusinessLabExecutiveOperateLog(request, user, userId); int insertFlag = labExecutiveOperateLogMapper.insert(operateLog); - if(deleteFlag > 0 && insertFlag > 0){ + if (deleteFlag > 0 && insertFlag > 0) { //退回后会将下一个要执行的实验室检测状态更新为待分配，将后面的实验室顺序变更为连续（都进行减1） //更新所有状态为空的实验室检测的序号为当前减1 int seqUpdateFlag = labExecutiveInfoMapper.updateForSendBack(request.getOrderId(), request.getSampleId()); //更新所有状态为空的实验室检测中序号最小的记录的状态为待分配 Long id = labExecutiveInfoMapper.selectMinSeq(request.getOrderId(), request.getSampleId()); //仅分发了一个实验室检测或无实验室可分配的情况 - if(seqUpdateFlag <= 0 && Objects.isNull(id)){ + if (seqUpdateFlag <= 0 && Objects.isNull(id)) { //将样品状态变为待分发 orderSampleRelationMapper.updateByOrderIdAndSampleId(request.getOrderId(), request.getSampleId(), SampleStatusEnum.TO_HANDOUT, null); return ReturnUtil.success(); @@ -690,7 +694,7 @@ info.setId(id); info.setMeasureStatus(MeasureStatusEnum.TO_ALLOCATE); int statusUpdateFlag = labExecutiveInfoMapper.updateById(info); - if(seqUpdateFlag > 0 && statusUpdateFlag > 0) return ReturnUtil.success(); + if (seqUpdateFlag > 0 && statusUpdateFlag > 0) return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -702,7 +706,7 @@ labExecutiveInfo.setMeasurePersonId(sampleAllocateRequest.getMeasurePersonId()); labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_MEASURE); labExecutiveInfo.setRequireCertifications(sampleAllocateRequest.getRequireCertifications()); - if(labExecutiveInfoMapper.updateById(labExecutiveInfo) > 0){ + if (labExecutiveInfoMapper.updateById(labExecutiveInfo) > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -733,11 +737,11 @@ labExecutiveInfos.add(labExecutiveInfo); //更新样品状态为检测中 int updateFlag = orderSampleRelationMapper.updateByOrderIdAndSampleId(handOut.getOrderId(), handOut.getSampleId(), SampleStatusEnum.IN_MEASURE, null); - if(updateFlag < 0){ + if (updateFlag < 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } }); - if(this.saveBatch(labExecutiveInfos)){ + if (this.saveBatch(labExecutiveInfos)) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -754,7 +758,7 @@ secondSamples = queryReadSampleList(request.getStrSet(), null); resultList.addAll(firstSamples); resultList.addAll(secondSamples); - }else { + } else { //获取不同场景样品列表 resultList = handleSceneSample(request.getSceneNo(), request.getStatus(), request.getStrSet(), request.getCustomerId()); } @@ -773,44 +777,47 @@ private List handleSceneSample(String sceneNo, String status, Set strSet, Long customerId) throws Exception { List resultList = new ArrayList<>(); - if(sceneNo.equals("1")){ + if (sceneNo.equals("1")) { SampleDispatchListRequest request = new SampleDispatchListRequest(); - if(status.equals("1")){ + if (status.equals("1")) { //扫描收入：设备收发场景+待收入状态 request.setSampleStatus(SampleStatusEnum.TO_RECEIVE); - }else if(status.equals("2")){ + } else if (status.equals("2")) { //扫描结束检定：设备收发场景+已收入状态 request.setSampleStatus(SampleStatusEnum.TO_HANDOUT); - }else if(status.equals("3")){ + } else if (status.equals("3")) { //扫描归还：设备收发场景+待归还状态 request.setSampleStatus(SampleStatusEnum.TO_GIVE_BACK); - }else if(status.equals("4")){ + } else if (status.equals("4")) { //扫描结束检定：设备收发场景+已超期状态 request.setSampleStatus(SampleStatusEnum.BE_OVERDUE); } List records = orderSampleRelationMapper.getSampleListByStatus(request); resultList = ConvertUtils.sourceToTarget(records, ReadSampleDTO.class); - } else if(sceneNo.equals("2")){ + } else if (sceneNo.equals("2")) { //新建委托书：委托书场景 resultList = orderMapper.sampleListByCustomerId(customerId); - } else if(sceneNo.equals("3")){ + } else if (sceneNo.equals("3")) { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); SampleLabExecutiveListRequest request = new SampleLabExecutiveListRequest(); - if(status.equals("1")){ + if (status.equals("1")) { //扫描收入：我的任务场景+待检测状态 request.setMeasureStatus(MeasureStatusEnum.TO_MEASURE); - }else if(status.equals("2")){ + } else if (status.equals("2")) { //扫描检完：我的任务场景+检测中状态 request.setMeasureStatus(MeasureStatusEnum.IN_MEASURE); + } else if (status.equals("3")) { + //扫描检完：我的任务场景+待分配状态 + request.setMeasureStatus(MeasureStatusEnum.TO_ALLOCATE); } Page sampleLabExecutiveListResponsePage = this.myLabExecutiveListPage(page, request); List records = sampleLabExecutiveListResponsePage.getRecords(); resultList = ConvertUtils.sourceToTarget(records, ReadSampleDTO.class); - } else if(sceneNo.equals("4")){ - if(status.equals("1")){ + } else if (sceneNo.equals("4")) { + if (status.equals("1")) { //扫描检完：部门检测场景+检测中状态 Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -822,7 +829,7 @@ List records = sampleLabExecutiveListResponsePage.getRecords(); resultList = ConvertUtils.sourceToTarget(records, ReadSampleDTO.class); } - } else if (sceneNo.equals("5")){ + } else if (sceneNo.equals("5")) { SampleDispatchListRequest request = new SampleDispatchListRequest(); List records = orderSampleRelationMapper.getSampleListByStatus(request); resultList = ConvertUtils.sourceToTarget(records, ReadSampleDTO.class); diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh index fb3b8d8..b312cdc 100644 --- a/casic-metering-api/src/main/build/bin/start.sh +++ b/casic-metering-api/src/main/build/bin/start.sh @@ -1 +1 @@ -nohup java -jar ./lib/casic-metering-api-1.0.0.jar > /dev/null 2>&1 & \ No newline at end of file +nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 & \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index b77d2d1..a44a156 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -92,11 +92,11 @@ return dispatchService.forcedTerminate(deviceReceiveDTO); } - @ApiOperation("设备批量改变状态") - @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { - return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); - } +// @ApiOperation("设备批量改变状态") +// @PostMapping("/status/batchChange") +// public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { +// return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); +// } @ApiOperation("标签绑定") @PostMapping("/label/bind") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index 81a7738..41e8b09 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -102,7 +102,7 @@ super.exportExcel(SampleHandOutListResponse.class, list, ExportEnum.HANDOUT_EXPORT.getSheetName()); } - @ApiOperation("新建任务单、设备收发(扫描收入、扫描检完（我的任务扫描增加任务同）、扫描归还)、我的任务(扫描收入、扫描检完)、实验室任务(扫描检完)、交接单(扫描增加)等标签识别获取样品列表") + @ApiOperation("新建任务单、设备收发(扫描收入、扫描检完（我的任务“扫描增加待分发任务”按钮同）、扫描归还)、我的任务(扫描收入、扫描检完、我的任务“扫描增加实验室任务”按钮)、实验室任务(扫描检完)、交接单(扫描增加)等标签识别获取样品列表") @PostMapping("/sample/label/readList") public ReturnDTO> sampleLabelReadList(@RequestBody SampleLabelReadListRequest request) throws Exception { return labExecutiveInfoService.sampleLabelReadList(request); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index bdcffbc..fcabdb4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -89,7 +89,7 @@ return labExecutiveInfoService.sampleReceive(requestList); } - @ApiOperation("我的任务-扫描增加任务到检测中（委托书样品->待检测->检测中）") + @ApiOperation("我的任务-扫描增加任务到检测中（任务分发管理中待分发->检测中 / 实验室任务待检测->检测中）") @PostMapping("/myExecutive/add") public ReturnDTO sampleAdd(@RequestBody @Valid List requestList) { return labExecutiveInfoService.sampleAdd(requestList); diff --git a/casic-metering-dao/src/main/resources/mapper/system/DeptExtendMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/DeptExtendMapper.xml index 859940d..035d7fc 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/DeptExtendMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/DeptExtendMapper.xml @@ -5,7 +5,7 @@ sd.id AS "id", sd.id as "deptId", sd.num AS "num", sd.pid AS "pid", sd.pids AS "pids", sd.simple_name AS "simpleName", sd.full_name AS "fullName", sd.tips AS "tips", sd.version AS "version", sd.dept_type as "deptType", sd.ip_segment as ipSegment, - GROUP_CONCAT(ss.id) as directorId, GROUP_CONCAT(ss.name) AS directorName + GROUP_CONCAT(ss.id) as directorId, GROUP_CONCAT(ss.name) AS directorName, sd.SYNC_ID AS "syncId"