Feature/wxj

ServiceSite/src/main/java/com/seasky/projectplan/application/command/prediction/SaveYBKZMoneySvrImpl.java

@@ -182,8 +182,8 @@ public class SaveYBKZMoneySvrImpl implements SaveYBKZMoneySvr {
     }
 
 
-
-    public void SubmitQuotaDeclarationyuanlai(ActionFlowCmd actionFlowCmd) {
+    @Override
+    public void SubmitQuotaDeclaration(ActionFlowCmd actionFlowCmd) {
         //根据id，查看预拨项是否存在
         ProjectPo projectPo = projectMapper.selectById(actionFlowCmd.getId());
         if (ObjectUtils.isEmpty(projectPo)) {
@@ -321,10 +321,24 @@ public class SaveYBKZMoneySvrImpl implements SaveYBKZMoneySvr {
                 );
             }
             //调用三方接口，判断是否立项
-            String info = tripartiteRPC.GetPojectBudgetData_arrival
-                    (expenseCardNumberPos.get(0).getNumber());
+            PageSelectModel pageSelectModel = new PageSelectModel();
+            pageSelectModel.setKeyWord(expenseCardNumberPos.get(0).getNumber());
+            pageSelectModel.setPageSize(1);
+            pageSelectModel.setPageNO(1);
+            String s = JSONObject.toJSONString(pageSelectModel);
+            String info = tripartiteRPC.GetPojectBudgetData_arrival(s);
+            JSONArray jsonArray = JSONArray.fromObject(info);
+            boolean flag = true;
+            for (int i = 0; i < jsonArray.size(); i++) {
+                String s1 = jsonArray.getJSONObject(i).get("projectCode").toString();
+                if (expenseCardNumberPos.get(0).getNumber().equals(s1)) {
+                    flag = false;
+                    break;
+                }
+            }
+
             //如果没有立项，需立项
-            if (Objects.equals(info, "false")) {
+            if (flag) {
 
                 Map<String, Object> budgetInfoMap = new HashMap<>(1);
                 budgetInfoMap.put("id", projectPlanBookPo.getProjectTypeId());
@@ -567,8 +581,8 @@ public class SaveYBKZMoneySvrImpl implements SaveYBKZMoneySvr {
      *
      * @param actionFlowCmd 动作流cmd
      */
-    @Override
-    public void SubmitQuotaDeclaration(ActionFlowCmd actionFlowCmd){
+
+    public void SubmitQuotaDeclaration111(ActionFlowCmd actionFlowCmd){
         //根据id，查看预拨项是否存在
         ProjectPo projectPo = projectMapper.selectById(actionFlowCmd.getId());
         if (ObjectUtils.isEmpty(projectPo)) {