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

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
sy 2022-09-20 16:37:21 +08:00
parent 546e976543 f302654d0a
commit b8a87d2fd8
6 changed files with 97 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
View File

@ -148,10 +148,10 @@
<if test="param.hiredate != null and param.hiredate.size() == 2">
AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]})
</if>
<!-- 排序 -->
<if test="param.orderRule != null">
ORDER BY #{param.orderRule.orderRule} #{param.orderRule.ascOrDesc}
</if>
<!-- &lt;!&ndash; 排序 &ndash;&gt;-->
<!-- <if test="param.orderRule != null">-->
<!-- ORDER BY #{param.orderRule.orderRule} #{param.orderRule.ascOrDesc}-->
<!-- </if>-->
</select>
<select id="list" resultType="com.engine.salary.entity.salaryarchive.dto.SalaryArchiveListDTO" databaseId="oracle">
SELECT
@ -206,10 +206,10 @@
<if test="param.hiredate != null and param.hiredate.size() == 2">
AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]})
</if>
<!-- 排序 -->
<if test="param.orderRule != null">
ORDER BY #{param.orderRule.orderRule} #{param.orderRule.ascOrDesc}
</if>
<!-- &lt;!&ndash; 排序 &ndash;&gt;-->
<!-- <if test="param.orderRule != null">-->
<!-- ORDER BY #{param.orderRule.orderRule} #{param.orderRule.ascOrDesc}-->
<!-- </if>-->
</select>
<select id="list" resultType="com.engine.salary.entity.salaryarchive.dto.SalaryArchiveListDTO"
databaseId="sqlserver">
@ -265,10 +265,10 @@
<if test="param.hiredate != null and param.hiredate.size() == 2">
AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]})
</if>
<!-- 排序 -->
<if test="param.orderRule != null">
ORDER BY #{param.orderRule.orderRule} #{param.orderRule.ascOrDesc}
</if>
<!-- &lt;!&ndash; 排序 &ndash;&gt;-->
<!-- <if test="param.orderRule != null">-->
<!-- ORDER BY #{param.orderRule.orderRule} #{param.orderRule.ascOrDesc}-->
<!-- </if>-->
</select>
<insert id="batchInsert">

2
src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
View File

@ -178,7 +178,7 @@
FROM
hrsa_bill_detail t
WHERE t.delete_type = 0
AND t.payment_status = 0
-- AND t.payment_status = 0
AND t.bill_month = #{billMonth}
AND t.payment_organization = #{paymentOrganization}
<if test="employeeIds != null and employeeIds.size()>0">

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

@ -35,6 +35,14 @@ public interface SalaryAcctExcelService {
*/
XSSFWorkbook exportReducedEmployee(SalaryAcctEmployeeQueryParam queryParam);
/**
* 薪资核算环比增加人员导出
*
* @param queryParam
* @return
*/
XSSFWorkbook exportAddedEmployee(SalaryAcctEmployeeQueryParam queryParam);
/**
* 薪资核算结果导出
*

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

@ -158,6 +158,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
}
@Override
public XSSFWorkbook exportReducedEmployee(SalaryAcctEmployeeQueryParam queryParam) {
ValidUtil.doValidator(queryParam);
@ -190,6 +192,36 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
}
@Override
public XSSFWorkbook exportAddedEmployee(SalaryAcctEmployeeQueryParam queryParam) {
ValidUtil.doValidator(queryParam);
// 1.工作簿名称
String sheetName = SalaryI18nUtil.getI18nLabel(85368, "环比上月增加人员");
// 2.表头
String[] header = {
SalaryI18nUtil.getI18nLabel(85429, "姓名"),
SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"),
SalaryI18nUtil.getI18nLabel(86185, "部门"),
SalaryI18nUtil.getI18nLabel(86186, "手机号"),
SalaryI18nUtil.getI18nLabel(86186, "工号"),
SalaryI18nUtil.getI18nLabel(91075, "员工状态"),
SalaryI18nUtil.getI18nLabel(91075, "入职日期"),
SalaryI18nUtil.getI18nLabel(91075, "离职日期")
};
List<Object> headerList = new ArrayList<>(Arrays.asList(header));
// 查询薪资核算人员（环比上月增加）
List<SalaryAcctEmployeePO> salaryAcctEmployees = getSalaryAcctEmployeeService(user).listByParam4Add(queryParam);
// 组装数据
List<List<Object>> rows = new ArrayList<>();
rows.add(headerList);
// 3.表数据
List<List<Object>> lists = convert2ExcelRow(salaryAcctEmployees);
rows.addAll(lists);
return ExcelUtil.genWorkbookV2(rows, sheetName);
}
private List<List<Object>> convert2ExcelRow(List<SalaryAcctEmployeePO> salaryAcctEmployees) {
if (CollectionUtils.isEmpty(salaryAcctEmployees)) {

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

@ -329,6 +329,38 @@ public class SalaryAcctController {
}
/**
* 导出环比增加人员
*/
@GET
@Path("/addedemployee/export")
@Produces(MediaType.APPLICATION_OCTET_STREAM)
public Response exportAddedEmployee(@Context HttpServletRequest request, @Context HttpServletResponse response) {
try {
SalaryAcctEmployeeQueryParam param = buildSalaryAcctEmployeeQueryParam(request);
User user = HrmUserVarify.getUser(request, response);
XSSFWorkbook workbook = getSalaryAcctExcelWrapper(user).exportAddedEmployee(param);
String time = LocalDate.now().toString();
String fileName = "环比上月增加人员" + time;
try {
fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
StreamingOutput output = outputStream -> {
workbook.write(outputStream);
outputStream.flush();
};
response.setContentType("application/octet-stream");
return Response.ok(output).header("Content-disposition", "attachment;filename=" + fileName).header("Cache-Control", "no-cache").build();
} catch (Exception e) {
log.error("环比上月增加人员导出异常", e);
throw e;
}
}
// **********************************薪资核算人员相关 end*********************************/
// **********************************薪资核算结果 start*********************************/

12
src/com/engine/salary/wrapper/SalaryAcctExcelWrapper.java
View File

@ -40,6 +40,18 @@ public class SalaryAcctExcelWrapper extends Service {
return getSalaryAcctExcelService(user).exportReducedEmployee(queryParam);
}
/**
* 薪资核算环比增加人员导出
*
* @param queryParam
* @return
*/
public XSSFWorkbook exportAddedEmployee(SalaryAcctEmployeeQueryParam queryParam) {
return getSalaryAcctExcelService(user).exportAddedEmployee(queryParam);
}
/**
* 薪资核算结果导出
*