Commit d38f39df authored by hongguangwu's avatar hongguangwu

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

parents bb26ebcc 975827c2
...@@ -32,5 +32,8 @@ public class TEmployeeContractPrePushFascVo { ...@@ -32,5 +32,8 @@ public class TEmployeeContractPrePushFascVo {
@ExcelAttribute(name = "紧急联系人地址") @ExcelAttribute(name = "紧急联系人地址")
private String contactAddress; private String contactAddress;
@ExcelAttribute(name = "手机号码")
private String empPhone;
} }
...@@ -342,6 +342,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr ...@@ -342,6 +342,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
contract.setHuArea(empInfo.getHuArea()); contract.setHuArea(empInfo.getHuArea());
contract.setContactArea(empInfo.getContactArea()); contract.setContactArea(empInfo.getContactArea());
contract.setEmpEmail(empInfo.getEmpEmail()); contract.setEmpEmail(empInfo.getEmpEmail());
contract.setEmpPhone(empInfo.getEmpPhone());
} }
if (Common.isEmpty(contract.getFadadaTemplateId())) { if (Common.isEmpty(contract.getFadadaTemplateId())) {
...@@ -395,16 +396,17 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr ...@@ -395,16 +396,17 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
} }
TEmployeeContractPrePushFascVo empContactInfo = tEmpContactInfoMapper.getTEmpContactInfoOneByCard(empIdCard); TEmployeeContractPrePushFascVo empContactInfo = tEmpContactInfoMapper.getTEmpContactInfoOneByCard(empIdCard);
TEmployeeContractPrePushFascVo empInfo = tEmpContactInfoMapper.getTEmpInfoOneByCard(empIdCard); TEmployeeContractPrePushFascVo empInfo = tEmpContactInfoMapper.getTEmpInfoOneByCard(empIdCard);
if (empContactInfo != null) { if (empContactInfo != null) {
contract.setContactEmpName(empContactInfo.getContactEmpName()); contract.setContactEmpName(empContactInfo.getContactEmpName());
contract.setContactTel(empContactInfo.getContactTel()); contract.setContactTel(empContactInfo.getContactTel());
contract.setContactAddress(empContactInfo.getContactAddress()); contract.setContactAddress(empContactInfo.getContactAddress());
} }
// 如果员工档案信息有,默认用档案的手机号
if (empInfo != null) { if (empInfo != null) {
contract.setHuArea(empInfo.getHuArea()); contract.setHuArea(empInfo.getHuArea());
contract.setContactArea(empInfo.getContactArea()); contract.setContactArea(empInfo.getContactArea());
contract.setEmpEmail(empInfo.getEmpEmail()); contract.setEmpEmail(empInfo.getEmpEmail());
contract.setEmpPhone(empInfo.getEmpPhone());
} }
if (Common.isEmpty(contract.getFadadaTemplateId())) { if (Common.isEmpty(contract.getFadadaTemplateId())) {
......
...@@ -136,7 +136,8 @@ ...@@ -136,7 +136,8 @@
,ifnull(sc2.AREA_NAME,'') ,ifnull(sc2.AREA_NAME,'')
,ifnull(st2.AREA_NAME,'') ,ifnull(st2.AREA_NAME,'')
,ifnull(a.CONTACT_ADDRESS,'') ,ifnull(a.CONTACT_ADDRESS,'')
) contactArea,a.EMP_EMAIL empEmail ) contactArea,a.EMP_EMAIL empEmail,
a.EMP_PHONE empPhone
from t_employee_info a from t_employee_info a
left join sys_area sp on sp.id = a.ID_PROVINCE left join sys_area sp on sp.id = a.ID_PROVINCE
left join sys_area sc on sc.id = a.ID_CITY left join sys_area sc on sc.id = a.ID_CITY
......
...@@ -18,12 +18,11 @@ ...@@ -18,12 +18,11 @@
package com.yifu.cloud.plus.v1.yifu.social.entity; package com.yifu.cloud.plus.v1.yifu.social.entity;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
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.mybatis.base.BaseEntity; 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 jdk.nashorn.internal.ir.annotations.Ignore;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
...@@ -77,6 +76,7 @@ public class THouseHoldLimit extends BaseEntity { ...@@ -77,6 +76,7 @@ public class THouseHoldLimit extends BaseEntity {
/** /**
* 缴纳地-市 * 缴纳地-市
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ExcelAttribute(name = "缴纳地-市", maxLength = 10) @ExcelAttribute(name = "缴纳地-市", maxLength = 10)
@Length(max = 10, message = "缴纳地-市不能超过10个字符") @Length(max = 10, message = "缴纳地-市不能超过10个字符")
@ExcelProperty("缴纳地-市") @ExcelProperty("缴纳地-市")
...@@ -85,6 +85,7 @@ public class THouseHoldLimit extends BaseEntity { ...@@ -85,6 +85,7 @@ public class THouseHoldLimit extends BaseEntity {
/** /**
* 缴纳地-县 * 缴纳地-县
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ExcelAttribute(name = "缴纳地-县", maxLength = 10) @ExcelAttribute(name = "缴纳地-县", maxLength = 10)
@Length(max = 10, message = "缴纳地-县不能超过10个字符") @Length(max = 10, message = "缴纳地-县不能超过10个字符")
@ExcelProperty("缴纳地-县") @ExcelProperty("缴纳地-县")
......
...@@ -82,6 +82,15 @@ public class TDispatchAuditExportVo { ...@@ -82,6 +82,15 @@ public class TDispatchAuditExportVo {
@ExcelProperty("项目名称") @ExcelProperty("项目名称")
private String settleDomainName; private String settleDomainName;
/**
* 我司到款单位
*/
@ExcelAttribute(name = "我司到款单位", maxLength = 100)
@Schema(description = "我司到款单位" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("我司到款单位" )
private String unitOfOurCompany;
@ExcelAttribute(name = "手机号码", maxLength = 32) @ExcelAttribute(name = "手机号码", maxLength = 32)
@Schema(description = "手机号码" ) @Schema(description = "手机号码" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
......
...@@ -91,6 +91,15 @@ public class TDispatchInfoExportVo { ...@@ -91,6 +91,15 @@ public class TDispatchInfoExportVo {
@ExcelProperty("项目编码" ) @ExcelProperty("项目编码" )
private String settleDomainCode; private String settleDomainCode;
/**
* 我司到款单位
*/
@ExcelAttribute(name = "我司到款单位", maxLength = 100)
@Schema(description = "我司到款单位" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("我司到款单位" )
private String unitOfOurCompany;
@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE) @ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
@Schema(description = "员工类型") @Schema(description = "员工类型")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
......
...@@ -57,6 +57,15 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable { ...@@ -57,6 +57,15 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
@ExcelProperty("项目编码") @ExcelProperty("项目编码")
private String settleDomainCode; private String settleDomainCode;
/**
* 我司到款单位
*/
@ExcelAttribute(name = "我司到款单位", maxLength = 100)
@Schema(description = "我司到款单位" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("我司到款单位" )
private String unitOfOurCompany;
@ExcelAttribute(name = "员工姓名", maxLength = 50) @ExcelAttribute(name = "员工姓名", maxLength = 50)
@Schema(description = "员工姓名") @Schema(description = "员工姓名")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
......
...@@ -83,6 +83,7 @@ ...@@ -83,6 +83,7 @@
<result property="dispatchItem" column="DISPATCH_ITEM"/> <result property="dispatchItem" column="DISPATCH_ITEM"/>
<result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/> <result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/>
<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/> <result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
<result property="unitOfOurCompany" column="UNIT_OF_OUR_COMPANY"/>
<result property="belongUnitName" column="BELONG_UNIT_NAME"/> <result property="belongUnitName" column="BELONG_UNIT_NAME"/>
<result property="dispatchCode" column="DISPATCH_CODE"/> <result property="dispatchCode" column="DISPATCH_CODE"/>
<result property="againDispatchCode" column="AGAIN_DISPATCH_CODE"/> <result property="againDispatchCode" column="AGAIN_DISPATCH_CODE"/>
...@@ -134,6 +135,7 @@ ...@@ -134,6 +135,7 @@
<result property="belongUnitName" column="BELONG_UNIT_NAME"/> <result property="belongUnitName" column="BELONG_UNIT_NAME"/>
<result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/> <result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/>
<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/> <result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
<result property="unitOfOurCompany" column="UNIT_OF_OUR_COMPANY"/>
<result property="type" column="TYPE"/> <result property="type" column="TYPE"/>
<result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/> <result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/>
<result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/> <result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/>
...@@ -323,6 +325,7 @@ ...@@ -323,6 +325,7 @@
<result property="empIdcard" column="EMP_IDCARD"/> <result property="empIdcard" column="EMP_IDCARD"/>
<result property="belongUnitName" column="BELONG_UNIT_NAME"/> <result property="belongUnitName" column="BELONG_UNIT_NAME"/>
<result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/> <result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/>
<result property="unitOfOurCompany" column="UNIT_OF_OUR_COMPANY"/>
<result property="empMobile" column="EMP_MOBILE"/> <result property="empMobile" column="EMP_MOBILE"/>
<result property="idCardAddress" column="ID_CARD_ADDRESS"/> <result property="idCardAddress" column="ID_CARD_ADDRESS"/>
...@@ -444,6 +447,7 @@ ...@@ -444,6 +447,7 @@
a.DISPATCH_CODE, a.DISPATCH_CODE,
a.AGAIN_DISPATCH_CODE, a.AGAIN_DISPATCH_CODE,
a.SETTLE_DOMAIN_CODE, a.SETTLE_DOMAIN_CODE,
a.UNIT_OF_OUR_COMPANY,
a.CONTRACT_SUB_NAME, a.CONTRACT_SUB_NAME,
a.CONTRACT_ID, a.CONTRACT_ID,
a.EDUCATION_NAME, a.EDUCATION_NAME,
...@@ -829,6 +833,7 @@ ...@@ -829,6 +833,7 @@
a.BELONG_UNIT_NAME, a.BELONG_UNIT_NAME,
a.SETTLE_DOMAIN_NAME, a.SETTLE_DOMAIN_NAME,
a.SETTLE_DOMAIN_CODE, a.SETTLE_DOMAIN_CODE,
a.UNIT_OF_OUR_COMPANY,
case when a.TYPE = 0 then "派增" case when a.TYPE = 0 then "派增"
when a.TYPE = 1 then "派减" when a.TYPE = 1 then "派减"
else null end as "TYPE" , else null end as "TYPE" ,
...@@ -1051,6 +1056,7 @@ ...@@ -1051,6 +1056,7 @@
a.ID_CARD_ADDRESS, a.ID_CARD_ADDRESS,
a.BELONG_UNIT_NAME, a.BELONG_UNIT_NAME,
a.SETTLE_DOMAIN_NAME, a.SETTLE_DOMAIN_NAME,
a.UNIT_OF_OUR_COMPANY,
a.TYPE, a.TYPE,
a.SOCIAL_HOUSEHOLD_NAME, a.SOCIAL_HOUSEHOLD_NAME,
a.PROVIDENT_HOUSEHOLD_NAME, a.PROVIDENT_HOUSEHOLD_NAME,
......
...@@ -176,6 +176,7 @@ ...@@ -176,6 +176,7 @@
<result property="empType" column="EMP_TYPE"/> <result property="empType" column="EMP_TYPE"/>
<result property="empMobile" column="EMP_MOBILE"/> <result property="empMobile" column="EMP_MOBILE"/>
<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/> <result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
<result property="unitOfOurCompany" column="UNIT_OF_OUR_COMPANY"/>
<result property="unitName" column="UNIT_NAME"/> <result property="unitName" column="UNIT_NAME"/>
<result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/> <result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/>
<result property="idCardProvince" column="ID_CARD_PROVINCE"/> <result property="idCardProvince" column="ID_CARD_PROVINCE"/>
...@@ -319,6 +320,7 @@ ...@@ -319,6 +320,7 @@
a.EMP_TYPE, a.EMP_TYPE,
a.SETTLE_DOMAIN, a.SETTLE_DOMAIN,
if(a.SETTLE_DOMAIN_CODE = a.SETTLE_DOMAIN_CODE_FUND,a.SETTLE_DOMAIN_CODE,concat(ifnull(a.SETTLE_DOMAIN_CODE,""),if((a.SETTLE_DOMAIN_CODE is not null and a.SETTLE_DOMAIN_CODE !='') and (a.SETTLE_DOMAIN_CODE_FUND is not null and a.SETTLE_DOMAIN_CODE_FUND !=''),",",""),ifnull(a.SETTLE_DOMAIN_CODE_FUND,""))) SETTLE_DOMAIN_CODE, if(a.SETTLE_DOMAIN_CODE = a.SETTLE_DOMAIN_CODE_FUND,a.SETTLE_DOMAIN_CODE,concat(ifnull(a.SETTLE_DOMAIN_CODE,""),if((a.SETTLE_DOMAIN_CODE is not null and a.SETTLE_DOMAIN_CODE !='') and (a.SETTLE_DOMAIN_CODE_FUND is not null and a.SETTLE_DOMAIN_CODE_FUND !=''),",",""),ifnull(a.SETTLE_DOMAIN_CODE_FUND,""))) SETTLE_DOMAIN_CODE,
a.UNIT_OF_OUR_COMPANY,
if(a.SETTLE_DOMAIN_NAME = a.SETTLE_DOMAIN_NAME_FUND,a.SETTLE_DOMAIN_NAME,concat(ifnull(a.SETTLE_DOMAIN_NAME,""),if((a.SETTLE_DOMAIN_NAME is not null and a.SETTLE_DOMAIN_NAME !='') and (a.SETTLE_DOMAIN_NAME_FUND is not null and a.SETTLE_DOMAIN_NAME_FUND !=''),",",""),ifnull(a.SETTLE_DOMAIN_NAME_FUND,""))) SETTLE_DOMAIN_NAME, if(a.SETTLE_DOMAIN_NAME = a.SETTLE_DOMAIN_NAME_FUND,a.SETTLE_DOMAIN_NAME,concat(ifnull(a.SETTLE_DOMAIN_NAME,""),if((a.SETTLE_DOMAIN_NAME is not null and a.SETTLE_DOMAIN_NAME !='') and (a.SETTLE_DOMAIN_NAME_FUND is not null and a.SETTLE_DOMAIN_NAME_FUND !=''),",",""),ifnull(a.SETTLE_DOMAIN_NAME_FUND,""))) SETTLE_DOMAIN_NAME,
if(a.UNIT_NAME = a.UNIT_NAME_FUND,a.UNIT_NAME,concat(ifnull(a.UNIT_NAME,""),if((a.UNIT_NAME is not null and a.UNIT_NAME !='') and (a.UNIT_NAME_FUND is not null and a.UNIT_NAME_FUND !=''),",",""),ifnull(a.UNIT_NAME_FUND,""))) UNIT_NAME, if(a.UNIT_NAME = a.UNIT_NAME_FUND,a.UNIT_NAME,concat(ifnull(a.UNIT_NAME,""),if((a.UNIT_NAME is not null and a.UNIT_NAME !='') and (a.UNIT_NAME_FUND is not null and a.UNIT_NAME_FUND !=''),",",""),ifnull(a.UNIT_NAME_FUND,""))) UNIT_NAME,
a.UNIT_ID, a.UNIT_ID,
......
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