patch_ncc2005_pu_【重量端】项目接口可获取分配的项目_温发星_邱丹洁_20220826_v1.0

pu_patch/src/private/nc/bs/pu/wgpt/process/QueryProjectInfoProcess.java

@@ -68,6 +68,11 @@ public class QueryProjectInfoProcess {
 //								"left join org_accountingbook t3 on t2.pk_org = t3.pk_relorg and t3.dr=0\n" + 
 //								"left join bd_accchart t4 on t4.pk_accchart = t3.pk_curraccchart and t4.dr=0\n" + 
 //								"where nvl(t1.dr,0)=0 and "+wheresql;
+				
+				String projectsql = "select pk_org,dr,project_code,project_name,creationtime,modifiedtime,enablestate from bd_project "
+						+ "union select prb.pk_parti_org pk_org,pro.dr,pro.project_code,pro.project_name,pro.creationtime,pro.modifiedtime,pro.enablestate "+
+						"from bd_project pro inner join bd_project_b prb on prb.pk_project = pro.pk_project and prb.dr=0 ";
+				
 				StringBuffer sqlstr=new StringBuffer("");
 				sqlstr.append("select distinct t2.code,").append("\r\n");
 				sqlstr.append("               t1.project_code,").append("\r\n");
@@ -80,7 +85,7 @@ public class QueryProjectInfoProcess {
 				sqlstr.append("                 else").append("\r\n");
 				sqlstr.append("                  'N'").append("\r\n");
 				sqlstr.append("               end ischoujin").append("\r\n");
-				sqlstr.append(" from bd_project t1").append("\r\n");
+				sqlstr.append(" from ("+projectsql+") t1").append("\r\n");
 				sqlstr.append(" left join org_orgs t2").append("\r\n");
 				sqlstr.append("   on t1.pk_org = t2.pk_org").append("\r\n");
 				sqlstr.append("  and t2.dr = 0").append("\r\n");
@@ -91,7 +96,7 @@ public class QueryProjectInfoProcess {
 				sqlstr.append(" join bd_accchart t4").append("\r\n");
 				sqlstr.append("   on t4.pk_accchart = t3.pk_curraccchart").append("\r\n");
 				sqlstr.append("  and t4.dr = 0").append("\r\n");
-				sqlstr.append("where nvl(t1.dr, 0) = 0").append("\r\n");
+				sqlstr.append("where nvl(t1.dr, 0) = 0 and t1.enablestate=2 ").append("\r\n");
 				sqlstr.append(" and   "+wheresql); 
 
 				List<Map<String,Object>> projectList = (List<Map<String,Object>>) baseDAO.executeQuery(sqlstr.toString(), new MapListProcessor());