Merge branch 'release/2.9.2.2307.02' into feature/230703-薪资账套项目页面改造

src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java

@@ -129,7 +129,7 @@ public class InsuranceComparisonResultBO {
      */
     public static List<Map<String, Object>> buildComparisonTableData(List<AccountExportPO> accountExportPOS, List<ExcelAccountExportPO> excelAccountExportPOS, Map<Long, String> schemeIdNameMap) {
 
-        Map<String, List<ExcelAccountExportPO>> excelResultMap = SalaryEntityUtil.group2Map(excelAccountExportPOS, ExcelAccountExportPO::getWorkcode);
+        Map<Long, List<ExcelAccountExportPO>> excelResultMap = SalaryEntityUtil.group2Map(excelAccountExportPOS, ExcelAccountExportPO::getEmployeeId);
 //        Map<String, List<AccountExportPO>> acctResultMap = SalaryEntityUtil.group2Map(accountExportPOS, AccountExportPO::getWorkcode);
 
         List<TaxAgentPO> paymentList = MapperProxyFactory.getProxy(TaxAgentMapper.class).listAll();
@@ -172,7 +172,7 @@ public class InsuranceComparisonResultBO {
             map.put("otherSchemeName", schemeIdNameMap.get(accountExportPO.getOtherSchemeId()));
 
             //线下值
-            List<ExcelAccountExportPO> excelResultValueList = excelResultMap.get(accountExportPO.getWorkcode());
+            List<ExcelAccountExportPO> excelResultValueList = excelResultMap.get(accountExportPO.getEmployeeId());
             ExcelAccountExportPO excelAccountExportPO = new ExcelAccountExportPO();
             if (excelResultValueList != null && excelResultValueList.size() == 1) {
                 excelAccountExportPO = excelResultValueList.get(0);

src/com/engine/salary/mapper/datacollection/EmployMapper.xml

@@ -233,8 +233,10 @@
                e.mobile           as mobile,
                e.subcompanyid1    as subcompanyid,
                e.departmentid     as departmentId,
+               d.DEPARTMENTNAME   as departmentName,
                e.jobtitle         as jobtitleId
         from hrmresource e
+        left join hrmdepartment d on e.departmentid = d.id
         where e.status not in (7)
           and (e.accounttype is null or e.accounttype = 0)
     </select>

src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml

@@ -743,7 +743,7 @@
 
 
     <!-- 更新不为NULL的字段 -->
-    <update id="updateIgnoreNull" parameterType="com.engine.salary.entity.salaryitem.po.SalaryItemPO">
+    <update id="updateIgnoreNull" parameterType="com.engine.salary.entity.salaryBill.po.SalarySendInfoPO">
         UPDATE hrsa_salary_send_info
         <set>
             <if test="salarySendId != null">
@@ -752,9 +752,6 @@
             <if test="salaryMonth != null">
                 salary_month=#{salaryMonth},
             </if>
-            <if test="useType != null">
-                use_type=#{useType},
-            </if>
             <if test="salaryAcctRecordId != null">
                 salary_acct_record_id=#{salaryAcctRecordId},
             </if>

src/com/engine/salary/mapper/taxagent/TaxAgentEmpMapper.xml

@@ -80,7 +80,12 @@
             AND update_time = #{updateTime}
         </if>
         <if test="employeeType != null">
-            AND employee_type = #{employeeType}
+          <if test="employeeType == 0">
+              AND (employee_type = #{employeeType} or employee_type is null)
+          </if>
+          <if test="employeeType != 0">
+              AND employee_type = #{employeeType}
+          </if>
         </if>
         <if test="taxAgentIds != null and taxAgentIds.size()>0">
             AND tax_agent_id IN

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

@@ -2381,7 +2381,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                 getExcelInsuranceDetailMapper().batchDelByIds(idList);
             }
             //新增
-            getExcelInsuranceDetailMapper().batchSave(addCompareList);
+            List<List<ExcelInsuranceDetailPO>> partition = Lists.partition((List<ExcelInsuranceDetailPO>) addCompareList, 20);
+            partition.forEach(getExcelInsuranceDetailMapper()::batchSave);
+
+//            getExcelInsuranceDetailMapper().batchSave(addCompareList);
 
             apidatas.put("successCount", successCount);
             apidatas.put("errorCount", failCount);

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

@@ -72,13 +72,13 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
     public List<DataCollectionEmployee> listAll(UseEmployeeTypeEnum empType) {
         List<DataCollectionEmployee> result = new ArrayList<>();
         if (empType == UseEmployeeTypeEnum.ORG) {
-            result = employBiz.listEmployee();
+            result = employBiz.listAll();
         }
         if (empType == UseEmployeeTypeEnum.EXT) {
             result = getExtEmpService(user).listEmployee();
         }
         if (empType == UseEmployeeTypeEnum.ALL) {
-            result.addAll(employBiz.listEmployee());
+            result.addAll(employBiz.listAll());
             result.addAll(getExtEmpService(user).listEmployee());
         }
         return result;

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

@@ -138,6 +138,8 @@ public class SalaryFormulaServiceImpl extends Service implements SalaryFormulaSe
         param.setFormula(param.getFormula().replaceAll("ＥＸＩＳＴＳ", "EXISTS"));
         param.setFormula(param.getFormula().replaceAll("ｂｅｔｗｅｅｎ", "between"));
         param.setFormula(param.getFormula().replaceAll("ＢＥＴＷＥＥＮ", "BETWEEN"));
+        param.setFormula(param.getFormula().replaceAll("ｕｎｉｏｎ", "union"));
+        param.setFormula(param.getFormula().replaceAll("ＵＮＩＯＮ", "UNION"));
 
         // 解析公式中的参数
         if (ReferenceTypeEnum.parseByValue(param.getReferenceType()) == ReferenceTypeEnum.FORMULA) {