Merge remote-tracking branch 'origin/master'

mjava-ts/src/main/java/com/malk/taisen/Timers/Time.java

@@ -1,26 +1,38 @@
 package com.malk.taisen.Timers;
 
+import com.alibaba.fastjson.JSON;
+import com.malk.server.aliwork.YDConf;
+import com.malk.server.aliwork.YDParam;
+import com.malk.service.aliwork.YDClient;
 import com.malk.taisen.service.NonPoServer;
+import com.malk.utils.UtilMap;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
 @Slf4j
 @Configuration
 @EnableScheduling
 public class Time {
 
-
+    private YDClient ydClient;
     @Autowired
     private NonPoServer nonPoServer;
 
-
-//    @Scheduled(fixedRate = 500)
+    /**
+     * 每半小时查询下 NPO 流程结束待推送的数据
+     */
+    //暂不开启
+//    @Scheduled(fixedRate = 1000 * 1800)
 //    public void JX() throws Exception {
-//        nonPoServer.NonPoinsetSAP0005("Non-PoToSAP0005","a752cd1d-af0e-4a9b-8ba");
-//
+//        nonPoServer.NonPoinsetSAP0005list();
 //    }
 
 }

mjava-ts/src/main/java/com/malk/taisen/service/NonPoServer.java

@@ -4,6 +4,8 @@ public interface NonPoServer {
 
     void  NonPoinsetSAP0005(String type,String InstanceId);
 
+    void  NonPoinsetSAP0005list( );
+
     void  FPGX(String InstanceId,String voucherNumber,String OAnumber);
 
 }

mjava-ts/src/main/java/com/malk/taisen/service/impl/NonPoServerImpl.java

@@ -261,7 +261,7 @@ public class NonPoServerImpl implements NonPoServer {
                         itemObj.put("ZOA_ITEMNO", sjItemNo);//OA单据行号
                         itemObj.put("HKONT", String.valueOf(row.get("textField_l6lvt6lj"))); //会计科目
                         itemObj.put("ZTAXOUT_AMT", "0");//进项税转出金额  、、、 String.valueOf(row.get("numberField_l6bx7hqk_value"))
-                        itemObj.put("MWSKZ", String.valueOf(row.get("textField_l7a6bzpv" )));///税码
+                        itemObj.put("MWSKZ", String.valueOf(row.get("textField_l7a6bzpv")));///税码
                         itemObj.put("ZTAX_AMT", String.valueOf(row.get("numberField_memejxqp")).equals("") ? "0" : String.valueOf(row.get("numberField_memejxqp")));  //税额
                         itemObj.put("SGTXT", String.valueOf(row.get("textField_mejfoonz")));  //行项目文本
                         itemArray.put(itemObj);
@@ -400,6 +400,23 @@ public class NonPoServerImpl implements NonPoServer {
 
     }
 
+    @Override
+    public void NonPoinsetSAP0005list() {
+        List<Map<String, Object>> conditions = new ArrayList<>(Arrays.asList(buildCondition("selectField_mi72r4s6", "待推送", "TEXT", "eq", "SelectField")));
+        String listJson = JSON.toJSONString(conditions);
+        YDParam YGydParam = _getNPonlist(listJson);
+        List<Map> dataList = (List<Map>) ydClient.queryData(YGydParam, YDConf.FORM_QUERY.retrieve_search_process).getData();
+        if (dataList != null && dataList.size() > 0) {
+            for (Map<String, Object> map : dataList) {
+                String insetid = map.get("formInstanceId").toString();
+
+               // this.NonPoinsetSAP0005("", insetid);
+
+            }
+        }
+
+    }
+
     /***
      * 发票勾选处理
      * @param InstanceId
@@ -755,6 +772,10 @@ public class NonPoServerImpl implements NonPoServer {
     public static YDParam _getYDTokenZXXZ(String searchFieldJson) {
         return YDParam.builder().appType("APP_N9NPHVTQLPBPO8MR6WFG").systemToken("UM6660D1PGF2O34KAVVKG8XZ756E3O06MZX5LW").formUuid("FORM-4J7669A10FO250UJ9C6Q7CM00PC62YPW8DD6LT").searchFieldJson(searchFieldJson).build();
     }
+    public static YDParam _getNPonlist(String searchFieldJson) {
+        return YDParam.builder().appType("APP_N9NPHVTQLPBPO8MR6WFG").systemToken("UM6660D1PGF2O34KAVVKG8XZ756E3O06MZX5LW").formUuid("FORM-E9A6EBE00F3E4DA68681107F85600D80ZJUT") .searchFieldJson(searchFieldJson) .approvedResult("agree").build();
+    }
+
 
 
     //匹配条件用