From 5478714fb3a8fcaab1eab887b7da037541cca6af Mon Sep 17 00:00:00 2001
From: zhangzhiguo <zhangzhiguo@123>
Date: Wed, 11 Jun 2025 17:21:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B7=AE=E6=97=85=E6=8A=A5=E9=94=80=E5=8D=95?=
 =?UTF-8?q?=E6=89=A3=E9=99=A4=E9=A4=90=E8=A1=A5=E5=A4=A9=E6=95=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86=202.=E6=B6=88=E8=B4=B9=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E8=AE=A1=E7=AE=97=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/TriprAutoCalWorkingDaysPlugin.java   | 32 +++++++++++--------
 .../report/PositionFeesRptQueryPlugin.java    |  8 +++--
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TriprAutoCalWorkingDaysPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TriprAutoCalWorkingDaysPlugin.java
index 32033ee..d152867 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TriprAutoCalWorkingDaysPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TriprAutoCalWorkingDaysPlugin.java
@@ -2,6 +2,8 @@ package zcgj.zcdev.zcdev.fs.plugin.form;
 
 import com.alibaba.druid.util.StringUtils;
 import kd.bos.bill.AbstractBillPlugIn;
+import kd.bos.bill.BillShowParameter;
+import kd.bos.bill.OperationStatus;
 import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
@@ -27,20 +29,24 @@ public class TriprAutoCalWorkingDaysPlugin extends AbstractBillPlugIn implements
     @Override
     public void afterBindData(EventObject e) {
         super.afterBindData(e);
-        //当前切换选择的组织
-        Object company = this.getModel().getValue("costcompany");//核算组织(费用承担公司)
-        Long currentOrgId = RequestContext.get().getOrgId();
-        if(company!=null){
-            DynamicObject companyObj = (DynamicObject)company;
-            Long companyId = companyObj.getLong("id");
-            if(OrgCheckUtils.isKS(companyId)){
-                Set<LocalDate> allSet = new HashSet<>();
-                Set<LocalDate> localDates1 = calHomeentityDay();
-                Set<LocalDate> localDates2 = calTripentryDay();
-                allSet.addAll(localDates1);
-                allSet.addAll(localDates2);
-                this.getModel().setValue("zcgj_kccbdays",allSet.size());
+        //如果是新增时
+        BillShowParameter bsp=(BillShowParameter)this.getView().getFormShowParameter();
+        if(bsp.getStatus()== OperationStatus.ADDNEW ){
+            //当前切换选择的组织
+            Object company = this.getModel().getValue("costcompany");//核算组织(费用承担公司)
+            Long currentOrgId = RequestContext.get().getOrgId();
+            if(company!=null){
+                DynamicObject companyObj = (DynamicObject)company;
+                Long companyId = companyObj.getLong("id");
+                if(OrgCheckUtils.isKS(companyId)){
+                    Set<LocalDate> allSet = new HashSet<>();
+                    Set<LocalDate> localDates1 = calHomeentityDay();
+                    Set<LocalDate> localDates2 = calTripentryDay();
+                    allSet.addAll(localDates1);
+                    allSet.addAll(localDates2);
+                    this.getModel().setValue("zcgj_kccbdays",allSet.size());
 
+                }
             }
         }
     }
diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java
index 7df155e..8725afb 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java
@@ -23,7 +23,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 职务消费休假台账
+ * 职务消费台账
  * 报表取数插件
  */
 public class PositionFeesRptQueryPlugin extends AbstractReportListDataPlugin {
@@ -133,6 +133,10 @@ public class PositionFeesRptQueryPlugin extends AbstractReportListDataPlugin {
 
                 DynamicObjectCollection entrys = dynamicObject.getDynamicObjectCollection("expenseentryentity");
                 for (DynamicObject entry : entrys) {
+                    DynamicObject zcgjCostmangerEntity = entry.getDynamicObject("zcgj_costmanger_entity");
+                    if(zcgjCostmangerEntity == null){
+                        continue;
+                    }
                     DynamicObject expenseitemObj = entry.getDynamicObject("expenseitem"); //费用项目
                     if(expenseitemObj == null){
                         continue;
@@ -412,7 +416,7 @@ public class PositionFeesRptQueryPlugin extends AbstractReportListDataPlugin {
         searchFilterList.add(new QFilter("expenseentryentity.happendate", QCP.less_equals, lastDay));
         searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist));//增加过滤
         DynamicObject[] load = BusinessDataServiceHelper.load("er_dailyreimbursebill",
-                "id,description,billno,expenseentryentity," +
+                "id,description,billno,expenseentryentity,zcgj_costmanger_entity," +
                         DEV_KEY+"_is_business_foreign,"+
                         "expenseentryentity.happendate," + //费用发生日期
                         "expenseentryentity.expenseitem," + //费用项目