From 28002f53100ac27029d4710e7fad84f363e7a4b8 Mon Sep 17 00:00:00 2001 From: zhangzhiguo Date: Fri, 28 Mar 2025 18:07:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E9=A2=84?= =?UTF-8?q?=E6=B5=8B=E5=AE=A1=E6=89=B9=E4=BA=BA=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/report/EmpTravelRptDetailListPlugin.java | 11 ++++++++--- .../fs/plugin/report/EmpTravelRptQueryPlugin.java | 6 +++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptDetailListPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptDetailListPlugin.java index fce13d8..8d8d6a0 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptDetailListPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptDetailListPlugin.java @@ -65,7 +65,11 @@ public class EmpTravelRptDetailListPlugin extends AbstractFormPlugin implements for (Row row : tripreimbursebillHome) { DynamicObject dynamicObject = zcgjKccbList.addNew(); dynamicObject.set("zcgj_bill_type","差旅报销单"); - dynamicObject.set("zcgj_type","往来居家"); + if(row.getBoolean("ishome")){ + dynamicObject.set("zcgj_type","往来居家"); + }else{ + dynamicObject.set("zcgj_type","差旅报销"); + } dynamicObject.set("zcgj_billno",row.getString("billno")); Date startdate = row.getDate("startdate"); dynamicObject.set("zcgj_start_date",startdate); @@ -166,14 +170,15 @@ public class EmpTravelRptDetailListPlugin extends AbstractFormPlugin implements //查询申请人下的今年的探亲差旅单据 List searchFilterList = new ArrayList<>(); searchFilterList.add(new QFilter("applier", QCP.equals, applierId)); - searchFilterList.add(new QFilter( "zcgj_is_include_home", QCP.equals, true)); + //searchFilterList.add(new QFilter( "zcgj_is_include_home", QCP.equals, true)); + searchFilterList.add(new QFilter( "zcgj_kccbdays", QCP.large_than, 0)); searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist)); searchFilterList.add( new QFilter("bizdate", QCP.large_equals, firstDayOfMonth)); searchFilterList.add( new QFilter("bizdate", QCP.less_equals, lastDayOfMonth)); DataSet dateSet = QueryServiceHelper.queryDataSet( this.getClass().getName(), "er_tripreimbursebill", - "id,applier,billno,zcgj_homeentity.zcgj_startdate as startdate,zcgj_homeentity.zcgj_enddate as enddate,zcgj_homeentity.zcgj_kccbdaycount as kccbdaycount" , + "id,applier,billno,zcgj_is_include_home as ishome,zcgj_homeentity.zcgj_startdate as startdate,zcgj_homeentity.zcgj_enddate as enddate,zcgj_homeentity.zcgj_kccbdaycount as kccbdaycount" , searchFilterList.toArray(new QFilter [] {}), null ); return dateSet; diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptQueryPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptQueryPlugin.java index d2ea151..cf9d5c5 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptQueryPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptQueryPlugin.java @@ -12,6 +12,7 @@ import kd.bos.logging.LogFactory; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.QueryServiceHelper; +import kd.bos.servicehelper.org.OrgUnitServiceHelper; import kd.bos.servicehelper.user.UserServiceHelper; import java.math.BigDecimal; @@ -89,6 +90,8 @@ public class EmpTravelRptQueryPlugin extends AbstractReportListDataPlugin { //获取公司下的所有人 List orgIds = new ArrayList<>(); orgIds.add(orgId); + //获取当前组织的所有下级组织 + List subOrgIds = OrgUnitServiceHelper.getAllSubordinateOrgs(1L, orgIds, true); List allUsersOfOrg = UserServiceHelper.getAllUsersOfOrg(orgIds); if(!applierId.isEmpty()){ //通过查询用户过滤组织下的人 @@ -193,7 +196,8 @@ public class EmpTravelRptQueryPlugin extends AbstractReportListDataPlugin { //查询申请人下的今年的探亲差旅单据 List searchFilterList = new ArrayList<>(); searchFilterList.add(new QFilter("applier", QCP.equals, applierId)); - searchFilterList.add(new QFilter( "zcgj_is_include_home", QCP.equals, true)); + //searchFilterList.add(new QFilter( "zcgj_is_include_home", QCP.equals, true)); + searchFilterList.add(new QFilter( "zcgj_kccbdays", QCP.large_than, 0)); searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist)); searchFilterList.add( new QFilter("bizdate", QCP.large_equals, firstDay)); searchFilterList.add( new QFilter("bizdate", QCP.less_equals, lastDay));