Commit 9dbdca76 authored by fangxinjiang's avatar fangxinjiang

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

parents 2df0836b 6c94995c
......@@ -483,11 +483,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
} else {
baseMapper.updateById(tEmployeeContractInfo);
if (CommonConstants.TWO_STRING.equals(tEmployeeContractInfo.getContractType())
|| CommonConstants.ZERO_STRING.equals(tEmployeeContractInfo.getContractType())) {
tEmployeeContractInfo.setContractEnd(null);
baseMapper.updateContractEnd(tEmployeeContractInfo);
}
}
// 不是待提交,记录审核记录
......
......@@ -71,13 +71,13 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
private String settleDomainName;
/**
* 社保缴纳地
* 生成月份
*/
@ExcelAttribute(name = "社保缴纳地" )
@Schema(description ="社保缴纳地")
@ExcelAttribute(name = "生成月份")
@Schema(description ="生成月份")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保缴纳地")
private String socialPayAddr;
@ExcelProperty("生成月份")
private String socialCreateMonth;
/**
* 缴纳月份
......@@ -89,13 +89,22 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
private String socialPayMonth;
/**
* 生成月份
* 社保户
*/
@ExcelAttribute(name = "生成月份")
@Schema(description ="生成月份")
@ExcelAttribute(name = "社保户" )
@Schema(description ="社保户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生成月份")
private String socialCreateMonth;
@ExcelProperty("社保户")
private String socialHousehold;
/**
* 社保缴纳地
*/
@ExcelAttribute(name = "社保缴纳地" )
@Schema(description ="社保缴纳地")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保缴纳地")
private String socialPayAddr;
/**
* 养老金额
......@@ -147,14 +156,6 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
@ExcelProperty("补缴利息")
private BigDecimal accrualSum;
/**
* 社保户
*/
@ExcelAttribute(name = "社保户" )
@Schema(description ="社保户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保户")
private String socialHousehold;
/**
* 社保合计
......
......@@ -830,6 +830,25 @@
</if>
</sql>
<sql id="tPaymentInfo_export_socialFund_where1">
<if test="tPaymentInfo != null">
<if test="tPaymentInfo.idList == null">
<if test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''">
AND k.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold}
</if>
<if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
AND k.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold}
</if>
<if test="tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''">
AND k.SOCIAL_CREATE_MONTH = #{tPaymentInfo.socialCreateMonth}
</if>
<if test="tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''">
AND k.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth}
</if>
</if>
</if>
</sql>
<sql id="tPaymentInfo_export_fund_where">
<if test="tPaymentInfo != null">
<if test="tPaymentInfo.idList == null">
......@@ -1182,6 +1201,54 @@
<!--tPaymentInfo简单分页查询-->
<select id="getTPaymentInfoNewPageInfo" resultMap="tPaymentInfoNewMap">
SELECT
k.EMP_IDCARD,
k.EMP_NAME,
k.UNIT_NAME,
k.SETTLE_DOMAIN_NAME,
k.SOCIAL_HOUSEHOLD,
k.SOCIAL_SECURITY_NO,
k.SOCIAL_PAY_ADDR,
k.SOCIAL_PAY_MONTH,
k.SOCIAL_CREATE_MONTH,
k.PERSONAL_PROVIDENT_SUM,
k.SUM_ALL,
k.PROVIDENT_HOUSEHOLD,
k.PROVIDENT_PAY_ADDR,
k.SOCIAL_SUM,
k.UNIT_SOCIAL_SUM,
k.SOCIAL_SECURITY_PERSONAL_SUM,
k.PROVIDENT_SUM,
k.COMPANY_ACCRUAL,
k.PERSONAL_ACCRUAL,
k.UNIT_PENSION_SET,
k.UNIT_MEDICAL_SET,
k.UNIT_UNEMPLOYMENT_SET,
k.UNIT_INJURY_SET,
k.UNIT_BIRTH_SET,
k.UNIT_PENSION_MONEY,
k.UNIT_MEDICAL_MONEY,
k.UNIT_UNEMPLOYMENT_MONEY,
k.UNIT_INJURY_MONEY,
k.UNIT_BIRTH_MONEY,
k.UNIT_BIGMAILMENT_MONEY,
k.PERSONAL_PENSION_MONEY,
k.PERSONAL_MEDICAL_MONEY,
k.PERSONAL_UNEMPLOYMENT_MONEY,
k.PERSONAL_BIGMAILMENT_MONEY,
k.PENSION_MONEY_SUM,
k.MEDICAL_MONEY_SUM,
k.UNEMPLOYMENT_MONEY_SUM,
k.BIGMAILMENT_MONEY_SUM,
k.ACCRUAL_SUM,
k.PROVIDENT_NO,
k.PERSONAL_PROIDENT_SET,
k.UNIT_PROVIDENT_SET,
k.PROVIDENT_PERCENT,
k.SOCIAL_FUND_PERSONAL_SUM,
k.UNIT_SOCIAL_FUND_SUM,
k.UNIT_PROVIDENT_SUM
from (
select
w.keyGroup,
w.EMP_IDCARD,
w.EMP_NAME,
......@@ -1338,7 +1405,11 @@
GROUP BY a.EMP_IDCARD,a.PROVIDENT_PAY_MONTH,a.PROVIDENT_CREATE_MONTH,a.SETTLE_DOMAIN_CODE
)
) w
GROUP BY w.keyGroup
GROUP BY w.keyGroup) k
<where>
1 = 1
<include refid="tPaymentInfo_export_socialFund_where1"/>
</where>
</select>
<!--tPaymentInfo数量查询-->
......
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