shilei
/
E10-njpmsreport
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#weaver-njpmsreport-2# 处理流程不对的问题

Browse Source
devlop
shilei 10 months ago
parent 29267cfc45
commit 1bb01f6085
2 changed files with 75 additions and 19 deletions
Show Stats Download Patch File Download Diff File

16
src/main/java/com/weaver/seconddev/njprojectreport/controller/ProjectColumnsController.java
Unescape Escape View File

@ -37,7 +37,6 @@ public class ProjectColumnsController {
public String tenant_key = "t7akvdnf84" ;
public String jtjname = "第三集团军";
public String qiyuesuoid = "9081413488803384317";
public String group_id = "" ;
public String permissionEmployee = "9078080309085655917,6488080121949444347" ;
@ -193,7 +192,11 @@ public class ProjectColumnsController {
return WeaResult.success(recordList);
}
/**
* 流程
* @param request
* @return
*/
@GetMapping("/getProjectRequestId")
@WeaPermission(publicPermission = true)
public WeaResult<Object> getProjectRequestId(HttpServletRequest request){
@ -205,7 +208,7 @@ public class ProjectColumnsController {
/***
*
* 流程
* @param request
* @return
*/
@ -215,7 +218,14 @@ public class ProjectColumnsController {
String otherid = CommonUtils.null2String(request.getParameter("otherid")).trim();
if(StringUtils.isBlank(otherid)){
String pkey = "pms.knowledgeshare.others" ;
String userids = columnsUtils.getUfPropData(pkey,tenant_key);
log.error("userids:"+userids);
if(StringUtils.isNotBlank(userids)){
permissionEmployee = userids ;
}
otherid = permissionEmployee;
log.error("otherid:"+otherid);
}
String xm_id = CommonUtils.null2String(request.getParameter("xmid")).trim();
String xm_mc = CommonUtils.null2String(request.getParameter("xmmc")).trim();

78
src/main/java/com/weaver/seconddev/njprojectreport/util/ColumnsUtils.java
Unescape Escape View File

@ -657,8 +657,8 @@ public class ColumnsUtils {
if(StringUtils.isNotBlank(mainlineid))
{
String dataSql =" select p.requestname,l.requestid " +
" from wfc_form_data l\n" +
" inner join formtable_main_963 d on d.id = l.dataid\n" +
" from formtable_main_963 d \n" +
" inner join wfc_form_data l on d.id = l.dataid\n" +
" inner join wfc_requestbase p on p.requestid = l.requestid\n" +
" where (d.xm=? or d.xmid=?)\n" +
" and d.tenant_key=?\n" +
@ -674,12 +674,12 @@ public class ColumnsUtils {
List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
SqlParamEntity sqlParamEntity = new SqlParamEntity();
sqlParamEntity.setParamType(SqlParamType.LONG);
sqlParamEntity.setParamType(SqlParamType.VARCHAR);
sqlParamEntity.setValue(mainlineid);
sqlparam.add(sqlParamEntity);
sqlParamEntity = new SqlParamEntity();
sqlParamEntity.setParamType(SqlParamType.LONG);
sqlParamEntity.setParamType(SqlParamType.VARCHAR);
sqlParamEntity.setValue(mainlineid);
sqlparam.add(sqlParamEntity);
@ -702,8 +702,9 @@ public class ColumnsUtils {
recordList = databaseUtils.getDataSourceList(result);
if(CollectionUtils.isEmpty(recordList)) {
dataSql=" select p.requestname,l.requestid from wfc_form_data l\n" +
" inner join formtable_main_3786 d on d.id = l.dataid\n" +
dataSql=" select p.requestname,l.requestid " +
" from formtable_main_3786 d \n" +
" inner join wfc_form_data l on d.id = l.dataid\n" +
" inner join wfc_requestbase p on p.requestid = l.requestid\n" +
" where d.xm=?\n" +
" and d.tenant_key=?\n" +
@ -713,8 +714,9 @@ public class ColumnsUtils {
" and p.tenant_key=?\n" +
" and p.delete_type=0\n" +
" union \n" +
" select p.requestname,l.requestid from wfc_form_data l\n" +
" inner join formtable_main_961 d on d.id = l.dataid\n" +
" select p.requestname,l.requestid " +
" from formtable_main_961 d \n" +
" inner join wfc_form_data l on d.id = l.dataid\n" +
" inner join wfc_requestbase p on p.requestid = l.requestid\n" +
" where d.xm=? \n" +
" and d.tenant_key=?\n" +
@ -728,7 +730,7 @@ public class ColumnsUtils {
List<SqlParamEntity> sqlparam2 = new ArrayList<SqlParamEntity>();
SqlParamEntity sqlParamEntity2 = new SqlParamEntity();
sqlParamEntity2.setParamType(SqlParamType.LONG);
sqlParamEntity2.setParamType(SqlParamType.VARCHAR);
sqlParamEntity2.setValue(mainlineid);
sqlparam2.add(sqlParamEntity2);
@ -748,7 +750,7 @@ public class ColumnsUtils {
sqlparam2.add(sqlParamEntity2);
sqlParamEntity2 = new SqlParamEntity();
sqlParamEntity2.setParamType(SqlParamType.LONG);
sqlParamEntity2.setParamType(SqlParamType.VARCHAR);
sqlParamEntity2.setValue(mainlineid);
sqlparam2.add(sqlParamEntity2);
@ -771,8 +773,8 @@ public class ColumnsUtils {
recordList = databaseUtils.getDataSourceList(result);
if(CollectionUtils.isEmpty(recordList)) {
dataSql = " select p.requestname,l.requestid " +
" from wfc_form_data l\n" +
" inner join formtable_main_3785 d on d.id = l.dataid\n" +
" from formtable_main_3785 d \n" +
" inner join wfc_form_data l on d.id = l.dataid\n" +
" inner join wfc_requestbase p on p.requestid = l.requestid\n" +
" where d.xm=?\n" +
" and d.tenant_key=?\n" +
@ -786,7 +788,7 @@ public class ColumnsUtils {
List<SqlParamEntity> sqlparam3 = new ArrayList<SqlParamEntity>();
SqlParamEntity sqlParamEntity3 = new SqlParamEntity();
sqlParamEntity3.setParamType(SqlParamType.LONG);
sqlParamEntity3.setParamType(SqlParamType.VARCHAR);
sqlParamEntity3.setValue(mainlineid);
sqlparam3.add(sqlParamEntity3);
@ -1006,9 +1008,9 @@ public class ColumnsUtils {
" inner join ec_customerservice.proj_pms_base p on p.form_data_id = fd.form_data_id "+
" inner join ec_customerservice.mainline_status_custom msc on msc.mainline_id = m.id "+
" inner join ec_customerservice.mainline_cust_status mcs on msc.status_id = mcs.id "+
" inner join ( select id,username from eteams.employee where tenant_key = ? ) e on m.manager = e.id "+
" inner join ( select id,name from eteams.department where type = 'department' and tenant_key = ? ) d on e.department = d.id "+
" inner join ( select id,name from eteams.department where type = 'subcompany' and tenant_key = ? ) d2 on d.subcompanyid = d2.id "+
" inner join ( select id,username,department from eteams.employee where tenant_key = ? ) e on m.manager = e.id "+
" inner join ( select id,name,subcompanyid from eteams.department where type = 'department' and tenant_key = ? ) d on e.department = d.id "+
" inner join ( select id,name,subcompanyid from eteams.department where type = 'subcompany' and tenant_key = ? ) d2 on d.subcompanyid = d2.id "+
" where m.group_id = '"+group_id+"' " +
" and m.delete_type = 0 and m.tenant_key = ? " +
" and fd.delete_type = 0 and fd.tenant_key = ? " +
@ -2031,4 +2033,48 @@ public class ColumnsUtils {
//// }
// return recordList;
// }
/***
*
* @param pkey
* @param tenant_key
* @return
*/
public String getUfPropData(String pkey,String tenant_key) {
String pvalue = "" ;
String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC";
try{
if(StringUtils.isNotBlank(pkey))
{
String dataSql =" select pvalue \n" +
" from uf_nj_prop \n" +
" where pkey = ? \n" +
" and delete_type = 0 \n" +
" and tenant_key='"+tenant_key+"'" ;
List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
SqlParamEntity sqlParamEntity = new SqlParamEntity();
sqlParamEntity.setParamType(SqlParamType.VARCHAR);
sqlParamEntity.setValue(pkey);
sqlparam.add(sqlParamEntity);
Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, dataSql,sqlparam);
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
if(CollectionUtils.isNotEmpty(recordList) && recordList.size() >0 ) {
Map<String,Object> recordMap = recordList.get(0);
if(recordMap.containsKey("pvalue")){
pvalue = String.valueOf(recordMap.get("pvalue"));
}
}
}
}catch (Exception e){
e.printStackTrace();
log.error("getUfPropData-Exception:"+e);
}
return pvalue;
}
}
Write Preview
Loading…
Cancel
Save