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

#E10-40# 增加项目查询的接口

Browse Source
main
shilei 11 months ago
parent 8c9d21a0ca
commit b1b4f7cb57
1 changed files with 60 additions and 36 deletions
Show Stats Download Patch File Download Diff File

96
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitProjectDataCmd.java
Unescape Escape View File

@ -4,7 +4,6 @@ package com.weaver.seconddev.cockpit.cmd;
import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity;
import com.weaver.ebuilder.datasource.api.enums.SqlParamType; import com.weaver.ebuilder.datasource.api.enums.SqlParamType;
import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.framework.rpc.annotation.RpcReference;
import com.weaver.project.entity.SimpleMainline;
import com.weaver.project.service.RemoteMainlineService; import com.weaver.project.service.RemoteMainlineService;
import com.weaver.seconddev.cockpit.util.DatabaseUtils; import com.weaver.seconddev.cockpit.util.DatabaseUtils;
import com.weaver.teams.domain.user.SimpleEmployee; import com.weaver.teams.domain.user.SimpleEmployee;
@ -70,38 +69,45 @@ public class CockpitProjectDataCmd {
try { try {
String sql =" select w.* from (\n" + String sql =" select w.* from (\n" +
" select convert(m.id,char) as mainline_id,m.name as mainline_name,\n" + " select convert(m.id,char) as mainline_id,m.name as mainline_name,\n" +
" convert(m.manager,char) as manager_id,\n" + " convert(m.manager,char) as manager_id,e.username as manager_name,d.id as departmentid,d.name as departmentname,\n" +
" convert(p.rel_custom,char) as rel_custom,p.proj_amount,p.proj_approval_date,\n" + " convert(p.rel_custom,char) as rel_custom,p.proj_amount,p.proj_approval_date,\n" +
" p.actual_val_date \n" + " p.actual_val_date \n" +
" from ec_customerservice.mainline m \n" + " from ec_customerservice.mainline m \n" +
" inner JOIN ec_customerservice.mainline_form_data f ON f.mainline_id = m.id \n" + " inner JOIN ec_customerservice.mainline_form_data f ON f.mainline_id = m.id \n" +
" inner join ec_customerservice.proj_pms_base p on p.form_data_id = f.form_data_id \n" + " inner join ec_customerservice.proj_pms_base p on p.form_data_id = f.form_data_id \n" +
" inner join ec_customerservice.mainline_status_custom msc on msc.mainline_id = m.id \n" + " inner join ec_customerservice.mainline_status_custom msc on msc.mainline_id = m.id \n" +
" inner join ec_customerservice.mainline_cust_status mcs on msc.status_id = mcs.id\n" + " inner join ec_customerservice.mainline_cust_status mcs on msc.status_id = mcs.id\n" +
" where m.group_id = '4527875868755238091' \n" + " left join eteams.employee e ON m.manager = e.id \n" +
" and m.manager in( select id\n" + " left join eteams.department d ON e.department = d.id \n" +
" from eteams.employee \n" + " where m.group_id = '4527875868755238091' \n" +
" where (superior = "+employeeid+" or id = "+employeeid+")\n" + " and m.manager in( select id\n" +
" and status='normal'\n" + " from eteams.employee \n" +
" and delete_type=0" + " where (superior = "+employeeid+" or id = "+employeeid+")\n" +
" and tenant_key = '"+tenantKey+"'\n" + " and status='normal'\n" +
" and password is not null\n" + " and delete_type=0 " +
" )\n" + " and tenant_key = '"+tenantKey+"'\n" +
" and m.delete_type = 0 \n" + " )\n" +
" and m.tenant_key = '"+tenantKey+"'\n" + " and e.status = 'normal' " +
" and f.delete_type = 0 \n" + " and d.type='department' " +
" and f.tenant_key = '"+tenantKey+"'\n" + " and mcs.name <> '结案'" +
" and p.delete_type = 0\n" + " and m.delete_type = 0 \n" +
" and p.tenant_key = '"+tenantKey+"'\n" + " and m.tenant_key = '"+tenantKey+"'\n" +
" and msc.delete_type = 0\n" + " and f.delete_type = 0 \n" +
" and msc.tenant_key = '"+tenantKey+"'\n" + " and f.tenant_key = '"+tenantKey+"'\n" +
" and mcs.delete_type = 0\n" + " and p.delete_type = 0\n" +
" and mcs.tenant_key = '"+tenantKey+"'\n" + " and p.tenant_key = '"+tenantKey+"'\n" +
" and mcs.enabled = 1 \n" + " and msc.delete_type = 0\n" +
" and mcs.name <> '结案'\n" + " and msc.tenant_key = '"+tenantKey+"'\n" +
" order by m.create_time desc\n" + " and mcs.delete_type = 0\n" +
") w limit 6"; " and mcs.tenant_key = '"+tenantKey+"'\n" +
" and mcs.enabled = 1 \n" +
" and e.delete_type = 0 \n" +
" and e.tenant_key = '"+tenantKey+"'\n" +
" and d.delete_type = 0 \n" +
" and d.tenant_key = '"+tenantKey+"'\n" +
" order by m.create_time desc\n" +
") w limit 6";
log.error("sql:"+sql); log.error("sql:"+sql);
@ -134,7 +140,7 @@ public class CockpitProjectDataCmd {
String sql =" select w.* from (\n" + String sql =" select w.* from (\n" +
" select convert(m.id,char) as mainline_id,m.name as mainline_name,\n" + " select convert(m.id,char) as mainline_id,m.name as mainline_name,\n" +
" convert(m.manager,char) as manager_id,\n" + " convert(m.manager,char) as manager_id,e.username as manager_name,d.id as departmentid,d.name as departmentname,\n" +
" convert(p.rel_custom,char) as rel_custom,p.proj_amount,p.proj_approval_date,\n" + " convert(p.rel_custom,char) as rel_custom,p.proj_amount,p.proj_approval_date,\n" +
" p.actual_val_date \n" + " p.actual_val_date \n" +
" from ec_customerservice.mainline m \n" + " from ec_customerservice.mainline m \n" +
@ -142,6 +148,8 @@ public class CockpitProjectDataCmd {
" inner join ec_customerservice.proj_pms_base p on p.form_data_id = f.form_data_id \n" + " inner join ec_customerservice.proj_pms_base p on p.form_data_id = f.form_data_id \n" +
" inner join ec_customerservice.mainline_status_custom msc on msc.mainline_id = m.id \n" + " inner join ec_customerservice.mainline_status_custom msc on msc.mainline_id = m.id \n" +
" inner join ec_customerservice.mainline_cust_status mcs on msc.status_id = mcs.id\n" + " inner join ec_customerservice.mainline_cust_status mcs on msc.status_id = mcs.id\n" +
" left join eteams.employee e ON m.manager = e.id \n" +
" left join eteams.department d ON e.department = d.id \n" +
" where m.group_id = ? \n" + " where m.group_id = ? \n" +
" and m.manager in( select id\n" + " and m.manager in( select id\n" +
" from eteams.employee \n" + " from eteams.employee \n" +
@ -149,8 +157,10 @@ public class CockpitProjectDataCmd {
" and status='normal'\n" + " and status='normal'\n" +
" and delete_type=0" + " and delete_type=0" +
" and tenant_key = ?\n" + " and tenant_key = ?\n" +
" and password is not null\n" +
" )\n" + " )\n" +
" and e.status = 'normal' " +
" and d.type='department' " +
" and mcs.name <> '结案'\n" +
" and m.delete_type = 0 \n" + " and m.delete_type = 0 \n" +
" and m.tenant_key = ?\n" + " and m.tenant_key = ?\n" +
" and f.delete_type = 0 \n" + " and f.delete_type = 0 \n" +
@ -162,7 +172,11 @@ public class CockpitProjectDataCmd {
" and mcs.delete_type = 0\n" + " and mcs.delete_type = 0\n" +
" and mcs.tenant_key = ?\n" + " and mcs.tenant_key = ?\n" +
" and mcs.enabled = 1 \n" + " and mcs.enabled = 1 \n" +
" and mcs.name <> '结案'\n" + " and e.delete_type = 0 \n" +
" and e.tenant_key = ? \n" +
" and d.delete_type = 0 \n" +
" and d.tenant_key = ?\n" +
" order by m.create_time desc\n" + " order by m.create_time desc\n" +
") w limit 6"; ") w limit 6";
@ -214,6 +228,16 @@ public class CockpitProjectDataCmd {
sqlParamEntity.setValue(tenantKey+""); sqlParamEntity.setValue(tenantKey+"");
sqlparam.add(sqlParamEntity); sqlparam.add(sqlParamEntity);
sqlParamEntity = new SqlParamEntity();
sqlParamEntity.setParamType(SqlParamType.VARCHAR);
sqlParamEntity.setValue(tenantKey+"");
sqlparam.add(sqlParamEntity);
sqlParamEntity = new SqlParamEntity();
sqlParamEntity.setParamType(SqlParamType.VARCHAR);
sqlParamEntity.setValue(tenantKey+"");
sqlparam.add(sqlParamEntity);
Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
projectList = databaseUtils.getDataSourceList(result); projectList = databaseUtils.getDataSourceList(result);

Write Preview
Loading…
Cancel
Save