思库

mjava-siku/src/main/java/com/malk/siku/service/impl/SikuServiceImpl.java

@@ -149,12 +149,11 @@ public class SikuServiceImpl implements SikuService {
 
             List<Map> data2 = UtilMap.getList(result2, "data");
             String status2 = UtilMap.getString(data2.get(0), "status");
-            if ("ALL_FAIL".equals(status2)){
-                String message = UtilMap.getString(data2.get(0), "message");
-
+            String message2 = UtilMap.getString(data2.get(0), "message");
+            if ("ALL_FAIL".equals(status2) || Strings.isNotBlank(message2)){
                 ydClient.operateData(YDParam.builder()
                         .formInstanceId(formInstId)
-                        .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("selectField_mmx7nk6m, textareaField_mmx7nk6r","入库成功，账号保存失败",message)))
+                        .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("selectField_mmx7nk6m, textareaField_mmx7nk6r","入库成功，账号保存失败",message2)))
                         .build(), YDConf.FORM_OPERATION.update);
             }else {
                 ydClient.operateData(YDParam.builder()
@@ -288,7 +287,9 @@ public class SikuServiceImpl implements SikuService {
     private boolean isTrue(Map result){
         String messageCode = UtilMap.getString(result, "messageCode");
 
-        if (Objects.nonNull(messageCode) && "SUCCESS".equals(messageCode)){
+        String code = UtilMap.getString(result,"code");
+
+        if ((Objects.nonNull(messageCode) && "SUCCESS".equals(messageCode)) || (Objects.nonNull(code) && "ACK".equals(code))){
             return true;
         }else {
             return false;
@@ -477,16 +478,17 @@ public class SikuServiceImpl implements SikuService {
                 customObject.put("CF1",projectCode);//项目
                 customObject.put("CF7",UtilMap.getString(detail,"numberField_mmwt2wcn"));//逾期天数
 
+                Map consumeAmount = new HashMap();
+                consumeAmount.put("amount",String.format("%.2f", UtilMap.getDouble(detail,"numberField_mkkmij5e")));//结算金额
+                consumeAmount.put("currency","CNY");
+
+                customObject.put("CF42",consumeAmount);//采购金额
 
                 body.put("customObject",customObject);
 
                 //报销单费用导入
                 Map expenseListItem = new HashMap();
 
-                Map consumeAmount = new HashMap();
-                consumeAmount.put("amount",String.format("%.2f", UtilMap.getDouble(detail,"numberField_mkkmij5e")));//结算金额
-                consumeAmount.put("currency","CNY");
-
                 expenseListItem.put("consumeAmount",consumeAmount);
                 expenseListItem.put("corpExpense",true);//是否对公费用，需要填写true
                 String gysej = UtilMap.getString(detail, "selectField_mkkkw28y");//供应商二级
@@ -524,6 +526,18 @@ public class SikuServiceImpl implements SikuService {
 
                 Map result = MkBxUtil.receiveReimburse(body);
 
+                if (isTrue(result)){
+                    ydClient.operateData(YDParam.builder()
+                            .formInstanceId(formInstId)
+                            .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("selectField_mpp9c6w9, textareaField_mpp9c6wa","推送成功","")))
+                            .build(), YDConf.FORM_OPERATION.update);
+                }else {
+                    String message = UtilMap.getString(result, "message");
+                    ydClient.operateData(YDParam.builder()
+                            .formInstanceId(formInstId)
+                            .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("selectField_mpp9c6w9, textareaField_mpp9c6wa","推送失败",message)))
+                            .build(), YDConf.FORM_OPERATION.update);
+                }
             }
         }else {
             List<Map> detailList = UtilMap.getList(formData, "tableField_mkkmij61");//free-采购明细
@@ -554,7 +568,7 @@ public class SikuServiceImpl implements SikuService {
                 }
                 body.put("coverDepartmentBizCode",coverDepartmentBizCode);//承担部门编码
 
-                body.put("reimburseName","FREE-" + UtilMap.getString(detail,"selectField_mkkixdd7"));//报销事由
+                body.put("reimburseName","FREE-" + UtilMap.getString(detail,"textareaField_mkkmij64"));//报销事由
                 body.put("legalEntityBizCode",legalEntityBizCode);//公司抬头编码
                 body.put("tradingPartnerBizCode",UtilMap.getString(detail,"textField_mmekbfa2"));//往来单位编码
 
@@ -567,15 +581,17 @@ public class SikuServiceImpl implements SikuService {
                 customObject.put("CF1",projectCode);//项目
                 customObject.put("CF7",UtilMap.getString(detail,"numberField_mmwswtkx"));//逾期天数
 
+                Map consumeAmount = new HashMap();
+                consumeAmount.put("amount",String.format("%.2f", UtilMap.getDouble(detail,"numberField_mkkmij6p")));//结算金额
+                consumeAmount.put("currency","CNY");
+
+                customObject.put("CF42",consumeAmount);//采购金额
+
                 body.put("customObject",customObject);
 
                 //报销单费用导入
                 Map expenseListItem = new HashMap();
 
-                Map consumeAmount = new HashMap();
-                consumeAmount.put("amount",String.format("%.2f", UtilMap.getDouble(detail,"numberField_mkkmij6p")));//结算金额
-                consumeAmount.put("currency","CNY");
-
                 expenseListItem.put("consumeAmount",consumeAmount);
                 expenseListItem.put("corpExpense",true);//是否对公费用，需要填写true
                 String gysej = UtilMap.getString(detail, "selectField_mmwuzaql");//供应商二级
@@ -613,6 +629,18 @@ public class SikuServiceImpl implements SikuService {
 
                 Map result = MkBxUtil.receiveReimburse(body);
 
+                if (isTrue(result)){
+                    ydClient.operateData(YDParam.builder()
+                            .formInstanceId(formInstId)
+                            .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("selectField_mpp9c6w9, textareaField_mpp9c6wa","推送成功","")))
+                            .build(), YDConf.FORM_OPERATION.update);
+                }else {
+                    String message = UtilMap.getString(result, "message");
+                    ydClient.operateData(YDParam.builder()
+                            .formInstanceId(formInstId)
+                            .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("selectField_mpp9c6w9, textareaField_mpp9c6wa","推送失败",message)))
+                            .build(), YDConf.FORM_OPERATION.update);
+                }
             }
 
         }
