Skip to content

Y
yifu-mvp
Commit 7d325dc2 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

批量办理 100%

parent 85c92013
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 104 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @ 7d325dc2
......@@ -389,8 +389,8 @@ public class TEmployeeContractInfo extends BaseEntity {
/**
* 最新审核通过时间
*/
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@Schema(description = "最新审核通过时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime auditTimeLast;
/**
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @ 7d325dc2
......@@ -2113,6 +2113,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(c)){
c.setAuditStatus(CommonConstants.TWO_INT);
c.setInUse(CommonConstants.ZERO_STRING);
contractServicer.updateById(c);
}
......@@ -2165,6 +2166,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
contract.setAuditStatus(CommonConstants.ONE_INT);
contract.setApplyNo(contractServicer.getCode(false));
contract.setInUse(CommonConstants.ONE_STRING);
contractServicer.save(contract);
contractAdd.setId(contract.getId());
contractAdd.setEmpNo(contract.getEmpNo());
......
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @ 7d325dc2
......@@ -117,11 +117,11 @@ emp.dispatch.fund.not.empty=\u6D3E\u5355\u5458\u5DE5\u516C\u79EF\u91D1\u76F8\u51
emp.dispatch.social.existing=\u65B0\u589E\u5F02\u5E38\uFF1A\u5DF2\u5B58\u5728\u793E\u4FDD\u6570\u636E
emp.dispatch.social.injury.existing=\u65B0\u589E\u5F02\u5E38\uFF1A\u5B58\u5728\u529E\u7406\u6210\u529F\u672A\u6D3E\u51CF\u7684\u5DE5\u4F24\u793E\u4FDD\u6570\u636E
emp.dispatch.social.injury.existing=\u65B0\u589E\u5F02\u5E38\uFF1A\u5B58\u5728\u672A\u6D3E\u51CF\u7684\u5DE5\u4F24\u793E\u4FDD\u6570\u636E
emp.dispatch.social.not.reduce=\u65B0\u589E\u5F02\u5E38\uFF1A\u5B58\u5728\u529E\u7406\u6210\u529F\u672A\u6D3E\u51CF\u7684\u4E94\u9669\u793E\u4FDD\u6570\u636E\uFF0C\u7981\u6B62\u65B0\u589E\u5DE5\u4F24
emp.dispatch.social.not.reduce=\u65B0\u589E\u5F02\u5E38\uFF1A\u5B58\u5728\u672A\u6D3E\u51CF\u7684\u4E94\u9669\u793E\u4FDD\u6570\u636E\uFF0C\u7981\u6B62\u65B0\u589E\u5DE5\u4F24
emp.dispatch.social.injury.not.reduce=\u65B0\u589E\u5F02\u5E38\uFF1A\u5B58\u5728\u529E\u7406\u6210\u529F\u672A\u6D3E\u51CF\u7684\u5DE5\u4F24\u793E\u4FDD\u6570\u636E\uFF0C\u7981\u6B62\u65B0\u589E\u4E94\u9669
emp.dispatch.social.injury.not.reduce=\u65B0\u589E\u5F02\u5E38\uFF1A\u5B58\u5728\u672A\u6D3E\u51CF\u7684\u5DE5\u4F24\u793E\u4FDD\u6570\u636E\uFF0C\u7981\u6B62\u65B0\u589E\u4E94\u9669
emp.dispatch.social.hold.not.exist=\u65B0\u589E\u5F02\u5E38\uFF1A\u672A\u627E\u5230\u5BF9\u5E94\u793E\u4FDD\u6237\u540D\u79F0\u7684\u53EF\u7528\u57FA\u6570\u914D\u7F6E\u4FE1\u606F
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
View file @ 7d325dc2
......@@ -365,11 +365,11 @@ public class TDispatchInfo extends BaseEntity {
@ExcelProperty("社保办理状态" )
private String socialHandleStatus;
/**
* 公积金办理状态:0 未办理 1办理成功 2 办理失败 3 已派减
* 公积金办理状态:0 未办理 1办理成功 2 办理失败
*/
@Length(max = 1, message = "公积金办理状态 不能超过1个字符" )
@ExcelAttribute(name = "公积金办理状态", maxLength = 1)
@Schema(description = "公积金办理状态:0 未办理 1办理成功 2 办理失败 3 已派减" )
@Schema(description = "公积金办理状态:0 未办理 1办理成功 2 办理失败 " )
@ExcelProperty("公积金办理状态" )
private String fundHandleStatus;
/**
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
View file @ 7d325dc2
......@@ -763,4 +763,20 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty("基数下限（社保或公积金）")
private BigDecimal lowerLimit;
/**
* 单位社保合计
*/
@ExcelAttribute(name = "单位社保合计" )
@Schema(description ="单位社保合计")
@ExcelProperty("单位社保合计")
private BigDecimal unitSocialSum;
/**
* 个人社保合计
*/
@ExcelAttribute(name = "个人社保合计" )
@Schema(description ="个人社保合计")
@ExcelProperty("个人社保合计")
private BigDecimal personalSocialSum;
}
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @ 7d325dc2
......@@ -388,13 +388,17 @@
AND a.BELONG_UNIT_NAME = #{tDispatchInfo.belongUnitName}
</if>
<if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''">
<if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''">
AND s.SOCIAL_HOUSEHOLD_NAME = #{tDispatchInfo.socialHouseholdName}
</if>
<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
AND f.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName}
</if>
</if>
<if test="tDispatchInfo.createTimes != null and tDispatchInfo.createTimes.length>0">
AND a.UPDATE_TIME <![CDATA[ >= ]]> #{tDispatchInfo.createTimes[0]}
AND a.UPDATE_TIME <![CDATA[ <= ]]> #{tDispatchInfo.createTimes[1]}
</if>
</if>
</sql>
<!--tDispatchInfo简单分页查询-->
<select id="getTDispatchInfoPage" resultMap="dispatchPageMap">
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @ 7d325dc2
......@@ -386,7 +386,7 @@
a.PERSONAL_INTEREST_FEE,
a.SOCIAL_STATUS,
a.FUND_STATUS,
a.DISPATCH_ID
a.DISPATCH_ID,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM
</sql>
<sql id="tSocialFundInfo_where">
<if test="tSocialFundInfo != null">
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialInfoMapper.xml
View file @ 7d325dc2
......@@ -123,6 +123,8 @@
<result property="payPolicy" column="PAY_POLICY"/>
<result property="lowerLimit" column="LOWER_LIMIT"/>
<result property="upperLimit" column="UPPER_LIMIT"/>
<result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/>
<result property="personalSocialSum" column="PERSONAL_SOCIAL_SUM"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
......@@ -225,7 +227,7 @@
a.UPDATE_TIME,
a.PAY_POLICY,
a.LOWER_LIMIT,
a.UPPER_LIMIT
a.UPPER_LIMIT,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM
</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