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

入职日期改为String

This commit is contained in:
钱涛 2022-04-28 10:05:27 +08:00
parent e74931aa54
commit 5c2bb1bf58
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/WEB-INF/prop/hrmSalary.properties
View File

@ -1,7 +1,7 @@
#??????
log=ture
#??????
isPermission=true
isPermission=false
#??????id
salaryAdminRoleId=28

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

@ -81,7 +81,7 @@ public class SIArchivesBiz {
if (welfareType == null) {
//基础信息表单
InsuranceArchivesBaseDTO insuranceArchivesBaseDTO = InsuranceArchivesBaseDTO.builder().department(item.getDepartmentName())
.hiredate(SalaryDateUtil.getFormatLocalDate(item.getCompanystartdate()))
.hiredate(item.getCompanystartdate())
.position(item.getJobtitleName())
.username(item.getUsername())
.telephone(item.getMobile())

2
src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
View File

@ -45,7 +45,7 @@ public class DataCollectionEmployee {
//入职日期
@SalaryFormulaVar(defaultLabel ="入职日期", labelId = 86319, dataType = "string")
private Date companystartdate;
private String companystartdate;
//手机号
@SalaryFormulaVar(defaultLabel ="手机", labelId = 98621, dataType = "string")

3
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctEmployeeBO.java
View File

@ -8,7 +8,6 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveDataDTO;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveTaxAgentDataDTO;
import com.engine.salary.entity.taxrate.TaxAgent;
import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryEntityUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@ -66,7 +65,7 @@ public class SalaryAcctEmployeeBO {
.status(simpleEmployee.getStatus())
.mobile(simpleEmployee.getMobile())
.jobNum(simpleEmployee.getWorkcode())
.hireDate(SalaryDateUtil.getFormatLocalDate(simpleEmployee.getCompanystartdate()))
.hireDate(simpleEmployee.getCompanystartdate())
.dismissDate("")
.build();
}).collect(Collectors.toList());

3
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctFormulaBO.java
View File

@ -6,7 +6,6 @@ import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
import com.engine.salary.enums.SalaryRoundingModeEnum;
import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
import com.engine.salary.util.JsonUtil;
import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryI18nUtil;
import org.apache.commons.lang3.StringUtils;
@ -81,7 +80,7 @@ public class SalaryAcctFormulaBO {
.departmentName(simpleEmployee.getDepartmentName())
.positionName(simpleEmployee.getJobtitleName())
.gradeName(simpleEmployee.getJobcall())
.hireDate(SalaryDateUtil.getFormatLocalDate(simpleEmployee.getCompanystartdate()))
.hireDate(simpleEmployee.getCompanystartdate())
.birthday(simpleEmployee.getBirthday())
.build();
return JsonUtil.parseMap(JsonUtil.toJsonString(formulaEmployee), String.class);

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

@ -392,7 +392,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
// 根据薪资账套的"核算人员范围"过滤入职日期大于薪资周期止的人员
salaryEmployees = salaryEmployees.stream()
.filter(salaryEmployee -> Objects.isNull(salaryEmployee.getCompanystartdate())
|| salaryEmployee.getCompanystartdate().compareTo(salarySobCycleDTO.getSalaryCycle().getEndDate()) <= 0)
|| SalaryDateUtil.stringToDate(salaryEmployee.getCompanystartdate()).compareTo(salarySobCycleDTO.getSalaryCycle().getEndDate()) <= 0)
.collect(Collectors.toList());
// 根据薪资账套的"核算人员范围"过滤离职日期小于薪资周期起的人员
// TODO: 2/9/22 过滤离职人员

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

@ -1,7 +1,5 @@
package com.engine.salary.service.impl;
import cn.hutool.core.codec.Base64Encoder;
import cn.weaver.ecology.framework.rpc.annotation.RpcReference;
import com.alibaba.fastjson.JSONArray;
import com.api.formmode.mybatis.util.SqlProxyHandle;
import com.engine.common.util.ServiceUtil;
@ -21,7 +19,6 @@ import com.engine.salary.entity.salaryacct.bo.SalaryAcctResultBO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
import com.engine.salary.entity.salaryarchive.po.TaxAgentPO;
import com.engine.salary.entity.salaryformula.dto.SalaryFormulaEmployeeDTO;
import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO;
import com.engine.salary.entity.salarysob.po.SalarySobPO;
@ -32,12 +29,10 @@ import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.mapper.salaryacct.SalaryAcctEmployeeMapper;
import com.engine.salary.mapper.salaryacct.SalaryAcctRecordMapper;
import com.engine.salary.mapper.salaryacct.SalaryAcctResultMapper;
import com.engine.salary.mapper.salarybill.SalarySendMapper;
import com.engine.salary.service.*;
import com.engine.salary.util.JsonUtil;
import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.excel.ExcelUtil;
import com.engine.salary.util.page.PageInfo;
import dm.jdbc.util.IdGenerator;
@ -47,17 +42,12 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.transaction.annotation.Transactional;
import weaver.hrm.User;
import javax.annotation.Resource;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.stream.Collectors;
/**
@ -483,7 +473,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
.departmentName(simpleEmployee.getDepartmentName() )
.email(StringUtils.isEmpty(simpleEmployee.getEmail()) ? "" : simpleEmployee.getEmail())
.gradeName(simpleEmployee.getJobcall())
.hireDate(SalaryDateUtil.getFormatLocalDate(simpleEmployee.getCompanystartdate()))
.hireDate(simpleEmployee.getCompanystartdate())
.sex(simpleEmployee.getSex() == "0" ? "男" : "女")
.mobile(StringUtils.isEmpty(simpleEmployee.getMobile()) ? "" : simpleEmployee.getMobile())
.positionName(simpleEmployee.getJobtitleName())

15
src/com/engine/salary/util/SalaryDateUtil.java
View File

@ -406,7 +406,7 @@ public class SalaryDateUtil {
* @param date
* @return
*/
public static Date stringToDate(String date) {
public static Date stringToDateTime(String date) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date parse = null;
if (date != null) {
@ -419,6 +419,19 @@ public class SalaryDateUtil {
return parse;
}
public static Date stringToDate(String date) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date parse = null;
if (date != null) {
try {
parse = sdf.parse(date);
} catch (ParseException e) {
throw new RuntimeException(e);
}
}
return parse;
}
//格式化日期
public static String strToDateLong(String strDate) {
Date date = new Date();

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

@ -31,7 +31,6 @@ import com.engine.salary.service.TaxAgentService;
import com.engine.salary.service.impl.SalaryArchiveItemServiceImpl;
import com.engine.salary.service.impl.SalaryArchiveServiceImpl;
import com.engine.salary.service.impl.TaxAgentServiceImpl;
import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import com.google.common.collect.Lists;
@ -153,7 +152,7 @@ public class SalaryArchiveWrapper extends Service {
.username(employee.getUsername())
.department(employee.getDepartmentName())
.position(employee.getJobtitleName() == null ? "" : employee.getJobtitleName())
.hiredate(SalaryDateUtil.getFormatLocalDate(employee.getCompanystartdate()))
.hiredate(employee.getCompanystartdate())
.mobile(employee.getMobile())
.taxAgent(taxAgent)
.build();