From de5a00f588410a31f31245a66126bc87dea8261d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 25 Nov 2024 16:04:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=88=97=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/sqlupgrade/DM/sql202411250103.sql    |  5 ++
 resource/sqlupgrade/GS/sql202411250103.sql    |  5 ++
 resource/sqlupgrade/JC/sql202411250103.sql    |  5 ++
 resource/sqlupgrade/Mysql/sql202411250103.sql |  1 +
 .../sqlupgrade/Oracle/sql202411250103.sql     |  4 ++
 resource/sqlupgrade/PG/sql202411250103.sql    |  1 +
 .../sqlupgrade/SQLServer/sql202411250103.sql  |  2 +
 resource/sqlupgrade/ST/sql202411250103.sql    |  5 ++
 .../param/PageListSettingQueryParam.java      |  2 +
 .../param/PageListSettingSaveParam.java       |  8 ++-
 .../entity/setting/po/PageListSettingPO.java  |  7 ++-
 .../mapper/setting/PageListSettingMapper.java |  2 +-
 .../mapper/setting/PageListSettingMapper.xml  | 16 +++++
 .../SalaryStatisticsEmployeeServiceImpl.java  | 29 ++++++---
 .../SalaryStatisticsEmployeeWrapper.java      |  7 ++-
 .../engine/salary/service/SettingService.java |  3 +-
 .../service/impl/SettingServiceImpl.java      | 60 +++++++++++++++----
 .../salary/web/SalaryCommonController.java    |  2 +-
 .../salary/wrapper/SalaryCommonWrapper.java   |  3 +-
 19 files changed, 136 insertions(+), 31 deletions(-)
 create mode 100644 resource/sqlupgrade/DM/sql202411250103.sql
 create mode 100644 resource/sqlupgrade/GS/sql202411250103.sql
 create mode 100644 resource/sqlupgrade/JC/sql202411250103.sql
 create mode 100644 resource/sqlupgrade/Mysql/sql202411250103.sql
 create mode 100644 resource/sqlupgrade/Oracle/sql202411250103.sql
 create mode 100644 resource/sqlupgrade/PG/sql202411250103.sql
 create mode 100644 resource/sqlupgrade/SQLServer/sql202411250103.sql
 create mode 100644 resource/sqlupgrade/ST/sql202411250103.sql

diff --git a/resource/sqlupgrade/DM/sql202411250103.sql b/resource/sqlupgrade/DM/sql202411250103.sql
new file mode 100644
index 000000000..9a56df46d
--- /dev/null
+++ b/resource/sqlupgrade/DM/sql202411250103.sql
@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+);
+/
+
diff --git a/resource/sqlupgrade/GS/sql202411250103.sql b/resource/sqlupgrade/GS/sql202411250103.sql
new file mode 100644
index 000000000..9a56df46d
--- /dev/null
+++ b/resource/sqlupgrade/GS/sql202411250103.sql
@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+);
+/
+
diff --git a/resource/sqlupgrade/JC/sql202411250103.sql b/resource/sqlupgrade/JC/sql202411250103.sql
new file mode 100644
index 000000000..9a56df46d
--- /dev/null
+++ b/resource/sqlupgrade/JC/sql202411250103.sql
@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+);
+/
+
diff --git a/resource/sqlupgrade/Mysql/sql202411250103.sql b/resource/sqlupgrade/Mysql/sql202411250103.sql
new file mode 100644
index 000000000..0a79e673f
--- /dev/null
+++ b/resource/sqlupgrade/Mysql/sql202411250103.sql
@@ -0,0 +1 @@
+ALTER TABLE hrsa_page_list_setting ADD COLUMN default_setting int;
\ No newline at end of file
diff --git a/resource/sqlupgrade/Oracle/sql202411250103.sql b/resource/sqlupgrade/Oracle/sql202411250103.sql
new file mode 100644
index 000000000..81ccb980d
--- /dev/null
+++ b/resource/sqlupgrade/Oracle/sql202411250103.sql
@@ -0,0 +1,4 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+)
+/
\ No newline at end of file
diff --git a/resource/sqlupgrade/PG/sql202411250103.sql b/resource/sqlupgrade/PG/sql202411250103.sql
new file mode 100644
index 000000000..def09e4e2
--- /dev/null
+++ b/resource/sqlupgrade/PG/sql202411250103.sql
@@ -0,0 +1 @@
+ALTER TABLE hrsa_page_list_setting  ADD COLUMN default_setting int  ;
\ No newline at end of file
diff --git a/resource/sqlupgrade/SQLServer/sql202411250103.sql b/resource/sqlupgrade/SQLServer/sql202411250103.sql
new file mode 100644
index 000000000..017545023
--- /dev/null
+++ b/resource/sqlupgrade/SQLServer/sql202411250103.sql
@@ -0,0 +1,2 @@
+ALTER TABLE hrsa_page_list_setting ADD default_setting int NULL
+GO
\ No newline at end of file
diff --git a/resource/sqlupgrade/ST/sql202411250103.sql b/resource/sqlupgrade/ST/sql202411250103.sql
new file mode 100644
index 000000000..9a56df46d
--- /dev/null
+++ b/resource/sqlupgrade/ST/sql202411250103.sql
@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_page_list_setting add (
+	default_setting number
+);
+/
+
diff --git a/src/com/engine/salary/entity/setting/param/PageListSettingQueryParam.java b/src/com/engine/salary/entity/setting/param/PageListSettingQueryParam.java
index 0de49c816..b00d55c5d 100644
--- a/src/com/engine/salary/entity/setting/param/PageListSettingQueryParam.java
+++ b/src/com/engine/salary/entity/setting/param/PageListSettingQueryParam.java
@@ -19,4 +19,6 @@ public class PageListSettingQueryParam {
     private String page;
 
     private String name;
+
+    private Integer defaultSetting;
 }
