Commit 28d41c21 authored by hongguangwu's avatar hongguangwu

MVP1.6.4-优化社保士兵

parent bb644f7e
...@@ -18,10 +18,14 @@ package com.yifu.cloud.plus.v1.yifu.social.vo; ...@@ -18,10 +18,14 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
/** /**
* 派单信息记录表 * 派单信息记录表
...@@ -50,4 +54,14 @@ public class TDispatchInfoPageVo extends TDispatchInfo { ...@@ -50,4 +54,14 @@ public class TDispatchInfoPageVo extends TDispatchInfo {
@ExcelProperty("公积金户名称" ) @ExcelProperty("公积金户名称" )
private String providentHouseholdName; private String providentHouseholdName;
// 社保办理页面查询使用,判断能否办理
@Schema(description = "养工失状态:(0空、1待办理、2自动办理中、3继续办理、4终止办理、5人工处理、6成功)" )
@ExcelProperty("养工失状态" )
@TableField(exist = false)
private String ygsHandleStatus;
@Schema(description = "医生大状态:(0空、1待办理、2自动办理中、3继续办理、4终止办理、5人工处理、6成功)" )
@TableField(exist = false)
private String ysdHandleStatus;
} }
...@@ -112,6 +112,9 @@ ...@@ -112,6 +112,9 @@
<result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/> <result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/>
<result property="exportFundFlag" column="EXPORT_FUND_FLAG"/> <result property="exportFundFlag" column="EXPORT_FUND_FLAG"/>
<result property="exportSocialFlag" column="EXPORT_SOCIAL_FLAG"/> <result property="exportSocialFlag" column="EXPORT_SOCIAL_FLAG"/>
<result property="ygsHandleStatus" column="YGS_HANDLE_STATUS"/>
<result property="ysdHandleStatus" column="YSD_HANDLE_STATUS"/>
</resultMap> </resultMap>
<!-- 派单导出vo --> <!-- 派单导出vo -->
<resultMap id="exportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo"> <resultMap id="exportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo">
...@@ -1316,7 +1319,7 @@ ...@@ -1316,7 +1319,7 @@
<select id="getTDispatchSocialHandlePage" resultMap="dispatchPageMap"> <select id="getTDispatchSocialHandlePage" resultMap="dispatchPageMap">
SELECT SELECT
<include refid="Base_Column_List"/>, <include refid="Base_Column_List"/>,
a.SOCIAL_HOUSEHOLD_NAME,a.EXPORT_SOCIAL_FLAG a.SOCIAL_HOUSEHOLD_NAME,a.EXPORT_SOCIAL_FLAG,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
......
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