Ver Fonte

Merge branch 'V2.0.1'

zhaoxian há 2 anos atrás
pai
commit
0408703f7e

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

@@ -64,9 +64,6 @@ public class DuxiaomanMaterialInfoController {
         if (!Check.isNull(materialName)) {
             queryWrapper.like("material_name", materialName);
         }
-        if (!Check.isNull(duxiaomanMaterialInfo.getUserId())) {
-            queryWrapper.eq("user_id", duxiaomanMaterialInfo.getUserId());
-        }
         if (!Check.isNull(duxiaomanMaterialInfo.getType())) {
             queryWrapper.eq("type", duxiaomanMaterialInfo.getType());
         }

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/duxiaoman/entity/DuxiaomanMaterialInfo.java

@@ -113,9 +113,9 @@ public class DuxiaomanMaterialInfo {
     @ApiModelProperty(value = "审核人")
     private String auditorId;
     /**
-     * 0-待审核,1-预审核,2-待上传,3-上传成功,4-预审拒绝,5-媒体拒绝
+     * 0-待审核,1-待上传,2-审批中,3-审核通过,4-审核不通过,5-预审核,6-预审核拒绝,7-上传成功,8-上传失败,101待提交
      */
-    @Excel(name = "0-待审核,1-待上传,2-审批中,3-审核通过,4-审核不通过,5-预审核,6-预审核拒绝,7-上传成功,8-上传失败", width = 15)
+    @Excel(name = "0-待审核,1-待上传,2-审批中,3-审核通过,4-审核不通过,5-预审核,6-预审核拒绝,7-上传成功,8-上传失败,101待提交", width = 15)
     @ApiModelProperty(value = "0-待审核,1-待上传,2-审批中,3-审核通过,4-审核不通过,5-预审核,6-预审核拒绝,7-上传成功,8-上传失败")
     private Integer status;
     /**

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

@@ -282,6 +282,7 @@ public class DuxiaomanMaterialInfoServiceImpl extends ServiceImpl<DuxiaomanMater
             if (!Check.isNull(resultJson) && resultJson.getInteger("retCode") == 0) {
                 JSONObject result = resultJson.getJSONObject("result");
                 Integer auditStatus = result.getInteger("audit_status");
+                auditStatus = auditStatus == 1 ? 101 : auditStatus;
 
                 materialInfo.setStatus(auditStatus);
                 materialInfo.setConfirmTime(result.getString("audit_time"));
@@ -292,7 +293,12 @@ public class DuxiaomanMaterialInfoServiceImpl extends ServiceImpl<DuxiaomanMater
                 }
                 if ("SCRIPT".equals(materialInfo.getType())) {
                     Project project = projectService.getById(materialInfo.getProjectId());
-                    String text = messageTemplate.getDuXiaoManMaterialTemplate(materialInfo.getProductName(), project.getProjectName(), materialInfo.getMaterialName(), materialInfo.getRefuseReason(), true);
+                    String text = null;
+                    if (auditStatus == 4) {
+                        text = messageTemplate.getDuXiaoManMaterialTemplate(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);
+                    }
                     sendMessageService.sendMessage(materialInfo.getUserId(), text);
                 }
             } else {