qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

自定义列全局设置

This commit is contained in:
钱涛 2024-10-11 15:34:17 +08:00
parent da4e908a7d
commit 64ac30c05f
21 changed files with 699 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
resource/sqlupgrade/DM/sql202410110103.sql Normal file
View File

@ -0,0 +1,13 @@
create table hrsa_page_list_setting
(
id number primary key ,
setting clob ,
page varchar2(200),
creator number,
create_time date ,
update_time date,
delete_type int ,
tenant_key varchar2(10)
);
/

13
resource/sqlupgrade/GS/sql202410110103.sql Normal file
View File

@ -0,0 +1,13 @@
create table hrsa_page_list_setting
(
id number primary key ,
setting clob ,
page varchar2(200),
creator number,
create_time date ,
update_time date,
delete_type int ,
tenant_key varchar2(10)
);
/

13
resource/sqlupgrade/JC/sql202410110103.sql Normal file
View File

@ -0,0 +1,13 @@
create table hrsa_page_list_setting
(
id number primary key ,
setting clob ,
page varchar2(200),
creator number,
create_time date ,
update_time date,
delete_type int ,
tenant_key varchar2(10)
);
/

12
resource/sqlupgrade/Mysql/sql202410110103.sql Normal file
View File

@ -0,0 +1,12 @@
CREATE TABLE hrsa_page_list_setting
(
id bigint(0) NOT NULL ,
setting text ,
page varchar(200),
creator bigint(0),
create_time datetime(0) ,
update_time datetime(0),
delete_type int(0) ,
tenant_key varchar(10) ,
PRIMARY KEY (id)
);

12
resource/sqlupgrade/Oracle/sql202410110103.sql Normal file
View File

@ -0,0 +1,12 @@
create table hrsa_page_list_setting
(
id number primary key ,
setting clob ,
page varchar2(200),
creator number,
create_time date ,
update_time date,
delete_type int ,
tenant_key varchar2(10)
)
/

11
resource/sqlupgrade/PG/sql202410110103.sql Normal file
View File

@ -0,0 +1,11 @@
create table hrsa_page_list_setting
(
id bigint primary key ,
setting text ,
page varchar(200),
creator bigint,
create_time timestamp ,
update_time timestamp,
delete_type int ,
tenant_key varchar(10)
);

12
resource/sqlupgrade/SQLServer/sql202410110103.sql Normal file
View File

@ -0,0 +1,12 @@
create table hrsa_page_list_setting
(
id bigint primary key ,
setting ntext ,
page varchar(200),
creator bigint,
create_time datetime ,
update_time datetime,
delete_type int ,
tenant_key varchar(10)
)
GO

13
resource/sqlupgrade/ST/sql202410110103.sql Normal file
View File

@ -0,0 +1,13 @@
create table hrsa_page_list_setting
(
id number primary key ,
setting clob ,
page varchar2(200),
creator number,
create_time date ,
update_time date,
delete_type int ,
tenant_key varchar2(10)
);
/

13
src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
View File

@ -1,12 +1,13 @@
package com.engine.salary.constant;
/**
* @description: 默认的租户key
* @author: xiajun
* @modified By: xiajun
* @date: Created in 2/8/22 11:25 AM
* @version:v1.0
*/
* 默认租户
* <p>Copyright: Copyright (c) 2024</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
**/
public class SalaryDefaultTenantConstant {
public static final String DEFAULT_TENANT_KEY = "all_teams";

20
src/com/engine/salary/entity/setting/dto/PageListSettingDTO.java Normal file
View File

@ -0,0 +1,20 @@
package com.engine.salary.entity.setting.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 薪资帐套表
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PageListSettingDTO {
private String name;
private String value;
}

31
src/com/engine/salary/entity/setting/param/PageListSettingSaveParam.java Normal file
View File

@ -0,0 +1,31 @@
package com.engine.salary.entity.setting.param;
import com.engine.salary.util.valid.DataCheck;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* 薪资帐套表
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PageListSettingSaveParam {
/**
* 页面，0：薪资明细
*/
@DataCheck(require = true,message = "请选择页面")
private String page;
/**
* 设置
*/
@DataCheck(require = true,message = "请选择设置")
private List<Long> setting;
}

72
src/com/engine/salary/entity/setting/po/PageListSettingPO.java Normal file
View File

@ -0,0 +1,72 @@
package com.engine.salary.entity.setting.po;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Collection;
import java.util.Date;
/**
* 薪资帐套表
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PageListSettingPO {
@ElogTransform(name = "")
private Long id;
/**
* 页面，0：薪资明细
*/
@ElogTransform(name = "页面，0：薪资明细")
private String page;
/**
* 设置
*/
@ElogTransform(name = "设置")
private String setting;
/**
* 更新时间
*/
@ElogTransform(name = "更新时间")
private Date updateTime;
/**
* 创建时间
*/
@ElogTransform(name = "创建时间")
private Date createTime;
/**
* 创建人
*/
@ElogTransform(name = "创建人")
private Long creator;
/**
* 是否已删除。0：未删除、1：已删除
*/
@ElogTransform(name = "是否已删除。0：未删除、1：已删除")
private Integer deleteType;
/**
* 租户ID
*/
@ElogTransform(name = "租户ID")
private String tenantKey;
//主键id集合
private Collection<Long> ids;
}

