From 0909e377411c48c321d44a79952a9d30f3cfafb6 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Thu, 19 May 2022 09:45:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datacollection/AddUpDeductionGetSearchConditionCmd.java  | 5 +++--
 .../datacollection/AddUpSituationGetSearchConditionCmd.java  | 5 +++--
 .../datacollection/OtherDeductionGetSearchConditionCmd.java  | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/salary/cmd/datacollection/AddUpDeductionGetSearchConditionCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpDeductionGetSearchConditionCmd.java
index 46f82d2c4..3cf8ccd29 100644
--- a/src/com/engine/salary/cmd/datacollection/AddUpDeductionGetSearchConditionCmd.java
+++ b/src/com/engine/salary/cmd/datacollection/AddUpDeductionGetSearchConditionCmd.java
@@ -52,8 +52,8 @@ public class AddUpDeductionGetSearchConditionCmd extends AbstractCommonCommand<M
         SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER,502227,"departmentIds","4");
         departmentName.setInputType("browser");
         departmentName.setColSpan(2);
-        departmentName.setFieldcol(12);
-        departmentName.setLabelcol(6);
+        departmentName.setFieldcol(16);
+        departmentName.setLabelcol(8);
         departmentName.setViewAttr(2);
         departmentName.setIsQuickSearch(false);
         departmentName.setLabel("部门");
@@ -85,6 +85,7 @@ public class AddUpDeductionGetSearchConditionCmd extends AbstractCommonCommand<M
         dateOptions.add(new SearchConditionOption("6", SystemEnv.getHtmlLabelName(32530, user.getLanguage()),true));//指定日期范围(必须为6)
         SearchConditionItem hiredate = conditionFactory.createCondition(ConditionType.RANGEPICKER, 18648, new String[]{"hiredate","hiredate"});
         hiredate.setInputType("rangepicker");
+        hiredate.setFormat("yyyy-MM-dd");
         hiredate.setFieldcol(16);
         hiredate.setLabelcol(8);
         hiredate.setViewAttr(2);
diff --git a/src/com/engine/salary/cmd/datacollection/AddUpSituationGetSearchConditionCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpSituationGetSearchConditionCmd.java
index f699c8b94..0b2e3e2fa 100644
--- a/src/com/engine/salary/cmd/datacollection/AddUpSituationGetSearchConditionCmd.java
+++ b/src/com/engine/salary/cmd/datacollection/AddUpSituationGetSearchConditionCmd.java
@@ -52,8 +52,8 @@ public class AddUpSituationGetSearchConditionCmd extends AbstractCommonCommand<M
         SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER,502227,"departmentName","4");
         departmentName.setInputType("browser");
         departmentName.setColSpan(2);
-        departmentName.setFieldcol(12);
-        departmentName.setLabelcol(6);
+        departmentName.setFieldcol(16);
+        departmentName.setLabelcol(8);
         departmentName.setViewAttr(2);
         departmentName.setIsQuickSearch(false);
         departmentName.setLabel("部门");
@@ -85,6 +85,7 @@ public class AddUpSituationGetSearchConditionCmd extends AbstractCommonCommand<M
         dateOptions.add(new SearchConditionOption("6", SystemEnv.getHtmlLabelName(32530, user.getLanguage()),true));//指定日期范围(必须为6)
         SearchConditionItem hiredate = conditionFactory.createCondition(ConditionType.RANGEPICKER, 18648, new String[]{"hiredate","hiredate"});
         hiredate.setInputType("rangepicker");
+        hiredate.setFormat("yyyy-MM-dd");
         hiredate.setFieldcol(16);
         hiredate.setLabelcol(8);
         hiredate.setViewAttr(2);
diff --git a/src/com/engine/salary/cmd/datacollection/OtherDeductionGetSearchConditionCmd.java b/src/com/engine/salary/cmd/datacollection/OtherDeductionGetSearchConditionCmd.java
index 38776d6fa..7b06caecc 100644
--- a/src/com/engine/salary/cmd/datacollection/OtherDeductionGetSearchConditionCmd.java
+++ b/src/com/engine/salary/cmd/datacollection/OtherDeductionGetSearchConditionCmd.java
@@ -52,8 +52,8 @@ public class OtherDeductionGetSearchConditionCmd extends AbstractCommonCommand<M
         SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER,502227,"departmentName","4");
         departmentName.setInputType("browser");
         departmentName.setColSpan(2);
-        departmentName.setFieldcol(12);
-        departmentName.setLabelcol(6);
+        departmentName.setFieldcol(16);
+        departmentName.setLabelcol(8);
         departmentName.setViewAttr(2);
         departmentName.setIsQuickSearch(false);
         departmentName.setLabel("部门");
@@ -85,6 +85,7 @@ public class OtherDeductionGetSearchConditionCmd extends AbstractCommonCommand<M
         dateOptions.add(new SearchConditionOption("6", SystemEnv.getHtmlLabelName(32530, user.getLanguage()),true));//指定日期范围(必须为6)
         SearchConditionItem hiredate = conditionFactory.createCondition(ConditionType.RANGEPICKER, 18648, new String[]{"hiredate","hiredate"});
         hiredate.setInputType("rangepicker");
+        hiredate.setFormat("yyyy-MM-dd");
         hiredate.setFieldcol(16);
         hiredate.setLabelcol(8);
         hiredate.setViewAttr(2);