diff --git a/resource/sqlupgrade/PG/sql202501150103.sql b/resource/sqlupgrade/PG/sql202501150103.sql
index d62aea72f..3841048c5 100644
--- a/resource/sqlupgrade/PG/sql202501150103.sql
+++ b/resource/sqlupgrade/PG/sql202501150103.sql
@@ -1,41 +1,42 @@
-CREATE TABLE hrsa_hrm_snapshot (
- ID bigint(0) NOT NULL,
+CREATE TABLE hrsa_hrm_snapshot
+(
+ ID bigint NOT NULL,
snapshot_time timestamp,
- employee_id bigint(0),
+ employee_id bigint,
loginid varchar(100),
LASTNAME varchar(60),
SEX char(1),
BIRTHDAY char(10) ,
- NATIONALITY int(0) ,
+ NATIONALITY int ,
MARITALSTATUS char(1) ,
TELEPHONE varchar(60),
MOBILE varchar(60) ,
MOBILECALL varchar(60) ,
EMAIL varchar(60),
- LOCATIONID int(0),
+ LOCATIONID int,
WORKROOM varchar(60),
HOMEADDRESS varchar(100),
RESOURCETYPE char(1) ,
STARTDATE char(10) ,
ENDDATE char(10),
- JOBTITLE int(0) ,
+ JOBTITLE int ,
JOBTITLENAME varchar(200) ,
JOBACTIVITYDESC varchar(200),
- JOBLEVEL int(0) ,
- SECLEVEL int(0) ,
- DEPARTMENTID int(0) ,
+ JOBLEVEL int ,
+ SECLEVEL int ,
+ DEPARTMENTID int ,
DEPARTMENTNAME varchar(200) ,
- SUBCOMPANYID1 int(0) ,
+ SUBCOMPANYID1 int ,
SUBCOMPANYNAME varchar(200) ,
- COSTCENTERID int(0) ,
- MANAGERID int(0) ,
- ASSISTANTID int(0),
- BANKID1 int(0) ,
+ COSTCENTERID int ,
+ MANAGERID int ,
+ ASSISTANTID int,
+ BANKID1 int ,
ACCOUNTID1 varchar(100) ,
LASTLOGINDATE char(10) ,
CERTIFICATENUM varchar(60) ,
NATIVEPLACE varchar(100) ,
- EDUCATIONLEVEL int(0) ,
+ EDUCATIONLEVEL int ,
BEMEMBERDATE char(10) ,
BEPARTYDATE char(10) ,
WORKCODE varchar(60) ,
@@ -44,8 +45,8 @@ CREATE TABLE hrsa_hrm_snapshot (
RESIDENTPLACE varchar(200) ,
POLICY varchar(30) ,
DEGREE varchar(30) ,
- USEKIND int(0) ,
- JOBCALL int(0) ,
+ USEKIND int ,
+ JOBCALL int ,
jobcallname varchar(200) ,
ACCUMFUNDACCOUNT varchar(30),
BIRTHPLACE varchar(60) ,
@@ -54,14 +55,14 @@ CREATE TABLE hrsa_hrm_snapshot (
RESIDENTPOSTCODE varchar(60) ,
EXTPHONE varchar(50) ,
MANAGERSTR varchar(500),
- STATUS int(0) ,
+ STATUS int ,
FAX varchar(60) ,
ISLABOUUNION char(1),
TEMPRESIDENTNUMBER varchar(60),
PROBATIONENDDATE char(10),
- COUNTRYID int(0) ,
- ACCOUNTTYPE int(0) ,
- BELONGTO int(0) ,
+ COUNTRYID int ,
+ ACCOUNTTYPE int ,
+ BELONGTO int ,
ACCOUNTNAME varchar(200) ,
companystartdate varchar(10),
workstartdate varchar(10) ,
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
index 19d0147ed..24db00d78 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
@@ -11,7 +11,6 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
import com.engine.salary.entity.salarysob.po.SalarySobPO;
import com.engine.salary.entity.taxagent.param.TaxAgentQueryParam;
-import com.engine.salary.entity.setting.param.PageListSettingQueryParam;
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
import com.engine.salary.enums.UserStatusEnum;
import com.engine.salary.enums.auth.AuthFilterTypeEnum;
@@ -31,6 +30,8 @@ import com.engine.salary.service.*;
import com.engine.salary.service.auth.AuthService;
import com.engine.salary.service.auth.AuthServiceImpl;
import com.engine.salary.service.impl.*;
+import com.engine.salary.sys.service.SalarySysConfService;
+import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl;
import com.engine.salary.util.SalaryAssert;
import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryEntityUtil;
@@ -49,6 +50,8 @@ import weaver.hrm.User;
import java.util.*;
import java.util.stream.Collectors;
+import static com.engine.salary.sys.constant.SalarySysConstant.REPORT_ORGANIZATIN_TYPE;
+
/**
* 薪酬统计员工明细
* Copyright: Copyright (c) 2022
@@ -103,6 +106,11 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
return ServiceUtil.getService(SettingServiceImpl.class, user);
}
+ private SalarySysConfService getSalarySysConfService(User user) {
+ return ServiceUtil.getService(SalarySysConfServiceImpl.class, user);
+ }
+
+ private final boolean isRealOrg = "1".equals(getSalarySysConfService(user).getValueByCode(REPORT_ORGANIZATIN_TYPE));
@Override
public PageInfo listPage(SalaryStatisticsEmployeeQueryParam queryParam) {
List list = Collections.emptyList();
@@ -262,14 +270,22 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
map.put("salarySob", SalarySobMap.get(se.getSalarySobId()));
map.put("acctTimes", salaryAcctRecordMap.get(se.getSalaryAcctRecordId()));
map.put("userName", Util.null2String(emp.getUsername()));
- map.put("subCompany", Util.null2String(emp.getSubcompanyName()));
- map.put("department", Util.null2String(emp.getDepartmentName()));
- map.put("jobTitle", Util.null2String(emp.getJobtitleName()));
- map.put("status", Util.null2String(NumberUtil.isNumber(emp.getStatus()) ? SalaryEmployeeStatusEnum.parseByValue(Integer.valueOf(emp.getStatus())).getDefaultLabel() : null));
map.put("workCode", Util.null2String(emp.getWorkcode()));
map.put("idNo", Util.null2String(emp.getIdNo()));
map.put("companystartdate", Util.null2String(emp.getCompanystartdate()));
+ if(isRealOrg){
+ map.put("subCompany", Util.null2String(emp.getSubcompanyName()));
+ map.put("department", Util.null2String(emp.getDepartmentName()));
+ map.put("jobTitle", Util.null2String(emp.getJobtitleName()));
+ map.put("status", Util.null2String(NumberUtil.isNumber(emp.getStatus()) ? SalaryEmployeeStatusEnum.parseByValue(Integer.valueOf(emp.getStatus())).getDefaultLabel() : null));
+ }else {
+ map.put("subCompany", Util.null2String(se.getSubcompanyName()));
+ map.put("department", Util.null2String(se.getDepartmentName()));
+ map.put("jobTitle", Util.null2String(se.getJobtitleName()));
+ map.put("status", Util.null2String(NumberUtil.isNumber(se.getStatus()) ? SalaryEmployeeStatusEnum.parseByValue(Integer.valueOf(se.getStatus())).getDefaultLabel() : null));
+ }
+
// IncomeCategoryEnum incomeCategoryEnum = IncomeCategoryEnum.parseByValue(Integer.parseInt(se.getIncomeCategory()));
// map.put("incomeCategory", Objects.isNull(incomeCategoryEnum) ? "" : SalaryI18nUtil.getI18nLabel(incomeCategoryEnum.getLabelId(), incomeCategoryEnum.getDefaultLabel()));
list.add(map);
diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
index 5c5e58bbf..50bd37d53 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
@@ -519,7 +519,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
List> attendQuoteSyncData = new ArrayList<>();
Attend4Salary attend4Salary = new Attend4Salary();
try {
- int partSize = 500;
+ int partSize = 100;
List> partition = Lists.partition(employeeIds, partSize);
for (List part : partition) {
attend4Salary.setBeginDate(attendCycleRange.getFromDate());