收入优化

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParam.java

@@ -13,6 +13,10 @@ import java.io.Serializable;
 @Data
 public class EkpSalaryParam implements Serializable {
 
+	/**
+	 * 工资id
+	 **/
+	private String fd_3b10af838eab5c;
 	/**
 	 * 项目编码
 	 **/

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParamVo.java

-package com.yifu.cloud.plus.v1.yifu.ekp.vo;
-
-import lombok.Data;
-
-/**
- * @Author fxj
- * @Date 2022/8/22
- * @Description 薪资明细对应参数
- * @Version 1.0
- */
-@Data
-public class EkpSalaryParamVo extends EkpSalaryParam {
-	/**
-	 * 报账表id
-	**/
-	private String salaryAccountId;
-}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java

@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.AccountCheckVo;
@@ -40,6 +40,7 @@ import java.util.List;
 public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
 	/**
 	 * 工资报账主表（工资条）简单分页查询
+	 *
 	 * @param tSalaryAccount 工资报账主表（工资条）
 	 * @return
 	 */
@@ -49,14 +50,14 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
 	 * @param settleId
 	 * @param settleMonth
 	 * @Description: 版本2.6.6判重：对同一“结算主体”、同一“结算月份”、同一“报表类型”、同一“工资月份”、同一“身份证号”、同一“应发金额”进行校验
-	 *
+	 * <p>
 	 * 校验导入数据重复的Map格式：# 身份证号_工资月份_报表类型_应发金额
-	 *
 	 * @Author: hgw
 	 * @Date: 2021/9/17 18:06
 	 * @return: java.util.List<java.lang.String>
 	 **/
 	List<AccountCheckVo> getAccountCheckList(@Param("settleId") String settleId, @Param("settleMonth") String settleMonth);
+
 	List<AccountCheckVo> getAccountSpecialList(@Param("invoiceTitle") String invoiceTitle, @Param("unitId") String unitId, @Param("salaryMonth") String salaryMonth);
 
 	List<AccountCheckVo> getAccountCheckListLabor(@Param("settleId") String settleId, @Param("settleMonth") String settleMonth);
@@ -72,15 +73,15 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
 	String getMinTaxMonthByNowYear(@Param("empIdCard") String empIdCard, @Param("nowYear") int nowYear);
 
 	/**
+	 * @return
 	 * @Author fxj
 	 * @Description 获取有工资无社保数据
 	 * @Date 17:23 2022/8/16
 	 * @Param
-	 * @return
 	 **/
-	List<THaveSalaryNosocial> getLastMonthTHaveSalaryNosocial(@Param("month")String month,
-															  @Param("month2")String month2,
-															  @Param("month3")String month3);
+	List<THaveSalaryNosocial> getLastMonthTHaveSalaryNosocial(@Param("month") String month,
+															  @Param("month2") String month2,
+															  @Param("month3") String month3);
 
 	/**
 	 * @Description: 薪资类型互斥校验 获取本年度身份证号列表
@@ -97,10 +98,10 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
 	 * @Date: 2022/8/29 16:52
 	 * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam>
 	 **/
-	List<EkpSalaryParamVo> getEkpSalaryParamList(@Param("salaryId") String salaryId);
+	List<EkpSalaryParam> getEkpSalaryParamList(@Param("salaryId") String salaryId);
 
 	List<TSalaryAccount> noPageDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo,
-								   @Param("idList")List<String> idList);
+								   @Param("idList") List<String> idList);
 
 	/**
 	 * @Description: 根据工资id，返回报账明细（字段较少且有计算，其他地方勿用）
@@ -111,5 +112,5 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
 	List<TSalaryAccount> getListByIncome(@Param("salaryId") String salaryId);
 
 	int noPageCountDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo,
-						@Param("idList")List<String> idList);
+					   @Param("idList") List<String> idList);
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryAccountService.java

@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountSearchVo;
@@ -104,5 +104,5 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> {
 	 * @Date: 2022/8/29 16:54
 	 * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam>
 	 **/
-	List<EkpSalaryParamVo> getEkpSalaryParamList(String salaryId);
+	List<EkpSalaryParam> getEkpSalaryParamList(String salaryId);
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java

@@ -26,7 +26,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
-import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryAccountMapper;
@@ -212,7 +212,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
 	}
 
 	@Override
-	public List<EkpSalaryParamVo> getEkpSalaryParamList(String salaryId) {
+	public List<EkpSalaryParam> getEkpSalaryParamList(String salaryId) {
 		return baseMapper.getEkpSalaryParamList(salaryId);
 	}
 

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java

@@ -35,7 +35,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil;
 import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
-import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.MSalaryEstimate;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
@@ -51,7 +50,6 @@ import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
@@ -515,7 +513,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 			return R.failed("未找到工资表");
 		} else if (s.getStatus() == SalaryConstants.STATUS[2] || s.getStatus() == SalaryConstants.STATUS[10]) {
 			//报账表
-			List<EkpSalaryParamVo> ekpList = salaryAccountService.getEkpSalaryParamList(id);
+			List<EkpSalaryParam> ekpList = salaryAccountService.getEkpSalaryParamList(id);
 			YifuUser user = SecurityUtils.getUser();
 			if (user != null && ekpList != null && !ekpList.isEmpty()) {
 				boolean sendStatus = true;
@@ -524,13 +522,10 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 				TSalaryAccount account;
 				Date sendTime = new Date();
 				String nowMonth = DateUtil.addMonth(0);
-				EkpSalaryParam sendParam;
-				for (EkpSalaryParamVo sendParamVo : ekpList) {
+				for (EkpSalaryParam sendParam : ekpList) {
 					// 转化报账表的参数
 					account = new TSalaryAccount();
-					account.setId(sendParamVo.getSalaryAccountId());
-					sendParam = new EkpSalaryParam();
-					BeanUtils.copyProperties(sendParamVo, sendParam);
+					account.setId(sendParam.getFd_3b10af838eab5c());
 					sendBack = ekpSalaryUtil.sendToEKP(sendParam);
 					account.setSendTime(sendTime);
 					account.setSendUser(user.getId());

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -81,8 +81,8 @@
   </resultMap>
 
 	<!-- 对接EKP的参数 -->
-	<resultMap id="ekpSalaryParamVoMap" type="com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo">
-		<id property="salaryAccountId" column="id"/>
+	<resultMap id="ekpSalaryParamVoMap" type="com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam">
+		<result property="fd_3b10af838eab5c" column="fd_3b10af838eab5c"/>
 		<result property="fd_3adfedf98ccba2" column="fd_3adfedf98ccba2"/>
 		<result property="fd_3adfedf9d2bf1c" column="fd_3adfedf9d2bf1c"/>
 		<result property="fd_3adfedfacd65d6" column="fd_3adfedfacd65d6"/>
@@ -444,7 +444,7 @@
 	<!-- 获取薪资明细 -->
 	<select id="getEkpSalaryParamList" resultMap="ekpSalaryParamVoMap">
 		select
-			a.id
+			ifnull(a.id,'') fd_3b10af838eab5c
 			 ,ifnull(a.DEPT_NO,'') fd_3adfedf98ccba2
 			 ,ifnull(a.DEPT_NAME,'') fd_3adfedf9d2bf1c
 			 ,'' fd_3adfedfa4410aa