13
0

2 Revīzijas 48c0ef1779 ... d184fd8dbb

Autors SHA1 Ziņojums Datums
  longht d184fd8dbb Merge branch 'master' of http://183.56.220.107:50005/FSGAS_NCC/HR.git 3 gadi atpakaļ
  longht afd91b6b23 薪资发放说明人员参照调整 3 gadi atpakaļ

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 10 - 10
hrwa/METADATA/waexplain/wa_data_explain.bmf


+ 4 - 4
hrwa/nccloud/src/client/nccloud/web/hrwa/pubinfo/wadataexplain/action/HrwaPsndocdevFilter.java

@@ -15,10 +15,10 @@ public class HrwaPsndocdevFilter implements IRefSqlBuilder {
 		String pk_wa_class = null==para.getQueryCondition().get("pk_wa_class")?null:para.getQueryCondition().get("pk_wa_class").toString();
 		String cyearperiod = null==para.getQueryCondition().get("cyearperiod")?null:para.getQueryCondition().get("cyearperiod").toString();
 		
-//		return "and pk_psndoc in ( SELECT pk_psndoc FROM wa_data "
-//				+ "where   nvl(stopflag ,'N')='N' AND  pk_wa_class = '" + pk_wa_class + "' and cyearperiod = '"
-//				+ cyearperiod + "')";
-		return "";
+		return " and bd_psndoc.pk_psndoc in ( SELECT pk_psndoc FROM wa_data "
+				+ "where     pk_wa_class = '" + pk_wa_class + "' and cyearperiod = '"
+				+ cyearperiod + "')";
+		//return "";
 	}
 
 	@Override