Commit 194b049f authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/develop' into develop

parents c163d78d 8ae61757
......@@ -140,6 +140,7 @@ public class EKPUtil {
public static TInsuranceSettlePushParam InsuranceDetail2PushParam(EKPInteractiveParam param){
String format = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
TInsuranceSettlePushParam pushParam = new TInsuranceSettlePushParam();
param.setHappenDate(format);
//ekpId
if(null != param.getId() && null != param.getDefaultSettleId()){
pushParam.setFd_3afa8a70006bea(param.getId()+CommonConstants.DOWN_LINE_STRING+param.getDefaultSettleId());
......@@ -181,7 +182,7 @@ public class EKPUtil {
pushParam.setFd_3adfe7a2688902(CommonConstants.EMPTY_STRING);
}
//发生日期
pushParam.setFd_3adfe67c24dace(format);
pushParam.setFd_3adfe67c24dace(param.getHappenDate());
//姓名
pushParam.setFd_3adfe65d759650(param.getEmpName());
if(null != param.getEmpName()){
......
......@@ -85,7 +85,7 @@ public class EKPInteractiveParam implements Serializable {
* 发生日期
*/
@Schema(description = "发生日期")
private Date happenDate;
private String happenDate;
/**
* 保单编号
......@@ -156,7 +156,7 @@ public class EKPInteractiveParam implements Serializable {
/**
* 单据状态
*/
@Schema(description = "状态:1新增结算单,2更新保单信息,3作废结算信息")
@Schema(description = "状态:1新增结算单,2更新结算单信息,3作废结算单信息")
private Integer interactiveType;
}
......@@ -41,7 +41,7 @@ public class TDispatchInfoExportVo {
@ExcelAttribute(name = "申请编码", maxLength = 30)
@Schema(description = "申请编码")
@ExcelProperty("申请编码")
private String dispatchCode;
private String applyNo;
@ExcelAttribute(name = "员工编码", maxLength = 30)
@Schema(description = "员工编码")
......@@ -103,8 +103,8 @@ public class TDispatchInfoExportVo {
@ExcelProperty("公积金户")
private String providentHouseholdName;
@ExcelAttribute(name = "审核状态", readConverterExp = "1=待审核,2=审核通过,3=审核不通过")
@Schema(description = "审核状态:1待审核2审核通过3审核不通过")
@ExcelAttribute(name = "审核状态", readConverterExp = "1=待审核,2=审核通过,3=审核不通过,4=已办结")
@Schema(description = "审核状态:1待审核2审核通过3审核不通过4已办结")
@ExcelProperty("审核状态")
private String status;
......
......@@ -103,7 +103,7 @@
<!-- 派单导出vo -->
<resultMap id="exportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo">
<id property="id" column="ID"/>
<result property="dispatchCode" column="DISPATCH_CODE"/>
<result property="applyNo" column="APPLY_NO"/>
<result property="empNo" column="EMP_NO"/>
<result property="empName" column="EMP_NAME"/>
<result property="empIdcard" column="EMP_IDCARD"/>
......@@ -436,7 +436,7 @@
<select id="exportDispatch" resultMap="exportMap">
select
a.ID,
a.DISPATCH_CODE,
a.APPLY_NO,
a.EMP_NO,
a.EMP_NAME,
a.EMP_IDCARD,
......
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