diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index e9b576a..27de197 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -112,11 +112,11 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定记录(在样品中实现,可复用)") - @PostMapping("/fake/interface") - public ReturnDTO> measureRecordsBySampleId() { - return null; - } +// @ApiOperation("根据客户id查询检定记录(在样品中实现,可复用)") +// @PostMapping("/fake/interface") +// public ReturnDTO> measureRecordsBySampleId() { +// return null; +// } @ApiOperation("客户导出") @PostMapping("/export") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index e9b576a..27de197 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -112,11 +112,11 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定记录(在样品中实现,可复用)") - @PostMapping("/fake/interface") - public ReturnDTO> measureRecordsBySampleId() { - return null; - } +// @ApiOperation("根据客户id查询检定记录(在样品中实现,可复用)") +// @PostMapping("/fake/interface") +// public ReturnDTO> measureRecordsBySampleId() { +// return null; +// } @ApiOperation("客户导出") @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java index 6fe5810..9eaa04c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java @@ -1,12 +1,17 @@ package com.casic.missiles.listeners.processor.register; +import com.alibaba.fastjson.JSON; +import com.casic.missiles.dto.business.certificate.ElectronicImage; import com.casic.missiles.dto.business.certificate.FilePrintRegister; import com.casic.missiles.mapper.sys.PrintFileRegisterMapper; import com.casic.missiles.model.business.BusinessCertificateReport; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class PrintFileDataSupport { @@ -14,15 +19,39 @@ @Resource protected PrintFileRegisterMapper fileRegisterMapper; + /** + * 1、获取证书模板 + * 2、设置临时处理空间路径、文件名称、 + * 3、设置文件id,作为操作空间文件名称,防止对其他同时处理的证书形成影响 + */ protected void initialization(FilePrintRegister filePrintRegister, String templateFileDir, BusinessCertificateReport certificateReport) { String fileName = fileRegisterMapper.getFileNameById(certificateReport.getTemplateId(), "system_template"); - filePrintRegister.setFileName(fileName); filePrintRegister.setTemDir(templateFileDir); filePrintRegister.setFileName(templateFileDir + "\\" + fileName); filePrintRegister.setFileNameId(String.valueOf(certificateReport.getId())); - List fileNames=new ArrayList<>(); + List fileNames = new ArrayList<>(); fileNames.add(fileName); filePrintRegister.setBeDownloadedFileNames(fileNames); } + /** + * @param keyParamList 关键字集合 + * @param customizedSignName 存放名称集合 + * @param appendNameList 扩展名称集合 + * @return + */ + protected List electronicSignNamesCreator(List keyParamList, List customizedSignName, List> appendNameList) { + List electronicImageList = new ArrayList<>(); +// if (!CollectionUtils.isEmpty(appenList)) { +// ElectronicImage electronicImage = new ElectronicImage(); +// standardStatusFomateList.addAll(appenList); +// } + return electronicImageList; + } + + + private void populateElectronicFiles(ElectronicImage electronicImage) { + + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index e9b576a..27de197 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -112,11 +112,11 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定记录(在样品中实现,可复用)") - @PostMapping("/fake/interface") - public ReturnDTO> measureRecordsBySampleId() { - return null; - } +// @ApiOperation("根据客户id查询检定记录(在样品中实现,可复用)") +// @PostMapping("/fake/interface") +// public ReturnDTO> measureRecordsBySampleId() { +// return null; +// } @ApiOperation("客户导出") @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java index 6fe5810..9eaa04c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java @@ -1,12 +1,17 @@ package com.casic.missiles.listeners.processor.register; +import com.alibaba.fastjson.JSON; +import com.casic.missiles.dto.business.certificate.ElectronicImage; import com.casic.missiles.dto.business.certificate.FilePrintRegister; import com.casic.missiles.mapper.sys.PrintFileRegisterMapper; import com.casic.missiles.model.business.BusinessCertificateReport; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class PrintFileDataSupport { @@ -14,15 +19,39 @@ @Resource protected PrintFileRegisterMapper fileRegisterMapper; + /** + * 1、获取证书模板 + * 2、设置临时处理空间路径、文件名称、 + * 3、设置文件id,作为操作空间文件名称,防止对其他同时处理的证书形成影响 + */ protected void initialization(FilePrintRegister filePrintRegister, String templateFileDir, BusinessCertificateReport certificateReport) { String fileName = fileRegisterMapper.getFileNameById(certificateReport.getTemplateId(), "system_template"); - filePrintRegister.setFileName(fileName); filePrintRegister.setTemDir(templateFileDir); filePrintRegister.setFileName(templateFileDir + "\\" + fileName); filePrintRegister.setFileNameId(String.valueOf(certificateReport.getId())); - List fileNames=new ArrayList<>(); + List fileNames = new ArrayList<>(); fileNames.add(fileName); filePrintRegister.setBeDownloadedFileNames(fileNames); } + /** + * @param keyParamList 关键字集合 + * @param customizedSignName 存放名称集合 + * @param appendNameList 扩展名称集合 + * @return + */ + protected List electronicSignNamesCreator(List keyParamList, List customizedSignName, List> appendNameList) { + List electronicImageList = new ArrayList<>(); +// if (!CollectionUtils.isEmpty(appenList)) { +// ElectronicImage electronicImage = new ElectronicImage(); +// standardStatusFomateList.addAll(appenList); +// } + return electronicImageList; + } + + + private void populateElectronicFiles(ElectronicImage electronicImage) { + + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/TestReportPrintFileData.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/TestReportPrintFileData.java index bcf5607..f90d829 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/TestReportPrintFileData.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/TestReportPrintFileData.java @@ -33,18 +33,18 @@ public FilePrintRegister CustomizedPrintFileRegister(BusinessCertificateReport metaData, String templateFileDir) { FilePrintRegister filePrintRegister = new FilePrintRegister(); initialization(filePrintRegister, templateFileDir, metaData); + metaData.getProcessId(); filePrintRegister.setElectronicImageList(this.getCustomizedSignName(metaData)); doPopulatePrintFileRegister(filePrintRegister, metaData); return filePrintRegister; } - - /** * 每一种证书可能存在一个或者多个定制化的签名、签章 */ private List getCustomizedSignName(BusinessCertificateReport certificateReport) { List customizedSignNames = new ArrayList<>(); List fileNames = new ArrayList<>(); + String signName = fileRegisterMapper.getFileNameById(certificateReport.getSignId(), ""); return customizedSignNames; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index e9b576a..27de197 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -112,11 +112,11 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定记录(在样品中实现,可复用)") - @PostMapping("/fake/interface") - public ReturnDTO> measureRecordsBySampleId() { - return null; - } +// @ApiOperation("根据客户id查询检定记录(在样品中实现,可复用)") +// @PostMapping("/fake/interface") +// public ReturnDTO> measureRecordsBySampleId() { +// return null; +// } @ApiOperation("客户导出") @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java index 6fe5810..9eaa04c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java @@ -1,12 +1,17 @@ package com.casic.missiles.listeners.processor.register; +import com.alibaba.fastjson.JSON; +import com.casic.missiles.dto.business.certificate.ElectronicImage; import com.casic.missiles.dto.business.certificate.FilePrintRegister; import com.casic.missiles.mapper.sys.PrintFileRegisterMapper; import com.casic.missiles.model.business.BusinessCertificateReport; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class PrintFileDataSupport { @@ -14,15 +19,39 @@ @Resource protected PrintFileRegisterMapper fileRegisterMapper; + /** + * 1、获取证书模板 + * 2、设置临时处理空间路径、文件名称、 + * 3、设置文件id,作为操作空间文件名称,防止对其他同时处理的证书形成影响 + */ protected void initialization(FilePrintRegister filePrintRegister, String templateFileDir, BusinessCertificateReport certificateReport) { String fileName = fileRegisterMapper.getFileNameById(certificateReport.getTemplateId(), "system_template"); - filePrintRegister.setFileName(fileName); filePrintRegister.setTemDir(templateFileDir); filePrintRegister.setFileName(templateFileDir + "\\" + fileName); filePrintRegister.setFileNameId(String.valueOf(certificateReport.getId())); - List fileNames=new ArrayList<>(); + List fileNames = new ArrayList<>(); fileNames.add(fileName); filePrintRegister.setBeDownloadedFileNames(fileNames); } + /** + * @param keyParamList 关键字集合 + * @param customizedSignName 存放名称集合 + * @param appendNameList 扩展名称集合 + * @return + */ + protected List electronicSignNamesCreator(List keyParamList, List customizedSignName, List> appendNameList) { + List electronicImageList = new ArrayList<>(); +// if (!CollectionUtils.isEmpty(appenList)) { +// ElectronicImage electronicImage = new ElectronicImage(); +// standardStatusFomateList.addAll(appenList); +// } + return electronicImageList; + } + + + private void populateElectronicFiles(ElectronicImage electronicImage) { + + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/TestReportPrintFileData.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/TestReportPrintFileData.java index bcf5607..f90d829 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/TestReportPrintFileData.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/TestReportPrintFileData.java @@ -33,18 +33,18 @@ public FilePrintRegister CustomizedPrintFileRegister(BusinessCertificateReport metaData, String templateFileDir) { FilePrintRegister filePrintRegister = new FilePrintRegister(); initialization(filePrintRegister, templateFileDir, metaData); + metaData.getProcessId(); filePrintRegister.setElectronicImageList(this.getCustomizedSignName(metaData)); doPopulatePrintFileRegister(filePrintRegister, metaData); return filePrintRegister; } - - /** * 每一种证书可能存在一个或者多个定制化的签名、签章 */ private List getCustomizedSignName(BusinessCertificateReport certificateReport) { List customizedSignNames = new ArrayList<>(); List fileNames = new ArrayList<>(); + String signName = fileRegisterMapper.getFileNameById(certificateReport.getSignId(), ""); return customizedSignNames; } 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 a148676..07385fb 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -33,7 +33,7 @@ SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType", - bo.is_urgent AS "isUrgent",plan_deliver_time AS "planDeliverTime" + bo.is_urgent AS "isUrgent",plan_deliver_time AS "planDeliverTime",bo.require_over_time AS "requireOverTime",bo.deliverer FROM ( SELECT * diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index e9b576a..27de197 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -112,11 +112,11 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定记录(在样品中实现,可复用)") - @PostMapping("/fake/interface") - public ReturnDTO> measureRecordsBySampleId() { - return null; - } +// @ApiOperation("根据客户id查询检定记录(在样品中实现,可复用)") +// @PostMapping("/fake/interface") +// public ReturnDTO> measureRecordsBySampleId() { +// return null; +// } @ApiOperation("客户导出") @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java index 6fe5810..9eaa04c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java @@ -1,12 +1,17 @@ package com.casic.missiles.listeners.processor.register; +import com.alibaba.fastjson.JSON; +import com.casic.missiles.dto.business.certificate.ElectronicImage; import com.casic.missiles.dto.business.certificate.FilePrintRegister; import com.casic.missiles.mapper.sys.PrintFileRegisterMapper; import com.casic.missiles.model.business.BusinessCertificateReport; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class PrintFileDataSupport { @@ -14,15 +19,39 @@ @Resource protected PrintFileRegisterMapper fileRegisterMapper; + /** + * 1、获取证书模板 + * 2、设置临时处理空间路径、文件名称、 + * 3、设置文件id,作为操作空间文件名称,防止对其他同时处理的证书形成影响 + */ protected void initialization(FilePrintRegister filePrintRegister, String templateFileDir, BusinessCertificateReport certificateReport) { String fileName = fileRegisterMapper.getFileNameById(certificateReport.getTemplateId(), "system_template"); - filePrintRegister.setFileName(fileName); filePrintRegister.setTemDir(templateFileDir); filePrintRegister.setFileName(templateFileDir + "\\" + fileName); filePrintRegister.setFileNameId(String.valueOf(certificateReport.getId())); - List fileNames=new ArrayList<>(); + List fileNames = new ArrayList<>(); fileNames.add(fileName); filePrintRegister.setBeDownloadedFileNames(fileNames); } + /** + * @param keyParamList 关键字集合 + * @param customizedSignName 存放名称集合 + * @param appendNameList 扩展名称集合 + * @return + */ + protected List electronicSignNamesCreator(List keyParamList, List customizedSignName, List> appendNameList) { + List electronicImageList = new ArrayList<>(); +// if (!CollectionUtils.isEmpty(appenList)) { +// ElectronicImage electronicImage = new ElectronicImage(); +// standardStatusFomateList.addAll(appenList); +// } + return electronicImageList; + } + + + private void populateElectronicFiles(ElectronicImage electronicImage) { + + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/TestReportPrintFileData.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/TestReportPrintFileData.java index bcf5607..f90d829 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/TestReportPrintFileData.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/TestReportPrintFileData.java @@ -33,18 +33,18 @@ public FilePrintRegister CustomizedPrintFileRegister(BusinessCertificateReport metaData, String templateFileDir) { FilePrintRegister filePrintRegister = new FilePrintRegister(); initialization(filePrintRegister, templateFileDir, metaData); + metaData.getProcessId(); filePrintRegister.setElectronicImageList(this.getCustomizedSignName(metaData)); doPopulatePrintFileRegister(filePrintRegister, metaData); return filePrintRegister; } - - /** * 每一种证书可能存在一个或者多个定制化的签名、签章 */ private List getCustomizedSignName(BusinessCertificateReport certificateReport) { List customizedSignNames = new ArrayList<>(); List fileNames = new ArrayList<>(); + String signName = fileRegisterMapper.getFileNameById(certificateReport.getSignId(), ""); return customizedSignNames; } 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 a148676..07385fb 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -33,7 +33,7 @@ SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType", - bo.is_urgent AS "isUrgent",plan_deliver_time AS "planDeliverTime" + bo.is_urgent AS "isUrgent",plan_deliver_time AS "planDeliverTime",bo.require_over_time AS "requireOverTime",bo.deliverer FROM ( SELECT * diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index df14778..f464b93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -51,37 +51,45 @@ @ExcelProperty(value = "委托方代码", order = 4) private String customerNo; + @ApiModelProperty(value = "要求检完时间", dataType = "String") + @ExcelProperty(value = "要求检完时间", order = 5) + private String requireOverTime; + + @ApiModelProperty(value = "送检人", dataType = "String") + @ExcelProperty(value = "送检人", order = 6) + private String deliverer; + @ApiModelProperty(value = "委托书编号", dataType = "String") - @ExcelProperty(value = "委托书编号", order = 5) + @ExcelProperty(value = "委托书编号", order = 7) private String orderCode; @ApiModelProperty(value = "委托书名称", dataType = "String") - @ExcelProperty(value = "委托书名称", order = 6) + @ExcelProperty(value = "委托书名称", order = 8) private String customerName; @ApiModelProperty(value = "计划送达时间", dataType = "String") - @ExcelProperty(value = "计划送达时间", order = 7) + @ExcelProperty(value = "计划送达时间", order = 9) private String planDeliverTime; //数据库暂时没有字段 @ApiModelProperty(value = "实际送达时间", dataType = "String") - @ExcelProperty(value = "实际送达时间", order = 8) + @ExcelProperty(value = "实际送达时间", order = 10) private String realDeliverTime; @ApiModelProperty(value = "样品所属", dataType = "String") - @ExcelProperty(value = "样品所属", order = 8) + @ExcelProperty(value = "样品所属", order = 11) private String sampleBelong; @ApiModelProperty(value = "当前检定环节", dataType = "String") - @ExcelProperty(value = "当前检定环节", order = 9) + @ExcelProperty(value = "当前检定环节", order = 12) private String currentSegment; @ApiModelProperty(value = "已出具证书", dataType = "Integer") - @ExcelProperty(value = "已出具证书", order = 10) + @ExcelProperty(value = "已出具证书", order = 13) private Integer alreadyCertifications; @ApiModelProperty(value = "应出具证书", dataType = "Integer") - @ExcelProperty(value = "应出具证书", order = 11) + @ExcelProperty(value = "应出具证书", order = 14) private Integer requireCertifications; @ApiModelProperty(value = "是否加急", dataType = "Integer")