Commit 1c81ec38 authored by hongguangwu's avatar hongguangwu

MVP1.5.4-派单委托备注(合同起缴日期等)

parent 3c83d31f
...@@ -117,4 +117,7 @@ public class TSalaryAccountExportVo { ...@@ -117,4 +117,7 @@ public class TSalaryAccountExportVo {
@ExcelProperty("支出结算状态") @ExcelProperty("支出结算状态")
private String paySettleFlag; private String paySettleFlag;
@ExcelProperty("HRO状态")
private String status;
} }
...@@ -292,6 +292,13 @@ public class SalaryAccountUtil implements Serializable { ...@@ -292,6 +292,13 @@ public class SalaryAccountUtil implements Serializable {
if (fieldType == null) { if (fieldType == null) {
continue; 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); setFields(field, cellValueStr, attr, fieldType, entity);
error = validateUtil(cellValueStr, attr, (i + 2)); error = validateUtil(cellValueStr, attr, (i + 2));
if (null != error) { if (null != error) {
......
...@@ -44,6 +44,7 @@ public class SalaryConstants { ...@@ -44,6 +44,7 @@ public class SalaryConstants {
public static final String IS_NEW = "是"; public static final String IS_NEW = "是";
public static final String ID_NUMBER = "身份证号"; public static final String ID_NUMBER = "身份证号";
public static final String SALARY_GIVE_TIME = "暂停发"; public static final String SALARY_GIVE_TIME = "暂停发";
public static final String SALARY_GIVE_TIME_TWO = "立即发";
//暂停发 //暂停发
public static final String SALARY_GIVE_TIME_VALUE = "1"; public static final String SALARY_GIVE_TIME_VALUE = "1";
//0:生成月; //0:生成月;
...@@ -192,4 +193,6 @@ public class SalaryConstants { ...@@ -192,4 +193,6 @@ public class SalaryConstants {
public static final String CUR_TAX_INFO = "当前项目薪酬人员已维护计税月份,计税月份沿用系统原值,其他字段已更新!"; public static final String CUR_TAX_INFO = "当前项目薪酬人员已维护计税月份,计税月份沿用系统原值,其他字段已更新!";
public static final String EKP_NO_RETURN = "推送EKP无结果返回"; public static final String EKP_NO_RETURN = "推送EKP无结果返回";
public static final String TAX_MONTH_LENGTH = "计税月份错误"; public static final String TAX_MONTH_LENGTH = "计税月份错误";
// 暂停发java
public static final String SALARY_GIVE_TIME_JAVA = "salaryGiveTime";
} }
...@@ -842,9 +842,11 @@ ...@@ -842,9 +842,11 @@
a.CREATE_NAME as createName, a.CREATE_NAME as createName,
GROUP_CONCAT(pdeduction.CN_NAME,':',pdeduction.SALARY_MONEY SEPARATOR ';') pdeductionDetail, GROUP_CONCAT(pdeduction.CN_NAME,':',pdeduction.SALARY_MONEY SEPARATOR ';') pdeductionDetail,
sum(ifnull(pdeduction.SALARY_MONEY,0)) pdeductionMoney, 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 from
t_salary_account a 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 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 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' left join t_salary_account_item enterpriseAnnuity on enterpriseAnnuity.SALARY_ACCOUNT_ID = a.id and enterpriseAnnuity.JAVA_FIED_NAME='enterpriseAnnuity'
...@@ -852,7 +854,7 @@ ...@@ -852,7 +854,7 @@
<where> <where>
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
<include refid="where_export"/> <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 != null">
<if test="searchVo.limitStart != null"> <if test="searchVo.limitStart != null">
limit #{searchVo.limitStart},#{searchVo.limitEnd} limit #{searchVo.limitStart},#{searchVo.limitEnd}
......
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