Commit 915781dd authored by huyuchen's avatar huyuchen

huych-社保自动化相关提交

parent 9b918911
...@@ -52,7 +52,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSalaryProperties; ...@@ -52,7 +52,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSalaryProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil; 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.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
import com.yifu.cloud.plus.v1.yifu.salary.vo.ListStringVo; import com.yifu.cloud.plus.v1.yifu.salary.vo.ListStringVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TBankNameMapVo; import com.yifu.cloud.plus.v1.yifu.salary.vo.TBankNameMapVo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
......
...@@ -58,11 +58,11 @@ public class UnSocialFundInfoVo implements Serializable { ...@@ -58,11 +58,11 @@ public class UnSocialFundInfoVo implements Serializable {
/** /**
* 派单人姓名 * 派单人姓名
*/ */
private String createName; private String dispatchName;
/** /**
* 创建时间 * 创建时间
*/ */
private String createTime; private String dispatchTime;
} }
...@@ -277,8 +277,8 @@ ...@@ -277,8 +277,8 @@
<result property="socialStatus" column="SOCIAL_STATUS"/> <result property="socialStatus" column="SOCIAL_STATUS"/>
<result property="deptNo" column="SETTLE_DOMAIN_CODE"/> <result property="deptNo" column="SETTLE_DOMAIN_CODE"/>
<result property="deptName" column="SETTLE_DOMAIN_NAME"/> <result property="deptName" column="SETTLE_DOMAIN_NAME"/>
<result property="createName" column="CREATE_NAME"/> <result property="dispatchName" column="dispatchName"/>
<result property="createTime" column="CREATE_TIME"/> <result property="dispatchTime" column="dispatchTime"/>
<result property="socialProvince" column="SOCIAL_PROVINCE"/> <result property="socialProvince" column="SOCIAL_PROVINCE"/>
<result property="socialCity" column="SOCIAL_CITY"/> <result property="socialCity" column="SOCIAL_CITY"/>
<result property="socialTown" column="SOCIAL_TOWN"/> <result property="socialTown" column="SOCIAL_TOWN"/>
...@@ -1227,8 +1227,8 @@ ...@@ -1227,8 +1227,8 @@
a.SOCIAL_PROVINCE, a.SOCIAL_PROVINCE,
a.SOCIAL_CITY, a.SOCIAL_CITY,
a.SOCIAL_TOWN, a.SOCIAL_TOWN,
d.CREATE_NAME, d.CREATE_NAME as dispatchName,
DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as CREATE_TIME DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as dispatchTime
FROM t_social_fund_info a FROM t_social_fund_info a
inner join t_dispatch_info d on a.DISPATCH_ID = d.ID inner join t_dispatch_info d on a.DISPATCH_ID = d.ID
where a.EMP_IDCARD = #{empIdcard} where a.EMP_IDCARD = #{empIdcard}
......
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