|
|
@ -578,17 +578,10 @@ public class DepositoryRecordController { |
|
|
// 获取当前部门负责人
|
|
|
// 获取当前部门负责人
|
|
|
List<UserByPort> departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken); |
|
|
List<UserByPort> departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken); |
|
|
StringBuilder departmentHeadId = new StringBuilder(); |
|
|
StringBuilder departmentHeadId = new StringBuilder(); |
|
|
StringBuilder departMentHeadQyWxName = new StringBuilder(); |
|
|
|
|
|
// for (UserByPort departmentHeadByUser : departmentHeadByUsers) {
|
|
|
// for (UserByPort departmentHeadByUser : departmentHeadByUsers) {
|
|
|
// departmentHeadId.append(departmentHeadByUser.getId()).append(",");
|
|
|
// departmentHeadId.append(departmentHeadByUser.getId()).append(",");
|
|
|
// String workwechat = departmentHeadByUser.getWorkwechat();
|
|
|
|
|
|
// if (workwechat == null || "".equals(workwechat)) {
|
|
|
|
|
|
// workwechat = departmentHeadByUser.getWechat();
|
|
|
|
|
|
// }
|
|
|
|
|
|
// departMentHeadQyWxName.append(workwechat + ",");
|
|
|
|
|
|
// }
|
|
|
// }
|
|
|
departmentHeadId = new StringBuilder("78").append(","); |
|
|
departmentHeadId = new StringBuilder("78").append(","); |
|
|
departMentHeadQyWxName = new StringBuilder("PangFuZhen").append(","); |
|
|
|
|
|
map.put("departmenthead", departmentHeadId.toString()); |
|
|
map.put("departmenthead", departmentHeadId.toString()); |
|
|
List<Integer> params = (List<Integer>) map.get("params"); |
|
|
List<Integer> params = (List<Integer>) map.get("params"); |
|
|
Integer integer = 0; |
|
|
Integer integer = 0; |
|
|
@ -1266,19 +1259,11 @@ public class DepositoryRecordController { |
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(usertoken); |
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(usertoken); |
|
|
List<UserByPort> departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken); |
|
|
List<UserByPort> departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken); |
|
|
StringBuilder departmentHeadId = new StringBuilder(); |
|
|
StringBuilder departmentHeadId = new StringBuilder(); |
|
|
StringBuilder departMentHeadQyWxName = new StringBuilder(); |
|
|
|
|
|
// for (UserByPort departmentHeadByUser : departmentHeadByUsers) {
|
|
|
// for (UserByPort departmentHeadByUser : departmentHeadByUsers) {
|
|
|
// departmentHeadId.append(departmentHeadByUser.getId()).append(",");
|
|
|
// departmentHeadId.append(departmentHeadByUser.getId()).append(",");
|
|
|
// String workwechat = departmentHeadByUser.getWorkwechat();
|
|
|
|
|
|
// if (workwechat == null || "".equals(workwechat)) {
|
|
|
|
|
|
// workwechat = departmentHeadByUser.getWechat();
|
|
|
|
|
|
// }
|
|
|
|
|
|
// departMentHeadQyWxName.append(workwechat + ",");
|
|
|
|
|
|
// }
|
|
|
// }
|
|
|
departmentHeadId.append("78").append(","); |
|
|
departmentHeadId.append("78").append(","); |
|
|
departMentHeadQyWxName.append("PangFuZhen").append(","); |
|
|
|
|
|
map.put("departmenthead", departmentHeadId.toString()); |
|
|
map.put("departmenthead", departmentHeadId.toString()); |
|
|
map.put("departMentHeadQyWxName", departMentHeadQyWxName.toString()); |
|
|
|
|
|
if (map.containsKey("constructionUnitId")) { |
|
|
if (map.containsKey("constructionUnitId")) { |
|
|
String constructionUnitId = map.get("constructionUnitId").toString(); |
|
|
String constructionUnitId = map.get("constructionUnitId").toString(); |
|
|
if ("".equals(constructionUnitId)) { |
|
|
if ("".equals(constructionUnitId)) { |
|
|
@ -1707,17 +1692,10 @@ public class DepositoryRecordController { |
|
|
// 获取部门负责人
|
|
|
// 获取部门负责人
|
|
|
List<UserByPort> departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken); |
|
|
List<UserByPort> departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken); |
|
|
StringBuilder departmentHeadId = new StringBuilder(); |
|
|
StringBuilder departmentHeadId = new StringBuilder(); |
|
|
StringBuilder departMentHeadQyWxName = new StringBuilder(); |
|
|
|
|
|
// for (UserByPort departmentHeadByUser : departmentHeadByUsers) {
|
|
|
// for (UserByPort departmentHeadByUser : departmentHeadByUsers) {
|
|
|
// departmentHeadId.append(departmentHeadByUser.getId()).append(",");
|
|
|
// departmentHeadId.append(departmentHeadByUser.getId()).append(",");
|
|
|
// String workwechat = departmentHeadByUser.getWorkwechat();
|
|
|
|
|
|
// if(workwechat == null || "".equals(workwechat)){
|
|
|
|
|
|
// workwechat = departmentHeadByUser.getWechat();
|
|
|
|
|
|
// }
|
|
|
|
|
|
// departMentHeadQyWxName.append(workwechat).append(",");
|
|
|
|
|
|
// }
|
|
|
// }
|
|
|
departmentHeadId = new StringBuilder("78").append(","); |
|
|
departmentHeadId = new StringBuilder("78").append(","); |
|
|
departMentHeadQyWxName = new StringBuilder("PangFuZhen").append(","); |
|
|
|
|
|
map.put("departmenthead", departmentHeadId.toString()); |
|
|
map.put("departmenthead", departmentHeadId.toString()); |
|
|
map.put("adminorgId", userToken.getMaindeparment()); |
|
|
map.put("adminorgId", userToken.getMaindeparment()); |
|
|
map.put("createUid", userToken.getId()); |
|
|
map.put("createUid", userToken.getId()); |
|
|
@ -1997,17 +1975,10 @@ public class DepositoryRecordController { |
|
|
// 获取部门负责人
|
|
|
// 获取部门负责人
|
|
|
List<UserByPort> departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken); |
|
|
List<UserByPort> departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken); |
|
|
StringBuilder departmentHeadId = new StringBuilder(); |
|
|
StringBuilder departmentHeadId = new StringBuilder(); |
|
|
StringBuilder departMentHeadQyWxName = new StringBuilder(); |
|
|
|
|
|
// for (UserByPort departmentHeadByUser : departmentHeadByUsers) {
|
|
|
// for (UserByPort departmentHeadByUser : departmentHeadByUsers) {
|
|
|
// departmentHeadId.append(departmentHeadByUser.getId()).append(",");
|
|
|
// departmentHeadId.append(departmentHeadByUser.getId()).append(",");
|
|
|
// String workwechat = departmentHeadByUser.getWorkwechat();
|
|
|
|
|
|
// if (workwechat == null || "".equals(workwechat)) {
|
|
|
|
|
|
// workwechat = departmentHeadByUser.getWechat();
|
|
|
|
|
|
// }
|
|
|
|
|
|
// departMentHeadQyWxName.append(workwechat + ",");
|
|
|
|
|
|
// }
|
|
|
// }
|
|
|
departmentHeadId = new StringBuilder("78").append(","); |
|
|
departmentHeadId = new StringBuilder("78").append(","); |
|
|
departMentHeadQyWxName = new StringBuilder("PangFuZhen").append(","); |
|
|
|
|
|
mainRecord.put("applicantId", userToken.getId()); |
|
|
mainRecord.put("applicantId", userToken.getId()); |
|
|
mainRecord.put("applyRemark", ""); |
|
|
mainRecord.put("applyRemark", ""); |
|
|
mainRecord.put("quantity", sumQuantity.toString()); |
|
|
mainRecord.put("quantity", sumQuantity.toString()); |
|
|
|