合数

mjava-heshu/src/main/java/com/malk/heshu/controller/HeShuController.java

@@ -98,14 +98,14 @@ public class HeShuController {
             supplierEntity.setF_UNW_yida("https://garktl.aliwork.com/APP_QM42OEGLMNNGBLIJELJI/processDetail?formUuid=FORM-9C0EC03227CC49738447A27B4563779F0WLW&procInsId="+params.getString("fid"));
             String operator=UtilMap.getString(formData,"radioField_mma72l0t");// 操作类型 客商准入  客商更新
             if(operator.equals("客商更新")){
-                String fId=UtilMap.getString(formData,params.getString("textField_moi1ejl2"));
+                String fId=UtilMap.getString(formData,"textField_moi1ejl2");
                 if(!PublicUtil.isNull(fId)){
                     // 反审核
                     unAudit("BD_Supplier",fId);
                     supplierEntity.setFSupplierId(Integer.parseInt(fId));
                 }
             }
-            return  saveToAudit("BD_Supplier",supplierEntity,params.getString("fid"),params.getString("key"),"selectField_mogukmd9","textareaField_mogukmdb","textField_moi1ejl2");
+            return  saveToAudit("BD_Supplier",supplierEntity,params.getString("fid"),params.getString("key"),"selectField_mogukmd9","textareaField_mogukmdb","textField_moi1ejl2",null);
         }catch (Exception e){
             return McR.error("201",e.getMessage());
         }
@@ -130,13 +130,17 @@ public class HeShuController {
                 bkList.add(fBankInfo);
             }
             customerInfo.setFT_BD_CUSTBANK(bkList);
-            List<Map> list2=UtilMap.getList(formData,"tableField_mogukmdh");
-            List<CustomerInfo.CustContact> dzList=new ArrayList<>();
+            List<Map> list2=UtilMap.getList(formData,"tableField_mma72kx1");
+            List<ContactInfo> lxrList=new ArrayList<>();
             for(Map map:list2){
-                CustomerInfo.CustContact  custContact = BeanUtil.toBean(map, CustomerInfo.CustContact.class);
-                dzList.add(custContact);
+                ContactInfo contactInfo=new ContactInfo();
+                contactInfo.setFName(UtilMap.getString(map,"textField_mma72kx2"));
+                contactInfo.setFMobile(UtilMap.getString(map,"textField_mma72kx3"));
+                contactInfo.setFCompanyType("BD_Customer");
+                contactInfo.setFBizLocation(UtilMap.getString(map,"textField_mogukmdi"));
+                contactInfo.setFBizAddress(UtilMap.getString(map,"textField_mogukmdi"));
+                lxrList.add(contactInfo);
             }
-            customerInfo.setFT_BD_CUSTCONTACT(dzList);
             customerInfo.setFSALDEPTID(new FNumber(UtilMap.getString(formData,"textField_mogukmdd")));// 业务部门
             String custTypeValue=UtilMap.getString(formData,"radioField_mma72kxi");
             String custType;
@@ -157,24 +161,24 @@ public class HeShuController {
                     customerInfo.setFCUSTID(Integer.parseInt(fId));
                 }
             }
-            return  saveToAudit("BD_Customer",customerInfo,params.getString("fid"),params.getString("key"),"selectField_mogukmd8","textareaField_mogukmda","textField_moi1ejl1");
+            return  saveToAudit("BD_Customer",customerInfo,params.getString("fid"),params.getString("key"),"selectField_mogukmd8","textareaField_mogukmda","textField_moi1ejl1",lxrList);
         }catch (Exception e){
             return McR.error("201",e.getMessage());
         }
     }
 
 