73
src/com/engine/salary/mapper/setting/PageListSettingMapper.java Normal file
View File

@ -0,0 +1,73 @@
package com.engine.salary.mapper.setting;
import com.engine.salary.entity.setting.po.PageListSettingPO;
import org.apache.ibatis.annotations.Param;
import java.util.Collection;
import java.util.List;
public interface PageListSettingMapper {
/**
* 查询所有记录
*
* @return 返回集合，没有返回空List
*/
List<PageListSettingPO> listAll();
/**
* 条件查询
*
* @return 返回集合，没有返回空List
*/
List<PageListSettingPO> listSome(PageListSettingPO pageListSetting);
/**
* 根据主键查询
*
* @param id 主键
* @return 返回记录，没有返回null
*/
PageListSettingPO getById(Long id);
/**
* 新增，忽略null字段
*
* @param pageListSetting 新增的记录
* @return 返回影响行数
*/
int insertIgnoreNull(PageListSettingPO pageListSetting);
/**
* 修改，修改所有字段
*
* @param pageListSetting 修改的记录
* @return 返回影响行数
*/
int update(PageListSettingPO pageListSetting);
/**
* 修改，忽略null字段
*
* @param pageListSetting 修改的记录
* @return 返回影响行数
*/
int updateIgnoreNull(PageListSettingPO pageListSetting);
/**
* 删除记录
*
* @param pageListSetting 待删除的记录
* @return 返回影响行数
*/
int delete(PageListSettingPO pageListSetting);
/**
* 批量删除记录
* @param ids 主键id集合
*/
void deleteByIds(@Param("ids") Collection<Long> ids);
PageListSettingPO getByPage(String page);
}

209
src/com/engine/salary/mapper/setting/PageListSettingMapper.xml Normal file
View File

