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

AddUpDeductionServiceImpl国际化

This commit is contained in:
Harryxzy 2023-04-14 16:49:04 +08:00
parent 20ebdd33da
commit 53fc815e2e
29 changed files with 269 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/engine/salary/biz/SIArchivesBiz.java
View File

@ -13,6 +13,7 @@ import com.cloudstore.eccom.pc.table.WeaTableCheckboxpopedom;
import com.cloudstore.eccom.pc.table.WeaTableColumn;
import com.cloudstore.eccom.result.WeaResultMsg;
import com.engine.common.util.ServiceUtil;
import com.engine.salary.common.SalaryContext;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.encrypt.AESEncryptUtil;
import com.engine.salary.encrypt.EncryptUtil;
@ -43,6 +44,7 @@ import com.engine.salary.mapper.taxagent.TaxAgentMapper;
import com.engine.salary.util.SalaryAssert;
import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryFormItemUtil;
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;
@ -122,7 +124,7 @@ public class SIArchivesBiz {
SalaryAssert.notNull(employeeId, "员工id不可为空");
EmployBiz employBiz = new EmployBiz();
List<DataCollectionEmployee> employeeByIds = employBiz.getEmployeeByIdsAll(Collections.singletonList(employeeId));
SalaryAssert.notEmpty(employeeByIds, "员工信息不存在");
SalaryAssert.notEmpty(employeeByIds, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在"));
DataCollectionEmployee item = employeeByIds.get(0);
@ -1036,14 +1038,15 @@ public class SIArchivesBiz {
public List<WeaTableColumn> buildWeaTableColumns(List<InsuranceArchivesEmployeePO> insuranceArchivesEmployeePOS, long operateId) {
Map<Integer, Map<String, String>> titleMap = buildColumnTitle(insuranceArchivesEmployeePOS, operateId);
List<WeaTableColumn> list = new ArrayList<>();
WeaTableColumn nameColumn = new WeaTableColumn("100px", "姓名", "employeeName");
User user = (User) SalaryContext.get().getValue("user");
WeaTableColumn nameColumn = new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),25034,"姓名"), "employeeName");
nameColumn.setFixed("left");
list.add(nameColumn);
list.add(new WeaTableColumn("150px", "个税扣缴义务人", "paymentOrganizationName"));
list.add(new WeaTableColumn("150px", "部门", "departmentName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "departmentName"));
list.add(new WeaTableColumn("150px", "手机号", "mobile"));
list.add(new WeaTableColumn("150px", "员工状态", "status"));
list.add(new WeaTableColumn("150px", "工号", "jobNum"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "jobNum"));
list.add(new WeaTableColumn("150px", "入职日期", "companystartdate"));
list.add(new WeaTableColumn("150px", "离职日期", "dismissdate"));
@ -1339,7 +1342,7 @@ public class SIArchivesBiz {
jobNum.setFieldcol(16); //条件输入框所占宽度，默认值18
jobNum.setLabelcol(8);
jobNum.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2
jobNum.setLabel("工号"); //设置文本值 这个将覆盖多语言标签的值
jobNum.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号")); //设置文本值 这个将覆盖多语言标签的值
conditionItems.add(jobNum);
@ -1347,7 +1350,7 @@ public class SIArchivesBiz {
departmentIds.setColSpan(2);
departmentIds.setFieldcol(16);
departmentIds.setLabelcol(8);
departmentIds.setLabel("部门");
departmentIds.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
conditionItems.add(departmentIds);

7
src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java
View File

@ -3,6 +3,7 @@ package com.engine.salary.entity.salaryarchive.bo;
import com.cloudstore.eccom.constant.WeaBoolAttr;
import com.cloudstore.eccom.pc.table.WeaTableColumn;
import com.engine.salary.common.LocalDateRange;
import com.engine.salary.common.SalaryContext;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.constant.SalaryItemConstant;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveDataDTO;
@ -24,6 +25,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.hrm.User;
import java.util.*;
import java.util.stream.Collectors;
@ -71,12 +73,13 @@ public class SalaryArchiveBO {
columns.add(idColumn);
WeaTableColumn employeeIdColumn = new WeaTableColumn("100px", "人员信息表的主键id", "employeeId");
employeeIdColumn.setDisplay(WeaBoolAttr.FALSE);
User user = (User) SalaryContext.get().getValue("user");
columns.add(employeeIdColumn);
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(85429, "姓名"), "username"));
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), "taxAgentName"));
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86185, "分部"), "subcompanyName"));
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86185, "部门"), "departmentName"));
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86185, "工号"), "workcode"));
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "departmentName"));
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "workcode"));
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86186, "手机号"), "mobile"));
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86187, "员工状态"), "employeeStatus"));
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86187, "起始发薪日期"), "payStartDate"));

2
src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
View File

