Commit fd95f903 authored by hongguangwu's avatar hongguangwu

MVP1.6.4-社保士兵相关代码6-列表表头

parent 12327037
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
/**
* 社保士兵列表查询
*
* @author hgw
* @date 2024-5-13 15:36:27
*/
@Data
public class TSocialSoldierPageVo extends TDispatchInfo {
/**
* 社保户名称
*/
@ExcelAttribute(name = "社保户名称", maxLength = 50)
@Schema(description = "社保户名称" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保户名称" )
private String socialHouseholdName;
@NotBlank(message = "养工失状态不能为空" )
@Length(max = 32, message = "养工失状态 不能超过32个字符" )
@ExcelAttribute(name = "养工失状态", isNotEmpty = true, errorInfo = "办理状态不能为空", maxLength = 32)
@Schema(description = "养工失状态:(0空、1待办理、2自动办理中、3继续办理、4终止办理、5人工处理、6成功)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养工失状态" )
private String ygsHandleStatus;
/**
* 医生大状态:(0空、1待办理、2自动办理中、3继续办理、4终止办理、5人工处理)
*/
@NotBlank(message = "医生大状态不能为空" )
@Length(max = 32, message = "医生大状态 不能超过32个字符" )
@ExcelAttribute(name = "医生大状态", isNotEmpty = true, errorInfo = "办理状态不能为空", maxLength = 32)
@Schema(description = "医生大状态:(0空、1待办理、2自动办理中、3继续办理、4终止办理、5人工处理、6成功)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医生大状态" )
private String ysdHandleStatus;
/**
* 养工失反馈
*/
@Length(max = 500, message = "养工失反馈 不能超过500个字符" )
@ExcelAttribute(name = "养工失反馈", maxLength = 500)
@Schema(description = "养工失反馈" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养工失反馈" )
private String ygsRemark;
/**
* 医生大反馈
*/
@Length(max = 500, message = "医生大反馈 不能超过500个字符" )
@ExcelAttribute(name = "医生大反馈", maxLength = 500)
@Schema(description = "医生大反馈" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医生大反馈" )
private String ysdRemark;
/**
* 养工失反馈-原反馈
*/
@Length(max = 500, message = "养工失反馈-原反馈 不能超过500个字符" )
@ExcelAttribute(name = "养工失反馈-原反馈", maxLength = 500)
@Schema(description = "养工失反馈-原反馈" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养工失反馈-原反馈" )
private String ygsRemarkOld;
/**
* 医生大反馈-原反馈
*/
@Length(max = 500, message = "医生大反馈-原反馈 不能超过500个字符" )
@ExcelAttribute(name = "医生大反馈-原反馈", maxLength = 500)
@Schema(description = "医生大反馈-原反馈" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医生大反馈-原反馈" )
private String ysdRemarkOld;
}
......@@ -217,7 +217,7 @@ public class TDispatchInfoController {
**/
@Operation(description = "简单分页查询--社保士兵列表")
@GetMapping("/pageSocialSoldier")
public R<IPage<TDispatchInfo>> pageSocialSoldier(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo) {
public R<IPage<TSocialSoldierPageVo>> pageSocialSoldier(Page<TSocialSoldierPageVo> page, SocialHandleSearchVo tDispatchInfo) {
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tDispatchInfo);
......
......@@ -111,7 +111,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
* @Date: 2024/5/10 11:50
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo>
**/
IPage<TDispatchInfo> getTSocialSoldierHandlePage(Page<TDispatchInfo> page,
IPage<TSocialSoldierPageVo> getTSocialSoldierHandlePage(Page<TSocialSoldierPageVo> page,
@Param("tDispatchInfo") SocialHandleSearchVo tDispatchInfo,
@Param("idsStr") List<String> idsStr);
......
......@@ -98,7 +98,7 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
* @Date: 2024/5/10 11:51
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo>
**/
IPage<TDispatchInfo> getTSocialSoldierHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo);
IPage<TSocialSoldierPageVo> getTSocialSoldierHandlePage(Page<TSocialSoldierPageVo> page, SocialHandleSearchVo tDispatchInfo);
IPage<TDispatchInfo> getTDispatchSocialHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo);
......
......@@ -5225,7 +5225,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
@Override
public IPage<TDispatchInfo> getTSocialSoldierHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo) {
public IPage<TSocialSoldierPageVo> getTSocialSoldierHandlePage(Page<TSocialSoldierPageVo> page, SocialHandleSearchVo tDispatchInfo) {
return baseMapper.getTSocialSoldierHandlePage(page,tDispatchInfo,null);
}
......
......@@ -1290,8 +1290,18 @@
<include refid="where_getSocialSoldier"/>
</select>
<resultMap id="socialSoldierPageMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TSocialSoldierPageVo" extends="tDispatchInfoMap">
<result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/>
<result property="ygsHandleStatus" column="YGS_HANDLE_STATUS"/>
<result property="ysdHandleStatus" column="YSD_HANDLE_STATUS"/>
<result property="ygsRemark" column="YGS_REMARK"/>
<result property="ysdRemark" column="YSD_REMARK"/>
<result property="ygsRemarkOld" column="YGS_REMARK_OLD"/>
<result property="ysdRemarkOld" column="YSD_REMARK_OLD"/>
</resultMap>
<!-- hgw 2024-5-10 10:42:33 社保士兵列表查询 -->
<select id="getTSocialSoldierHandlePage" resultMap="dispatchPageMap">
<select id="getTSocialSoldierHandlePage" resultMap="socialSoldierPageMap">
SELECT
<include refid="Base_Column_List"/>
,a.SOCIAL_HOUSEHOLD_NAME,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS
......
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