From a643baf71c583402fe46ade874358fbc1733b7ff Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Wed, 7 May 2025 17:31:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=AD=89=E7=BA=A7=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E6=9F=A5=E8=AF=A2=20=E6=B7=BB=E5=8A=A0site=E7=9A=84?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/spring/ifs/api/BaseSearchApi.java | 6 +++++- src/main/java/com/spring/ifs/bean/BaseSearchBean.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/spring/ifs/api/BaseSearchApi.java b/src/main/java/com/spring/ifs/api/BaseSearchApi.java index 0ddae255..3a8caa8d 100644 --- a/src/main/java/com/spring/ifs/api/BaseSearchApi.java +++ b/src/main/java/com/spring/ifs/api/BaseSearchApi.java @@ -626,7 +626,7 @@ public class BaseSearchApi { * @date 2025/5/6 11:58 * @version 1.0 */ - public static List getLaborClassCosts(Server srv, int startIndex, int pageSize) throws APException { + public static List getLaborClassCosts(Server srv, String siteCon, int startIndex, int pageSize) throws APException { StringBuilder searchSql = new StringBuilder(); searchSql.append("SELECT OBJID ifsRowId, OBJVERSION ifsRowVersion, CONTRACT, LABOR_CLASS_NO,"); searchSql.append(" ifsapp.LABOR_CLASS_API.Get_labor_class_Description(CONTRACT, LABOR_CLASS_NO) laborClassDesc,"); @@ -634,6 +634,10 @@ public class BaseSearchApi { searchSql.append(" to_char(START_DATE, 'yyyy-MM-dd') START_DATE, to_char(END_DATE, 'yyyy-MM-dd') END_DATE"); searchSql.append(" FROM ifsapp.LABOR_CLASS_COST"); searchSql.append(" WHERE COST_SET = '1' AND END_DATE IS NULL"); + //添加判断的查询条件 + if(!(null == siteCon || "".equals(siteCon))) { + searchSql.append(" AND pcs.contract IN "+siteCon); + } //设置查询的入参 Map inParam = new HashMap<>(); //添加排序语句 diff --git a/src/main/java/com/spring/ifs/bean/BaseSearchBean.java b/src/main/java/com/spring/ifs/bean/BaseSearchBean.java index 9ca691a5..b44c1381 100644 --- a/src/main/java/com/spring/ifs/bean/BaseSearchBean.java +++ b/src/main/java/com/spring/ifs/bean/BaseSearchBean.java @@ -280,12 +280,13 @@ public class BaseSearchBean { public List getLaborClassCosts(Server srv, BaseSearchData inData) throws APException { //查询的参数 logger.info("人员等级成本开始查询!"); + String siteCon = inData.getSiteCon(); List resultList = new ArrayList<>(); int pageSize = 200; //迭代查询 for(int i = 0; i < 100; i++){ int startIndex = i * pageSize; - List tempList = BaseSearchApi.getLaborClassCosts(srv, startIndex, pageSize); + List tempList = BaseSearchApi.getLaborClassCosts(srv, siteCon, startIndex, pageSize); //判断查询是否结束 if(tempList.size() > 0) { resultList.addAll(tempList);