@ -500,7 +500,7 @@ public class SalaryArchiveExcelBO extends Service {
SalaryArchivePO finalSalaryArchive = buildSalaryArchive(employeeId, taxAgentId, importHandleParam);
// 不满足构建条件
if (finalSalaryArchive == null) {
// SalaryI18nUtil.getI18nLabel( 100579, "姓名错误，系统内不存在该姓名")
// SalaryI18nUtil.getI18nLabel(user.getLanguage(),542133,"姓名错误，系统内不存在该姓名")
// SalaryI18nUtil.getI18nLabel( 101653, "该人员的薪资档案不存在，请先初始化"
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowindex + listTypeErrMsg);

84
src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
View File

@ -797,10 +797,10 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
String taxAgentId = Util.null2String(importParam.getTaxAgentId());
if (StringUtils.isBlank(imageId)) {
throw new SalaryRunTimeException("文件不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),391241,"文件不存在"));
}
if (StringUtils.isBlank(declareMonthStr)) {
throw new SalaryRunTimeException("税款所属期为空");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542154,"税款所属期为空"));
}
}
@ -997,7 +997,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
public List<AddUpDeduction> getAddUpDeductionList(YearMonth declareMonth, List<Long> employeeIds, Long taxAgentId) {
AddUpDeductionBiz addUpDeductionBiz = new AddUpDeductionBiz();
if (declareMonth == null) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100342, "参数有误：申报月份、租户key必传"));
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),100342, "参数有误：申报月份、租户key必传"));
}
return addUpDeductionBiz.listSome(AddUpDeduction.builder().declareMonth(SalaryDateUtil.toDateStartOfMonth(declareMonth)).employeeIds(employeeIds).taxAgentId(taxAgentId).build());
}
@ -1005,22 +1005,22 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
@Override
public XSSFWorkbook downloadTemplate(boolean isChief, AddUpDeductionQueryParam queryParam) {
String sheetName = SalaryI18nUtil.getI18nLabel(101603, "累计专项附加扣除导入模板");
String sheetName = SalaryI18nUtil.getI18nLabel(user.getLanguage(),101603, "累计专项附加扣除导入模板");
String[] header = {
SalaryI18nUtil.getI18nLabel(25034, "姓名"),
SalaryI18nUtil.getI18nLabel(537996, "个税扣缴义务人"),
SalaryI18nUtil.getI18nLabel(27511, "部门"),
SalaryI18nUtil.getI18nLabel(125238, "手机号"),
SalaryI18nUtil.getI18nLabel(1933, "工号"),
SalaryI18nUtil.getI18nLabel(1839, "证件号码"),
SalaryI18nUtil.getI18nLabel(1516, "入职日期"),
SalaryI18nUtil.getI18nLabel(542158, "累计子女教育"),
SalaryI18nUtil.getI18nLabel(542159, "累计继续教育"),
SalaryI18nUtil.getI18nLabel(542160, "累计住房贷款利息"),
SalaryI18nUtil.getI18nLabel(542161, "累计住房租金"),
SalaryI18nUtil.getI18nLabel(542162, "累计赡养老人"),
SalaryI18nUtil.getI18nLabel(542163, "累计大病医疗"),
SalaryI18nUtil.getI18nLabel(537990, "累计婴幼儿照护")
SalaryI18nUtil.getI18nLabel(user.getLanguage(),25034, "姓名"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),537996, "个税扣缴义务人"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511, "部门"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),125238, "手机号"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933, "工号"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1839, "证件号码"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1516, "入职日期"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542158, "累计子女教育"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542159, "累计继续教育"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542160, "累计住房贷款利息"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542161, "累计住房租金"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542162, "累计赡养老人"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542163, "累计大病医疗"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),537990, "累计婴幼儿照护")
};
List<String> dataIndexList = Lists.newArrayList("username", "taxAgentName", "departmentName", "mobile", "workcode", "idNo", "hiredate", "billMonth", "supplementaryMonth");
@ -1043,15 +1043,15 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
// 4.注释
List<ExcelComment> excelComments = Lists.newArrayList();
excelComments.add(new ExcelComment(0, 0, 3, 2, SalaryI18nUtil.getI18nLabel(30036, "必填")));
excelComments.add(new ExcelComment(1, 0, 4, 2, SalaryI18nUtil.getI18nLabel(30036, "必填")));
excelComments.add(new ExcelComment(7, 0, 10, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字")));
excelComments.add(new ExcelComment(8, 0, 11, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字")));
excelComments.add(new ExcelComment(9, 0, 12, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字")));
excelComments.add(new ExcelComment(10, 0, 13, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字")));
excelComments.add(new ExcelComment(11, 0, 14, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字")));
excelComments.add(new ExcelComment(12, 0, 15, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字")));
excelComments.add(new ExcelComment(13, 0, 16, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字")));
excelComments.add(new ExcelComment(0, 0, 3, 2, SalaryI18nUtil.getI18nLabel(user.getLanguage(),30036, "必填")));
excelComments.add(new ExcelComment(1, 0, 4, 2, SalaryI18nUtil.getI18nLabel(user.getLanguage(),30036, "必填")));
excelComments.add(new ExcelComment(7, 0, 10, 2, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542164, "输入数字")));
excelComments.add(new ExcelComment(8, 0, 11, 2, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542164, "输入数字")));
excelComments.add(new ExcelComment(9, 0, 12, 2, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542164, "输入数字")));
excelComments.add(new ExcelComment(10, 0, 13, 2, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542164, "输入数字")));
excelComments.add(new ExcelComment(11, 0, 14, 2, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542164, "输入数字")));
excelComments.add(new ExcelComment(12, 0, 15, 2, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542164, "输入数字")));
excelComments.add(new ExcelComment(13, 0, 16, 2, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542164, "输入数字")));
XSSFWorkbook book = ExcelUtil.genWorkbookV2(rows, sheetName, excelComments);
@ -1100,7 +1100,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
List<List<String>> rowList = getExcelRowList(isChief, queryParam);
//获取excel
return ExcelUtil.genWorkbook(rowList, SalaryI18nUtil.getI18nLabel(538006, "累计专项附加扣除"));
return ExcelUtil.genWorkbook(rowList, SalaryI18nUtil.getI18nLabel(user.getLanguage(),538006, "累计专项附加扣除"));
}
@ -1114,20 +1114,20 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
//excel标题
List<String> title = Arrays.asList(
SalaryI18nUtil.getI18nLabel(25034, "姓名"),
SalaryI18nUtil.getI18nLabel(537996, "个税扣缴义务人"),
SalaryI18nUtil.getI18nLabel(27511, "部门"),
SalaryI18nUtil.getI18nLabel(125238, "手机号"),
SalaryI18nUtil.getI18nLabel(1933, "工号"),
SalaryI18nUtil.getI18nLabel(1839, "证件号码"),
SalaryI18nUtil.getI18nLabel(1516, "入职日期"),
SalaryI18nUtil.getI18nLabel(542158, "累计子女教育"),
SalaryI18nUtil.getI18nLabel(542159, "累计继续教育"),
SalaryI18nUtil.getI18nLabel(542160, "累计住房贷款利息"),
SalaryI18nUtil.getI18nLabel(542161, "累计住房租金"),
SalaryI18nUtil.getI18nLabel(542162, "累计赡养老人"),
SalaryI18nUtil.getI18nLabel(542163, "累计大病医疗"),
SalaryI18nUtil.getI18nLabel(537990, "累计婴幼儿照护"));
SalaryI18nUtil.getI18nLabel(user.getLanguage(),25034, "姓名"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),537996, "个税扣缴义务人"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511, "部门"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),125238, "手机号"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933, "工号"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1839, "证件号码"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1516, "入职日期"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542158, "累计子女教育"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542159, "累计继续教育"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542160, "累计住房贷款利息"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542161, "累计住房租金"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542162, "累计赡养老人"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542163, "累计大病医疗"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),537990, "累计婴幼儿照护"));
//排序配置

80
src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
View File

@ -108,7 +108,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
username.setFieldcol(16); //条件输入框所占宽度，默认值18
username.setLabelcol(8);
username.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2
username.setLabel("姓名"); //设置文本值 这个将覆盖多语言标签的值
username.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),25034,"姓名")); //设置文本值 这个将覆盖多语言标签的值
conditionItems.add(username);
@ -119,7 +119,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
departmentName.setLabelcol(8);
departmentName.setViewAttr(2);
departmentName.setIsQuickSearch(false);
departmentName.setLabel("部门");
departmentName.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
conditionItems.add(departmentName);
@ -129,7 +129,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
jobNum.setFieldcol(16);
jobNum.setLabelcol(8);
jobNum.setViewAttr(2);
jobNum.setLabel("工号");
jobNum.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
conditionItems.add(jobNum);
@ -273,9 +273,12 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
private List<List<String>> getExcelRowList(AddUpSituationQueryParam param) {
long employeeId = user.getUID();
// excel标题
final List<String> title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计收入额", "累计减除费用",
"累计社保个人合计", "累计公积金个人合计", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人",
"累计大病医疗", "累计企业（职业）年金及其他福利", "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额", "累计已预扣预缴税额", "累计婴幼儿照护");
final List<String> title = Arrays.asList("姓名", "个税扣缴义务人", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "手机号", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "证件号码", "入职日期", "累计收入额", "累计减除费用",
"累计社保个人合计", "累计公积金个人合计", SalaryI18nUtil.getI18nLabel(user.getLanguage(),542158,"累计子女教育"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542159,"累计继续教育"),SalaryI18nUtil.getI18nLabel(user.getLanguage(),542160,"累计住房贷款利息"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542161,"累计住房租金"),SalaryI18nUtil.getI18nLabel(user.getLanguage(),542162,"累计赡养老人"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542163,"累计大病医疗"), "累计企业（职业）年金及其他福利", "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额",
"累计已预扣预缴税额", SalaryI18nUtil.getI18nLabel(user.getLanguage(),537990,"累计婴幼儿照护"));
//排序配置
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
@ -338,9 +341,12 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
private List<List<String>> getExcelRowDetailList(AddUpSituationQueryParam param) {
long employeeId = user.getUID();
//excel标题
List<String> title = Arrays.asList("姓名", "税款所属期", "个税扣缴义务人", "部门", "手机号", "工号", "累计收入额", "累计减除费用", "累计社保个人合计",
"累计公积金个人合计", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计大病医疗", "累计企业（职业）年金及其他福利",
"累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额", "累计已预扣预缴税额", "累计婴幼儿照护");
List<String> title = Arrays.asList("姓名", "税款所属期", "个税扣缴义务人", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "手机号", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "累计收入额", "累计减除费用", "累计社保个人合计",
"累计公积金个人合计", SalaryI18nUtil.getI18nLabel(user.getLanguage(),542158,"累计子女教育"),SalaryI18nUtil.getI18nLabel(user.getLanguage(),542159,"累计继续教育"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542160,"累计住房贷款利息"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542161,"累计住房租金"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),542162,"累计赡养老人"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542163,"累计大病医疗"), "累计企业（职业）年金及其他福利",
"累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额", "累计已预扣预缴税额", SalaryI18nUtil.getI18nLabel(user.getLanguage(),537990,"累计婴幼儿照护"));
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
//查询详细信息
@ -399,7 +405,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
Long id = queryParam.getAccumulatedSituationId();
if (id == null) {
throw new SalaryRunTimeException("id不能为空");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),390521,"id不能为空"));
}
AddUpSituation po = biz.getById(id);
@ -409,7 +415,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
List<DataCollectionEmployee> employeeList = employBiz.getEmployeeByIds(Collections.singletonList(po.getEmployeeId()));
if (CollectionUtils.isEmpty(employeeList)) {
throw new SalaryRunTimeException("员工信息不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在"));
}
//查询参数
@ -436,28 +442,28 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
String[] header = {
SalaryI18nUtil.getI18nLabel(85429, "姓名"),
SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"),
SalaryI18nUtil.getI18nLabel(86185, "部门"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"),
SalaryI18nUtil.getI18nLabel(86186, "手机号"),
SalaryI18nUtil.getI18nLabel(86317, "工号"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"),
SalaryI18nUtil.getI18nLabel(86318, "证件号码"),
SalaryI18nUtil.getI18nLabel(86319, "入职日期"),
SalaryI18nUtil.getI18nLabel(86712, "累计收入额"),
SalaryI18nUtil.getI18nLabel(86711, "累计减除费用"),
SalaryI18nUtil.getI18nLabel(86710, "累计社保个人合计"),
SalaryI18nUtil.getI18nLabel(86709, "累计公积金个人合计"),
SalaryI18nUtil.getI18nLabel(86321, "累计子女教育"),
SalaryI18nUtil.getI18nLabel(86323, "累计继续教育"),
SalaryI18nUtil.getI18nLabel(86324, "累计住房贷款利息"),
SalaryI18nUtil.getI18nLabel(86325, "累计住房租金"),
SalaryI18nUtil.getI18nLabel(86326, "累计赡养老人"),
SalaryI18nUtil.getI18nLabel(105142, "累计大病医疗"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542158,"累计子女教育"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542159,"累计继续教育"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542160,"累计住房贷款利息"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542161,"累计住房租金"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542162,"累计赡养老人"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542163,"累计大病医疗"),
SalaryI18nUtil.getI18nLabel(90567, "累计企业（职业）年金及其他福利"),
SalaryI18nUtil.getI18nLabel(93902, "累计其他免税扣除"),
SalaryI18nUtil.getI18nLabel(86704, "累计免税收入"),
SalaryI18nUtil.getI18nLabel(86703, "累计准予扣除的捐赠额"),
SalaryI18nUtil.getI18nLabel(105478, "累计减免税额"),
SalaryI18nUtil.getI18nLabel(86702, "累计已预扣预缴税额"),
SalaryI18nUtil.getI18nLabel(86702, "累计婴幼儿照护")
SalaryI18nUtil.getI18nLabel(user.getLanguage(),537990,"累计婴幼儿照护")
};
// 2.表头
List<Object> headerList = Arrays.asList(header);
@ -516,8 +522,8 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
}
// 4.注释
List<ExcelComment> excelComments = Lists.newArrayList();
excelComments.add(new ExcelComment(0, 0, 3, 2, SalaryI18nUtil.getI18nLabel(100344, "必填")));
excelComments.add(new ExcelComment(1, 0, 4, 2, SalaryI18nUtil.getI18nLabel(100344, "必填")));
excelComments.add(new ExcelComment(0, 0, 3, 2, SalaryI18nUtil.getI18nLabel(30036, "必填")));
excelComments.add(new ExcelComment(1, 0, 4, 2, SalaryI18nUtil.getI18nLabel(30036, "必填")));
excelComments.add(new ExcelComment(7, 0, 10, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));
excelComments.add(new ExcelComment(8, 0, 11, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));
excelComments.add(new ExcelComment(9, 0, 14, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));
@ -674,12 +680,12 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
//姓名 不能为空
//错误消息对象
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "姓名不能为空");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542130,"姓名不能为空"));
errorData.add(errorMessageMap);
errorSum += 1;
} else if (CollectionUtils.isEmpty(employeeSameIds)) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "员工信息不存在");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在"));
errorData.add(errorMessageMap);
errorSum += 1;
} else if (employeeSameIds.size() > 1) {
@ -689,7 +695,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
.collect(Collectors.toList());
if (employeeSameIds.size() != 1) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "员工信息不存在或者存在多个员工");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542132,"员工信息不存在或者存在多个员工"));
errorData.add(errorMessageMap);
errorSum += 1;
}else {
@ -703,7 +709,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
} else {
//姓名错误，系统内不存在该姓名
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "姓名错误，系统内不存在该姓名");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542133,"姓名错误，系统内不存在该姓名"));
errorData.add(errorMessageMap);
errorSum += 1;
}
@ -714,7 +720,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
if (StringUtils.isBlank(taxAgentName)) {
//个税扣缴义务人不能为空
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "个税扣缴义务人不能为空");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542134,"个税扣缴义务人不能为空"));
errorData.add(errorMessageMap);
errorSum += 1;
} else {
@ -748,7 +754,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
boolean isExist = list.stream().anyMatch(f -> f.getEmployeeId().equals(po.getEmployeeId()) && f.getTaxAgentId().equals(po.getTaxAgentId()));
if (optionalAcctEmp.isPresent() && isExist) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "该年月这条数据已经核算过，不可导入");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542137,"该年月这条数据已经核算过，不可导入"));
errorData.add(errorMessageMap);
errorSum += 1;
}
@ -837,10 +843,10 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
if (StringUtils.isBlank(imageId)) {
throw new SalaryRunTimeException("文件不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),391241,"文件不存在"));
}
if (StringUtils.isBlank(declareMonthStr)) {
throw new SalaryRunTimeException("税款所属期为空");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542154,"税款所属期为空"));
}
}
@ -866,7 +872,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
boolean canEdit = taxAgentList.stream().anyMatch(t -> Objects.equals(t.getTaxAgentId() , taxAgentId));
if(!canEdit){
//没有编辑权限
throw new SalaryRunTimeException("该个税扣缴义务人无权限编辑此数据！");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542139,"该个税扣缴义务人无权限编辑此数据！"));
}
// 已经核算过的不可操作
// 获取已经核算的数据(获取税款所属期下一个月的数据)
@ -882,7 +888,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
if (CollectionUtils.isNotEmpty(salaryAcctEmployees) && !Objects.equals(taxYearMonthStr.split("-")[1], "12")) {
Optional<SalaryAcctEmployeePO> optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(addUpSituationParam.getEmployeeId()) && f.getTaxAgentId().equals(addUpSituationParam.getTaxAgentId())).findFirst();
if (optionalAcctEmp.isPresent()) {
throw new SalaryRunTimeException("该年月这条数据已经核算过,不可进行编辑！");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542140,"该年月这条数据已经核算过,不可进行编辑！"));
}
}
ArrayList<AddUpSituation> updateList = new ArrayList<>();
@ -949,13 +955,13 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
//筛选导入人员信息可以在人力资源池中匹配到的人员信息
boolean employeeSameId = employees.stream().anyMatch(e -> Objects.equals(e.getEmployeeId() , addUpSituationParam.getEmployeeId()));
if(!employeeSameId){
throw new SalaryRunTimeException("员工信息不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在"));
}
po.setEmployeeId(addUpSituationParam.getEmployeeId());
String taxAgentName = addUpSituationParam.getTaxAgentName();
if (StringUtils.isBlank(taxAgentName)) {
//个税扣缴义务人不能为空
throw new SalaryRunTimeException("个税扣缴义务人不能为空");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542134,"个税扣缴义务人不能为空"));
} else {
Optional<TaxAgentManageRangeEmployeeDTO> optionalTemp = taxAgentList.stream().filter(m -> m.getTaxAgentName().equals(taxAgentName)).findFirst();
if (optionalTemp.isPresent()) {
@ -983,7 +989,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
Optional<SalaryAcctEmployeePO> optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(po.getEmployeeId()) && f.getTaxAgentId().equals(po.getTaxAgentId())).findFirst();
boolean isExist = list.stream().anyMatch(f -> f.getEmployeeId().equals(po.getEmployeeId()) && f.getTaxAgentId().equals(po.getTaxAgentId()));
if (optionalAcctEmp.isPresent() && isExist) {
throw new SalaryRunTimeException("该年月这条数据已经核算过,不可导入");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542137,"该年月这条数据已经核算过,不可导入"));
}
}
@ -1059,7 +1065,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
Long id = deleteIds.get(i);
AddUpSituation byId = biz.getById(id);
if(byId == null){
throw new SalaryRunTimeException("数据不存在或已被删除！");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542142,"数据不存在或已被删除!"));
}
// 判断是否在个税扣缴义务人范围内
Optional<TaxAgentManageRangeEmployeeDTO> first = taxAgentList.stream().filter(m -> Objects.equals(m.getTaxAgentId() , byId.getTaxAgentId())).findFirst();
@ -1091,7 +1097,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
try {
declareMonthDate = (sdf.parse(declareMonthStr+"-01"));
}catch (Exception e){
throw new SalaryRunTimeException("日期异常");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542144,"日期异常"));
}
AddUpSituation queryParam = null;

