采购订单导出bug修复

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/TimerServiceImpl.java

@@ -1,6 +1,5 @@
 package com.malk.lanyun.service.impl;
 
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -242,7 +241,7 @@ public class TimerServiceImpl implements TimerService {
                         .build(),
                 YDConf.FORM_QUERY.retrieve_id).getFormData();
         log.info("formData:{}",formData);
-//        Map dataMain = new HashMap();
+        //获取主表字段
         final String[] keys = {""};
         final String[] valuses = {""};
         formData.forEach((k,v)->{
@@ -253,6 +252,23 @@ public class TimerServiceImpl implements TimerService {
         });
         Map<String, String> dataMain = UtilMap.map(keys[0], valuses[0]);
         log.info("dataMain:{}",dataMain);
+        //获取订单日期
+        long dateFiled = Long.parseLong(formData.get("dateField_lr26l3h2").toString());
+        if (ObjectUtil.isNotEmpty(dateFiled)){
+            String dateStr = DateUtil.date(dateFiled).toString("yyyy-MM-dd");
+            dataMain.put("dateField_lr26l3h2",dateStr);
+        }
+        //获取供应商名称
+        String association = formData.get("associationFormField_lr26l3he_id").toString();
+        log.info(association);
+        if (ObjectUtil.isNotEmpty(association)){
+            association = JSON.parse(association).toString();
+            JSONArray jsonArray = JSON.parseArray(association);
+            JSONObject jsonObject = (JSONObject) jsonArray.get(0);
+            String title = jsonObject.get("title").toString();
+            dataMain.put("title",title);
+        }
+        //获取文件标题
         String fileName = dataMain.get("textField_lr26y1io") + dataMain.get("textField_lz2fk0wc") + "采购订单";
 
         List<Map> dataList = ydService.queryDetails(YDParam.builder().
@@ -260,10 +276,17 @@ public class TimerServiceImpl implements TimerService {
                 .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
                 .formInstanceId(formInstId)
                 .formUuid("FORM-61F329A9DFFE4CF0BBEC0FDC34C42C03QJKQ")
+                //测试
+//                .formUuid("FORM-44AF067BF733464F8431620612726615RNNV")
                 .tableFieldId("tableField_ltxyt76f")
                 .build());
+        log.info("dataList1:{}",dataList);
         for (int i = 0; i < dataList.size(); i++) {
             dataList.get(i).put("row",i+1);
+            String person = dataList.get(i).get("textField_lu2gzzab").toString();
+            String phone = dataList.get(i).get("textField_lu2gzzac").toString();
+            String information = person + " " + phone;
+            dataList.get(i).put("information",information);
         }
         log.info("dataList:{}",dataList);
         String text = "一、订单说明：\n" +