\ No newline at end of file
diff --git a/src/com/engine/salary/entity/setting/param/PageListSettingSaveParam.java b/src/com/engine/salary/entity/setting/param/PageListSettingSaveParam.java
index bd97950e7..e164d4889 100644
--- a/src/com/engine/salary/entity/setting/param/PageListSettingSaveParam.java
+++ b/src/com/engine/salary/entity/setting/param/PageListSettingSaveParam.java
@@ -17,6 +17,12 @@ import java.util.List;
 @AllArgsConstructor
 public class PageListSettingSaveParam {
 
+    /**
+     * 默认设置
+     */
+    @DataCheck(require = true,message = "是否为默认设置")
+    private Integer defaultSetting;
+
     /**
      * 页面，0：薪资明细
      */
@@ -27,5 +33,5 @@ public class PageListSettingSaveParam {
      * 设置
      */
     @DataCheck(require = true,message = "请选择设置")
-    private List<Long> setting;
+    private List<String> setting;
 }
\ No newline at end of file
diff --git a/src/com/engine/salary/entity/setting/po/PageListSettingPO.java b/src/com/engine/salary/entity/setting/po/PageListSettingPO.java
index c27bec6a3..5d706166a 100644
--- a/src/com/engine/salary/entity/setting/po/PageListSettingPO.java
+++ b/src/com/engine/salary/entity/setting/po/PageListSettingPO.java
@@ -30,7 +30,12 @@ public class PageListSettingPO {
      * 设置
      */
     @ElogTransform(name = "设置")
-    private List<Long> setting;
+    private List<String> setting;
+
+    /**
+     * 默认设置
+     */
+    private Integer defaultSetting;
 
 
     /**
diff --git a/src/com/engine/salary/mapper/setting/PageListSettingMapper.java b/src/com/engine/salary/mapper/setting/PageListSettingMapper.java
index d45faa161..ef466c2a7 100644
--- a/src/com/engine/salary/mapper/setting/PageListSettingMapper.java
+++ b/src/com/engine/salary/mapper/setting/PageListSettingMapper.java
@@ -70,7 +70,7 @@ public interface PageListSettingMapper {
     void deleteByIds(@Param("ids") Collection<Long> ids);
 
 	//获取页面默认配置
-	PageListSettingPO getByPage(String page);
+	PageListSettingPO getByPage(@Param("page") String page, @Param("defaultSetting") Integer defaultSetting);
 
 	//获取页面配置模板
 	List<PageListSettingPO> getTemplatesByPage(String page);
diff --git a/src/com/engine/salary/mapper/setting/PageListSettingMapper.xml b/src/com/engine/salary/mapper/setting/PageListSettingMapper.xml
index f52abe207..d2234f231 100644
--- a/src/com/engine/salary/mapper/setting/PageListSettingMapper.xml
+++ b/src/com/engine/salary/mapper/setting/PageListSettingMapper.xml
@@ -10,6 +10,7 @@
         <result column="update_time" property="updateTime"/>
         <result column="delete_type" property="deleteType"/>
         <result column="tenant_key" property="tenantKey"/>
+        <result column="default_setting" property="defaultSetting"/>
     </resultMap>
 
     <!-- 表字段 -->
@@ -24,6 +25,7 @@
         , t.setting
         , t.tenant_key
         , t.update_time
+        , t.default_setting
     </sql>
 
     <!-- 查询全部 -->
@@ -70,6 +72,9 @@
         <if test="updateTime != null">
             AND update_time = #{updateTime}
         </if>
+        <if test="defaultSetting != null">
+            AND default_setting = #{defaultSetting}
+        </if>
         <if test="ids != null and ids.size()>0">
             AND id IN
             <foreach collection="ids" open="(" item="id" separator="," close=")">
@@ -109,6 +114,9 @@
             <if test="updateTime != null">
                 update_time,
             </if>
+            <if test="defaultSetting != null">
+                default_setting,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="createTime != null">
@@ -135,6 +143,9 @@
             <if test="updateTime != null">
                 #{updateTime},
             </if>
+            <if test="defaultSetting != null">
+                #{defaultSetting},
+            </if>
         </trim>
     </insert>
 
@@ -150,6 +161,7 @@
             setting=#{setting, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.SalaryListTypeHandler},
             tenant_key=#{tenantKey},
             update_time=#{updateTime},
+            default_setting=#{defaultSetting},
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
@@ -180,6 +192,9 @@
             <if test="updateTime != null">
                 update_time=#{updateTime},
             </if>
+            <if test="defaultSetting != null">
+                default_setting=#{defaultSetting},
+            </if>
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
@@ -209,6 +224,7 @@
         FROM hrsa_page_list_setting t
         WHERE delete_type = 0
         and page = #{page}
+        and default_setting = #{defaultSetting}
     </select>
 
     <select id="getTemplatesByPage" resultMap="BaseResultMap">
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
index 813b0e867..5b582470f 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
@@ -10,7 +10,6 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
 import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
 import com.engine.salary.entity.salarysob.po.SalarySobPO;
-import com.engine.salary.entity.setting.param.PageListSettingQueryParam;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
 import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum;
@@ -26,7 +25,10 @@ import com.engine.salary.report.entity.param.SalaryStatisticsEmployeeSalaryQuery
 import com.engine.salary.report.service.SalaryStatisticsEmployeeService;
 import com.engine.salary.service.*;
 import com.engine.salary.service.impl.*;
-import com.engine.salary.util.*;
+import com.engine.salary.util.SalaryAssert;
+import com.engine.salary.util.SalaryDateUtil;
+import com.engine.salary.util.SalaryEntityUtil;
+import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
 import com.engine.salary.util.page.SalaryPageUtil;
@@ -41,8 +43,6 @@ import weaver.hrm.User;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.engine.salary.enums.setting.PageListSettingPageEnum.SALARY_DETAILS_REPORT;
-
 /**
  * 薪酬统计员工明细
  * <p>Copyright: Copyright (c) 2022</p>
@@ -350,10 +350,23 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
     @Override
     public SalaryStatisticsEmployeeDetailResultDTO getDetailSalaryAcctResultByAcctEmp(List<SalaryAcctEmployeePO> salaryAcctEmployeeList) {
         // 3.获取薪资项目
-        PageListSettingQueryParam param = PageListSettingQueryParam.builder().page(SALARY_DETAILS_REPORT.getValue()).build();
-        Map setting = getSettingService(user).getPageListSetting(param);
-        List<Long> checked = setting.get("checked") != null ? JsonUtil.parseList(setting.get("checked"), Long.class) : new ArrayList<>();
-        List<SalaryItemPO> salaryItemList = getSalaryItemService(user).listByIds(checked);
+        List<SalaryItemPO> salaryItemList = getSalaryItemService(user).listAll();
+        salaryItemList = salaryItemList.stream()
+                .sorted(new Comparator<SalaryItemPO>() {
+                    @Override
+                    public int compare(SalaryItemPO o1, SalaryItemPO o2) {
+                        if (o1.getSortedIndex() == null && o2.getSortedIndex() == null) {
+                            Integer systemType1 = o1.getSystemType() == null ? 0 : o1.getSystemType();
+                            Integer systemType2 = o2.getSystemType() == null ? 0 : o2.getSystemType();
+                            return systemType1.compareTo(systemType2);
+                        } else {
+                            Integer sortedIndex1 = o1.getSortedIndex() == null ? 0 : o1.getSortedIndex();
+                            Integer sortedIndex2 = o2.getSortedIndex() == null ? 0 : o2.getSortedIndex();
+                            return sortedIndex2.compareTo(sortedIndex1);
+                        }
+                    }
+                })
+                .collect(Collectors.toList());
         if (CollectionUtils.isEmpty(salaryAcctEmployeeList)) {
             return SalaryStatisticsEmployeeDetailResultDTO.builder()
                     .salaryAcctEmployeeList(Collections.emptyList())
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
index e140ed0fd..cadde1026 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
@@ -11,6 +11,8 @@ import com.engine.salary.component.WeaTableColumnGroup;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
 import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveListDTO;
 import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
+import com.engine.salary.entity.setting.dto.PageListTemplateDTO;
+import com.engine.salary.entity.setting.param.PageListSettingQueryParam;
 import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
 import com.engine.salary.report.common.constant.SalaryConstant;
 import com.engine.salary.report.entity.bo.SalaryStatisticsReportBO;
@@ -189,8 +191,9 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
         if (templateShow) {
             weaTableColumns = getSettingService(user).getPageListColumns(SALARY_DETAILS_REPORT.getValue());
         } else {
-            // 显示方案0，显示定制列,默认方式
-            weaTableColumns = buildDetailTableColumns(salaryStatisticsEmployeeDetailResult, true);
+            PageListSettingQueryParam param = PageListSettingQueryParam.builder().page(SALARY_DETAILS_REPORT.getValue()).build();
+            PageListTemplateDTO pageListSetting = getSettingService(user).getPageListSetting(param);
+            weaTableColumns = pageListSetting.getChecked();
         }
 
         // 结果
diff --git a/src/com/engine/salary/service/SettingService.java b/src/com/engine/salary/service/SettingService.java
index aa6526b02..8846ddf69 100644
--- a/src/com/engine/salary/service/SettingService.java
+++ b/src/com/engine/salary/service/SettingService.java
@@ -6,12 +6,11 @@ import com.engine.salary.entity.setting.param.*;
 import com.engine.salary.entity.setting.po.PageListTemplatePO;
 
 import java.util.List;
-import java.util.Map;
 
 public interface SettingService {
     void savePageListSetting(PageListSettingSaveParam pageListSettingSaveParam);
 
-    Map getPageListSetting(PageListSettingQueryParam param);
+    PageListTemplateDTO getPageListSetting(PageListSettingQueryParam param);
 
     PageListTemplateDTO getPageListTemplate(PageListTemplateQueryParam param);
 
diff --git a/src/com/engine/salary/service/impl/SettingServiceImpl.java b/src/com/engine/salary/service/impl/SettingServiceImpl.java
index 485f6e24e..844579b76 100644
--- a/src/com/engine/salary/service/impl/SettingServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SettingServiceImpl.java
@@ -67,10 +67,12 @@ public class SettingServiceImpl extends Service implements SettingService {
 
     @Override
     public void savePageListSetting(PageListSettingSaveParam pageListSettingSaveParam) {
+        ValidUtil.doValidator(pageListSettingSaveParam);
+
         Date now = new Date();
 
-        PageListSettingPO pageListSettingPO = getPageListSettingMapper().getByPage(pageListSettingSaveParam.getPage());
-        List<Long> checked = pageListSettingSaveParam.getSetting().stream().distinct().collect(Collectors.toList());
+        PageListSettingPO pageListSettingPO = getPageListSettingMapper().getByPage(pageListSettingSaveParam.getPage(), pageListSettingSaveParam.getDefaultSetting());
+        List<String> checked = pageListSettingSaveParam.getSetting().stream().distinct().collect(Collectors.toList());
         if (pageListSettingPO != null) {
             pageListSettingPO.setSetting(checked);
             pageListSettingPO.setUpdateTime(now);
@@ -80,6 +82,7 @@ public class SettingServiceImpl extends Service implements SettingService {
                     .id(IdGenerator.generate())
                     .page(pageListSettingSaveParam.getPage())
                     .setting(checked)
+                    .defaultSetting(pageListSettingSaveParam.getDefaultSetting())
                     .creator((long) user.getUID())
                     .createTime(now)
                     .updateTime(now)
@@ -91,13 +94,27 @@ public class SettingServiceImpl extends Service implements SettingService {
     }
 
     @Override
-    public Map getPageListSetting(PageListSettingQueryParam param) {
+    public PageListTemplateDTO getPageListSetting(PageListSettingQueryParam param) {
         String page = param.getPage();
-        Map result = new HashMap();
-        PageListSettingPO pageListSettingPO = getPageListSettingMapper().getByPage(page);
         if (SALARY_DETAILS_REPORT.getValue().equals(page)) {
+            List<WeaTableColumn> columns = new ArrayList<>();
+            columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(87614, "薪资所属月"), "salaryMonth"));
+            columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), "taxAgent"));
+            columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86184, "账套"), "salarySob"));
+            columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "姓名"), "userName"));
+            columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "分部"), "subCompany"));
+            columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "部门"), "department"));
+            columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "岗位"), "jobTitle"));
+            columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "员工状态"), "status"));
+            columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "工号"), "workCode"));
+            columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "入职日期"), "companystartdate"));
+            columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86184, "次数"), "acctTimes").setDisplay(WeaBoolAttr.FALSE));
+            if (StrUtil.isNotBlank(param.getName())) {
+                columns = columns.stream().filter(column -> column.getText().contains(param.getName())).collect(Collectors.toList());
+            }
+
             List<SalaryItemPO> salaryItemList = getSalaryItemService(user).listAll();
-            salaryItemList = salaryItemList.stream()
+            List<WeaTableColumn> collect = salaryItemList.stream()
                     .filter(po -> {
                         String name = param.getName();
                         if (StrUtil.isNotEmpty(name)) {
@@ -116,16 +133,33 @@ public class SettingServiceImpl extends Service implements SettingService {
                             return sortedIndex2.compareTo(sortedIndex1);
                         }
                     })
+                    .map(item -> new WeaTableColumn("100px", item.getName(), item.getId() + SalaryConstant.DYNAMIC_SUFFIX))
                     .collect(Collectors.toList());
-            result.put("setting", salaryItemList);
-            if (pageListSettingPO != null && CollUtil.isNotEmpty(pageListSettingPO.getSetting())) {
-                result.put("checked", pageListSettingPO.getSetting());
-            } else {
-                List<Long> collect = salaryItemList.stream().map(SalaryItemPO::getId).collect(Collectors.toList());
-                result.put("checked", collect);
+
+            columns.addAll(collect);
+
+            Integer defaultSetting = param.getDefaultSetting();
+            Map<String, WeaTableColumn> columnMap = SalaryEntityUtil.convert2Map(columns, WeaTableColumn::getColumn);
+            List<WeaTableColumn> checkedList = new ArrayList<>();
+            PageListSettingPO po = getPageListSettingMapper().getByPage(page, defaultSetting);
+
+            //如果查询个人设置且无值，查询默认设置
+            if (defaultSetting == 0 && po == null) {
+                po = getPageListSettingMapper().getByPage(page, 1);
             }
+
+            if (po != null) {
+                checkedList = Optional.ofNullable(po.getSetting()).orElse(new ArrayList<>())
+                        .stream()
+                        .map(s -> columnMap.getOrDefault(s, new WeaTableColumn()))
+                        .collect(Collectors.toList());
+            }else {
+                checkedList = columns;
+            }
+            return PageListTemplateDTO.builder().setting(columns).checked(checkedList).build();
         }
-        return result;
+
+        return  PageListTemplateDTO.builder().setting(new ArrayList<>()).checked(new ArrayList<>()).build();
     }
 
     @Override
diff --git a/src/com/engine/salary/web/SalaryCommonController.java b/src/com/engine/salary/web/SalaryCommonController.java
index 28155c729..86152defe 100644
--- a/src/com/engine/salary/web/SalaryCommonController.java
+++ b/src/com/engine/salary/web/SalaryCommonController.java
@@ -80,7 +80,7 @@ public class SalaryCommonController {
     @Produces(MediaType.APPLICATION_JSON)
     public String getPageListSetting(@Context HttpServletRequest request, @Context HttpServletResponse response,@RequestBody PageListSettingQueryParam param) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<PageListSettingQueryParam, Map>(user).run(getSalaryCommonWrapper(user)::getPageListSetting, param);
+        return new ResponseResult<PageListSettingQueryParam, PageListTemplateDTO>(user).run(getSalaryCommonWrapper(user)::getPageListSetting, param);
     }
 
     /**
diff --git a/src/com/engine/salary/wrapper/SalaryCommonWrapper.java b/src/com/engine/salary/wrapper/SalaryCommonWrapper.java
index 7719c6d5a..1ff7c641c 100644
--- a/src/com/engine/salary/wrapper/SalaryCommonWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryCommonWrapper.java
@@ -12,7 +12,6 @@ import com.engine.salary.service.impl.SettingServiceImpl;
 import weaver.hrm.User;
 
 import java.util.List;
-import java.util.Map;
 
 
 public class SalaryCommonWrapper extends Service {
@@ -38,7 +37,7 @@ public class SalaryCommonWrapper extends Service {
     }
 
 
-    public Map getPageListSetting(PageListSettingQueryParam param) {
+    public PageListTemplateDTO getPageListSetting(PageListSettingQueryParam param) {
         return getSettingService(user).getPageListSetting(param);
     }
 

From 12df33960af1de25e13d25d7b1b351d3500605f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 25 Nov 2024 18:05:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=88=97=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/setting/PageListSettingMapper.java |  47 ++---
 .../mapper/setting/PageListSettingMapper.xml  |   3 +
 .../SalaryStatisticsEmployeeWrapper.java      |  19 +-
 .../service/impl/SettingServiceImpl.java      | 184 +++++++-----------
 4 files changed, 104 insertions(+), 149 deletions(-)

diff --git a/src/com/engine/salary/mapper/setting/PageListSettingMapper.java b/src/com/engine/salary/mapper/setting/PageListSettingMapper.java
index ef466c2a7..2bcdd1f88 100644
--- a/src/com/engine/salary/mapper/setting/PageListSettingMapper.java
+++ b/src/com/engine/salary/mapper/setting/PageListSettingMapper.java
@@ -8,70 +8,71 @@ import java.util.List;
 
 public interface PageListSettingMapper {
 
-	/**
+    /**
      * 查询所有记录
      *
      * @return 返回集合，没有返回空List
      */
-	List<PageListSettingPO> listAll();
-    
+    List<PageListSettingPO> listAll();
+
     /**
      * 条件查询
      *
      * @return 返回集合，没有返回空List
      */
     List<PageListSettingPO> listSome(PageListSettingPO pageListSetting);
-    
 
-	/**
+
+    /**
      * 根据主键查询
      *
      * @param id 主键
      * @return 返回记录，没有返回null
      */
-	PageListSettingPO getById(Long id);
-	
-	/**
+    PageListSettingPO getById(Long id);
+
+    /**
      * 新增，忽略null字段
      *
      * @param pageListSetting 新增的记录
      * @return 返回影响行数
      */
-	int insertIgnoreNull(PageListSettingPO pageListSetting);
-	
-	/**
+    int insertIgnoreNull(PageListSettingPO pageListSetting);
+
+    /**
      * 修改，修改所有字段
      *
      * @param pageListSetting 修改的记录
      * @return 返回影响行数
      */
-	int update(PageListSettingPO pageListSetting);
-	
-	/**
+    int update(PageListSettingPO pageListSetting);
+
+    /**
      * 修改，忽略null字段
      *
      * @param pageListSetting 修改的记录
      * @return 返回影响行数
      */
-	int updateIgnoreNull(PageListSettingPO pageListSetting);
-	
-	/**
+    int updateIgnoreNull(PageListSettingPO pageListSetting);
+
+    /**
      * 删除记录
      *
      * @param pageListSetting 待删除的记录
      * @return 返回影响行数
      */
-	int delete(PageListSettingPO pageListSetting);
-    
+    int delete(PageListSettingPO pageListSetting);
+
     /**
      * 批量删除记录
+     *
      * @param ids 主键id集合
      */
     void deleteByIds(@Param("ids") Collection<Long> ids);
 
-	//获取页面默认配置
-	PageListSettingPO getByPage(@Param("page") String page, @Param("defaultSetting") Integer defaultSetting);
+    //获取页面默认配置
+    PageListSettingPO getByPage(@Param("page") String page, @Param("defaultSetting") Integer defaultSetting, @Param("creator") Long creator);
 
-	//获取页面配置模板
-	List<PageListSettingPO> getTemplatesByPage(String page);
+    //获取页面配置模板
+    List<PageListSettingPO> getTemplatesByPage(String page);
 }
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/setting/PageListSettingMapper.xml b/src/com/engine/salary/mapper/setting/PageListSettingMapper.xml
index d2234f231..ed8f14bb4 100644
--- a/src/com/engine/salary/mapper/setting/PageListSettingMapper.xml
+++ b/src/com/engine/salary/mapper/setting/PageListSettingMapper.xml
@@ -225,6 +225,9 @@
         WHERE delete_type = 0
         and page = #{page}
         and default_setting = #{defaultSetting}
+        <if test="creator != null">
+            AND creator = #{creator}
+        </if>
     </select>
 
     <select id="getTemplatesByPage" resultMap="BaseResultMap">
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
index cadde1026..4f6a71d93 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
@@ -1,7 +1,6 @@
 package com.engine.salary.report.wrapper;
 
 import com.cloudstore.eccom.constant.WeaBoolAttr;
-import com.cloudstore.eccom.pc.table.WeaTable;
 import com.cloudstore.eccom.pc.table.WeaTableColumn;
 import com.cloudstore.eccom.result.WeaResultMsg;
 import com.engine.common.util.ServiceUtil;
@@ -41,7 +40,6 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import weaver.general.PageIdConst;
 import weaver.general.Util;
 import weaver.hrm.User;
 
@@ -191,13 +189,14 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
         if (templateShow) {
             weaTableColumns = getSettingService(user).getPageListColumns(SALARY_DETAILS_REPORT.getValue());
         } else {
-            PageListSettingQueryParam param = PageListSettingQueryParam.builder().page(SALARY_DETAILS_REPORT.getValue()).build();
+            PageListSettingQueryParam param = PageListSettingQueryParam.builder().page(SALARY_DETAILS_REPORT.getValue()).defaultSetting(0).build();
             PageListTemplateDTO pageListSetting = getSettingService(user).getPageListSetting(param);
             weaTableColumns = pageListSetting.getChecked();
         }
 
         // 结果
         resultMap.put("columns", weaTableColumns);
+        resultMap.put("pageInfo", pageInfo);
         if (queryParam.isExport()) {
             Map<String, Object> countResultMap = Maps.newHashMap();
             List<SalaryItemPO> salaryItems = salaryStatisticsEmployeeDetailResult.getSalaryItemList();
@@ -215,21 +214,7 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
             }
             resultMap.put("salaryItems", salaryStatisticsEmployeeDetailResult.getSalaryItemList());
             resultMap.put("countResult", countResultMap);
-        } else {
-            WeaTable table = new WeaTable();
-            String pageId = "b72ed4bb-725e-45de-aea1-4eb4c9184af7";
-            table.setPageID(pageId);
-            table.setPageUID(pageId + user.getUID());
-            table.setPagesize(PageIdConst.getPageSize(pageId, user.getUID()));
-            table.setBackfields("");
-            table.setColumns(weaTableColumns);
-
-            WeaResultMsg result = new WeaResultMsg(false);
-            result.putAll(table.makeDataResult());
-            result.success();
-            resultMap.put("dataKey", result.getResultMap());
         }
