代码检查，移除System.out.println

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/DailyloanbillExpAccPlugin.java

@@ -118,7 +118,6 @@ public class DailyloanbillExpAccPlugin extends AbstractBillPlugIn implements Plu
                             DynamicObject dynamicObject = zcgjEntryentity.get(0);
                             DynamicObject itemDynamicObject= dynamicObject.getDynamicObject(prefix+"_entity_items");
                             long aLong = itemDynamicObject.getLong("id");
-                            System.out.println();
                             this.getModel().setValue(EXPENSE_ITEM,aLong,selectRow);
                         }
                     }

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/DailyreimbursExpAccPlugin.java

@@ -115,7 +115,6 @@ public class DailyreimbursExpAccPlugin extends AbstractBillPlugIn implements Plu
                             DynamicObject dynamicObject = zcgjEntryentity.get(0);
                             DynamicObject itemDynamicObject= dynamicObject.getDynamicObject(prefix+"_entity_items");
                             long aLong = itemDynamicObject.getLong("id");
-                            System.out.println();
                             this.getModel().setValue(EXPENSE_ITEM,aLong,selectRow);
                         }
                     }

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PrepaybillExpAccPlugin.java

@@ -115,7 +115,6 @@ public class PrepaybillExpAccPlugin extends AbstractBillPlugIn implements Plugin
                             DynamicObject dynamicObject = zcgjEntryentity.get(0);
                             DynamicObject itemDynamicObject= dynamicObject.getDynamicObject(prefix+"_entity_items");
                             long aLong = itemDynamicObject.getLong("id");
-                            System.out.println();
                             this.getModel().setValue(EXPENSE_ITEM,aLong,selectRow);
                         }
                     }

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillExpAccPlugin.java

@@ -116,7 +116,6 @@ public class PublicreimbursebillExpAccPlugin extends AbstractBillPlugIn implemen
                             DynamicObject dynamicObject = zcgjEntryentity.get(0);
                             DynamicObject itemDynamicObject= dynamicObject.getDynamicObject(prefix+"_entity_items");
                             long aLong = itemDynamicObject.getLong("id");
-                            System.out.println();
                             this.getModel().setValue(EXPENSE_ITEM,aLong,selectRow);
                         }
                     }

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TriprAutoCalWorkingDaysPlugin.java

@@ -24,6 +24,27 @@ import java.util.*;
  */
 public class TriprAutoCalWorkingDaysPlugin extends AbstractBillPlugIn implements Plugin {
 
+    @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());
+
+            }
+        }
+    }
+
     @Override
     public void propertyChanged(PropertyChangedArgs e) {
         //当前切换选择的组织

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyreimbursHomeCheckOp.java

@@ -118,7 +118,6 @@ public class DailyreimbursHomeCheckOp extends AbstractOperationServicePlugIn {
                                 isOk= false;
                                 this.addFatalErrorMessage(extendedDataEntity, message);
                             }
-                            //System.out.println(entry.getKey() + ": " + entry.getValue() + " 次");
                         }
                         if(isOk){
                             for (DynamicObject dynamicObject : tripentry) {

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyreimbursVisitCheckOp.java

@@ -257,7 +257,6 @@ public class DailyreimbursVisitCheckOp extends AbstractOperationServicePlugIn {
                         }
 
                         holidayCount++;
-                        System.out.println(string);
                     }
 
                     //剩余次数

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TripreimbursebillIsHomeCheckOp.java

@@ -123,7 +123,6 @@ public class TripreimbursebillIsHomeCheckOp extends AbstractOperationServicePlug
                                 isOk= false;
                                 this.addFatalErrorMessage(extendedDataEntity, message);
                             }
