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 55de92e..9f0694f 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 @@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Collections; import java.util.List; import java.util.Objects; @@ -44,7 +43,7 @@ /** * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外,还需覆盖所有按钮的权限操作,终止、回退、收入、归还、催办按钮 */ - @ApiOperation("设备列表-分页") + @ApiOperation("设备收发列表-分页") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { 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 55de92e..9f0694f 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 @@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Collections; import java.util.List; import java.util.Objects; @@ -44,7 +43,7 @@ /** * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外,还需覆盖所有按钮的权限操作,终止、回退、收入、归还、催办按钮 */ - @ApiOperation("设备列表-分页") + @ApiOperation("设备收发列表-分页") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java index a0b2841..2ec89ec 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java @@ -44,7 +44,7 @@ @Autowired private IBusinessOutsourceProjectService projectService; - @ApiOperation("分包项目验收审批列表(分页)") + @ApiOperation("分包项目验收审批列表及详情(分页)") @PostMapping("/approval/listPage") public ReturnDTO> approvalListPage(@RequestBody @Valid OutsourceProjectApprovalListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { 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 55de92e..9f0694f 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 @@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Collections; import java.util.List; import java.util.Objects; @@ -44,7 +43,7 @@ /** * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外,还需覆盖所有按钮的权限操作,终止、回退、收入、归还、催办按钮 */ - @ApiOperation("设备列表-分页") + @ApiOperation("设备收发列表-分页") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java index a0b2841..2ec89ec 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java @@ -44,7 +44,7 @@ @Autowired private IBusinessOutsourceProjectService projectService; - @ApiOperation("分包项目验收审批列表(分页)") + @ApiOperation("分包项目验收审批列表及详情(分页)") @PostMapping("/approval/listPage") public ReturnDTO> approvalListPage(@RequestBody @Valid OutsourceProjectApprovalListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index 500d9b0..a248ae9 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -98,6 +98,7 @@ AND csi.sample_belong = #{request.sampleBelong} ) csi ON csi.id = bosr.sample_id + ORDER BY bosr.create_time 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 55de92e..9f0694f 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 @@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Collections; import java.util.List; import java.util.Objects; @@ -44,7 +43,7 @@ /** * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外,还需覆盖所有按钮的权限操作,终止、回退、收入、归还、催办按钮 */ - @ApiOperation("设备列表-分页") + @ApiOperation("设备收发列表-分页") @PostMapping("/listPage") public ReturnDTO> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) { Assert.isFalse(bindingResult.hasErrors(), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java index a0b2841..2ec89ec 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java @@ -44,7 +44,7 @@ @Autowired private IBusinessOutsourceProjectService projectService; - @ApiOperation("分包项目验收审批列表(分页)") + @ApiOperation("分包项目验收审批列表及详情(分页)") @PostMapping("/approval/listPage") public ReturnDTO> approvalListPage(@RequestBody @Valid OutsourceProjectApprovalListRequest request, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index 500d9b0..a248ae9 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -98,6 +98,7 @@ AND csi.sample_belong = #{request.sampleBelong} ) csi ON csi.id = bosr.sample_id + ORDER BY bosr.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml index 1d525eb..fbbb2e2 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml @@ -63,6 +63,12 @@ and bop.applicant_time <= #{request.applicantEndTime} + + and bop.check_time >= #{request.checkStartTime} + + + and bop.check_time <= #{request.checkEndTime} + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml index 1d525eb..fbbb2e2 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml @@ -63,6 +63,12 @@ and bop.applicant_time <= #{request.applicantEndTime} + + and bop.check_time >= #{request.checkStartTime} + + + and bop.check_time <= #{request.checkEndTime} + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml index 1d525eb..fbbb2e2 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml @@ -63,6 +63,12 @@ and bop.applicant_time <= #{request.applicantEndTime} + + and bop.check_time >= #{request.checkStartTime} + + + and bop.check_time <= #{request.checkEndTime} +