22
src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
View File

@ -239,9 +239,9 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
String sheetName = SalaryI18nUtil.getI18nLabel(93931, "考勤数据");
List<Object> header = new ArrayList<>();
header.add(SalaryI18nUtil.getI18nLabel(85429, "姓名"));
header.add(SalaryI18nUtil.getI18nLabel(86185, "部门"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
header.add(SalaryI18nUtil.getI18nLabel(86186, "手机号"));
header.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
// 动态列
if (CollectionUtils.isNotEmpty(listMaps)) {
for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) {
@ -514,9 +514,9 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
String sheetName = SalaryI18nUtil.getI18nLabel(101606, "考勤引用导入模板");
List<Object> header = new ArrayList<>();
header.add(SalaryI18nUtil.getI18nLabel(85429, "姓名"));
header.add(SalaryI18nUtil.getI18nLabel(86185, "部门"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
header.add(SalaryI18nUtil.getI18nLabel(86186, "手机号"));
header.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
// 动态列
for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) {
header.add(attendQuoteField.getFieldName());
@ -665,9 +665,9 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
int errorSum = 0;
String userName = Optional.ofNullable(map.get(SalaryI18nUtil.getI18nLabel(85429, "姓名"))).orElse("").toString();
String deparmentName = Optional.ofNullable(map.get(SalaryI18nUtil.getI18nLabel(86185, "部门"))).orElse("").toString();
String deparmentName = Optional.ofNullable(map.get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"))).orElse("").toString();
String mobile = Optional.ofNullable(map.get(SalaryI18nUtil.getI18nLabel(86186, "手机号"))).orElse("").toString();
String workcode = Optional.ofNullable(map.get(SalaryI18nUtil.getI18nLabel(86317, "工号"))).orElse("").toString();
String workcode = Optional.ofNullable(map.get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"))).orElse("").toString();
List<Long> employeeSameIds = new ArrayList<>();
//筛选导入人员信息可以在人力资源池中匹配到的人员信息
@ -696,12 +696,12 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
//当人员信息导入筛选的全局配置为"0"时，姓名才是必填项
if (StringUtils.isEmpty(cellVal) && "0".equals(confValue)) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(100579, "姓名不能为空"));
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542130,"姓名不能为空"));
excelComments.add(errorMessageMap);
errorSum += 1;
} else if (CollectionUtils.isEmpty(employeeSameIds) || employeeSameIds.size() > 1) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(100579, "员工信息不存在或者存在多个员工"));
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542132,"员工信息不存在或者存在多个员工"));
excelComments.add(errorMessageMap);
errorSum += 1;
} else {
@ -710,7 +710,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
po.setEmployeeId(employeeId);
} else {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(100579, "姓名错误，系统内不存在该姓名"));
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542133,"姓名错误，系统内不存在该姓名"));
excelComments.add(errorMessageMap);
errorSum += 1;
}
@ -835,9 +835,9 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
List<Map<String, Object>> listMaps = getListMaps(list);
List<WeaTableColumn> columns = new ArrayList<>();
columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(85429, "姓名"), "username"));
columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(86185, "部门"), "departmentName"));
columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "departmentName"));
columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(86186, "手机号"), "mobile"));
columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(86317, "工号"), "jobNum"));
columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "jobNum"));
// 动态列
if (CollectionUtils.isNotEmpty(listMaps)) {

4
src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
View File

@ -50,7 +50,7 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic
WeaTableColumn employeeIdColumn = new WeaTableColumn("150px", "人员信息表的主键id", "employeeId");
employeeIdColumn.setDisplay(WeaBoolAttr.FALSE);
list.add(employeeIdColumn);
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 86185, "部门"), "department"));
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "department"));
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 86186, "手机号"), "mobile"));
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 86187, "员工状态"), "employeeStatus"));
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 100377, "数据来源"), "sourceFrom"));
@ -309,7 +309,7 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic
idColumn.setIsPrimarykey(WeaBoolAttr.TRUE);
idColumn.setDisplay(WeaBoolAttr.FALSE);
list.add(idColumn);
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 86185, "部门"), "department"));
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "department"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(86186, "手机号"), "mobile"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(86187, "员工状态"), "employeeStatus"));
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 100544, "缴纳情况"), "supplementaryMonth"));

50
src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
View File

