对公报销单页面逻辑处理

code/base/nckd-jimin-base-helper/src/main/java/nckd/base/helper/CommonHelperUtils.java

@@ -50,7 +50,9 @@ public class CommonHelperUtils {
         if(entryentity == null || entryentity.size() == 0){
             return null;
         }
-        Map<String, String> mapentity = entryentity.stream().collect(Collectors.toMap(k -> k.getString("nckd_key"), v -> v.getString("nckd_value")));
+        Map<String, String> mapentity = entryentity.stream().collect(Collectors.toMap(k->k.getString("nckd_key")
+                                                                        , v -> v.getString("nckd_value"),
+                                                                            (existing, replacement) -> existing));
 
         return mapentity;
     }

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/DailyApplyBillEditPlugin.java

@@ -111,28 +111,6 @@ public class DailyApplyBillEditPlugin extends AbstractBillPlugIn implements Befo
         return expenseItem;
     }
 
-/*
-* 已代扣代缴设置，刘志华编写代码
-* */
-    @Override
-    public void propertyChanged(PropertyChangedArgs e) {
-        super.propertyChanged(e);
-        if(e.getProperty().getName().equals("nckd_expenseitem")){
-            DynamicObject newValue = (DynamicObject)e.getChangeSet()[0].getNewValue();
-             if(EmptyUtils.isNotEmpty(newValue)){
-                 QFilter qFilter = new QFilter("nckd_expenseitem", QCP.in, newValue.getLong("id"));
-                 DynamicObject expenseitemInfo =BusinessDataServiceHelper.loadSingle("nckd_proxytax", qFilter.toArray());
-                 //已代扣代缴赋值
-                 if(this.getModel().getProperty("nckd_jywithhold")!=null ){
-                     if(EmptyUtils.isNotEmpty(expenseitemInfo)){
-                         this.getModel().setValue("nckd_jywithhold",true);
-                     }else {
-                         this.getModel().setValue("nckd_jywithhold",false);
-                     }
-                 }
-             }
-        }
-    }
 
     @Override
     public void afterCreateNewData(EventObject e) {

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/PublicReimburseBillFormPlugin.java

@@ -6,6 +6,7 @@ import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.resource.ResManager;
 import kd.bos.entity.datamodel.events.BizDataEventArgs;
+import kd.bos.entity.datamodel.events.PropertyChangedArgs;
 import kd.bos.entity.property.BasedataProp;
 import kd.bos.exception.KDBizException;
 import kd.bos.ext.fi.plugin.ArApConvert.util.EmptyUtils;
@@ -49,6 +50,41 @@ public class PublicReimburseBillFormPlugin extends AbstractBillPlugIn implements
         acctitemF7ext.addBeforeF7SelectListener(this);
     }
 
+    /*
+     * 已代扣代缴设置，刘志华编写代码
+     * */
+    @Override
+    public void propertyChanged(PropertyChangedArgs e) {
+        super.propertyChanged(e);
+
+        String fieldKey = e.getProperty().getName();
+
+        if("nckd_expenseitem".equals(fieldKey)){
+            DynamicObject newValue = (DynamicObject)e.getChangeSet()[0].getNewValue();
+            if(EmptyUtils.isNotEmpty(newValue)){
+                QFilter qFilter = new QFilter("nckd_expenseitem", QCP.in, newValue.getLong("id"));
+                qFilter.and(new QFilter("status", QCP.equals, "C"));
+                qFilter.and(new QFilter("enable", QCP.equals, "1"));
+                if(this.getModel().getValue("costcompany") != null){
+                    DynamicObject company = (DynamicObject) this.getModel().getValue("costcompany");
+                    qFilter.and(new QFilter("nckd_org.id", QCP.equals, company.getLong("id")));
+                }
+
+                DynamicObject expenseitemInfo =BusinessDataServiceHelper.loadSingle("nckd_proxytax", qFilter.toArray());
+                //已代扣代缴赋值
+                if(this.getModel().getProperty("nckd_jywithhold") != null ){
+                    if(EmptyUtils.isNotEmpty(expenseitemInfo)){
+                        this.getModel().setValue("nckd_jywithhold",true);
+                    } else {
+                        this.getModel().setValue("nckd_jywithhold",false);
+                    }
+                }
+            } else {
+                this.getModel().setValue("nckd_jywithhold",false);
+            }
+        }
+    }
+
     @Override
     public void beforeF7Select(BeforeF7SelectEvent evt) {
         String property = evt.getProperty().getName();