diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index 76f95b4..b1b006c 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -122,3 +122,8 @@ author: wangpeng #待生成对象表名 table-name: business_certificate_print +reminder: + #节点--common模块config包 ReminderNodeConfig配置 + node: + sample_certificate: 7 #样品证书 + diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index 76f95b4..b1b006c 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -122,3 +122,8 @@ author: wangpeng #待生成对象表名 table-name: business_certificate_print +reminder: + #节点--common模块config包 ReminderNodeConfig配置 + node: + sample_certificate: 7 #样品证书 + diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/ReminderNodeConfig.java b/casic-metering-common/src/main/java/com/casic/missiles/config/ReminderNodeConfig.java new file mode 100644 index 0000000..4d41461 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/ReminderNodeConfig.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Data +@Configuration +@ConfigurationProperties( + prefix ="reminder.node" +) +public class ReminderNodeConfig { + + private String sampleCertificate; + + +} diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index 76f95b4..b1b006c 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -122,3 +122,8 @@ author: wangpeng #待生成对象表名 table-name: business_certificate_print +reminder: + #节点--common模块config包 ReminderNodeConfig配置 + node: + sample_certificate: 7 #样品证书 + diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/ReminderNodeConfig.java b/casic-metering-common/src/main/java/com/casic/missiles/config/ReminderNodeConfig.java new file mode 100644 index 0000000..4d41461 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/ReminderNodeConfig.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Data +@Configuration +@ConfigurationProperties( + prefix ="reminder.node" +) +public class ReminderNodeConfig { + + private String sampleCertificate; + + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 7f75b74..356824a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -89,9 +89,9 @@ SELECT orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleSatus,customerName,measurePeriod, - validDeadline,measureLastTime + validDeadline,measureLastTime,sampleNo,orderNo FROM ( - SELECT sample_name AS "sampleName",sample_model AS "sampleModel",manufacturing_no AS + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS "measurePeriod", valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS "measureContent" FROM customer_sample_info @@ -104,10 +104,10 @@ )csi JOIN ( - SELECT sample_status AS "sampleSatus",sample_id as "sampleId",order_id AS "orderId" + SELECT sample_status AS "sampleSatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" FROM business_order_sample_relation bosr JOIN ( - SELECT id + SELECT id,order_code FROM business_order WHERE customer_id=#{request.customerId} )bo ON bo.id=bosr.order_id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListResponse.java index cf23039..55e9075 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListResponse.java @@ -13,12 +13,21 @@ @ApiModelProperty(value = "委托书id", dataType = "String") private Long orderId; + @ApiModelProperty(value = "委托书代码", dataType = "String") + private String orderNo; + @ApiModelProperty(value = "样品id", dataType = "String") private Long sampleId; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + private String measureLastTime; + @ApiModelProperty(value = "样品型号", dataType = "String") private String sampleModel; @@ -50,6 +59,4 @@ @ApiModelProperty(value = "证书过期时间", dataType = "String") private String validDeadline; - @ApiModelProperty(value = "上次检定时间", dataType = "String") - private String measureLastTime; } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index 76f95b4..b1b006c 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -122,3 +122,8 @@ author: wangpeng #待生成对象表名 table-name: business_certificate_print +reminder: + #节点--common模块config包 ReminderNodeConfig配置 + node: + sample_certificate: 7 #样品证书 + diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/ReminderNodeConfig.java b/casic-metering-common/src/main/java/com/casic/missiles/config/ReminderNodeConfig.java new file mode 100644 index 0000000..4d41461 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/ReminderNodeConfig.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Data +@Configuration +@ConfigurationProperties( + prefix ="reminder.node" +) +public class ReminderNodeConfig { + + private String sampleCertificate; + + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 7f75b74..356824a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -89,9 +89,9 @@ SELECT orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleSatus,customerName,measurePeriod, - validDeadline,measureLastTime + validDeadline,measureLastTime,sampleNo,orderNo FROM ( - SELECT sample_name AS "sampleName",sample_model AS "sampleModel",manufacturing_no AS + SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS "measurePeriod", valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS "measureContent" FROM customer_sample_info @@ -104,10 +104,10 @@ )csi JOIN ( - SELECT sample_status AS "sampleSatus",sample_id as "sampleId",order_id AS "orderId" + SELECT sample_status AS "sampleSatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" FROM business_order_sample_relation bosr JOIN ( - SELECT id + SELECT id,order_code FROM business_order WHERE customer_id=#{request.customerId} )bo ON bo.id=bosr.order_id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListResponse.java index cf23039..55e9075 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListResponse.java @@ -13,12 +13,21 @@ @ApiModelProperty(value = "委托书id", dataType = "String") private Long orderId; + @ApiModelProperty(value = "委托书代码", dataType = "String") + private String orderNo; + @ApiModelProperty(value = "样品id", dataType = "String") private Long sampleId; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") + private String measureLastTime; + @ApiModelProperty(value = "样品型号", dataType = "String") private String sampleModel; @@ -50,6 +59,4 @@ @ApiModelProperty(value = "证书过期时间", dataType = "String") private String validDeadline; - @ApiModelProperty(value = "上次检定时间", dataType = "String") - private String measureLastTime; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index 0d847a0..56d89b6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -57,7 +57,6 @@ @Override public BusinessInterchangeDetailResponse exchangeDetail(Long id) { - ; BusinessInterchangeDetailResponse businessExchange = this.baseMapper.getInfoById(id); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", businessExchange.getOrderId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java index b03ce44..8e9644b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.config.ReminderNodeConfig; import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -42,9 +43,11 @@ @Service @AllArgsConstructor -public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService, CertificationExpireStatusEnum,PrefixCodeEnum{ +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService, CertificationExpireStatusEnum, PrefixCodeEnum { private final CustomerSampleListResponseMapper customerSampleListResponseMapper; + + private final ReminderNodeConfig reminderNodeConfig; private final CustomerMapper customerMapper; private final IBaseExportService iBaseExportService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; @@ -75,7 +78,7 @@ */ @Override @Transactional - public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) throws Exception{ + public ReturnDTO addSample(CustomerSampleInfo customerSampleInfo) throws Exception { DictCodeUtils.validDictCode(customerSampleInfo); initSample(customerSampleInfo); int addFlag = this.baseMapper.insert(customerSampleInfo); @@ -164,8 +167,6 @@ } - - @Override public Page samplesByOderId(Page page, Long orderId, String sampleNo, String sampleName) { return this.baseMapper.samplesByOderId(page, orderId, sampleNo, sampleName); @@ -202,10 +203,11 @@ queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); if (!StringUtils.isEmpty(request.getOvertimeStatus())) { + int expireTime=StringUtils.isEmpty(reminderNodeConfig.getSampleCertificate())?0:Integer.valueOf(reminderNodeConfig.getSampleCertificate()); queryWrapper.apply("1".equals(request.getOvertimeStatus()), - "sysdate() > DATE_FORMAT(valid_deadline,'%Y-%m-%d')"); + "DATE_ADD(sysdate(),INTERVAL " + expireTime+ " DAY) > DATE_FORMAT(valid_deadline,'%Y-%m-%d')"); queryWrapper.apply("0".equals(request.getOvertimeStatus()), - "sysdate() <= DATE_FORMAT(valid_deadline,'%Y-%m-%d')"); + "DATE_ADD(sysdate(),INTERVAL " + expireTime + " DAY) <= DATE_FORMAT(valid_deadline,'%Y-%m-%d')"); } queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), "{0} <= DATE_FORMAT(measure_last_time,'%Y-%m-%d')", request.getStartTime()); @@ -229,7 +231,8 @@ } Calendar date = Calendar.getInstance(); date.setTime(new Date()); - date.add(Calendar.DAY_OF_MONTH, -30); + int expireTime=StringUtils.isEmpty(reminderNodeConfig.getSampleCertificate())?7:Integer.valueOf(reminderNodeConfig.getSampleCertificate()); + date.add(Calendar.DAY_OF_MONTH,expireTime); if (validDeadline.compareTo(sdf.format(date.getTime())) < 0) { return ALMOST_EXPIRE; }