diff --git a/resource/sqlupgrade/DM/sql202501150103.sql b/resource/sqlupgrade/DM/sql202501150103.sql index c8b71336f..a51508d84 100644 --- a/resource/sqlupgrade/DM/sql202501150103.sql +++ b/resource/sqlupgrade/DM/sql202501150103.sql @@ -6,36 +6,36 @@ loginid varchar2(100), LASTNAME varchar2(60), SEX char(1), BIRTHDAY char(10) , -NATIONALITY int(0) , +NATIONALITY int , MARITALSTATUS char(1) , TELEPHONE varchar2(60), MOBILE varchar2(60) , MOBILECALL varchar2(60) , EMAIL varchar2(60), -LOCATIONID int(0), +LOCATIONID int, WORKROOM varchar2(60), HOMEADDRESS varchar2(100), RESOURCETYPE char(1) , STARTDATE char(10) , ENDDATE char(10), -JOBTITLE int(0) , +JOBTITLE int , JOBTITLENAME varchar2(200) , JOBACTIVITYDESC varchar2(200), -JOBLEVEL int(0) , -SECLEVEL int(0) , -DEPARTMENTID int(0) , +JOBLEVEL int , +SECLEVEL int , +DEPARTMENTID int , DEPARTMENTNAME varchar2(200) , -SUBCOMPANYID1 int(0) , +SUBCOMPANYID1 int , SUBCOMPANYNAME varchar2(200) , -COSTCENTERID int(0) , -MANAGERID int(0) , -ASSISTANTID int(0), -BANKID1 int(0) , +COSTCENTERID int , +MANAGERID int , +ASSISTANTID int, +BANKID1 int , ACCOUNTID1 varchar2(100) , LASTLOGINDATE char(10) , CERTIFICATENUM varchar2(60) , NATIVEPLACE varchar2(100) , -EDUCATIONLEVEL int(0) , +EDUCATIONLEVEL int , BEMEMBERDATE char(10) , BEPARTYDATE char(10) , WORKCODE varchar2(60) , @@ -44,8 +44,8 @@ HEALTHINFO char(1) , RESIDENTPLACE varchar2(200) , POLICY varchar2(30) , DEGREE varchar2(30) , -USEKIND int(0) , -JOBCALL int(0) , +USEKIND int , +JOBCALL int , jobcallname varchar2(200) , ACCUMFUNDACCOUNT varchar2(30), BIRTHPLACE varchar2(60) , @@ -54,14 +54,14 @@ RESIDENTPHONE varchar2(60) , RESIDENTPOSTCODE varchar2(60) , EXTPHONE varchar2(50) , MANAGERSTR varchar2(500), -STATUS int(0) , +STATUS int , FAX varchar2(60) , ISLABOUUNION char(1), TEMPRESIDENTNUMBER varchar2(60), PROBATIONENDDATE char(10), -COUNTRYID int(0) , -ACCOUNTTYPE int(0) , -BELONGTO int(0) , +COUNTRYID int , +ACCOUNTTYPE int , +BELONGTO int , ACCOUNTNAME varchar2(200) , companystartdate varchar2(10), workstartdate varchar2(10) , diff --git a/resource/sqlupgrade/DM/sql202502060103.sql b/resource/sqlupgrade/DM/sql202502060103.sql new file mode 100644 index 000000000..6ce16cbf8 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202502060103.sql @@ -0,0 +1,3 @@ +alter table hrsa_page_list_template add file_id int; +/ + diff --git a/resource/sqlupgrade/GS/sql202501150103.sql b/resource/sqlupgrade/GS/sql202501150103.sql index c8b71336f..a51508d84 100644 --- a/resource/sqlupgrade/GS/sql202501150103.sql +++ b/resource/sqlupgrade/GS/sql202501150103.sql @@ -6,36 +6,36 @@ loginid varchar2(100), LASTNAME varchar2(60), SEX char(1), BIRTHDAY char(10) , -NATIONALITY int(0) , +NATIONALITY int , MARITALSTATUS char(1) , TELEPHONE varchar2(60), MOBILE varchar2(60) , MOBILECALL varchar2(60) , EMAIL varchar2(60), -LOCATIONID int(0), +LOCATIONID int, WORKROOM varchar2(60), HOMEADDRESS varchar2(100), RESOURCETYPE char(1) , STARTDATE char(10) , ENDDATE char(10), -JOBTITLE int(0) , +JOBTITLE int , JOBTITLENAME varchar2(200) , JOBACTIVITYDESC varchar2(200), -JOBLEVEL int(0) , -SECLEVEL int(0) , -DEPARTMENTID int(0) , +JOBLEVEL int , +SECLEVEL int , +DEPARTMENTID int , DEPARTMENTNAME varchar2(200) , -SUBCOMPANYID1 int(0) , +SUBCOMPANYID1 int , SUBCOMPANYNAME varchar2(200) , -COSTCENTERID int(0) , -MANAGERID int(0) , -ASSISTANTID int(0), -BANKID1 int(0) , +COSTCENTERID int , +MANAGERID int , +ASSISTANTID int, +BANKID1 int , ACCOUNTID1 varchar2(100) , LASTLOGINDATE char(10) , CERTIFICATENUM varchar2(60) , NATIVEPLACE varchar2(100) , -EDUCATIONLEVEL int(0) , +EDUCATIONLEVEL int , BEMEMBERDATE char(10) , BEPARTYDATE char(10) , WORKCODE varchar2(60) , @@ -44,8 +44,8 @@ HEALTHINFO char(1) , RESIDENTPLACE varchar2(200) , POLICY varchar2(30) , DEGREE varchar2(30) , -USEKIND int(0) , -JOBCALL int(0) , +USEKIND int , +JOBCALL int , jobcallname varchar2(200) , ACCUMFUNDACCOUNT varchar2(30), BIRTHPLACE varchar2(60) , @@ -54,14 +54,14 @@ RESIDENTPHONE varchar2(60) , RESIDENTPOSTCODE varchar2(60) , EXTPHONE varchar2(50) , MANAGERSTR varchar2(500), -STATUS int(0) , +STATUS int , FAX varchar2(60) , ISLABOUUNION char(1), TEMPRESIDENTNUMBER varchar2(60), PROBATIONENDDATE char(10), -COUNTRYID int(0) , -ACCOUNTTYPE int(0) , -BELONGTO int(0) , +COUNTRYID int , +ACCOUNTTYPE int , +BELONGTO int , ACCOUNTNAME varchar2(200) , companystartdate varchar2(10), workstartdate varchar2(10) , diff --git a/resource/sqlupgrade/GS/sql202502060103.sql b/resource/sqlupgrade/GS/sql202502060103.sql new file mode 100644 index 000000000..6ce16cbf8 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202502060103.sql @@ -0,0 +1,3 @@ +alter table hrsa_page_list_template add file_id int; +/ + diff --git a/resource/sqlupgrade/JC/sql202501150103.sql b/resource/sqlupgrade/JC/sql202501150103.sql index c8b71336f..a51508d84 100644 --- a/resource/sqlupgrade/JC/sql202501150103.sql +++ b/resource/sqlupgrade/JC/sql202501150103.sql @@ -6,36 +6,36 @@ loginid varchar2(100), LASTNAME varchar2(60), SEX char(1), BIRTHDAY char(10) , -NATIONALITY int(0) , +NATIONALITY int , MARITALSTATUS char(1) , TELEPHONE varchar2(60), MOBILE varchar2(60) , MOBILECALL varchar2(60) , EMAIL varchar2(60), -LOCATIONID int(0), +LOCATIONID int, WORKROOM varchar2(60), HOMEADDRESS varchar2(100), RESOURCETYPE char(1) , STARTDATE char(10) , ENDDATE char(10), -JOBTITLE int(0) , +JOBTITLE int , JOBTITLENAME varchar2(200) , JOBACTIVITYDESC varchar2(200), -JOBLEVEL int(0) , -SECLEVEL int(0) , -DEPARTMENTID int(0) , +JOBLEVEL int , +SECLEVEL int , +DEPARTMENTID int , DEPARTMENTNAME varchar2(200) , -SUBCOMPANYID1 int(0) , +SUBCOMPANYID1 int , SUBCOMPANYNAME varchar2(200) , -COSTCENTERID int(0) , -MANAGERID int(0) , -ASSISTANTID int(0), -BANKID1 int(0) , +COSTCENTERID int , +MANAGERID int , +ASSISTANTID int, +BANKID1 int , ACCOUNTID1 varchar2(100) , LASTLOGINDATE char(10) , CERTIFICATENUM varchar2(60) , NATIVEPLACE varchar2(100) , -EDUCATIONLEVEL int(0) , +EDUCATIONLEVEL int , BEMEMBERDATE char(10) , BEPARTYDATE char(10) , WORKCODE varchar2(60) , @@ -44,8 +44,8 @@ HEALTHINFO char(1) , RESIDENTPLACE varchar2(200) , POLICY varchar2(30) , DEGREE varchar2(30) , -USEKIND int(0) , -JOBCALL int(0) , +USEKIND int , +JOBCALL int , jobcallname varchar2(200) , ACCUMFUNDACCOUNT varchar2(30), BIRTHPLACE varchar2(60) , @@ -54,14 +54,14 @@ RESIDENTPHONE varchar2(60) , RESIDENTPOSTCODE varchar2(60) , EXTPHONE varchar2(50) , MANAGERSTR varchar2(500), -STATUS int(0) , +STATUS int , FAX varchar2(60) , ISLABOUUNION char(1), TEMPRESIDENTNUMBER varchar2(60), PROBATIONENDDATE char(10), -COUNTRYID int(0) , -ACCOUNTTYPE int(0) , -BELONGTO int(0) , +COUNTRYID int , +ACCOUNTTYPE int , +BELONGTO int , ACCOUNTNAME varchar2(200) , companystartdate varchar2(10), workstartdate varchar2(10) , diff --git a/resource/sqlupgrade/JC/sql202502060103.sql b/resource/sqlupgrade/JC/sql202502060103.sql new file mode 100644 index 000000000..6ce16cbf8 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202502060103.sql @@ -0,0 +1,3 @@ +alter table hrsa_page_list_template add file_id int; +/ + diff --git a/resource/sqlupgrade/Mysql/sql202502060103.sql b/resource/sqlupgrade/Mysql/sql202502060103.sql new file mode 100644 index 000000000..0ed0d6acb --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202502060103.sql @@ -0,0 +1 @@ +ALTER TABLE hrsa_page_list_template ADD COLUMN file_id int(0); diff --git a/resource/sqlupgrade/Oracle/sql202501150103.sql b/resource/sqlupgrade/Oracle/sql202501150103.sql index 7817d23d0..ee779a50f 100644 --- a/resource/sqlupgrade/Oracle/sql202501150103.sql +++ b/resource/sqlupgrade/Oracle/sql202501150103.sql @@ -6,36 +6,36 @@ loginid varchar2(100), LASTNAME varchar2(60), SEX char(1), BIRTHDAY char(10) , -NATIONALITY int(0) , +NATIONALITY int , MARITALSTATUS char(1) , TELEPHONE varchar2(60), MOBILE varchar2(60) , MOBILECALL varchar2(60) , EMAIL varchar2(60), -LOCATIONID int(0), +LOCATIONID int, WORKROOM varchar2(60), HOMEADDRESS varchar2(100), RESOURCETYPE char(1) , STARTDATE char(10) , ENDDATE char(10), -JOBTITLE int(0) , +JOBTITLE int , JOBTITLENAME varchar2(200) , JOBACTIVITYDESC varchar2(200), -JOBLEVEL int(0) , -SECLEVEL int(0) , -DEPARTMENTID int(0) , +JOBLEVEL int , +SECLEVEL int , +DEPARTMENTID int , DEPARTMENTNAME varchar2(200) , -SUBCOMPANYID1 int(0) , +SUBCOMPANYID1 int , SUBCOMPANYNAME varchar2(200) , -COSTCENTERID int(0) , -MANAGERID int(0) , -ASSISTANTID int(0), -BANKID1 int(0) , +COSTCENTERID int , +MANAGERID int , +ASSISTANTID int, +BANKID1 int , ACCOUNTID1 varchar2(100) , LASTLOGINDATE char(10) , CERTIFICATENUM varchar2(60) , NATIVEPLACE varchar2(100) , -EDUCATIONLEVEL int(0) , +EDUCATIONLEVEL int , BEMEMBERDATE char(10) , BEPARTYDATE char(10) , WORKCODE varchar2(60) , @@ -44,8 +44,8 @@ HEALTHINFO char(1) , RESIDENTPLACE varchar2(200) , POLICY varchar2(30) , DEGREE varchar2(30) , -USEKIND int(0) , -JOBCALL int(0) , +USEKIND int , +JOBCALL int , jobcallname varchar2(200) , ACCUMFUNDACCOUNT varchar2(30), BIRTHPLACE varchar2(60) , @@ -54,14 +54,14 @@ RESIDENTPHONE varchar2(60) , RESIDENTPOSTCODE varchar2(60) , EXTPHONE varchar2(50) , MANAGERSTR varchar2(500), -STATUS int(0) , +STATUS int , FAX varchar2(60) , ISLABOUUNION char(1), TEMPRESIDENTNUMBER varchar2(60), PROBATIONENDDATE char(10), -COUNTRYID int(0) , -ACCOUNTTYPE int(0) , -BELONGTO int(0) , +COUNTRYID int , +ACCOUNTTYPE int , +BELONGTO int , ACCOUNTNAME varchar2(200) , companystartdate varchar2(10), workstartdate varchar2(10) , diff --git a/resource/sqlupgrade/Oracle/sql202502060103.sql b/resource/sqlupgrade/Oracle/sql202502060103.sql new file mode 100644 index 000000000..25da649a0 --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202502060103.sql @@ -0,0 +1,2 @@ +alter table hrsa_page_list_template add file_id int +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202502060103.sql b/resource/sqlupgrade/PG/sql202502060103.sql new file mode 100644 index 000000000..267d3416c --- /dev/null +++ b/resource/sqlupgrade/PG/sql202502060103.sql @@ -0,0 +1 @@ +alter table hrsa_page_list_template add file_id int; \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202502060103.sql b/resource/sqlupgrade/SQLServer/sql202502060103.sql new file mode 100644 index 000000000..b6a038a58 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202502060103.sql @@ -0,0 +1,2 @@ +alter table hrsa_page_list_template add file_id int +go \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202501150103.sql b/resource/sqlupgrade/ST/sql202501150103.sql index c8b71336f..a51508d84 100644 --- a/resource/sqlupgrade/ST/sql202501150103.sql +++ b/resource/sqlupgrade/ST/sql202501150103.sql @@ -6,36 +6,36 @@ loginid varchar2(100), LASTNAME varchar2(60), SEX char(1), BIRTHDAY char(10) , -NATIONALITY int(0) , +NATIONALITY int , MARITALSTATUS char(1) , TELEPHONE varchar2(60), MOBILE varchar2(60) , MOBILECALL varchar2(60) , EMAIL varchar2(60), -LOCATIONID int(0), +LOCATIONID int, WORKROOM varchar2(60), HOMEADDRESS varchar2(100), RESOURCETYPE char(1) , STARTDATE char(10) , ENDDATE char(10), -JOBTITLE int(0) , +JOBTITLE int , JOBTITLENAME varchar2(200) , JOBACTIVITYDESC varchar2(200), -JOBLEVEL int(0) , -SECLEVEL int(0) , -DEPARTMENTID int(0) , +JOBLEVEL int , +SECLEVEL int , +DEPARTMENTID int , DEPARTMENTNAME varchar2(200) , -SUBCOMPANYID1 int(0) , +SUBCOMPANYID1 int , SUBCOMPANYNAME varchar2(200) , -COSTCENTERID int(0) , -MANAGERID int(0) , -ASSISTANTID int(0), -BANKID1 int(0) , +COSTCENTERID int , +MANAGERID int , +ASSISTANTID int, +BANKID1 int , ACCOUNTID1 varchar2(100) , LASTLOGINDATE char(10) , CERTIFICATENUM varchar2(60) , NATIVEPLACE varchar2(100) , -EDUCATIONLEVEL int(0) , +EDUCATIONLEVEL int , BEMEMBERDATE char(10) , BEPARTYDATE char(10) , WORKCODE varchar2(60) , @@ -44,8 +44,8 @@ HEALTHINFO char(1) , RESIDENTPLACE varchar2(200) , POLICY varchar2(30) , DEGREE varchar2(30) , -USEKIND int(0) , -JOBCALL int(0) , +USEKIND int , +JOBCALL int , jobcallname varchar2(200) , ACCUMFUNDACCOUNT varchar2(30), BIRTHPLACE varchar2(60) , @@ -54,14 +54,14 @@ RESIDENTPHONE varchar2(60) , RESIDENTPOSTCODE varchar2(60) , EXTPHONE varchar2(50) , MANAGERSTR varchar2(500), -STATUS int(0) , +STATUS int , FAX varchar2(60) , ISLABOUUNION char(1), TEMPRESIDENTNUMBER varchar2(60), PROBATIONENDDATE char(10), -COUNTRYID int(0) , -ACCOUNTTYPE int(0) , -BELONGTO int(0) , +COUNTRYID int , +ACCOUNTTYPE int , +BELONGTO int , ACCOUNTNAME varchar2(200) , companystartdate varchar2(10), workstartdate varchar2(10) , diff --git a/resource/sqlupgrade/ST/sql202502060103.sql b/resource/sqlupgrade/ST/sql202502060103.sql new file mode 100644 index 000000000..6ce16cbf8 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202502060103.sql @@ -0,0 +1,3 @@ +alter table hrsa_page_list_template add file_id int; +/ + diff --git a/src/com/engine/salary/action/CheckStopSalaryAction.java b/src/com/engine/salary/action/CheckStopSalaryAction.java index 78b3c0a7c..6243e6ed5 100644 --- a/src/com/engine/salary/action/CheckStopSalaryAction.java +++ b/src/com/engine/salary/action/CheckStopSalaryAction.java @@ -96,15 +96,18 @@ public class CheckStopSalaryAction implements Action { List taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName); if(CollectionUtils.isEmpty(taxAgentPOS)){ requestInfo.getRequestManager().setMessage("个税扣缴义务人不存在！"); + log.error("停薪检查异常 requestId:{} msg:{}", requestInfo.getRequestid(), taxAgentName + "个税扣缴义务人不存在！"); return FAILURE_AND_CONTINUE; } Long taxAgentId = Long.valueOf( taxAgentPOS.get(0).getId() ); Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString()); if( importDataMap.get("最后发薪日期") == null || StringUtils.isBlank(importDataMap.get("最后发薪日期").toString())){ requestInfo.getRequestManager().setMessage("缺少最后发薪日期字段！"); + log.error("停薪检查异常 requestId:{} msg:{}", requestInfo.getRequestid(), "缺少最后发薪日期字段！"); return FAILURE_AND_CONTINUE; }else if(SalaryDateUtil.stringToDate(importDataMap.get("最后发薪日期").toString()) == null){ requestInfo.getRequestManager().setMessage("最后发薪日期格式错误，格式为yyyy-MM-dd"); + log.error("停薪检查异常 requestId:{} msg:{}", requestInfo.getRequestid(), "最后发薪日期格式错误，格式为yyyy-MM-dd" + importDataMap.get("最后发薪日期").toString()); return FAILURE_AND_CONTINUE; } @@ -115,15 +118,17 @@ public class CheckStopSalaryAction implements Action { List salaryArchiveList = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().taxAgentId(taxAgentId).employeeId(employeeId).deleteType(NumberUtils.INTEGER_ZERO).build()); if(CollectionUtils.isEmpty(salaryArchiveList)){ requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工不存在薪资档案，请检查后重试！"); + log.error("停薪检查异常 requestId:{} msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工不存在薪资档案，请检查后重试！"); return FAILURE_AND_CONTINUE; } if(salaryArchiveList.size() > 1){ requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工存在多条薪资档案记录，请检查后重试！"); + log.error("停薪检查异常 requestId:{} msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工存在多条薪资档案记录，请检查后重试！"); return FAILURE_AND_CONTINUE; } } catch (Exception e) { - log.error("停薪校验异常", e); + log.error("停薪检查异常", e); requestInfo.getRequestManager().setMessage(e.getMessage()); return FAILURE_AND_CONTINUE; } diff --git a/src/com/engine/salary/action/StopSalaryAction.java b/src/com/engine/salary/action/StopSalaryAction.java index 6433e4e95..10d4d765a 100644 --- a/src/com/engine/salary/action/StopSalaryAction.java +++ b/src/com/engine/salary/action/StopSalaryAction.java @@ -107,15 +107,18 @@ public class StopSalaryAction implements Action { List taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName); if(CollectionUtils.isEmpty(taxAgentPOS)){ requestInfo.getRequestManager().setMessage("个税扣缴义务人不存在！"); + log.error("停薪异常 requestId:{} msg:{}", requestInfo.getRequestid(), taxAgentName + "个税扣缴义务人不存在！"); return FAILURE_AND_CONTINUE; } Long taxAgentId = Long.valueOf( taxAgentPOS.get(0).getId() ); Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString()); if( importDataMap.get("最后发薪日期") == null || StringUtils.isBlank(importDataMap.get("最后发薪日期").toString())){ requestInfo.getRequestManager().setMessage("缺少最后发薪日期字段！"); + log.error("停薪异常 requestId:{} msg:{}", requestInfo.getRequestid(), "缺少最后发薪日期字段！"); return FAILURE_AND_CONTINUE; }else if(SalaryDateUtil.stringToDate(importDataMap.get("最后发薪日期").toString()) == null){ requestInfo.getRequestManager().setMessage("最后发薪日期格式错误，格式为yyyy-MM-dd"); + log.error("停薪异常 requestId:{} msg:{}", requestInfo.getRequestid(), "最后发薪日期格式错误，格式为yyyy-MM-dd" + importDataMap.get("最后发薪日期").toString()); return FAILURE_AND_CONTINUE; } @@ -123,10 +126,12 @@ public class StopSalaryAction implements Action { List salaryArchiveList = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().taxAgentId(taxAgentId).employeeId(employeeId).deleteType(NumberUtils.INTEGER_ZERO).build()); if(CollectionUtils.isEmpty(salaryArchiveList)){ requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工不存在薪资档案，请检查后重试！"); + log.error("停薪异常 requestId:{} msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工不存在薪资档案，请检查后重试！"); return FAILURE_AND_CONTINUE; } if(salaryArchiveList.size() > 1){ requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工存在多条薪资档案记录，请检查后重试！"); + log.error("停薪异常 requestId:{} msg:{}", requestInfo.getRequestid(), taxAgentId +"_"+ employeeId+"该个税扣缴义务人下该员工存在多条薪资档案记录，请检查后重试！"); return FAILURE_AND_CONTINUE; } // 设置最后发薪日期 diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 9b2bbb180..56a1ce4b8 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -439,11 +439,11 @@ public class SIAccountBiz extends Service { public List listCanPayEmpIds(Long paymentOrganization, String billMonth) { List listCanPayEmpIds = new ArrayList<>(); //社保档案中可进行缴纳的人员 - List socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth); + List socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0); //公积金档案中可进行缴纳的人员 - List fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth); + List fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0); //其他福利档案中可进行缴纳的人员 - List otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth); + List otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0); if (socialCanPayEmpIds != null && socialCanPayEmpIds.size() > 0) { listCanPayEmpIds.addAll(socialCanPayEmpIds); } diff --git a/src/com/engine/salary/biz/SalarySendRangeObjBiz.java b/src/com/engine/salary/biz/SalarySendRangeObjBiz.java index 05ccaaadb..53633dce6 100644 --- a/src/com/engine/salary/biz/SalarySendRangeObjBiz.java +++ b/src/com/engine/salary/biz/SalarySendRangeObjBiz.java @@ -7,6 +7,8 @@ import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeTaxAgentDTO; import com.engine.salary.mapper.salarybill.SalarySendRangeObjMapper; import com.engine.salary.service.TaxAgentService; import com.engine.salary.service.impl.TaxAgentServiceImpl; +import com.engine.salary.util.db.MapperProxyFactory; +import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -23,6 +25,10 @@ public class SalarySendRangeObjBiz { return ServiceUtil.getService(TaxAgentServiceImpl.class); } + private SalarySendRangeObjMapper getSalarySendRangeObjMapper() { + return MapperProxyFactory.getProxy(SalarySendRangeObjMapper.class); + } + public R applyMapper(Function mapper) { try (SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession()) { final SalarySendRangeObjMapper salarySendRangeObjMapper = sqlSession.getMapper(SalarySendRangeObjMapper.class); @@ -41,7 +47,13 @@ public class SalarySendRangeObjBiz { } public List getSalarySendUserInfoDTOs(List employees) { - List userDTOs = applyMapper(mapper -> mapper.getUserInfoByEmployeeIds(employees)); + List userDTOs = new ArrayList<>(); + List> partition = Lists.partition(employees, 500); + partition.forEach(l->{ + List userInfos = getSalarySendRangeObjMapper().getUserInfoByEmployeeIds(l); + userDTOs.addAll(userInfos); + }); + Map userMap = userDTOs.stream() .collect(Collectors.toMap(SalarySendUserInfoDTO::getResourceId, Function.identity())); diff --git a/src/com/engine/salary/entity/extemp/dto/ExtEmpDTO.java b/src/com/engine/salary/entity/extemp/dto/ExtEmpDTO.java new file mode 100644 index 000000000..83f356300 --- /dev/null +++ b/src/com/engine/salary/entity/extemp/dto/ExtEmpDTO.java @@ -0,0 +1,57 @@ +package com.engine.salary.entity.extemp.dto; + + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.TableTitle; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 外部人员 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +//hrsa_external_employee +@ElogTransform( name = "非系统人员") +public class ExtEmpDTO { + + @ElogTransform(name = "主键id") + private Long id; + + /** + * 姓名 + */ + @TableTitle(title = "姓名", dataIndex = "username", key = "username") + private String username; + + /** + * 部门 + */ + @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") + private String departmentName; + + + /** + * 分部 + */ + @TableTitle(title = "分部", dataIndex = "subcompanyName", key = "subcompanyName") + private String subcompanyName; + + /** + * 入职日期 + */ + @TableTitle(title = "入职日期", dataIndex = "companystartdate", key = "companystartdate") + private String companystartdate; + + + /** + * 工号 + */ + @TableTitle(title = "工号", dataIndex = "workcode", key = "workcode") + private String workcode; + +} diff --git a/src/com/engine/salary/entity/setting/dto/PageListTemplateDTO.java b/src/com/engine/salary/entity/setting/dto/PageListTemplateDTO.java index 24570f54a..de493e128 100644 --- a/src/com/engine/salary/entity/setting/dto/PageListTemplateDTO.java +++ b/src/com/engine/salary/entity/setting/dto/PageListTemplateDTO.java @@ -59,6 +59,11 @@ public class PageListTemplateDTO { @TableTitle(title = "范围",dataIndex = "limits",key = "limits") private String limits; + @TableTitle(title = "导出模板",dataIndex = "fileName",key = "fileName") + private String fileName; + private Integer fileId; + + /** * 限制 */ diff --git a/src/com/engine/salary/entity/setting/param/DownloadTemplateParam.java b/src/com/engine/salary/entity/setting/param/DownloadTemplateParam.java new file mode 100644 index 000000000..ee882d721 --- /dev/null +++ b/src/com/engine/salary/entity/setting/param/DownloadTemplateParam.java @@ -0,0 +1,24 @@ +package com.engine.salary.entity.setting.param; + +import com.engine.salary.util.valid.DataCheck; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DownloadTemplateParam { + + @DataCheck(require = true,message = "请选择表头") + private List heads; + + @DataCheck(require = true,message = "请选择设置") + private List setting; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/setting/param/PageListTemplateSaveParam.java b/src/com/engine/salary/entity/setting/param/PageListTemplateSaveParam.java index 1ef45247a..cde28fdf9 100644 --- a/src/com/engine/salary/entity/setting/param/PageListTemplateSaveParam.java +++ b/src/com/engine/salary/entity/setting/param/PageListTemplateSaveParam.java @@ -40,4 +40,9 @@ public class PageListTemplateSaveParam { */ @DataCheck(require = true,message = "请选择设置") private List setting; + + /** + * 导出模板id + */ + private Integer fileId; } \ No newline at end of file diff --git a/src/com/engine/salary/entity/setting/po/PageListTemplatePO.java b/src/com/engine/salary/entity/setting/po/PageListTemplatePO.java index 1b2f727b4..adebbf0e2 100644 --- a/src/com/engine/salary/entity/setting/po/PageListTemplatePO.java +++ b/src/com/engine/salary/entity/setting/po/PageListTemplatePO.java @@ -12,7 +12,7 @@ import java.util.Date; import java.util.List; /** - * 薪资帐套表 + * 页面模板表 */ @Data @Builder @@ -64,6 +64,12 @@ public class PageListTemplatePO { @ElogTransform(name = "限制") private List limitIds; + /** + * excel模板文件id + */ + @ElogTransform(name = "模板文件id") + private Integer fileId; + /** * 租户ID */ diff --git a/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationSaveParam.java b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationSaveParam.java index 18b8c28c8..8fffb93cc 100644 --- a/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationSaveParam.java +++ b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationSaveParam.java @@ -1,11 +1,13 @@ package com.engine.salary.entity.taxdeclaration.param; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.time.YearMonth; +import java.util.Date; /** * 生成个税申报表参数 @@ -42,4 +44,10 @@ public class TaxDeclarationSaveParam { private String description; private String salaryMonthStr; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date taxCycle; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date salaryDate; } diff --git a/src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java b/src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java index c65d02559..8a9ca719a 100644 --- a/src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java +++ b/src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java @@ -54,7 +54,7 @@ public class AddUpSituationManager extends Service { // 调用生成申报单接口 YearMonth yearMonth = YearMonth.of(localDate.getYear(), localDate.getMonth()); try { - getTaxDeclarationService().save(TaxDeclarationSaveParam.builder().salaryMonth(yearMonth).taxAgentId(po.getTaxAgentId()).build()); + getTaxDeclarationService().save(TaxDeclarationSaveParam.builder().salaryMonth(yearMonth).salaryDate(po.getSalaryMonth()).taxCycle(po.getTaxCycle()).taxAgentId(po.getTaxAgentId()).build()); } catch (Exception e) { bb.writeLog("错误:" + e); result = false; diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index 833128372..17229b2e9 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -117,7 +117,7 @@ LEFT JOIN hrmdepartment d ON d.id = e.departmentid LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1 WHERE t.delete_type = 0 - and t.employee_type is null + and (t.employee_type is null or t.employee_type = 0) and e.status not in (7) @@ -221,7 +221,7 @@ LEFT JOIN hrmdepartment d ON d.id = e.departmentid LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1 WHERE t.delete_type = 0 - and t.employee_type is null + and (t.employee_type is null or t.employee_type = 0) and e.status not in (7) @@ -322,7 +322,7 @@ LEFT JOIN hrmdepartment d ON d.id = e.departmentid LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1 WHERE t.delete_type = 0 - and t.employee_type is null + and (t.employee_type is null or t.employee_type = 0) and e.status not in (7) diff --git a/src/com/engine/salary/mapper/setting/PageListTemplateMapper.xml b/src/com/engine/salary/mapper/setting/PageListTemplateMapper.xml index 02d015d13..e24131e5f 100644 --- a/src/com/engine/salary/mapper/setting/PageListTemplateMapper.xml +++ b/src/com/engine/salary/mapper/setting/PageListTemplateMapper.xml @@ -9,11 +9,12 @@ - + + @@ -32,6 +33,7 @@ , t.system_type , t.tenant_key , t.update_time + , t.file_id @@ -75,13 +77,16 @@ AND page = #{page} + + AND file_id = #{fileId} + AND setting = #{setting} AND shared_type = #{sharedType} - + AND system_type = #{systemType} @@ -141,6 +146,9 @@ update_time, + + file_id, + @@ -179,6 +187,9 @@ #{updateTime}, + + #{fileId}, + @@ -197,6 +208,7 @@ system_type=#{systemType}, tenant_key=#{tenantKey}, update_time=#{updateTime}, + file_id=#{fileId}, WHERE id = #{id} AND delete_type = 0 @@ -239,6 +251,7 @@ update_time=#{updateTime}, + file_id=#{fileId}, WHERE id = #{id} AND delete_type = 0 diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java index 75fbefcaa..7a470a222 100644 --- a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java +++ b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java @@ -28,6 +28,8 @@ public interface SIAccountDetailTempMapper { */ void batchDelByEmpIdsAndMonthAndPayOrg(@Param("employeeIds") Collection employeeIds, @Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization); + void batchDelByMonthAndPayOrg(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization); + /** * 批量保存 * @param accounts diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml index ca12fe478..a5fa46fca 100644 --- a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml @@ -139,6 +139,14 @@ + + UPDATE hrsa_bill_detail_temp + SET delete_type = 1 + WHERE delete_type = 0 + AND bill_month = #{billMonth} + AND payment_organization = #{paymentOrganization} + + INSERT INTO hrsa_bill_detail_temp diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java index c7dfa1233..07396a02b 100644 --- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java +++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java @@ -67,7 +67,7 @@ public interface FundSchemeMapper { * @param paymentOrganization * @return */ - List listCanPayEmpIds(@Param("paymentOrganization")Long paymentOrganization, @Param("billMonth")String billMonth); + List listCanPayEmpIds(@Param("paymentOrganization")Long paymentOrganization, @Param("billMonth")String billMonth, @Param("nonPayment") Integer nonPayment); List listAll(); diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml index 644a21d18..8cb8fc4e0 100644 --- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml @@ -266,6 +266,7 @@ AND fund_scheme_id is not null AND fund_start_time is not null AND fund_start_time #{billMonth} AND (fund_end_time is null OR fund_end_time = ]]> #{billMonth} OR fund_end_time ='') + AND non_payment = #{nonPayment}