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

1、核算接口代理 

2、获取异常真实信息
This commit is contained in:
钱涛 2022-08-01 14:15:09 +08:00
parent 3f4c6954d1
commit a252d055ab
6 changed files with 90 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resource/sql/公式修改.sql
View File

@ -1 +1,3 @@
update hrsa_formula set formula = 'if({薪资项目.当前累计应纳税所得额}<=36000){0;}else if({薪资项目.当前累计应纳税所得额}<=144000){2520;}else if({薪资项目.当前累计应纳税所得额}<=300000){16920;}else if({薪资项目.当前累计应纳税所得额}<=420000){31920;}else if({薪资项目.当前累计应纳税所得额}<=660000){52920;}else if({薪资项目.当前累计应纳税所得额}<=960000){85920;}else{181920;}' where id = 1651742702735
update hrsa_formula set formula = 'if({薪资项目.当前累计应纳税所得额}<=36000){0;}else if({薪资项目.当前累计应纳税所得额}<=144000){2520;}else if({薪资项目.当前累计应纳税所得额}<=300000){16920;}else if({薪资项目.当前累计应纳税所得额}<=420000){31920;}else if({薪资项目.当前累计应纳税所得额}<=660000){52920;}else if({薪资项目.当前累计应纳税所得额}<=960000){85920;}else{181920;}' where id = 1651742702735 ;
update hrsa_formula set formulaRunScript = 'if(salaryItem_addUpTaxableIncome<=36000){0;}else if(salaryItem_addUpTaxableIncome<=144000){2520;}else if(salaryItem_addUpTaxableIncome<=300000){16920;}else if(salaryItem_addUpTaxableIncome<=420000){31920;}else if(salaryItem_addUpTaxableIncome<=660000){52920;}else if(salaryItem_addUpTaxableIncome<=960000){85920;}else{181920;}' where id = 1651742702735 ;

2
src/CI.java
View File

@ -2,7 +2,7 @@ import java.io.*;
import java.time.LocalDate;
/**
* 怀恋Jenkins的第365天
* 怀念Jenkins的第365天
* <p>Copyright: Copyright (c) 2022</p>
* <p>Company: 泛微软件</p>
*

17
src/com/engine/salary/exception/ExceptionUtil.java Normal file
View File

@ -0,0 +1,17 @@
package com.engine.salary.exception;
public class ExceptionUtil {
public static String getRealMessage(Throwable e) {
while (e != null) {
Throwable cause = e.getCause();
if (cause == null) {
return e.getMessage();
}
e = cause;
}
return "";
}
}

4
src/com/engine/salary/util/ResponseResult.java
View File

@ -6,6 +6,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
import com.engine.common.service.HrmCommonService;
import com.engine.common.service.impl.HrmCommonServiceImpl;
import com.engine.core.exception.ECException;
import com.engine.salary.exception.ExceptionUtil;
import com.engine.salary.exception.SalaryRunTimeException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@ -80,8 +81,7 @@ public class ResponseResult<T, R> {
return Error(e.getMessage());
} catch (ECException e) {
log.error("salary api run fail", e);
Throwable cause = e.getCause();
return Error(cause.getMessage());
return Error(ExceptionUtil.getRealMessage(e));
} catch (Exception e) {
log.error("salary api run fail", e);
return Error("系统异常!", e);

25
src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
View File

@ -24,6 +24,7 @@ import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.wrapper.proxy.SalaryAcctRecordWrapperProxy;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.hrm.User;
@ -39,22 +40,22 @@ import java.util.stream.Collectors;
* @author qiantao
* @version 1.0
**/
public class SalaryAcctRecordWrapper extends Service {
public class SalaryAcctRecordWrapper extends Service implements SalaryAcctRecordWrapperProxy {
private SalaryAcctRecordService getSalaryAcctRecordService(User user) {
return (SalaryAcctRecordService) ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user);
return ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user);
}
private SalarySobService getSalarySobService(User user) {
return (SalarySobService) ServiceUtil.getService(SalarySobServiceImpl.class, user);
return ServiceUtil.getService(SalarySobServiceImpl.class, user);
}
private SalaryAcctEmployeeService getSalaryAcctEmployeeService(User user) {
return (SalaryAcctEmployeeService) ServiceUtil.getService(SalaryAcctEmployeeServiceImpl.class, user);
return ServiceUtil.getService(SalaryAcctEmployeeServiceImpl.class, user);
}
// private ComInfoCache comInfoCache;
public PageInfo listPage(SalaryAcctRecordQueryParam queryParam) {
public PageInfo<SalaryAcctRecordListDTO> listPage(SalaryAcctRecordQueryParam queryParam) {
EmployBiz employBiz = new EmployBiz();
// 查询薪资核算记录（分页）
PageInfo<SalaryAcctRecordPO> page = getSalaryAcctRecordService(user).listPageByParam(queryParam);
@ -103,16 +104,16 @@ public class SalaryAcctRecordWrapper extends Service {
* @param id 薪资核算记录id
* @return
*/
public Map<String,Object> getForm(Long id) {
public Map<String, Object> getForm(Long id) {
SalaryAcctRecordFormDTO formDTO = new SalaryAcctRecordFormDTO();
// 查询所有启用的薪资账套
List<SalarySobPO> salarySobPOS = getSalarySobService(user).listByDisable(NumberUtils.INTEGER_ZERO);
// 薪资核算详情表单中"薪资账套"的下拉选择项
List<Map<String, Object>> salarySobs = salarySobPOS.stream()
.map(salarySobPO -> {
Map<String,Object> map = new HashMap<>();
map.put("id",salarySobPO.getId());
map.put("name",salarySobPO.getName());
Map<String, Object> map = new HashMap<>();
map.put("id", salarySobPO.getId());
map.put("name", salarySobPO.getName());
return map;
})
.collect(Collectors.toList());
@ -136,9 +137,9 @@ public class SalaryAcctRecordWrapper extends Service {
.setDescription(salaryAcctRecordPO.getDescription());
}
// 转换成前端所需的数据格式
Map<String,Object> result = new HashMap<>();
result.put("formDTO",formDTO);
result.put("salarySobs",salarySobs);
Map<String, Object> result = new HashMap<>();
result.put("formDTO", formDTO);
result.put("salarySobs", salarySobs);
return result;
}

54
src/com/engine/salary/wrapper/proxy/SalaryAcctRecordWrapperProxy.java Normal file
View File

@ -0,0 +1,54 @@
package com.engine.salary.wrapper.proxy;
import com.engine.salary.entity.salaryacct.dto.SalaryAcctRecordListDTO;
import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordQueryParam;
import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordSaveParam;
import com.engine.salary.util.page.PageInfo;
import java.util.Collection;
import java.util.Map;
public interface SalaryAcctRecordWrapperProxy {
/**
* 分页列表
*/
PageInfo<SalaryAcctRecordListDTO> listPage(SalaryAcctRecordQueryParam queryParam);
/**
* 薪资核算记录详情
*
* @param id 薪资核算记录id
*/
Map<String, Object> getForm(Long id);
/**
* 保存
*
* @param saveParam 保存参数
*/
Long save(SalaryAcctRecordSaveParam saveParam);
/**
* 删除
*
* @param ids 薪资核算记录的id
*/
void delete(Collection<Long> ids);
/**
* 归档
*
* @param id 薪资核算记录的id
*/
void file(Long id);
/**
* 重新核算
*
* @param id 薪资核算记录的id
*/
void reCalculate(Long id);
}