20240904 导出任务修改

src/main/java/cn/cslg/pas/common/vo/ImportTaskAMVO.java

@@ -1,8 +1,10 @@
 package cn.cslg.pas.common.vo;
 
 import cn.cslg.pas.common.dto.es.EsCustomFieldDTO;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -96,4 +98,6 @@ public class ImportTaskAMVO {
     private List<EsCustomFieldDTO> fieldDTOS;
     private Integer pdfType;
     private String updateCycle;
+    private Date updateToDate;
+    private Date lastUpdateToDate;
 }

src/main/java/cn/cslg/pas/service/MailSendService.java

@@ -187,7 +187,7 @@ public class MailSendService {
                     if (importTask.getUpdateToDate() != null) {
                         String toDateStr = DateUtils2.dateTimeToPatentStr(importTask.getUpdateToDate());
                         String fromDateStr = DateUtils2.dateTimeToPatentStr(importTask.getLastUpdateToDate());
-                        dateRange = toDateStr + "~" + fromDateStr;
+                        dateRange = fromDateStr + "~" + toDateStr;
                     }
 
                 } else if (importTask.getUpdateToDate() != null) {
@@ -199,6 +199,18 @@ public class MailSendService {
             }
             map.put("value3", dateRange);
             map.put("value4", importTask.getAllNum());
+
+            LambdaQueryWrapper<SystemDict> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(SystemDict::getType, "CYCLE_IMPORT_BCC");
+            List<SystemDict> systemDictList = systemDictService.list(queryWrapper);
+
+            if (systemDictList.size() > 0) {
+                String[] bcs = new String[systemDictList.size()];
+                for (int i = 0; i < systemDictList.size(); i++) {
+                    bcs[i] = systemDictList.get(i).getValue();
+                }
+                map.put("bcc", bcs);
+            }
             rabbitMQUtils.sendEmailMessage(map);
         }
     }

src/main/java/cn/cslg/pas/service/importPatent/WebVOTransformService.java

@@ -1006,7 +1006,7 @@ public class WebVOTransformService {
     public List<EsCustomFieldDTO> getEsCustomFieldDTOList(ImportTaskAMVO importTaskAMVO) {
         UploadParamsVO.Field field = new UploadParamsVO.Field();
         field.setKey("监控周期:4");
-        Date date = new Date();
+        Date date = importTaskAMVO.getUpdateToDate();
         String cycle = DateUtils2.getDateIndexStr(date, importTaskAMVO.getUpdateCycle());
 
         field.setFieldList(Arrays.asList(cycle));