@ -0,0 +1,209 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.engine.salary.mapper.setting.PageListSettingMapper">
<resultMap id="BaseResultMap" type="com.engine.salary.entity.setting.po.PageListSettingPO">
<result column="create_time" property="createTime"/>
<result column="creator" property="creator"/>
<result column="delete_type" property="deleteType"/>
<result column="id" property="id"/>
<result column="page" property="page"/>
<result column="setting" property="setting"/>
<result column="tenant_key" property="tenantKey"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<!-- 表字段 -->
<sql id="baseColumns">
t
.
create_time
, t.creator
, t.delete_type
, t.id
, t.page
, t.setting
, t.tenant_key
, t.update_time
</sql>
<!-- 查询全部 -->
<select id="listAll" resultMap="BaseResultMap">
SELECT
<include refid="baseColumns"/>
FROM hrsa_page_list_setting t
WHERE delete_type = 0
</select>
<!-- 根据主键获取单条记录 -->
<select id="getById" resultMap="BaseResultMap" parameterType="Long">
SELECT
<include refid="baseColumns"/>
FROM hrsa_page_list_setting t
WHERE id = #{id} AND delete_type = 0
</select>
<!-- 条件查询 -->
<select id="listSome" resultMap="BaseResultMap"
parameterType="com.engine.salary.entity.setting.po.PageListSettingPO">
SELECT
<include refid="baseColumns"/>
FROM hrsa_page_list_setting t
WHERE delete_type = 0
<if test="createTime != null">
AND create_time = #{createTime}
</if>
<if test="creator != null">
AND creator = #{creator}
</if>
<if test="deleteType != null">
AND delete_type = #{deleteType}
</if>
<if test="page != null">
AND page = #{page}
</if>
<if test="setting != null">
AND setting = #{setting}
</if>
<if test="tenantKey != null">
AND tenant_key = #{tenantKey}
</if>
<if test="updateTime != null">
AND update_time = #{updateTime}
</if>
<if test="ids != null and ids.size()>0">
AND id IN
<foreach collection="ids" open="(" item="id" separator="," close=")">
#{id}
</foreach>
</if>
ORDER BY id DESC
</select>
<!-- 插入不为NULL的字段 -->
<insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.setting.po.PageListSettingPO">
INSERT INTO hrsa_page_list_setting
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="createTime != null">
create_time,
</if>
<if test="creator != null">
creator,
</if>
<if test="deleteType != null">
delete_type,
</if>
<if test="page != null">
page,
</if>
<if test="setting != null">
setting,
</if>
<if test="tenantKey != null">
tenant_key,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="createTime != null">
#{createTime},
</if>
<if test="creator != null">
#{creator},
</if>
<if test="deleteType != null">
#{deleteType},
</if>
<if test="page != null">
#{page},
</if>
<if test="setting != null">
#{setting},
</if>
<if test="tenantKey != null">
#{tenantKey},
</if>
<if test="updateTime != null">
#{updateTime},
</if>
</trim>
</insert>
<!-- 更新,更新全部字段 -->
<update id="update" parameterType="com.engine.salary.entity.setting.po.PageListSettingPO">
UPDATE hrsa_page_list_setting
<set>
create_time=#{createTime},
creator=#{creator},
delete_type=#{deleteType},
page=#{page},
setting=#{setting},
tenant_key=#{tenantKey},
update_time=#{updateTime},
</set>
WHERE id = #{id} AND delete_type = 0
</update>
<!-- 更新不为NULL的字段 -->
<update id="updateIgnoreNull" parameterType="com.engine.salary.entity.setting.po.PageListSettingPO">
UPDATE hrsa_page_list_setting
<set>
<if test="createTime != null">
create_time=#{createTime},
</if>
<if test="creator != null">
creator=#{creator},
</if>
<if test="deleteType != null">
delete_type=#{deleteType},
</if>
<if test="page != null">
page=#{page},
</if>
<if test="setting != null">
setting=#{setting},
</if>
<if test="tenantKey != null">
tenant_key=#{tenantKey},
</if>
<if test="updateTime != null">
update_time=#{updateTime},
</if>
</set>
WHERE id = #{id} AND delete_type = 0
</update>
<!-- 根据主键删除记录 -->
<delete id="delete">
UPDATE hrsa_page_list_setting
SET delete_type=1
WHERE id = #{id}
AND delete_type = 0
</delete>
<delete id="deleteByIds">
UPDATE hrsa_page_list_setting
SET delete_type = 1
WHERE delete_type = 0
AND id IN
<foreach collection="ids" open="(" item="id" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="getByPage" resultMap="BaseResultMap">
SELECT
<include refid="baseColumns"/>
FROM hrsa_page_list_setting t
WHERE delete_type = 0
and page = #{page}
</select>
</mapper>

55
src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
View File