-        resultMap.put("pageInfo", pageInfo);
         return resultMap;
     }
 
diff --git a/src/com/engine/salary/service/impl/SettingServiceImpl.java b/src/com/engine/salary/service/impl/SettingServiceImpl.java
index 844579b76..0f6636d8e 100644
--- a/src/com/engine/salary/service/impl/SettingServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SettingServiceImpl.java
@@ -71,24 +71,22 @@ public class SettingServiceImpl extends Service implements SettingService {
 
         Date now = new Date();
 
-        PageListSettingPO pageListSettingPO = getPageListSettingMapper().getByPage(pageListSettingSaveParam.getPage(), pageListSettingSaveParam.getDefaultSetting());
+        //是否保存默认设置
+        Integer defaultSetting = pageListSettingSaveParam.getDefaultSetting();
+        PageListSettingPO pageListSettingPO;
+        if (defaultSetting == 0) {
+            pageListSettingPO = getPageListSettingMapper().getByPage(pageListSettingSaveParam.getPage(), defaultSetting, (long) user.getUID());
+        } else {
+            pageListSettingPO = getPageListSettingMapper().getByPage(pageListSettingSaveParam.getPage(), defaultSetting, null);
+        }
+
         List<String> checked = pageListSettingSaveParam.getSetting().stream().distinct().collect(Collectors.toList());
         if (pageListSettingPO != null) {
             pageListSettingPO.setSetting(checked);
             pageListSettingPO.setUpdateTime(now);
             getPageListSettingMapper().updateIgnoreNull(pageListSettingPO);
         } else {
-            pageListSettingPO = PageListSettingPO.builder()
-                    .id(IdGenerator.generate())
-                    .page(pageListSettingSaveParam.getPage())
-                    .setting(checked)
-                    .defaultSetting(pageListSettingSaveParam.getDefaultSetting())
-                    .creator((long) user.getUID())
-                    .createTime(now)
-                    .updateTime(now)
-                    .deleteType(0)
-                    .tenantKey(DEFAULT_TENANT_KEY)
-                    .build();
+            pageListSettingPO = PageListSettingPO.builder().id(IdGenerator.generate()).page(pageListSettingSaveParam.getPage()).setting(checked).defaultSetting(defaultSetting).creator((long) user.getUID()).createTime(now).updateTime(now).deleteType(0).tenantKey(DEFAULT_TENANT_KEY).build();
             getPageListSettingMapper().insertIgnoreNull(pageListSettingPO);
         }
     }
