yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

个人视图展示效果修改

Browse Source
This commit is contained in:
Mr-wang 2023-07-17 20:14:29 +08:00
parent 1642c43f4d
commit 63b29b4e0e
1 changed files with 53 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/DataViewService.java
View File

@ -23,6 +23,8 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
import com.actionsoft.bpms.commons.database.RowMap;
import com.actionsoft.bpms.commons.mvc.view.ActionWeb;
import com.actionsoft.bpms.commons.mvc.view.ResponseObject;
import com.actionsoft.bpms.org.model.DepartmentModel;
import com.actionsoft.bpms.org.model.UserModel;
import com.actionsoft.bpms.server.RequestParams;
import com.actionsoft.bpms.server.UserContext;
import com.actionsoft.bpms.util.DBSql;
@ -249,12 +251,16 @@ public class DataViewService extends ActionWeb {
String positionName = POSITIONMap.getString("POSITION_NAME");
// if (nodeRowMap.getString("ROLE").equals(positionID) ||
// nodeRowMap.getString("POST").equals(positionID)) {
DepartmentModel departId = uc.getDepartmentModel();
String subDepartments = getSubDepartments(new ArrayList<>(), departId);
List<RowMap> nodeRowMaps = DBSql.getMaps(
"SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE5 WHERE POST LIKE '%"
+ positionName + "%'");
"SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE POST LIKE '%"
+ positionName + "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%'");
System.out.println("=========nodeRowMaps========>"+nodeRowMaps);
for (RowMap nodeRowMap : nodeRowMaps) {
String plId = nodeRowMap.getString("PLID");
RowMap fileRowMap = DBSql.getMap(
"SELECT FILESTATE,FILEID,PLNAME,PLMETHODID,PLLEVEL,PLORDERINDEX,RELEVANTFILE,SUPPORTFILE,PROCESSKPI FROM BO_EU_PAL_FILE1 WHERE FILEID = '"
+ plId + "'");
@ -619,9 +625,15 @@ public class DataViewService extends ActionWeb {
long start = System.currentTimeMillis();
String POSITION_NAME = UserContext.fromUID(uid).getUserModel().getPositionName();
if (UtilString.isNotEmpty(POSITION_NAME)) {
DepartmentModel departId = uc.getDepartmentModel();
String subDepartments = getSubDepartments(new ArrayList<>(), departId);
List<RowMap> nodeRowMaps = DBSql.getMaps(
"SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE POST LIKE '%"
+ POSITION_NAME + "%'");
+ POSITION_NAME + "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%'");
for (RowMap nodeRowMap : nodeRowMaps) {
String PLID = nodeRowMap.getString("PLID");
RowMap fileRowMap = DBSql.getMap(
@ -1048,13 +1060,25 @@ public class DataViewService extends ActionWeb {
// nodeRowMap.getString("POST").equals(positionID)) {
String positionName = UserContext.fromUID(uid).getUserModel().getPositionName();
String departName = UserContext.fromUID(uid).getDepartmentModel().getName();
DepartmentModel departId = uc.getDepartmentModel();
String subDepartments = getSubDepartments(new ArrayList<>(), departId);
String depaertName = "";
if (UtilString.isNotEmpty(subDepartments)){
subDepartments.substring(0,subDepartments.length()-1);
String[] split = subDepartments.split(",");
for (String name:
split) {
depaertName += "'"+name+"'";
}
}else {
depaertName = "'"+departId.getName()+"'";
}
List<RowMap> nodeRowMaps = DBSql.getMaps(
"SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE POST LIKE '%"
+ positionName + "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%' ");
+ positionName + "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%' OR POST in("+depaertName+") ");
List<RowMap> DepartnodeRowMaps = DBSql.getMaps(
"SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE POST LIKE '%"
+ departName + "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%' ");
+ departName + "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%' OR POST IN("+depaertName+") ");
System.out.println("=========nodeRowMaps========>"+nodeRowMaps);
System.out.println("=========DepartnodeRowMaps========>"+DepartnodeRowMaps);
for (RowMap nodeRowMap : nodeRowMaps) {
@ -2035,4 +2059,27 @@ public class DataViewService extends ActionWeb {
}
}
public String getSubDepartments( ArrayList<String> arr,
DepartmentModel departmentById) {
String departName = "";
if (!departmentById.isClosed()) {
List<DepartmentModel> subDepartments = SDK.getORGAPI().getSubDepartments(departmentById.getId());
for (DepartmentModel departmentModel : subDepartments) {
if (!departmentModel.isClosed()) {
String name = departmentModel.getName();
String id = departmentModel.getId();
departName+=name+",";
// 递归获取子部门下的子部门
if (SDK.getORGAPI().isExistSubDepartment(id)) {
getSubDepartments( arr, SDK.getORGAPI().getDepartmentById(id));
}
}
}
}
return departName;
}
}