@@ -1296,15 +1324,17 @@ public class SikuServiceImpl implements SikuService {
                 customObject.put("CF1",projectCode);//项目
                 customObject.put("CF7",UtilMap.getString(detail,"numberField_mmwswtkv"));//逾期天数
 
+                Map consumeAmount = new HashMap();
+                consumeAmount.put("amount",String.format("%.2f", UtilMap.getDouble(detail,"numberField_mkkmij5e")));//结算金额
+                consumeAmount.put("currency","CNY");
+
+                customObject.put("CF42",consumeAmount);//采购金额
+
                 body.put("customObject",customObject);
 
                 //报销单费用导入
                 Map expenseListItem = new HashMap();
 
-                Map consumeAmount = new HashMap();
-                consumeAmount.put("amount",String.format("%.2f", UtilMap.getDouble(detail,"numberField_mkkmij5e")));//结算金额
-                consumeAmount.put("currency","CNY");
-
                 expenseListItem.put("consumeAmount",consumeAmount);
                 expenseListItem.put("corpExpense",true);//是否对公费用，需要填写true
                 String gysej = UtilMap.getString(detail, "selectField_mkkkw28y");//供应商二级
@@ -1342,6 +1372,18 @@ public class SikuServiceImpl implements SikuService {
 
                 Map result = MkBxUtil.receiveReimburse(body);
 
+                if (isTrue(result)){
+                    ydClient.operateData(YDParam.builder()
+                            .formInstanceId(formInstId)
+                            .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("selectField_mpp9c6w9, textareaField_mpp9c6wa","推送成功","")))
+                            .build(), YDConf.FORM_OPERATION.update);
+                }else {
+                    String message = UtilMap.getString(result, "message");
+                    ydClient.operateData(YDParam.builder()
+                            .formInstanceId(formInstId)
+                            .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("selectField_mpp9c6w9, textareaField_mpp9c6wa","推送失败",message)))
+                            .build(), YDConf.FORM_OPERATION.update);
+                }
             }
         }else {
             List<Map> detailList = UtilMap.getList(formData, "tableField_mkkmij61");//free-采购明细
@@ -1373,7 +1415,7 @@ public class SikuServiceImpl implements SikuService {
                 body.put("coverDepartmentBizCode",coverDepartmentBizCode);//承担部门编码
 
 
-                body.put("reimburseName","FREE-" + UtilMap.getString(detail,"selectField_mkkixdd7"));//报销事由
+                body.put("reimburseName","FREE-" + UtilMap.getString(detail,"textareaField_mkkmij64"));//报销事由
                 body.put("legalEntityBizCode",legalEntityBizCode);//公司抬头编码
                 body.put("tradingPartnerBizCode",UtilMap.getString(detail,"textField_mmekbfa2"));//往来单位编码
 
@@ -1386,15 +1428,17 @@ public class SikuServiceImpl implements SikuService {
                 customObject.put("CF1",projectCode);//项目
                 customObject.put("CF7",UtilMap.getString(detail,"numberField_mmwswtkx"));//逾期天数
 
+                Map consumeAmount = new HashMap();
+                consumeAmount.put("amount",String.format("%.2f", UtilMap.getDouble(detail,"numberField_mkkmij6p")));//结算金额
+                consumeAmount.put("currency","CNY");
+
+                customObject.put("CF42",consumeAmount);//采购金额
+
                 body.put("customObject",customObject);
 
                 //报销单费用导入
                 Map expenseListItem = new HashMap();
 
-                Map consumeAmount = new HashMap();
-                consumeAmount.put("amount",String.format("%.2f", UtilMap.getDouble(detail,"numberField_mkkmij6p")));//结算金额
-                consumeAmount.put("currency","CNY");
-
                 expenseListItem.put("consumeAmount",consumeAmount);
                 expenseListItem.put("corpExpense",true);//是否对公费用，需要填写true
                 String gysej = UtilMap.getString(detail, "selectField_mmwuzaql");//供应商二级
@@ -1431,12 +1475,27 @@ public class SikuServiceImpl implements SikuService {
 
 
                 Map result = MkBxUtil.receiveReimburse(body);
+
+                if (isTrue(result)){
+                    ydClient.operateData(YDParam.builder()
+                            .formInstanceId(formInstId)
+                            .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("selectField_mpp9c6w9, textareaField_mpp9c6wa","推送成功","")))
+                            .build(), YDConf.FORM_OPERATION.update);
+                }else {
+                    String message = UtilMap.getString(result, "message");
+                    ydClient.operateData(YDParam.builder()
+                            .formInstanceId(formInstId)
+                            .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("selectField_mpp9c6w9, textareaField_mpp9c6wa","推送失败",message)))
+                            .build(), YDConf.FORM_OPERATION.update);
+                }
             }
         }
 
         return McR.success();
     }
 
+
+
     @Override
     public McR checkBudgetAmt(Map map) {
         String projectCode = UtilMap.getString(map, "projectCode");