bugfix

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/component/TimingRemindImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.jjh.declaration.component;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
 import com.ruoyi.jjh.ent.entity.JContacts;
+import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
 import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
 import com.ruoyi.jjh.ent.service.JContactsService;
 import com.ruoyi.jjh.ent.service.JEnterpriseContactService;
@@ -95,22 +96,25 @@ public class TimingRemindImpl implements TimingRemindService {
      */
     public void getContact(String code, String s) {
         if (isTiming) {
-//            List<JEnterpriseContact> list1 = jEnterpriseContactService.lambdaQuery().eq(JEnterpriseContact::getEnterpriseCode, code).list();
+            List<JEnterpriseContact> list1 = jEnterpriseContactService.lambdaQuery().eq(JEnterpriseContact::getEnterpriseCode, code).list();
-//            list1.forEach(y -> {
+            if (list1 != null && !list1.isEmpty()) {
-//                //先添加工单再发送短信
+                list1.forEach(y -> {
-//                //可在导入或者新增的时候将该常用联系人的手机号添加进工单
+                    //先添加工单再发送短信
-//                smsAlertsService.enterSms(y.getEnterpriseName(), s, y.getContactPhone());
+                    //可在导入或者新增的时候将该常用联系人的手机号添加进工单
-//                log.info(y.getEnterpriseName() + "发送短信成功!");
+                    smsAlertsService.enterSms(y.getEnterpriseName(), s, y.getContactPhone());
-//            });
+                    log.info(y.getEnterpriseName() + "发送短信成功!");
-            List<JContacts> list = jContactsService.lambdaQuery().eq(JContacts::getTyshxydm, code)
+                });
-                    .eq(JContacts::getDefaultcontact, "1").list();
+            } else {
-            list.forEach(y -> {
+                List<JContacts> list = jContactsService.lambdaQuery().eq(JContacts::getTyshxydm, code)
-                //先添加工单再发送短信
+                        .eq(JContacts::getDefaultcontact, "1").list();
-                smsAlertsService.addSsmPhone(y.getYddh());
+                list.forEach(y -> {
-                //可在导入或者新增的时候将该常用联系人的手机号添加进工单
+                    //先添加工单再发送短信
-                smsAlertsService.enterSms(y.getQymc(), s, y.getYddh());
+                    smsAlertsService.addSsmPhone(y.getYddh());
-                log.info(y.getQymc() + "发送短信成功!");
+                    //可在导入或者新增的时候将该常用联系人的手机号添加进工单
-            });
+                    smsAlertsService.enterSms(y.getQymc(), s, y.getYddh());
+                    log.info(y.getQymc() + "发送短信成功!");
+                });
+            }
         }
     }
 
@@ -137,10 +141,10 @@ public class TimingRemindImpl implements TimingRemindService {
                 sd.setZwId(x.getUserId());
                 if (isTiming) {
                     if (sd.getProjectId() != null & !x.getPhonenumber().isEmpty()) {
-                        smsAlertsService.enterSms("政府人员-" + x.getNickName(), "您有1个项目自定义通知,请前往工作台查看,"+"登录网址为:https://idp.sipac.gov.cn/bms/#/login", x.getPhonenumber());
+                        smsAlertsService.enterSms("政府人员-" + x.getNickName(), "您有1个项目自定义通知,请前往工作台查看," + "登录网址为:https://idp.sipac.gov.cn/bms/#/login", x.getPhonenumber());
                     }
                     if (!x.getPhonenumber().isEmpty() & sd.getProjectId() == null) {
-                        smsAlertsService.enterSms("政府人员-" + x.getNickName(), "您有1个全局自定义通知,请前往工作台查看,"+"登录网址为:https://idp.sipac.gov.cn/bms/#/login", x.getPhonenumber());
+                        smsAlertsService.enterSms("政府人员-" + x.getNickName(), "您有1个全局自定义通知,请前往工作台查看," + "登录网址为:https://idp.sipac.gov.cn/bms/#/login", x.getPhonenumber());
                     }
                 }
                 listAdd.add(sd);

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java

@@ -30,7 +30,10 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.time.Year;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 在线模板Service业务层处理
@@ -226,13 +229,19 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
         List<BmsDeclarationRecords> drlist = new ArrayList<>();
         //如果前端部分企业名录集合为空
         if (null != enterpriseDirectoryList && enterpriseDirectoryList.size() > 0) {
-            enterpriseDirectoryList.forEach(x -> {
+            List<BmsEnterpriseDirectory> deduplicatedList = new ArrayList<>(enterpriseDirectoryList.stream()
+                    .collect(Collectors.toMap(
+                            BmsEnterpriseDirectory::getCreditCode,
+                            p -> p, // 映射为 Person 对象
+                            (existing, replacement) -> existing)) // 如果 id 重复，保留第一个
+                    .values());
+            deduplicatedList.forEach(x -> {
                 getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, x.getCreditCode().trim(), tp.getTemplateJson());
                 x.setTemplateRecordId(bmsTemplateRecordAddDto.getId());
                 x.setCreditCode(x.getCreditCode().trim());
                 x.setEnterpriseName(x.getEnterpriseName().trim());
             });
-            enterpriseDirectoryService.saveBatch(enterpriseDirectoryList);
+            enterpriseDirectoryService.saveBatch(deduplicatedList);
         } else {
             List<BmsEnterpriseBasicInfo> list = iBmsEnterpriseBasicInfoService.list();
             List<BmsEnterpriseDirectory> copyList = new ArrayList<>();
@@ -252,12 +261,11 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
         if (isTiming) {
             List<BmsEnterpriseDirectory> list = enterpriseDirectoryService.lambdaQuery().eq(BmsEnterpriseDirectory::getTemplateRecordId, bmsTemplateRecordAddDto.getId()).list();
             for (BmsEnterpriseDirectory x : list) {
-                timingRemindImpl.getContact(x.getCreditCode(), "您有1个新的申报任务[待填报]");
+                timingRemindImpl.getContact(x.getCreditCode(), "各重点企业，现开展生产性服务业企业或项目支撑新型工业化的相关案例征集，详情请登录金鸡湖现代服务业品牌管理系统https://idp.sipac.gov.cn/bms/#/login  首页查看待办事项，感谢支持！");
             }
         }
         return num;
     }
-
     /**
      * 生成在线申报记录
      */