@ -25,10 +25,7 @@ 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.SalaryAssert;
import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.*;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
@ -89,6 +86,10 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user);
}
private SettingService getSettingService(User user) {
return ServiceUtil.getService(SettingServiceImpl.class, user);
}
@Override
public PageInfo<SalaryStatisticsEmployeeListDTO> listPage(SalaryStatisticsEmployeeQueryParam queryParam) {
List<SalaryStatisticsEmployeeListDTO> list = Collections.emptyList();
@ -270,7 +271,7 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
map.put("id", se.getId().toString());
map.put("salaryMonth", SalaryDateUtil.getFormatYearMonth(se.getSalaryMonth()));
map.put("taxAgent", taxAgentMap.get(se.getTaxAgentId()));
map.put("salarySob",SalarySobMap.get(se.getSalarySobId()));
map.put("salarySob", SalarySobMap.get(se.getSalarySobId()));
map.put("acctTimes", salaryAcctRecordMap.get(se.getSalaryAcctRecordId()));
map.put("userName", Util.null2String(emp.getUsername()));
map.put("subCompany", Util.null2String(emp.getSubcompanyName()));
@ -302,10 +303,10 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
// 2.年月参数处理，注意：薪资所属月居然是用字符串存储的，无法通过sql between处理
List<Date> dataParam = new ArrayList<>();
if (StringUtils.isNotBlank(queryParam.getStartDateStr())) {
dataParam.add(SalaryDateUtil.dateStrToLocalTime(queryParam.getStartDateStr()+ "-01 00:00:00"));
dataParam.add(SalaryDateUtil.dateStrToLocalTime(queryParam.getStartDateStr() + "-01 00:00:00"));
}
if (StringUtils.isNotBlank(queryParam.getEndDateStr())) {
dataParam.add(SalaryDateUtil.dateStrToLocalTime(queryParam.getEndDateStr()+ "-01 00:00:00"));
dataParam.add(SalaryDateUtil.dateStrToLocalTime(queryParam.getEndDateStr() + "-01 00:00:00"));
}
Set<Date> salaryMonths = SalaryStatisticsEmployeeBO.getSalaryMonths(null, dataParam)
.stream()
@ -319,13 +320,13 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
// 根据分部、部门筛选
List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listBySubCompanyOrDepartment(queryParam.getSubCompanyIds(), queryParam.getDepartmentIds());
// 根据关键词过滤
if(StringUtils.isNotBlank(queryParam.getKeyword())) {
if (StringUtils.isNotBlank(queryParam.getKeyword())) {
employeeList = employeeList.stream()
.filter(e -> (e.getUsername().contains(queryParam.getKeyword()) || (StringUtils.isNotEmpty(e.getWorkcode()) && e.getWorkcode().contains(queryParam.getKeyword()))))
.collect(Collectors.toList());
}
List<Long> employeeIds = employeeList.stream().map(DataCollectionEmployee::getEmployeeId).collect(Collectors.toList());
salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter( acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList());
salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList());
}
if (CollectionUtils.isEmpty(salaryAcctEmployeeList)) {
return new PageInfo<>();
@ -358,23 +359,25 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
List<SalaryAcctResultPO> salaryAcctResultValues = getSalaryAcctResultService(user).listBySalaryAcctEmployeeIds(salaryAcctEmployeeIds);
// 3.获取薪资项目
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());
Map setting = getSettingService(user).getPageListSetting("salary_details_report");
List<Long> checked = setting.get("checked") != null ? JsonUtil.parseList(setting.get("checked"), Long.class) : new ArrayList<>();
List<SalaryItemPO> salaryItemList = getSalaryItemService(user).listByIds(checked);
// 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());
return SalaryStatisticsEmployeeDetailResultDTO.builder()
.salaryAcctEmployeeList(salaryAcctEmployeeList)

2
src/com/engine/salary/report/web/SalaryStatisticsEmployeeController.java
View File

@ -73,7 +73,7 @@ public class SalaryStatisticsEmployeeController {
}
/**
* 员工薪资列表
* 薪资明细
*
* @param queryParam
* @return

3
src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
View File

@ -229,6 +229,9 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
// 获取发薪人员
PageInfo<SalaryAcctEmployeePO> salaryAcctEmployeePageInfo = getSalaryStatisticsEmployeeService(user).listSalaryAcctEmp(queryParam);
List<SalaryAcctEmployeePO> employeePOS = salaryAcctEmployeePageInfo.getList();
if (CollectionUtils.isEmpty(employeePOS)){
return resultMap;
}
Map<String, Object> sumResultMap = Maps.newHashMap();

11
src/com/engine/salary/service/SettingService.java Normal file
View File

@ -0,0 +1,11 @@
package com.engine.salary.service;
import com.engine.salary.entity.setting.param.PageListSettingSaveParam;
import java.util.Map;
public interface SettingService {
void savePageListSetting(PageListSettingSaveParam pageListSettingSaveParam);
Map getPageListSetting(String page);
}

102
src/com/engine/salary/service/impl/SettingServiceImpl.java Normal file
View File

@ -0,0 +1,102 @@
package com.engine.salary.service.impl;
import cn.hutool.core.util.StrUtil;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
import com.engine.salary.entity.setting.param.PageListSettingSaveParam;
import com.engine.salary.entity.setting.po.PageListSettingPO;
import com.engine.salary.mapper.setting.PageListSettingMapper;
import com.engine.salary.service.SalaryItemService;
import com.engine.salary.service.SalarySobService;
import com.engine.salary.service.SettingService;
import com.engine.salary.util.JsonUtil;
import com.engine.salary.util.db.IdGenerator;
import com.engine.salary.util.db.MapperProxyFactory;
import weaver.hrm.User;
import java.util.*;
import java.util.stream.Collectors;
import static com.engine.salary.constant.SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY;
/**
* 薪资核算
* <p>Copyright: Copyright (c) 2022</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
**/
public class SettingServiceImpl extends Service implements SettingService {
private PageListSettingMapper getPageListSettingMapper() {
return MapperProxyFactory.getProxy(PageListSettingMapper.class);
}
private SalarySobService getSalarySobService(User user) {
return ServiceUtil.getService(SalarySobServiceImpl.class, user);
}
private SalaryItemService getSalaryItemService(User user) {
return ServiceUtil.getService(SalaryItemServiceImpl.class, user);
}
@Override
public void savePageListSetting(PageListSettingSaveParam pageListSettingSaveParam) {
Date now = new Date();
PageListSettingPO pageListSettingPO = getPageListSettingMapper().getByPage(pageListSettingSaveParam.getPage());
if (pageListSettingPO != null) {
pageListSettingPO.setSetting(JsonUtil.toJsonString(pageListSettingSaveParam.getSetting()));
pageListSettingPO.setUpdateTime(now);
getPageListSettingMapper().updateIgnoreNull(pageListSettingPO);
} else {
pageListSettingPO = PageListSettingPO.builder()
.id(IdGenerator.generate())
.page(pageListSettingSaveParam.getPage())
.setting(JsonUtil.toJsonString(pageListSettingSaveParam.getSetting()))
.creator((long) user.getUID())
.createTime(now)
.updateTime(now)
.deleteType(0)
.tenantKey(DEFAULT_TENANT_KEY)
.build();
getPageListSettingMapper().insertIgnoreNull(pageListSettingPO);
}
}
@Override
public Map getPageListSetting(String page) {
Map result = new HashMap();
PageListSettingPO pageListSettingPO = getPageListSettingMapper().getByPage(page);
if ("salary_details_report".equals(page)) {
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());
result.put("setting", salaryItemList);
if (pageListSettingPO != null && StrUtil.isNotEmpty(pageListSettingPO.getSetting())) {
result.put("checked", JsonUtil.parseList(pageListSettingPO.getSetting(), Long.class));
} else {
List<Long> collect = salaryItemList.stream().map(SalaryItemPO::getId).collect(Collectors.toList());
result.put("checked", collect);
}
}
return result;
}
}

