Skip to content

Y
yifu-mvp
Commit 489a7774 authored by zhenbin wang's avatar zhenbin wang
Browse files
Options

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

parents b4ba0add 0508cd9d
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 11 deletions
yifu-insurances/yifu-insurances-biz/src/main/resources/application-test.yml
View file @ 489a7774
......@@ -20,8 +20,8 @@ spring:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: root
password: ekp!@#123
jdbc-url: jdbc:mysql://36.7.147.19:20023/ekp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
password: ll_mysql
jdbc-url: jdbc:mysql://192.168.1.106:23306/ekp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
hikari:
minimum-idle: 10 # 最小空闲连接数量
idle-timeout: 60000 # 空闲连接存活最大时间，默认600000（10分钟）
......
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryAccountExportVo.java
View file @ 489a7774
......@@ -117,4 +117,7 @@ public class TSalaryAccountExportVo {
@ExcelProperty("支出结算状态")
private String paySettleFlag;
@ExcelProperty("HRO状态")
private String status;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @ 489a7774
......@@ -292,6 +292,13 @@ public class SalaryAccountUtil implements Serializable {
if (fieldType == null) {
continue;
}
if (SalaryConstants.SALARY_GIVE_TIME_JAVA.equals(scs.getJavaFiedName())
&& !SalaryConstants.SALARY_GIVE_TIME.equals(cellValueStr)
&& !SalaryConstants.SALARY_GIVE_TIME_TWO.equals(cellValueStr)) {
errorFlag = false;
errorList.add(new ErrorMessage((i + 2), "请注意：工资发放时间，只能是【立即发】或【暂停发】！你的内容：【"+cellValueStr+"】"));
continue;
}
setFields(field, cellValueStr, attr, fieldType, entity);
error = validateUtil(cellValueStr, attr, (i + 2));
if (null != error) {
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java
View file @ 489a7774
......@@ -44,6 +44,7 @@ public class SalaryConstants {
public static final String IS_NEW = "是";
public static final String ID_NUMBER = "身份证号";
public static final String SALARY_GIVE_TIME = "暂停发";
public static final String SALARY_GIVE_TIME_TWO = "立即发";
//暂停发
public static final String SALARY_GIVE_TIME_VALUE = "1";
//0：生成月；
......@@ -192,4 +193,6 @@ public class SalaryConstants {
public static final String CUR_TAX_INFO = "当前项目薪酬人员已维护计税月份，计税月份沿用系统原值，其他字段已更新！";
public static final String EKP_NO_RETURN = "推送EKP无结果返回";
public static final String TAX_MONTH_LENGTH = "计税月份错误";
// 暂停发java
public static final String SALARY_GIVE_TIME_JAVA = "salaryGiveTime";
}
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @ 489a7774
......@@ -842,9 +842,11 @@
a.CREATE_NAME as createName,
GROUP_CONCAT(pdeduction.CN_NAME,':',pdeduction.SALARY_MONEY SEPARATOR ';') pdeductionDetail,
sum(ifnull(pdeduction.SALARY_MONEY,0)) pdeductionMoney,
if(a.PAY_SETTLE_FLAG = '0','已结算',if(a.PAY_SETTLE_FLAG = '1','结算中',if(a.PAY_SETTLE_FLAG = '2','未结算','-'))) paySettleFlag
if(a.PAY_SETTLE_FLAG = '0','已结算',if(a.PAY_SETTLE_FLAG = '1','结算中',if(a.PAY_SETTLE_FLAG = '2','未结算','-'))) paySettleFlag,
case s.STATUS when 0 then '待提交' when 1 then '待审核' when 2 then '待推送明细' when 3 then '已推送待发放' when 4 then '已发放' when 5 then '审核不通过' when 7 then '财务退回' when 10 then '推送失败' when 11 then '已审核生成收入中' when 12 then '已审核生成收入失败' else '-' end as status
from
t_salary_account a
left join t_salary_standard s on a.SALARY_FORM_ID = s.id
left join t_salary_account_item annualBonus on annualBonus.SALARY_ACCOUNT_ID = a.id and annualBonus.JAVA_FIED_NAME = 'annualBonus'
left join t_salary_account_item exemptionPersionTax on exemptionPersionTax.SALARY_ACCOUNT_ID = a.id and exemptionPersionTax.JAVA_FIED_NAME='exemptionPersionTax'
left join t_salary_account_item enterpriseAnnuity on enterpriseAnnuity.SALARY_ACCOUNT_ID = a.id and enterpriseAnnuity.JAVA_FIED_NAME='enterpriseAnnuity'
......@@ -852,7 +854,7 @@
<where>
a.DELETE_FLAG = 0
<include refid="where_export"/>
GROUP BY a.id ORDER BY a.CREATE_TIME desc
GROUP BY a.id ORDER BY a.SETTLEMENT_MONTH asc
<if test="searchVo != null">
<if test="searchVo.limitStart != null">
limit #{searchVo.limitStart},#{searchVo.limitEnd}
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
View file @ 489a7774
......@@ -187,8 +187,8 @@ public class TDispatchInfoExportVo {
@ExcelProperty("公积金停缴日期" )
private Date fundReduceDate;
@ExcelAttribute(name = "社保审核状态", readConverterExp = "0=未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结")
@Schema(description = "社保审核状态：1待审核2审核通过3审核不通过4已办结")
@ExcelAttribute(name = "社保审核状态", readConverterExp = "0=未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结,5=待SSC审核")
@Schema(description = "社保审核状态：1待审核2审核通过3审核不通过4已办结5待SSC审核")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保审核状态")
private String auditStatus;
......@@ -231,7 +231,7 @@ public class TDispatchInfoExportVo {
/**
* 审核状态（0待审核/1已审核）
*/
@ExcelAttribute(name = "公积金审核状态",readConverterExp = "0=未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结")
@ExcelAttribute(name = "公积金审核状态",readConverterExp = "0=未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结,5=待SSC审核")
@Schema(description = "公积金审核状态:（0待审核/1已审核）" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金审核状态" )
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 489a7774
......@@ -2252,7 +2252,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isEmpty(empVo.getContractName()) && validContractInfo(errorMessageList,excel)) {
return true;
}
if (Common.isNotNull(empVo.getContractStart())) {
if (Common.isNotNull(empVo.getContractStart()) && Common.isNotNull(excel.getContractStart())) {
// 系统已存在的合同起缴日期
String conYearMonthDay = DateUtil.formatDatePatten(empVo.getContractStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT);
String excelConYearMonthDay = DateUtil.formatDatePatten(excel.getContractStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT);
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @ 489a7774
......@@ -598,6 +598,9 @@
<if test="tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''">
${tDispatchInfo.authSql}
</if>
<if test="tDispatchInfo.noCreateUser != null and tDispatchInfo.noCreateUser.trim() != ''">
AND a.CREATE_BY != #{tDispatchInfo.noCreateUser}
</if>
</if>
</sql>
......@@ -795,6 +798,7 @@
when a.STATUS = 2 then "审核通过"
when a.STATUS = 3 then "审核不通过"
when a.STATUS = 4 then "已办结"
when a.STATUS = 5 then "待SSC审核"
else null end )
) as FUND_AUDIT_STATUS,
c.AUDIT_USER_NAME as FUND_AUDIT_USER,
......@@ -807,6 +811,7 @@
when a.STATUS = 2 then "审核通过"
when a.STATUS = 3 then "审核不通过"
when a.STATUS = 4 then "已办结"
when a.STATUS = 5 then "待SSC审核"
else null end )
) as AUDIT_STATUS,
s.SOCIAL_START_DATE,
......@@ -883,7 +888,15 @@
left join t_social_info b on a.SOCIAL_ID = b.ID
left join t_provident_fund c on a.FUND_ID = C.ID
<where>
a.DELETE_FLAG = '0' and a.STATUS = '1'
a.DELETE_FLAG = '0'
<if test="tDispatchInfo != null">
<if test="tDispatchInfo.status != null and tDispatchInfo.status.trim() != ''">
AND a.STATUS = #{tDispatchInfo.status}
</if>
<if test="tDispatchInfo.status == null or tDispatchInfo.status.trim() == ''">
AND a.STATUS = '1'
</if>
</if>
<include refid="tDispatchInfoAudit_where"/>
</where>
order by a.APPLY_NO desc
......@@ -897,7 +910,15 @@
count(1)
from t_dispatch_info a
<where>
a.DELETE_FLAG = '0' and a.STATUS = '1'
a.DELETE_FLAG = '0'
<if test="tDispatchInfo != null">
<if test="tDispatchInfo.status != null and tDispatchInfo.status.trim() != ''">
AND a.STATUS = #{tDispatchInfo.status}
</if>
<if test="tDispatchInfo.status == null or tDispatchInfo.status.trim() == ''">
AND a.STATUS = '1'
</if>
</if>
<include refid="tDispatchInfoAudit_where"/>
</where>
</select>
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @ 489a7774
......@@ -540,7 +540,7 @@
#{idStr}
</foreach>
</if>
<if test="tSocialFundInfo.empTypeList != null ">
<if test="tSocialFundInfo.empTypeList != null and tSocialFundInfo.empTypeList.length>0">
AND a.EMP_TYPE IN
<foreach collection="tSocialFundInfo.empTypeList" item="item" index="index" open="(" separator="," close=")">
#{item}
......
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