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

Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport

This commit is contained in:
sy 2022-09-21 10:47:49 +08:00
parent 78d1bf0554 c08a660fa0
commit b06eae55d8
6 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportActionParam.java
View File

@ -35,4 +35,6 @@ public class SalaryArchiveImportActionParam {
*
*/
List<Map<String,Object>> importDatas;
private boolean addData;
}

4
src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml
View File

@ -205,9 +205,7 @@
<!-- 插入不为NULL的字段 -->
<insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salaryBill.po.SalarySendPO"
keyProperty="id" keyColumn="id" useGeneratedKeys="true"
>
<insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salaryBill.po.SalarySendPO">
INSERT INTO hrsa_salary_send
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">

16
src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java
View File

@ -57,9 +57,25 @@ public class SalaryArchiveActionAPI {
@Produces(MediaType.APPLICATION_JSON)
public String importSalaryArchiveInit(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveImportActionParam importData) {
User user = HrmUserVarify.getUser(request, response);
importData.setImportType("init");
importData.setAddData(false);
return new ResponseResult<SalaryArchiveImportActionParam, Map<String, Object>>(user).run(getSalaryArchiveWrapper(user)::importSalaryArchiveInit, importData);
}
/**
* 初始化档案
* @param importData
* @return
*/
@POST
@Path("/initSalaryArchive")
@Produces(MediaType.APPLICATION_JSON)
public String salaryArchiveListInit(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveImportActionParam importData) {
User user = HrmUserVarify.getUser(request, response);
importData.setImportType("init");
importData.setAddData(true);
return new ResponseResult<SalaryArchiveImportActionParam, Map<String, Object>>(user).run(getSalaryArchiveWrapper(user)::importSalaryArchiveInit, importData);
}
/**
* 导入薪资档案附件上传前置校验

30
src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
View File

@ -123,6 +123,10 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
// 薪资档案
SalaryArchivePO salaryArchive = salaryArchiveMapper.getById(salaryArchiveId);
if (salaryArchive == null) {
throw new SalaryRunTimeException("薪资档案不存在！");
}
// 获取当前已生效数据
List<SalaryArchiveItemPO> effectiveSalaryItems = getEffectiveSalaryItems(salaryArchiveId, salaryItemIds);
@ -305,13 +309,13 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
public String deleteSalaryItem(Long salaryArchiveItemId) {
SalaryArchiveItemPO salaryArchiveItem = salaryArchiveItemMapper.getById(salaryArchiveItemId);
if (salaryArchiveItem == null) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "参数错误，薪资项目不存在或已被删除"));
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "参数错误，薪资项目不存在或已被删除"));
}
if (salaryArchiveItem.getEffectiveTime().after(new Date())) {
salaryArchiveItem.setDeleteType(1);
// 删除未生效数据
salaryArchiveItemMapper.updateById(salaryArchiveItem);
}else{
} else {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "该薪资项目已生效不可删除"));
}
return StringUtils.EMPTY;
@ -345,17 +349,17 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
// 获取所有可被引用的薪资项目
List<SalaryItemPO> salaryItems = salaryItemMapper.getCanAdjustSalaryItems();
String[] header = {
SalaryI18nUtil.getI18nLabel( 85429, "姓名"),
SalaryI18nUtil.getI18nLabel( 86187, "员工状态"),
SalaryI18nUtil.getI18nLabel( 86185, "部门"),
SalaryI18nUtil.getI18nLabel( 84960, "薪资项目"),
SalaryI18nUtil.getI18nLabel( 85433, "调整前"),
SalaryI18nUtil.getI18nLabel( 85434, "调整后"),
SalaryI18nUtil.getI18nLabel( 85431, "调整原因"),
SalaryI18nUtil.getI18nLabel( 85904, "生效日期"),
SalaryI18nUtil.getI18nLabel( 85435, "操作人"),
SalaryI18nUtil.getI18nLabel( 85436, "操作时间"),
SalaryI18nUtil.getI18nLabel( 84961, "备注")
SalaryI18nUtil.getI18nLabel(85429, "姓名"),
SalaryI18nUtil.getI18nLabel(86187, "员工状态"),
SalaryI18nUtil.getI18nLabel(86185, "部门"),
SalaryI18nUtil.getI18nLabel(84960, "薪资项目"),
SalaryI18nUtil.getI18nLabel(85433, "调整前"),
SalaryI18nUtil.getI18nLabel(85434, "调整后"),
SalaryI18nUtil.getI18nLabel(85431, "调整原因"),
SalaryI18nUtil.getI18nLabel(85904, "生效日期"),
SalaryI18nUtil.getI18nLabel(85435, "操作人"),
SalaryI18nUtil.getI18nLabel(85436, "操作时间"),
SalaryI18nUtil.getI18nLabel(84961, "备注")
};
// 2.表头
List<Object> headerList = new ArrayList<>(Arrays.asList(header));

30
src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
View File

@ -1400,11 +1400,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
// isError = true;
}
if (ineffectiveSalaryItem != null && ineffectiveSalaryItem.getItemValue().equals(cellVal)) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowindex + key + "与未生效的调整后不可相同");
excelComments.add(errorMessageMap);
// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同"), errorCount + 1, errorCount + 1, j, j);
isError = true;
// Map<String, String> errorMessageMap = Maps.newHashMap();
// errorMessageMap.put("message", rowindex + key + "与未生效的调整后不可相同");
// excelComments.add(errorMessageMap);
//// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同"), errorCount + 1, errorCount + 1, j, j);
// isError = true;
}
// 1.3 如果>已经生效且<=今天
} else if (effectiveTime.after(currentEffectiveTime) && !effectiveTime.after(importHandleParam.getToday())) {
@ -1416,11 +1416,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
// isError = true;
}
if (ineffectiveSalaryItem != null && ineffectiveSalaryItem.getItemValue().equals(cellVal)) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowindex + key + "与未生效的调整后不可相同");
excelComments.add(errorMessageMap);
// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同"), errorCount + 1, errorCount + 1, j, j);
isError = true;
// Map<String, String> errorMessageMap = Maps.newHashMap();
// errorMessageMap.put("message", rowindex + key + "与未生效的调整后不可相同");
// excelComments.add(errorMessageMap);
//// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同"), errorCount + 1, errorCount + 1, j, j);
// isError = true;
}
// 1.4 如果>今天
} else if (effectiveTime.after(importHandleParam.getToday()) && effectiveSalaryItem.getItemValue().equals(cellVal)) {
@ -1431,11 +1431,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
// isError = true;
}
} else if (ineffectiveSalaryItem != null && ineffectiveSalaryItem.getItemValue().equals(cellVal)) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowindex + key + "与未生效的调整后不可相同");
excelComments.add(errorMessageMap);
// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同"), errorCount + 1, errorCount + 1, j, j);
isError = true;
// Map<String, String> errorMessageMap = Maps.newHashMap();
// errorMessageMap.put("message", rowindex + key + "与未生效的调整后不可相同");
// excelComments.add(errorMessageMap);
//// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同"), errorCount + 1, errorCount + 1, j, j);
// isError = true;
}
// 2.数据处理
if (effectiveSalaryItem != null && effectiveTime.equals(effectiveSalaryItem.getEffectiveTime())) {

4
src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
View File

@ -331,10 +331,10 @@ public class SalaryArchiveWrapper extends Service {
public Map<String, Object> importSalaryArchiveInit(SalaryArchiveImportActionParam importData) {
importData.setImportType("init");
return getSalaryArchiveService(user).importSalaryArchiveAction(importData, false);
return getSalaryArchiveService(user).importSalaryArchiveAction(importData, importData.isAddData());
}
public Map<String, Object> importSalaryArchiveSalaryItemAdjust(SalaryArchiveImportActionParam importData) {
importData.setImportType("salaryItemAdjust");
return getSalaryArchiveService(user).importSalaryArchiveAction(importData, false);