From bdd9306804a8369516e6c5769f86a4476ed525e7 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 19 Mar 2024 10:50:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E8=AF=81=E4=B9=A6=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E7=AD=89=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/purchase/impl/SupCertRemindMsgImpl.java    | 6 +++---
 .../glxp/api/service/purchase/impl/SupCertServiceImpl.java | 7 ++++---
 .../mybatis/mapper/purchase/SupCertRemindMsgDao.xml        | 7 +++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java
index 0c5dd540..190597e8 100644
--- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java
+++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java
@@ -137,13 +137,13 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService {
         wrapper.eq("status", 0).eq("auditStatus", ConstantStatus.AUDIT_PASS).lt("expireDate", new Date()).eq("type", type);
         switch (type) {
             case 1: //查询供应商ID
-                wrapper.select("CustomerId", "code", "vailDate", "expireDate");
+                wrapper.select("CustomerId", "code", "vailDate", "expireDate", "type");
                 break;
             case 2: //查询生产企业ID
-                wrapper.select("manufacturerIdFk", "code", "vailDate", "expireDate");
+                wrapper.select("manufacturerIdFk", "code", "vailDate", "expireDate", "type");
                 break;
             case 3: //查询产品ID
-                wrapper.select("productIdFk", "code", "vailDate", "expireDate");
+                wrapper.select("productIdFk", "code", "vailDate", "expireDate", "type");
                 break;
             default:
                 break;
diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java
index fb6adf5d..e3dcb853 100644
--- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java
@@ -19,6 +19,7 @@ import com.glxp.api.service.purchase.SupCertService;
 import com.glxp.api.service.purchase.SupCompanyService;
 import com.glxp.api.service.purchase.SupManufacturerService;
 import com.glxp.api.service.purchase.SupProductService;
+import com.glxp.api.util.IntUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -208,17 +209,17 @@ public class SupCertServiceImpl extends ServiceImpl<SupCertDao, SupCertEntity> i
         supCertEntity.setCreateTime(new Date());
         supCertEntity.setUpdateTime(new Date());
         boolean b = supCertDao.updateCompanyCert(supCertEntity);
-        if (supCertEntity.getType() == ConstantStatus.CERT_COMPANY) {
+        if (IntUtil.value(supCertEntity.getType()) == ConstantStatus.CERT_COMPANY) {
             SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(supCertEntity.getCustomerId());
             supCompanyEntity.setAuditStatus(ConstantStatus.AUDIT_UN);
             supCompanyEntity.setUpdateTime(new Date());
             supCompanyService.modifyCompany(supCompanyEntity);
-        } else if (supCertEntity.getType() == ConstantStatus.CERT_MANUFACTURER) {
+        } else if (IntUtil.value(supCertEntity.getType()) == ConstantStatus.CERT_MANUFACTURER) {
             SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supCertEntity.getManufacturerIdFk());
             supManufacturerEntity.setAuditStatus(ConstantStatus.AUDIT_UN);
             supManufacturerEntity.setUpdateTime(new Date());
             supManufacturerService.modifyCompany(supManufacturerEntity);
-        } else if (supCertEntity.getType() == ConstantStatus.CERT_PRODUCT) {
+        } else if (IntUtil.value(supCertEntity.getType()) == ConstantStatus.CERT_PRODUCT) {
             SupProductResponse supProductResponse = supProductService.findByProductId(supCertEntity.getProductIdFk());
             SupProductEntity supProductEntity = new SupProductEntity();
             supProductEntity.setId(supProductResponse.getId());
diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
index 521b334d..2a2b14a7 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
@@ -29,6 +29,7 @@
                 AND bc.name like concat('%', #{certName}, '%')
             </if>
         </where>
+        group by m.id
         order by m.updateTime desc
     </select>
 
@@ -36,8 +37,8 @@
         select m.*,
                c.companyName                                                                                 `name`,
                (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk limit 1) certName
-        ,
-        (select name from basic_corp where erpId = c.customerId)                                 supName
+                ,
+               (select name from basic_corp where erpId = c.customerId)                                      supName
         from sup_cert_remind_msg m
                      left join sup_manufacturer c on m.idFk = c.manufacturerId
                      left join sup_cert bc on bc.code = m.code
@@ -61,6 +62,7 @@
                 AND bc.name like concat('%', #{certName}, '%')
             </if>
         </where>
+        group by m.id
         order by m.updateTime desc
     </select>
 
@@ -96,6 +98,7 @@
                 AND bc.name like concat('%', #{certName}, '%')
             </if>
         </where>
+        group by m.id
         order by m.updateTime desc
     </select>
 </mapper>