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 5c346d3..9164896 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 @@ -104,14 +104,12 @@ @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { - return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { - return ReturnUtil.success(labExecutiveInfoService.executiveDetail(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 5c346d3..9164896 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 @@ -104,14 +104,12 @@ @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { - return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { - return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index 66ebdb5..d131279 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -208,6 +208,9 @@ WHERE customer_id = #{request.customerId} )bo ON bo.id = bosr.order_id WHERE bosr.interchange_id is null + + AND bosr.order_id = #{request.orderId} + )bor ON bor.sample_id = eei.id ORDER BY bor.create_time DESC 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 5c346d3..9164896 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 @@ -104,14 +104,12 @@ @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { - return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { - return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index 66ebdb5..d131279 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -208,6 +208,9 @@ WHERE customer_id = #{request.customerId} )bo ON bo.id = bosr.order_id WHERE bosr.interchange_id is null + + AND bosr.order_id = #{request.orderId} + )bor ON bor.sample_id = eei.id ORDER BY bor.create_time DESC diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListRequest.java index df6f681..f0b78ef 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListRequest.java @@ -22,4 +22,7 @@ @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; + + @ApiModelProperty(value = "任务单Id", dataType = "Long") + private Long orderId; } 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 5c346d3..9164896 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 @@ -104,14 +104,12 @@ @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { - return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { - return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index 66ebdb5..d131279 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -208,6 +208,9 @@ WHERE customer_id = #{request.customerId} )bo ON bo.id = bosr.order_id WHERE bosr.interchange_id is null + + AND bosr.order_id = #{request.orderId} + )bor ON bor.sample_id = eei.id ORDER BY bor.create_time DESC diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListRequest.java index df6f681..f0b78ef 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListRequest.java @@ -22,4 +22,7 @@ @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; + + @ApiModelProperty(value = "任务单Id", dataType = "Long") + private Long orderId; } 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 f67de9a..3037090 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 @@ -484,7 +484,8 @@ } //增加检测节点 BusinessLabExecutiveInfo labExecutiveInfo = new BusinessLabExecutiveInfo(); - labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_MEASURE); + labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.IN_MEASURE); + labExecutiveInfo.setStartTime(DateUtil.now()); labExecutiveInfo.setOrderId(request.getOrderId()); labExecutiveInfo.setSampleId(request.getSampleId()); labExecutiveInfo.setMeasureDeptId(user.getDeptId());