diff --git a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java index dd45033d..56de079e 100644 --- a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java @@ -101,13 +101,13 @@ public class AuthHistServiceImpl extends ServiceImpl"); if (emailAddress.get(0).getRecordTypeDb().equals("1")){ // 使用 标签创建可点击链接,链接地址和文本均自定义 - Link = "" + + Link = "" + emailAddress.get(0).getOrderRef1() + ""; fromName = "报价单"; s.append("
  • 有新的报价单待审批,请及时处理!报价单号:").append(Link).append("
  • "); } else if (emailAddress.get(0).getRecordTypeDb().equals("2")) { - Link = "" + + Link = "" + emailAddress.get(0).getOrderRef1() + ""; fromName = "询价申请单"; s.append("
  • 有新的询价申请单待审批,请及时处理!询价申请单号:").append(Link).append("
  • "); diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java index 52377680..28d42819 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java @@ -265,7 +265,7 @@ public class EamProjectServiceImpl implements EamProjectService { EamProjectMapper.eamProjectPartInfoEdit(inData); } - if(inData.getStatus2() == "进行中") { + if(Objects.equals(inData.getStatus2(), "进行中")) { try { EamProjectPartInfoData eamProjectPartInfoData = new EamProjectPartInfoData(); eamProjectPartInfoData.setProjectPartId(inData.getProjectPartId()); @@ -570,7 +570,7 @@ public class EamProjectServiceImpl implements EamProjectService { s.append("").append(formatter.format(proofingInformationData.getDueDate())).append(""); if (!Objects.equals(type, "项目物料立项")) { // 使用 标签创建可点击链接,链接地址和文本均自定义 - String documentLink = "" + String documentLink = "" + proofingInformationData.getDocumentType() + ""; s.append("").append(documentLink).append(""); s.append("").append(proofingInformationData.getUserDisplay()).append(""); @@ -589,7 +589,7 @@ public class EamProjectServiceImpl implements EamProjectService { s.append(""); if (!Objects.equals(type, "项目物料立项")) { // 使用 标签创建可点击链接,链接地址和文本均自定义 - String documentLink = "" + String documentLink = "" + proofingInformationData.getDocumentType() + ""; s.append("").append(documentLink).append(""); s.append("").append(proofingInformationData.getUserDisplay()).append(""); @@ -721,7 +721,7 @@ public class EamProjectServiceImpl implements EamProjectService { StringBuilder s = new StringBuilder(); s.append("
      "); // 使用 标签创建可点击链接,链接地址和文本均自定义 - String projectPartLink = "" + String projectPartLink = "" + inData.getDocumentType() + ""; if (inData.getProofingNo().equals("*")) { s.append("
    1. 请及时上传转量产阶段文档文件!

      "); @@ -789,7 +789,7 @@ public class EamProjectServiceImpl implements EamProjectService { //List collect = data.getItemList().stream().filter(a -> "N".equals(a.getItemResult())).map(QcFAIRecordData::getItemDesc).collect(Collectors.toList()); if (emailAddress != null) { // 使用 标签创建可点击链接,链接地址和文本均自定义 - String projectPartLink = "" + String projectPartLink = "" + inData.getTestPartNo() + ""; StringBuilder s = new StringBuilder(); s.append("
        "); @@ -1038,10 +1038,10 @@ public class EamProjectServiceImpl implements EamProjectService { String projectPartLink = null; if (proofingInformationData.getDocumentType().equals("打样单未完成") || proofingInformationData.getDocumentType().equals("生产文档未确认")) { - projectPartLink = "" + projectPartLink = "" + proofingInformationData.getDocumentType() + ""; } else { - projectPartLink = "" + projectPartLink = "" + proofingInformationData.getDocumentType() + ""; }