-                            //System.out.println(entry.getKey() + ": " + entry.getValue() + " 次");
                         }
                         if(isOk){
                             for (DynamicObject dynamicObject : tripentry) {

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/BudgetActuRptQueryPlugin.java

@@ -126,7 +126,6 @@ public class BudgetActuRptQueryPlugin extends AbstractReportListDataPlugin {
         List<Integer> yearList = new ArrayList<>();
         // 输出所有年份
         for (int year = startYear; year <= currentYear; year++) {
-            System.out.println(year);
             yearList.add(year);
         }
         //年份-(预算&实际)/项目/金额

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/EmpTravelRptDetailListPlugin.java

@@ -105,10 +105,6 @@ public class EmpTravelRptDetailListPlugin  extends AbstractFormPlugin implements
             dynamicObject.set("zcgj_end_date",enddate);
             dynamicObject.set("zcgj_days",row.getInteger("kccbdaycount"));
         }
-
-
-        System.out.println();
-
     }
 
     /**

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/VisitRptDetailListPlugin.java

@@ -35,7 +35,6 @@ public class VisitRptDetailListPlugin extends AbstractFormPlugin implements Plug
         Long userId = (Long)formShowParameter.getCustomParam("userId");
         String queryDate = (String)formShowParameter.getCustomParam("queryDate");
         LocalDate parse = LocalDate.parse(queryDate);
-        System.out.println();
         DynamicObjectCollection zcgjKccbList = this.getModel().getDataEntity().getDynamicObjectCollection("zcgj_entryentity");
         DataSet tripreimbursebill = getDailyreimbursebill(queryDate, userId);
         for (Row row : tripreimbursebill) {

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/workflow/ApprovalCheckFlowPlugin.java

@@ -19,8 +19,6 @@ public class ApprovalCheckFlowPlugin implements IWorkflowPlugin {
         IWorkflowPlugin.super.notify(execution);
         List<Long> allApprover = execution.getAllApprover();    // 获取审批人id
         List<Map<String, Object>> userInfo = UserServiceHelper.get(allApprover);   // 审批人信息
-        System.out.println();
-
     }
 
 

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/workflow/WorkLoadExt.java

@@ -123,7 +123,7 @@ public class WorkLoadExt extends WorkLoad {
         //是否自动审批通过
         boolean isAutoPass = false;
         if(localApprovers.isEmpty()){
-            System.out.println("本地无人审批，跳过移除审批人，不自动审批通过。");
+            log.info("本地无人审批，跳过移除审批人，不自动审批通过。");
             map.put("isAutoPass", isAutoPass);
             map.put("removedApprovers", removedApprovers);
             return map;
@@ -133,8 +133,8 @@ public class WorkLoadExt extends WorkLoad {
             // 完全覆盖：随机选择一个共享审批人，自动审批通过
             Long approver = getRandomApprover(sharedApprovers);
             removedApprovers.remove(approver);
-            System.out.println("共享审批节点完全被覆盖，审批人：" + approver + "，自动审批通过。");
+            log.info("共享审批节点完全被覆盖，审批人：" + approver + "，自动审批通过。");
-            System.out.println("被移除掉的审批人：" + removedApprovers);
+            log.info("被移除掉的审批人：" + removedApprovers);
             isAutoPass =true;
         } else {
             // 未完全覆盖：选择不在本地节点中的共享审批人，不自动审批通过
@@ -142,11 +142,11 @@ public class WorkLoadExt extends WorkLoad {
             if (!sharedSet.isEmpty()) {
                 Long approver = sharedSet.iterator().next();
                 removedApprovers.remove(approver);
-                System.out.println("共享审批节点未被完全覆盖，审批人：" + approver + "，不自动审批通过。");
+                log.info("共享审批节点未被完全覆盖，审批人：" + approver + "，不自动审批通过。");
-                System.out.println("被移除掉的审批人：" + removedApprovers);
+                log.info("被移除掉的审批人：" + removedApprovers);
                 isAutoPass = false;
             } else {
-                System.out.println("未找到合适的审批人。");
+                log.info("未找到合适的审批人。");
             }
         }
         map.put("isAutoPass", isAutoPass);

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcContractFromPlugin.java

@@ -37,7 +37,6 @@ public class EcContractFromPlugin extends AbstractBillPlugIn implements Plugin {
             DynamicObject dataEntity = this.getModel().getDataEntity(true);
             if (name.equals("zcgj_pjnhhshte")) {
                 Object zcgjPjnhbhshte = this.getModel().getValue("zcgj_pjnhhshte");
-                System.out.println();
                 if (zcgjPjnhbhshte != null) {
                     ofamount = new BigDecimal(zcgjPjnhbhshte.toString());
                 }
@@ -51,7 +50,6 @@ public class EcContractFromPlugin extends AbstractBillPlugIn implements Plugin {
             } else if (name.equals("zcgj_pjnhbhshte")) {
 //                Object zcgjPjnhhshte = this.getModel().getValue("zcgj_pjnhbhshte");
                 Object zcgjPjnhhshte = changeData.getNewValue();
-                System.out.println();
                 if (zcgjPjnhhshte != null) {
                     amount = new BigDecimal(zcgjPjnhhshte.toString());
                 }
@@ -65,7 +63,6 @@ public class EcContractFromPlugin extends AbstractBillPlugIn implements Plugin {
                 this.getView().updateView();
             }else if (name.equals("zcgj_yjhshtsr")) {
                 Object zcgjyjhshtsr = this.getModel().getValue("zcgj_yjhshtsr");
-                System.out.println();
                 if (zcgjyjhshtsr != null) {
                     ofamount = new BigDecimal(zcgjyjhshtsr.toString());
                 }
@@ -78,7 +75,6 @@ public class EcContractFromPlugin extends AbstractBillPlugIn implements Plugin {
                 this.getView().updateView();
             } else if (name.equals("zcgj_yjbhshtsr")) {
                 Object zcgjyjbhshtsr = this.getModel().getValue("zcgj_yjbhshtsr");
-                System.out.println();
                 if (zcgjyjbhshtsr != null) {
                     amount = new BigDecimal(zcgjyjbhshtsr.toString());
                 }

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcContractRevisionFromPlugin.java

@@ -45,7 +45,6 @@ public class EcContractRevisionFromPlugin extends AbstractBillPlugIn implements
                 DynamicObject dataEntity = this.getModel().getDataEntity(true);
                 if (name.equals("zcgj_pjnhhshte")) {
                     Object zcgjPjnhbhshte = this.getModel().getValue("zcgj_pjnhhshte");
-                    System.out.println();
                     if (zcgjPjnhbhshte != null) {
                         ofamount = new BigDecimal(zcgjPjnhbhshte.toString());
                     }
@@ -60,7 +59,6 @@ public class EcContractRevisionFromPlugin extends AbstractBillPlugIn implements
                 } else if (name.equals("zcgj_pjnhbhshte")) {
 //                Object zcgjPjnhhshte = this.getModel().getValue("zcgj_pjnhbhshte");
                     Object zcgjPjnhhshte = changeData.getNewValue();
-                    System.out.println();
                     if (zcgjPjnhhshte != null) {
                         amount = new BigDecimal(zcgjPjnhhshte.toString());
                     }
@@ -76,7 +74,6 @@ public class EcContractRevisionFromPlugin extends AbstractBillPlugIn implements
                     this.getView().updateView("zcgj_pjnhse");
                 }else if (name.equals("zcgj_yjhshtsr")) {
                     Object zcgjyjhshtsr = this.getModel().getValue("zcgj_yjhshtsr");
-                    System.out.println();
                     if (zcgjyjhshtsr != null) {
                         ofamount = new BigDecimal(zcgjyjhshtsr.toString());
                     }
@@ -90,7 +87,6 @@ public class EcContractRevisionFromPlugin extends AbstractBillPlugIn implements
                     this.getView().updateView("zcgj_yjzse");
                 } else if (name.equals("zcgj_yjbhshtsr")) {
                     Object zcgjyjbhshtsr = this.getModel().getValue("zcgj_yjbhshtsr");
-                    System.out.println();
                     if (zcgjyjbhshtsr != null) {
                         amount = new BigDecimal(zcgjyjbhshtsr.toString());
                     }

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ResourceFilterExtPlugin.java

@@ -45,8 +45,6 @@ public class ResourceFilterExtPlugin extends ResourceItemListPlugin {
                 }
             }
         }
-        System.out.println();
-
     }
 
     @Override

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/ContractSettleOp.java

@@ -39,7 +39,6 @@ public class ContractSettleOp extends AbstractOperationServicePlugIn {
                             outContract.set("ismulticontract", true);
                         }
                         OperationResult saveOperationResult1 = SaveServiceHelper.saveOperate("ec_out_contract", new DynamicObject[]{outContractF7}, null);//支出合同实体
-                        System.out.println(saveOperationResult1);
                     }
                 }
             }

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/SubmitInContractBillOp.java

@@ -22,9 +22,7 @@ public class SubmitInContractBillOp extends AbstractOperationServicePlugIn {
             if (abstractValidator instanceof ContractValidator){
                 validators.remove(abstractValidator);
                 i--;
-                logger.info("合同总金额校验已取去除");
             }
         }
-        System.out.println(validators);
     }
 }