Commit 9b418409 authored by 李灿灿's avatar 李灿灿

Merge branch 'develop' into feature-licancan

parents 75b53785 60c6006d
...@@ -64,9 +64,9 @@ public class EmpContractDispatchVo implements Serializable { ...@@ -64,9 +64,9 @@ public class EmpContractDispatchVo implements Serializable {
/** /**
* 员工类型 * 员工类型
*/ */
@ExcelAttribute(name = "员工类型", errorInfo = "员工类型不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.PERSONNEL_TYPE) @ExcelAttribute(name = "员工类型", errorInfo = "员工类型不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
@TableField(exist = false) @TableField(exist = false)
private String empType; private String empNatrue;
/** /**
* 项目编码 * 项目编码
*/ */
......
...@@ -142,6 +142,9 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert ...@@ -142,6 +142,9 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
wrapper.in(TCertRecord::getId,idList); wrapper.in(TCertRecord::getId,idList);
} }
if (Common.isNotNull(searchVo.getAuthSql())) { if (Common.isNotNull(searchVo.getAuthSql())) {
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains("a.")) {
searchVo.setAuthSql(searchVo.getAuthSql().replace("a.", " "));
}
wrapper.last(searchVo.getAuthSql()); wrapper.last(searchVo.getAuthSql());
} }
return baseMapper.selectList(wrapper); return baseMapper.selectList(wrapper);
......
...@@ -82,6 +82,9 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM ...@@ -82,6 +82,9 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
} }
wrapper.ne(TEmpContractAlert::getId,CommonConstants.ZERO_STRING); wrapper.ne(TEmpContractAlert::getId,CommonConstants.ZERO_STRING);
if (Common.isNotNull(searchVo.getAuthSql())) { if (Common.isNotNull(searchVo.getAuthSql())) {
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains("a.")) {
searchVo.setAuthSql(searchVo.getAuthSql().replace("a.", " "));
}
wrapper.last(searchVo.getAuthSql()); wrapper.last(searchVo.getAuthSql());
} }
return baseMapper.selectList(wrapper); return baseMapper.selectList(wrapper);
...@@ -94,6 +97,9 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM ...@@ -94,6 +97,9 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
wrapper.in(TEmpContractAlert::getId,idList); wrapper.in(TEmpContractAlert::getId,idList);
} }
if (Common.isNotNull(searchVo.getAuthSql())) { if (Common.isNotNull(searchVo.getAuthSql())) {
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains("a.")) {
searchVo.setAuthSql(searchVo.getAuthSql().replace("a.", " "));
}
wrapper.last(searchVo.getAuthSql()); wrapper.last(searchVo.getAuthSql());
} }
if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() >= 0){ if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() >= 0){
......
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
a.AUDIT_TIME_LAST, a.AUDIT_TIME_LAST,
a.TYPE, a.TYPE,
a.LEAVE_DATE, a.LEAVE_DATE,
a.REDUCE_REASON a.REDUCE_REASON,a.type
</sql> </sql>
......
...@@ -187,6 +187,27 @@ public class ExcelUtil <T> implements Serializable { ...@@ -187,6 +187,27 @@ public class ExcelUtil <T> implements Serializable {
} }
return tempValue; return tempValue;
} }
/**
* @Author fxj
* @Description 单独转义字典值
* @Date 15:26 2022/11/8
* @Param
* @return
**/
public static String getDicValueByDataType(String value, String dataType){
String tempStr = null;
Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue()
.get(CacheConstants.DICT_DETAILS
+ CommonConstants.COLON_STRING
+ dataType);
for (Map.Entry<String,String> entry:dicObj.entrySet()){
if (Common.isNotNull(entry.getValue()) && entry.getValue().equals(value.trim())){
tempStr = entry.getKey();
break;
}
}
return tempStr;
}
/** /**
* 返回传参对应的fileds * 返回传参对应的fileds
* *
......
...@@ -67,18 +67,16 @@ public class EkpSalaryUtil { ...@@ -67,18 +67,16 @@ public class EkpSalaryUtil {
} }
// 推送主表到ekp // 推送主表到ekp
public String sendStandardToEKP(EkpSalaryStandardParam param){ public String sendStandardToEKP(String loginName, EkpSalaryStandardParam param){
log.info("推送EKP开始--薪资主表数据"); log.info("推送EKP开始--薪资主表数据");
RestTemplate yourRestTemplate = new RestTemplate(); RestTemplate yourRestTemplate = new RestTemplate();
try{ try{
//指向EKP的接口url //指向EKP的接口url
//把ModelingAppModelParameterAddForm转换成MultiValueMap //把ModelingAppModelParameterAddForm转换成MultiValueMap
JSONObject loginName = new JSONObject();
String formValues = new ObjectMapper().writeValueAsString(param); String formValues = new ObjectMapper().writeValueAsString(param);
loginName.append("LoginName",ekpProperties.getLoginName());
MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>(); MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
wholeForm.add("docSubject",ekpProperties.getDocSubject()); wholeForm.add("docSubject",ekpProperties.getDocSubject());
wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}"); wholeForm.add("docCreator", "{\"LoginName\":\"" + loginName+ "\"}");
wholeForm.add("docStatus", ekpProperties.getDocStatus()); wholeForm.add("docStatus", ekpProperties.getDocStatus());
wholeForm.add("formValues", formValues); wholeForm.add("formValues", formValues);
wholeForm.add("fdModelId", ekpProperties.getStandardFdModelId()); wholeForm.add("fdModelId", ekpProperties.getStandardFdModelId());
...@@ -106,17 +104,15 @@ public class EkpSalaryUtil { ...@@ -106,17 +104,15 @@ public class EkpSalaryUtil {
} }
// 退表到ekp // 退表到ekp
public String backStandardToEKP(EkpSalaryBackParam param){ public String backStandardToEKP(String loginName, EkpSalaryBackParam param){
log.info("推送EKP开始--薪资退表"); log.info("推送EKP开始--薪资退表");
RestTemplate yourRestTemplate = new RestTemplate(); RestTemplate yourRestTemplate = new RestTemplate();
try{ try{
//指向EKP的接口url //指向EKP的接口url
//把ModelingAppModelParameterAddForm转换成MultiValueMap //把ModelingAppModelParameterAddForm转换成MultiValueMap
JSONObject loginName = new JSONObject();
loginName.append("LoginName",ekpProperties.getLoginName());
MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>(); MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
wholeForm.add("docSubject",ekpProperties.getDocSubject()); wholeForm.add("docSubject",ekpProperties.getDocSubject());
wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}"); wholeForm.add("docCreator", "{\"LoginName\":\"" + loginName+ "\"}");
wholeForm.add("docStatus", ekpProperties.getDocStatus()); wholeForm.add("docStatus", ekpProperties.getDocStatus());
String formValues = new ObjectMapper().writeValueAsString(param); String formValues = new ObjectMapper().writeValueAsString(param);
wholeForm.add("formValues", formValues); wholeForm.add("formValues", formValues);
......
income.url=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel #income.url=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
income.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
income.fdModelIdManage=181d76db26e419a88dba97b0c406689e income.fdModelIdManage=181d76db26e419a88dba97b0c406689e
income.fdFlowIdManage=182d3b6e522b2690119e70d4ff082136 income.fdFlowIdManage=182d3b6e522b2690119e70d4ff082136
income.fdModelIdRisk=181d76db26e4112e14b9bb4274d06ba1 income.fdModelIdRisk=181d76db26e4112e14b9bb4274d06ba1
......
...@@ -26,7 +26,7 @@ public class TSalaryStandardExportVo implements Serializable { ...@@ -26,7 +26,7 @@ public class TSalaryStandardExportVo implements Serializable {
/** /**
* 状态0待提交 1待审核 2审核通过 3发送成功 5审核不通过 10 发送失败 * 状态0待提交 1待审核 2审核通过 3发送成功 5审核不通过 10 发送失败
*/ */
@ExcelAttribute(name = "状态", isDataId = true, readConverterExp = "0=待提交,1=待审核,2=审核通过,3=发送成功,5=审核不通过,10=发送失败") @ExcelAttribute(name = "状态", isDataId = true, readConverterExp = "0=待提交,1=待审核,2=审核通过,3=发送成功,5=审核不通过,6=确认不通过,10=发送失败")
@NotBlank(message = "状态(0待提交 1待审核 2审核通过 3发送成功 5审核不通过 10 发送失败)不能为空") @NotBlank(message = "状态(0待提交 1待审核 2审核通过 3发送成功 5审核不通过 10 发送失败)不能为空")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("薪酬状态") @ExcelProperty("薪酬状态")
...@@ -57,6 +57,12 @@ public class TSalaryStandardExportVo implements Serializable { ...@@ -57,6 +57,12 @@ public class TSalaryStandardExportVo implements Serializable {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("项目编码") @ExcelProperty("项目编码")
private String deptNo; private String deptNo;
@ExcelAttribute(name = "申请编码", maxLength = 32)
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("申请编码")
private String applyNo;
/** /**
* 项目金额 * 项目金额
*/ */
......
...@@ -184,6 +184,7 @@ public class TSalaryStandardController { ...@@ -184,6 +184,7 @@ public class TSalaryStandardController {
return R.failed("未找到工资表"); return R.failed("未找到工资表");
} else if (s.getStatus() == SalaryConstants.STATUS[0] } else if (s.getStatus() == SalaryConstants.STATUS[0]
|| s.getStatus() == SalaryConstants.STATUS[5] || s.getStatus() == SalaryConstants.STATUS[5]
|| s.getStatus() == SalaryConstants.STATUS[6]
|| s.getStatus() == SalaryConstants.STATUS[7]) { || s.getStatus() == SalaryConstants.STATUS[7]) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (user != null) { if (user != null) {
......
...@@ -120,4 +120,13 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> { ...@@ -120,4 +120,13 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
int noPageCountDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo, int noPageCountDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo,
@Param("idList") List<String> idList); @Param("idList") List<String> idList);
/**
* @param salaryId 工资表id
* @Description: 退表回退状态
* @Author: hgw
* @Date: 2022/11/8 15:41
* @return: void
**/
void backSalaryBySalaryId(@Param("salaryId") String salaryId);
} }
...@@ -114,4 +114,13 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> { ...@@ -114,4 +114,13 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> {
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam> * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam>
**/ **/
List<EkpSalaryParamVo> getEkpSalaryParamList(String salaryId); List<EkpSalaryParamVo> getEkpSalaryParamList(String salaryId);
/**
* @param salaryId 工资表id
* @Description: 退表回退状态
* @Author: hgw
* @Date: 2022/11/8 15:41
* @return: void
**/
void backSalaryBySalaryId(String salaryId);
} }
...@@ -229,4 +229,9 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper, ...@@ -229,4 +229,9 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
return baseMapper.getEkpSalaryParamList(salaryId); return baseMapper.getEkpSalaryParamList(salaryId);
} }
@Override
public void backSalaryBySalaryId(String salaryId) {
baseMapper.backSalaryBySalaryId(salaryId);
}
} }
...@@ -167,6 +167,9 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -167,6 +167,9 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
wrapper.in(TSalaryEmployee::getId, idList); wrapper.in(TSalaryEmployee::getId, idList);
} }
if (Common.isNotNull(searchVo.getAuthSql())) { if (Common.isNotNull(searchVo.getAuthSql())) {
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains("a.")) {
searchVo.setAuthSql(searchVo.getAuthSql().replace("a.", " "));
}
wrapper.last(searchVo.getAuthSql()); wrapper.last(searchVo.getAuthSql());
} }
return baseMapper.selectCount(wrapper); return baseMapper.selectCount(wrapper);
......
...@@ -575,7 +575,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -575,7 +575,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
error.setType(CommonConstants.ONE_STRING); error.setType(CommonConstants.ONE_STRING);
error.setCreateUserName(s.getCreateName()); error.setCreateUserName(s.getCreateName());
error.setLinkId(account.getId()); error.setLinkId(account.getId());
error.setTitle(sendBack); error.setTitle(sendBack == null ? SalaryConstants.EKP_NO_RETURN : sendBack);
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId() HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN); , "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);
...@@ -594,9 +594,15 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -594,9 +594,15 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
standardParam.setFd_3b3d3ec85bfeb0(s.getSalaryMonth().substring(0,4) standardParam.setFd_3b3d3ec85bfeb0(s.getSalaryMonth().substring(0,4)
+ CommonConstants.CENTER_SPLIT_LINE_STRING + s.getSalaryMonth().substring(4,6)); + CommonConstants.CENTER_SPLIT_LINE_STRING + s.getSalaryMonth().substring(4,6));
// 推送主表信息 // 推送主表信息
sendBack = ekpSalaryUtil.sendStandardToEKP(standardParam); String loginName;
if (user != null) {
loginName = user.getUsername();
} else {
loginName = s.getCreateName();
}
sendBack = ekpSalaryUtil.sendStandardToEKP(loginName, standardParam);
if (Common.isEmpty(sendBack) || sendBack.length() != 32) { if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
sendBack = ekpSalaryUtil.sendStandardToEKP(standardParam); sendBack = ekpSalaryUtil.sendStandardToEKP(loginName, standardParam);
} }
s.setSendTime(new Date()); s.setSendTime(new Date());
s.setSendMonth(nowMonth); s.setSendMonth(nowMonth);
...@@ -789,7 +795,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -789,7 +795,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
error.setType(CommonConstants.ZERO_STRING); error.setType(CommonConstants.ZERO_STRING);
error.setCreateUserName(s.getCreateName()); error.setCreateUserName(s.getCreateName());
error.setLinkId(account.getFd_3b10af838eab5c()); error.setLinkId(account.getFd_3b10af838eab5c());
error.setTitle(sendBack); error.setTitle(sendBack == null ? SalaryConstants.EKP_NO_RETURN : sendBack);
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId() HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN); , "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);
...@@ -877,7 +883,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -877,7 +883,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
error.setType(CommonConstants.ZERO_STRING); error.setType(CommonConstants.ZERO_STRING);
error.setCreateUserName(s.getCreateName()); error.setCreateUserName(s.getCreateName());
error.setLinkId(account.getFd_3b10af838eab5c()); error.setLinkId(account.getFd_3b10af838eab5c());
error.setTitle(sendBack); error.setTitle(sendBack == null ? SalaryConstants.EKP_NO_RETURN : sendBack);
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId() HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN); , "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);
...@@ -901,22 +907,37 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -901,22 +907,37 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
param.setFd_3b3c293745e7b4(ss.getDeptName()); param.setFd_3b3c293745e7b4(ss.getDeptName());
param.setFd_3b3c2935c13056(ss.getDeptNo()); param.setFd_3b3c2935c13056(ss.getDeptNo());
param.setFd_3b3c293811c0ee(ss.getApplyNo()); param.setFd_3b3c293811c0ee(ss.getApplyNo());
String sendBack = ekpSalaryUtil.backStandardToEKP(param); YifuUser user = SecurityUtils.getUser();
String loginName;
if (user != null) {
loginName = user.getUsername();
} else {
loginName = ss.getCreateName();
}
String sendBack = ekpSalaryUtil.backStandardToEKP(loginName, param);
if (Common.isEmpty(sendBack) || sendBack.length() != 32) { if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
sendBack = ekpSalaryUtil.backStandardToEKP(param); sendBack = ekpSalaryUtil.backStandardToEKP(loginName, param);
} }
if (Common.isNotNull(sendBack) && sendBack.length() == 32) { if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
// 更新薪资为确认不通过 // 更新薪资为确认不通过
ss.setStatus(SalaryConstants.STATUS[6]); ss.setStatus(SalaryConstants.STATUS[6]);
ss.setSendMonth(null);
ss.setSendTime(null);
ss.setBackTime(new Date()); ss.setBackTime(new Date());
ss.setBackEkpId(sendBack); ss.setBackEkpId(sendBack);
this.updateById(ss); this.updateById(ss);
// 更新报账表
salaryAccountService.backSalaryBySalaryId(ss.getId());
TIncome income = new TIncome(); TIncome income = new TIncome();
income.setApplyNo(applyNo); income.setApplyNo(applyNo);
// 删除收入对应编号的明细 // 删除收入对应编号的明细
HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId() HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tincome/inner/deleteIncomeAndDetailByApplyNo", income , "/tincome/inner/deleteIncomeAndDetailByApplyNo", income
, Object.class, SecurityConstants.FROM_IN); , Object.class, SecurityConstants.FROM_IN);
// 添加流程进展明细
if (user != null) {
this.saveRecordLog(ss, user, CommonConstants.ZERO_STRING, "从EKP退表");
}
return R.ok(); return R.ok();
} else { } else {
TSendEkpError error = new TSendEkpError(); TSendEkpError error = new TSendEkpError();
...@@ -925,7 +946,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -925,7 +946,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
error.setType(CommonConstants.SEVEN_STRING); error.setType(CommonConstants.SEVEN_STRING);
error.setCreateUserName(ss.getCreateName()); error.setCreateUserName(ss.getCreateName());
error.setLinkId(ss.getId()); error.setLinkId(ss.getId());
error.setTitle(sendBack); error.setTitle(sendBack == null ? SalaryConstants.EKP_NO_RETURN : sendBack);
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId() HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN); , "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);
......
...@@ -174,4 +174,5 @@ public class SalaryConstants { ...@@ -174,4 +174,5 @@ public class SalaryConstants {
public static final String PROVINCE_ERROR = "开户行省错误!"; public static final String PROVINCE_ERROR = "开户行省错误!";
public static final String CITY_ERROR = "开户行市错误!"; public static final String CITY_ERROR = "开户行市错误!";
public static final String CUR_TAX_INFO = "当前项目薪酬人员已维护计税月份,计税月份沿用系统原值,其他字段已更新!"; public static final String CUR_TAX_INFO = "当前项目薪酬人员已维护计税月份,计税月份沿用系统原值,其他字段已更新!";
public static final String EKP_NO_RETURN = "推送EKP无结果返回";
} }
...@@ -838,4 +838,9 @@ ...@@ -838,4 +838,9 @@
</if> </if>
</if> </if>
</sql> </sql>
<!-- 退表回退状态 -->
<update id="backSalaryBySalaryId" >
update t_salary_account a set a.SEND_STATUS = '0' where a.SALARY_FORM_ID = #{salaryId}
</update>
</mapper> </mapper>
...@@ -332,6 +332,7 @@ ...@@ -332,6 +332,7 @@
<result property="sendMonth" column="SEND_MONTH"/> <result property="sendMonth" column="SEND_MONTH"/>
<result property="deptName" column="DEPT_NAME"/> <result property="deptName" column="DEPT_NAME"/>
<result property="deptNo" column="DEPT_NO"/> <result property="deptNo" column="DEPT_NO"/>
<result property="applyNo" column="APPLY_NO"/>
<result property="settlementAmount" column="SETTLEMENT_AMOUNT"/> <result property="settlementAmount" column="SETTLEMENT_AMOUNT"/>
<result property="invoiceTitle" column="INVOICE_TITLE"/> <result property="invoiceTitle" column="INVOICE_TITLE"/>
<result property="createName" column="CREATE_NAME"/> <result property="createName" column="CREATE_NAME"/>
...@@ -346,6 +347,7 @@ ...@@ -346,6 +347,7 @@
a.SEND_MONTH, a.SEND_MONTH,
a.DEPT_NAME, a.DEPT_NAME,
a.DEPT_NO, a.DEPT_NO,
a.APPLY_NO,
a.SETTLEMENT_AMOUNT, a.SETTLEMENT_AMOUNT,
a.ID, a.ID,
a.DEPT_ID, a.DEPT_ID,
...@@ -432,6 +434,9 @@ ...@@ -432,6 +434,9 @@
<if test="searchVo.deptNo != null and searchVo.deptNo.trim() != ''"> <if test="searchVo.deptNo != null and searchVo.deptNo.trim() != ''">
AND a.DEPT_NO = #{searchVo.deptNo} AND a.DEPT_NO = #{searchVo.deptNo}
</if> </if>
<if test="searchVo.applyNo != null and searchVo.applyNo.trim() != ''">
AND a.APPLY_NO like concat('%',#{searchVo.applyNo},'%')
</if>
<if test="searchVo.salaryMonth != null and searchVo.salaryMonth.trim() != ''"> <if test="searchVo.salaryMonth != null and searchVo.salaryMonth.trim() != ''">
AND a.SALARY_MONTH = #{searchVo.salaryMonth} AND a.SALARY_MONTH = #{searchVo.salaryMonth}
</if> </if>
......
...@@ -36,6 +36,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain; ...@@ -36,6 +36,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*; import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes; import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*; import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
...@@ -109,6 +110,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -109,6 +110,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private final TIncomeService incomeService; private final TIncomeService incomeService;
ExcelUtil<Object> excelUtil = new ExcelUtil<>(Object.class);
/** /**
* 派单信息记录表简单分页查询 * 派单信息记录表简单分页查询
* *
...@@ -1846,7 +1849,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1846,7 +1849,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
contract.setEmpId(empVo.getId()); contract.setEmpId(empVo.getId());
contract.setEmpNo(empVo.getEmpNo()); contract.setEmpNo(empVo.getEmpNo());
if (Common.isNotNull(empVo.getEmpNatrue())){ if (Common.isNotNull(empVo.getEmpNatrue())){
contract.setEmpType(empVo.getEmpNatrue()); contract.setEmpNatrue(empVo.getEmpNatrue());
} }
contract.setFileProvince(empVo.getFileProvince()); contract.setFileProvince(empVo.getFileProvince());
contract.setFileCity(empVo.getFileCity()); contract.setFileCity(empVo.getFileCity());
...@@ -1866,7 +1869,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1866,7 +1869,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
project.setCreateBy(user.getId()); project.setCreateBy(user.getId());
project.setCreateName(user.getNickname()); project.setCreateName(user.getNickname());
project.setDeptNo(excel.getSettleDomainCode()); project.setDeptNo(excel.getSettleDomainCode());
project.setContractType(excel.getContractName()); project.setContractType(excelUtil.getDicValueByDataType(excel.getContractName(), ExcelAttributeConstants.PERSONNEL_TYPE));
project.setEmpIdcard(excel.getEmpIdcard()); project.setEmpIdcard(excel.getEmpIdcard());
project.setEmpName(excel.getEmpName()); project.setEmpName(excel.getEmpName());
project.setEmpNatrue(excel.getEmpType()); project.setEmpNatrue(excel.getEmpType());
......
...@@ -388,12 +388,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -388,12 +388,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} }
} }
if (Common.isNotNull(socialCreateMonth)) { if (Common.isNotNull(socialCreateMonth)) {
wrapper.eq(TPaymentInfo::getSocialCreateMonth, socialCreateMonth).or() wrapper.and(wrapper2 -> wrapper2.eq(TPaymentInfo::getSocialCreateMonth, socialCreateMonth)
.eq(TPaymentInfo::getProvidentCreateMonth, socialCreateMonth); .or(wrapper1 -> wrapper1.eq(TPaymentInfo::getProvidentCreateMonth, socialCreateMonth)
));
} }
if (Common.isNotNull(socialPayMonth)) { if (Common.isNotNull(socialPayMonth)) {
wrapper.eq(TPaymentInfo::getSocialPayMonth, socialPayMonth).or() wrapper.and(wrapper2 -> wrapper2.eq(TPaymentInfo::getSocialPayMonth, socialPayMonth)
.eq(TPaymentInfo::getProvidentPayMonth, socialPayMonth); .or(wrapper1 -> wrapper1.eq(TPaymentInfo::getProvidentPayMonth, socialPayMonth)
));
} }
return wrapper; return wrapper;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment