From 92fc902fba5f73e42c5aaa806a1292bd0c879241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 11 Mar 2022 10:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E5=8A=A0checkbox?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmd/datacollection/AddUpDeductionGetDetailListCmd.java  | 2 --
 .../cmd/datacollection/AddUpSituationGetDetailListCmd.java  | 3 ---
 .../cmd/datacollection/OtherDeductionGetDetailListCmd.java  | 6 ++----
 .../salary/cmd/taxDeclaration/TaxDeclarationListCmd.java    | 4 +---
 .../entity/datacollection/dto/AddUpDeductionRecordDTO.java  | 2 +-
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/com/engine/salary/cmd/datacollection/AddUpDeductionGetDetailListCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpDeductionGetDetailListCmd.java
index 1b0456835..92715a12c 100644
--- a/src/com/engine/salary/cmd/datacollection/AddUpDeductionGetDetailListCmd.java
+++ b/src/com/engine/salary/cmd/datacollection/AddUpDeductionGetDetailListCmd.java
@@ -85,8 +85,6 @@ public class AddUpDeductionGetDetailListCmd extends AbstractCommonCommand<Map<St
         table.setSqlprimarykey("t1.id");
         table.setSqlisdistinct("false");
 
-        table.setCheckboxList(new ArrayList<>());
-        table.setCheckboxpopedom(null);
 
         WeaResultMsg result = new WeaResultMsg(false);
         result.putAll(table.makeDataResult());
diff --git a/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java
index 9e3778338..22ac82f71 100644
--- a/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java
+++ b/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java
@@ -70,9 +70,6 @@ public class AddUpSituationGetDetailListCmd extends AbstractCommonCommand<Map<St
         table.setSqlprimarykey("t1.id");
         table.setSqlisdistinct("false");
 
-        table.setCheckboxList(new ArrayList<>());
-        table.setCheckboxpopedom(null);
-
         WeaResultMsg result = new WeaResultMsg(false);
         result.putAll(table.makeDataResult());
         result.success();
diff --git a/src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java b/src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java
index cd5903b8c..5c8c0fb2a 100644
--- a/src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java
+++ b/src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java
@@ -8,7 +8,7 @@ import com.engine.salary.biz.EmployBiz;
 import com.engine.salary.biz.OtherDeductionBiz;
 import com.engine.salary.component.SalaryWeaTable;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
-import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordDTO;
+import com.engine.salary.entity.datacollection.dto.OtherDeductionRecordDTO;
 import com.engine.salary.entity.datacollection.param.OtherDeductionQueryParam;
 import com.engine.salary.entity.datacollection.po.OtherDeductionPO;
 import com.engine.salary.exception.SalaryRunTimeException;
@@ -79,7 +79,7 @@ public class OtherDeductionGetDetailListCmd extends AbstractCommonCommand<Map<St
                 "        LEFT JOIN hrmresource e ON e.id = t1.employee_id" +
                 "        LEFT JOIN hrmdepartment d ON d.id = e.departmentid";
 
-        SalaryWeaTable<AddUpDeductionRecordDTO> table = new SalaryWeaTable<AddUpDeductionRecordDTO>(user, AddUpDeductionRecordDTO.class);
+        SalaryWeaTable<OtherDeductionRecordDTO> table = new SalaryWeaTable<OtherDeductionRecordDTO>(user, OtherDeductionRecordDTO.class);
         table.setBackfields(fields);
         table.setSqlform(fromSql);
         table.setSqlwhere(makeSqlWhere(queryParam));
@@ -87,8 +87,6 @@ public class OtherDeductionGetDetailListCmd extends AbstractCommonCommand<Map<St
         table.setSqlprimarykey("t1.id");
         table.setSqlisdistinct("false");
 
-        table.setCheckboxList(new ArrayList<>());
-        table.setCheckboxpopedom(null);
 
         WeaResultMsg result = new WeaResultMsg(false);
         result.putAll(table.makeDataResult());
diff --git a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationListCmd.java b/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationListCmd.java
index aae780f9a..42032ff57 100644
--- a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationListCmd.java
+++ b/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationListCmd.java
@@ -72,9 +72,7 @@ public class TaxDeclarationListCmd extends AbstractCommonCommand<Map<String, Obj
         table.getColumns().add(new WeaTableColumn("20%", "名称", "createTime", ""));
         table.getColumns().add(new WeaTableColumn("20%", "名称", "description", ""));
 
-        //设置check是否可用
-        table.setCheckboxList(null);
-        table.setCheckboxpopedom(null);
+
         result.putAll(table.makeDataResult());
         result.success();
         apidatas = result.getResultMap();
diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
index c61f434fc..5cc7bf081 100644
--- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
+++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
@@ -19,7 +19,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 //数据采集-累计专项附加扣除记录
-@SalaryTable(pageId = "a4f85287-3354-4275-adn9-7d06e54y6rj8",tableType = WeaTableTypeEnum.CHECKBOX)
+@SalaryTable(pageId = "a4f85287-3354-4275-adn9-7d06e54y6rj8", tableType = WeaTableTypeEnum.CHECKBOX)
 public class AddUpDeductionRecordDTO {
 
     //主键id