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

薪资核算导出模板

This commit is contained in:
Harryxzy 2024-03-27 11:33:56 +08:00
parent 1c40ed0ecd
commit 130be31d99
5 changed files with 81 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/com/engine/salary/mapper/salaryacct/SalaryAcctResultTemplateMapper.java Normal file
View File

@ -0,0 +1,63 @@
package com.engine.salary.mapper.salaryacct;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultTemplatePO;
import java.util.List;
public interface SalaryAcctResultTemplateMapper {
/**
* 查询所有记录
*
* @return 返回集合，没有返回空List
*/
List<SalaryAcctResultTemplatePO> listAll();
/**
* 条件查询
*
* @return 返回集合，没有返回空List
*/
List<SalaryAcctResultTemplatePO> listSome(SalaryAcctResultTemplatePO salaryAcctResultTemplate);
/**
* 根据主键查询
*
* @param id 主键
* @return 返回记录，没有返回null
*/
SalaryAcctResultTemplatePO getById(Long id);
/**
* 新增，忽略null字段
*
* @param salaryAcctResultTemplate 新增的记录
* @return 返回影响行数
*/
int insertIgnoreNull(SalaryAcctResultTemplatePO salaryAcctResultTemplate);
/**
* 修改，修改所有字段
*
* @param salaryAcctResultTemplate 修改的记录
* @return 返回影响行数
*/
int update(SalaryAcctResultTemplatePO salaryAcctResultTemplate);
/**
* 修改，忽略null字段
*
* @param salaryAcctResultTemplate 修改的记录
* @return 返回影响行数
*/
int updateIgnoreNull(SalaryAcctResultTemplatePO salaryAcctResultTemplate);
/**
* 删除记录
*
* @param id 待删除的记录
* @return 返回影响行数
*/
int deleteById(Long id);
}

2
src/com/engine/salary/mapper/salaryacct/SalaryAcctResultTemplateMapper.xml
View File

@ -200,7 +200,7 @@
<!-- 根据主键删除记录 -->
<delete id="delete" parameterType="com.engine.salary.entity.salaryacct.po.SalaryAcctResultTemplatePO">
<delete id="deleteById" parameterType="com.engine.salary.entity.salaryacct.po.SalaryAcctResultTemplatePO">
UPDATE hrsa_salary_acct_result_template
SET delete_type=1
WHERE id = #{id} AND delete_type = 0

3
src/com/engine/salary/service/SalaryAcctExcelService.java
View File

@ -4,7 +4,6 @@ import com.engine.salary.component.WeaTableColumnGroup;
import com.engine.salary.entity.salaryacct.dto.SalaryAcctImportFieldDTO;
import com.engine.salary.entity.salaryacct.param.*;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultTemplatePO;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import java.util.List;
@ -143,7 +142,7 @@ public interface SalaryAcctExcelService {
* 根据账套id获取导出模板列表
* @param salarySobId
*/
List<SalaryAcctResultTemplatePO> exportTemplateList(Long salarySobId);
List<Object> exportTemplateList(Long salarySobId);
//
// /**

18
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -1456,6 +1456,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
}
salaryAcctResultTemplatePO.setSalaryItemIds(StringUtils.join(saveParam.getSalaryItemIds(), ","));
salaryAcctResultTemplatePO.setTemplateName(saveParam.getTemplateName());
salaryAcctResultTemplatePO.setUpdateTime(new Date());
getSalaryAcctResultTemplateService(user).update(salaryAcctResultTemplatePO);
} else {
Optional<SalaryAcctResultTemplatePO> saveNameOptional = templateBySobId.stream().filter(po -> po.getTemplateName().equals(saveParam.getTemplateName())).findFirst();
@ -1463,13 +1464,15 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
throw new SalaryRunTimeException("该账套中已经存在同名模板，请重新设置后保存");
}
// 新建
Date now = new Date();
getSalaryAcctResultTemplateService(user).insertIgnoreNull(SalaryAcctResultTemplatePO.builder()
.id(IdGenerator.generate())
.salarySobId(saveParam.getSalarySobId())
.salaryItemIds(StringUtils.join(saveParam.getSalaryItemIds(), ","))
.templateName(saveParam.getTemplateName())
.creator(Long.valueOf(user.getUID()))
.createTime(new Date())
.createTime(now)
.updateTime(now)
.deleteType(0)
.build());
}
@ -1493,8 +1496,17 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
}
@Override
public List<SalaryAcctResultTemplatePO> exportTemplateList(Long salarySobId) {
return getSalaryAcctResultTemplateService(user).listBySalarySobId(salarySobId);
public List<Object> exportTemplateList(Long salarySobId) {
List<SalaryAcctResultTemplatePO> salaryAcctResultTemplatePOS = getSalaryAcctResultTemplateService(user).listBySalarySobId(salarySobId);
List<Object> resultList = new ArrayList<>();
salaryAcctResultTemplatePOS.stream().forEach(po -> {
Map<String, Object> map = new HashMap<>();
map.put("id", po.getId());
map.put("templateName", po.getTemplateName());
map.put("createTime",SalaryDateUtil.getFormatLocalDateTime(po.getCreateTime()));
resultList.add(map);
});
return resultList;
}
// @Override
// public Map<String, Object> exportCheckResult(

3
src/com/engine/salary/web/SalaryAcctController.java
View File

@ -3,7 +3,6 @@ package com.engine.salary.web;
import com.engine.common.util.ServiceUtil;
import com.engine.salary.entity.salaryacct.dto.*;
import com.engine.salary.entity.salaryacct.param.*;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultTemplatePO;
import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO;
import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum;
import com.engine.salary.service.SalaryAcctExcelService;
@ -599,7 +598,7 @@ public class SalaryAcctController {
@Produces(MediaType.APPLICATION_JSON)
public String exportTemplateList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryAcctResultTemplateSaveParam param) {
User user = HrmUserVarify.getUser(request, response);
return new ResponseResult<Long, List<SalaryAcctResultTemplatePO>>(user).run(getSalaryAcctExcelService(user)::exportTemplateList, param.getSalarySobId());
return new ResponseResult<Long, List<Object>>(user).run(getSalaryAcctExcelService(user)::exportTemplateList, param.getSalarySobId());
}