@@ -114,52 +112,52 @@ public class SettingServiceImpl extends Service implements SettingService {
             }
 
             List<SalaryItemPO> salaryItemList = getSalaryItemService(user).listAll();
-            List<WeaTableColumn> collect = salaryItemList.stream()
-                    .filter(po -> {
-                        String name = param.getName();
-                        if (StrUtil.isNotEmpty(name)) {
-                            return po.getName() != null && po.getName().contains(name);
-                        }
-                        return true;
-                    })
-                    .sorted((o1, o2) -> {
-                        if (o1.getSortedIndex() == null && o2.getSortedIndex() == null) {
-                            Integer systemType1 = o1.getSystemType() == null ? 0 : o1.getSystemType();
-                            Integer systemType2 = o2.getSystemType() == null ? 0 : o2.getSystemType();
-                            return systemType1.compareTo(systemType2);
-                        } else {
-                            Integer sortedIndex1 = o1.getSortedIndex() == null ? 0 : o1.getSortedIndex();
-                            Integer sortedIndex2 = o2.getSortedIndex() == null ? 0 : o2.getSortedIndex();
-                            return sortedIndex2.compareTo(sortedIndex1);
-                        }
-                    })
-                    .map(item -> new WeaTableColumn("100px", item.getName(), item.getId() + SalaryConstant.DYNAMIC_SUFFIX))
-                    .collect(Collectors.toList());
+            List<WeaTableColumn> collect = salaryItemList.stream().filter(po -> {
+                String name = param.getName();
+                if (StrUtil.isNotEmpty(name)) {
+                    return po.getName() != null && po.getName().contains(name);
+                }
+                return true;
+            }).sorted((o1, o2) -> {
+                if (o1.getSortedIndex() == null && o2.getSortedIndex() == null) {
+                    Integer systemType1 = o1.getSystemType() == null ? 0 : o1.getSystemType();
+                    Integer systemType2 = o2.getSystemType() == null ? 0 : o2.getSystemType();
+                    return systemType1.compareTo(systemType2);
+                } else {
+                    Integer sortedIndex1 = o1.getSortedIndex() == null ? 0 : o1.getSortedIndex();
+                    Integer sortedIndex2 = o2.getSortedIndex() == null ? 0 : o2.getSortedIndex();
+                    return sortedIndex2.compareTo(sortedIndex1);
+                }
+            }).map(item -> new WeaTableColumn("100px", item.getName(), item.getId() + SalaryConstant.DYNAMIC_SUFFIX)).collect(Collectors.toList());
 
             columns.addAll(collect);
 
             Integer defaultSetting = param.getDefaultSetting();
             Map<String, WeaTableColumn> columnMap = SalaryEntityUtil.convert2Map(columns, WeaTableColumn::getColumn);
             List<WeaTableColumn> checkedList = new ArrayList<>();
