diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java new file mode 100644 index 0000000..f2f7a44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java @@ -0,0 +1,45 @@ +package com.casic.missiles.dto.business.order; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2024/7/1 14:12 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class OrderSampleCertDTO { + + @ExcelProperty(value = "委托单编号", order = 0) + private String orderCode; + + @ExcelProperty(value = "委托方名称", order = 1) + private String customerName; + + @ExcelProperty(value = "样品名称", order = 2) + private String sampleName; + + @ExcelProperty(value = "样品型号", order = 3) + private String sampleModel; + + @ExcelProperty(value = "出厂编号", order = 4) + private String manufacturingNo; + + @ExcelProperty(value = "检校日期", order = 5) + private String calibrationTime; + + @ExcelProperty(value = "证书编号", order = 6) + private String certificateNo; +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java new file mode 100644 index 0000000..f2f7a44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java @@ -0,0 +1,45 @@ +package com.casic.missiles.dto.business.order; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2024/7/1 14:12 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class OrderSampleCertDTO { + + @ExcelProperty(value = "委托单编号", order = 0) + private String orderCode; + + @ExcelProperty(value = "委托方名称", order = 1) + private String customerName; + + @ExcelProperty(value = "样品名称", order = 2) + private String sampleName; + + @ExcelProperty(value = "样品型号", order = 3) + private String sampleModel; + + @ExcelProperty(value = "出厂编号", order = 4) + private String manufacturingNo; + + @ExcelProperty(value = "检校日期", order = 5) + private String calibrationTime; + + @ExcelProperty(value = "证书编号", order = 6) + private String certificateNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 9d5cd64..1d63dca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -186,6 +186,10 @@ @TableField("check_remark") private String checkRemark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java new file mode 100644 index 0000000..f2f7a44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java @@ -0,0 +1,45 @@ +package com.casic.missiles.dto.business.order; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2024/7/1 14:12 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class OrderSampleCertDTO { + + @ExcelProperty(value = "委托单编号", order = 0) + private String orderCode; + + @ExcelProperty(value = "委托方名称", order = 1) + private String customerName; + + @ExcelProperty(value = "样品名称", order = 2) + private String sampleName; + + @ExcelProperty(value = "样品型号", order = 3) + private String sampleModel; + + @ExcelProperty(value = "出厂编号", order = 4) + private String manufacturingNo; + + @ExcelProperty(value = "检校日期", order = 5) + private String calibrationTime; + + @ExcelProperty(value = "证书编号", order = 6) + private String certificateNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 9d5cd64..1d63dca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -186,6 +186,10 @@ @TableField("check_remark") private String checkRemark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java index c16b71d..c1901e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java @@ -378,6 +378,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java new file mode 100644 index 0000000..f2f7a44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java @@ -0,0 +1,45 @@ +package com.casic.missiles.dto.business.order; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2024/7/1 14:12 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class OrderSampleCertDTO { + + @ExcelProperty(value = "委托单编号", order = 0) + private String orderCode; + + @ExcelProperty(value = "委托方名称", order = 1) + private String customerName; + + @ExcelProperty(value = "样品名称", order = 2) + private String sampleName; + + @ExcelProperty(value = "样品型号", order = 3) + private String sampleModel; + + @ExcelProperty(value = "出厂编号", order = 4) + private String manufacturingNo; + + @ExcelProperty(value = "检校日期", order = 5) + private String calibrationTime; + + @ExcelProperty(value = "证书编号", order = 6) + private String certificateNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 9d5cd64..1d63dca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -186,6 +186,10 @@ @TableField("check_remark") private String checkRemark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java index c16b71d..c1901e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java @@ -378,6 +378,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index 3b747d1..1888277 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -103,6 +103,9 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; @TableField("print_file_name") private String printFileName; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java new file mode 100644 index 0000000..f2f7a44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java @@ -0,0 +1,45 @@ +package com.casic.missiles.dto.business.order; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2024/7/1 14:12 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class OrderSampleCertDTO { + + @ExcelProperty(value = "委托单编号", order = 0) + private String orderCode; + + @ExcelProperty(value = "委托方名称", order = 1) + private String customerName; + + @ExcelProperty(value = "样品名称", order = 2) + private String sampleName; + + @ExcelProperty(value = "样品型号", order = 3) + private String sampleModel; + + @ExcelProperty(value = "出厂编号", order = 4) + private String manufacturingNo; + + @ExcelProperty(value = "检校日期", order = 5) + private String calibrationTime; + + @ExcelProperty(value = "证书编号", order = 6) + private String certificateNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 9d5cd64..1d63dca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -186,6 +186,10 @@ @TableField("check_remark") private String checkRemark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java index c16b71d..c1901e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java @@ -378,6 +378,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index 3b747d1..1888277 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -103,6 +103,9 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; @TableField("print_file_name") private String printFileName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index cdfa706..d3185bd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -176,6 +176,10 @@ @ApiModelProperty(value = "备注", dataType = "String") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java new file mode 100644 index 0000000..f2f7a44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java @@ -0,0 +1,45 @@ +package com.casic.missiles.dto.business.order; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2024/7/1 14:12 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class OrderSampleCertDTO { + + @ExcelProperty(value = "委托单编号", order = 0) + private String orderCode; + + @ExcelProperty(value = "委托方名称", order = 1) + private String customerName; + + @ExcelProperty(value = "样品名称", order = 2) + private String sampleName; + + @ExcelProperty(value = "样品型号", order = 3) + private String sampleModel; + + @ExcelProperty(value = "出厂编号", order = 4) + private String manufacturingNo; + + @ExcelProperty(value = "检校日期", order = 5) + private String calibrationTime; + + @ExcelProperty(value = "证书编号", order = 6) + private String certificateNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 9d5cd64..1d63dca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -186,6 +186,10 @@ @TableField("check_remark") private String checkRemark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java index c16b71d..c1901e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java @@ -378,6 +378,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index 3b747d1..1888277 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -103,6 +103,9 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; @TableField("print_file_name") private String printFileName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index cdfa706..d3185bd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -176,6 +176,10 @@ @ApiModelProperty(value = "备注", dataType = "String") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java index 1bc658b..9cac902 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java @@ -246,9 +246,10 @@ @TableField("remark") private String remark; - /** - * 创建人 - */ + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(value = "创建人id", dataType = "Long") @TableField("create_user") private Long createUser; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java new file mode 100644 index 0000000..f2f7a44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java @@ -0,0 +1,45 @@ +package com.casic.missiles.dto.business.order; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2024/7/1 14:12 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class OrderSampleCertDTO { + + @ExcelProperty(value = "委托单编号", order = 0) + private String orderCode; + + @ExcelProperty(value = "委托方名称", order = 1) + private String customerName; + + @ExcelProperty(value = "样品名称", order = 2) + private String sampleName; + + @ExcelProperty(value = "样品型号", order = 3) + private String sampleModel; + + @ExcelProperty(value = "出厂编号", order = 4) + private String manufacturingNo; + + @ExcelProperty(value = "检校日期", order = 5) + private String calibrationTime; + + @ExcelProperty(value = "证书编号", order = 6) + private String certificateNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 9d5cd64..1d63dca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -186,6 +186,10 @@ @TableField("check_remark") private String checkRemark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java index c16b71d..c1901e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java @@ -378,6 +378,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index 3b747d1..1888277 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -103,6 +103,9 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; @TableField("print_file_name") private String printFileName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index cdfa706..d3185bd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -176,6 +176,10 @@ @ApiModelProperty(value = "备注", dataType = "String") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java index 1bc658b..9cac902 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java @@ -246,9 +246,10 @@ @TableField("remark") private String remark; - /** - * 创建人 - */ + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(value = "创建人id", dataType = "Long") @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java index 9a4f2a8..a0f6fb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -153,6 +153,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 流程实例id */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java new file mode 100644 index 0000000..f2f7a44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java @@ -0,0 +1,45 @@ +package com.casic.missiles.dto.business.order; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2024/7/1 14:12 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class OrderSampleCertDTO { + + @ExcelProperty(value = "委托单编号", order = 0) + private String orderCode; + + @ExcelProperty(value = "委托方名称", order = 1) + private String customerName; + + @ExcelProperty(value = "样品名称", order = 2) + private String sampleName; + + @ExcelProperty(value = "样品型号", order = 3) + private String sampleModel; + + @ExcelProperty(value = "出厂编号", order = 4) + private String manufacturingNo; + + @ExcelProperty(value = "检校日期", order = 5) + private String calibrationTime; + + @ExcelProperty(value = "证书编号", order = 6) + private String certificateNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 9d5cd64..1d63dca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -186,6 +186,10 @@ @TableField("check_remark") private String checkRemark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java index c16b71d..c1901e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java @@ -378,6 +378,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index 3b747d1..1888277 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -103,6 +103,9 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; @TableField("print_file_name") private String printFileName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index cdfa706..d3185bd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -176,6 +176,10 @@ @ApiModelProperty(value = "备注", dataType = "String") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java index 1bc658b..9cac902 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java @@ -246,9 +246,10 @@ @TableField("remark") private String remark; - /** - * 创建人 - */ + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(value = "创建人id", dataType = "Long") @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java index 9a4f2a8..a0f6fb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -153,6 +153,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 流程实例id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java index 1cf8405..a795d7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -308,6 +308,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java new file mode 100644 index 0000000..f2f7a44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java @@ -0,0 +1,45 @@ +package com.casic.missiles.dto.business.order; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2024/7/1 14:12 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class OrderSampleCertDTO { + + @ExcelProperty(value = "委托单编号", order = 0) + private String orderCode; + + @ExcelProperty(value = "委托方名称", order = 1) + private String customerName; + + @ExcelProperty(value = "样品名称", order = 2) + private String sampleName; + + @ExcelProperty(value = "样品型号", order = 3) + private String sampleModel; + + @ExcelProperty(value = "出厂编号", order = 4) + private String manufacturingNo; + + @ExcelProperty(value = "检校日期", order = 5) + private String calibrationTime; + + @ExcelProperty(value = "证书编号", order = 6) + private String certificateNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 9d5cd64..1d63dca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -186,6 +186,10 @@ @TableField("check_remark") private String checkRemark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java index c16b71d..c1901e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java @@ -378,6 +378,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index 3b747d1..1888277 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -103,6 +103,9 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; @TableField("print_file_name") private String printFileName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index cdfa706..d3185bd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -176,6 +176,10 @@ @ApiModelProperty(value = "备注", dataType = "String") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java index 1bc658b..9cac902 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java @@ -246,9 +246,10 @@ @TableField("remark") private String remark; - /** - * 创建人 - */ + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(value = "创建人id", dataType = "Long") @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java index 9a4f2a8..a0f6fb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -153,6 +153,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 流程实例id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java index 1cf8405..a795d7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -308,6 +308,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java index 2d10d6f..4af21c4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -145,6 +145,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 流程实例id */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java new file mode 100644 index 0000000..f2f7a44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java @@ -0,0 +1,45 @@ +package com.casic.missiles.dto.business.order; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2024/7/1 14:12 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class OrderSampleCertDTO { + + @ExcelProperty(value = "委托单编号", order = 0) + private String orderCode; + + @ExcelProperty(value = "委托方名称", order = 1) + private String customerName; + + @ExcelProperty(value = "样品名称", order = 2) + private String sampleName; + + @ExcelProperty(value = "样品型号", order = 3) + private String sampleModel; + + @ExcelProperty(value = "出厂编号", order = 4) + private String manufacturingNo; + + @ExcelProperty(value = "检校日期", order = 5) + private String calibrationTime; + + @ExcelProperty(value = "证书编号", order = 6) + private String certificateNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 9d5cd64..1d63dca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -186,6 +186,10 @@ @TableField("check_remark") private String checkRemark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java index c16b71d..c1901e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java @@ -378,6 +378,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index 3b747d1..1888277 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -103,6 +103,9 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; @TableField("print_file_name") private String printFileName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index cdfa706..d3185bd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -176,6 +176,10 @@ @ApiModelProperty(value = "备注", dataType = "String") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java index 1bc658b..9cac902 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java @@ -246,9 +246,10 @@ @TableField("remark") private String remark; - /** - * 创建人 - */ + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(value = "创建人id", dataType = "Long") @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java index 9a4f2a8..a0f6fb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -153,6 +153,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 流程实例id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java index 1cf8405..a795d7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -308,6 +308,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java index 2d10d6f..4af21c4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -145,6 +145,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 流程实例id */ 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 715f549..7c2afa0 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 @@ -16,6 +16,7 @@ import com.casic.missiles.dto.business.order.OrderCancelRequest; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.dto.business.order.OrderListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -35,7 +36,6 @@ import com.casic.missiles.service.customer.CustomerSampleService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; import com.casic.missiles.utils.SpringContextUtil; import lombok.AllArgsConstructor; @@ -68,7 +68,6 @@ private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; private final BusinessDealRecordMapper dealRecordMapper; - private final MinioUtil minioUtil; /** * 1、分页查询 2、批量查询所有的委托书、样品关系 => 进行以sampleId为key主键map list 3、查询计算样品数量 @@ -297,6 +296,16 @@ } } + @Override + public void sampleCertExport(Long id, HttpServletResponse response) { + try { + List list = sampleRelationMapper.selectCertListByOrderId(id); + iBaseExportService.exportExcel(response, OrderSampleCertDTO.class, list, ExportEnum.ORDER_CERT_FORM_DATA.getSheetName()); + } catch (Exception e) { + log.error("样品导出出现异常，异常信息为{}", e); + } + } + /** * 新增操作记录 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java new file mode 100644 index 0000000..f2f7a44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java @@ -0,0 +1,45 @@ +package com.casic.missiles.dto.business.order; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2024/7/1 14:12 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class OrderSampleCertDTO { + + @ExcelProperty(value = "委托单编号", order = 0) + private String orderCode; + + @ExcelProperty(value = "委托方名称", order = 1) + private String customerName; + + @ExcelProperty(value = "样品名称", order = 2) + private String sampleName; + + @ExcelProperty(value = "样品型号", order = 3) + private String sampleModel; + + @ExcelProperty(value = "出厂编号", order = 4) + private String manufacturingNo; + + @ExcelProperty(value = "检校日期", order = 5) + private String calibrationTime; + + @ExcelProperty(value = "证书编号", order = 6) + private String certificateNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 9d5cd64..1d63dca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -186,6 +186,10 @@ @TableField("check_remark") private String checkRemark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java index c16b71d..c1901e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java @@ -378,6 +378,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index 3b747d1..1888277 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -103,6 +103,9 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; @TableField("print_file_name") private String printFileName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index cdfa706..d3185bd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -176,6 +176,10 @@ @ApiModelProperty(value = "备注", dataType = "String") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java index 1bc658b..9cac902 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java @@ -246,9 +246,10 @@ @TableField("remark") private String remark; - /** - * 创建人 - */ + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(value = "创建人id", dataType = "Long") @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java index 9a4f2a8..a0f6fb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -153,6 +153,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 流程实例id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java index 1cf8405..a795d7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -308,6 +308,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java index 2d10d6f..4af21c4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -145,6 +145,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 流程实例id */ 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 715f549..7c2afa0 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 @@ -16,6 +16,7 @@ import com.casic.missiles.dto.business.order.OrderCancelRequest; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.dto.business.order.OrderListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -35,7 +36,6 @@ import com.casic.missiles.service.customer.CustomerSampleService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; import com.casic.missiles.utils.SpringContextUtil; import lombok.AllArgsConstructor; @@ -68,7 +68,6 @@ private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; private final BusinessDealRecordMapper dealRecordMapper; - private final MinioUtil minioUtil; /** * 1、分页查询 2、批量查询所有的委托书、样品关系 => 进行以sampleId为key主键map list 3、查询计算样品数量 @@ -297,6 +296,16 @@ } } + @Override + public void sampleCertExport(Long id, HttpServletResponse response) { + try { + List list = sampleRelationMapper.selectCertListByOrderId(id); + iBaseExportService.exportExcel(response, OrderSampleCertDTO.class, list, ExportEnum.ORDER_CERT_FORM_DATA.getSheetName()); + } catch (Exception e) { + log.error("样品导出出现异常，异常信息为{}", e); + } + } + /** * 新增操作记录 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 68d6612..d1454b3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -295,9 +295,10 @@ case ApprovalStatusEnum.FAILED: businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝 List rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + List failApprovalList = new ArrayList<>(); if (!CollectionUtils.isEmpty(businessKeys)) { - approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys); - approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED); + failApprovalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys); + failApprovalList = handleApprovalListResponse(failApprovalList, ApprovalStatusEnum.FAILED); } List rejectApprovalList = new ArrayList<>(); if (!CollectionUtils.isEmpty(rejectBusinessKey)) { @@ -305,6 +306,7 @@ rejectApprovalList = handleApprovalListResponse(rejectApprovalList, ApprovalStatusEnum.FAILED_REJECT); } //合并未通过-拒绝和未通过-驳回 + approvalList.addAll(failApprovalList); approvalList.addAll(rejectApprovalList); //分页处理 if(!CollectionUtils.isEmpty(approvalList)) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java new file mode 100644 index 0000000..f2f7a44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java @@ -0,0 +1,45 @@ +package com.casic.missiles.dto.business.order; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2024/7/1 14:12 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class OrderSampleCertDTO { + + @ExcelProperty(value = "委托单编号", order = 0) + private String orderCode; + + @ExcelProperty(value = "委托方名称", order = 1) + private String customerName; + + @ExcelProperty(value = "样品名称", order = 2) + private String sampleName; + + @ExcelProperty(value = "样品型号", order = 3) + private String sampleModel; + + @ExcelProperty(value = "出厂编号", order = 4) + private String manufacturingNo; + + @ExcelProperty(value = "检校日期", order = 5) + private String calibrationTime; + + @ExcelProperty(value = "证书编号", order = 6) + private String certificateNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 9d5cd64..1d63dca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -186,6 +186,10 @@ @TableField("check_remark") private String checkRemark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java index c16b71d..c1901e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java @@ -378,6 +378,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index 3b747d1..1888277 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -103,6 +103,9 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; @TableField("print_file_name") private String printFileName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index cdfa706..d3185bd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -176,6 +176,10 @@ @ApiModelProperty(value = "备注", dataType = "String") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java index 1bc658b..9cac902 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java @@ -246,9 +246,10 @@ @TableField("remark") private String remark; - /** - * 创建人 - */ + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(value = "创建人id", dataType = "Long") @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java index 9a4f2a8..a0f6fb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -153,6 +153,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 流程实例id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java index 1cf8405..a795d7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -308,6 +308,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java index 2d10d6f..4af21c4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -145,6 +145,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 流程实例id */ 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 715f549..7c2afa0 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 @@ -16,6 +16,7 @@ import com.casic.missiles.dto.business.order.OrderCancelRequest; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.dto.business.order.OrderListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -35,7 +36,6 @@ import com.casic.missiles.service.customer.CustomerSampleService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; import com.casic.missiles.utils.SpringContextUtil; import lombok.AllArgsConstructor; @@ -68,7 +68,6 @@ private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; private final BusinessDealRecordMapper dealRecordMapper; - private final MinioUtil minioUtil; /** * 1、分页查询 2、批量查询所有的委托书、样品关系 => 进行以sampleId为key主键map list 3、查询计算样品数量 @@ -297,6 +296,16 @@ } } + @Override + public void sampleCertExport(Long id, HttpServletResponse response) { + try { + List list = sampleRelationMapper.selectCertListByOrderId(id); + iBaseExportService.exportExcel(response, OrderSampleCertDTO.class, list, ExportEnum.ORDER_CERT_FORM_DATA.getSheetName()); + } catch (Exception e) { + log.error("样品导出出现异常，异常信息为{}", e); + } + } + /** * 新增操作记录 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 68d6612..d1454b3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -295,9 +295,10 @@ case ApprovalStatusEnum.FAILED: businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝 List rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + List failApprovalList = new ArrayList<>(); if (!CollectionUtils.isEmpty(businessKeys)) { - approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys); - approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED); + failApprovalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys); + failApprovalList = handleApprovalListResponse(failApprovalList, ApprovalStatusEnum.FAILED); } List rejectApprovalList = new ArrayList<>(); if (!CollectionUtils.isEmpty(rejectBusinessKey)) { @@ -305,6 +306,7 @@ rejectApprovalList = handleApprovalListResponse(rejectApprovalList, ApprovalStatusEnum.FAILED_REJECT); } //合并未通过-拒绝和未通过-驳回 + approvalList.addAll(failApprovalList); approvalList.addAll(rejectApprovalList); //分页处理 if(!CollectionUtils.isEmpty(approvalList)) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java index d2f7c45..153944a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -41,4 +41,6 @@ List optionRecord(Long id); void formExport(Long id, int excel, HttpServletResponse response); + + void sampleCertExport(Long id, HttpServletResponse response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index f4e1034..b53caad 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -147,4 +147,13 @@ businessOrderService.formExport(orderPrintDTO.getId(), orderPrintDTO.getExcel(), response); } + /** + * 根据委托单导出该委托单中包含已出证书样品的“设备名称，型号，出厂编号，校准时间，证书编号”表格 + */ + @ApiOperation("委托书内样品证书清单导出") + @PostMapping("/cert/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.sampleCertExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index 0580ec3..a527b9a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,7 +14,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -44,8 +43,6 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; - @Autowired - private IDeptService deptService; @ApiOperation("现场检测审批列表（分页）") @PostMapping("/approval/listPage") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e05c3d8..d4eefd7 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -50,7 +50,8 @@ DEPT_OUTPUT_EXPORT("deptOutputData", "deptOutputData", "部门产值分析"), WORKLOAD_EXPORT("workloadData", "workloadData", "业务工作量分析"), DEPT_COMPREHENSIVE_EXPORT("deptComprehensiveData", "deptComprehensiveData", "部门综合分析"), - ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"); + ENVIRONMENTAL_RECORD("environmentalRecordData", "environmentalRecordData", "现场环境记录"), + ORDER_CERT_FORM_DATA("certFormData", "certFormData", "证书清单"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 8d506ce..55ad8a2 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 @@ -8,6 +8,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.dto.business.outsource.OrderSampleDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; import com.casic.missiles.dto.cockpit.BusTrendResponse; @@ -71,4 +72,6 @@ List selectPreMonthCountByYear(); WorkRatioResponse selectCountByMonth(@Param("date") String date); + + List selectCertListByOrderId(@Param("id") Long id); } 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 6241902..61a5e95 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -462,4 +462,15 @@ AND (bosr.sample_status = 4 OR bosr.sample_status = 5) AND DATE_FORMAT(bosr.update_time, '%Y%m') = DATE_FORMAT(#{date},'%Y%m') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java new file mode 100644 index 0000000..f2f7a44 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderSampleCertDTO.java @@ -0,0 +1,45 @@ +package com.casic.missiles.dto.business.order; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2024/7/1 14:12 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class OrderSampleCertDTO { + + @ExcelProperty(value = "委托单编号", order = 0) + private String orderCode; + + @ExcelProperty(value = "委托方名称", order = 1) + private String customerName; + + @ExcelProperty(value = "样品名称", order = 2) + private String sampleName; + + @ExcelProperty(value = "样品型号", order = 3) + private String sampleModel; + + @ExcelProperty(value = "出厂编号", order = 4) + private String manufacturingNo; + + @ExcelProperty(value = "检校日期", order = 5) + private String calibrationTime; + + @ExcelProperty(value = "证书编号", order = 6) + private String certificateNo; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 9d5cd64..1d63dca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -186,6 +186,10 @@ @TableField("check_remark") private String checkRemark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java index c16b71d..c1901e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java @@ -378,6 +378,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(hidden = true) @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java index 3b747d1..1888277 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java @@ -103,6 +103,9 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; @TableField("print_file_name") private String printFileName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java index cdfa706..d3185bd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java @@ -176,6 +176,10 @@ @ApiModelProperty(value = "备注", dataType = "String") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java index 1bc658b..9cac902 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java @@ -246,9 +246,10 @@ @TableField("remark") private String remark; - /** - * 创建人 - */ + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + @ApiModelProperty(value = "创建人id", dataType = "Long") @TableField("create_user") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java index 9a4f2a8..a0f6fb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterFile.java @@ -153,6 +153,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 流程实例id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java index 1cf8405..a795d7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java @@ -308,6 +308,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 删除标记 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java index 2d10d6f..4af21c4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java @@ -145,6 +145,10 @@ @TableField("remark") private String remark; + @TableField("reject_remark") + @ApiModelProperty(value = "历次驳回原因（未通过中的驳回更新(保存按钮)时增量传入）", dataType = "String") + private String rejectRemark; + /** * 流程实例id */ 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 715f549..7c2afa0 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 @@ -16,6 +16,7 @@ import com.casic.missiles.dto.business.order.OrderCancelRequest; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.dto.business.order.OrderListResponse; +import com.casic.missiles.dto.business.order.OrderSampleCertDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.PrefixCodeEnum; @@ -35,7 +36,6 @@ import com.casic.missiles.service.customer.CustomerSampleService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; import com.casic.missiles.utils.SpringContextUtil; import lombok.AllArgsConstructor; @@ -68,7 +68,6 @@ private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; private final BusinessDealRecordMapper dealRecordMapper; - private final MinioUtil minioUtil; /** * 1、分页查询 2、批量查询所有的委托书、样品关系 => 进行以sampleId为key主键map list 3、查询计算样品数量 @@ -297,6 +296,16 @@ } } + @Override + public void sampleCertExport(Long id, HttpServletResponse response) { + try { + List list = sampleRelationMapper.selectCertListByOrderId(id); + iBaseExportService.exportExcel(response, OrderSampleCertDTO.class, list, ExportEnum.ORDER_CERT_FORM_DATA.getSheetName()); + } catch (Exception e) { + log.error("样品导出出现异常，异常信息为{}", e); + } + } + /** * 新增操作记录 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 68d6612..d1454b3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -295,9 +295,10 @@ case ApprovalStatusEnum.FAILED: businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝 List rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + List failApprovalList = new ArrayList<>(); if (!CollectionUtils.isEmpty(businessKeys)) { - approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys); - approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED); + failApprovalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys); + failApprovalList = handleApprovalListResponse(failApprovalList, ApprovalStatusEnum.FAILED); } List rejectApprovalList = new ArrayList<>(); if (!CollectionUtils.isEmpty(rejectBusinessKey)) { @@ -305,6 +306,7 @@ rejectApprovalList = handleApprovalListResponse(rejectApprovalList, ApprovalStatusEnum.FAILED_REJECT); } //合并未通过-拒绝和未通过-驳回 + approvalList.addAll(failApprovalList); approvalList.addAll(rejectApprovalList); //分页处理 if(!CollectionUtils.isEmpty(approvalList)) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java index d2f7c45..153944a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -41,4 +41,6 @@ List optionRecord(Long id); void formExport(Long id, int excel, HttpServletResponse response); + + void sampleCertExport(Long id, HttpServletResponse response); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index b05b0f3..7de8785 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -138,10 +138,12 @@ // 创建需要的字体样式 Font italicFont = workbook.createFont(); italicFont.setItalic(true); // 斜体 - italicFont.setFontName("宋体"); + //italicFont.setFontName("宋体"); + italicFont.setFontName("Times New Roman"); Font subscriptFont = workbook.createFont(); subscriptFont.setTypeOffset(Font.SS_SUB); // 下标 - subscriptFont.setFontName("宋体"); + //subscriptFont.setFontName("宋体"); + subscriptFont.setFontName("Times New Roman"); // 填充占位符 for (Row row : sheetTwo) { @@ -211,6 +213,7 @@ richText.applyFont(index, index + 1, italicFont); // 斜体 U index += 1; // 移动到下一个可能的匹配位置 } + richText.applyFont(italicFont); // 设置单元格新值和格式 cell.setCellValue(richText); }