Merge branch 'release/2.18.2.2412.02' into release/个税版本

resource/WEB-INF/prop/hrmSalary.properties

@@ -1,5 +1,5 @@
 log=false
 defaultCloseNonStandard149=true
 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
-version=2.18.1.2412.01
+version=2.18.1.2412.02
 openFormulaForcedEditing=false

src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java

@@ -818,7 +818,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
             data.getList().forEach(employee -> {
                 if (employee.getSubcompanyId() != null && employee.getSubcompanyId() != null) {
                     subComIdNameMap.put(employee.getSubcompanyId(), employee.getSubcompanyName());
-                    subComIds.add(employee.getDepartmentId());
+                    subComIds.add(employee.getSubcompanyId());
                     empIdSubComMap.put(employee.getEmployeeId(), employee.getSubcompanyId());
                 }
             });

src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java

@@ -303,12 +303,15 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
             return Collections.emptyList();
         }
         Set<Long> lastMonthSalaryAcctRecordIds = SalaryEntityUtil.properties(salaryAcctRecordPOS, SalaryAcctRecordPO::getId);
-        // 上个月的核算人员
-        List<SalaryAcctEmployeePO> lastMonthSalaryAcctEmployeePOS = listBySalaryAcctRecordIds(lastMonthSalaryAcctRecordIds);
-        Map<String, SalaryAcctEmployeePO> lastMonthSalaryAcctEmployeePOMap = SalaryEntityUtil.convert2Map(lastMonthSalaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId());
         // 本月的核算人员
-        List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = listByParam(queryParam);
+        List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = listBySalaryAcctRecordId(queryParam.getSalaryAcctRecordId());
         Set<String> keySet = SalaryEntityUtil.properties(salaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId());
+        // 上个月的核算人员
+        queryParam.setSalaryAcctRecordId(null);
+        queryParam.setSalaryAcctRecordIds(lastMonthSalaryAcctRecordIds);
+        List<SalaryAcctEmployeePO> lastMonthSalaryAcctEmployeePOS = listByParam(queryParam);
+        Map<String, SalaryAcctEmployeePO> lastMonthSalaryAcctEmployeePOMap = SalaryEntityUtil.convert2Map(lastMonthSalaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId());
+
         List<SalaryAcctEmployeePO> resultList = Lists.newArrayList();
         if (CollectionUtils.isNotEmpty(keySet)) {
             lastMonthSalaryAcctEmployeePOMap.forEach((k, v) -> {

src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java

@@ -29,6 +29,7 @@ import com.engine.salary.mapper.archive.SalaryArchiveItemMapper;
 import com.engine.salary.mapper.salaryitem.SalaryItemMapper;
 import com.engine.salary.service.*;
 import com.engine.salary.sys.entity.vo.UploadConfigResponse;
+import com.engine.salary.util.SalaryDateUtil;
 import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.SalaryLoggerUtil;
@@ -41,6 +42,7 @@ import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import weaver.hrm.User;
 
@@ -706,7 +708,7 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
                     String userstatus = queryParam.getUserstatus();
                     r.setUsername(employee.getUsername());
                     r.setDepartmentName(employee.getDepartmentName());
-                    r.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(employee.getStatus())));
+                    r.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(NumberUtils.isCreatable(employee.getStatus()) ? employee.getStatus() : "-1")));
                     r.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(r.getAdjustReason()));
                     return (StringUtils.isBlank(username) || employee.getUsername().contains(username))
                             && (CollectionUtils.isEmpty(departmentIds) || departmentIds.contains(employee.getDepartmentId()))
@@ -739,7 +741,7 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
             row.add(dto.getAdjustBefore());
             row.add(dto.getAdjustAfter());
             row.add(dto.getAdjustReason());
-            row.add(dto.getEffectiveTime() + "");
+            row.add(SalaryDateUtil.getFormatDate(dto.getEffectiveTime()));
             row.add(dto.getOperator());
             row.add(format.format(dto.getOperateTime()));
             row.add(dto.getDescription());