-            PageListSettingPO po = getPageListSettingMapper().getByPage(page, defaultSetting);
 
-            //如果查询个人设置且无值，查询默认设置
-            if (defaultSetting == 0 && po == null) {
-                po = getPageListSettingMapper().getByPage(page, 1);
+            //是否查询默认设置
+            PageListSettingPO pageListSettingPO;
+            if (defaultSetting == 0) {
+                pageListSettingPO = getPageListSettingMapper().getByPage(page, 0, (long) user.getUID());
+                //查不到个人查默认
+                if (pageListSettingPO == null) {
+                    pageListSettingPO = getPageListSettingMapper().getByPage(page, 1, null);
+                }
+            } else {
+                pageListSettingPO = getPageListSettingMapper().getByPage(page, 1, null);
             }
 
-            if (po != null) {
-                checkedList = Optional.ofNullable(po.getSetting()).orElse(new ArrayList<>())
-                        .stream()
-                        .map(s -> columnMap.getOrDefault(s, new WeaTableColumn()))
-                        .collect(Collectors.toList());
-            }else {
+            //查询选中的项目
+            if (pageListSettingPO != null) {
+                checkedList = Optional.ofNullable(pageListSettingPO.getSetting()).orElse(new ArrayList<>()).stream().map(s -> columnMap.getOrDefault(s, new WeaTableColumn())).collect(Collectors.toList());
+            } else {
                 checkedList = columns;
             }
             return PageListTemplateDTO.builder().setting(columns).checked(checkedList).build();
         }
 
-        return  PageListTemplateDTO.builder().setting(new ArrayList<>()).checked(new ArrayList<>()).build();
+        return PageListTemplateDTO.builder().setting(new ArrayList<>()).checked(new ArrayList<>()).build();
     }
 
     @Override