@ -157,7 +157,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
//excel文件id
String imageId = Util.null2String(importParam.getImageId());
Validate.notBlank(imageId, "imageId为空");
Validate.notBlank(imageId, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542127,"imageId为空"));
InputStream fileInputStream = null;
try {
@ -189,7 +189,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
//excel文件id
String imageId = Util.null2String(importParam.getImageId());
Validate.notBlank(imageId, "imageId为空");
Validate.notBlank(imageId, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542127,"imageId为空"));
//税款所属期
String declareMonthStr = Util.null2String(importParam.getDeclareMonth());
//个税扣缴义务人
@ -267,12 +267,12 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
//姓名 不能为空
//错误消息对象
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "姓名不能为空");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542130,"姓名不能为空"));
errorData.add(errorMessageMap);
errorSum += 1;
} else if (CollectionUtils.isEmpty(employeeSameIds) || employeeSameIds.size() > 1) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "员工信息不存在或者存在多个员工");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542132,"员工信息不存在或者存在多个员工"));
errorData.add(errorMessageMap);
errorSum += 1;
} else {
@ -282,7 +282,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
} else {
//姓名错误，系统内不存在该姓名
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "姓名错误，系统内不存在该姓名");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542133,"姓名错误，系统内不存在该姓名"));
errorData.add(errorMessageMap);
errorSum += 1;
}
@ -293,7 +293,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
if (StringUtils.isBlank(taxAgentName)) {
//个税扣缴义务人不能为空
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "个税扣缴义务人不能为空");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542134,"个税扣缴义务人不能为空"));
errorData.add(errorMessageMap);
errorSum += 1;
} else {
@ -302,7 +302,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
if (StringUtils.isNotEmpty(taxAgentId) && !optionalTemp.get().getTaxAgentId().equals(Long.valueOf(taxAgentId))) {
//个税扣缴义务人与导入时选择的不一致
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "个税扣缴义务人与导入时选择的不一致");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542135,"个税扣缴义务人与导入时选择的不一致"));
errorData.add(errorMessageMap);
errorSum += 1;
} else {
@ -342,7 +342,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
boolean isExist = list.stream().anyMatch(f -> f.getEmployeeId().equals(finalPo.getEmployeeId()) && f.getTaxAgentId().equals(finalPo.getTaxAgentId()));
if (optionalAcctEmp.isPresent() && isExist) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "该年月这条数据已经核算过，不可导入");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542137,"该年月这条数据已经核算过，不可导入"));
errorData.add(errorMessageMap);
errorSum += 1;
}
@ -381,10 +381,10 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
String taxAgentId = Util.null2String(importParam.getTaxAgentId());
if (StringUtils.isBlank(imageId)) {
throw new SalaryRunTimeException("文件不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),391241,"文件不存在"));
}
if (StringUtils.isBlank(declareMonthStr)) {
throw new SalaryRunTimeException("税款所属期为空");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542154,"税款所属期为空"));
}
}
@ -413,7 +413,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
private List<List<String>> getExcelRowList(OtherDeductionQueryParam param) {
long employeeId = user.getUID();
//excel标题
List<String> title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "商业健康保险", "税延养老保险", "其他", "准予扣除的捐赠额", "个人养老金");
List<String> title = Arrays.asList("姓名", "个税扣缴义务人", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "手机号", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "证件号码", "入职日期", "商业健康保险", "税延养老保险", "其他", "准予扣除的捐赠额", "个人养老金");
//排序配置
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
param.setOrderRule(orderRule);
@ -477,7 +477,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
Long id = param.getOtherTaxExemptDeductionId();
if (id == null) {
throw new SalaryRunTimeException("id不能为空");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),390521,"id不能为空"));
}
OtherDeductionPO po = biz.getById(id);
@ -487,7 +487,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
List<DataCollectionEmployee> employeeList = employBiz.getEmployeeByIds(Collections.singletonList(po.getEmployeeId()));
if (CollectionUtils.isEmpty(employeeList)) {
throw new SalaryRunTimeException("员工信息不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在"));
}
//构建参数
@ -516,7 +516,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
*/
private List<List<String>> getExcelRowDetailList(OtherDeductionQueryParam param) {
//excel标题
List<String> title = Arrays.asList("姓名", "申报月份", "个税扣缴义务人", "部门", "手机号", "工号", "商业健康保险", "税延养老保险", "其他", "准予扣除的捐赠额","个人养老金");
List<String> title = Arrays.asList("姓名", "申报月份", "个税扣缴义务人", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "手机号", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "商业健康保险", "税延养老保险", "其他", "准予扣除的捐赠额","个人养老金");
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
//查询详细信息
@ -573,7 +573,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
boolean canEdit = taxAgentList.stream().anyMatch(t -> Objects.equals(t.getTaxAgentId(), taxAgentId));
if (!canEdit) {
//没有编辑权限
throw new SalaryRunTimeException("该个税扣缴义务人无权限编辑此数据！");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542139,"该个税扣缴义务人无权限编辑此数据！"));
}
// 获取已经核算的数据
List<SalaryAcctEmployeePO> salaryAcctEmployees = getAddUpDeductionService(user).getAccountedEmployeeData(declareMonthStr);
@ -581,7 +581,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
if (CollectionUtils.isNotEmpty(salaryAcctEmployees)) {
Optional<SalaryAcctEmployeePO> optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(otherDeductionParam.getEmployeeId()) && f.getTaxAgentId().equals(otherDeductionParam.getTaxAgentId())).findFirst();
if (optionalAcctEmp.isPresent()) {
throw new SalaryRunTimeException("该年月这条数据已经核算过,不可进行编辑！");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542140,"该年月这条数据已经核算过,不可进行编辑！"));
}
}
ArrayList<OtherDeductionPO> updateList = new ArrayList<>();
@ -634,13 +634,13 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
//筛选导入人员信息可以在人力资源池中匹配到的人员信息
boolean employeeSameId = employees.stream().anyMatch(e -> Objects.equals(e.getEmployeeId(), otherDeductionParam.getEmployeeId()));
if (!employeeSameId) {
throw new SalaryRunTimeException("员工信息不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在"));
}
po.setEmployeeId(otherDeductionParam.getEmployeeId());
String taxAgentName = otherDeductionParam.getTaxAgentName();
if (StringUtils.isBlank(taxAgentName)) {
//个税扣缴义务人不能为空
throw new SalaryRunTimeException("个税扣缴义务人不能为空");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542134,"个税扣缴义务人不能为空"));
} else {
Optional<TaxAgentManageRangeEmployeeDTO> optionalTemp = taxAgentList.stream().filter(m -> m.getTaxAgentName().equals(taxAgentName)).findFirst();
if (optionalTemp.isPresent()) {
@ -675,7 +675,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
Optional<SalaryAcctEmployeePO> optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(finalPo.getEmployeeId()) && f.getTaxAgentId().equals(finalPo.getTaxAgentId())).findFirst();
boolean isExist = list.stream().anyMatch(f -> f.getEmployeeId().equals(finalPo.getEmployeeId()) && f.getTaxAgentId().equals(finalPo.getTaxAgentId()));
if (optionalAcctEmp.isPresent() && isExist) {
throw new SalaryRunTimeException("该年月这条数据已经核算过,不可导入");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542137,"该年月这条数据已经核算过,不可导入"));
}
}
insertData.add(po);
@ -700,7 +700,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
Long id = deleteIds.get(i);
OtherDeductionPO byId = otherDeductionBiz.getById(id);
if (byId == null) {
throw new SalaryRunTimeException("数据不存在或已被删除！");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542142,"数据不存在或已被删除!"));
}
// 判断是否在个税扣缴义务人范围内
Optional<TaxAgentManageRangeEmployeeDTO> first = taxAgentList.stream().filter(m -> Objects.equals(m.getTaxAgentId(), byId.getTaxAgentId())).findFirst();
@ -732,7 +732,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
try {
declareMonthDate = sdf.parse(declareMonthStr + "-01");
} catch (Exception e) {
throw new SalaryRunTimeException("日期异常");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542144,"日期异常"));
}
OtherDeductionPO queryParam = null;
@ -857,9 +857,9 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
String[] header = {
SalaryI18nUtil.getI18nLabel(85429, "姓名"),
SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"),
SalaryI18nUtil.getI18nLabel(86185, "部门"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"),
SalaryI18nUtil.getI18nLabel(86186, "手机号"),
SalaryI18nUtil.getI18nLabel(86317, "工号"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"),
SalaryI18nUtil.getI18nLabel(86318, "证件号码"),
SalaryI18nUtil.getI18nLabel(86319, "入职日期"),
SalaryI18nUtil.getI18nLabel(91238, "商业健康保险"),
@ -874,8 +874,8 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
// 4.注释
List<ExcelComment> excelComments = Lists.newArrayList();
excelComments.add(new ExcelComment(0, 0, 3, 2, SalaryI18nUtil.getI18nLabel(100344, "必填")));
excelComments.add(new ExcelComment(1, 0, 4, 2, SalaryI18nUtil.getI18nLabel(100344, "必填")));
excelComments.add(new ExcelComment(0, 0, 3, 2, SalaryI18nUtil.getI18nLabel(30036, "必填")));
excelComments.add(new ExcelComment(1, 0, 4, 2, SalaryI18nUtil.getI18nLabel(30036, "必填")));
excelComments.add(new ExcelComment(7, 0, 10, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));
excelComments.add(new ExcelComment(8, 0, 11, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));
excelComments.add(new ExcelComment(9, 0, 12, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));

58
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -1205,9 +1205,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
// 模板表头(默认必带"个税扣缴义务人"、"姓名")
List<Object> headerList = Lists.newArrayList(SalaryI18nUtil.getI18nLabel(85429, "姓名"),
"部门",
SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"),
SalaryI18nUtil.getI18nLabel(86186, "手机号"),
SalaryI18nUtil.getI18nLabel(86317, "工号"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"),
SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"),
"账单月份");
List<String> dataIndexList = Lists.newArrayList("username", "departmentName", "mobile", "workcode", "taxAgentName", "billMonth");
@ -1252,7 +1252,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
String imageId = Util.null2String(importParam.getImageId());
if (StringUtils.isBlank(imageId)) {
throw new SalaryRunTimeException("文件不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),391241,"文件不存在"));
}
// // 获取所有个税扣缴义务人
// List<TaxAgentPO> taxAgents = getTaxAgentService(user).listAll();
@ -1329,9 +1329,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
continue;
}
String dataValue = (String) map.getOrDefault(dataKey.toString(), "");
String deparmentName = (String) map.getOrDefault("部门", "");
String deparmentName = (String) map.getOrDefault(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "");
String mobile = (String) map.getOrDefault("手机号", "");
String workcode = (String) map.getOrDefault("工号", "");
String workcode = (String) map.getOrDefault(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "");
if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(85429, "姓名"), dataKey.toString())) {
@ -1339,7 +1339,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
if (StringUtils.isEmpty(dataValue) && "0".equals(confValue)) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(102838, "姓名不能为空"));
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542130,"姓名不能为空"));
excelComments.add(errorMessageMap);
} else {
@ -1349,7 +1349,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
if (CollectionUtils.isEmpty(employeeSameIds)) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(100579, "姓名错误，系统内不存在该姓名"));
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542133,"姓名错误，系统内不存在该姓名"));
excelComments.add(errorMessageMap);
} else if (employeeSameIds.size() > 1) {
@ -1360,7 +1360,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
if (employeeSameIds.size() != 1) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + "员工信息不存在或者存在多个员工");
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542132,"员工信息不存在或者存在多个员工"));
excelComments.add(errorMessageMap);
} else {
employeeId = CollectionUtils.isNotEmpty(employeeSameIds) && employeeSameIds.size() == 1 ? employeeSameIds.get(0).getEmployeeId() : null;
@ -1479,9 +1479,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
// 模板表头(默认必带"个税扣缴义务人"、"姓名")
List<Object> headerList = Lists.newArrayList(SalaryI18nUtil.getI18nLabel(85429, "姓名"),
"部门",
SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"),
SalaryI18nUtil.getI18nLabel(86186, "手机号"),
SalaryI18nUtil.getI18nLabel(86317, "工号"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"),
SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"),
"账单月份",
"补缴月份");
@ -1605,7 +1605,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
Map<String, Object> toDealMap =
baseMap.entrySet().stream()
.filter(map -> !"姓名".equals(map.getKey())
&& !"部门".equals(map.getKey())
&& !SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门").equals(map.getKey())
&& !"手机号".equals(map.getKey())
&& !"个税扣缴义务人".equals(map.getKey())
&& !"账单月份".equals(map.getKey()))
@ -1831,9 +1831,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
List<ICategoryPO> fundWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 2).collect(Collectors.toList());
List<ICategoryPO> otherWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 3).collect(Collectors.toList());
List<Object> headerList = Lists.newArrayList(SalaryI18nUtil.getI18nLabel(85429, "姓名"),
SalaryI18nUtil.getI18nLabel(86185, "部门"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"),
SalaryI18nUtil.getI18nLabel(86186, "手机号"),
SalaryI18nUtil.getI18nLabel(86317, "工号"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"),
SalaryI18nUtil.getI18nLabel(86187, "员工状态"),
SalaryI18nUtil.getI18nLabel(100377, "数据来源"),
SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人"));
@ -1920,7 +1920,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
String imageId = Util.null2String(importParam.getImageId());
if (StringUtils.isBlank(imageId)) {
throw new SalaryRunTimeException("文件不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),391241,"文件不存在"));
}
// 获取租户下所有的人员
@ -1988,9 +1988,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
continue;
}
String dataValue = (String) map.getOrDefault(dataKey.toString(), "");
String deparmentName = (String) map.getOrDefault("部门", "");
String deparmentName = (String) map.getOrDefault(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "");
String mobile = (String) map.getOrDefault("手机号", "");
String workcode = (String) map.getOrDefault("工号", "");
String workcode = (String) map.getOrDefault(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "");
if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(85429, "姓名"), dataKey.toString())) {
@ -1998,7 +1998,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
if (StringUtils.isEmpty(dataValue) && "0".equals(confValue)) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(102838, "姓名不能为空"));
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542130,"姓名不能为空"));
excelComments.add(errorMessageMap);
} else {
@ -2008,7 +2008,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
if (CollectionUtils.isEmpty(employeeSameIds)) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(100579, "姓名错误，系统内不存在该姓名"));
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542133,"姓名错误，系统内不存在该姓名"));
excelComments.add(errorMessageMap);
} else if (employeeSameIds.size() > 1) {
@ -2019,7 +2019,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
if (employeeSameIds.size() != 1) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + "员工信息不存在或者存在多个员工");
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542132,"员工信息不存在或者存在多个员工"));
excelComments.add(errorMessageMap);
} else {
employeeId = CollectionUtils.isNotEmpty(employeeSameIds) && employeeSameIds.size() == 1 ? employeeSameIds.get(0).getEmployeeId() : null;
@ -2102,12 +2102,12 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
Map<String, Object> toDealMap =
baseMap.entrySet().stream()
.filter(map -> !"姓名".equals(map.getKey())
&& !"部门".equals(map.getKey())
&& !SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门").equals(map.getKey())
&& !"手机号".equals(map.getKey())
&& !"个税扣缴义务人".equals(map.getKey())
&& !"员工状态".equals(map.getKey())
&& !"数据来源".equals(map.getKey())
&& !"工号".equals(map.getKey()))
&& !SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号").equals(map.getKey()))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
for(Map.Entry<String, Object> entry : toDealMap.entrySet()) {
@ -2560,9 +2560,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
// 模板表头(默认必带"个税扣缴义务人"、"姓名")
List<Object> headerList = Lists.newArrayList(SalaryI18nUtil.getI18nLabel(85429, "姓名"),
"部门",
SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"),
SalaryI18nUtil.getI18nLabel(86186, "手机号"),
SalaryI18nUtil.getI18nLabel(86317, "工号"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"),
SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人")
);
List<String> dataIndexList = Lists.newArrayList("username", "departmentName", "mobile", "workcode", "taxAgentName");
@ -2609,7 +2609,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
String imageId = Util.null2String(importParam.getImageId());
if (StringUtils.isBlank(imageId)) {
throw new SalaryRunTimeException("文件不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),391241,"文件不存在"));
}
// // 获取所有个税扣缴义务人
// List<TaxAgentPO> taxAgents = getTaxAgentService(user).listAll();
@ -2700,9 +2700,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
singleAccount.add(cellData);
//抽取人员信息进行校验
String name = (String) map.getOrDefault("姓名", "");
String departmentName = (String) map.getOrDefault("部门", "");
String departmentName = (String) map.getOrDefault(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "");
String mobile = (String) map.getOrDefault("手机号", "");
String workcode = (String) map.getOrDefault("工号", "");
String workcode = (String) map.getOrDefault(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "");
if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(85429, "姓名"), dataKey.toString())) {
@ -2710,7 +2710,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
if (StringUtils.isEmpty(name) && "0".equals(confValue)) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(102838, "姓名不能为空"));
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542130,"姓名不能为空"));
excelComments.add(errorMessageMap);
} else {
@ -2720,7 +2720,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
if (CollectionUtils.isEmpty(employeeSameIds)) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(100579, "姓名错误，系统内不存在该姓名"));
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542133,"姓名错误，系统内不存在该姓名"));
excelComments.add(errorMessageMap);
} else if (employeeSameIds.size() > 1) {
@ -2731,7 +2731,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
if (employeeSameIds.size() != 1) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + "员工信息不存在或者存在多个员工");
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542132,"员工信息不存在或者存在多个员工"));
excelComments.add(errorMessageMap);
} else {
employeeId = CollectionUtils.isNotEmpty(employeeSameIds) && employeeSameIds.size() == 1 ? employeeSameIds.get(0).getEmployeeId() : null;

4
src/com/engine/salary/service/impl/SIExportServiceImpl.java
View File

@ -468,9 +468,9 @@ public class SIExportServiceImpl extends Service implements SIExportService {
Map<Integer, Map<String, String>> personColumns = buildPersonalTitle(pos, categoryIdNameMap);
Map<Integer, Map<String, String>> comColumns = buildComTitle(pos, categoryIdNameMap);
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(85429, "姓名"), "userName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(86185, "部门"), "department"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "department"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(86186, "手机号"), "mobile"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(86317, "工号"), "workcode"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "workcode"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(86187, "员工状态"), "employeeStatus"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(100377, "数据来源"), "sourceFrom"));
if (paymentStatus.equals(PaymentStatusEnum.REPAIR.getValue())) {

10
src/com/engine/salary/service/impl/SIImportServiceImpl.java
View File

@ -168,8 +168,8 @@ public class SIImportServiceImpl extends Service implements SIImportService {
// 4.注释
List<ExcelComment> excelComments = Lists.newArrayList();
excelComments.add(new ExcelComment(0, 0, 3, 2, SalaryI18nUtil.getI18nLabel(100344, "必填")));
excelComments.add(new ExcelComment(5, 0, 6, 2, SalaryI18nUtil.getI18nLabel(100344, "必填")));
excelComments.add(new ExcelComment(0, 0, 3, 2, SalaryI18nUtil.getI18nLabel(30036, "必填")));
excelComments.add(new ExcelComment(5, 0, 6, 2, SalaryI18nUtil.getI18nLabel(30036, "必填")));
excelComments.add(new ExcelComment(6, 0, 7, 2, SalaryI18nUtil.getI18nLabel(100344, "社保,公积金,其他福利方案名称不可同时为空")));
@ -186,10 +186,10 @@ public class SIImportServiceImpl extends Service implements SIImportService {
public List<String> buildHeader() {
List<String> result = new ArrayList<>();
result.add(SalaryI18nUtil.getI18nLabel( 85429, "姓名"));
result.add(SalaryI18nUtil.getI18nLabel( 86185, "部门"));
result.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
result.add(SalaryI18nUtil.getI18nLabel( 86186, "手机号"));
result.add(SalaryI18nUtil.getI18nLabel( 86187, "员工状态"));
result.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
result.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
result.add(SalaryI18nUtil.getI18nLabel( 86184, "个税扣缴义务人"));
result.add(SalaryI18nUtil.getI18nLabel( 91323, "社保方案名称"));
// result.add(SalaryI18nUtil.getI18nLabel( 91325, "社保缴纳组织"));
@ -282,7 +282,7 @@ public class SIImportServiceImpl extends Service implements SIImportService {
InsuranceArchivesOtherSchemePO otherItem = otherSchemePOMap.get(item.getEmployeeId());
Map<String, Object> map = new HashMap<>();
map.put(SalaryI18nUtil.getI18nLabel( 85429, "姓名"), item.getUserName());
map.put(SalaryI18nUtil.getI18nLabel( 86185, "部门"), item.getDepartmentName());
map.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), item.getDepartmentName());
map.put(SalaryI18nUtil.getI18nLabel( 86186, "手机号"), item.getTelephone());
map.put(SalaryI18nUtil.getI18nLabel( 86187, "员工状态"), item.getUserStatusEnum() == null ? "" : item.getUserStatusEnum().getDefaultLabel());
if (socialItem != null) {

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

@ -465,7 +465,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
WeaTableColumn nameColumn = new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(85429, "姓名"), "employeeName");
nameColumn.setFixed("left");
list.add(nameColumn);
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(86185, "部门"), "departmentName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "departmentName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(86186, "手机号"), "mobile"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(86187, "员工状态"), "status"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(93910, "个税扣缴义务人"), "paymentOrganizationName"));
@ -739,24 +739,24 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
public boolean singleAccountCheck(List<Map<String, Object>> singleAccount, Map<Long, String> welfareMap, List<InsuranceArchivesAccountPO> insuranceArchivesAccountPOS, List<DataCollectionEmployee> employeeByIds, List<Map<String, String>> excelComments, int i, Map<String, Long> schemeNameIdMap, Map<String, Long> paymentNameIdMap, Long creator, int index, Boolean openDevolution, List<TaxAgentManageRangeEmployeeDTO> taxAgentManageRangeEmployeeTree, String runStatus) {
boolean isError = false;
// String userName = (String) singleAccount.get(0).get(SalaryI18nUtil.getI18nLabel(85429, "姓名"));
// String deparmentName = (String) singleAccount.get(1).get(SalaryI18nUtil.getI18nLabel(86185, "部门"));
// String deparmentName = (String) singleAccount.get(1).get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
// String mobile = (String) singleAccount.get(2).get(SalaryI18nUtil.getI18nLabel(86186, "手机号"));
// String userStatus = (String) singleAccount.get(3).get(SalaryI18nUtil.getI18nLabel(86187, "员工状态"));
// String workcode = (String) singleAccount.get(4).get(SalaryI18nUtil.getI18nLabel(86317, "工号"));
// String workcode = (String) singleAccount.get(4).get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
Map<String, Object> userNameMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(85429, "姓名"));
Map<String, Object> deparmentNameMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(86185, "部门"));
Map<String, Object> deparmentNameMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
Map<String, Object> mobileMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(86186, "手机号"));
Map<String, Object> userStatusMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(86187, "员工状态"));
Map<String, Object> workcodeMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(86317, "工号"));
Map<String, Object> workcodeMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
Map<String, Object> employeeIdMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(86187, "员工id"));
String userName = (String) userNameMap.get(SalaryI18nUtil.getI18nLabel(85429, "姓名"));
String deparmentName = (String) deparmentNameMap.get(SalaryI18nUtil.getI18nLabel(86185, "部门"));
String deparmentName = (String) deparmentNameMap.get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
String mobile = (String) mobileMap.get(SalaryI18nUtil.getI18nLabel(86186, "手机号"));
String userStatus = (String) userStatusMap.get(SalaryI18nUtil.getI18nLabel(86187, "员工状态"));
String workcode = (String) workcodeMap.get(SalaryI18nUtil.getI18nLabel(86317, "工号"));
String workcode = (String) workcodeMap.get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
String toAddEmployeeId;
if (employeeIdMap.isEmpty()) {
toAddEmployeeId = null;
@ -790,7 +790,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
if (CollectionUtils.isEmpty(employees)) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "员工信息不存在");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在"));
excelComments.add(errorMessageMap);
isError = true;
return isError;
@ -802,7 +802,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
.collect(Collectors.toList());
if (employees.size() != 1) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(100304, "员工信息不存在或者存在多个员工"));
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542132,"员工信息不存在或者存在多个员工"));
excelComments.add(errorMessageMap);
isError = true;
return isError;

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

