Commit 2899b863 authored by fangxinjiang's avatar fangxinjiang

权限导入&派单增加学校专业及首次至缴纳地时间

parent 56f6b1fc
......@@ -16,7 +16,9 @@
*/
package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
......@@ -25,6 +27,7 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
......
package com.yifu.cloud.plus.v1.yifu.archives.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;
......@@ -53,5 +57,17 @@ public class UpProjectSocialFundVo implements Serializable {
String detailId;
String contactAddress;
String highEducation;
/**
* 学校
*/
@Schema(description = "学校" )
private String schoolName;
/**
* 专业
*/
@Schema(description = "专业" )
private String major;
// 是否更新学历标识
String flag;
}
......@@ -185,6 +185,7 @@ public class TCutsomerDataPermissonServiceImpl extends ServiceImpl<TCutsomerData
data.setRowIndex(rowIndex+1);
ErrorMessage errorMessage = util1.checkEntity(data, data.getRowIndex());
if (Common.isNotNull(errorMessage)){
errorMessage.setData(data);
errorMessageList.add(errorMessage);
}else {
cachedDataList.add(data);
......@@ -255,24 +256,24 @@ public class TCutsomerDataPermissonServiceImpl extends ServiceImpl<TCutsomerData
user = res.getData();
userMap.put(user.getUsername(),user);
}else {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.USER_FAIL));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.USER_FAIL,excel));
continue;
}
}
if (Common.isEmpty(user.getDeptName())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应登录账号无部门信息,请完善后导入"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应登录账号无部门信息,请完善后导入",excel));
continue;
}
// 项目信息验证
domain = domainMap.get(excel.getSettleDomainNo());
if (Common.isEmpty(domain)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SETTLE_DOMAIN_NOT_EXIST));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SETTLE_DOMAIN_NOT_EXIST,excel));
continue;
}
// 重复校验
temp = existMap.get(excel.getUserLoginName()+CommonConstants.DOWN_LINE_STRING+excel.getSettleDomainNo());
if (Common.isNotNull(temp)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应账号的权限已存在,请勿重复导入"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应账号的权限已存在,请勿重复导入",excel));
continue;
}else {
exist = baseMapper.selectOne(Wrappers.<TCutsomerDataPermisson>query().lambda()
......@@ -280,7 +281,7 @@ public class TCutsomerDataPermissonServiceImpl extends ServiceImpl<TCutsomerData
.eq(TCutsomerDataPermisson::getUserLoginName,excel.getUserLoginName())
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(exist)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应账号的权限已存在,请勿重复导入"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应账号的权限已存在,请勿重复导入",excel));
continue;
}
}
......@@ -299,7 +300,7 @@ public class TCutsomerDataPermissonServiceImpl extends ServiceImpl<TCutsomerData
insertExcel(permission);
// 加入map 验证当前表单数据是否重复
existMap.put(excel.getUserLoginName()+CommonConstants.DOWN_LINE_STRING+excel.getSettleDomainNo(),excel.getSettleDomainNo());
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN,excel));
// 清理缓存
redisUtil.remove(CacheConstants.WXHR_SETTLE_DOMAIN_VOS_BY_USERID +"_"+user.getUserId());
redisUtil.remove(CacheConstants.WXHR_SETTLE_DOMAIN_NOS_BY_USERID +"_"+user.getUserId());
......
......@@ -1418,6 +1418,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if (Common.isNotNull(vo.getHighEducation())) {
employee.setHignEducation(vo.getHighEducation());
}
if (Common.isNotNull(vo.getSchoolName())){
employee.setSchool(vo.getSchoolName());
}
if (Common.isNotNull(vo.getMajor())){
employee.setMajor(vo.getMajor());
}
}
tEmployeeInfoMapper.updateSocialInfoById(employee);
}
......
......@@ -1140,6 +1140,8 @@
<if test="tEmployeeInfo.socialStatus != null">SOCIAL_STATUS=#{tEmployeeInfo.socialStatus},</if>
<if test="tEmployeeInfo.fundStatus != null">FUND_STATUS=#{tEmployeeInfo.fundStatus},</if>
<if test="tEmployeeInfo.hignEducation != null">HIGN_EDUCATION=#{tEmployeeInfo.hignEducation},</if>
<if test="tEmployeeInfo.school != null">SCHOOL=#{tEmployeeInfo.school},</if>
<if test="tEmployeeInfo.major != null">MAJOR=#{tEmployeeInfo.major},</if>
<if test="tEmployeeInfo.contactAddress != null">CONTACT_ADDRESS=#{tEmployeeInfo.contactAddress},</if>
<if test="tEmployeeInfo.isCollege != null">IS_COLLEGE='1',</if>
<if test="tEmployeeInfo.fileProvince != null">a.FILE_PROVINCE=#{tEmployeeInfo.fileProvince},</if>
......
......@@ -626,6 +626,36 @@ public class TDispatchInfo extends BaseEntity {
@Schema(description = "学历", name = "contractName")
private String educationName;
/**
* 学校
*/
@ExcelAttribute(name = "学校",isNotEmpty = false)
@Length(max = 50, message = "学校不能超过50个字符")
@Schema(description = "学校:派增只做记录" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="学校")
private String schoolName;
/**
* 专业
*/
@ExcelAttribute(name = "专业",isNotEmpty = false)
@Length(max = 50, message = "学校不能超过50个字符")
@Schema(description = "专业:派增只做记录" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="专业")
private String major;
/**
* 首次至缴纳地时间
*/
@ExcelAttribute(name = "首次至缴纳地时间",isNotEmpty = false, isDate = true)
@Length(max = 50, message = "学校不能超过50个字符")
@Schema(description = "首次至缴纳地时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="首次至缴纳地时间")
private Date firstPayTime;
/**
* 试用期(单位月)
*/
......
......@@ -955,4 +955,14 @@ public class TSocialInfo extends BaseEntity {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人社保合计")
private BigDecimal personalSocialSum;
/**
* 首次至缴纳地时间
*/
@ExcelAttribute(name = "首次至缴纳地时间",isNotEmpty = false, isDate = true)
@Length(max = 50, message = "学校不能超过50个字符")
@Schema(description = "首次至缴纳地时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="首次至缴纳地时间")
private Date firstPayTime;
}
......@@ -4,13 +4,16 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ContentStyle;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
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.ExcelAttributeConstants;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Author fxj
......@@ -435,4 +438,33 @@ public class SocialHandleExportVo implements Serializable {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否已导出" )
private String exportSocialFlag;
/**
* 学校
*/
@ExcelAttribute(name = "学校",isNotEmpty = false)
@Schema(description = "学校:派增只做记录" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="学校")
private String schoolName;
/**
* 专业
*/
@ExcelAttribute(name = "专业",isNotEmpty = false)
@Length(max = 50, message = "学校不能超过50个字符")
@Schema(description = "专业:派增只做记录" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="专业")
private String major;
/**
* 首次至缴纳地时间
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "首次至缴纳地时间",isNotEmpty = false,isDate = true)
@Schema(description = "首次至缴纳地时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="首次至缴纳地时间")
private Date firstPayTime;
}
......@@ -350,5 +350,32 @@ public class TDispatchAuditExportVo {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人公积金缴纳比例" )
private BigDecimal personalProvidentPer;
/**
* 学校
*/
@ExcelAttribute(name = "学校",isNotEmpty = false)
@Schema(description = "学校:派增只做记录" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="学校")
private String schoolName;
/**
* 专业
*/
@ExcelAttribute(name = "专业",isNotEmpty = false)
@Length(max = 50, message = "学校不能超过50个字符")
@Schema(description = "专业:派增只做记录" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="专业")
private String major;
/**
* 首次至缴纳地时间
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "首次至缴纳地时间",isNotEmpty = false,isDate = true)
@Schema(description = "首次至缴纳地时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="首次至缴纳地时间")
private Date firstPayTime;
}
......@@ -280,6 +280,36 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
@ExcelProperty(value ="学历")
private String educationName;
/**
* 学校
*/
@ExcelAttribute(name = "学校",isNotEmpty = false)
@Length(max = 50, message = "学校不能超过50个字符")
@Schema(description = "学校:派增只做记录" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="学校")
private String schoolName;
/**
* 专业
*/
@ExcelAttribute(name = "专业",isNotEmpty = false)
@Length(max = 50, message = "学校不能超过50个字符")
@Schema(description = "专业:派增只做记录" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="专业")
private String major;
/**
* 首次至缴纳地时间
*/
@ExcelAttribute(name = "首次至缴纳地时间",isNotEmpty = false,isDate = true)
@Length(max = 50, message = "学校不能超过50个字符")
@Schema(description = "首次至缴纳地时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="首次至缴纳地时间")
private Date firstPayTime;
/**
* 备案基数
*/
......
......@@ -476,4 +476,32 @@ public class TDispatchInfoExportVo {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金办理备注" )
private String fundHandleRemark;
/**
* 学校
*/
@ExcelAttribute(name = "学校",isNotEmpty = false)
@Schema(description = "学校:派增只做记录" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="学校")
private String schoolName;
/**
* 专业
*/
@ExcelAttribute(name = "专业",isNotEmpty = false)
@Schema(description = "专业:派增只做记录" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="专业")
private String major;
/**
* 首次至缴纳地时间
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "首次至缴纳地时间",isNotEmpty = false,isDate = true)
@Schema(description = "首次至缴纳地时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="首次至缴纳地时间")
private Date firstPayTime;
}
......@@ -738,7 +738,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(socialFund) && Common.isNotNull(socialFund.getId())){
forecastLibraryService.updateForecastLibaryByDispatch(null,null,socialFund);
}
// 同步更新人员档案和项目档案的社保公积金状态
// 同步更新人员档案和项目档案的社保公积金状态 学历信息
updateDocSocialFund(social, fund, socialFund,empVoMap,excel);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS, CommonConstants.GREEN));
......@@ -848,6 +848,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
else {
vo.setHighEducation("");
}
if (Common.isNotNull(excel.getSchoolName())){
vo.setSchoolName(excel.getSchoolName());
}
if (Common.isNotNull(excel.getMajor())){
vo.setMajor(excel.getMajor());
}
}
}
}
......@@ -1320,6 +1326,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch.setBelongUnit(excel.getCustomerId());
dispatch.setBelongUnitName(excel.getCustomerName());
dispatch.setEducationName(excel.getEducationName());
dispatch.setSchoolName(excel.getSchoolName());
dispatch.setMajor(excel.getMajor());
dispatch.setFirstPayTime(excel.getFirstPayTime());
dispatch.setIdCardProvince(excel.getIdCardProvince());
dispatch.setIdCardCity(excel.getIdCardCity());
dispatch.setIdCardTown(excel.getIdCardTown());
......@@ -1598,6 +1607,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setHandleStatus(CommonConstants.ZERO_STRING);
social.setDeleteFlag(CommonConstants.ZERO_STRING);
social.setTrustRemark(excel.getTrustRemark());
social.setFirstPayTime(excel.getFirstPayTime());
List<Date> lstDate = new ArrayList<>();
if (Common.isNotNull(excel.getPensionStart())) {
lstDate.add(excel.getPensionStart());
......@@ -2125,6 +2135,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
emp.setEmpPhone(excel.getEmpMobile());
emp.setEmpRegisType(excel.getEmpRegisType());
emp.setHignEducation(excel.getEducationName());
emp.setMajor(excel.getMajor());
emp.setSchool(excel.getSchoolName());
emp.setContractStatus(CommonConstants.ZERO_INT);
emp.setDeleteFlag(CommonConstants.ZERO_STRING);
emp.setFileSource(CommonConstants.ONE_STRING);
......
......@@ -216,6 +216,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
data.setRowIndex(rowIndex+1);
ErrorMessage errorMessage = util1.checkEntity(data, data.getRowIndex());
if (Common.isNotNull(errorMessage)){
errorMessage.setData(data);
errorMessageList.add(errorMessage);
}else {
cachedDataList.add(data);
......@@ -276,26 +277,26 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
user = res.getData();
userMap.put(user.getUsername(),user);
}else {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"无有效状态的用户信息!"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"无有效状态的用户信息!",excel));
continue;
}
}
if (Common.isEmpty(user.getDeptName())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应登录账号无部门信息,请完善后导入"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应登录账号无部门信息,请完善后导入",excel));
continue;
}
// 户验证
if (CommonConstants.ZERO_STRING.equals(excel.getType())){
baseSet = socialBaseSetMap.get(excel.getHouseHold());
if (Common.isEmpty(baseSet)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"未找到对应社保户数据!"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"未找到对应社保户数据!",excel));
continue;
}
}
if (CommonConstants.ONE_STRING.equals(excel.getType())){
baseSet = fundBaseSetMap.get(excel.getHouseHold());
if (Common.isEmpty(baseSet)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"未找到对应公积金户数据!"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"未找到对应公积金户数据!",excel));
continue;
}
}
......@@ -304,16 +305,17 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
+CommonConstants.DOWN_LINE_STRING
+excel.getHouseHold());
if (Common.isNotNull(temp)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应账号的权限已存在,请勿重复导入"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应账号的权限已存在,请勿重复导入",excel));
continue;
}else {
exist = baseMapper.selectOne(Wrappers.<TSocialfundHouseRes>query().lambda()
.eq(TSocialfundHouseRes::getFundHousehold,excel.getHouseHold())
.eq(TSocialfundHouseRes::getHouseNameType,excel.getType())
.eq(TSocialfundHouseRes::getUserId,user.getUserId())
.eq(TSocialfundHouseRes::getAuthType,CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(exist)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应账号的权限已存在,请勿重复导入"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应账号的权限已存在,请勿重复导入",excel));
continue;
}
}
......@@ -333,7 +335,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
existMap.put(excel.getUserLoginName()
+CommonConstants.DOWN_LINE_STRING
+excel.getHouseHold(),excel.getHouseHold());
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN,excel));
}
}
/**
......@@ -371,7 +373,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
ExcelUtil<SocialAuthHandleImportVo> util1 = new ExcelUtil<>(SocialAuthHandleImportVo.class);
Map<String, SysBaseSetInfo> baseSetInfoMap= new HashMap<>();
List<SysBaseSetInfo> setInfos = baseSetInfoService.list(Wrappers.<SysBaseSetInfo>query().lambda()
.eq(SysBaseSetInfo::getBaseType,CommonConstants.ZERO_STRING)
.eq(SysBaseSetInfo::getBaseType,type)
.eq(SysBaseSetInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
.groupBy(SysBaseSetInfo::getDepartName,SysBaseSetInfo::getProvince,SysBaseSetInfo::getCity,SysBaseSetInfo::getTown));
if (Common.isNotNull(setInfos)){
......@@ -404,6 +406,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
data.setRowIndex(rowIndex+1);
ErrorMessage errorMessage = util1.checkEntity(data, data.getRowIndex());
if (Common.isNotNull(errorMessage)){
errorMessage.setData(data);
errorMessageList.add(errorMessage);
}else {
cachedDataList.add(data);
......@@ -462,26 +465,26 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
user = res.getData();
userMap.put(user.getUsername(),user);
}else {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"无有效状态的用户信息!"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"无有效状态的用户信息!",excel));
continue;
}
}
if (Common.isEmpty(user.getDeptName())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应登录账号无部门信息,请完善后导入"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应登录账号无部门信息,请完善后导入",excel));
continue;
}
// 户验证
if (CommonConstants.ZERO_STRING.equals(type)){
baseSet = baseSetInfoMap.get(excel.getHouseHold());
if (Common.isEmpty(baseSet)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"未找到对应社保户数据!"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"未找到对应社保户数据!",excel));
continue;
}
}
if (CommonConstants.ONE_STRING.equals(type)){
baseSet = baseSetInfoMap.get(excel.getHouseHold());
if (Common.isEmpty(baseSet)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"未找到对应公积金户数据!"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"未找到对应公积金户数据!",excel));
continue;
}
}
......@@ -490,7 +493,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
+CommonConstants.DOWN_LINE_STRING
+excel.getHouseHold());
if (Common.isNotNull(temp)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应账号的权限已存在,请勿重复导入"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应账号的权限已存在,请勿重复导入",excel));
continue;
}else {
if (CommonConstants.ZERO_STRING.equals(type)){
......@@ -498,16 +501,18 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
.eq(TSocialfundHouseRes::getSocialHousehold,excel.getHouseHold())
.eq(TSocialfundHouseRes::getUserId,user.getUserId())
.eq(TSocialfundHouseRes::getHouseNameType,type)
.eq(TSocialfundHouseRes::getAuthType,CommonConstants.ONE_STRING)
.last(CommonConstants.LAST_ONE_SQL));
}else {
exist = baseMapper.selectOne(Wrappers.<TSocialfundHouseRes>query().lambda()
.eq(TSocialfundHouseRes::getFundHousehold,excel.getHouseHold())
.eq(TSocialfundHouseRes::getUserId,user.getUserId())
.eq(TSocialfundHouseRes::getHouseNameType,type)
.eq(TSocialfundHouseRes::getAuthType,CommonConstants.ONE_STRING)
.last(CommonConstants.LAST_ONE_SQL));
}
if (Common.isNotNull(exist)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应账号的权限已存在,请勿重复导入"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"对应账号的权限已存在,请勿重复导入",excel));
continue;
}
}
......@@ -527,7 +532,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
existMap.put(excel.getUserLoginName()
+CommonConstants.DOWN_LINE_STRING
+excel.getHouseHold(),excel.getUserLoginName());
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN,excel));
}
}
}
......@@ -99,6 +99,10 @@
<result property="createTime" column="CREATE_TIME"/>
<result property="orderId" column="ORDER_ID"/>
<result property="schoolName" column="SCHOOL_NAME"/>
<result property="major" column="MAJOR"/>
<result property="firstPayTime" column="FIRST_PAY_TIME"/>
</resultMap>
<resultMap id="dispatchPageMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPageVo" extends="tDispatchInfoMap">
<result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/>
......@@ -163,6 +167,10 @@
<result property="unitWorkInjuryCardinal" column="UNIT_WORK_INJURY_CARDINAL"/>
<result property="unitBirthCardinal" column="UNIT_BIRTH_CARDINAL"/>
<result property="empMobile" column="EMP_MOBILE"/>
<result property="schoolName" column="SCHOOL_NAME"/>
<result property="major" column="MAJOR"/>
<result property="firstPayTime" column="FIRST_PAY_TIME"/>
</resultMap>
<resultMap id="fundSupplementaryMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo">
......@@ -327,6 +335,10 @@
<result property="personalProvidentCardinal" column="PERSONAL_PROVIDENT_CARDINAL"/>
<result property="unitProvidentPer" column="UNIT_PROVIDENT_PER"/>
<result property="personalProvidentPer" column="PERSONAL_PROVIDENT_PER"/>
<result property="schoolName" column="SCHOOL_NAME"/>
<result property="major" column="MAJOR"/>
<result property="firstPayTime" column="FIRST_PAY_TIME"/>
</resultMap>
<sql id="Base_Column_List">
......@@ -403,7 +415,10 @@
a.ID_CARD_TOWN,
a.ID_CARD_ADDRESS,
a.APPLY_NO,
a.ORDER_ID
a.ORDER_ID,
a.SCHOOL_NAME,
a.MAJOR,
a.FIRST_PAY_TIME
</sql>
<sql id="tDispatchInfo_where">
<if test="tDispatchInfo != null">
......@@ -934,7 +949,10 @@
c.PROVIDENT_HOUSEHOLD_NAME,
c.UNIT_PROVIDENG_CARDINAL,
c.UNIT_PROVIDENT_PER,
a.EMP_MOBILE
a.EMP_MOBILE,
a.SCHOOL_NAME,
a.MAJOR,
a.FIRST_PAY_TIME
from t_dispatch_info a
left join t_social_info s on s.id=a.SOCIAL_ID
......@@ -991,7 +1009,10 @@
c.PROVIDENT_START,
c.PERSONAL_PROVIDENT_CARDINAL,
c.UNIT_PROVIDENT_PER,
c.PERSONAL_PROVIDENT_PER
c.PERSONAL_PROVIDENT_PER,
a.SCHOOL_NAME,
a.MAJOR,
a.FIRST_PAY_TIME
from t_dispatch_info a
left join t_social_info b on a.SOCIAL_ID = b.ID
left join t_provident_fund c on a.FUND_ID = C.ID
......@@ -1075,6 +1096,9 @@
<result property="birthStart" column="BIRTH_START"/>
<result property="bigailmentStart" column="BIGAILMENT_START"/>
<result property="exportSocialFlag" column="EXPORT_SOCIAL_FLAG"/>
<result property="schoolName" column="SCHOOL_NAME"/>
<result property="major" column="MAJOR"/>
<result property="firstPayTime" column="FIRST_PAY_TIME"/>
</resultMap>
<resultMap id="fundHandleMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.FundHandleExportVo">
......@@ -1160,7 +1184,10 @@
s.PERSONAL_BIGAILMENT_MONEY,
a.TRUST_REMARK,
a.REDUCE_REASON,
'1' as EXPORT_SOCIAL_FLAG
'1' as EXPORT_SOCIAL_FLAG,
a.SCHOOL_NAME,
a.MAJOR,
a.FIRST_PAY_TIME
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
<include refid="where_getSocialRecordRoster"/>
......
......@@ -134,6 +134,8 @@
<result property="upperLimit" column="UPPER_LIMIT"/>
<result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/>
<result property="personalSocialSum" column="PERSONAL_SOCIAL_SUM"/>
<result property="firstPayTime" column="FIRST_PAY_TIME"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
......@@ -236,7 +238,8 @@
a.UPDATE_TIME,
a.PAY_POLICY,
a.LOWER_LIMIT,
a.UPPER_LIMIT,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM
a.UPPER_LIMIT,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM,
a.FIRST_PAY_TIME
</sql>
<sql id="tSocialInfo_where">
<if test="tSocialInfo != null">
......
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