ソースを参照

度小满 优化修改功能

zhaoxian 2 年 前
コミット
e6f487d8ee

+ 3 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/IMessageTemplate.java

@@ -86,5 +86,8 @@ public interface IMessageTemplate {
 
     String getTrackMessage(Long accountId, Long unitId);
 
+    String getDuXiaoManScriptTemplate(String productName, String projectName, String materialName, String refuseReason, boolean success);
+
     String getDuXiaoManMaterialTemplate(String productName, String projectName, String materialName, String refuseReason, boolean success);
+
 }

+ 19 - 5
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/MessageTemplateImpl.java

@@ -222,7 +222,7 @@ public class MessageTemplateImpl implements IMessageTemplate {
     }
 
     @Override
-    public String getDuXiaoManMaterialTemplate(String productName, String projectName, String materialName, String refuseReason, boolean success) {
+    public String getDuXiaoManScriptTemplate(String productName, String projectName, String materialName, String refuseReason, boolean success) {
         StringBuilder text = new StringBuilder();
         text.append("脚本审核结果通知").append("<br/>")
                 .append("您的产品:").append(productName + ",").append("<br/>")
@@ -231,13 +231,27 @@ public class MessageTemplateImpl implements IMessageTemplate {
         if (success) {
             text.append("已通过审核");
         } else {
-            text.append("已被驳回").append("<br/>");
+            text.append("已被驳回").append("<br/>");
         }
-        if (!Check.isNull(refuseReason)) {
-            text.append("驳回原因为:").append(refuseReason).append("</br>");
+        text.append("驳回原因详见素材库").append(refuseReason).append("</br>");
+        text.append("请您及时调整");
+        return text.toString();
+    }
 
+    @Override
+    public String getDuXiaoManMaterialTemplate(String productName, String projectName, String materialName, String refuseReason, boolean success) {
+        StringBuilder text = new StringBuilder();
+        text.append("素材审核结果通知").append("<br/>")
+                .append("您的产品:").append(productName + ",").append("<br/>")
+                .append("下的项目:").append(projectName + ",").append("<br/>")
+                .append("素材名为:").append(materialName).append("<br/>");
+        if (success) {
+            text.append("已通过审核");
+        } else {
+            text.append("已被驳回").append("<br/>");
         }
-        text.append("请您联系相关同学及时调整");
+        text.append("驳回原因详见素材库").append(refuseReason).append("</br>");
+        text.append("请您及时调整");
         return text.toString();
     }
 

+ 20 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/duxiaoman/controller/DuxiaomanMaterialInfoController.java

@@ -1,5 +1,9 @@
 package org.jeecg.modules.duxiaoman.controller;
 
+import cn.com.ctop.common.module.entity.Project;
+import cn.com.ctop.common.module.service.IMessageTemplate;
+import cn.com.ctop.common.module.service.IProjectService;
+import cn.com.ctop.common.module.service.ISendMessageService;
 import cn.com.ctop.common.module.utils.Check;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -42,6 +46,15 @@ public class DuxiaomanMaterialInfoController {
     @Autowired
     private IDuxiaomanMaterialInfoService duxiaomanMaterialInfoService;
 
+    @Autowired
+    private IProjectService projectService;
+
+    @Autowired
+    private IMessageTemplate messageTemplate;
+
+    @Autowired
+    private ISendMessageService sendMessageService;
+
     /**
      * 分页列表查询
      *
@@ -161,6 +174,13 @@ public class DuxiaomanMaterialInfoController {
             if (ok) {
                 result.success("修改成功!");
             }
+
+            if (duxiaomanMaterialInfo.getStatus() == 6) {
+                Project project = projectService.getById(duxiaomanMaterialInfo.getProjectId());
+                String text = messageTemplate.getDuXiaoManMaterialTemplate(duxiaomanMaterialInfo.getProductName(), project.getProjectName(), duxiaomanMaterialInfo.getMaterialName(), duxiaomanMaterialInfo.getRefuseReason(), false);
+                sendMessageService.sendMessage(duxiaomanMaterialInfo.getUserId(), text);
+            }
+
         }
         return result;
     }

+ 5 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/duxiaoman/service/impl/DuxiaomanMaterialInfoServiceImpl.java

@@ -292,6 +292,9 @@ public class DuxiaomanMaterialInfoServiceImpl extends ServiceImpl<DuxiaomanMater
                     syncMaterial(materialInfo);
                 }
                 if (auditStatus == 4) {
+                    Project project = projectService.getById(materialInfo.getProjectId());
+                    String text = messageTemplate.getDuXiaoManMaterialTemplate(materialInfo.getProductName(), project.getProjectName(), materialInfo.getMaterialName(), materialInfo.getRefuseReason(), false);
+                    sendMessageService.sendMessage(materialInfo.getUserId(), text);
                     JSONArray auditImages = result.getJSONArray("audit_images");
                     if (!Check.isNull(auditImages)) {
                         JSONObject json = auditImages.getJSONObject(0);
@@ -303,9 +306,9 @@ public class DuxiaomanMaterialInfoServiceImpl extends ServiceImpl<DuxiaomanMater
                     Project project = projectService.getById(materialInfo.getProjectId());
                     String text = null;
                     if (auditStatus == 4) {
-                        text = messageTemplate.getDuXiaoManMaterialTemplate(materialInfo.getProductName(), project.getProjectName(), materialInfo.getMaterialName(), materialInfo.getRefuseReason(), false);
+                        text = messageTemplate.getDuXiaoManScriptTemplate(materialInfo.getProductName(), project.getProjectName(), materialInfo.getMaterialName(), materialInfo.getRefuseReason(), false);
                     } else if (auditStatus == 3) {
-                        text = messageTemplate.getDuXiaoManMaterialTemplate(materialInfo.getProductName(), project.getProjectName(), materialInfo.getMaterialName(), materialInfo.getRefuseReason(), true);
+                        text = messageTemplate.getDuXiaoManScriptTemplate(materialInfo.getProductName(), project.getProjectName(), materialInfo.getMaterialName(), materialInfo.getRefuseReason(), true);
                     }
                     sendMessageService.sendMessage(materialInfo.getUserId(), text);
                 }