Explorar el Código

feature 优化邮件格式

xiahan hace 9 meses
padre
commit
f23b18dc28

+ 7 - 6
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquFrockTestRecordServiceImpl.java

@@ -42,6 +42,9 @@ import java.util.stream.Collectors;
 @Service
 public class EquFrockTestRecordServiceImpl extends ServiceImpl<EquFrockTestRecordDao, EquFrockTestRecordDo> implements EquFrockTestRecordService {
 
+    public static final String MAIL_CONTENT = " 尊敬的各位领导,【%s】的【%s(%s)】的工装本次检测达到报废标准,请位领导知悉,本次工装检测信息如下页面截图,或者登录系统查看\n" +
+            "\n <img style='width: %s;' src='%s'/> " +
+            "系统登录地址: http://120.192.74.74:7500/#/page/s/d55d1e0878874b179a1a8dbbcd507f18";
     private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
     @Autowired
     private EquFrockTestRecordDao equFrockTestRecordDao;
@@ -49,9 +52,7 @@ public class EquFrockTestRecordServiceImpl extends ServiceImpl<EquFrockTestRecor
     private EquFrockTestRecordService equFrockTestRecordService;
     @Autowired
     private CommonDao commonDao;
-    public static final String MAIL_CONTENT=" 尊敬的各位领导,【%s】的【%s(%s)】的工装本次检测达到报废标准,请位领导知悉,本次工装检测信息如下页面截图,或者登录系统查看\n" +
-            "\n <img  src='%s'/> " +
-            "系统登录地址: http://120.192.74.74:7500/#/page/s/d55d1e0878874b179a1a8dbbcd507f18";
+
     @Override
     @Transactional
     public R importEquFrockTestRecord(MultipartFile file) {
@@ -244,13 +245,13 @@ public class EquFrockTestRecordServiceImpl extends ServiceImpl<EquFrockTestRecor
         //   车间主任、车间维修主管、车间设备主管   以及 该工厂的设备部设备部长、设备部维修主管、设备部工装负责人
         String tenantid = equFrockTestRecordDo.getTenantid();
         List<String> equFrockUserId = commonDao.getEquFrockUserId(tenantid, usedeptid);
-        if(equFrockUserId.isEmpty()){
+        if (equFrockUserId.isEmpty()) {
             log.error("无法获取提醒人");
             return R.error("无法获取提醒人");
         }
         String mailContent = String.format(MAIL_CONTENT, equFrockTestRecordDo.getUsedept(), equFrockTestRecordDo.getFrockname(),
-                equFrockTestRecordDo.getFrockname(),params.getOrDefault("imgBase64",""));
-        MailDo mailDo= new MailDo();
+                equFrockTestRecordDo.getFrockname(), "100%", params.getOrDefault("imgBase64", ""));
+        MailDo mailDo = new MailDo();
         mailDo.setContent(mailContent);
         mailDo.setSubject("工装报废提醒");
         mailDo.setOperationtype("10");