Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/entity/purchase/SupCertRemindMsgEntity.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 资质预警消息
  */
 @Data
-@TableName(value = "sup_cret_remind_msg")
+@TableName(value = "sup_cert_remind_msg")
 public class SupCertRemindMsgEntity {
 
     /**
@@ -27,6 +27,12 @@ public class SupCertRemindMsgEntity {
     @TableField(value = "idFk")
     private String idFk;
 
+    /**
+     * 资质证书编码
+     */
+    @TableField(value = "code")
+    private String code;
+
     /**
      * 有效期
      */

src/main/java/com/glxp/api/res/purchase/SupCertRemindMsgResponse.java

@@ -1,5 +1,6 @@
 package com.glxp.api.res.purchase;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -20,14 +21,21 @@ public class SupCertRemindMsgResponse {
      */
     private String idFk;
 
+    /**
+     * 证书编码
+     */
+    private String code;
+
     /**
      * 有效期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date vailDate;
 
     /**
      * 失效期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date expireDate;
 
     /**
@@ -80,4 +88,9 @@ public class SupCertRemindMsgResponse {
      */
     private String name;
 
+    /**
+     * 资质证书名称
+     */
+    private String certName;
+
 }

src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java

@@ -129,16 +129,16 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService {
      */
     private QueryWrapper<SupCertEntity> buildQueryWrapper(Integer type) {
         QueryWrapper<SupCertEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("status", 0).eq("auditStatus", ConstantStatus.AUDIT_PASS).gt("expireDate", new Date()).eq("type", type);
+        wrapper.eq("status", 0).eq("auditStatus", ConstantStatus.AUDIT_PASS).lt("expireDate", new Date()).eq("type", type);
         switch (type) {
             case 1: //查询供应商ID
-                wrapper.select("CustomerId", "vailDate", "expireDate");
+                wrapper.select("CustomerId", "code", "vailDate", "expireDate");
                 break;
             case 2: //查询生产企业ID
-                wrapper.select("manufacturerIdFk", "vailDate", "expireDate");
+                wrapper.select("manufacturerIdFk", "code", "vailDate", "expireDate");
                 break;
             case 3: //查询产品ID
-                wrapper.select("productIdFk", "vailDate", "expireDate");
+                wrapper.select("productIdFk", "code", "vailDate", "expireDate");
                 break;
             default:
                 break;
@@ -212,12 +212,13 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService {
             default:
                 break;
         }
-        SupCertRemindMsgEntity msgEntity = supCertRemindMsgDao.selectOne(new QueryWrapper<SupCertRemindMsgEntity>().eq("idFk", idFk).eq("type", type));
+        SupCertRemindMsgEntity msgEntity = supCertRemindMsgDao.selectOne(new QueryWrapper<SupCertRemindMsgEntity>().eq("idFk", idFk).eq("type", type).eq("code", supCertEntity.getCode()));
         if (null == msgEntity) {
             //构造新的资质预警信息
             msgEntity = new SupCertRemindMsgEntity();
             msgEntity.setIdFk(idFk); //设置关联主键
             msgEntity.setType(type); //类型
+            msgEntity.setCode(supCertEntity.getCode()); //证书编码
             msgEntity.setCreateTime(new Date());
         }
 

src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml

@@ -2,7 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.purchase.SupCertRemindMsgDao">
     <select id="selectSupRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
-        select m.*, c.companyName name
+        select m.*,
+               c.companyName                                                                   `name`,
+               (select `name` from sup_cert s where s.code = m.code and s.CustomerId = m.idFk) certName
         from sup_cert_remind_msg m
                  left join sup_company c on m.idFk = c.customerId
         <where>
@@ -23,7 +25,9 @@
     </select>
 
     <select id="selectManufactureRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
-        select m.*, c.companyName name
+        select m.*,
+               c.companyName                                                                   `name`,
+               (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk) certName
         from sup_cert_remind_msg m
                  left join sup_manufacturer c on m.idFk = c.customerId
         <where>
@@ -44,9 +48,11 @@
     </select>
 
     <select id="selectProductRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
-        select m.*, c.recordProductName name
+        select m.*,
+               c.recordProductName                                                              `name`,
+               (select `name` from sup_cert s where s.code = m.code and s.productIdFk = m.idFk) certName
         from sup_cert_remind_msg m
-                 left join sup_product c on m.idFk = c.customerId
+                 left join sup_product c on m.idFk = c.productId
         <where>
             <if test="name != null and name != ''">
                 AND c.recordProductName like concat('%', #{name}, '%')