Commit db2a08c9 authored by wangzb's avatar wangzb

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

parents 75081d9d 64e147fe
...@@ -19,12 +19,10 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity; ...@@ -19,12 +19,10 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
...@@ -32,8 +30,6 @@ import io.swagger.v3.oas.annotations.media.Schema; ...@@ -32,8 +30,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import java.util.Date;
/** /**
* @author fxj * @author fxj
* @date 2023-06-13 15:42:17 * @date 2023-06-13 15:42:17
......
...@@ -19,22 +19,15 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo; ...@@ -19,22 +19,15 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TPersonnelRoster;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import java.util.Date;
/** /**
* @author fxj * @author fxj
* @date 2023-06-13 15:42:17 * @date 2023-06-13 15:42:17
...@@ -153,7 +146,7 @@ public class TPersonnelRosterExportVo{ ...@@ -153,7 +146,7 @@ public class TPersonnelRosterExportVo{
/** /**
* 性别 * 性别
*/ */
@ExcelAttribute(name = "性别", maxLength = 10,isDataId = true,readConverterExp = "1=男,2=女") @ExcelAttribute(name = "性别", maxLength = 10)
@Length(max = 10, message = "性别不能超过10个字符") @Length(max = 10, message = "性别不能超过10个字符")
@ExcelProperty("性别") @ExcelProperty("性别")
@Schema(description = "性别") @Schema(description = "性别")
...@@ -162,13 +155,11 @@ public class TPersonnelRosterExportVo{ ...@@ -162,13 +155,11 @@ public class TPersonnelRosterExportVo{
/** /**
* 出生日期 * 出生日期
*/ */
@DateTimeFormat("yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@ExcelAttribute(name = "出生日期", isDate = true) @ExcelAttribute(name = "出生日期", isDate = true)
@ExcelProperty("出生日期") @ExcelProperty("出生日期")
@Schema(description = "出生日期") @Schema(description = "出生日期")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
private Date empBirthDate; private String empBirthDate;
/** /**
* 年龄 * 年龄
*/ */
......
...@@ -28,13 +28,10 @@ import com.yifu.cloud.plus.v1.yifu.archives.mapper.TPersonnelRosterMapper; ...@@ -28,13 +28,10 @@ import com.yifu.cloud.plus.v1.yifu.archives.mapper.TPersonnelRosterMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TPersonnelRosterService; import com.yifu.cloud.plus.v1.yifu.archives.service.TPersonnelRosterService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TPersonnelRosterExportVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TPersonnelRosterExportVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TPersonnelRosterSearchVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TPersonnelRosterSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
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.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSalaryProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSalaryProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryEmpRosterRes; import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryEmpRosterRes;
...@@ -97,22 +94,22 @@ public class TPersonnelRosterServiceImpl extends ServiceImpl<TPersonnelRosterMap ...@@ -97,22 +94,22 @@ public class TPersonnelRosterServiceImpl extends ServiceImpl<TPersonnelRosterMap
response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName , CommonConstants.UTF8)); response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName , CommonConstants.UTF8));
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭 // 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
//EasyExcel.write(out, TEmpBadRecord.class).sheet("不良记录").doWrite(list); //EasyExcel.write(out, TEmpBadRecord.class).sheet("不良记录").doWrite(list);
ExcelWriter excelWriter = EasyExcel.write(out, TPersonnelRosterExportVo.class).build();
int index = 0; int index = 0;
if (count > CommonConstants.ZERO_INT){ WriteSheet writeSheet;
ExcelUtil<TPersonnelRosterExportVo> util; HashMap<String,String> userMap = new HashMap<>();
WriteSheet writeSheet; ExcelUtil<TPersonnelRosterExportVo> util = new ExcelUtil<>(TPersonnelRosterExportVo.class);
Map<String,String> redisLabelMap = (Map<String, String>) RedisUtil.redis.opsForValue().get(CacheConstants.REDIS_DICT_LABLE);
redisLabelMap.putAll(userMap);
Map<String,String> nameAndDicTypeMap = util.getConverterDicType();
// 获取所有字典type
ExcelWriter excelWriter = EasyExcel.write(out, TPersonnelRosterExportVo.class)
.registerConverter(new DictConverter(nameAndDicTypeMap,redisLabelMap)).build();
if (count > CommonConstants.ZERO_INT){
for (int i = 0; i <= count; ) { for (int i = 0; i <= count; ) {
// 获取实际记录 // 获取实际记录
searchVo.setLimitStart(i); searchVo.setLimitStart(i);
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT); searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
list = noPageDiy(searchVo); list = noPageDiy(searchVo);
if (Common.isNotNull(list)){
util = new ExcelUtil<>(TPersonnelRosterExportVo.class);
for (TPersonnelRosterExportVo vo:list){
util.convertEntity(vo,null,null,null);
}
}
if (Common.isNotNull(list)){ if (Common.isNotNull(list)){
writeSheet = EasyExcel.writerSheet(""+index).build(); writeSheet = EasyExcel.writerSheet(""+index).build();
excelWriter.write(list,writeSheet); excelWriter.write(list,writeSheet);
...@@ -124,7 +121,7 @@ public class TPersonnelRosterServiceImpl extends ServiceImpl<TPersonnelRosterMap ...@@ -124,7 +121,7 @@ public class TPersonnelRosterServiceImpl extends ServiceImpl<TPersonnelRosterMap
} }
} }
}else { }else {
WriteSheet writeSheet = EasyExcel.writerSheet(""+index).build(); writeSheet = EasyExcel.writerSheet(""+index).build();
excelWriter.write(list,writeSheet); excelWriter.write(list,writeSheet);
} }
if (Common.isNotNull(list)){ if (Common.isNotNull(list)){
......
...@@ -371,9 +371,61 @@ ...@@ -371,9 +371,61 @@
<!--tEmployeeInfo人员档案导出查询改造 fxj 2022-11-02--> <!--tEmployeeInfo人员档案导出查询改造 fxj 2022-11-02-->
<select id="noPageDiy" resultMap="tPersonnelRosterExportMap"> <select id="noPageDiy" resultMap="tPersonnelRosterExportMap">
select SELECT
<include refid="Base_Column_List"/> a.ID,
from t_personnel_roster a a.CUSTOMER_NAME,
a.DEPART_NAME,
a.DEPART_NO,
a.BUSINESS_PRIMARY,
a.BUSINESS_SECOND,
a.BUSINESS_THIRD,
a.LABEL,
a.BUSINESS_TYPE,
a.BU_BELONG,
a.EMP_TYPE,
a.EMP_NAME,
CASE WHEN a.EMP_SEX=1 THEN "男" WHEN a.EMP_SEX=2 THEN "女" ELSE "" END as "EMP_SEX",
a.EMP_BIRTH_DATE,
a.EMP_AGE,
a.EMP_IDCARD,
a.BANK_NO,
a.BANK_NAME,
a1.AREA_NAME as "BANK_PROVINCE",
a1.AREA_NAME as "BANK_CITY",
a.BANK_NAME_SUB,
a.EMP_PHONE,
a6.AREA_NAME as "EMP_PROVINCE",
a7.AREA_NAME as "EMP_CITY",
a8.AREA_NAME as "EMP_TOWN",
a3.AREA_NAME as "SOCIAL_PROVINCE",
a4.AREA_NAME as "SOCIAL_CITY",
a5.AREA_NAME as "SOCIAL_TOWN",
a.CONTRACT_APPLY_NO,
a.CONTRACT_START,
a.CONTRACT_END,
a.CONTRACT_TYPE,
a.BUSINESS_DETAIL,
a.SIGN_TYPE,
a.SIGN_TERM,
a.CONTRACT_PARTY_A,
a.CONTRACT_POST,
a.CONTRACT_TASK_TIME,
a.CONTRACT_CODE,
a.CONTRACT_CREATER,
a.CONTRACT_CREATE_TIME,
a.DATA_CREATE_MONTH,
a.SETTLE_DOMAIN
FROM
t_personnel_roster a
LEFT JOIN sys_area a1 on a1.id=a.BANK_PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.BANK_CITY
LEFT JOIN sys_area a3 on a3.id=a.SOCIAL_PROVINCE
LEFT JOIN sys_area a4 on a4.id=a.SOCIAL_CITY
LEFT JOIN sys_area a5 on a5.id=a.SOCIAL_TOWN
LEFT JOIN sys_area a6 on a6.id=a.EMP_PROVINCE
LEFT JOIN sys_area a7 on a7.id=a.EMP_CITY
LEFT JOIN sys_area a8 on a8.id=a.EMP_TOWN
<where> <where>
1=1 1=1
<include refid="tPersonnelRoster_where"/> <include refid="tPersonnelRoster_where"/>
......
...@@ -1767,8 +1767,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1767,8 +1767,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
if (CommonConstants.ZERO_STRING.equals(social.getIsIllness())){ if (CommonConstants.ZERO_STRING.equals(social.getIsIllness())){
social.setInsuranceBigailment(socialSet.getInsuranceBigailment()); social.setInsuranceBigailment(socialSet.getInsuranceBigailment());
social.setPersonalBigailmentCardinal(ServiceUtil.ifNull(social.getPersonalBigailmentCardinal(), excel.getPensionCardinal())); social.setPersonalBigailmentCardinal(ServiceUtil.ifNull(social.getPersonalBigailmentCardinal(), excel.getBigailmentCardinal()));
social.setUnitBigailmentCardinal(ServiceUtil.ifNull(social.getUnitBigailmentCardinal(), excel.getPensionCardinal())); social.setUnitBigailmentCardinal(ServiceUtil.ifNull(social.getUnitBigailmentCardinal(), excel.getBigailmentCardinal()));
social.setUnitBigailmentPer(socialSet.getPayCompanyPro()); social.setUnitBigailmentPer(socialSet.getPayCompanyPro());
social.setPersonalBigailmentPer(socialSet.getPayPersonalPro()); social.setPersonalBigailmentPer(socialSet.getPayPersonalPro());
social.setBigailmentHandle(CommonConstants.ZERO_STRING); social.setBigailmentHandle(CommonConstants.ZERO_STRING);
...@@ -1821,7 +1821,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1821,7 +1821,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//收取大病按比例 //收取大病按比例
social.setUnitBigailmentMoney(BigDecimalUtils.safeMultiply(social.getUnitBigailmentCardinal(), socialSet.getPayCompanyPro(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue()))); social.setUnitBigailmentMoney(BigDecimalUtils.safeMultiply(social.getUnitBigailmentCardinal(), socialSet.getPayCompanyPro(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
social.setPersonalBigailmentMoney(BigDecimalUtils.safeMultiply(social.getPersonalBigailmentCardinal(), socialSet.getPayPersonalPro(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue()))); social.setPersonalBigailmentMoney(BigDecimalUtils.safeMultiply(social.getPersonalBigailmentCardinal(), socialSet.getPayPersonalPro(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
} }
} }
} }
...@@ -2651,7 +2650,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2651,7 +2650,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.BIR_DISPATCH_SOCIAL_LIMIT_ERROR))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.BIR_DISPATCH_SOCIAL_LIMIT_ERROR)));
return true; return true;
} }
if (Common.isNotNull(excel.getBigailmentCardinal()) if (Common.isNotNull(excel.getBigailmentCardinal()) && CommonConstants.ONE_STRING.equals(socialSet.getCollectType())
&& CommonConstants.ONE_STRING.equals(socialSet.getValueType())
&& (excel.getBigailmentCardinal().compareTo(socialSet.getUpBig()) > CommonConstants.ZERO_INT && (excel.getBigailmentCardinal().compareTo(socialSet.getUpBig()) > CommonConstants.ZERO_INT
|| excel.getBigailmentCardinal().compareTo(socialSet.getLowerBig())< CommonConstants.ZERO_INT)) { || excel.getBigailmentCardinal().compareTo(socialSet.getLowerBig())< CommonConstants.ZERO_INT)) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.DB_DISPATCH_SOCIAL_LIMIT_ERROR))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.DB_DISPATCH_SOCIAL_LIMIT_ERROR)));
...@@ -4093,11 +4093,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4093,11 +4093,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
vo.setEmpName(dis.getEmpName()); vo.setEmpName(dis.getEmpName());
vo.setDeptName(dis.getSettleDomainName()); vo.setDeptName(dis.getSettleDomainName());
vo.setDetailId(dis.getId()); vo.setDetailId(dis.getId());
} R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo);
R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo); if (Common.isEmpty(resUp) || !(CommonConstants.SUCCESS.intValue() == resUp.getCode()) || !resUp.getData().booleanValue()) {
if (Common.isEmpty(resUp) || !(CommonConstants.SUCCESS.intValue() == resUp.getCode()) || !resUp.getData().booleanValue()) { errorList.add(new ErrorMessage(-1, vo.getEmpIdCard() + DispatchConstants.DISPATCH_SYN_DOC_EXE, CommonConstants.RED, dis.getEmpName()));
errorList.add(new ErrorMessage(-1, vo.getEmpIdCard() + DispatchConstants.DISPATCH_SYN_DOC_EXE, CommonConstants.RED, dis.getEmpName())); continue;
continue; }
} }
// 派减公积金办理失败不同步档案的相关字段信息 // 派减公积金办理失败不同步档案的相关字段信息
} else if (!(CommonConstants.ONE_STRING.equals(dis.getType()) } else if (!(CommonConstants.ONE_STRING.equals(dis.getType())
......
...@@ -381,7 +381,8 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe ...@@ -381,7 +381,8 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.BIR_DISPATCH_SOCIAL_LIMIT_ERROR))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.BIR_DISPATCH_SOCIAL_LIMIT_ERROR)));
continue; continue;
} }
if (Common.isNotNull(excel.getUnitBigailmentMoney()) if (Common.isNotNull(excel.getUnitBigailmentMoney()) && CommonConstants.ONE_STRING.equals(socialSetInfo.getCollectType())
&& CommonConstants.ONE_STRING.equals(socialSetInfo.getValueType())
&& (excel.getUnitBigailmentMoney().compareTo(socialSetInfo.getUpBig()) > CommonConstants.ZERO_INT && (excel.getUnitBigailmentMoney().compareTo(socialSetInfo.getUpBig()) > CommonConstants.ZERO_INT
|| excel.getUnitBigailmentMoney().compareTo(socialSetInfo.getLowerBig()) < CommonConstants.ZERO_INT)) { || excel.getUnitBigailmentMoney().compareTo(socialSetInfo.getLowerBig()) < CommonConstants.ZERO_INT)) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.DB_DISPATCH_SOCIAL_LIMIT_ERROR))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.DB_DISPATCH_SOCIAL_LIMIT_ERROR)));
......
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