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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 11acc4f..9cf2e13 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class OrderListRequest { @@ -29,6 +31,12 @@ @ApiModelProperty(value = "委托书开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "委托书结束时间", dataType = "String") private String endTime; } 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 11acc4f..9cf2e13 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class OrderListRequest { @@ -29,6 +31,12 @@ @ApiModelProperty(value = "委托书开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "委托书结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java index b93049e..a0b9a92 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @ApiModel @Data public class CustomerAdviceListRequest { @@ -20,6 +22,13 @@ @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") private String startTime; + + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") private String endTime; } 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 11acc4f..9cf2e13 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class OrderListRequest { @@ -29,6 +31,12 @@ @ApiModelProperty(value = "委托书开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "委托书结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java index b93049e..a0b9a92 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @ApiModel @Data public class CustomerAdviceListRequest { @@ -20,6 +22,13 @@ @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") private String startTime; + + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java index b7897cf..95b7ebe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author cz * @date 2023-02-01 @@ -21,6 +23,12 @@ @ApiModelProperty(value = "业务规模", dataType = "String") private String bussinessSize; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "公司评级", dataType = "String") private String grade; 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 11acc4f..9cf2e13 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class OrderListRequest { @@ -29,6 +31,12 @@ @ApiModelProperty(value = "委托书开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "委托书结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java index b93049e..a0b9a92 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @ApiModel @Data public class CustomerAdviceListRequest { @@ -20,6 +22,13 @@ @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") private String startTime; + + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java index b7897cf..95b7ebe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author cz * @date 2023-02-01 @@ -21,6 +23,12 @@ @ApiModelProperty(value = "业务规模", dataType = "String") private String bussinessSize; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "公司评级", dataType = "String") private String grade; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java index 6c7e8b3..67433bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class CustomerSampleListRequest { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "检定开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "检定结束时间", dataType = "String") private String endTime; 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 11acc4f..9cf2e13 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class OrderListRequest { @@ -29,6 +31,12 @@ @ApiModelProperty(value = "委托书开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "委托书结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java index b93049e..a0b9a92 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @ApiModel @Data public class CustomerAdviceListRequest { @@ -20,6 +22,13 @@ @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") private String startTime; + + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java index b7897cf..95b7ebe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author cz * @date 2023-02-01 @@ -21,6 +23,12 @@ @ApiModelProperty(value = "业务规模", dataType = "String") private String bussinessSize; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "公司评级", dataType = "String") private String grade; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java index 6c7e8b3..67433bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class CustomerSampleListRequest { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "检定开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "检定结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index a7ededa..d23b197 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -27,6 +27,7 @@ private Long id; + @TableField(exist = false) private Long orderId; @ApiModelProperty(value = "样品编号", dataType = "String") 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 11acc4f..9cf2e13 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class OrderListRequest { @@ -29,6 +31,12 @@ @ApiModelProperty(value = "委托书开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "委托书结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java index b93049e..a0b9a92 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @ApiModel @Data public class CustomerAdviceListRequest { @@ -20,6 +22,13 @@ @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") private String startTime; + + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java index b7897cf..95b7ebe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author cz * @date 2023-02-01 @@ -21,6 +23,12 @@ @ApiModelProperty(value = "业务规模", dataType = "String") private String bussinessSize; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "公司评级", dataType = "String") private String grade; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java index 6c7e8b3..67433bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class CustomerSampleListRequest { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "检定开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "检定结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index a7ededa..d23b197 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -27,6 +27,7 @@ private Long id; + @TableField(exist = false) private Long orderId; @ApiModelProperty(value = "样品编号", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java index 455340b..d5bcdbc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -24,6 +24,8 @@ @TableId("id") private Long id; + + /** * 委托书id */ 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 11acc4f..9cf2e13 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class OrderListRequest { @@ -29,6 +31,12 @@ @ApiModelProperty(value = "委托书开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "委托书结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java index b93049e..a0b9a92 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @ApiModel @Data public class CustomerAdviceListRequest { @@ -20,6 +22,13 @@ @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") private String startTime; + + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java index b7897cf..95b7ebe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author cz * @date 2023-02-01 @@ -21,6 +23,12 @@ @ApiModelProperty(value = "业务规模", dataType = "String") private String bussinessSize; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "公司评级", dataType = "String") private String grade; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java index 6c7e8b3..67433bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class CustomerSampleListRequest { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "检定开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "检定结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index a7ededa..d23b197 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -27,6 +27,7 @@ private Long id; + @TableField(exist = false) private Long orderId; @ApiModelProperty(value = "样品编号", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java index 455340b..d5bcdbc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -24,6 +24,8 @@ @TableId("id") private Long id; + + /** * 委托书id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index dfcc97b..e1b7bce 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -24,6 +24,9 @@ @ApiModelProperty(value = "委托方id", dataType = "Long") private Long customerId; + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 11acc4f..9cf2e13 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class OrderListRequest { @@ -29,6 +31,12 @@ @ApiModelProperty(value = "委托书开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "委托书结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java index b93049e..a0b9a92 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @ApiModel @Data public class CustomerAdviceListRequest { @@ -20,6 +22,13 @@ @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") private String startTime; + + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java index b7897cf..95b7ebe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author cz * @date 2023-02-01 @@ -21,6 +23,12 @@ @ApiModelProperty(value = "业务规模", dataType = "String") private String bussinessSize; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "公司评级", dataType = "String") private String grade; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java index 6c7e8b3..67433bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class CustomerSampleListRequest { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "检定开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "检定结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index a7ededa..d23b197 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -27,6 +27,7 @@ private Long id; + @TableField(exist = false) private Long orderId; @ApiModelProperty(value = "样品编号", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java index 455340b..d5bcdbc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -24,6 +24,8 @@ @TableId("id") private Long id; + + /** * 委托书id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index dfcc97b..e1b7bce 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -24,6 +24,9 @@ @ApiModelProperty(value = "委托方id", dataType = "Long") private Long customerId; + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index ea245a5..2e86a7d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -12,9 +12,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.model.business.BusinessInterchange; @@ -25,6 +27,7 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -45,6 +48,7 @@ private final IBaseExportService iBaseExportService; private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; + private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper; //** 送检人查询条件不在设备交接单中，需要联查才可以实现 @Override @@ -107,11 +111,16 @@ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { - Page page = PageFactory.defaultPage(); - page.setCurrent(1); - page.setSearchCount(false); - page.setSize(Integer.MAX_VALUE); - List resultPage = this.baseMapper.selectInterchangeListPage(page, request); + List resultPage; + if (!CollectionUtils.isEmpty(request.getIds())) { + resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds()); + } else { + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + resultPage = this.baseMapper.selectInterchangeListPage(page, request); + } iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName()); } catch (Exception e) { log.error("样品导出出现异常，异常信息为{}", e); 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 11acc4f..9cf2e13 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class OrderListRequest { @@ -29,6 +31,12 @@ @ApiModelProperty(value = "委托书开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "委托书结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java index b93049e..a0b9a92 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @ApiModel @Data public class CustomerAdviceListRequest { @@ -20,6 +22,13 @@ @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") private String startTime; + + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java index b7897cf..95b7ebe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author cz * @date 2023-02-01 @@ -21,6 +23,12 @@ @ApiModelProperty(value = "业务规模", dataType = "String") private String bussinessSize; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "公司评级", dataType = "String") private String grade; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java index 6c7e8b3..67433bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class CustomerSampleListRequest { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "检定开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "检定结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index a7ededa..d23b197 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -27,6 +27,7 @@ private Long id; + @TableField(exist = false) private Long orderId; @ApiModelProperty(value = "样品编号", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java index 455340b..d5bcdbc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -24,6 +24,8 @@ @TableId("id") private Long id; + + /** * 委托书id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index dfcc97b..e1b7bce 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -24,6 +24,9 @@ @ApiModelProperty(value = "委托方id", dataType = "Long") private Long customerId; + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index ea245a5..2e86a7d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -12,9 +12,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.model.business.BusinessInterchange; @@ -25,6 +27,7 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -45,6 +48,7 @@ private final IBaseExportService iBaseExportService; private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; + private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper; //** 送检人查询条件不在设备交接单中，需要联查才可以实现 @Override @@ -107,11 +111,16 @@ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { - Page page = PageFactory.defaultPage(); - page.setCurrent(1); - page.setSearchCount(false); - page.setSize(Integer.MAX_VALUE); - List resultPage = this.baseMapper.selectInterchangeListPage(page, request); + List resultPage; + if (!CollectionUtils.isEmpty(request.getIds())) { + resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds()); + } else { + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + resultPage = this.baseMapper.selectInterchangeListPage(page, request); + } iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName()); } catch (Exception e) { log.error("样品导出出现异常，异常信息为{}", e); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 9848a3b..4c9d57a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.dto.customer.Info.CustomerInfoResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; @@ -28,6 +29,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -109,7 +111,7 @@ ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200"); } - sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "0") > 0; + sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0; } if (updateFlag > 0) { return ReturnUtil.success(); @@ -126,13 +128,13 @@ Integer addFlag = this.baseMapper.insert(businessOrder); Boolean sampleAddFlag = true; this.sampleStatusDeletor(businessOrder.getId()); - this.doSampleListPopution(businessOrder); + this.doSampleListPopulation(businessOrder); for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) { if (sampleInfo.getIsExistSample().equals("0")) { ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200; } - sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "1") > 0; + sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0; } if (addFlag > 0 && sampleAddFlag) { return ReturnUtil.success(); @@ -144,8 +146,13 @@ @Override public void orderExport(OrderListRequest request, HttpServletResponse response) { try { - QueryWrapper wrapper = listParamWrapper(request); - List orderListReponseList = this.orderListReponseMapper.selectList(wrapper); + List orderListReponseList; + if (!CollectionUtils.isEmpty(request.getIds())) { + orderListReponseList = orderListReponseMapper.selectBatchIds(request.getIds()); + } else { + QueryWrapper wrapper = listParamWrapper(request); + orderListReponseList = this.orderListReponseMapper.selectList(wrapper); + } List orderSampleList = sampleRelationMapper.selectList(null); Map> orderSampleMap = orderSampleList.stream().collect( Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId) @@ -193,11 +200,13 @@ queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent()); queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus()); + queryWrapper.eq("is_del",0); queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); queryWrapper.orderByDesc("create_time"); + return queryWrapper; } @@ -208,17 +217,16 @@ return sampleStatus; } - private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) { + private Integer sampleStatusCreator(Long orderId, Long sampleId) { BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation(); sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId); - sampleStatusPopulation.setSampleStatus(status); sampleStatusPopulation.setMeasureType("1"); Integer sampleStatus = this.sampleRelationMapper.insert(sampleStatusPopulation); return sampleStatus; } - private void doSampleListPopution(BusinessOrder businessOrder) { + private void doSampleListPopulation(BusinessOrder businessOrder) { businessOrder.getCustomerSampleInfoList().forEach( customerSampleInfo -> { customerSampleInfo.setOrderId(businessOrder.getId()); 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 11acc4f..9cf2e13 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class OrderListRequest { @@ -29,6 +31,12 @@ @ApiModelProperty(value = "委托书开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "委托书结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java index b93049e..a0b9a92 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @ApiModel @Data public class CustomerAdviceListRequest { @@ -20,6 +22,13 @@ @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") private String startTime; + + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java index b7897cf..95b7ebe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author cz * @date 2023-02-01 @@ -21,6 +23,12 @@ @ApiModelProperty(value = "业务规模", dataType = "String") private String bussinessSize; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "公司评级", dataType = "String") private String grade; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java index 6c7e8b3..67433bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class CustomerSampleListRequest { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "检定开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "检定结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index a7ededa..d23b197 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -27,6 +27,7 @@ private Long id; + @TableField(exist = false) private Long orderId; @ApiModelProperty(value = "样品编号", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java index 455340b..d5bcdbc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -24,6 +24,8 @@ @TableId("id") private Long id; + + /** * 委托书id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index dfcc97b..e1b7bce 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -24,6 +24,9 @@ @ApiModelProperty(value = "委托方id", dataType = "Long") private Long customerId; + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index ea245a5..2e86a7d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -12,9 +12,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.model.business.BusinessInterchange; @@ -25,6 +27,7 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -45,6 +48,7 @@ private final IBaseExportService iBaseExportService; private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; + private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper; //** 送检人查询条件不在设备交接单中，需要联查才可以实现 @Override @@ -107,11 +111,16 @@ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { - Page page = PageFactory.defaultPage(); - page.setCurrent(1); - page.setSearchCount(false); - page.setSize(Integer.MAX_VALUE); - List resultPage = this.baseMapper.selectInterchangeListPage(page, request); + List resultPage; + if (!CollectionUtils.isEmpty(request.getIds())) { + resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds()); + } else { + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + resultPage = this.baseMapper.selectInterchangeListPage(page, request); + } iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName()); } catch (Exception e) { log.error("样品导出出现异常，异常信息为{}", e); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 9848a3b..4c9d57a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.dto.customer.Info.CustomerInfoResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; @@ -28,6 +29,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -109,7 +111,7 @@ ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200"); } - sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "0") > 0; + sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0; } if (updateFlag > 0) { return ReturnUtil.success(); @@ -126,13 +128,13 @@ Integer addFlag = this.baseMapper.insert(businessOrder); Boolean sampleAddFlag = true; this.sampleStatusDeletor(businessOrder.getId()); - this.doSampleListPopution(businessOrder); + this.doSampleListPopulation(businessOrder); for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) { if (sampleInfo.getIsExistSample().equals("0")) { ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200; } - sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "1") > 0; + sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0; } if (addFlag > 0 && sampleAddFlag) { return ReturnUtil.success(); @@ -144,8 +146,13 @@ @Override public void orderExport(OrderListRequest request, HttpServletResponse response) { try { - QueryWrapper wrapper = listParamWrapper(request); - List orderListReponseList = this.orderListReponseMapper.selectList(wrapper); + List orderListReponseList; + if (!CollectionUtils.isEmpty(request.getIds())) { + orderListReponseList = orderListReponseMapper.selectBatchIds(request.getIds()); + } else { + QueryWrapper wrapper = listParamWrapper(request); + orderListReponseList = this.orderListReponseMapper.selectList(wrapper); + } List orderSampleList = sampleRelationMapper.selectList(null); Map> orderSampleMap = orderSampleList.stream().collect( Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId) @@ -193,11 +200,13 @@ queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent()); queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus()); + queryWrapper.eq("is_del",0); queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); queryWrapper.orderByDesc("create_time"); + return queryWrapper; } @@ -208,17 +217,16 @@ return sampleStatus; } - private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) { + private Integer sampleStatusCreator(Long orderId, Long sampleId) { BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation(); sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId); - sampleStatusPopulation.setSampleStatus(status); sampleStatusPopulation.setMeasureType("1"); Integer sampleStatus = this.sampleRelationMapper.insert(sampleStatusPopulation); return sampleStatus; } - private void doSampleListPopution(BusinessOrder businessOrder) { + private void doSampleListPopulation(BusinessOrder businessOrder) { businessOrder.getCustomerSampleInfoList().forEach( customerSampleInfo -> { customerSampleInfo.setOrderId(businessOrder.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 66a414b..556a092 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -29,13 +29,14 @@ @AllArgsConstructor public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService { + private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; //终止、回退、收入、归还、催办按钮 @Override public Page listPage(Page page, DeviceDispatchDTO request) { // Page deviceDispatchVOPage=P // //查询委托书和样品关联表中的各状态的样品 -// Page handOutList = orderSampleRelationMapper.selectSampleListByStatus(page, handOutListRequest); +// Page dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request); // log.info("任务分发-当前查询样品状态为：{}", request.getSampleStatus()); // List records = handOutList.getRecords(); // if(CollectionUtils.isEmpty(records)){ 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 11acc4f..9cf2e13 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class OrderListRequest { @@ -29,6 +31,12 @@ @ApiModelProperty(value = "委托书开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "委托书结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java index b93049e..a0b9a92 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @ApiModel @Data public class CustomerAdviceListRequest { @@ -20,6 +22,13 @@ @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") private String startTime; + + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java index b7897cf..95b7ebe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author cz * @date 2023-02-01 @@ -21,6 +23,12 @@ @ApiModelProperty(value = "业务规模", dataType = "String") private String bussinessSize; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "公司评级", dataType = "String") private String grade; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java index 6c7e8b3..67433bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class CustomerSampleListRequest { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "检定开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "检定结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index a7ededa..d23b197 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -27,6 +27,7 @@ private Long id; + @TableField(exist = false) private Long orderId; @ApiModelProperty(value = "样品编号", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java index 455340b..d5bcdbc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -24,6 +24,8 @@ @TableId("id") private Long id; + + /** * 委托书id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index dfcc97b..e1b7bce 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -24,6 +24,9 @@ @ApiModelProperty(value = "委托方id", dataType = "Long") private Long customerId; + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index ea245a5..2e86a7d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -12,9 +12,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.model.business.BusinessInterchange; @@ -25,6 +27,7 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -45,6 +48,7 @@ private final IBaseExportService iBaseExportService; private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; + private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper; //** 送检人查询条件不在设备交接单中，需要联查才可以实现 @Override @@ -107,11 +111,16 @@ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { - Page page = PageFactory.defaultPage(); - page.setCurrent(1); - page.setSearchCount(false); - page.setSize(Integer.MAX_VALUE); - List resultPage = this.baseMapper.selectInterchangeListPage(page, request); + List resultPage; + if (!CollectionUtils.isEmpty(request.getIds())) { + resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds()); + } else { + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + resultPage = this.baseMapper.selectInterchangeListPage(page, request); + } iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName()); } catch (Exception e) { log.error("样品导出出现异常，异常信息为{}", e); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 9848a3b..4c9d57a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.dto.customer.Info.CustomerInfoResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; @@ -28,6 +29,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -109,7 +111,7 @@ ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200"); } - sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "0") > 0; + sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0; } if (updateFlag > 0) { return ReturnUtil.success(); @@ -126,13 +128,13 @@ Integer addFlag = this.baseMapper.insert(businessOrder); Boolean sampleAddFlag = true; this.sampleStatusDeletor(businessOrder.getId()); - this.doSampleListPopution(businessOrder); + this.doSampleListPopulation(businessOrder); for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) { if (sampleInfo.getIsExistSample().equals("0")) { ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200; } - sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "1") > 0; + sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0; } if (addFlag > 0 && sampleAddFlag) { return ReturnUtil.success(); @@ -144,8 +146,13 @@ @Override public void orderExport(OrderListRequest request, HttpServletResponse response) { try { - QueryWrapper wrapper = listParamWrapper(request); - List orderListReponseList = this.orderListReponseMapper.selectList(wrapper); + List orderListReponseList; + if (!CollectionUtils.isEmpty(request.getIds())) { + orderListReponseList = orderListReponseMapper.selectBatchIds(request.getIds()); + } else { + QueryWrapper wrapper = listParamWrapper(request); + orderListReponseList = this.orderListReponseMapper.selectList(wrapper); + } List orderSampleList = sampleRelationMapper.selectList(null); Map> orderSampleMap = orderSampleList.stream().collect( Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId) @@ -193,11 +200,13 @@ queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent()); queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus()); + queryWrapper.eq("is_del",0); queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); queryWrapper.orderByDesc("create_time"); + return queryWrapper; } @@ -208,17 +217,16 @@ return sampleStatus; } - private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) { + private Integer sampleStatusCreator(Long orderId, Long sampleId) { BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation(); sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId); - sampleStatusPopulation.setSampleStatus(status); sampleStatusPopulation.setMeasureType("1"); Integer sampleStatus = this.sampleRelationMapper.insert(sampleStatusPopulation); return sampleStatus; } - private void doSampleListPopution(BusinessOrder businessOrder) { + private void doSampleListPopulation(BusinessOrder businessOrder) { businessOrder.getCustomerSampleInfoList().forEach( customerSampleInfo -> { customerSampleInfo.setOrderId(businessOrder.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 66a414b..556a092 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -29,13 +29,14 @@ @AllArgsConstructor public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService { + private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; //终止、回退、收入、归还、催办按钮 @Override public Page listPage(Page page, DeviceDispatchDTO request) { // Page deviceDispatchVOPage=P // //查询委托书和样品关联表中的各状态的样品 -// Page handOutList = orderSampleRelationMapper.selectSampleListByStatus(page, handOutListRequest); +// Page dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request); // log.info("任务分发-当前查询样品状态为：{}", request.getSampleStatus()); // List records = handOutList.getRecords(); // if(CollectionUtils.isEmpty(records)){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java index ee04e7b..938d725 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -8,6 +8,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; @@ -20,6 +21,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -79,8 +81,13 @@ @Override public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { try { - QueryWrapper wrapper = listParamWrapper(request); - List customerAdviceList = customerAdviceMapper.selectList(wrapper); + List customerAdviceList; + if (!CollectionUtils.isEmpty(request.getIds())) { + customerAdviceList = customerAdviceMapper.selectBatchIds(request.getIds()); + } else { + QueryWrapper wrapper = listParamWrapper(request); + customerAdviceList = customerAdviceMapper.selectList(wrapper); + } for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) { DictCodeUtils.convertDictCodeToName(customerAdviceInfo); } 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 11acc4f..9cf2e13 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class OrderListRequest { @@ -29,6 +31,12 @@ @ApiModelProperty(value = "委托书开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "委托书结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java index b93049e..a0b9a92 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @ApiModel @Data public class CustomerAdviceListRequest { @@ -20,6 +22,13 @@ @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") private String startTime; + + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java index b7897cf..95b7ebe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author cz * @date 2023-02-01 @@ -21,6 +23,12 @@ @ApiModelProperty(value = "业务规模", dataType = "String") private String bussinessSize; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "公司评级", dataType = "String") private String grade; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java index 6c7e8b3..67433bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class CustomerSampleListRequest { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "检定开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "检定结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index a7ededa..d23b197 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -27,6 +27,7 @@ private Long id; + @TableField(exist = false) private Long orderId; @ApiModelProperty(value = "样品编号", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java index 455340b..d5bcdbc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -24,6 +24,8 @@ @TableId("id") private Long id; + + /** * 委托书id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index dfcc97b..e1b7bce 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -24,6 +24,9 @@ @ApiModelProperty(value = "委托方id", dataType = "Long") private Long customerId; + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index ea245a5..2e86a7d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -12,9 +12,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.model.business.BusinessInterchange; @@ -25,6 +27,7 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -45,6 +48,7 @@ private final IBaseExportService iBaseExportService; private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; + private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper; //** 送检人查询条件不在设备交接单中，需要联查才可以实现 @Override @@ -107,11 +111,16 @@ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { - Page page = PageFactory.defaultPage(); - page.setCurrent(1); - page.setSearchCount(false); - page.setSize(Integer.MAX_VALUE); - List resultPage = this.baseMapper.selectInterchangeListPage(page, request); + List resultPage; + if (!CollectionUtils.isEmpty(request.getIds())) { + resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds()); + } else { + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + resultPage = this.baseMapper.selectInterchangeListPage(page, request); + } iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName()); } catch (Exception e) { log.error("样品导出出现异常，异常信息为{}", e); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 9848a3b..4c9d57a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.dto.customer.Info.CustomerInfoResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; @@ -28,6 +29,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -109,7 +111,7 @@ ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200"); } - sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "0") > 0; + sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0; } if (updateFlag > 0) { return ReturnUtil.success(); @@ -126,13 +128,13 @@ Integer addFlag = this.baseMapper.insert(businessOrder); Boolean sampleAddFlag = true; this.sampleStatusDeletor(businessOrder.getId()); - this.doSampleListPopution(businessOrder); + this.doSampleListPopulation(businessOrder); for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) { if (sampleInfo.getIsExistSample().equals("0")) { ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200; } - sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "1") > 0; + sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0; } if (addFlag > 0 && sampleAddFlag) { return ReturnUtil.success(); @@ -144,8 +146,13 @@ @Override public void orderExport(OrderListRequest request, HttpServletResponse response) { try { - QueryWrapper wrapper = listParamWrapper(request); - List orderListReponseList = this.orderListReponseMapper.selectList(wrapper); + List orderListReponseList; + if (!CollectionUtils.isEmpty(request.getIds())) { + orderListReponseList = orderListReponseMapper.selectBatchIds(request.getIds()); + } else { + QueryWrapper wrapper = listParamWrapper(request); + orderListReponseList = this.orderListReponseMapper.selectList(wrapper); + } List orderSampleList = sampleRelationMapper.selectList(null); Map> orderSampleMap = orderSampleList.stream().collect( Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId) @@ -193,11 +200,13 @@ queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent()); queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus()); + queryWrapper.eq("is_del",0); queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); queryWrapper.orderByDesc("create_time"); + return queryWrapper; } @@ -208,17 +217,16 @@ return sampleStatus; } - private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) { + private Integer sampleStatusCreator(Long orderId, Long sampleId) { BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation(); sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId); - sampleStatusPopulation.setSampleStatus(status); sampleStatusPopulation.setMeasureType("1"); Integer sampleStatus = this.sampleRelationMapper.insert(sampleStatusPopulation); return sampleStatus; } - private void doSampleListPopution(BusinessOrder businessOrder) { + private void doSampleListPopulation(BusinessOrder businessOrder) { businessOrder.getCustomerSampleInfoList().forEach( customerSampleInfo -> { customerSampleInfo.setOrderId(businessOrder.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 66a414b..556a092 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -29,13 +29,14 @@ @AllArgsConstructor public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService { + private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; //终止、回退、收入、归还、催办按钮 @Override public Page listPage(Page page, DeviceDispatchDTO request) { // Page deviceDispatchVOPage=P // //查询委托书和样品关联表中的各状态的样品 -// Page handOutList = orderSampleRelationMapper.selectSampleListByStatus(page, handOutListRequest); +// Page dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request); // log.info("任务分发-当前查询样品状态为：{}", request.getSampleStatus()); // List records = handOutList.getRecords(); // if(CollectionUtils.isEmpty(records)){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java index ee04e7b..938d725 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -8,6 +8,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; @@ -20,6 +21,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -79,8 +81,13 @@ @Override public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { try { - QueryWrapper wrapper = listParamWrapper(request); - List customerAdviceList = customerAdviceMapper.selectList(wrapper); + List customerAdviceList; + if (!CollectionUtils.isEmpty(request.getIds())) { + customerAdviceList = customerAdviceMapper.selectBatchIds(request.getIds()); + } else { + QueryWrapper wrapper = listParamWrapper(request); + customerAdviceList = customerAdviceMapper.selectList(wrapper); + } for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) { DictCodeUtils.convertDictCodeToName(customerAdviceInfo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java index dec41f1..c4f6cb8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -30,6 +30,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import javax.servlet.http.HttpServletResponse; @@ -53,11 +54,13 @@ QueryWrapper wrapper = listParamWrapper(request); Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); customerSamplePage.getRecords().stream() - .forEach(customerSample ->{ - BusinessOrderSampleRelation businessOrderSampleRelation=this.getSampleStatusById(customerSample.getId()); - customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); - customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); - }); + .forEach(customerSample -> { + BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId()); + if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { + customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); + customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + } + }); for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) { if (!StringUtils.isEmpty(customerSampleListResponse.getSampleSatus())) { DictCodeUtils.convertDictCodeToName(customerSampleListResponse); @@ -99,23 +102,33 @@ } /** - * 只导出样品列表信息 + * 只导出样品列表信息 + * * @param request * @param response */ @Override public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { try { - QueryWrapper wrapper = listParamWrapper(request); - List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + List customerSampleList; List businessOrderList = sampleRelationMapper.selectList(null); - Map businessOrderMap = businessOrderList.stream() - .collect(Collectors.toMap(e -> String.valueOf(e.getOrderId() + e.getSampleId()), BusinessOrderSampleRelation::getSampleStatus)); + Map businessOrderMap = businessOrderList.stream() + .collect(Collectors.toMap(e -> e.getSampleId(),e->e, + ( value1,value2) ->value1)); + if (!CollectionUtils.isEmpty(request.getIds())) { + customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds()); + } else { + QueryWrapper wrapper = listParamWrapper(request); + customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + } customerSampleList.stream().filter(customerSample -> !ObjectUtils.isEmpty(customerSample.getOrderId())) .forEach( customerSample -> { - String orderSampleIdKey = String.valueOf(customerSample.getOrderId() + customerSample.getId()); - customerSample.setSampleSatus(businessOrderMap.containsKey(orderSampleIdKey) ? businessOrderMap.get(orderSampleIdKey) : ""); + BusinessOrderSampleRelation businessOrderSampleRelation = businessOrderMap.get(customerSample.getId()); + if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { + customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); + customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + } } ); for (CustomerSampleListResponse customerSampleListResponse : customerSampleList) { @@ -161,7 +174,7 @@ .orderByDesc("create_time"); List orderSampleList = sampleRelationMapper.selectList(wrapper); Optional orderSampleOptional = orderSampleList.stream().findFirst(); - return orderSampleOptional.isPresent() ? orderSampleOptional.get(): null; + return orderSampleOptional.isPresent() ? orderSampleOptional.get() : null; } private void initSample(CustomerSampleInfo customerSampleInfo) { 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 a7cc37b..dc5e97a 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 @@ -36,6 +36,10 @@ private IBusinessDispatchService bizDispatchService; + /** + * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮 + * 这些是列表实现的详细点 + */ @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception { @@ -46,12 +50,18 @@ return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request))); } + /** + * 列表的导出 + */ @ApiOperation("样品导出") @PostMapping("/export") - public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){ + public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) { bizDispatchService.exportSampleDispatchList(request, response); } + /** + * 手动收入 + */ @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)") @PostMapping("/receive") public ReturnDTO receiveDevice(@RequestBody @Valid IdDTO idDTO) { @@ -61,6 +71,9 @@ return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId())); } + /** + * 直接回填状态即可 + */ @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)") @PostMapping("/back") public ReturnDTO backDevice(@RequestBody @Valid IdDTO idDTO) { @@ -70,6 +83,9 @@ return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId())); } + /** + * 设备终止，同时要进行终止原因的回填 + */ @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)") @PostMapping("/terminate") public ReturnDTO forcedTerminate(@RequestBody @Valid IdDTO idDTO) { @@ -79,7 +95,9 @@ return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId())); } - + /** + * 催办会产生催办消息，对相关操作人员进行消息提示 + */ @ApiOperation("催办") @PostMapping("/rushDoProcess") public ReturnDTO rushDoProcess(@RequestBody @Valid IdDTO idDTO) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java index e838f36..18ab69f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java @@ -131,7 +131,7 @@ String id = String.valueOf(idMap.get("id")); assigneeList.add(id); } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) { - //发起人自选审批人(需求暂无此功能) + // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能) } else if (AssigneeSetTypeEnum.SELF == settype) { //启动流程时设置的发起人全局变量 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java new file mode 100644 index 0000000..94db1cc --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java @@ -0,0 +1,7 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; + +public interface BusinessInterchangeListResponseMapper extends BaseMapper { +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0a411d2..2730c9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -35,41 +35,37 @@ id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time - + SELECT deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime FROM ( - SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName", - deliverer,deliver_time AS "deliverTime",remark - FROM business_interchange bi + SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime" + FROM business_interchange WHERE is_del = 0 - - AND interchange_Code=#{request.interchangeCode} - - - AND customer_Code=#{request.customerCode} - - - AND customer_name=#{request.customerName} - - - AND deliverer=#{request.reciever} - - - AND deliver_time=#{request.deliverTime} - - - AND deliver_time=#{request.deliverTime} - + + AND interchange_Code=#{request.interchangeCode} + + + AND reciever=#{request.reciever} + + + AND deliver_time=#{request.deliverTime} + ) bif JOIN ( - SELECT deliverer - FROM business_order - WHERE is_del = 0 - - AND deliverer=#{request.deliverer} - - ) bo ON bo.id = bif.customer_id - ORDER bif.deliver_time DESC + SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId" + FROM business_order + WHERE is_del = 0 + + AND deliverer=#{request.deliverer} + + + AND customer_no=#{request.customerNo} + + + AND customer_name=#{request.customerName} + + ) bo ON bo.orderId = bif.order_id + ORDER BY bo.deliverTime DESC - - diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index 37cb067..fd355a3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class InterchangeListRequest { @@ -13,7 +15,7 @@ private String interchangeCode; @ApiModelProperty(value = "委托方代码", dataType = "String") - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; @@ -24,6 +26,12 @@ @ApiModelProperty(value = "送检人", dataType = "String") private String deliverer; //委托书中自带 + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "交接时间", dataType = "String") private String deliverTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index 5ecdc6f..dced92e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -30,7 +30,7 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) - private String customerCode; + private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index ba919d3..7ae7005 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -62,7 +62,7 @@ @TableField(exist = false) @ApiModelProperty(value = "接收状态名称", dataType = "String") @ExcelProperty(value = "接收状态名称",order = 7) - private Integer statusName; + private String statusName; @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间",order = 8) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 11acc4f..9cf2e13 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class OrderListRequest { @@ -29,6 +31,12 @@ @ApiModelProperty(value = "委托书开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "委托书结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java index b93049e..a0b9a92 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @ApiModel @Data public class CustomerAdviceListRequest { @@ -20,6 +22,13 @@ @ApiModelProperty(value = "投诉查询开始时间", dataType = "String") private String startTime; + + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "投诉查询结束时间", dataType = "String") private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java index b7897cf..95b7ebe 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author cz * @date 2023-02-01 @@ -21,6 +23,12 @@ @ApiModelProperty(value = "业务规模", dataType = "String") private String bussinessSize; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "公司评级", dataType = "String") private String grade; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java index 6c7e8b3..67433bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data @ApiModel public class CustomerSampleListRequest { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "检定开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "检定结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index a7ededa..d23b197 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -27,6 +27,7 @@ private Long id; + @TableField(exist = false) private Long orderId; @ApiModelProperty(value = "样品编号", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java index 455340b..d5bcdbc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -24,6 +24,8 @@ @TableId("id") private Long id; + + /** * 委托书id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index dfcc97b..e1b7bce 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -24,6 +24,9 @@ @ApiModelProperty(value = "委托方id", dataType = "Long") private Long customerId; + @ApiModelProperty(value = "委托方代码", dataType = "String") + private String customerNo; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index ea245a5..2e86a7d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -12,9 +12,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.model.business.BusinessInterchange; @@ -25,6 +27,7 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -45,6 +48,7 @@ private final IBaseExportService iBaseExportService; private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; + private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper; //** 送检人查询条件不在设备交接单中，需要联查才可以实现 @Override @@ -107,11 +111,16 @@ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { - Page page = PageFactory.defaultPage(); - page.setCurrent(1); - page.setSearchCount(false); - page.setSize(Integer.MAX_VALUE); - List resultPage = this.baseMapper.selectInterchangeListPage(page, request); + List resultPage; + if (!CollectionUtils.isEmpty(request.getIds())) { + resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds()); + } else { + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + resultPage = this.baseMapper.selectInterchangeListPage(page, request); + } iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName()); } catch (Exception e) { log.error("样品导出出现异常，异常信息为{}", e); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 9848a3b..4c9d57a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; +import com.casic.missiles.dto.customer.Info.CustomerInfoResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; @@ -28,6 +29,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -109,7 +111,7 @@ ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200"); } - sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "0") > 0; + sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0; } if (updateFlag > 0) { return ReturnUtil.success(); @@ -126,13 +128,13 @@ Integer addFlag = this.baseMapper.insert(businessOrder); Boolean sampleAddFlag = true; this.sampleStatusDeletor(businessOrder.getId()); - this.doSampleListPopution(businessOrder); + this.doSampleListPopulation(businessOrder); for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) { if (sampleInfo.getIsExistSample().equals("0")) { ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200; } - sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "1") > 0; + sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0; } if (addFlag > 0 && sampleAddFlag) { return ReturnUtil.success(); @@ -144,8 +146,13 @@ @Override public void orderExport(OrderListRequest request, HttpServletResponse response) { try { - QueryWrapper wrapper = listParamWrapper(request); - List orderListReponseList = this.orderListReponseMapper.selectList(wrapper); + List orderListReponseList; + if (!CollectionUtils.isEmpty(request.getIds())) { + orderListReponseList = orderListReponseMapper.selectBatchIds(request.getIds()); + } else { + QueryWrapper wrapper = listParamWrapper(request); + orderListReponseList = this.orderListReponseMapper.selectList(wrapper); + } List orderSampleList = sampleRelationMapper.selectList(null); Map> orderSampleMap = orderSampleList.stream().collect( Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId) @@ -193,11 +200,13 @@ queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent()); queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus()); + queryWrapper.eq("is_del",0); queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime()); queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()), "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime()); queryWrapper.orderByDesc("create_time"); + return queryWrapper; } @@ -208,17 +217,16 @@ return sampleStatus; } - private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) { + private Integer sampleStatusCreator(Long orderId, Long sampleId) { BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation(); sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId); - sampleStatusPopulation.setSampleStatus(status); sampleStatusPopulation.setMeasureType("1"); Integer sampleStatus = this.sampleRelationMapper.insert(sampleStatusPopulation); return sampleStatus; } - private void doSampleListPopution(BusinessOrder businessOrder) { + private void doSampleListPopulation(BusinessOrder businessOrder) { businessOrder.getCustomerSampleInfoList().forEach( customerSampleInfo -> { customerSampleInfo.setOrderId(businessOrder.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 66a414b..556a092 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -29,13 +29,14 @@ @AllArgsConstructor public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService { + private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; //终止、回退、收入、归还、催办按钮 @Override public Page listPage(Page page, DeviceDispatchDTO request) { // Page deviceDispatchVOPage=P // //查询委托书和样品关联表中的各状态的样品 -// Page handOutList = orderSampleRelationMapper.selectSampleListByStatus(page, handOutListRequest); +// Page dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request); // log.info("任务分发-当前查询样品状态为：{}", request.getSampleStatus()); // List records = handOutList.getRecords(); // if(CollectionUtils.isEmpty(records)){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java index ee04e7b..938d725 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -8,6 +8,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; +import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; @@ -20,6 +21,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -79,8 +81,13 @@ @Override public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) { try { - QueryWrapper wrapper = listParamWrapper(request); - List customerAdviceList = customerAdviceMapper.selectList(wrapper); + List customerAdviceList; + if (!CollectionUtils.isEmpty(request.getIds())) { + customerAdviceList = customerAdviceMapper.selectBatchIds(request.getIds()); + } else { + QueryWrapper wrapper = listParamWrapper(request); + customerAdviceList = customerAdviceMapper.selectList(wrapper); + } for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) { DictCodeUtils.convertDictCodeToName(customerAdviceInfo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java index dec41f1..c4f6cb8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -30,6 +30,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import javax.servlet.http.HttpServletResponse; @@ -53,11 +54,13 @@ QueryWrapper wrapper = listParamWrapper(request); Page customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper); customerSamplePage.getRecords().stream() - .forEach(customerSample ->{ - BusinessOrderSampleRelation businessOrderSampleRelation=this.getSampleStatusById(customerSample.getId()); - customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); - customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); - }); + .forEach(customerSample -> { + BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId()); + if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { + customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); + customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + } + }); for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) { if (!StringUtils.isEmpty(customerSampleListResponse.getSampleSatus())) { DictCodeUtils.convertDictCodeToName(customerSampleListResponse); @@ -99,23 +102,33 @@ } /** - * 只导出样品列表信息 + * 只导出样品列表信息 + * * @param request * @param response */ @Override public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { try { - QueryWrapper wrapper = listParamWrapper(request); - List customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + List customerSampleList; List businessOrderList = sampleRelationMapper.selectList(null); - Map businessOrderMap = businessOrderList.stream() - .collect(Collectors.toMap(e -> String.valueOf(e.getOrderId() + e.getSampleId()), BusinessOrderSampleRelation::getSampleStatus)); + Map businessOrderMap = businessOrderList.stream() + .collect(Collectors.toMap(e -> e.getSampleId(),e->e, + ( value1,value2) ->value1)); + if (!CollectionUtils.isEmpty(request.getIds())) { + customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds()); + } else { + QueryWrapper wrapper = listParamWrapper(request); + customerSampleList = customerSampleListResponseMapper.selectList(wrapper); + } customerSampleList.stream().filter(customerSample -> !ObjectUtils.isEmpty(customerSample.getOrderId())) .forEach( customerSample -> { - String orderSampleIdKey = String.valueOf(customerSample.getOrderId() + customerSample.getId()); - customerSample.setSampleSatus(businessOrderMap.containsKey(orderSampleIdKey) ? businessOrderMap.get(orderSampleIdKey) : ""); + BusinessOrderSampleRelation businessOrderSampleRelation = businessOrderMap.get(customerSample.getId()); + if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { + customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); + customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + } } ); for (CustomerSampleListResponse customerSampleListResponse : customerSampleList) { @@ -161,7 +174,7 @@ .orderByDesc("create_time"); List orderSampleList = sampleRelationMapper.selectList(wrapper); Optional orderSampleOptional = orderSampleList.stream().findFirst(); - return orderSampleOptional.isPresent() ? orderSampleOptional.get(): null; + return orderSampleOptional.isPresent() ? orderSampleOptional.get() : null; } private void initSample(CustomerSampleInfo customerSampleInfo) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java index 6b05b67..45b17dc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -20,6 +20,7 @@ import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper; import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper; +import com.casic.missiles.model.customer.CustomerAdviceInfo; import com.casic.missiles.model.customer.CustomerInfo; import com.casic.missiles.model.customer.CustomerUserInfo; import com.casic.missiles.service.customer.CustomerService; @@ -30,6 +31,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -133,8 +135,13 @@ @Override public void customerExport(CustomerListRequest request, HttpServletResponse response) { try { - QueryWrapper wrapper = listParamWrapper(request); - List customerInfoList =customerInfoResponseMapper.selectList(wrapper); + List customerInfoList; + if (!CollectionUtils.isEmpty(request.getIds())) { + customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds()); + } else { + QueryWrapper wrapper = listParamWrapper(request); + customerInfoList =customerInfoResponseMapper.selectList(wrapper); + } for (CustomerInfoResponse customerInfo : customerInfoList) { DictCodeUtils.convertDictCodeToName(customerInfo); }