diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 2fe4e1f..b44de47 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -29,13 +29,13 @@ /** * 大读写器 - * 读取读写器获取标签信息、业务信息（新建委托书和待收入中使用，新建委托书中增加通过读写器获取样品按钮） + * 读取读写器获取标签信息、业务信息（新建委托书中使用，新建委托书中增加通过读写器获取样品按钮） */ - @ApiOperation("获取读写器识别的样品列表") - @PostMapping("/sample/readList") - public ReturnDTO> sampleReadList(@RequestBody Set strSet) { - return readWriterService.sampleReadList(strSet); - } +// @ApiOperation("获取读写器识别的样品列表") +// @PostMapping("/sample/readList") +// public ReturnDTO> sampleReadList(@RequestBody Set strSet) { +// return readWriterService.sampleReadList(strSet); +// } /** * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 2fe4e1f..b44de47 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -29,13 +29,13 @@ /** * 大读写器 - * 读取读写器获取标签信息、业务信息（新建委托书和待收入中使用，新建委托书中增加通过读写器获取样品按钮） + * 读取读写器获取标签信息、业务信息（新建委托书中使用，新建委托书中增加通过读写器获取样品按钮） */ - @ApiOperation("获取读写器识别的样品列表") - @PostMapping("/sample/readList") - public ReturnDTO> sampleReadList(@RequestBody Set strSet) { - return readWriterService.sampleReadList(strSet); - } +// @ApiOperation("获取读写器识别的样品列表") +// @PostMapping("/sample/readList") +// public ReturnDTO> sampleReadList(@RequestBody Set strSet) { +// return readWriterService.sampleReadList(strSet); +// } /** * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java index 5302bbd..92c98e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java @@ -46,7 +46,7 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) throws Exception { - List list = approvalMessageService.list(approvalMessageRequest); + List list = approvalMessageService.listPage(approvalMessageRequest); Page page = PageFactory.defaultPage(); Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); return ReturnUtil.success(super.packForBT(pages)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 2fe4e1f..b44de47 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -29,13 +29,13 @@ /** * 大读写器 - * 读取读写器获取标签信息、业务信息（新建委托书和待收入中使用，新建委托书中增加通过读写器获取样品按钮） + * 读取读写器获取标签信息、业务信息（新建委托书中使用，新建委托书中增加通过读写器获取样品按钮） */ - @ApiOperation("获取读写器识别的样品列表") - @PostMapping("/sample/readList") - public ReturnDTO> sampleReadList(@RequestBody Set strSet) { - return readWriterService.sampleReadList(strSet); - } +// @ApiOperation("获取读写器识别的样品列表") +// @PostMapping("/sample/readList") +// public ReturnDTO> sampleReadList(@RequestBody Set strSet) { +// return readWriterService.sampleReadList(strSet); +// } /** * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java index 5302bbd..92c98e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java @@ -46,7 +46,7 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) throws Exception { - List list = approvalMessageService.list(approvalMessageRequest); + List list = approvalMessageService.listPage(approvalMessageRequest); Page page = PageFactory.defaultPage(); Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); return ReturnUtil.success(super.packForBT(pages)); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 781b708..a021e9e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -33,6 +33,4 @@ List listPageBySubpackageCertificate(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); - - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 2fe4e1f..b44de47 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -29,13 +29,13 @@ /** * 大读写器 - * 读取读写器获取标签信息、业务信息（新建委托书和待收入中使用，新建委托书中增加通过读写器获取样品按钮） + * 读取读写器获取标签信息、业务信息（新建委托书中使用，新建委托书中增加通过读写器获取样品按钮） */ - @ApiOperation("获取读写器识别的样品列表") - @PostMapping("/sample/readList") - public ReturnDTO> sampleReadList(@RequestBody Set strSet) { - return readWriterService.sampleReadList(strSet); - } +// @ApiOperation("获取读写器识别的样品列表") +// @PostMapping("/sample/readList") +// public ReturnDTO> sampleReadList(@RequestBody Set strSet) { +// return readWriterService.sampleReadList(strSet); +// } /** * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java index 5302bbd..92c98e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java @@ -46,7 +46,7 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) throws Exception { - List list = approvalMessageService.list(approvalMessageRequest); + List list = approvalMessageService.listPage(approvalMessageRequest); Page page = PageFactory.defaultPage(); Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); return ReturnUtil.success(super.packForBT(pages)); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 781b708..a021e9e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -33,6 +33,4 @@ List listPageBySubpackageCertificate(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); - - } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index a7a0077..349429a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -10,6 +10,8 @@ + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 2fe4e1f..b44de47 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -29,13 +29,13 @@ /** * 大读写器 - * 读取读写器获取标签信息、业务信息（新建委托书和待收入中使用，新建委托书中增加通过读写器获取样品按钮） + * 读取读写器获取标签信息、业务信息（新建委托书中使用，新建委托书中增加通过读写器获取样品按钮） */ - @ApiOperation("获取读写器识别的样品列表") - @PostMapping("/sample/readList") - public ReturnDTO> sampleReadList(@RequestBody Set strSet) { - return readWriterService.sampleReadList(strSet); - } +// @ApiOperation("获取读写器识别的样品列表") +// @PostMapping("/sample/readList") +// public ReturnDTO> sampleReadList(@RequestBody Set strSet) { +// return readWriterService.sampleReadList(strSet); +// } /** * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java index 5302bbd..92c98e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java @@ -46,7 +46,7 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) throws Exception { - List list = approvalMessageService.list(approvalMessageRequest); + List list = approvalMessageService.listPage(approvalMessageRequest); Page page = PageFactory.defaultPage(); Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); return ReturnUtil.success(super.packForBT(pages)); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 781b708..a021e9e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -33,6 +33,4 @@ List listPageBySubpackageCertificate(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); - - } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index a7a0077..349429a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -10,6 +10,8 @@ + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java index 1719e9b..b0cdb5b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java @@ -10,6 +10,12 @@ */ @Data public class ReadSampleDTO { + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + @ApiModelProperty(value = "样品编号", dataType = "String") private String sampleNo; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 2fe4e1f..b44de47 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -29,13 +29,13 @@ /** * 大读写器 - * 读取读写器获取标签信息、业务信息（新建委托书和待收入中使用，新建委托书中增加通过读写器获取样品按钮） + * 读取读写器获取标签信息、业务信息（新建委托书中使用，新建委托书中增加通过读写器获取样品按钮） */ - @ApiOperation("获取读写器识别的样品列表") - @PostMapping("/sample/readList") - public ReturnDTO> sampleReadList(@RequestBody Set strSet) { - return readWriterService.sampleReadList(strSet); - } +// @ApiOperation("获取读写器识别的样品列表") +// @PostMapping("/sample/readList") +// public ReturnDTO> sampleReadList(@RequestBody Set strSet) { +// return readWriterService.sampleReadList(strSet); +// } /** * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java index 5302bbd..92c98e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java @@ -46,7 +46,7 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) throws Exception { - List list = approvalMessageService.list(approvalMessageRequest); + List list = approvalMessageService.listPage(approvalMessageRequest); Page page = PageFactory.defaultPage(); Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); return ReturnUtil.success(super.packForBT(pages)); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 781b708..a021e9e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -33,6 +33,4 @@ List listPageBySubpackageCertificate(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); - - } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index a7a0077..349429a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -10,6 +10,8 @@ + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java index 1719e9b..b0cdb5b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java @@ -10,6 +10,12 @@ */ @Data public class ReadSampleDTO { + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + @ApiModelProperty(value = "样品编号", dataType = "String") private String sampleNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java index f43a5f7..d2647ac 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -73,6 +73,17 @@ private Long environmentId; /** + * 环境记录单为空时取这里的手填温湿度 + */ + @ApiModelProperty(value = "温度", dataType = "String") + @TableField("temperature") + private String temperature; + + @ApiModelProperty(value = "湿度", dataType = "String") + @TableField("humidity") + private String humidity; + + /** * 检校地点 */ @TableField("calibration_place") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 2fe4e1f..b44de47 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -29,13 +29,13 @@ /** * 大读写器 - * 读取读写器获取标签信息、业务信息（新建委托书和待收入中使用，新建委托书中增加通过读写器获取样品按钮） + * 读取读写器获取标签信息、业务信息（新建委托书中使用，新建委托书中增加通过读写器获取样品按钮） */ - @ApiOperation("获取读写器识别的样品列表") - @PostMapping("/sample/readList") - public ReturnDTO> sampleReadList(@RequestBody Set strSet) { - return readWriterService.sampleReadList(strSet); - } +// @ApiOperation("获取读写器识别的样品列表") +// @PostMapping("/sample/readList") +// public ReturnDTO> sampleReadList(@RequestBody Set strSet) { +// return readWriterService.sampleReadList(strSet); +// } /** * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java index 5302bbd..92c98e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java @@ -46,7 +46,7 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) throws Exception { - List list = approvalMessageService.list(approvalMessageRequest); + List list = approvalMessageService.listPage(approvalMessageRequest); Page page = PageFactory.defaultPage(); Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); return ReturnUtil.success(super.packForBT(pages)); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 781b708..a021e9e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -33,6 +33,4 @@ List listPageBySubpackageCertificate(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); - - } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index a7a0077..349429a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -10,6 +10,8 @@ + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java index 1719e9b..b0cdb5b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java @@ -10,6 +10,12 @@ */ @Data public class ReadSampleDTO { + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + @ApiModelProperty(value = "样品编号", dataType = "String") private String sampleNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java index f43a5f7..d2647ac 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -73,6 +73,17 @@ private Long environmentId; /** + * 环境记录单为空时取这里的手填温湿度 + */ + @ApiModelProperty(value = "温度", dataType = "String") + @TableField("temperature") + private String temperature; + + @ApiModelProperty(value = "湿度", dataType = "String") + @TableField("humidity") + private String humidity; + + /** * 检校地点 */ @TableField("calibration_place") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index abaed81..27d4981 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -104,4 +104,18 @@ */ @TableField(exist = false) private String processId; + /** + * 前端跳转审批详情使用 + */ + @TableField(exist = false) + private String taskId; + /** + * 前端跳转审批详情使用 + */ + @TableField(exist = false) + private Integer decisionItem; + + @ApiModelProperty(value = "其他跳转参数", dataType = "Object") + @TableField(exist = false) + private Object skipParamsObject = new Object(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 2fe4e1f..b44de47 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -29,13 +29,13 @@ /** * 大读写器 - * 读取读写器获取标签信息、业务信息（新建委托书和待收入中使用，新建委托书中增加通过读写器获取样品按钮） + * 读取读写器获取标签信息、业务信息（新建委托书中使用，新建委托书中增加通过读写器获取样品按钮） */ - @ApiOperation("获取读写器识别的样品列表") - @PostMapping("/sample/readList") - public ReturnDTO> sampleReadList(@RequestBody Set strSet) { - return readWriterService.sampleReadList(strSet); - } +// @ApiOperation("获取读写器识别的样品列表") +// @PostMapping("/sample/readList") +// public ReturnDTO> sampleReadList(@RequestBody Set strSet) { +// return readWriterService.sampleReadList(strSet); +// } /** * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java index 5302bbd..92c98e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java @@ -46,7 +46,7 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) throws Exception { - List list = approvalMessageService.list(approvalMessageRequest); + List list = approvalMessageService.listPage(approvalMessageRequest); Page page = PageFactory.defaultPage(); Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); return ReturnUtil.success(super.packForBT(pages)); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 781b708..a021e9e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -33,6 +33,4 @@ List listPageBySubpackageCertificate(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); - - } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index a7a0077..349429a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -10,6 +10,8 @@ + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java index 1719e9b..b0cdb5b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java @@ -10,6 +10,12 @@ */ @Data public class ReadSampleDTO { + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + @ApiModelProperty(value = "样品编号", dataType = "String") private String sampleNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java index f43a5f7..d2647ac 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -73,6 +73,17 @@ private Long environmentId; /** + * 环境记录单为空时取这里的手填温湿度 + */ + @ApiModelProperty(value = "温度", dataType = "String") + @TableField("temperature") + private String temperature; + + @ApiModelProperty(value = "湿度", dataType = "String") + @TableField("humidity") + private String humidity; + + /** * 检校地点 */ @TableField("calibration_place") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index abaed81..27d4981 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -104,4 +104,18 @@ */ @TableField(exist = false) private String processId; + /** + * 前端跳转审批详情使用 + */ + @TableField(exist = false) + private String taskId; + /** + * 前端跳转审批详情使用 + */ + @TableField(exist = false) + private Integer decisionItem; + + @ApiModelProperty(value = "其他跳转参数", dataType = "Object") + @TableField(exist = false) + private Object skipParamsObject = new Object(); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java index cd7484b..16ad7fc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java @@ -271,7 +271,7 @@ List resultList = ConvertUtils.sourceToTarget(list, StaffAnalyseListResponse.class); List collect = resultList.stream().map(StaffAnalyseListResponse::getStaffId).collect(Collectors.toList()); meterStaffs.forEach(staff -> { - if(collect.contains(staff.getId())){ + if(!collect.contains(staff.getId())){ StaffAnalyseListResponse dto = new StaffAnalyseListResponse(); dto.setStaffId(staff.getId()); dto.setStaffName(staff.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 2fe4e1f..b44de47 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -29,13 +29,13 @@ /** * 大读写器 - * 读取读写器获取标签信息、业务信息（新建委托书和待收入中使用，新建委托书中增加通过读写器获取样品按钮） + * 读取读写器获取标签信息、业务信息（新建委托书中使用，新建委托书中增加通过读写器获取样品按钮） */ - @ApiOperation("获取读写器识别的样品列表") - @PostMapping("/sample/readList") - public ReturnDTO> sampleReadList(@RequestBody Set strSet) { - return readWriterService.sampleReadList(strSet); - } +// @ApiOperation("获取读写器识别的样品列表") +// @PostMapping("/sample/readList") +// public ReturnDTO> sampleReadList(@RequestBody Set strSet) { +// return readWriterService.sampleReadList(strSet); +// } /** * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java index 5302bbd..92c98e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java @@ -46,7 +46,7 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) throws Exception { - List list = approvalMessageService.list(approvalMessageRequest); + List list = approvalMessageService.listPage(approvalMessageRequest); Page page = PageFactory.defaultPage(); Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); return ReturnUtil.success(super.packForBT(pages)); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 781b708..a021e9e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -33,6 +33,4 @@ List listPageBySubpackageCertificate(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); - - } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index a7a0077..349429a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -10,6 +10,8 @@ + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java index 1719e9b..b0cdb5b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java @@ -10,6 +10,12 @@ */ @Data public class ReadSampleDTO { + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + @ApiModelProperty(value = "样品编号", dataType = "String") private String sampleNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java index f43a5f7..d2647ac 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -73,6 +73,17 @@ private Long environmentId; /** + * 环境记录单为空时取这里的手填温湿度 + */ + @ApiModelProperty(value = "温度", dataType = "String") + @TableField("temperature") + private String temperature; + + @ApiModelProperty(value = "湿度", dataType = "String") + @TableField("humidity") + private String humidity; + + /** * 检校地点 */ @TableField("calibration_place") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index abaed81..27d4981 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -104,4 +104,18 @@ */ @TableField(exist = false) private String processId; + /** + * 前端跳转审批详情使用 + */ + @TableField(exist = false) + private String taskId; + /** + * 前端跳转审批详情使用 + */ + @TableField(exist = false) + private Integer decisionItem; + + @ApiModelProperty(value = "其他跳转参数", dataType = "Object") + @TableField(exist = false) + private Object skipParamsObject = new Object(); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java index cd7484b..16ad7fc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java @@ -271,7 +271,7 @@ List resultList = ConvertUtils.sourceToTarget(list, StaffAnalyseListResponse.class); List collect = resultList.stream().map(StaffAnalyseListResponse::getStaffId).collect(Collectors.toList()); meterStaffs.forEach(staff -> { - if(collect.contains(staff.getId())){ + if(!collect.contains(staff.getId())){ StaffAnalyseListResponse dto = new StaffAnalyseListResponse(); dto.setStaffId(staff.getId()); dto.setStaffName(staff.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java index a0555a7..6d7aad6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.flowable.ToBeApprovedDTO; +import com.casic.missiles.dto.meter.*; import com.casic.missiles.dto.workbench.ApprovalMessageRequest; import com.casic.missiles.dto.workbench.ApprovalMessageUpdateRequest; import com.casic.missiles.dto.workbench.MessageInfoCountRequest; @@ -17,18 +18,26 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.system.ApplyFromIdEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.meter.MeterFileMapper; +import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; +import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; +import com.casic.missiles.model.meter.MeterFile; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService; +import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; @@ -48,6 +57,12 @@ private WorkbenchApprovalMessageMapper approvalMessageMapper; @Autowired private WorkbenchRemindMessageMapper remindMessageMapper; + @Resource + private MeterFileMapper meterFileMapper; + @Autowired + private MeterTrainPlanMapper trainPlanMapper; + @Autowired + private MeterTraceSupplierMapper traceSupplierMapper; /** * 所有业务待审批列表封装为消息 @@ -57,7 +72,7 @@ * 业务管理：分包方资格、项目申请、项目验收，现场检测 */ @Override - public List list(ApprovalMessageRequest request) throws Exception { + public List listPage(ApprovalMessageRequest request) throws Exception { AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -84,6 +99,8 @@ message.setStatus(0);//待审批消息都是未读/未处理，处理后就不会在这个列表显示 message.setBusinessId(a.getBusinessKey()); message.setProcessId(a.getProcessId()); + message.setTaskId(a.getTaskId()); + message.setDecisionItem(a.getDecisionItem()); resultList.add(message); }); }); @@ -106,11 +123,37 @@ if(!CollectionUtils.isEmpty(finalList)) { for (WorkbenchApprovalMessage approvalMessage : finalList) { DictCodeUtils.convertDictCodeToName(approvalMessage); + //丰富跳转参数，仅计量文件、培训计划、溯源供方 + enrichSkipParams(approvalMessage); } } return finalList; } + private void enrichSkipParams(WorkbenchApprovalMessage approvalMessage) { + List businessIds = new ArrayList<>(); + businessIds.add(approvalMessage.getBusinessId()); + if(ApplyFromIdEnum.FILE_APPROVAL.getCode().equals(approvalMessage.getFormId()) && approvalMessage.getMessageTitle().contains("待审批")) { + List meterFiles = meterFileMapper.selectBatchForApproval(PageFactory.defaultPage(), new FileApprovalListRequest(), businessIds); + if(!CollectionUtils.isEmpty(meterFiles)){ + FileApprovalListResponse fileApprovalListResponse = ConvertUtils.sourceToTarget(meterFiles.get(0), FileApprovalListResponse.class); + approvalMessage.setSkipParamsObject(fileApprovalListResponse); + } + }else if(ApplyFromIdEnum.TRAIN_APPROVAL.getCode().equals(approvalMessage.getFormId()) && approvalMessage.getMessageTitle().contains("待审批")) { + List meterTrainPlans = trainPlanMapper.selectBatchForApproval(PageFactory.defaultPage(), new TrainPlanApprovalListRequest(), businessIds); + if(!CollectionUtils.isEmpty(meterTrainPlans)){ + TrainPlanApprovalListResponse trainPlanApprovalListResponse = ConvertUtils.sourceToTarget(meterTrainPlans.get(0), TrainPlanApprovalListResponse.class); + approvalMessage.setSkipParamsObject(trainPlanApprovalListResponse); + } + }else if(ApplyFromIdEnum.STANDARD_EQUIPMENT.getCode().equals(approvalMessage.getFormId()) && approvalMessage.getMessageTitle().contains("待审批")) { + List meterTraceSuppliers = traceSupplierMapper.selectBatchForApproval(PageFactory.defaultPage(), new TraceSupplierApprovalListRequest(), businessIds); + if(!CollectionUtils.isEmpty(meterTraceSuppliers)){ + TraceSupplierApprovalListResponse traceSupplierApprovalListResponse = ConvertUtils.sourceToTarget(meterTraceSuppliers.get(0), TraceSupplierApprovalListResponse.class); + approvalMessage.setSkipParamsObject(traceSupplierApprovalListResponse); + } + } + } + @Override public ReturnDTO updateStatus(ApprovalMessageUpdateRequest updateRequest) { WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java index 2fe4e1f..b44de47 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessReadWriterController.java @@ -29,13 +29,13 @@ /** * 大读写器 - * 读取读写器获取标签信息、业务信息（新建委托书和待收入中使用，新建委托书中增加通过读写器获取样品按钮） + * 读取读写器获取标签信息、业务信息（新建委托书中使用，新建委托书中增加通过读写器获取样品按钮） */ - @ApiOperation("获取读写器识别的样品列表") - @PostMapping("/sample/readList") - public ReturnDTO> sampleReadList(@RequestBody Set strSet) { - return readWriterService.sampleReadList(strSet); - } +// @ApiOperation("获取读写器识别的样品列表") +// @PostMapping("/sample/readList") +// public ReturnDTO> sampleReadList(@RequestBody Set strSet) { +// return readWriterService.sampleReadList(strSet); +// } /** * 测量设备中标签识别按钮，实现接口调用有线扫码枪（二维码）和读写器设备结合的结果，识别的结果先展示为设备列表，点击某一个再查详情 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java index 5302bbd..92c98e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java @@ -46,7 +46,7 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) throws Exception { - List list = approvalMessageService.list(approvalMessageRequest); + List list = approvalMessageService.listPage(approvalMessageRequest); Page page = PageFactory.defaultPage(); Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); return ReturnUtil.success(super.packForBT(pages)); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 781b708..a021e9e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -33,6 +33,4 @@ List listPageBySubpackageCertificate(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); - - } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index a7a0077..349429a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -10,6 +10,8 @@ + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java index 1719e9b..b0cdb5b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java @@ -10,6 +10,12 @@ */ @Data public class ReadSampleDTO { + @ApiModelProperty(value = "样品id", dataType = "Long") + private Long id; + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + @ApiModelProperty(value = "样品编号", dataType = "String") private String sampleNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java index f43a5f7..d2647ac 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -73,6 +73,17 @@ private Long environmentId; /** + * 环境记录单为空时取这里的手填温湿度 + */ + @ApiModelProperty(value = "温度", dataType = "String") + @TableField("temperature") + private String temperature; + + @ApiModelProperty(value = "湿度", dataType = "String") + @TableField("humidity") + private String humidity; + + /** * 检校地点 */ @TableField("calibration_place") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index abaed81..27d4981 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -104,4 +104,18 @@ */ @TableField(exist = false) private String processId; + /** + * 前端跳转审批详情使用 + */ + @TableField(exist = false) + private String taskId; + /** + * 前端跳转审批详情使用 + */ + @TableField(exist = false) + private Integer decisionItem; + + @ApiModelProperty(value = "其他跳转参数", dataType = "Object") + @TableField(exist = false) + private Object skipParamsObject = new Object(); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java index cd7484b..16ad7fc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java @@ -271,7 +271,7 @@ List resultList = ConvertUtils.sourceToTarget(list, StaffAnalyseListResponse.class); List collect = resultList.stream().map(StaffAnalyseListResponse::getStaffId).collect(Collectors.toList()); meterStaffs.forEach(staff -> { - if(collect.contains(staff.getId())){ + if(!collect.contains(staff.getId())){ StaffAnalyseListResponse dto = new StaffAnalyseListResponse(); dto.setStaffId(staff.getId()); dto.setStaffName(staff.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java index a0555a7..6d7aad6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.flowable.ToBeApprovedDTO; +import com.casic.missiles.dto.meter.*; import com.casic.missiles.dto.workbench.ApprovalMessageRequest; import com.casic.missiles.dto.workbench.ApprovalMessageUpdateRequest; import com.casic.missiles.dto.workbench.MessageInfoCountRequest; @@ -17,18 +18,26 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.system.ApplyFromIdEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.meter.MeterFileMapper; +import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper; +import com.casic.missiles.mapper.meter.MeterTrainPlanMapper; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; +import com.casic.missiles.model.meter.MeterFile; +import com.casic.missiles.model.meter.MeterTraceSupplier; +import com.casic.missiles.model.meter.MeterTrainPlan; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService; +import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; @@ -48,6 +57,12 @@ private WorkbenchApprovalMessageMapper approvalMessageMapper; @Autowired private WorkbenchRemindMessageMapper remindMessageMapper; + @Resource + private MeterFileMapper meterFileMapper; + @Autowired + private MeterTrainPlanMapper trainPlanMapper; + @Autowired + private MeterTraceSupplierMapper traceSupplierMapper; /** * 所有业务待审批列表封装为消息 @@ -57,7 +72,7 @@ * 业务管理：分包方资格、项目申请、项目验收，现场检测 */ @Override - public List list(ApprovalMessageRequest request) throws Exception { + public List listPage(ApprovalMessageRequest request) throws Exception { AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); @@ -84,6 +99,8 @@ message.setStatus(0);//待审批消息都是未读/未处理，处理后就不会在这个列表显示 message.setBusinessId(a.getBusinessKey()); message.setProcessId(a.getProcessId()); + message.setTaskId(a.getTaskId()); + message.setDecisionItem(a.getDecisionItem()); resultList.add(message); }); }); @@ -106,11 +123,37 @@ if(!CollectionUtils.isEmpty(finalList)) { for (WorkbenchApprovalMessage approvalMessage : finalList) { DictCodeUtils.convertDictCodeToName(approvalMessage); + //丰富跳转参数，仅计量文件、培训计划、溯源供方 + enrichSkipParams(approvalMessage); } } return finalList; } + private void enrichSkipParams(WorkbenchApprovalMessage approvalMessage) { + List businessIds = new ArrayList<>(); + businessIds.add(approvalMessage.getBusinessId()); + if(ApplyFromIdEnum.FILE_APPROVAL.getCode().equals(approvalMessage.getFormId()) && approvalMessage.getMessageTitle().contains("待审批")) { + List meterFiles = meterFileMapper.selectBatchForApproval(PageFactory.defaultPage(), new FileApprovalListRequest(), businessIds); + if(!CollectionUtils.isEmpty(meterFiles)){ + FileApprovalListResponse fileApprovalListResponse = ConvertUtils.sourceToTarget(meterFiles.get(0), FileApprovalListResponse.class); + approvalMessage.setSkipParamsObject(fileApprovalListResponse); + } + }else if(ApplyFromIdEnum.TRAIN_APPROVAL.getCode().equals(approvalMessage.getFormId()) && approvalMessage.getMessageTitle().contains("待审批")) { + List meterTrainPlans = trainPlanMapper.selectBatchForApproval(PageFactory.defaultPage(), new TrainPlanApprovalListRequest(), businessIds); + if(!CollectionUtils.isEmpty(meterTrainPlans)){ + TrainPlanApprovalListResponse trainPlanApprovalListResponse = ConvertUtils.sourceToTarget(meterTrainPlans.get(0), TrainPlanApprovalListResponse.class); + approvalMessage.setSkipParamsObject(trainPlanApprovalListResponse); + } + }else if(ApplyFromIdEnum.STANDARD_EQUIPMENT.getCode().equals(approvalMessage.getFormId()) && approvalMessage.getMessageTitle().contains("待审批")) { + List meterTraceSuppliers = traceSupplierMapper.selectBatchForApproval(PageFactory.defaultPage(), new TraceSupplierApprovalListRequest(), businessIds); + if(!CollectionUtils.isEmpty(meterTraceSuppliers)){ + TraceSupplierApprovalListResponse traceSupplierApprovalListResponse = ConvertUtils.sourceToTarget(meterTraceSuppliers.get(0), TraceSupplierApprovalListResponse.class); + approvalMessage.setSkipParamsObject(traceSupplierApprovalListResponse); + } + } + } + @Override public ReturnDTO updateStatus(ApprovalMessageUpdateRequest updateRequest) { WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchApprovalMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchApprovalMessageService.java index 2761d4b..2e16de5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchApprovalMessageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchApprovalMessageService.java @@ -20,7 +20,7 @@ */ public interface IWorkbenchApprovalMessageService extends IService { - List list(ApprovalMessageRequest approvalMessageRequest) throws Exception; + List listPage(ApprovalMessageRequest approvalMessageRequest) throws Exception; ReturnDTO updateStatus(ApprovalMessageUpdateRequest updateRequest);