28
src/com/engine/salary/web/SalaryCommonController.java
View File

@ -1,19 +1,18 @@
package com.engine.salary.web;
import com.engine.common.util.ServiceUtil;
import com.engine.salary.entity.setting.param.PageListSettingSaveParam;
import com.engine.salary.util.ResponseResult;
import com.engine.salary.util.SalaryEnumUtil;
import com.engine.salary.wrapper.SalaryCommonWrapper;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import lombok.extern.slf4j.Slf4j;
import weaver.hrm.HrmUserVarify;
import weaver.hrm.User;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import java.util.List;
@ -52,4 +51,25 @@ public class SalaryCommonController {
}
/**
* 页面模板设置
*
* @param param
* @return
*/
@POST
@Path("/pageList/save/setting")
@Produces(MediaType.APPLICATION_JSON)
public String savePageListSetting(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PageListSettingSaveParam param) {
User user = HrmUserVarify.getUser(request, response);
return new ResponseResult<PageListSettingSaveParam, String>(user).run(getSalaryCommonWrapper(user)::savePageListSetting, param);
}
@GET
@Path("/pageList/get/setting")
@Produces(MediaType.APPLICATION_JSON)
public String getPageListSetting(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "page") String page) {
User user = HrmUserVarify.getUser(request, response);
return new ResponseResult<String, Map>(user).run(getSalaryCommonWrapper(user)::getPageListSetting, page);
}
}

18
src/com/engine/salary/wrapper/SalaryCommonWrapper.java
View File

@ -2,10 +2,15 @@ package com.engine.salary.wrapper;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.entity.setting.param.PageListSettingSaveParam;
import com.engine.salary.service.SalaryCacheService;
import com.engine.salary.service.SettingService;
import com.engine.salary.service.impl.SalaryCacheServiceImpl;
import com.engine.salary.service.impl.SettingServiceImpl;
import weaver.hrm.User;
import java.util.Map;
public class SalaryCommonWrapper extends Service {
@ -13,6 +18,10 @@ public class SalaryCommonWrapper extends Service {
return ServiceUtil.getService(SalaryCacheServiceImpl.class, user);
}
private SettingService getSettingService(User user) {
return ServiceUtil.getService(SettingServiceImpl.class, user);
}
public Object getCacheInfo(String key) {
return getSalaryCacheService(user).get(key);
}
@ -20,4 +29,13 @@ public class SalaryCommonWrapper extends Service {
public void removeCache(String key) {
getSalaryCacheService(user).remove(key);
}
public void savePageListSetting(PageListSettingSaveParam pageListSettingSaveParam) {
getSettingService(user).savePageListSetting(pageListSettingSaveParam);
}
public Map getPageListSetting(String page) {
return getSettingService(user).getPageListSetting(page);
}
}