diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 84d8a69..f1e8263 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -15,7 +15,6 @@ import com.casic.missiles.dto.business.print.CertificatePrintDetail; import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; -import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -64,9 +63,6 @@ return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书详情") @PostMapping("/detail") public ReturnDTO certificatePrintDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { @@ -76,10 +72,6 @@ return ReturnUtil.success(certificatePrintService.certificatePrintDetail(idDTO.getId())); } - - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书打印导出") @PostMapping("/export") public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { @@ -96,9 +88,6 @@ return certificatePrintService.certificatePrintStatus(idDTO.getId(),"2"); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书审批-同意") @PostMapping("/agree") public ReturnDTO agreeAgainPrint(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 84d8a69..f1e8263 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -15,7 +15,6 @@ import com.casic.missiles.dto.business.print.CertificatePrintDetail; import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; -import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -64,9 +63,6 @@ return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书详情") @PostMapping("/detail") public ReturnDTO certificatePrintDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { @@ -76,10 +72,6 @@ return ReturnUtil.success(certificatePrintService.certificatePrintDetail(idDTO.getId())); } - - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书打印导出") @PostMapping("/export") public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { @@ -96,9 +88,6 @@ return certificatePrintService.certificatePrintStatus(idDTO.getId(),"2"); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书审批-同意") @PostMapping("/agree") public ReturnDTO agreeAgainPrint(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 59f60ea..114283e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -17,7 +17,6 @@ import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificateReportService; -import com.casic.missiles.service.customer.CustomerSampleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; @@ -45,8 +44,6 @@ public class BusinessCertificateReportController extends ExportController { @Resource private IBusinessCertificateReportService certificateReportService; - @Resource - private CustomerSampleService customerSampleService; @ApiOperation("证书报告记录导出") @PostMapping("/listExport") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 84d8a69..f1e8263 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -15,7 +15,6 @@ import com.casic.missiles.dto.business.print.CertificatePrintDetail; import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; -import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -64,9 +63,6 @@ return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书详情") @PostMapping("/detail") public ReturnDTO certificatePrintDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { @@ -76,10 +72,6 @@ return ReturnUtil.success(certificatePrintService.certificatePrintDetail(idDTO.getId())); } - - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书打印导出") @PostMapping("/export") public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { @@ -96,9 +88,6 @@ return certificatePrintService.certificatePrintStatus(idDTO.getId(),"2"); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书审批-同意") @PostMapping("/agree") public ReturnDTO agreeAgainPrint(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 59f60ea..114283e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -17,7 +17,6 @@ import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificateReportService; -import com.casic.missiles.service.customer.CustomerSampleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; @@ -45,8 +44,6 @@ public class BusinessCertificateReportController extends ExportController { @Resource private IBusinessCertificateReportService certificateReportService; - @Resource - private CustomerSampleService customerSampleService; @ApiOperation("证书报告记录导出") @PostMapping("/listExport") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java index d97e701..232f065 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java @@ -9,6 +9,7 @@ import com.casic.missiles.dto.business.workbench.SampleMeasureChartResponse; import com.casic.missiles.dto.business.workbench.SampleMeasureResponse; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; +import com.casic.missiles.dto.business.workbench.SampleStatusMonthResponse; import com.casic.missiles.service.business.BusinessWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -60,4 +61,21 @@ return ReturnUtil.success(workbenchService.sampleMeasureChart()); } + /** + * 证书报告，调用证书报告中列表接口 + */ + + /** + * 实时工作统计，调用业务看板中实时工作统计接口 + */ + + /** + * 本月样品状态 + */ + @ApiOperation("本月样品状态") + @GetMapping("/sample/status/month") + public ReturnDTO> sampleStatusMonth() throws Exception { + return ReturnUtil.success(workbenchService.sampleStatusMonth()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 84d8a69..f1e8263 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -15,7 +15,6 @@ import com.casic.missiles.dto.business.print.CertificatePrintDetail; import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; -import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -64,9 +63,6 @@ return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书详情") @PostMapping("/detail") public ReturnDTO certificatePrintDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { @@ -76,10 +72,6 @@ return ReturnUtil.success(certificatePrintService.certificatePrintDetail(idDTO.getId())); } - - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书打印导出") @PostMapping("/export") public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { @@ -96,9 +88,6 @@ return certificatePrintService.certificatePrintStatus(idDTO.getId(),"2"); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书审批-同意") @PostMapping("/agree") public ReturnDTO agreeAgainPrint(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 59f60ea..114283e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -17,7 +17,6 @@ import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificateReportService; -import com.casic.missiles.service.customer.CustomerSampleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; @@ -45,8 +44,6 @@ public class BusinessCertificateReportController extends ExportController { @Resource private IBusinessCertificateReportService certificateReportService; - @Resource - private CustomerSampleService customerSampleService; @ApiOperation("证书报告记录导出") @PostMapping("/listExport") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java index d97e701..232f065 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java @@ -9,6 +9,7 @@ import com.casic.missiles.dto.business.workbench.SampleMeasureChartResponse; import com.casic.missiles.dto.business.workbench.SampleMeasureResponse; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; +import com.casic.missiles.dto.business.workbench.SampleStatusMonthResponse; import com.casic.missiles.service.business.BusinessWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -60,4 +61,21 @@ return ReturnUtil.success(workbenchService.sampleMeasureChart()); } + /** + * 证书报告，调用证书报告中列表接口 + */ + + /** + * 实时工作统计，调用业务看板中实时工作统计接口 + */ + + /** + * 本月样品状态 + */ + @ApiOperation("本月样品状态") + @GetMapping("/sample/status/month") + public ReturnDTO> sampleStatusMonth() throws Exception { + return ReturnUtil.success(workbenchService.sampleStatusMonth()); + } + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java index 41031ea..79944a2 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -52,4 +52,8 @@ OrderSampleDTO selectIdBySampleNo(@Param("sampleNo") String sampleNo); Page selectSampleMonitorListByStatus(Page page, @Param("status") String status); + + Page getSampleListByStatusMonth(Page page, @Param("request") DeviceDispatchDTO request); + + Page selectSampleListByStatusMonth(Page handOutPage, @Param("request") SampleHandOutListRequest request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 84d8a69..f1e8263 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -15,7 +15,6 @@ import com.casic.missiles.dto.business.print.CertificatePrintDetail; import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; -import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -64,9 +63,6 @@ return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书详情") @PostMapping("/detail") public ReturnDTO certificatePrintDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { @@ -76,10 +72,6 @@ return ReturnUtil.success(certificatePrintService.certificatePrintDetail(idDTO.getId())); } - - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书打印导出") @PostMapping("/export") public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { @@ -96,9 +88,6 @@ return certificatePrintService.certificatePrintStatus(idDTO.getId(),"2"); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书审批-同意") @PostMapping("/agree") public ReturnDTO agreeAgainPrint(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 59f60ea..114283e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -17,7 +17,6 @@ import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificateReportService; -import com.casic.missiles.service.customer.CustomerSampleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; @@ -45,8 +44,6 @@ public class BusinessCertificateReportController extends ExportController { @Resource private IBusinessCertificateReportService certificateReportService; - @Resource - private CustomerSampleService customerSampleService; @ApiOperation("证书报告记录导出") @PostMapping("/listExport") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java index d97e701..232f065 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java @@ -9,6 +9,7 @@ import com.casic.missiles.dto.business.workbench.SampleMeasureChartResponse; import com.casic.missiles.dto.business.workbench.SampleMeasureResponse; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; +import com.casic.missiles.dto.business.workbench.SampleStatusMonthResponse; import com.casic.missiles.service.business.BusinessWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -60,4 +61,21 @@ return ReturnUtil.success(workbenchService.sampleMeasureChart()); } + /** + * 证书报告，调用证书报告中列表接口 + */ + + /** + * 实时工作统计，调用业务看板中实时工作统计接口 + */ + + /** + * 本月样品状态 + */ + @ApiOperation("本月样品状态") + @GetMapping("/sample/status/month") + public ReturnDTO> sampleStatusMonth() throws Exception { + return ReturnUtil.success(workbenchService.sampleStatusMonth()); + } + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java index 41031ea..79944a2 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -52,4 +52,8 @@ OrderSampleDTO selectIdBySampleNo(@Param("sampleNo") String sampleNo); Page selectSampleMonitorListByStatus(Page page, @Param("status") String status); + + Page getSampleListByStatusMonth(Page page, @Param("request") DeviceDispatchDTO request); + + Page selectSampleListByStatusMonth(Page handOutPage, @Param("request") SampleHandOutListRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 5d2c2b1..688360e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -211,6 +211,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -220,6 +221,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_person_id = #{userId} AND blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -229,6 +231,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -239,6 +242,7 @@ JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL AND blei.measure_status IN (2,3,4) + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') GROUP BY blei.measure_status diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 84d8a69..f1e8263 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -15,7 +15,6 @@ import com.casic.missiles.dto.business.print.CertificatePrintDetail; import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; -import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -64,9 +63,6 @@ return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书详情") @PostMapping("/detail") public ReturnDTO certificatePrintDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { @@ -76,10 +72,6 @@ return ReturnUtil.success(certificatePrintService.certificatePrintDetail(idDTO.getId())); } - - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书打印导出") @PostMapping("/export") public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { @@ -96,9 +88,6 @@ return certificatePrintService.certificatePrintStatus(idDTO.getId(),"2"); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书审批-同意") @PostMapping("/agree") public ReturnDTO agreeAgainPrint(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 59f60ea..114283e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -17,7 +17,6 @@ import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificateReportService; -import com.casic.missiles.service.customer.CustomerSampleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; @@ -45,8 +44,6 @@ public class BusinessCertificateReportController extends ExportController { @Resource private IBusinessCertificateReportService certificateReportService; - @Resource - private CustomerSampleService customerSampleService; @ApiOperation("证书报告记录导出") @PostMapping("/listExport") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java index d97e701..232f065 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java @@ -9,6 +9,7 @@ import com.casic.missiles.dto.business.workbench.SampleMeasureChartResponse; import com.casic.missiles.dto.business.workbench.SampleMeasureResponse; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; +import com.casic.missiles.dto.business.workbench.SampleStatusMonthResponse; import com.casic.missiles.service.business.BusinessWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -60,4 +61,21 @@ return ReturnUtil.success(workbenchService.sampleMeasureChart()); } + /** + * 证书报告，调用证书报告中列表接口 + */ + + /** + * 实时工作统计，调用业务看板中实时工作统计接口 + */ + + /** + * 本月样品状态 + */ + @ApiOperation("本月样品状态") + @GetMapping("/sample/status/month") + public ReturnDTO> sampleStatusMonth() throws Exception { + return ReturnUtil.success(workbenchService.sampleStatusMonth()); + } + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java index 41031ea..79944a2 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -52,4 +52,8 @@ OrderSampleDTO selectIdBySampleNo(@Param("sampleNo") String sampleNo); Page selectSampleMonitorListByStatus(Page page, @Param("status") String status); + + Page getSampleListByStatusMonth(Page page, @Param("request") DeviceDispatchDTO request); + + Page selectSampleListByStatusMonth(Page handOutPage, @Param("request") SampleHandOutListRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 5d2c2b1..688360e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -211,6 +211,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -220,6 +221,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_person_id = #{userId} AND blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -229,6 +231,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -239,6 +242,7 @@ JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL AND blei.measure_status IN (2,3,4) + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') GROUP BY blei.measure_status 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 f3bfe90..500d9b0 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -32,12 +32,11 @@ + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index 84d8a69..f1e8263 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -15,7 +15,6 @@ import com.casic.missiles.dto.business.print.CertificatePrintDetail; import com.casic.missiles.dto.business.print.CertificateRefusePrintRequest; import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; -import com.casic.missiles.dto.flowable.ApprovalRefuseRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -64,9 +63,6 @@ return ReturnUtil.success(super.packForBT(certificatePrintService.certificatePrintListPage(request, page))); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书详情") @PostMapping("/detail") public ReturnDTO certificatePrintDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { @@ -76,10 +72,6 @@ return ReturnUtil.success(certificatePrintService.certificatePrintDetail(idDTO.getId())); } - - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书打印导出") @PostMapping("/export") public void certificatePrintExport(@RequestBody @Valid CertificateListRequest request, HttpServletResponse response) throws Exception { @@ -96,9 +88,6 @@ return certificatePrintService.certificatePrintStatus(idDTO.getId(),"2"); } - /** - * 证书打印列表，除了基本的列表的信息，需要判断证书打印审批中的状态，进而达到权限的控制 - */ @ApiOperation("证书审批-同意") @PostMapping("/agree") public ReturnDTO agreeAgainPrint(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index 59f60ea..114283e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -17,7 +17,6 @@ import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificateReportService; -import com.casic.missiles.service.customer.CustomerSampleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; @@ -45,8 +44,6 @@ public class BusinessCertificateReportController extends ExportController { @Resource private IBusinessCertificateReportService certificateReportService; - @Resource - private CustomerSampleService customerSampleService; @ApiOperation("证书报告记录导出") @PostMapping("/listExport") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java index d97e701..232f065 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java @@ -9,6 +9,7 @@ import com.casic.missiles.dto.business.workbench.SampleMeasureChartResponse; import com.casic.missiles.dto.business.workbench.SampleMeasureResponse; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; +import com.casic.missiles.dto.business.workbench.SampleStatusMonthResponse; import com.casic.missiles.service.business.BusinessWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -60,4 +61,21 @@ return ReturnUtil.success(workbenchService.sampleMeasureChart()); } + /** + * 证书报告，调用证书报告中列表接口 + */ + + /** + * 实时工作统计，调用业务看板中实时工作统计接口 + */ + + /** + * 本月样品状态 + */ + @ApiOperation("本月样品状态") + @GetMapping("/sample/status/month") + public ReturnDTO> sampleStatusMonth() throws Exception { + return ReturnUtil.success(workbenchService.sampleStatusMonth()); + } + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java index 41031ea..79944a2 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -52,4 +52,8 @@ OrderSampleDTO selectIdBySampleNo(@Param("sampleNo") String sampleNo); Page selectSampleMonitorListByStatus(Page page, @Param("status") String status); + + Page getSampleListByStatusMonth(Page page, @Param("request") DeviceDispatchDTO request); + + Page selectSampleListByStatusMonth(Page handOutPage, @Param("request") SampleHandOutListRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 5d2c2b1..688360e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -211,6 +211,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_dept_id = #{deptId} AND blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -220,6 +221,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_person_id = #{userId} AND blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -229,6 +231,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -239,6 +242,7 @@ JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL AND blei.measure_status IN (2,3,4) + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') GROUP BY blei.measure_status 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 f3bfe90..500d9b0 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -32,12 +32,11 @@ + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml index 1e6b3d3..fe78f91 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml @@ -18,7 +18,7 @@ @@ -220,6 +221,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_person_id = #{userId} AND blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -229,6 +231,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -239,6 +242,7 @@ JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL AND blei.measure_status IN (2,3,4) + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') GROUP BY blei.measure_status 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 f3bfe90..500d9b0 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -32,12 +32,11 @@ + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml index 1e6b3d3..fe78f91 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml @@ -18,7 +18,7 @@ @@ -220,6 +221,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_person_id = #{userId} AND blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -229,6 +231,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -239,6 +242,7 @@ JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL AND blei.measure_status IN (2,3,4) + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') GROUP BY blei.measure_status 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 f3bfe90..500d9b0 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -32,12 +32,11 @@ + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml index 1e6b3d3..fe78f91 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml @@ -18,7 +18,7 @@ @@ -220,6 +221,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_person_id = #{userId} AND blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -229,6 +231,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -239,6 +242,7 @@ JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL AND blei.measure_status IN (2,3,4) + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') GROUP BY blei.measure_status 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 f3bfe90..500d9b0 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -32,12 +32,11 @@ + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml index 1e6b3d3..fe78f91 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml @@ -18,7 +18,7 @@ @@ -220,6 +221,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_person_id = #{userId} AND blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -229,6 +231,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -239,6 +242,7 @@ JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL AND blei.measure_status IN (2,3,4) + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') GROUP BY blei.measure_status 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 f3bfe90..500d9b0 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -32,12 +32,11 @@ + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml index 1e6b3d3..fe78f91 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml @@ -18,7 +18,7 @@ @@ -220,6 +221,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_person_id = #{userId} AND blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -229,6 +231,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -239,6 +242,7 @@ JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL AND blei.measure_status IN (2,3,4) + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') GROUP BY blei.measure_status 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 f3bfe90..500d9b0 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -32,12 +32,11 @@ + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml index 1e6b3d3..fe78f91 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml @@ -18,7 +18,7 @@ @@ -220,6 +221,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_person_id = #{userId} AND blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -229,6 +231,7 @@ JOIN customer_sample_info csi ON csi.id = blei.sample_id JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') ORDER BY blei.update_time DESC @@ -239,6 +242,7 @@ JOIN business_order bo ON bo.id = blei.order_id WHERE blei.measure_status IS NOT NULL AND blei.measure_status IN (2,3,4) + AND DATE_FORMAT(blei.create_time, '%Y%m') = DATE_FORMAT(CURDATE() ,'%Y%m') GROUP BY blei.measure_status 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 f3bfe90..500d9b0 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -32,12 +32,11 @@ + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml index 1e6b3d3..fe78f91 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml @@ -18,7 +18,7 @@