Commit 6cb8bc44 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.6.10' into MVP1.6.10

parents b7188b5a 6a4d5066
......@@ -34,7 +34,7 @@ spec: # 资源规范字段
#dapr.io/sidecar-cpu-request: 1 #Dapr sidecar要求的 CPU 数量
#dapr.io/sidecar-memory-request #Dapr sidecar 请求的内存数量
dapr.io/http-max-request-size: "100" #增加http和grpc服务器请求正文参数的最大大小,单位为MB,以处理大文件的上传。 默认值为 4 MB
dapr.io/http-read-buffer-size: "16" #Dapr has a default limit of 4KB for the http header read buffer size. When sending http headers that are bigger than the default 4KB, you can increase this value. Otherwise, you may encounter a Too big request header
dapr.io/http-read-buffer-size: "100" #Dapr has a default limit of 4KB for the http header read buffer size. When sending http headers that are bigger than the default 4KB, you can increase this value. Otherwise, you may encounter a Too big request header
dapr.io/sidecar-listen-addresses: "0.0.0.0"
# 更多dapr配置请参考 https://www.bookstack.cn/read/dapr-1.5-zh/cc77b74e2cc2f4d4.md
......
......@@ -151,15 +151,15 @@ public class EmployeeInsertVO extends RowIndex implements Serializable {
@ExcelProperty(value = "户口性质")
private String empRegisType;
@ExcelAttribute(name = "档案所在省", isArea = true, isNotEmpty = true, errorInfo = "档案所在省不能为空")
@ExcelAttribute(name = "档案所在省", isArea = true)
@ExcelProperty("档案所在省")
private String fileProvince;
@ExcelAttribute(name = "档案所在市", isArea = true, parentField = "fileProvince", isNotEmpty = true, errorInfo = "档案所在市不能为空")
@ExcelAttribute(name = "档案所在市", isArea = true, parentField = "fileProvince")
@ExcelProperty("档案所在市")
private String fileCity;
@ExcelAttribute(name = "档案所在县", isArea = true, parentField = "fileCity", isNotEmpty = true, errorInfo = "档案所在县不能为空")
@ExcelAttribute(name = "档案所在县", isArea = true, parentField = "fileCity")
@ExcelProperty("档案所在县")
private String fileTown;
......@@ -215,11 +215,34 @@ public class EmployeeInsertVO extends RowIndex implements Serializable {
private String remark;
/**
* 通信地址
* 通信地址
*/
@Schema(description = "通信地址")
@ExcelAttribute(name = "通信地址-省",isArea = true, isNotEmpty = true)
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "通信地址")
@ExcelProperty("通信地址-省")
private String contactProvince;
/**
* 通信地址市
*/
@ExcelAttribute(name = "通信地址-市",isArea = true,parentField = "contactProvince")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("通信地址-市")
private String contactCity;
/**
* 通信地址县
*/
@ExcelAttribute(name = "通信地址-区/县",isArea = true,parentField = "contactCity")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("通信地址-区/县")
private String contactTown;
/**
* 通信地址-详细地址 fxj 20240911 通信地址 调整为 通信地址-详细地址
*/
@ExcelAttribute(name = "通信地址-详细地址")
@Schema(description = "通信地址-详细地址")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "通信地址-详细地址")
private String contactAddress;
}
......@@ -15,9 +15,10 @@ public class EmployeeConstants {
public static final String EMP_NATIONAL = "民族必填";
public static final String ID_PROVINCE = "户籍所在地必填";
public static final String FILE_PROVINCE = "档案所在地必填";
public static final String CONTACT_PROVINCE = "通信地址(省市县)必填";
public static final String EMP_REGIS_TYPE = "户口性质必填";
public static final String IS_COLLEGE = "是否大专及以上必填";
public static final String CONTACT_ADDRESS = "通信地址必填";
public static final String CONTACT_ADDRESS = "通信地址(详细地址)必填";
public static final String EMP_NATRUE_ZERO = "派遣";
public static final String EMP_NATRUE_ONE = "外包";
public static final String EMP_NATRUE_THREE = "内部员工";
......
......@@ -277,6 +277,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
adds.add(attaInfo);
}
if (CommonConstants.ONE_STRING.equals(attaInfo.getHandleType())){
adds.add(attaInfo);
}
if (CommonConstants.TWO_STRING.equals(attaInfo.getHandleType())){
deleteIds.add(attaInfo.getId());
}
}
......@@ -284,7 +287,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
attaInfoService.removeBatchByIds(deleteIds);
}
if (Common.isNotNull(adds)){
attaInfoService.saveBatch(adds);
attaInfoService.updateBatchById(adds);
}
}
}
......@@ -299,7 +302,17 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
info.setDomainId(otherFile.getId());
}
}
// 删除时
// 更新
}if (CommonConstants.ONE_STRING.equals(otherFile.getHandleType())){
if (Common.isNotNull(otherFile.getId())){
empOtherFileService.updateById(otherFile);
if (Common.isNotNull(otherFile.getAttaList())){
for (TAttaInfo info: otherFile.getAttaList()){
info.setDomainId(otherFile.getId());
}
}
}
// 删除时
}else if (CommonConstants.TWO_STRING.equals(otherFile.getHandleType())){
empOtherFileService.removeById(otherFile.getId());
}
......@@ -307,9 +320,20 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
private void getAttaInfo(TEmployeeInfo emp) {
List<TEmpOtherFile> otherFiles = otherFileService.getListByEmpId(emp.getId());
if (Common.isEmpty(otherFiles)){
if (Common.isNotNull(otherFiles)){
List<TAttaInfo> attaInfos;
for (TEmpOtherFile file:otherFiles){
file.setAttaList(attaInfoService.list(Wrappers.<TAttaInfo>query().lambda().eq(TAttaInfo::getDomainId,file.getId())));
attaInfos = attaInfoService.list(Wrappers.<TAttaInfo>query().lambda().eq(TAttaInfo::getDomainId,file.getId()));
if (Common.isNotNull(attaInfos)){
URL url;
for (TAttaInfo atta:attaInfos){
url = ossUtil.getObjectUrl(null, atta.getAttaSrc());
if (Common.isNotNull(url)){
atta.setAttaUrl(url.toString());
}
}
}
file.setAttaList(attaInfos);
}
}
emp.setOtherFiles(otherFiles);
......@@ -923,6 +947,11 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg.add(EmployeeConstants.FILE_PROVINCE);
errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.FILE_PROVINCE));
}
if (Common.isEmpty(employeeInfo.getContactTown())) {
errorMsg.add(EmployeeConstants.CONTACT_PROVINCE);
errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.CONTACT_PROVINCE));
}
if (Common.isEmpty(employeeInfo.getContactAddress())) {
errorMsg.add(EmployeeConstants.CONTACT_ADDRESS);
errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.CONTACT_ADDRESS));
......@@ -1398,6 +1427,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
saveEmp.setMajor(excel.getMajor());
}
}
// 通信地址所在地
if (Common.isNotNull(excel.getContactProvince())) {
saveEmp.setContactProvince(excel.getContactProvince());
}
if (Common.isNotNull(excel.getContactCity())) {
saveEmp.setContactCity(excel.getContactCity());
}
if (Common.isNotNull(excel.getContactTown())) {
saveEmp.setContactTown(excel.getContactTown());
}
if (Common.isNotNull(excel.getContactAddress())) {
if (excel.getContactAddress().length() > 200) {
errorMsg.add(EmployeeConstants.CONTACT_ADDRESS_LENGTH);
......@@ -1911,6 +1950,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
saveEmp.setMajor(excel.getMajor());
}
}
// 通信地址所在地
if (Common.isNotNull(excel.getContactProvince())) {
saveEmp.setContactProvince(excel.getContactProvince());
}
if (Common.isNotNull(excel.getContactCity())) {
saveEmp.setContactCity(excel.getContactCity());
}
if (Common.isNotNull(excel.getContactTown())) {
saveEmp.setContactTown(excel.getContactTown());
}
if (Common.isNotNull(excel.getContactAddress())) {
if (excel.getContactAddress().length() > 200) {
errorMsg.add(EmployeeConstants.CONTACT_ADDRESS_LENGTH);
......
......@@ -161,6 +161,9 @@
<if test="completeMonitorInfoVo.phone != null and completeMonitorInfoVo.phone.trim() != ''">
and b.EMP_PHONE = #{completeMonitorInfoVo.phone}
</if>
<if test="completeMonitorInfoVo.empIdCard != null and completeMonitorInfoVo.empIdCard.trim() != ''">
and a.EMP_IDCARD = #{completeMonitorInfoVo.empIdCard}
</if>
<if test="completeMonitorInfoVo.isComplete != null and completeMonitorInfoVo.isComplete.trim() != ''">
and a.IS_COMPLETE = #{completeMonitorInfoVo.isComplete}
</if>
......
......@@ -17,6 +17,9 @@
package com.yifu.cloud.plus.v1.yifu.common.core.constant;
import java.math.BigDecimal;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* @author lengleng
......@@ -622,4 +625,8 @@ public interface CommonConstants {
Integer TEN_INTEGER = 10;
Integer ELEVEN_INTEGER =11;
List<String> socialStatus = Stream.of("3","4","6","7","9","11","12").collect(Collectors.toList());
List<String> socialInfoStatus = Stream.of("1","5","7").collect(Collectors.toList());
}
......@@ -1154,8 +1154,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
List<TSocialInfo> socialist;
TSettleDomain domain;
List<TSocialFundInfo> socialInfoList = socialFundInfoMapper.selectList(Wrappers.<TSocialFundInfo>query().lambda()
.in(TSocialFundInfo::getEmpIdcard, Common.listObjectToStrList(list, ExcelAttributeConstants.EMPIDCARD)));
.in(TSocialFundInfo::getEmpIdcard, Common.listObjectToStrList(list, ExcelAttributeConstants.EMPIDCARD))
.in(TSocialFundInfo::getSocialStatus,CommonConstants.socialStatus));
//已存在的社保数据
HashMap<String, TSocialFundInfo> socialMap = new HashMap<>();
......@@ -1214,12 +1216,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard())
.eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince())
.eq(TSocialInfo::getSocialCity, infoVo.getSocialCity())
.and(obj -> obj.eq(TSocialInfo::getHandleStatus, CommonConstants.ONE_STRING)
.or()
.eq(TSocialInfo::getHandleStatus, CommonConstants.FIVE_STRING)
.or()
.eq(TSocialInfo::getHandleStatus, CommonConstants.SEVEN_STRING)
)
.in(TSocialInfo::getHandleStatus,CommonConstants.socialInfoStatus)
);
if (CollectionUtils.isNotEmpty(socialist)) {
for (TSocialInfo socialInfo1 : socialist) {
......@@ -1492,6 +1489,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (Common.isEmpty(tSocialInfo)) {
tSocialInfo = socialInfoMapper.selectOne(Wrappers.<TSocialInfo>query().lambda()
.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard()).groupBy(TSocialInfo::getCreateTime)
.in(TSocialInfo::getHandleStatus,CommonConstants.socialInfoStatus)
.last(CommonConstants.LAST_ONE_SQL));
}
......@@ -1788,7 +1786,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
@Override
public R<List<ErrorMessage>> importTaxSocialInfoDiy(InputStream inputStream) {
YifuUser user = SecurityUtils.getUser();
//养老插入的集合
ConcurrentHashMap<String,TPaymentInfo> batchYlInsertList = new ConcurrentHashMap<>();
//工伤插入的集合
......@@ -2827,7 +2825,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
TSettleDomain domain;
List<TSocialFundInfo> socialInfoList = socialFundInfoMapper.selectList(Wrappers.<TSocialFundInfo>query().lambda()
.in(TSocialFundInfo::getEmpIdcard, Common.listObjectToStrList(list, ExcelAttributeConstants.EMPIDCARD)));
.in(TSocialFundInfo::getEmpIdcard, Common.listObjectToStrList(list, ExcelAttributeConstants.EMPIDCARD))
.in(TSocialFundInfo::getSocialStatus,CommonConstants.socialStatus));
//已存在的社保数据
HashMap<String, TSocialFundInfo> socialMap = new HashMap<>();
......@@ -2882,12 +2881,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard())
.eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince().toString())
.eq(TSocialInfo::getSocialCity, infoVo.getSocialCity().toString())
.and(obj -> obj.eq(TSocialInfo::getHandleStatus, CommonConstants.ONE_STRING)
.or()
.eq(TSocialInfo::getHandleStatus, CommonConstants.FIVE_STRING)
.or()
.eq(TSocialInfo::getHandleStatus, CommonConstants.SEVEN_STRING)
)
.in(TSocialInfo::getHandleStatus,CommonConstants.socialInfoStatus)
);
if (CollectionUtils.isNotEmpty(socialist)) {
for (TSocialInfo socialInfo1 : socialist) {
......@@ -3107,6 +3101,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (Common.isEmpty(tSocialInfo)) {
tSocialInfo = socialInfoMapper.selectOne(Wrappers.<TSocialInfo>query().lambda()
.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard()).groupBy(TSocialInfo::getCreateTime)
.in(TSocialInfo::getHandleStatus,CommonConstants.socialInfoStatus)
.last(CommonConstants.LAST_ONE_SQL));
}
......@@ -3300,7 +3295,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
TSettleDomain domain;
List<TSocialFundInfo> socialInfoList = socialFundInfoMapper.selectList(Wrappers.<TSocialFundInfo>query().lambda()
.in(TSocialFundInfo::getEmpIdcard, Common.listObjectToStrList(list, ExcelAttributeConstants.EMPIDCARD)));
.in(TSocialFundInfo::getEmpIdcard, Common.listObjectToStrList(list, ExcelAttributeConstants.EMPIDCARD))
.in(TSocialFundInfo::getSocialStatus, CommonConstants.socialStatus));
//已存在的社保数据
HashMap<String, TSocialFundInfo> socialMap = new HashMap<>();
......@@ -3357,12 +3353,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard())
.eq(TSocialInfo::getSocialProvince, infoVo.getSocialProvince().toString())
.eq(TSocialInfo::getSocialCity, infoVo.getSocialCity().toString())
.and(obj -> obj.eq(TSocialInfo::getHandleStatus, CommonConstants.ONE_STRING)
.or()
.eq(TSocialInfo::getHandleStatus, CommonConstants.FIVE_STRING)
.or()
.eq(TSocialInfo::getHandleStatus, CommonConstants.SEVEN_STRING)
));
.in(TSocialInfo::getHandleStatus, CommonConstants.socialInfoStatus));
if (CollectionUtils.isNotEmpty(socialist)) {
for (TSocialInfo socialInfo1 : socialist) {
if ((Common.isEmpty(infoVo.getSocialTown()) || (Common.isNotNull(infoVo.getSocialTown()) &&
......@@ -3389,6 +3380,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (Common.isEmpty(tSocialInfo)) {
tSocialInfo = socialInfoMapper.selectOne(Wrappers.<TSocialInfo>query().lambda()
.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard()).groupBy(TSocialInfo::getCreateTime)
.in(TSocialInfo::getHandleStatus, CommonConstants.socialInfoStatus)
.last(CommonConstants.LAST_ONE_SQL));
}
......
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