Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
f842ee46
Commit
f842ee46
authored
Dec 10, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-户配置调整
parent
b6c29dfc
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
283 additions
and
61 deletions
+283
-61
TSocialHouseholdExportVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdExportVo.java
+191
-0
TSocialHouseholdInsertVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
+15
-25
TSocialHouseholdUpdateVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdUpdateVo.java
+6
-6
SysHouseHoldInfoMapper.java
...ud/plus/v1/yifu/social/mapper/SysHouseHoldInfoMapper.java
+2
-2
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+68
-27
SysHouseHoldInfoMapper.xml
...-biz/src/main/resources/mapper/SysHouseHoldInfoMapper.xml
+1
-1
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdExportVo.java
0 → 100644
View file @
f842ee46
/*
* 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
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
View file @
f842ee46
...
@@ -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
,
is
DataId
=
true
,
is
Area
=
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
,
is
DataId
=
true
,
is
Area
=
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
,
is
DataId
=
true
,
is
Area
=
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
;
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdUpdateVo.java
View file @
f842ee46
...
@@ -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
,
is
DataId
=
true
,
is
Area
=
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
,
is
DataId
=
true
,
is
Area
=
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
,
is
DataId
=
true
,
is
Area
=
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
;
/**
/**
* 所属机构
* 所属机构
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/SysHouseHoldInfoMapper.java
View file @
f842ee46
...
@@ -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.TSocialHousehold
Inse
rtVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialHousehold
Expo
rtVo
;
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
<
TSocialHousehold
Inse
rtVo
>
selectExportList
(
@Param
(
"sysHouseHoldInfo"
)
SysHouseHoldInfo
sysHouseHoldInfo
);
List
<
TSocialHousehold
Expo
rtVo
>
selectExportList
(
@Param
(
"sysHouseHoldInfo"
)
SysHouseHoldInfo
sysHouseHoldInfo
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
f842ee46
...
@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...
@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.yifu.cloud.plus.v1.check.entity.TCheckMobile
;
import
com.yifu.cloud.plus.v1.check.entity.TCheckMobile
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaMap
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
...
@@ -46,6 +47,7 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoMapper;
...
@@ -46,6 +47,7 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoMapper;
import
com.yifu.cloud.plus.v1.yifu.social.service.SysHouseHoldInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.SysHouseHoldInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TAttaInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TAttaInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialfundHouseResService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialfundHouseResService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialHouseholdExportVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialHouseholdInsertVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialHouseholdInsertVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialHouseholdUpdateVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialHouseholdUpdateVo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
...
@@ -129,8 +131,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -129,8 +131,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
baseMapper
.
insert
(
sysHouseHoldInfo
);
baseMapper
.
insert
(
sysHouseHoldInfo
);
//维护附件信息
//维护附件信息
if
(
Common
.
isNotNull
(
sysHouseHoldInfo
.
getAttaId
()))
{
if
(
Common
.
isNotNull
(
sysHouseHoldInfo
.
getAttaId
()))
{
TAttaInfo
attaInfo
=
attaInfoService
.
getById
(
Wrappers
.<
TAttaInfo
>
query
().
lambda
().
TAttaInfo
attaInfo
=
attaInfoService
.
getById
(
sysHouseHoldInfo
.
getAttaId
());
eq
(
TAttaInfo:
:
getId
,
sysHouseHoldInfo
.
getAttaId
()));
attaInfo
.
setDomainId
(
sysHouseHoldInfo
.
getId
());
attaInfo
.
setDomainId
(
sysHouseHoldInfo
.
getId
());
attaInfoService
.
updateById
(
attaInfo
);
attaInfoService
.
updateById
(
attaInfo
);
}
}
...
@@ -268,6 +269,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -268,6 +269,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
data
.
setRowIndex
(
rowIndex
+
1
);
data
.
setRowIndex
(
rowIndex
+
1
);
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
if
(
Common
.
isNotNull
(
errorMessage
)){
if
(
Common
.
isNotNull
(
errorMessage
)){
errorMessage
.
setData
(
data
);
errorMessageList
.
add
(
errorMessage
);
errorMessageList
.
add
(
errorMessage
);
}
else
{
}
else
{
cachedDataList
.
add
(
data
);
cachedDataList
.
add
(
data
);
...
@@ -294,7 +296,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -294,7 +296,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
log
.
error
(
CommonConstants
.
IMPORT_DATA_ANALYSIS_ERROR
,
e
);
log
.
error
(
CommonConstants
.
IMPORT_DATA_ANALYSIS_ERROR
,
e
);
return
R
.
failed
(
CommonConstants
.
IMPORT_DATA_ANALYSIS_ERROR
);
return
R
.
failed
(
CommonConstants
.
IMPORT_DATA_ANALYSIS_ERROR
);
}
}
return
R
.
ok
(
errorMessageList
);
if
(
errorMessageList
.
stream
().
allMatch
(
e
->
e
.
getMessage
().
equals
(
CommonConstants
.
SAVE_SUCCESS
)))
{
return
R
.
ok
();
}
else
{
return
R
.
ok
(
errorMessageList
);
}
}
}
@Override
@Override
...
@@ -322,6 +328,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -322,6 +328,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
data
.
setRowIndex
(
rowIndex
+
1
);
data
.
setRowIndex
(
rowIndex
+
1
);
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
if
(
Common
.
isNotNull
(
errorMessage
)){
if
(
Common
.
isNotNull
(
errorMessage
)){
errorMessage
.
setData
(
data
);
errorMessageList
.
add
(
errorMessage
);
errorMessageList
.
add
(
errorMessage
);
}
else
{
}
else
{
cachedDataList
.
add
(
data
);
cachedDataList
.
add
(
data
);
...
@@ -348,7 +355,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -348,7 +355,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
log
.
error
(
CommonConstants
.
IMPORT_DATA_ANALYSIS_ERROR
,
e
);
log
.
error
(
CommonConstants
.
IMPORT_DATA_ANALYSIS_ERROR
,
e
);
return
R
.
failed
(
CommonConstants
.
IMPORT_DATA_ANALYSIS_ERROR
);
return
R
.
failed
(
CommonConstants
.
IMPORT_DATA_ANALYSIS_ERROR
);
}
}
return
R
.
ok
(
errorMessageList
);
if
(
errorMessageList
.
stream
().
allMatch
(
e
->
e
.
getMessage
().
equals
(
CommonConstants
.
UPDATE_SUCCESS
)))
{
return
R
.
ok
();
}
else
{
return
R
.
ok
(
errorMessageList
);
}
}
}
/**
/**
...
@@ -359,14 +370,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -359,14 +370,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
public
void
listExport
(
HttpServletResponse
response
,
SysHouseHoldInfo
sysHouseHoldInfo
){
public
void
listExport
(
HttpServletResponse
response
,
SysHouseHoldInfo
sysHouseHoldInfo
){
String
fileName
=
"户配置信息批量导出"
+
DateUtil
.
getThisTime
()
+
CommonConstants
.
XLSX
;
String
fileName
=
"户配置信息批量导出"
+
DateUtil
.
getThisTime
()
+
CommonConstants
.
XLSX
;
//获取要导出的列表
//获取要导出的列表
List
<
TSocialHousehold
Inse
rtVo
>
list
=
new
ArrayList
<>();
List
<
TSocialHousehold
Expo
rtVo
>
list
=
new
ArrayList
<>();
long
count
=
baseMapper
.
selectExportCount
(
sysHouseHoldInfo
);
long
count
=
baseMapper
.
selectExportCount
(
sysHouseHoldInfo
);
try
(
ServletOutputStream
out
=
response
.
getOutputStream
();)
{
try
(
ServletOutputStream
out
=
response
.
getOutputStream
();)
{
response
.
setContentType
(
CommonConstants
.
MULTIPART_FORM_DATA
);
response
.
setContentType
(
CommonConstants
.
MULTIPART_FORM_DATA
);
response
.
setCharacterEncoding
(
"utf-8"
);
response
.
setCharacterEncoding
(
"utf-8"
);
response
.
setHeader
(
CommonConstants
.
CONTENT_DISPOSITION
,
CommonConstants
.
ATTACHMENT_FILENAME
+
URLEncoder
.
encode
(
fileName
,
"UTF-8"
));
response
.
setHeader
(
CommonConstants
.
CONTENT_DISPOSITION
,
CommonConstants
.
ATTACHMENT_FILENAME
+
URLEncoder
.
encode
(
fileName
,
"UTF-8"
));
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
out
,
TSocialHousehold
Inse
rtVo
.
class
).
build
();
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
out
,
TSocialHousehold
Expo
rtVo
.
class
).
build
();
if
(
count
>
CommonConstants
.
ZERO_INT
){
if
(
count
>
CommonConstants
.
ZERO_INT
){
WriteSheet
writeSheet
;
WriteSheet
writeSheet
;
list
=
baseMapper
.
selectExportList
(
sysHouseHoldInfo
);
list
=
baseMapper
.
selectExportList
(
sysHouseHoldInfo
);
...
@@ -388,12 +399,20 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -388,12 +399,20 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if
(!
Common
.
isNotNull
(
excelVOList
)){
if
(!
Common
.
isNotNull
(
excelVOList
)){
return
;
return
;
}
}
//获取所有区域数据
Map
<
String
,
String
>
areaMap
=
new
HashMap
<>();
R
<
AreaMap
>
areaListR
=
upmsDaprUtils
.
getAreaMapR
();
if
(
null
!=
areaListR
&&
!
Common
.
isEmpty
(
areaListR
.
getData
()))
{
areaMap
=
areaListR
.
getData
().
getIdLabelMap
();
}
else
{
errorMessageList
.
add
(
new
ErrorMessage
(
1
,
"获取区域数据失败"
));
}
//获取所有的人员信息
//获取所有的人员信息
HashMap
<
String
,
SysUser
>
userMap
=
new
HashMap
<>();
HashMap
<
String
,
SysUser
>
userMap
=
new
HashMap
<>();
R
<
AllUserNaVo
>
userListR
=
upmsDaprUtils
.
getAllUserIds
();
R
<
AllUserNaVo
>
userListR
=
upmsDaprUtils
.
getAllUserIds
();
if
(
Common
.
isNotNull
(
userListR
))
{
if
(
Common
.
isNotNull
(
userListR
))
{
AllUserNaVo
userList
=
userListR
.
getData
();
AllUserNaVo
userList
=
userListR
.
getData
();
if
(
null
!=
userList
&&
!
userList
.
get
UserNames
().
isEmpty
())
{
if
(
null
!=
userList
&&
!
userList
.
get
AllUser
().
isEmpty
())
{
userMap
=
userList
.
getAllUser
();
userMap
=
userList
.
getAllUser
();
}
}
}
else
{
}
else
{
...
@@ -413,6 +432,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -413,6 +432,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
excel
.
setOrganName
(
excel
.
getOrganName
().
trim
());
excel
.
setOrganName
(
excel
.
getOrganName
().
trim
());
SysHouseHoldInfo
household
=
new
SysHouseHoldInfo
();
SysHouseHoldInfo
household
=
new
SysHouseHoldInfo
();
BeanCopyUtils
.
copyProperties
(
excel
,
household
);
BeanCopyUtils
.
copyProperties
(
excel
,
household
);
excel
.
setProvince
(
areaMap
.
get
(
excel
.
getProvince
()));
excel
.
setCity
(
areaMap
.
get
(
excel
.
getCity
()));
if
(
Common
.
isNotNull
(
excel
.
getTown
()))
{
excel
.
setTown
(
areaMap
.
get
(
excel
.
getTown
()));
}
//判断模板中是否有户重复的数据
//判断模板中是否有户重复的数据
if
(
null
==
exitNameMap
.
get
(
excel
.
getName
()))
{
if
(
null
==
exitNameMap
.
get
(
excel
.
getName
()))
{
exitNameMap
.
put
(
excel
.
getName
(),
"1"
);
exitNameMap
.
put
(
excel
.
getName
(),
"1"
);
...
@@ -432,11 +456,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -432,11 +456,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
}
//是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功
//是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功
//选择否时,不做限制要求,可填可不填,导入时正常导入填写的字段
//选择否时,不做限制要求,可填可不填,导入时正常导入填写的字段
if
(
excel
.
getAutoStatus
().
equals
(
"是"
)
&&
Common
.
isEmpty
(
excel
.
getSocialAccount
())
//
if (excel.getAutoStatus().equals("是") && Common.isEmpty(excel.getSocialAccount())
&&
Common
.
isEmpty
(
excel
.
getMediclAccount
())){
//
&& Common.isEmpty(excel.getMediclAccount())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"是否自动办理,选择是时,社保和医保信息必须填写其中一个"
,
excel
));
//
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "是否自动办理,选择是时,社保和医保信息必须填写其中一个",excel));
continue
;
//
continue;
}
//
}
//判断社保、医保账户和密码的对应关系
//判断社保、医保账户和密码的对应关系
if
(((
Common
.
isEmpty
(
excel
.
getSocialAccount
()))
!=
(
Common
.
isEmpty
(
excel
.
getSocialPassword
())))
||
if
(((
Common
.
isEmpty
(
excel
.
getSocialAccount
()))
!=
(
Common
.
isEmpty
(
excel
.
getSocialPassword
())))
||
((
Common
.
isEmpty
(
excel
.
getMediclAccount
()))
!=
(
Common
.
isEmpty
(
excel
.
getMediclPassword
()))))
{
((
Common
.
isEmpty
(
excel
.
getMediclAccount
()))
!=
(
Common
.
isEmpty
(
excel
.
getMediclPassword
()))))
{
...
@@ -471,11 +495,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -471,11 +495,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
household
.
setAuditUserDeptName
(
null
==
auditUser
.
getDeptName
()
?
""
:
auditUser
.
getDeptName
());
household
.
setAuditUserDeptName
(
null
==
auditUser
.
getDeptName
()
?
""
:
auditUser
.
getDeptName
());
household
.
setHandleUser
(
null
==
handlerUser
.
getUserId
()
?
""
:
handlerUser
.
getUserId
());
household
.
setHandleUser
(
null
==
handlerUser
.
getUserId
()
?
""
:
handlerUser
.
getUserId
());
household
.
setHandleUserDeptName
(
null
==
handlerUser
.
getDeptName
()
?
""
:
handlerUser
.
getDeptName
());
household
.
setHandleUserDeptName
(
null
==
handlerUser
.
getDeptName
()
?
""
:
handlerUser
.
getDeptName
());
household
.
setProvince
(
String
.
valueOf
(
excel
.
getProvince
()));
household
.
setCity
(
String
.
valueOf
(
excel
.
getCity
()));
if
(
Common
.
isNotNull
(
excel
.
getTown
()))
{
household
.
setTown
(
String
.
valueOf
(
excel
.
getTown
()));
}
baseMapper
.
insert
(
household
);
baseMapper
.
insert
(
household
);
// 同步审核权限、办理权限
// 同步审核权限、办理权限
this
.
saveAuditUserOrHandleUser
(
household
,
CommonConstants
.
ZERO_STRING
);
this
.
saveAuditUserOrHandleUser
(
household
,
CommonConstants
.
ZERO_STRING
);
...
@@ -489,12 +508,20 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -489,12 +508,20 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if
(!
Common
.
isNotNull
(
excelVOList
)){
if
(!
Common
.
isNotNull
(
excelVOList
)){
return
;
return
;
}
}
//获取所有区域数据
Map
<
String
,
String
>
areaMap
=
new
HashMap
<>();
R
<
AreaMap
>
areaListR
=
upmsDaprUtils
.
getAreaMapR
();
if
(
null
!=
areaListR
&&
!
Common
.
isEmpty
(
areaListR
.
getData
()))
{
areaMap
=
areaListR
.
getData
().
getIdLabelMap
();
}
else
{
errorMessageList
.
add
(
new
ErrorMessage
(
1
,
"获取区域数据失败"
));
}
//获取所有的人员信息
//获取所有的人员信息
HashMap
<
String
,
SysUser
>
userMap
=
new
HashMap
<>();
HashMap
<
String
,
SysUser
>
userMap
=
new
HashMap
<>();
R
<
AllUserNaVo
>
userListR
=
upmsDaprUtils
.
getAllUserIds
();
R
<
AllUserNaVo
>
userListR
=
upmsDaprUtils
.
getAllUserIds
();
if
(
Common
.
isNotNull
(
userListR
))
{
if
(
Common
.
isNotNull
(
userListR
))
{
AllUserNaVo
userList
=
userListR
.
getData
();
AllUserNaVo
userList
=
userListR
.
getData
();
if
(
null
!=
userList
&&
!
userList
.
get
UserNames
().
isEmpty
())
{
if
(
null
!=
userList
&&
!
userList
.
get
AllUser
().
isEmpty
())
{
userMap
=
userList
.
getAllUser
();
userMap
=
userList
.
getAllUser
();
}
}
}
else
{
}
else
{
...
@@ -507,10 +534,33 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -507,10 +534,33 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
// 执行数据插入操作 组装
// 执行数据插入操作 组装
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
TSocialHouseholdUpdateVo
excel
=
excelVOList
.
get
(
i
);
TSocialHouseholdUpdateVo
excel
=
excelVOList
.
get
(
i
);
//校验省市县
if
(
Common
.
isNotNull
(
excel
.
getProvince
())
&&
Common
.
isEmpty
(
excel
.
getProvince
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"省市的信息需要填写完善!"
,
excel
));
continue
;
}
info
=
this
.
getOne
(
Wrappers
.<
SysHouseHoldInfo
>
query
().
lambda
()
info
=
this
.
getOne
(
Wrappers
.<
SysHouseHoldInfo
>
query
().
lambda
()
.
eq
(
SysHouseHoldInfo:
:
getType
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysHouseHoldInfo:
:
getType
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysHouseHoldInfo:
:
getName
,
excel
.
getName
())
.
eq
(
SysHouseHoldInfo:
:
getName
,
excel
.
getName
())
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
excel
.
getProvince
())
&&
Common
.
isNotNull
(
excel
.
getCity
()))
{
info
.
setProvince
(
excel
.
getProvince
());
info
.
setCity
(
excel
.
getCity
());
if
(
Common
.
isNotNull
(
excel
.
getTown
()))
{
info
.
setTown
(
excel
.
getTown
());
}
else
{
info
.
setTown
(
""
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getProvince
()))
{
excel
.
setProvince
(
areaMap
.
get
(
excel
.
getProvince
()));
}
if
(
Common
.
isNotNull
(
excel
.
getCity
()))
{
excel
.
setCity
(
areaMap
.
get
(
excel
.
getCity
()));
}
if
(
Common
.
isNotNull
(
excel
.
getTown
()))
{
excel
.
setTown
(
areaMap
.
get
(
excel
.
getTown
()));
}
if
(
Common
.
isEmpty
(
info
)){
if
(
Common
.
isEmpty
(
info
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"未找到对应账户性质、户名的配置!"
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"未找到对应账户性质、户名的配置!"
,
excel
));
continue
;
continue
;
...
@@ -631,15 +681,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -631,15 +681,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
info
.
setHandleUserName
(
excel
.
getAuditUserName
());
info
.
setHandleUserName
(
excel
.
getAuditUserName
());
info
.
setHandleUserDeptName
(
handlerUser
.
getDeptName
());
info
.
setHandleUserDeptName
(
handlerUser
.
getDeptName
());
}
}
if
(
Common
.
isNotNull
(
excel
.
getProvince
())
&&
Common
.
isNotNull
(
excel
.
getCity
()))
{
info
.
setProvince
(
String
.
valueOf
(
excel
.
getProvince
()));
info
.
setCity
(
String
.
valueOf
(
excel
.
getCity
()));
if
(
Common
.
isNotNull
(
excel
.
getTown
()))
{
info
.
setTown
(
String
.
valueOf
(
excel
.
getTown
()));
}
else
{
info
.
setTown
(
""
);
}
}
baseMapper
.
updateById
(
info
);
baseMapper
.
updateById
(
info
);
}
}
}
}
yifu-social/yifu-social-biz/src/main/resources/mapper/SysHouseHoldInfoMapper.xml
View file @
f842ee46
...
@@ -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.TSocialHousehold
Inse
rtVo"
>
<select
id=
"selectExportList"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.TSocialHousehold
Expo
rtVo"
>
SELECT
SELECT
if(a.TYPE = '0','社保户','公积金户') type,
if(a.TYPE = '0','社保户','公积金户') type,
a.NAME,
a.NAME,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment