diff --git a/src/main/java/com/management/controller/DesignController.java b/src/main/java/com/management/controller/DesignController.java index acfb415..7b585b5 100644 --- a/src/main/java/com/management/controller/DesignController.java +++ b/src/main/java/com/management/controller/DesignController.java @@ -197,6 +197,29 @@ public class DesignController { erpDesignMap.put("bizorg_number", orgCode);//采购组织 erpDesignMap.put("project_number", designDocData.getString("project_id__c") != null ? designDocData.getString("project_id__c") : "");//项目号(商机) + //项目经理 + List projectManagerList = designDocData.getJSONArray("project_manager__c") != null ? designDocData.getJSONArray("project_manager__c") : new ArrayList(); + + JSONObject getProjectManager = crmRequestUtil.getCRMList(Arrays.asList( + new Filter("EQ", "user_id", projectManagerList), + new Filter("EQ", "life_status", Arrays.asList("normal")) + ), "PersonnelObj"); + + JSONObject projectManagerRes = new JSONObject(); + + try { + projectManagerRes = restTemplate.postForObject(URLConstant.GET_CUSTOMIZE_LIST_URL, getProjectManager, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + + if ("success".equals(projectManagerRes.getString("errorDescription")) && !projectManagerRes.getJSONObject("data").getJSONArray("dataList").isEmpty()) { + JSONObject projectManagerData = projectManagerRes.getJSONObject("data").getJSONArray("dataList").getJSONObject(0); + + //封装项目经理 + erpDesignMap.put("projectuser_user", projectManagerData.getString("field_T1xid__c") != null ? projectManagerData.getString("field_T1xid__c") : ""); + } + //合同 String contractNo = ""; @@ -267,7 +290,7 @@ public class DesignController { long directDeliveryTime = designDocDetailData.getLong("direct_delivery_time__c") != null ? designDocDetailData.getLong("direct_delivery_time__c") : 0; Date directDeliveryDate = null; - if (directDeliveryTime != 0){ + if (directDeliveryTime != 0) { directDeliveryDate = new Date(directDeliveryTime); } diff --git a/src/main/java/com/management/tzcontroller/DeviceInstallController.java b/src/main/java/com/management/tzcontroller/DeviceInstallController.java index 1eaf500..c1841aa 100644 --- a/src/main/java/com/management/tzcontroller/DeviceInstallController.java +++ b/src/main/java/com/management/tzcontroller/DeviceInstallController.java @@ -199,7 +199,7 @@ public class DeviceInstallController { updaterStr = updaterJSON.getString("name"); } - deviceInstallMap.put("updater", updaterStr);//更新者 + deviceInstallMap.put("updateUser", updaterStr);//更新者 deviceInstallMap.put("deviceAttribute", 1);//todo 主副设备 //开始获取token @@ -391,7 +391,7 @@ public class DeviceInstallController { } } - deviceInstallMap.put("updater", updaterStr);//更新者 + deviceInstallMap.put("updateUser", updaterStr);//更新者 //开始获取token String token = new LedgerTokenController().getToken();