weiloong_zhang/zhyManagement
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设计文件优化，设备安装bug修复

Browse Source
This commit is contained in:
itzhang 2025-08-28 10:18:03 +08:00
parent 5129217e29
commit 50909e998d
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/management/controller/DesignController.java
View File

@ -197,6 +197,29 @@ public class DesignController {
erpDesignMap.put("bizorg_number", orgCode);//采购组织 erpDesignMap.put("bizorg_number", orgCode);//采购组织
erpDesignMap.put("project_number", designDocData.getString("project_id__c") != null ? designDocData.getString("project_id__c") : "");//项目号（商机） 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 = ""; String contractNo = "";

4
src/main/java/com/management/tzcontroller/DeviceInstallController.java
View File

@ -199,7 +199,7 @@ public class DeviceInstallController {
updaterStr = updaterJSON.getString("name"); updaterStr = updaterJSON.getString("name");
} }
deviceInstallMap.put("updater", updaterStr);//更新者 deviceInstallMap.put("updateUser", updaterStr);//更新者
deviceInstallMap.put("deviceAttribute", 1);//todo 主副设备 deviceInstallMap.put("deviceAttribute", 1);//todo 主副设备
//开始获取token //开始获取token
@ -391,7 +391,7 @@ public class DeviceInstallController {
} }
} }
deviceInstallMap.put("updater", updaterStr);//更新者 deviceInstallMap.put("updateUser", updaterStr);//更新者
//开始获取token //开始获取token
String token = new LedgerTokenController().getToken(); String token = new LedgerTokenController().getToken();