采购拆单切换正式环境试运行

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

@@ -75,9 +75,8 @@ public class WorkServiceImpl implements WorkService {
     }
     @Override
     public void getMonthWorkOrder() {
-        Date date = DateUtil.date();
         Date beginOfMonth = DateUtil.beginOfMonth(DateUtil.lastMonth());
-        Date endOfMonth = DateUtil.endOfMonth(DateUtil.lastMonth());
+        Date endOfMonth = DateUtil.endOfMonth(DateUtil.date());
         String[] dateList = new String[2];
         dateList[0] = String.valueOf(beginOfMonth.getTime());
 //        dateList[0] = String.valueOf(1755705600000L);
@@ -270,9 +269,8 @@ public class WorkServiceImpl implements WorkService {
 
     @Override
     public void getMonthOutSummary() {
-        Date date = DateUtil.date();
         Date beginOfMonth = DateUtil.beginOfMonth(DateUtil.lastMonth());
-        Date endOfMonth = DateUtil.endOfMonth(DateUtil.lastMonth());
+        Date endOfMonth = DateUtil.endOfMonth(DateUtil.date());
         String[] dateList = new String[2];
         dateList[0] = String.valueOf(beginOfMonth.getTime());
         dateList[1] = String.valueOf(endOfMonth.getTime());
@@ -315,7 +313,7 @@ public class WorkServiceImpl implements WorkService {
     @Override
     public void getMonthWorkSummary() {
         Date beginOfMonth = DateUtil.beginOfMonth(DateUtil.lastMonth());
-        Date endOfMonth = DateUtil.endOfMonth(DateUtil.lastMonth());
+        Date endOfMonth = DateUtil.endOfMonth(DateUtil.date());
         String[] dateList = new String[2];
         dateList[0] = String.valueOf(beginOfMonth.getTime());
         dateList[1] = String.valueOf(endOfMonth.getTime());

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

@@ -342,7 +342,7 @@ public class purchaseServiceImpl implements PurchaseService {
                                 successCount[0]++;
                             });
                         }
-                        List<Map<String, Object>> sortedByName = tableList.stream()
+                        List<Map> sortedByName = tableList.stream()
                                 .sorted((m1, m2) -> {
                                     String name1 = UtilMap.getString(m1,"textField_lu22o9f0");
                                     String name2 = UtilMap.getString(m2,"textField_lu22o9f0");
@@ -353,7 +353,7 @@ public class purchaseServiceImpl implements PurchaseService {
                         ydClient.operateData(YDParam.builder()
                                 .appType("APP_ERBDTFS82HOVBPL3NFH0")
                                 .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
-                                .formUuid("FORM-70F543E10887467188485B1E8AB3FFFDJUGK")
+                                .formUuid("FORM-073AFBCB510649978FB9B9FB5C14BAE3MZKU")
                                 .formDataJson(JSON.toJSONString(UtilMap.map("selectField_lr26l3h7, textField_lus384vk, selectField_lr26l3h8, " +
                                                 "textField_lr26l3hf, associationFormField_lr26l3he, textField_lwg62y7o, numberField_lr26l3hq, numberField_lr26l3hr, tableField_ltxug6h1, " +
                                                 "employeeField_lvz29gxt, textField_lvvs6x8v, textField_lw7sg8hq, textField_lw8we1wc, departmentSelectField_lxe98xep, employeeField_lr26l3h0, " +

mjava/src/main/java/com/malk/service/aliwork/YDClient.java

@@ -22,6 +22,8 @@ public interface YDClient {
      * 获取宜搭附件临时免登地址
      */
     String convertTemporaryUrl(String url, int timeout);
+    String convertTemporaryUrl(String url, int timeout, String appType, String systemToken);
 
     String convertTemporaryUrl(String url);
+    String convertTemporaryUrl(String url, String appType, String systemToken);
 }

mjava/src/main/java/com/malk/service/aliwork/impl/YDClientImpl.java

@@ -169,8 +169,23 @@ public class YDClientImpl implements YDClient {
         return (String) DDR_New.doGet("https://api.dingtalk.com/v1.0/yida/apps/temporaryUrls/" + (ydConf.getAppType()==null?"APP_ERBDTFS82HOVBPL3NFH0":ydConf.getAppType()), ddClient.initTokenHeader(), param).getResult();
     }
 
+    @Override
+    public String convertTemporaryUrl(String url, int timeout, String appType, String systemToken) {
+        Map param = new HashMap();
+        param.put("systemToken", ydConf.getSystemToken()==null?systemToken:ydConf.getSystemToken());
+        param.put("userId", YDConf.PUB_ACCOUNT);
+        param.put("fileUrl", url);          // URL在param上时, 需要编码 [UtilHttp已经做了编码] - URLEncoder.encode(url, "UTF-8")
+        param.put("timeout", timeout);      // 默认1分钟, 最大24小时 [毫秒]
+        return (String) DDR_New.doGet("https://api.dingtalk.com/v1.0/yida/apps/temporaryUrls/" + (ydConf.getAppType()==null?appType:ydConf.getAppType()), ddClient.initTokenHeader(), param).getResult();
+    }
+
     @Override
     public String convertTemporaryUrl(String url) {
         return convertTemporaryUrl(url, 60000);
     }
+
+    @Override
+    public String convertTemporaryUrl(String url, String appType, String systemToken) {
+        return convertTemporaryUrl(url,60000, appType, systemToken);
+    }
 }