feat:净值频次计算任务优化

service-base/src/main/resources/mapper/daq/ChannelMapper.xml

@@ -90,7 +90,8 @@
         </if>
     </select>
     <select id="selectAllChannel" resultMap="BaseResultMap">
-        select id,channel_name,email,channel_remark from channel_info
-        where isvalid=1
+        select ci.id,ci.channel_name,cei.email,ci.channel_remark from channel_info ci
+        join channel_email_info cei on ci.id = cei.channel_id
+        where ci.isvalid=1 and cei.isvalid=1
     </select>
 </mapper>

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

@@ -129,9 +129,9 @@ public class SendDeletionEmailTask {
                 data.add(emailDeletionInfoDO.getFundId());
                 data.add(emailDeletionInfoDO.getFundName());
                 data.add(emailDeletionInfoDO.getCompanyName());
-                data.add(Frequency.getFrequencyByCode(Integer.parseInt(key.getNavFrequency())).getInfo());
-                data.add(Frequency.getFrequencyByCode(Integer.parseInt(key.getAssetFrequency())).getInfo());
-                data.add(Frequency.getFrequencyByCode(Integer.parseInt(key.getValuationFrequency())).getInfo());
+                data.add(key.getNavFrequency()==null?null:Frequency.getFrequencyByCode(Integer.parseInt(key.getNavFrequency())).getInfo());
+                data.add(key.getAssetFrequency()==null?null:Frequency.getFrequencyByCode(Integer.parseInt(key.getAssetFrequency())).getInfo());
+                data.add(key.getValuationFrequency()==null?null:Frequency.getFrequencyByCode(Integer.parseInt(key.getValuationFrequency())).getInfo());
                 data.add(DeletionType.getDeletionTypeByCode(Integer.parseInt(emailDeletionInfoDO.getDeletionType())).getInfo());
                 data.add(emailDeletionInfoDO.getDeletionDate());
                 data.add(String.valueOf(emailDeletionInfoDO.getChannelId()));
@@ -224,9 +224,9 @@ public class SendDeletionEmailTask {
             data.add(dto.getFundId());
             data.add(dto.getFundName());
             data.add(dto.getCompanyName());
-            data.add(Frequency.getFrequencyByCode(Integer.parseInt(dto.getNavFrequency())).getInfo());
-            data.add(Frequency.getFrequencyByCode(Integer.parseInt(dto.getAssetFrequency())).getInfo());
-            data.add(Frequency.getFrequencyByCode(Integer.parseInt(dto.getValuationFrequency())).getInfo());
+            data.add(dto.getNavFrequency()==null?null:Frequency.getFrequencyByCode(Integer.parseInt(dto.getNavFrequency())).getInfo());
+            data.add(dto.getAssetFrequency()==null?null:Frequency.getFrequencyByCode(Integer.parseInt(dto.getAssetFrequency())).getInfo());
+            data.add(dto.getValuationFrequency()==null?null:Frequency.getFrequencyByCode(Integer.parseInt(dto.getValuationFrequency())).getInfo());
             data.add(dto.getIsDeletion());
             dataList.add(data);
         }