@@ -184,27 +182,23 @@ public class SettingServiceImpl extends Service implements SettingService {
             }
 
             List<SalaryItemPO> salaryItemList = getSalaryItemService(user).listAll();
-            List<WeaTableColumn> collect = salaryItemList.stream()
-                    .filter(po -> {
-                        String name = param.getName();
-                        if (StrUtil.isNotEmpty(name)) {
-                            return po.getName() != null && po.getName().contains(name);
-                        }
-                        return true;
-                    })
-                    .sorted((o1, o2) -> {
-                        if (o1.getSortedIndex() == null && o2.getSortedIndex() == null) {
-                            Integer systemType1 = o1.getSystemType() == null ? 0 : o1.getSystemType();
-                            Integer systemType2 = o2.getSystemType() == null ? 0 : o2.getSystemType();
-                            return systemType1.compareTo(systemType2);
-                        } else {
-                            Integer sortedIndex1 = o1.getSortedIndex() == null ? 0 : o1.getSortedIndex();
-                            Integer sortedIndex2 = o2.getSortedIndex() == null ? 0 : o2.getSortedIndex();
-                            return sortedIndex2.compareTo(sortedIndex1);
-                        }
-                    })
-                    .map(item -> new WeaTableColumn("100px", item.getName(), item.getId() + SalaryConstant.DYNAMIC_SUFFIX))
-                    .collect(Collectors.toList());
+            List<WeaTableColumn> collect = salaryItemList.stream().filter(po -> {
+                String name = param.getName();
+                if (StrUtil.isNotEmpty(name)) {
+                    return po.getName() != null && po.getName().contains(name);
+                }
+                return true;
+            }).sorted((o1, o2) -> {
+                if (o1.getSortedIndex() == null && o2.getSortedIndex() == null) {
+                    Integer systemType1 = o1.getSystemType() == null ? 0 : o1.getSystemType();
+                    Integer systemType2 = o2.getSystemType() == null ? 0 : o2.getSystemType();
+                    return systemType1.compareTo(systemType2);
+                } else {
+                    Integer sortedIndex1 = o1.getSortedIndex() == null ? 0 : o1.getSortedIndex();
+                    Integer sortedIndex2 = o2.getSortedIndex() == null ? 0 : o2.getSortedIndex();
+                    return sortedIndex2.compareTo(sortedIndex1);
+                }
+            }).map(item -> new WeaTableColumn("100px", item.getName(), item.getId() + SalaryConstant.DYNAMIC_SUFFIX)).collect(Collectors.toList());
 
             columns.addAll(collect);
 
