Kaynağa Gözat

feat:缺失任务频次优化

chenjianhua 1 hafta önce
ebeveyn
işleme
27f0a23da8

+ 2 - 2
service-base/src/main/java/com/simuwang/base/common/enums/Frequency.java

@@ -12,7 +12,7 @@ import java.util.zip.Inflater;
 public enum Frequency {
 
     DAY(1, "日频"),WEEK(2, "周频"),MONTH(3, "月频"),QUARTER(4,"季频"),
-    HALF_YEAR(5,"半年"),YEAR(6,"年频"),OTHER(-1,"无固定");
+    HALF_YEAR(5,"半年"),YEAR(6,"年频"),OTHER(-1,"无固定"),NO_SETTING(0,"未设置");
 
     private Integer code;
 
@@ -24,7 +24,7 @@ public enum Frequency {
     }
 
     public static Frequency getFrequencyByCode(Integer code) {
-        return Stream.of(Frequency.values()).filter(e -> e.code.equals(code)).findFirst().orElse(null);
+        return Stream.of(Frequency.values()).filter(e -> e.code.equals(code)).findFirst().orElse(NO_SETTING);
     }
 
     public Integer getCode() {

+ 1 - 4
service-manage/src/main/java/com/simuwang/manage/task/SendDeletionEmailTask.java

@@ -96,12 +96,9 @@ public class SendDeletionEmailTask {
             if(StringUtil.isEmpty(emails)){
                 return;
             }
-            if(!fundDeletionBaseInfoDOListMap.keySet().isEmpty()){
-                fileList.add(fundDeletionFile);
-            }
+            fileList.add(fundDeletionFile);
             fileList.add(fundBaseInfoFile);
             EmailUtil.senEmail(dto,emails,fileList,htmlText,sysConfigMapper.selectConfigByKey("email.host")==null?"":sysConfigMapper.selectConfigByKey("email.host"),emailTitle);
-
         }catch (Exception e){
             log.error(e.getMessage(),e);
             endEmailTask(emailTaskInfoDO.getId(),-1);