Commit 7b862c76 authored by hongguangwu's avatar hongguangwu

MVP1.7.8-请求ID、导出

parent a9b2d37f
......@@ -514,4 +514,16 @@ public class SocialSoldierExportVo implements Serializable {
@ExcelProperty("医保生育大病-失败原因")
private String ysdRemark;
@ExcelAttribute(name = "社保请求ID", maxLength = 50, needExport = true)
@Schema(description = "社保请求ID")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保请求ID")
private String ygsRequestId;
@ExcelAttribute(name = "医保请求ID", maxLength = 50, needExport = true)
@Schema(description = "医保请求ID")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保请求ID")
private String ysdRequestId;
}
......@@ -98,4 +98,18 @@ public class TSocialSoldierPageVo extends TDispatchInfo {
@ExcelProperty("医生大反馈-原反馈" )
private String ysdRemarkOld;
@Length(max = 50, message = "社保请求ID 不能超过50个字符" )
@ExcelAttribute(name = "社保请求ID", maxLength = 50)
@Schema(description = "社保请求ID" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保请求ID" )
private String ygsRequestId;
@Length(max = 50, message = "医保请求ID 不能超过50个字符" )
@ExcelAttribute(name = "医保请求ID", maxLength = 50)
@Schema(description = "医保请求ID" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保请求ID" )
private String ysdRequestId;
}
......@@ -1347,6 +1347,7 @@
,s.ysd_Handle_Status
,s.YGS_REMARK
,s.YSD_REMARK
,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID
FROM t_dispatch_info a
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
......@@ -1400,6 +1401,8 @@
<result property="ysdRemark" column="YSD_REMARK"/>
<result property="ygsRemarkOld" column="YGS_REMARK_OLD"/>
<result property="ysdRemarkOld" column="YSD_REMARK_OLD"/>
<result property="ygsRequestId" column="YGS_REQUEST_ID"/>
<result property="ysdRequestId" column="YSD_REQUEST_ID"/>
</resultMap>
<!-- hgw 2024-5-10 10:42:33 社保士兵列表查询 -->
......@@ -1485,6 +1488,7 @@
a.GRADUATION_TIME,a.AUTO_FLAG
,a.SOCIAL_HOUSEHOLD_NAME,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS
,s.YGS_REMARK,s.YSD_REMARK,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD
,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID
FROM t_dispatch_info a
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
......
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