基础信息修复

mjava-wlh3tok3/src/main/java/com/malk/service/sync/SyncService.java

@@ -1042,7 +1042,10 @@ public class SyncService {
         supplier.put("curegcapital_number", "CNY"); // 注册资本币别
         supplier.put("businessterm", bizData.getString("F0000016")); // 营业期限
         supplier.put("businessscope", bizData.getString("F0000017")); // 经营范围
-        supplier.put("establishdate", formatDate(bizData.getString("F0000018"))); // 成立时间
+        if (bizData.getString("F0000018") != null && !bizData.getString("F0000018").trim().isEmpty()) {
+            supplier.put("establishdate", formatDate(bizData.getString("F0000018"))); // 成立时间
+        }
+
 
         supplier.put("createorg_number", bizData.getString("F0000007") == "" ? "001" : bizData.getString("F0000007")); // 创建组织
         supplier.put("country_number", "001"); // 国家
@@ -1058,6 +1061,8 @@ public class SyncService {
         supplier.put("linkman", bizData.getString("F0000010")); // 联系人
         supplier.put("bizpartner_phone", bizData.getString("F0000011")); // 电话】
         supplier.put("paycond_number", h3yunService.getFieldValueById("D293655sxvsttpe7re2tep6gvsdg", bizData.getString("F0000019"), "F0000001"));
+        // supplier.put("idno", bizData.getString("F0000028")); // 身份证号
+
 
         // 银行账户信息
         List<Map<String, Object>> bankList = new ArrayList<>();
@@ -1160,7 +1165,10 @@ public class SyncService {
         customer.put("curegcapital_number", "CNY"); // 注册资本币别
         customer.put("businessterm", bizData.getString("F0000024")); // 营业期限
         customer.put("businessscope", bizData.getString("F0000025")); // 经营范围
-        customer.put("establishdate", formatDate(bizData.getString("F0000026"))); // 成立时间
+        if (bizData.getString("F0000026") != null && !bizData.getString("F0000026").trim().isEmpty()) {
+            customer.put("establishdate", formatDate(bizData.getString("F0000026"))); // 成立时间
+        }
+
 
         // 组织相关
         customer.put("createorg_number", StrUtil.blankToDefault(bizData.getString("F0000019"), "001")); // 创建组织
@@ -1188,8 +1196,10 @@ public class SyncService {
         customer.put("modifier_number", StrUtil.blankToDefault(bizData.getString("UserID"), "43007523")); // 修改人
 
         customer.put("receivingcondid_number", h3yunService.getFieldValueById("D293655sv6bv8bozikwrkze3rk1", bizData.getString("F0000028"), "F0000001"));
-
-
+//身份证号
+        customer.put("idno", bizData.getString("F0000032"));
+////发票类型-无异议
+//        customer.put("invoicecategory_number", h3yunService.getFieldValueById("D293655sdzbyn4yqt0ub0k8e9euc", bizData.getString("F0000033"), "F0000001"));
         String k3Id = bizData.getString("K3id");
         if (k3Id != null && !k3Id.isEmpty()) {
             customer.put("id", k3Id);
@@ -1198,7 +1208,7 @@ public class SyncService {
         List<Map<String, Object>> groupStandardList = new ArrayList<>();//分类标准
         Map<String, Object> groupStandard = new LinkedHashMap<>();
         groupStandard.put("standardid_number", "JBFLBZ"); // 组内编码
-        groupStandard.put("groupid_number", extractGroupNumber(bizData.getString("F0000027"))); // 组合号
+        groupStandard.put("groupid_number", h3yunService.getFieldValueById("D293655syoqw97qcuoxuxbhjkzo", bizData.getString("F0000027"), "F0000001")); // 组合号
         groupStandardList.add(groupStandard);
 
         customer.put("entry_groupstandard", groupStandardList);
@@ -1262,14 +1272,14 @@ public class SyncService {
 
         project.put("createorg_number", h3yunService.getFieldValueById("D29365537feb4e5e8644b21b7fd938dd322dab3", bizData.getString("F0000042"), "F0000002"));
         if (bizData.getString("F0000043") != "") {
-            project.put("group_number", h3yunService.getFieldValueById("D29365537feb4e5e8644b21b7fd938dd322dab3", bizData.getString("F0000043"), "F0000002"));
+            project.put("group_number", h3yunService.getFieldValueById("D293655sgawiua6uedgcpglojm", bizData.getString("F0000043"), "F0000001"));
         }
 
 //        project.put("parent_number", bizData.getString("F0000004"));
-//        project.put("planbegindate", formatDate(bizData.getString("F0000005")));
-//        project.put("planenddate", formatDate(bizData.getString("F0000006")));
+        project.put("planbegindate", formatDate(bizData.getString("F0000050")));
+        project.put("planenddate", formatDate(bizData.getString("F0000051")));
 //        project.put("proaddress", bizData.getString("F0000007"));
-//        project.put("sourcetype", "A");
+        project.put("sourcetype", "C");
 
         String k3Id = bizData.getString("K3id");
         if (StrUtil.isNotBlank(k3Id)) {