Commit f842ee46 authored by huyuchen's avatar huyuchen

huych-户配置调整

parent b6c29dfc
/*
* 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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import java.io.Serializable;
/**
* 社保户批量导出
*
* @author huych
* @date 2024-12-5 11:38:05
*/
@Data
public class TSocialHouseholdExportVo implements Serializable {
@Schema(description = "账户性质")
private String type;
/**
* 员工姓名
*/
@Length(max = 50, message = "户名不能超过50个字符")
@ExcelAttribute(name = "户名", maxLength = 50,isNotEmpty = true)
@Schema(description = "户名")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "户名")
private String name;
/**
* 缴纳地所在省
*/
@Length(max = 50, message = "缴纳地所在省不能超过32个字符")
@ExcelAttribute(name = "缴纳地所在省", maxLength = 50,isNotEmpty = true, isArea = true, parentField = "")
@Schema(description = "缴纳地所在省")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "缴纳地所在省")
private String province;
/**
* 缴纳地所在市
*/
@Length(max = 50, message = "缴纳地所在市不能超过50个字符")
@ExcelAttribute(name = "缴纳地所在市", maxLength = 50,isNotEmpty = true, isArea = true, parentField = "province")
@Schema(description = "缴纳地所在市")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "缴纳地所在市")
private String city;
/**
* 缴纳地所在县
*/
@Length(max = 50, message = "缴纳地所在县不能超过50个字符")
@ExcelAttribute(name = "缴纳地所在县", maxLength = 50, isArea = true, parentField = "city")
@Schema(description = "缴纳地所在县")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "缴纳地所在县")
private String town;
/**
* 所属机构
*/
@ExcelAttribute(name = "所属机构", maxLength = 50,isNotEmpty = true)
@Schema(description ="所属机构")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("所属机构")
private String organName;
/**
* 审核人
*/
@ExcelAttribute(name = "审核人", maxLength = 50,isNotEmpty = true )
@Schema(description ="审核人")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("审核人")
private String auditUserName;
/**
* 办理人
*/
@ExcelAttribute(name = "办理人", maxLength = 50,isNotEmpty = true )
@Schema(description ="办理人")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("办理人")
private String handleUserName;
/**
* 手机号
*/
@ExcelAttribute(name = "手机号", maxLength = 50,isNotEmpty = true )
@Schema(description ="手机号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("手机号")
private String phone;
/**
* 类型 0 独立户 1 自由户
*/
@ExcelAttribute(name = "户类型", maxLength = 3,isNotEmpty = true)
@Schema(description ="户类型")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("户类型")
private String houseType;
/**
* 单位编号
*/
@ExcelAttribute(name = "单位编号" )
@Schema(description ="单位编号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位编号")
private String customerNo;
/**
* 单位统一信用代码
*/
@ExcelAttribute(name = "单位统一信用代码" )
@Schema(description ="单位统一信用代码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位统一信用代码")
private String unitCreditCode;
/**
* 社保-登录账户
*/
@ExcelAttribute(name = "社保-登录账户" )
@Schema(description ="社保-登录账户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保-登录账户")
private String socialAccount;
/**
* 社保-登录密码
*/
@ExcelAttribute(name = "社保-登录密码" )
@Schema(description ="社保-登录密码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保-登录密码")
private String socialPassword;
/**
* 医保-登录账户
*/
@ExcelAttribute(name = "医保-登录账户" )
@Schema(description ="医保-登录账户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保-登录账户")
private String mediclAccount;
/**
* 医保-登录密码
*/
@ExcelAttribute(name = "医保-登录密码" )
@Schema(description ="医保-登录密码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保-登录密码")
private String mediclPassword;
@Schema(description ="是否配置公章")
private String isSign;
/**
* 自动化配置状态 0 是 1 否
*/
@ExcelAttribute(name = "是否自动办理" )
@Schema(description ="是否自动办理")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否自动办理")
private String autoStatus;
}
...@@ -35,13 +35,8 @@ import java.io.Serializable; ...@@ -35,13 +35,8 @@ import java.io.Serializable;
@Data @Data
public class TSocialHouseholdInsertVo extends RowIndex implements Serializable { public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
* 账户性质
*/
@ExcelAttribute(name = "账户性质")
@Schema(description = "账户性质") @Schema(description = "账户性质")
@HeadFontStyle(fontHeightInPoints = 11) @ExcelAttribute(name = "账户性质", isExport = false)
@ExcelProperty(value = "账户性质")
private String type; private String type;
/** /**
...@@ -58,31 +53,31 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable { ...@@ -58,31 +53,31 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
* 缴纳地所在省 * 缴纳地所在省
*/ */
@Length(max = 50, message = "缴纳地所在省不能超过32个字符") @Length(max = 50, message = "缴纳地所在省不能超过32个字符")
@ExcelAttribute(name = "缴纳地所在省", maxLength = 50,isNotEmpty = true, isDataId = true, isArea = true, parentField = "") @ExcelAttribute(name = "缴纳地所在省", maxLength = 50,isNotEmpty = true, isArea = true, parentField = "")
@Schema(description = "缴纳地所在省") @Schema(description = "缴纳地所在省")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "缴纳地所在省") @ExcelProperty(value = "缴纳地所在省")
private Integer province; private String province;
/** /**
* 缴纳地所在市 * 缴纳地所在市
*/ */
@Length(max = 50, message = "缴纳地所在市不能超过50个字符") @Length(max = 50, message = "缴纳地所在市不能超过50个字符")
@ExcelAttribute(name = "缴纳地所在市", maxLength = 50,isNotEmpty = true, isDataId = true, isArea = true, parentField = "province") @ExcelAttribute(name = "缴纳地所在市", maxLength = 50,isNotEmpty = true, isArea = true, parentField = "province")
@Schema(description = "缴纳地所在市") @Schema(description = "缴纳地所在市")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "缴纳地所在市") @ExcelProperty(value = "缴纳地所在市")
private Integer city; private String city;
/** /**
* 缴纳地所在县 * 缴纳地所在县
*/ */
@Length(max = 50, message = "缴纳地所在县不能超过50个字符") @Length(max = 50, message = "缴纳地所在县不能超过50个字符")
@ExcelAttribute(name = "缴纳地所在县", maxLength = 50, isDataId = true, isArea = true, parentField = "city") @ExcelAttribute(name = "缴纳地所在县", maxLength = 50, isArea = true, parentField = "city")
@Schema(description = "缴纳地所在县") @Schema(description = "缴纳地所在县")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "缴纳地所在县") @ExcelProperty(value = "缴纳地所在县")
private Integer town; private String town;
/** /**
* 所属机构 * 所属机构
...@@ -147,15 +142,6 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable { ...@@ -147,15 +142,6 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
@ExcelProperty("单位统一信用代码") @ExcelProperty("单位统一信用代码")
private String unitCreditCode; private String unitCreditCode;
/**
* 自动化配置状态 0 是 1 否
*/
@ExcelAttribute(name = "是否自动办理" )
@Schema(description ="是否自动办理")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否自动办理")
private String autoStatus;
/** /**
* 社保-登录账户 * 社保-登录账户
*/ */
...@@ -193,12 +179,16 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable { ...@@ -193,12 +179,16 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
private String mediclPassword; private String mediclPassword;
/** /**
* 是否配置公章 * 自动化配置状态 0 是 1 否
*/ */
@ExcelAttribute(name = "是否配置公章" ) @ExcelAttribute(name = "是否自动办理" )
@Schema(description ="是否配置公章") @Schema(description ="是否自动办理")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否配置公章") @ExcelProperty("是否自动办理")
private String autoStatus;
@Schema(description ="是否配置公章")
@ExcelAttribute(name = "是否配置公章", isExport = false)
private String isSign; private String isSign;
} }
...@@ -48,31 +48,31 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable { ...@@ -48,31 +48,31 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
* 缴纳地所在省 * 缴纳地所在省
*/ */
@Length(max = 32, message = "不能超过32个字符") @Length(max = 32, message = "不能超过32个字符")
@ExcelAttribute(name = "缴纳地所在省", maxLength = 32, isDataId = true, isArea = true, parentField = "") @ExcelAttribute(name = "缴纳地所在省", maxLength = 32, isArea = true, parentField = "")
@Schema(description = "缴纳地所在省") @Schema(description = "缴纳地所在省")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "缴纳地所在省") @ExcelProperty(value = "缴纳地所在省")
private Integer province; private String province;
/** /**
* 缴纳地所在市 * 缴纳地所在市
*/ */
@Length(max = 32, message = "不能超过32个字符") @Length(max = 32, message = "不能超过32个字符")
@ExcelAttribute(name = "缴纳地所在市", maxLength = 32, isDataId = true, isArea = true, parentField = "province") @ExcelAttribute(name = "缴纳地所在市", maxLength = 32, isArea = true, parentField = "province")
@Schema(description = "缴纳地所在市") @Schema(description = "缴纳地所在市")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "缴纳地所在市") @ExcelProperty(value = "缴纳地所在市")
private Integer city; private String city;
/** /**
* 缴纳地所在县 * 缴纳地所在县
*/ */
@Length(max = 32, message = "不能超过32个字符") @Length(max = 32, message = "不能超过32个字符")
@ExcelAttribute(name = "缴纳地所在县", maxLength = 32, isDataId = true, isArea = true, parentField = "city") @ExcelAttribute(name = "缴纳地所在县", maxLength = 32, isArea = true, parentField = "city")
@Schema(description = "缴纳地所在县") @Schema(description = "缴纳地所在县")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "缴纳地所在县") @ExcelProperty(value = "缴纳地所在县")
private Integer town; private String town;
/** /**
* 所属机构 * 所属机构
......
...@@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo;
import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialHouseholdInsertVo; import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialHouseholdExportVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -61,5 +61,5 @@ public interface SysHouseHoldInfoMapper extends BaseMapper<SysHouseHoldInfo> { ...@@ -61,5 +61,5 @@ public interface SysHouseHoldInfoMapper extends BaseMapper<SysHouseHoldInfo> {
* @param sysHouseHoldInfo * @param sysHouseHoldInfo
* @return * @return
*/ */
List<TSocialHouseholdInsertVo> selectExportList(@Param("sysHouseHoldInfo") SysHouseHoldInfo sysHouseHoldInfo); List<TSocialHouseholdExportVo> selectExportList(@Param("sysHouseHoldInfo") SysHouseHoldInfo sysHouseHoldInfo);
} }
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
order by a.CREATE_TIME desc order by a.CREATE_TIME desc
</select> </select>
<select id="selectExportList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.TSocialHouseholdInsertVo"> <select id="selectExportList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.TSocialHouseholdExportVo">
SELECT SELECT
if(a.TYPE = '0','社保户','公积金户') type, if(a.TYPE = '0','社保户','公积金户') type,
a.NAME, a.NAME,
......
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