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

定时任务修改给杨文军发送，个人试图修改u，附件排序问题修改

Browse Source
This commit is contained in:
Mr-wang 2023-08-01 13:53:20 +08:00
parent 70e8c22204
commit 357deca287
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/ijob.java
View File

@ -121,7 +121,7 @@ public class ijob implements IJob {
}*/ }*/
List<String> list = new LinkedList<>(); List<String> list = new LinkedList<>();
for (String user_id: /*for (String user_id:
sendList) { sendList) {
System.out.println("user_id================"+user_id); System.out.println("user_id================"+user_id);
List<BO> bo_eu_require_data = SDK.getBOAPI().query("BO_ACT_DATAID", true).addQuery("PROCESSID=", cc).addQuery("USER_ID=",user_id).list(); List<BO> bo_eu_require_data = SDK.getBOAPI().query("BO_ACT_DATAID", true).addQuery("PROCESSID=", cc).addQuery("USER_ID=",user_id).list();
@ -137,8 +137,8 @@ public class ijob implements IJob {
}else { }else {
continue; continue;
} }
} }*/
list.add("10056870");
System.out.println("新list>>>>>>"+list.size()); System.out.println("新list>>>>>>"+list.size());
System.out.println("剩余需要发送的人员清单>>>>>>>>>>>"+list.toString()); System.out.println("剩余需要发送的人员清单>>>>>>>>>>>"+list.toString());

18
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java
View File

@ -4109,6 +4109,24 @@ public class DesignerRelationShapeWeb extends ActionWeb {
JSONArray filePathArray = new JSONArray(new LinkedList<>()); JSONArray filePathArray = new JSONArray(new LinkedList<>());
//附件列表 //附件列表
List<FormFile> formFiles = SDK.getBOAPI().getFiles(boId, "CONTENT"); List<FormFile> formFiles = SDK.getBOAPI().getFiles(boId, "CONTENT");
Collections.sort(formFiles, new Comparator<FormFile>() {
@Override
public int compare(FormFile o1, FormFile o2) {
String p1 = o1.getFileName();
String p2 = o2.getFileName();
if ( p1.contains("、") && p2.contains("、") && StringUtils.isNumeric(p1.substring(0, p1.indexOf("、"))) && StringUtils.isNumeric(p2.substring(0, p2.indexOf("、")))) {
return Integer.parseInt(p1.substring(0, p1.indexOf("、"))) - Integer.parseInt(p2.substring(0, p2.indexOf("、")));
} else {
return 0;
}
}
});
for (FormFile formFile : formFiles) { for (FormFile formFile : formFiles) {
DCContext fileDCContext = SDK.getBOAPI().getFileDCContext(formFile); DCContext fileDCContext = SDK.getBOAPI().getFileDCContext(formFile);
fileDCContext.setSession(_uc); fileDCContext.setSession(_uc);

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

@ -1077,8 +1077,8 @@ public class DataViewService extends ActionWeb {
"SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE POST LIKE '%" "SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE POST LIKE '%"
+ positionName + "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%' OR POST in("+depaertName+") "); + positionName + "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%' OR POST in("+depaertName+") ");
List<RowMap> DepartnodeRowMaps = DBSql.getMaps( 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 '%" "SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE " +
+ departName + "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%' OR POST IN("+depaertName+") "); " POST LIKE '%内蒙古伊利实业集团股份有限公司%' OR POST IN("+depaertName+") ");
System.out.println("=========nodeRowMaps========>"+nodeRowMaps); System.out.println("=========nodeRowMaps========>"+nodeRowMaps);
System.out.println("=========DepartnodeRowMaps========>"+DepartnodeRowMaps); System.out.println("=========DepartnodeRowMaps========>"+DepartnodeRowMaps);
for (RowMap nodeRowMap : nodeRowMaps) { for (RowMap nodeRowMap : nodeRowMaps) {