@ -146,9 +146,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
String[] header = {
SalaryI18nUtil.getI18nLabel(85429, "姓名"),
SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"),
SalaryI18nUtil.getI18nLabel(86185, "部门"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"),
SalaryI18nUtil.getI18nLabel(86186, "手机号"),
SalaryI18nUtil.getI18nLabel(86186, "工号"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"),
SalaryI18nUtil.getI18nLabel(91075, "员工状态"),
SalaryI18nUtil.getI18nLabel(91075, "入职日期"),
SalaryI18nUtil.getI18nLabel(91075, "离职日期")
@ -179,9 +179,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
String[] header = {
SalaryI18nUtil.getI18nLabel(85429, "姓名"),
SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"),
SalaryI18nUtil.getI18nLabel(86185, "部门"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"),
SalaryI18nUtil.getI18nLabel(86186, "手机号"),
SalaryI18nUtil.getI18nLabel(86186, "工号"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"),
SalaryI18nUtil.getI18nLabel(91075, "员工状态"),
SalaryI18nUtil.getI18nLabel(91075, "入职日期"),
SalaryI18nUtil.getI18nLabel(91075, "离职日期")
@ -211,9 +211,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
String[] header = {
SalaryI18nUtil.getI18nLabel(85429, "姓名"),
SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"),
SalaryI18nUtil.getI18nLabel(86185, "部门"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"),
SalaryI18nUtil.getI18nLabel(86186, "手机号"),
SalaryI18nUtil.getI18nLabel(86186, "工号"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"),
SalaryI18nUtil.getI18nLabel(91075, "员工状态"),
SalaryI18nUtil.getI18nLabel(91075, "入职日期"),
SalaryI18nUtil.getI18nLabel(91075, "离职日期")
@ -424,7 +424,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
// List<Object> headerList = Lists.newArrayList(SalaryI18nUtil.getI18nLabel(85429, "姓名"),
// "部门",
// SalaryI18nUtil.getI18nLabel(86186, "手机号"),
// SalaryI18nUtil.getI18nLabel(86317, "工号"),
// SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"),
// SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"));
// List<String> dataIndexList = Lists.newArrayList("username", "departmentName", "mobile", "workcode", "taxAgentName");
// // 查询薪资项目
@ -572,9 +572,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
// 模板表头(默认必带"个税扣缴义务人"、"姓名")
List<Object> headerList = Lists.newArrayList(SalaryI18nUtil.getI18nLabel(85429, "姓名"), SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"));
//定位人员带“部门”，“手机号”，“工号”
headerList.add("部门");
headerList.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
headerList.add("手机号");
headerList.add("工号");
headerList.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
// 查询薪资账套下的薪资项目
SalarySobItemAggregateDTO salarySobItemAggregateDTO = getSalarySobItemService(user).getAggregateBySalarySobId(salaryAcctRecordPO.getSalarySobId());
@ -779,18 +779,18 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
continue;
}
String dataValue = (String) map.getOrDefault(dataKey.toString(), "");
String deparmentName = (String) map.getOrDefault("部门", "");
String deparmentName = (String) map.getOrDefault(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "");
String mobile = (String) map.getOrDefault("手机号", "");
String workcode = (String) map.getOrDefault("工号", "");
String workcode = (String) map.getOrDefault(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "");
if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(85429, "姓名"), dataKey.toString())) {
usernameIndex = j;
if (StringUtils.isEmpty(dataValue) && "0".equals(confValue)) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(102838, "姓名不能为空"));
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542130,"姓名不能为空"));
excelComments.add(errorMessageMap);
//salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(102838, "姓名不能为空"), i, i, j, j);
//salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542130,"姓名不能为空"), i, i, j, j);
} else {
//筛选导入人员信息可以在人力资源池中匹配到的人员信息
List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(salaryEmployees, dataValue, deparmentName, mobile, workcode, null);
@ -798,7 +798,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
if (CollectionUtils.isEmpty(employeeSameIds)) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(100579, "姓名错误，系统内不存在该姓名"));
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542133,"姓名错误，系统内不存在该姓名"));
excelComments.add(errorMessageMap);
// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(100579, "姓名错误，系统内不存在该姓名"), i, i, j, j);
} else if (employeeSameIds.size() > 1) {
@ -809,7 +809,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
if (employeeSameIds.size() != 1) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + "员工信息不存在或者存在多个员工");
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542132,"员工信息不存在或者存在多个员工"));
excelComments.add(errorMessageMap);
} else {
employeeId = CollectionUtils.isNotEmpty(employeeSameIds) && employeeSameIds.size() == 1 ? employeeSameIds.get(0).getEmployeeId() : null;
@ -818,15 +818,15 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
employeeId = employeeSameIds.get(0).getEmployeeId();
}
}
} else if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(86184, "部门"), dataKey.toString())
} else if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), dataKey.toString())
|| StringUtils.equals(SalaryI18nUtil.getI18nLabel(86186, "手机号"), dataKey.toString())
|| StringUtils.equals(SalaryI18nUtil.getI18nLabel(86186, "工号"), dataKey.toString())) {
|| StringUtils.equals(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), dataKey.toString())) {
} else if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), dataKey.toString())) {
if (StringUtils.isEmpty(dataValue)) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(100579, SalaryI18nUtil.getI18nLabel(102839, "个税扣缴义务人不能为空")));
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542134,"个税扣缴义务人不能为空"));
excelComments.add(errorMessageMap);
// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(102839, "个税扣缴义务人不能为空"), i, i, j, j);
} else {

10
src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
View File

@ -138,9 +138,9 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
// headerList.add(SalaryI18nUtil.getI18nLabel(121908, "收入所得项目"));
// headerList.add(SalaryI18nUtil.getI18nLabel(87889, "薪资账套"));
// headerList.add(SalaryI18nUtil.getI18nLabel(86319, "入职日期"));
// headerList.add(SalaryI18nUtil.getI18nLabel(86185, "部门"));
// headerList.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
// headerList.add(SalaryI18nUtil.getI18nLabel(86186, "手机号"));
// headerList.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
// headerList.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
//// if (enableHr) {
//// headerList.add(SalaryI18nUtil.getI18nLabel(106277, "身份证号码"));
//// }
@ -276,9 +276,9 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
// header.add(SalaryI18nUtil.getI18nLabel(121908, "收入所得项目"));
// header.add(SalaryI18nUtil.getI18nLabel(87889, "薪资账套"));
// header.add(SalaryI18nUtil.getI18nLabel(86319, "入职日期"));
header.add(SalaryI18nUtil.getI18nLabel(86185, "部门"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
header.add(SalaryI18nUtil.getI18nLabel(86186, "手机号"));
header.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
// if (enableHr) {
// header.add(SalaryI18nUtil.getI18nLabel(106277, "身份证号码"));
// }
@ -383,7 +383,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
// 4.注释
List<ExcelComment> excelComments = Lists.newArrayList();
String requireI18n = SalaryI18nUtil.getI18nLabel(100344, "必填");
String requireI18n = SalaryI18nUtil.getI18nLabel(30036, "必填");
excelComments.add(new ExcelComment(0, 0, 3, 2, requireI18n));
excelComments.add(new ExcelComment(1, 0, 4, 2, requireI18n));
//收入所得项目

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

@ -584,7 +584,7 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
String[] header = {
SalaryI18nUtil.getI18nLabel(85429, "姓名"),
SalaryI18nUtil.getI18nLabel(86187, "员工状态"),
SalaryI18nUtil.getI18nLabel(86185, "部门"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"),
SalaryI18nUtil.getI18nLabel(84960, "薪资项目"),
SalaryI18nUtil.getI18nLabel(85433, "调整前"),
SalaryI18nUtil.getI18nLabel(85434, "调整后"),

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

@ -37,7 +37,6 @@ import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.excel.ExcelParseHelper;
import com.engine.salary.util.excel.ExcelSupport;
import com.engine.salary.util.excel.ExcelUtil;
import com.engine.salary.util.excel.ExcelUtilPlus;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
@ -457,7 +456,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
String sheetName = SalaryI18nUtil.getI18nLabel(85368, "薪资档案");
// 获取所有可被引用的薪资项目
List<SalaryItemPO> salaryItems = salaryItemMapper.getCanAdjustSalaryItems();
String[] header = {SalaryI18nUtil.getI18nLabel(85429, "姓名"), SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), SalaryI18nUtil.getI18nLabel(86185, "部门"), SalaryI18nUtil.getI18nLabel(86176, "工号"), SalaryI18nUtil.getI18nLabel(86186, "手机号"), SalaryI18nUtil.getI18nLabel(91075, "状态"), SalaryI18nUtil.getI18nLabel(91075, "起始发薪日期"), SalaryI18nUtil.getI18nLabel(91075, "最后发薪日期")};
String[] header = {SalaryI18nUtil.getI18nLabel(85429, "姓名"), SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), SalaryI18nUtil.getI18nLabel(86186, "手机号"), SalaryI18nUtil.getI18nLabel(91075, "状态"), SalaryI18nUtil.getI18nLabel(91075, "起始发薪日期"), SalaryI18nUtil.getI18nLabel(91075, "最后发薪日期")};
// 2.表头
List<Object> headerList = new ArrayList<>(Arrays.asList(header));
for (SalaryItemPO salaryItem : salaryItems) {
@ -895,7 +894,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
map.put(SalaryI18nUtil.getI18nLabel(85429, "姓名"), "username");
map.put(SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), "taxAgentName");
map.put(SalaryI18nUtil.getI18nLabel(85904, "生效日期"), "taxAgentEffectiveTime");
map.put(SalaryI18nUtil.getI18nLabel(86185, "部门"), "departmentName");
map.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "departmentName");
map.put(SalaryI18nUtil.getI18nLabel(86186, "手机号"), "mobile");
map.put(SalaryI18nUtil.getI18nLabel(91075, "员工状态"), "employeeStatus");

2
src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java
View File

@ -199,7 +199,7 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA
List<Object> header = new ArrayList<>();
header.add(SalaryI18nUtil.getI18nLabel(85429, "姓名"));
header.add(SalaryI18nUtil.getI18nLabel(86187, "员工状态"));
header.add(SalaryI18nUtil.getI18nLabel(86185, "部门"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
header.add(SalaryI18nUtil.getI18nLabel(85433, "调整前"));
header.add(SalaryI18nUtil.getI18nLabel(85434, "调整后"));
header.add(SalaryI18nUtil.getI18nLabel(85431, "调整原因"));

8
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -1162,9 +1162,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
List<Object> header = new ArrayList<>();
header.add(SalaryI18nUtil.getI18nLabel(85429, "姓名"));
header.add(SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"));
header.add(SalaryI18nUtil.getI18nLabel(86185, "部门"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
header.add(SalaryI18nUtil.getI18nLabel(86186, "手机号"));
header.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
header.add(SalaryI18nUtil.getI18nLabel(86317, "发送状态"));
List<List<Object>> rows = new ArrayList<>();
@ -1228,9 +1228,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
String sheetName = SalaryI18nUtil.getI18nLabel(97036, "工资单发放详情");
List<Object> header = new ArrayList<>();
header.add(SalaryI18nUtil.getI18nLabel(85429, "姓名"));
header.add(SalaryI18nUtil.getI18nLabel(86185, "部门"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
header.add(SalaryI18nUtil.getI18nLabel(86186, "手机号"));
header.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
// 动态列
if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(salaryItems)) {
for (SalaryTemplateSalaryItemListDTO salaryItem : salaryItems) {

16
src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
View File

@ -201,7 +201,7 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange
// 查询薪资账套的人员范围
List<SalarySobRangePO> salarySobRangePOS = listByIds(ids);
if (CollectionUtils.isEmpty(salarySobRangePOS)) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98604, "数据不存在或已被删除"));
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542142,"数据不存在或已被删除!"));
}
ids = SalaryEntityUtil.properties(salarySobRangePOS, SalarySobRangePO::getId);
// 删除薪资账套的人员范围
@ -343,12 +343,12 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange
//姓名 不能为空
//错误消息对象
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "姓名不能为空");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542130,"姓名不能为空"));
errorData.add(errorMessageMap);
errorSum += 1;
} else if (CollectionUtils.isEmpty(employeeSameIds) || employeeSameIds.size() > 1) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "员工信息不存在或者存在多个员工");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542132,"员工信息不存在或者存在多个员工"));
errorData.add(errorMessageMap);
errorSum += 1;
} else {
@ -358,7 +358,7 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange
} else {
//姓名错误，系统内不存在该姓名
Map<String, String> errorMessageMap = new HashMap<>();
errorMessageMap.put("message", rowIndex + "姓名错误，系统内不存在该姓名");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542133,"姓名错误，系统内不存在该姓名"));
errorData.add(errorMessageMap);
errorSum += 1;
}
@ -437,7 +437,7 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange
String imageId = Util.null2String(importParam.getImageId());
if (StringUtils.isBlank(imageId)) {
throw new SalaryRunTimeException("文件不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),391241,"文件不存在"));
}
if (StringUtils.isBlank(importParam.getSalarySobId())) {
throw new SalaryRunTimeException("薪资账套ID为空");
@ -450,7 +450,7 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange
//excel文件id
String imageId = Util.null2String(importParam.getImageId());
Validate.notBlank(imageId, "imageId为空");
Validate.notBlank(imageId, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542127,"imageId为空"));
InputStream fileInputStream = null;
try {
@ -474,9 +474,9 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange
// 表头
List<Object> headers = Lists.newArrayList();
headers.add(SalaryI18nUtil.getI18nLabel( 85429, "姓名"));
headers.add(SalaryI18nUtil.getI18nLabel( 86185, "部门"));
headers.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
headers.add(SalaryI18nUtil.getI18nLabel(86186, "手机号"));
headers.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
headers.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
headers.add(SalaryI18nUtil.getI18nLabel(86318, "员工状态"));
List<List<Object>> rowList = new ArrayList<>();
rowList.add(headers);

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

@ -153,7 +153,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
//excel文件id
String imageId = Util.null2String(importParam.getImageId());
Validate.notBlank(imageId, "imageId为空");
Validate.notBlank(imageId, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542127,"imageId为空"));
InputStream fileInputStream = null;
try {
@ -187,7 +187,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
//excel文件id
String imageId = Util.null2String(importParam.getImageId());
Validate.notBlank(imageId, "imageId为空");
Validate.notBlank(imageId, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542127,"imageId为空"));
//个税扣缴义务人
String taxAgentId = Util.null2String(importParam.getTaxAgentId());
@ -260,12 +260,12 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
//姓名 不能为空
//错误消息对象
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "姓名不能为空");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542130,"姓名不能为空"));
errorData.add(errorMessageMap);
errorSum += 1;
} else if (CollectionUtils.isEmpty(employeeSameIds) || employeeSameIds.size() > 1) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "员工信息不存在或者存在多个员工");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542132,"员工信息不存在或者存在多个员工"));
errorData.add(errorMessageMap);
errorSum += 1;
} else {
@ -275,7 +275,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
} else {
//姓名错误，系统内不存在该姓名
Map<String, String> errorMessageMap = new HashMap<>();
errorMessageMap.put("message", rowIndex + "姓名错误，系统内不存在该姓名");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542133,"姓名错误，系统内不存在该姓名"));
errorData.add(errorMessageMap);
errorSum += 1;
}
@ -286,7 +286,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
if (StringUtils.isBlank(taxAgentName)) {
//个税扣缴义务人不能为空
Map<String, String> errorMessageMap = new HashMap<>();
errorMessageMap.put("message", rowIndex + "个税扣缴义务人不能为空");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542134,"个税扣缴义务人不能为空"));
errorData.add(errorMessageMap);
errorSum += 1;
} else {
@ -295,7 +295,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
if (StringUtils.isNotEmpty(taxAgentId) && !optionalTemp.get().getTaxAgentId().equals(Long.valueOf(taxAgentId))) {
//个税扣缴义务人与导入时选择的不一致
Map<String, String> errorMessageMap = new HashMap<>();
errorMessageMap.put("message", rowIndex + "个税扣缴义务人与导入时选择的不一致");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542135,"个税扣缴义务人与导入时选择的不一致"));
errorData.add(errorMessageMap);
errorSum += 1;
} else {
@ -351,7 +351,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
String taxAgentId = Util.null2String(importParam.getTaxAgentId());
if (StringUtils.isBlank(imageId)) {
throw new SalaryRunTimeException("文件不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),391241,"文件不存在"));
}
}
@ -380,7 +380,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
private List<List<String>> getExcelRowList(SpecialAddDeductionQueryParam param, boolean isTemplate) {
long employeeId = user.getUID();
//excel标题
List<String> title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "子女教育", "继续教育", "住房贷款利息", "住房租金", "赡养老人", "大病医疗", "婴幼儿照护");
List<String> title = Arrays.asList("姓名", "个税扣缴义务人", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "手机号", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "证件号码", "入职日期", "子女教育", "继续教育", "住房贷款利息", "住房租金", "赡养老人", "大病医疗", "婴幼儿照护");
List<List<String>> rowList = new ArrayList<>();
rowList.add(title);
@ -406,7 +406,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
Long id = param.getSpecialAddDeductionId();
if (id == null) {
throw new SalaryRunTimeException("id不能为空");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),390521,"id不能为空"));
}
SpecialAddDeductionPO po = biz.getById(id);
@ -416,7 +416,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
List<DataCollectionEmployee> employeeList = employBiz.getEmployeeByIds(Collections.singletonList(po.getEmployeeId()));
if (CollectionUtils.isEmpty(employeeList)) {
throw new SalaryRunTimeException("员工信息不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在"));
}
//构建参数
@ -439,7 +439,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
*/
private List<List<String>> getExcelRowDetailList(SpecialAddDeductionQueryParam param) {
//excel标题
List<String> title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "子女教育", "继续教育", "住房贷款利息", "住房租金", "赡养老人", "大病医疗", "婴幼儿照护");
List<String> title = Arrays.asList("姓名", "个税扣缴义务人", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "手机号", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "子女教育", "继续教育", "住房贷款利息", "住房租金", "赡养老人", "大病医疗", "婴幼儿照护");
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
//查询详细信息
@ -497,7 +497,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
|| taxAgentList.stream().anyMatch(t -> Objects.equals(t.getTaxAgentId(), byId.getTaxAgentId()));
if (!canEdit) {
//没有编辑权限
throw new SalaryRunTimeException("该个税扣缴义务人无权限编辑此数据！");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542139,"该个税扣缴义务人无权限编辑此数据！"));
}
ArrayList<SpecialAddDeductionPO> updateList = new ArrayList<>();
SpecialAddDeductionPO build = SpecialAddDeductionPO.builder()
@ -545,13 +545,13 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
boolean employeeSameId = employees.stream()
.anyMatch(e -> Objects.equals(e.getEmployeeId(), specialAddDeductionParam.getEmployeeId()));
if (!employeeSameId) {
throw new SalaryRunTimeException("员工信息不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在"));
}
po.setEmployeeId(specialAddDeductionParam.getEmployeeId());
String taxAgentName = specialAddDeductionParam.getTaxAgentName();
if (StringUtils.isBlank(taxAgentName)) {
//个税扣缴义务人不能为空
throw new SalaryRunTimeException("个税扣缴义务人不能为空");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542134,"个税扣缴义务人不能为空"));
} else {
Optional<TaxAgentManageRangeEmployeeDTO> optionalTemp = taxAgentList.stream().filter(m -> m.getTaxAgentName().equals(taxAgentName)).findFirst();
if (optionalTemp.isPresent()) {
@ -587,7 +587,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
for (Long id : deleteIds) {
SpecialAddDeductionPO byId = SpecialAddDeductionBiz.getById(id);
if (byId == null) {
throw new SalaryRunTimeException("数据不存在或已被删除！");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542142,"数据不存在或已被删除!"));
}
// 判断是否在个税扣缴义务人范围内
boolean isNotInRegion =

8
src/com/engine/salary/service/impl/TaxAgentExcelServiceImpl.java
View File

@ -45,7 +45,7 @@ public class TaxAgentExcelServiceImpl extends Service implements TaxAgentExcelSe
List<List<Object>> rowList = getExcelRowList(taxAgent);
// 注释
List<ExcelComment> excelComments = Lists.newArrayList();
excelComments.add(new ExcelComment(0, 0, 1, 2, SalaryI18nUtil.getI18nLabel(100344, "必填")));
excelComments.add(new ExcelComment(0, 0, 1, 2, SalaryI18nUtil.getI18nLabel(30036, "必填")));
excelComments.add(new ExcelComment(4, 0, 6, 3, SalaryI18nUtil.getI18nLabel(100344, "若不填，默认全部员工状态。指定员工状态格式：试用、正式、临时、试用延期")));
//获取excel
return ExcelUtil.genWorkbookV2(rowList, "个税扣缴义务人人员范围", excelComments);
@ -57,7 +57,7 @@ public class TaxAgentExcelServiceImpl extends Service implements TaxAgentExcelSe
//excel文件id
String imageId = Util.null2String(importParam.getImageId());
Validate.notBlank(imageId, "imageId为空");
Validate.notBlank(imageId, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542127,"imageId为空"));
InputStream fileInputStream = null;
try {
@ -83,9 +83,9 @@ public class TaxAgentExcelServiceImpl extends Service implements TaxAgentExcelSe
headers.add(SalaryI18nUtil.getI18nLabel( 86184, "个税扣缴义务人"));
}
headers.add(SalaryI18nUtil.getI18nLabel( 85429, "姓名"));
headers.add(SalaryI18nUtil.getI18nLabel( 86185, "部门"));
headers.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
headers.add(SalaryI18nUtil.getI18nLabel(86186, "手机号"));
headers.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
headers.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
headers.add(SalaryI18nUtil.getI18nLabel(86318, "员工状态"));
List<List<Object>> rowList = new ArrayList<>();
rowList.add(headers);

