From 502450baabc0ee4ccfb81544eb7462e487cc1708 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 18:14:19 +0800
Subject: [PATCH] bug

---
 .../AddUpSituationGetDetailListCmd.java       |  2 +-
 .../entity/taxrate/vo/TaxRateTableVO.java     | 11 ++++---
 .../impl/AttendQuoteFieldServiceImpl.java     | 31 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java
index ce330e943..2646b59a5 100644
--- a/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java
+++ b/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java
@@ -67,7 +67,7 @@ public class AddUpSituationGetDetailListCmd extends AbstractCommonCommand<Map<St
 
 
         String fields = " t1.id," +
-                "        t1.tax_year_month," +
+                "        t1.tax_year_month as taxYearMonth," +
                 "        t1.employee_id as employeeId," +
                 "        e.lastname as username," +
                 "        d.departmentName AS departmentName," +
diff --git a/src/com/engine/salary/entity/taxrate/vo/TaxRateTableVO.java b/src/com/engine/salary/entity/taxrate/vo/TaxRateTableVO.java
index 49e2d2d68..18511ebb5 100644
--- a/src/com/engine/salary/entity/taxrate/vo/TaxRateTableVO.java
+++ b/src/com/engine/salary/entity/taxrate/vo/TaxRateTableVO.java
@@ -32,11 +32,6 @@ import lombok.NoArgsConstructor;
 )
 public class TaxRateTableVO {
 
-    /**
-     * 描述
-     */
-    @SalaryTableColumn(text = "说明", width = "20", column = "description")
-    private String description;
 
     /**
      * 主键
@@ -56,6 +51,12 @@ public class TaxRateTableVO {
     @SalaryTableColumn(text = "表单类型", width = "20", column = "system_type", transmethod = "com.engine.salary.transmethod.TaxRateTransMethod.getSystemTypeName")
     private Integer systemType;
 
+    /**
+     * 描述
+     */
+    @SalaryTableColumn(text = "说明", width = "20", column = "description")
+    private String description;
+
     /**
      * 操作
      */
diff --git a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
index 2679236f0..4f65d7152 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
@@ -1,6 +1,9 @@
 package com.engine.salary.service.impl;
 
+import com.cloudstore.eccom.result.WeaResultMsg;
 import com.engine.core.impl.Service;
+import com.engine.salary.component.SalaryWeaTable;
+import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO;
 import com.engine.salary.entity.datacollection.param.AttendQuoteFieldQueryParam;
 import com.engine.salary.service.AttendQuoteFieldService;
 
@@ -30,6 +33,33 @@ public class AttendQuoteFieldServiceImpl extends Service implements AttendQuoteF
         // todo 同步字段
 //        syncAttendFields(employeeId, tenantKey);
 
+        String fields = "    t1.id\n" +
+                "        ,\n" +
+                "        t1.field_name,\n" +
+                "        t1.source_type,\n" +
+                "        t1.field_type,\n" +
+                "        t1.enable_status,\n" +
+                "        t1.description";
+
+        String fromSql = "        FROM" +
+                "        hrsa_add_up_deduction t1" +
+                "        LEFT JOIN hrsa_tax_agent t2 ON t1.tax_agent_id = t2.id" +
+                "        LEFT JOIN hrmresource e ON t1.employee_id = e.id" +
+                "        LEFT JOIN hrmdepartment d ON e.departmentid = d.id";
+
+        SalaryWeaTable<AttendQuoteFieldListDTO> table = new SalaryWeaTable<AttendQuoteFieldListDTO>(user, AttendQuoteFieldListDTO.class);
+        table.setBackfields(fields);
+        table.setSqlform(fromSql);
+//        table.setSqlwhere(makeSqlWhere());
+        table.setSqlorderby("t1.id DESC");
+        table.setSqlprimarykey("t1.id");
+        table.setSqlisdistinct("false");
+
+        WeaResultMsg result = new WeaResultMsg(false);
+        result.putAll(table.makeDataResult());
+        result.success();
+        return result.getResultMap();
+
 //        Page<AttendQuoteFieldListDTO> page = new Page<>(queryParam.getCurrent(), queryParam.getPageSize(), true);
 //        mapper.list(page, queryParam, tenantKey);
 //
@@ -50,7 +80,6 @@ public class AttendQuoteFieldServiceImpl extends Service implements AttendQuoteF
 //        editableTable.setPageSize(page.getSize());
 //        editableTable.setModule("hrmsalary");
 //        return editableTable;
-        return  null;
     }
 
 //    @Override