-    private McR saveToAudit(String formid, Object object,String fid,String codeKey,String statusKey,String msgKey,String idKey) throws Exception {
+    private McR saveToAudit(String formid, Object object,String fid,String codeKey,String statusKey,String msgKey,String idKey,List<ContactInfo> lxrList) throws Exception {
         JSONObject resultObj = new JSONObject();
         K3CloudApi client = new K3CloudApi(initIden());
         String result=client.save(formid,JSONObject.toJSONString(UtilMap.map("Model",object)));
         resultObj.put("save",result);
         Gson gson = new Gson();
         RepoRet sRet = gson.fromJson(result, RepoRet.class);
+        JSONObject reObj = JSONObject.parseObject(result,JSONObject.class);
         if (sRet.isSuccessfully()) {
             if(!PublicUtil.isNull(codeKey)){
                 // 回写信息
-                JSONObject reObj = JSONObject.parseObject(result,JSONObject.class);
                 Map updateMap=UtilMap.map(codeKey,reObj.getJSONObject("Result").getString("Number"));
                 updateMap.put(statusKey,"成功");
                 updateMap.put(idKey,reObj.getJSONObject("Result").getString("Id"));// ID 内码
@@ -182,6 +186,13 @@ public class HeShuController {
                         JSONObject.toJSONString(updateMap)
                 ).build(), YDConf.FORM_OPERATION.update);
             }
+            if(lxrList!=null){
+                for (ContactInfo contactInfo : lxrList) {
+                    contactInfo.setFCompany(new FNumber(reObj.getJSONObject("Result").getString("Number")));
+                    String data=new Gson().toJson(contactInfo);
+                    String id=saveToAudit("BD_CommonContact",new Gson().fromJson(data,Object.class));
+                }
+            }
             JsonObject jsonData = new JsonObject();
             jsonData.addProperty("Ids", sRet.getResult().getId());
             String result2=client.submit(formid, jsonData.toString());
@@ -216,7 +227,19 @@ public class HeShuController {
         }
         return McR.error("203",JSONObject.toJSONString(resultObj));
     }
-
+    private String saveToAudit(String formid, Object object) throws Exception {
+        K3CloudApi client = new K3CloudApi(initIden());
+        String result=client.save(formid,JSONObject.toJSONString(UtilMap.map("Model",object)));
+        System.out.println(result);
+        Gson gson = new Gson();
+        RepoRet sRet = gson.fromJson(result, RepoRet.class);
+        JSONObject reObj = JSONObject.parseObject(result,JSONObject.class);
+        if (sRet.isSuccessfully()) {
+            return reObj.getJSONObject("Result").getString("Id");
+        }else {
+            return "";
+        }
+    }
     private void unAudit(String formid,String fNumber) throws Exception {
         K3CloudApi client = new K3CloudApi(initIden());
         Gson gson = new Gson();

mjava-heshu/src/main/java/com/malk/heshu/entity/ContactInfo.java

@@ -0,0 +1,26 @@
+package com.malk.heshu.entity;
+
+import lombok.Data;
+
+@Data
+public class ContactInfo {
+
+    private Integer FCONTACTID; //实体主键
+    private String FNumber; //编码
+    private String FName; //姓名 (必填项)
+    private FNumber Fex; //性别
+    private String FPost; //职务
+    private String FCompanyType; //类型 (必填项)
+    private FNumber FCompany; //所属公司
+    private String FTel; //固定电话
+    private String FMobile; //移动电话
+    private String FFax; //传真
+    private String FEmail; //邮箱
+    private String FBizAddress; //详细地址
+    private String FBizLocation; //地点名称
+    private String FBizLocNumber; //地点编码
+    private String FIsDefaultContact; //默认联系人
+    private String FIsDefaultConsignee; //默认收货地址
+    private String FForbidDate; //禁用日期
+    private FNumber FCustId; //客户编码
+}

mjava-heshu/src/main/java/com/malk/heshu/entity/CustomerInfo.java

@@ -149,9 +149,10 @@ public class CustomerInfo {
         private String FNUMBER1;                 // 交货地点编码
         @Alias("textField_mogukmdi")
         private String FNAME1;                   // 交货地点
+        @Alias("textField_mogukmdi")
         private String FADDRESS1;                // 详细地址
 //        @Alias("textField_mogukmdf")
-        private String FTContact;               // 联系人
+        private FNAME FTContact;               // 联系人
         @Alias("textField_mogukmdg")
         private String FMOBILE;                  // 移动电话
         private Integer FTRANSLEADTIME1;         // 运输提前期
@@ -160,6 +161,15 @@ public class CustomerInfo {
         private String FIsDefaultPayer;          // 默认付款地址
         private String FIsUsed;                  // 启用
     }
+
+    @Data
+    public static class FNAME {
+        private String FNAME;
+        public FNAME(String FNAME) {
+            this.FNAME = FNAME;
+        }
+        public FNAME() {}
+    }
     
     // 订货组织
     @Data

mjava-heshu/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
   servlet:
     multipart:
       max-file-size: 100MB

mjava-heshu/src/test/java/com/malk/heshu/JdTest.java

@@ -71,13 +71,17 @@ public class JdTest {
                 bkList.add(fBankInfo);
             }
             customerInfo.setFT_BD_CUSTBANK(bkList);
-            List<Map> list2=UtilMap.getList(formData,"tableField_mogukmdh");
-            List<CustomerInfo.CustContact> dzList=new ArrayList<>();
+            List<Map> list2=UtilMap.getList(formData,"tableField_mma72kx1");
+            List<ContactInfo> lxrList=new ArrayList<>();
             for(Map map:list2){
-                CustomerInfo.CustContact  custContact = BeanUtil.toBean(map, CustomerInfo.CustContact.class);
-                dzList.add(custContact);
+                ContactInfo contactInfo=new ContactInfo();
+                contactInfo.setFName(UtilMap.getString(map,"textField_mma72kx2"));
+                contactInfo.setFMobile(UtilMap.getString(map,"textField_mma72kx3"));
+                contactInfo.setFCompanyType("BD_Customer");
+                contactInfo.setFBizLocation(UtilMap.getString(map,"textField_mogukmdi"));
+                contactInfo.setFBizAddress(UtilMap.getString(map,"textField_mogukmdi"));
+                lxrList.add(contactInfo);
             }
-            customerInfo.setFT_BD_CUSTCONTACT(dzList);
             customerInfo.setFSALDEPTID(new FNumber(UtilMap.getString(formData,"textField_mogukmdd")));// 业务部门
             String custTypeValue=UtilMap.getString(formData,"radioField_mma72kxi");
             String custType;
@@ -90,7 +94,7 @@ public class JdTest {
             }
             customerInfo.setFGroup(new FNumber(custType));
             String operator=UtilMap.getString(formData,"radioField_mma72l0t");// 操作类型 客商准入  客商更新
-            if(operator.equals("客商准入")){
+            if(operator.equals("客商更新")){
                 String fId=UtilMap.getString(formData,"textField_moi1ejl1");
                 if(!PublicUtil.isNull(fId)){
                     // 反审核
@@ -98,7 +102,7 @@ public class JdTest {
                     customerInfo.setFCUSTID(Integer.parseInt(fId));
                 }
             }
-            McR mcr=saveToAudit("BD_Customer",customerInfo,params.getString("fid"),params.getString("key"),"selectField_mogukmd8","textareaField_mogukmda","textField_moi1ejl1");
+            McR mcr=saveToAudit("BD_Customer",customerInfo,params.getString("fid"),params.getString("key"),"selectField_mogukmd8","textareaField_mogukmda","textField_moi1ejl1",lxrList);
             System.out.println(JSONObject.toJSONString(mcr));
         }catch (Exception e){
         }
@@ -129,17 +133,17 @@ public class JdTest {
 //        System.out.println(saveToAudit("BD_Supplier",supplierEntity));
     }
 
-    private McR saveToAudit(String formid, Object object,String fid,String codeKey,String statusKey,String msgKey,String idKey) throws Exception {
+    private McR saveToAudit(String formid, Object object,String fid,String codeKey,String statusKey,String msgKey,String idKey,List<ContactInfo> lxrList) throws Exception {
         JSONObject resultObj = new JSONObject();
         K3CloudApi client = new K3CloudApi(initIden());
         String result=client.save(formid,JSONObject.toJSONString(UtilMap.map("Model",object)));
         resultObj.put("save",result);
         Gson gson = new Gson();
         RepoRet sRet = gson.fromJson(result, RepoRet.class);
+        JSONObject reObj = JSONObject.parseObject(result,JSONObject.class);
         if (sRet.isSuccessfully()) {
             if(!PublicUtil.isNull(codeKey)){
                 // 回写信息
-                JSONObject reObj = JSONObject.parseObject(result,JSONObject.class);
                 Map updateMap=UtilMap.map(codeKey,reObj.getJSONObject("Result").getString("Number"));
                 updateMap.put(statusKey,"成功");
                 updateMap.put(idKey,reObj.getJSONObject("Result").getString("Id"));// ID 内码
@@ -147,6 +151,13 @@ public class JdTest {
                         JSONObject.toJSONString(updateMap)
                 ).build(), YDConf.FORM_OPERATION.update);
             }
+            if(lxrList!=null){
+                for (ContactInfo contactInfo : lxrList) {
+                    contactInfo.setFCompany(new FNumber(reObj.getJSONObject("Result").getString("Number")));
+                    String data=new Gson().toJson(contactInfo);
+                    String id=saveToAudit("BD_CommonContact",new Gson().fromJson(data,Object.class));
+                }
+            }
             JsonObject jsonData = new JsonObject();
             jsonData.addProperty("Ids", sRet.getResult().getId());
             String result2=client.submit(formid, jsonData.toString());
@@ -262,8 +273,44 @@ public class JdTest {
         }
     }
 
+    @Test
+    public void update(){
+//        unAudit("BD_Customer","");
+    }
+
     @Test
     public void queryOrder2(){
+        ContactInfo contactInfo=new ContactInfo();
+        contactInfo.setFName("张三");
+        contactInfo.setFMobile("17700001111");
+        contactInfo.setFCompanyType("BD_Customer");
+        contactInfo.setFCompany(new FNumber("CUST5127"));
+        contactInfo.setFBizLocation("测试地址");
+        contactInfo.setFBizAddress("测试地址");
+        try {
+            String data=new Gson().toJson(contactInfo);
+            System.out.println(data);
+            JSONObject jsonObject=JSONObject.parseObject(data);
+            System.out.println(jsonObject);
+            String id=saveToAudit("BD_CommonContact",new Gson().fromJson(data,Object.class));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    private String saveToAudit(String formid, Object object) throws Exception {
+        K3CloudApi client = new K3CloudApi(initIden());
+        String result=client.save(formid,JSONObject.toJSONString(UtilMap.map("Model",object)));
+        System.out.println(result);
+        Gson gson = new Gson();
+        RepoRet sRet = gson.fromJson(result, RepoRet.class);
+        JSONObject reObj = JSONObject.parseObject(result,JSONObject.class);
+        if (sRet.isSuccessfully()) {
+            return reObj.getJSONObject("Result").getString("Id");
+        }else {
+            return "";
+        }
     }