12
src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
View File

@ -400,7 +400,7 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM
// 查询管理范围
List<TaxAgentManageRangePO> taxAgentManageRanges = listByIds(ids);
if (CollectionUtils.isEmpty(taxAgentManageRanges)) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98604, "数据不存在或已被删除"));
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542142,"数据不存在或已被删除!"));
}
List<Long> taxAgentIds = taxAgentManageRanges.stream().map(TaxAgentManageRangePO::getTaxAgentId).distinct().collect(Collectors.toList());
if (taxAgentIds.size() > 1) {
@ -574,7 +574,7 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM
//excel文件id
String imageId = Util.null2String(taxAgentImportParam.getImageId());
Validate.notBlank(imageId, "imageId为空");
Validate.notBlank(imageId, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542127,"imageId为空"));
//个税扣缴义务人
Long taxAgentId = taxAgentImportParam.getTaxAgentId();
TaxAgentPO taxAgent = getTaxAgentService(user).getById(taxAgentId);
@ -652,12 +652,12 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM
//姓名 不能为空
//错误消息对象
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "姓名不能为空");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542130,"姓名不能为空"));
errorData.add(errorMessageMap);
errorSum += 1;
} else if (CollectionUtils.isEmpty(employeeSameIds) || employeeSameIds.size() > 1) {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowIndex + "员工信息不存在或者存在多个员工");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542132,"员工信息不存在或者存在多个员工"));
errorData.add(errorMessageMap);
errorSum += 1;
} else {
@ -667,7 +667,7 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM
} else {
//姓名错误，系统内不存在该姓名
Map<String, String> errorMessageMap = new HashMap<>();
errorMessageMap.put("message", rowIndex + "姓名错误，系统内不存在该姓名");
errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542133,"姓名错误，系统内不存在该姓名"));
errorData.add(errorMessageMap);
errorSum += 1;
}
@ -767,7 +767,7 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM
String imageId = Util.null2String(importParam.getImageId());
if (StringUtils.isBlank(imageId)) {
throw new SalaryRunTimeException("文件不存在");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),391241,"文件不存在"));
}
Long taxAgentId = importParam.getTaxAgentId();
if (Objects.isNull(taxAgentId)) {

5
src/com/engine/salary/web/AddUpDeductionController.java
View File

@ -10,6 +10,7 @@ import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordDTO;
import com.engine.salary.entity.datacollection.param.*;
import com.engine.salary.util.ResponseResult;
import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.wrapper.AddUpDeductionWrapper;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
@ -87,7 +88,7 @@ public class AddUpDeductionController {
User user = HrmUserVarify.getUser(request, response);
AddUpDeductionQueryParam queryParam = buildParam(request);
XSSFWorkbook workbook = getAddUpDeductionWrapper(user).downloadTemplate(queryParam);
String fileName = "累计专项附加扣除导入模板" + LocalDate.now();
String fileName = SalaryI18nUtil.getI18nLabel(user.getLanguage(),101603, "累计专项附加扣除导入模板") + LocalDate.now();
try {
fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8");
} catch (UnsupportedEncodingException e) {
@ -160,7 +161,7 @@ public class AddUpDeductionController {
XSSFWorkbook workbook = getAddUpDeductionWrapper(user).exportDetail(param);
String fileName = "累计专项附加扣除明细" + LocalDate.now();
String fileName = SalaryI18nUtil.getI18nLabel(user.getLanguage(),542156,"累计专项附加扣除明细") + LocalDate.now();
try {
fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8");
} catch (UnsupportedEncodingException e) {

2
src/com/engine/salary/web/AttendQuoteController.java
View File

@ -2,6 +2,7 @@ package com.engine.salary.web;
import com.engine.common.util.ParamUtil;
import com.engine.common.util.ServiceUtil;
import com.engine.salary.common.SalaryContext;
import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldFormDTO;
import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldSettingListDTO;
import com.engine.salary.entity.datacollection.dto.AttendQuoteListDTO;
@ -45,6 +46,7 @@ public class AttendQuoteController {
}
private AttendQuoteDataWrapper getAttendQuoteDataWrapper(User user) {
SalaryContext.get().setValue("user",user);
return ServiceUtil.getService(AttendQuoteDataWrapper.class, user);
}

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

@ -79,7 +79,7 @@ public class AddUpDeductionWrapper extends Service {
Long id = queryParam.getAccumulatedSpecialAdditionalDeductionId();
AddUpDeduction po = getAddUpDeductionService(user).getById(id);
if (po == null) {
throw new SalaryRunTimeException(String.format(SalaryI18nUtil.getI18nLabel(100338, "累计专项附加扣除不存在") + "[id:%s]", id));
throw new SalaryRunTimeException(String.format(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542155,"累计专项附加扣除不存在") + "[id:%s]", id));
}
//申报月份
@ -117,7 +117,7 @@ public class AddUpDeductionWrapper extends Service {
Long id = queryParam.getAccumulatedSpecialAdditionalDeductionId();
AddUpDeduction po = getAddUpDeductionService(user).getById(id);
if (po == null) {
throw new SalaryRunTimeException(String.format(SalaryI18nUtil.getI18nLabel(100338, "累计专项附加扣除不存在") + "[id:%s]", id));
throw new SalaryRunTimeException(String.format(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542155,"累计专项附加扣除不存在") + "[id:%s]", id));
}
boolean isChief = getTaxAgentService(user).isChief((long) user.getUID());

8
src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java
View File

@ -75,9 +75,9 @@ public class AttendQuoteDataWrapper extends Service {
listPage.setTotal(page.getTotal());
List<Column> columns = new ArrayList<>();
columns.add(Column.builder().title("姓名").dataIndex("username").key("username").display(Boolean.TRUE).build());
columns.add(Column.builder().title("部门").dataIndex("departmentName").key("departmentName").display(Boolean.TRUE).build());
columns.add(Column.builder().title(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门")).dataIndex("departmentName").key("departmentName").display(Boolean.TRUE).build());
columns.add(Column.builder().title("手机号").dataIndex("mobile").key("mobile").display(Boolean.TRUE).build());
columns.add(Column.builder().title("工号").dataIndex("jobNum").key("jobNum").display(Boolean.TRUE).build());
columns.add(Column.builder().title(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号")).dataIndex("jobNum").key("jobNum").display(Boolean.TRUE).build());
if (CollectionUtils.isNotEmpty(listMaps)) {
for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) {
columns.add(Column.builder().title(attendQuoteField.getFieldName())
@ -89,9 +89,9 @@ public class AttendQuoteDataWrapper extends Service {
// 表格表头
// List<WeaTableColumn> columns = new ArrayList<>();
// columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(85429, "姓名"), "username"));
// columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(86185, "部门"), "departmentName"));
// columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "departmentName"));
// columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(86186, "手机号"), "mobile"));
// columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(86317, "工号"), "jobNum"));
// columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "jobNum"));
// 动态列
// if (CollectionUtils.isNotEmpty(listMaps)) {
// for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) {

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

@ -83,7 +83,7 @@ public class OtherDeductionWrapper extends Service {
departmentName.setLabelcol(8);
departmentName.setViewAttr(2);
departmentName.setIsQuickSearch(false);
departmentName.setLabel("部门");
departmentName.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
conditionItems.add(departmentName);
@ -93,7 +93,7 @@ public class OtherDeductionWrapper extends Service {
jobNum.setFieldcol(16);
jobNum.setLabelcol(8);
jobNum.setViewAttr(2);
jobNum.setLabel("工号");
jobNum.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
conditionItems.add(jobNum);

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

@ -237,7 +237,7 @@ public class SalarySendWrapper extends Service {
departmentName.setLabelcol(8);
departmentName.setViewAttr(2);
departmentName.setIsQuickSearch(false);
departmentName.setLabel("部门");
departmentName.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
departmentName.setInputType("");
conditionItems.add(departmentName);
@ -322,9 +322,9 @@ public class SalarySendWrapper extends Service {
idColumn.setDisplay(WeaBoolAttr.TRUE);
list.add(new WeaTableColumn("20%", "姓名", "username"));
list.add(new WeaTableColumn("20%", "个税扣缴义务人", "taxAgent"));
list.add(new WeaTableColumn("20%", "部门", "department"));
list.add(new WeaTableColumn("20%", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "department"));
list.add(new WeaTableColumn("20%", "手机号", "mobile"));
list.add(new WeaTableColumn("20%", "工号", "jobNum"));
list.add(new WeaTableColumn("20%", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "jobNum"));
list.add(new WeaTableColumn("20%", "发送状态", "sendStatus"));
list.add(new WeaTableColumn("20%", "操作", "operation"));
return list;
@ -406,7 +406,7 @@ public class SalarySendWrapper extends Service {
departmentName.setViewAttr(2);
departmentName.setInputType("");
departmentName.setIsQuickSearch(false);
departmentName.setLabel("部门");
departmentName.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
conditionItems.add(departmentName);
// 岗位
@ -533,9 +533,9 @@ public class SalarySendWrapper extends Service {
idColumn.setDisplay(WeaBoolAttr.TRUE);
list.add(new WeaTableColumn("100px", "姓名", "username"));
list.add(new WeaTableColumn("100px", "个税扣缴义务人", "taxAgent"));
list.add(new WeaTableColumn("100px", "部门", "department"));
list.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "department"));
list.add(new WeaTableColumn("100px", "手机号", "mobile"));
list.add(new WeaTableColumn("100px", "工号", "jobNum"));
list.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "jobNum"));
return list;
}

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

@ -68,7 +68,7 @@ public class SpecialAddDeductionWrapper extends Service {
departmentName.setLabelcol(8);
departmentName.setViewAttr(2);
departmentName.setIsQuickSearch(false);
departmentName.setLabel("部门");
departmentName.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
conditionItems.add(departmentName);
@ -78,7 +78,7 @@ public class SpecialAddDeductionWrapper extends Service {
jobNum.setFieldcol(16);
jobNum.setLabelcol(8);
jobNum.setViewAttr(2);
jobNum.setLabel("工号");
jobNum.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"));
conditionItems.add(jobNum);
addGroups.add(new SearchConditionGroup("常用条件", true, conditionItems));