@@ -213,10 +207,7 @@ public class SettingServiceImpl extends Service implements SettingService {
             if (id != null) {
                 PageListTemplatePO po = getPageListTemplateMapper().getById(id);
                 if (po != null) {
-                    checkedList = Optional.ofNullable(po.getSetting()).orElse(new ArrayList<>())
-                            .stream()
-                            .map(s -> columnMap.getOrDefault(s, new WeaTableColumn()))
-                            .collect(Collectors.toList());
+                    checkedList = Optional.ofNullable(po.getSetting()).orElse(new ArrayList<>()).stream().map(s -> columnMap.getOrDefault(s, new WeaTableColumn())).collect(Collectors.toList());
 
                 }
             }
@@ -241,22 +232,19 @@ public class SettingServiceImpl extends Service implements SettingService {
 
         Collection<TaxAgentPO> taxAgentPOS = getTaxAgentService().listAllTaxAgents((long) user.getUID());
         List<String> taxIds = SalaryEntityUtil.properties(taxAgentPOS, po -> po.getId().toString(), Collectors.toList());
-        pos = pos.stream()
-                .filter(po -> {
-                    if (po.getSharedType() == 1) {
-                        List limitIds = po.getLimitIds();
-                        List<String> collect = new ArrayList<>();
-                        for (int i = 0; i < limitIds.size(); i++) {
-                            collect.add(limitIds.get(i).toString());
-                        }
-                        return CollectionUtil.isNotEmpty(limitIds) && CollectionUtil.intersection(collect, taxIds).size() != 0;
-                    }
-                    return true;
-                })
-                .peek(po -> {
-                    po.setChecked(link != null && po.getId().equals(link.getTemplateId()));
-                })
-                .collect(Collectors.toList());
+        pos = pos.stream().filter(po -> {
+            if (po.getSharedType() == 1) {
+                List limitIds = po.getLimitIds();
+                List<String> collect = new ArrayList<>();
+                for (int i = 0; i < limitIds.size(); i++) {
+                    collect.add(limitIds.get(i).toString());
+                }
+                return CollectionUtil.isNotEmpty(limitIds) && CollectionUtil.intersection(collect, taxIds).size() != 0;
+            }
+            return true;
+        }).peek(po -> {
+            po.setChecked(link != null && po.getId().equals(link.getTemplateId()));
+        }).collect(Collectors.toList());
         return pos;
     }
 
@@ -268,19 +256,7 @@ public class SettingServiceImpl extends Service implements SettingService {
 
         PageListTemplatePO po;
         if (id == null) {
-            po = PageListTemplatePO.builder()
-                    .id(IdGenerator.generate())
-                    .page(param.getPage())
-                    .name(param.getName())
-                    .sharedType(param.getSharedType())
-                    .limitIds(param.getLimitIds())
-                    .setting(param.getSetting())
-                    .creator((long) user.getUID())
-                    .createTime(now)
-                    .updateTime(now)
-                    .deleteType(0)
-                    .tenantKey(DEFAULT_TENANT_KEY)
-                    .build();
+            po = PageListTemplatePO.builder().id(IdGenerator.generate()).page(param.getPage()).name(param.getName()).sharedType(param.getSharedType()).limitIds(param.getLimitIds()).setting(param.getSetting()).creator((long) user.getUID()).createTime(now).updateTime(now).deleteType(0).tenantKey(DEFAULT_TENANT_KEY).build();
             getPageListTemplateMapper().insertIgnoreNull(po);
         } else {
             po = getPageListTemplateMapper().getById(id);
@@ -308,17 +284,7 @@ public class SettingServiceImpl extends Service implements SettingService {
             Set<Long> ids = SalaryEntityUtil.properties(pageLinkPOS, PageLinkPO::getId);
             getPageLinkMapper().deleteByIds(ids);
         }
-        PageLinkPO pageLinkPO = PageLinkPO.builder()
-                .id(IdGenerator.generate())
-                .employeeId((long) user.getUID())
-                .page(param.getPage())
-                .templateId(param.getTemplateId())
-                .tenantKey(DEFAULT_TENANT_KEY)
-                .createTime(new Date())
-                .updateTime(new Date())
-                .creator((long) user.getUID())
-                .deleteType(0)
-                .build();
+        PageLinkPO pageLinkPO = PageLinkPO.builder().id(IdGenerator.generate()).employeeId((long) user.getUID()).page(param.getPage()).templateId(param.getTemplateId()).tenantKey(DEFAULT_TENANT_KEY).createTime(new Date()).updateTime(new Date()).creator((long) user.getUID()).deleteType(0).build();
 
         getPageLinkMapper().insertIgnoreNull(pageLinkPO);
     }