Commit ddefcc07 authored by hongguangwu's avatar hongguangwu

MVP1.7.5-薪资提交校验

parent 2f98d330
......@@ -506,6 +506,14 @@ public class TSalaryStandard extends BaseEntity {
@ExcelProperty("是否校验商险")
private Integer isCheckRisk;
/**
* 校验商险通过的原因
*/
@ExcelAttribute(name = "校验商险通过的原因")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("校验商险通过的原因")
private String checkRiskRemark;
/**
* 工资月份-起
*/
......
......@@ -1180,19 +1180,19 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
if (!updatePerSonSalaryList.isEmpty()) {
tInsuranceUnpurchasePersonSalaryService.saveBatch(updatePerSonSalaryList);
}
return getTrueR(s, "校验通过");
return getTrueR(s, "校验【商险不购买】通过");
} else {
return new R<>(CommonConstants.TWO_INT, "校验商险不通过!", returnList);
return new R<>(CommonConstants.TWO_INT, "校验【商险不购买】不通过!", returnList);
}
} else {
return getTrueR(s, "均已购买商险");
return getTrueR(s, "均已购买【商险】");
}
}
} else {
return getTrueR(s, "没有报账明细,无需拦截");
}
} else {
return getTrueR(s, "项目不含风险无商险");
return getTrueR(s, "项目不含风险无商险");
}
} else {
return R.failed("获取项目信息失败,请联管理员!");
......@@ -1207,6 +1207,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
**/
private R<List<SalaryRiskVo>> getTrueR(TSalaryStandard s, String msg) {
s.setIsCheckRisk(CommonConstants.ONE_INT);
s.setCheckRiskRemark(msg);
this.updateById(s);
return R.ok(null, msg);
}
......
......@@ -90,6 +90,7 @@
<result property="newEmpUpdateFlag" column="NEW_EMP_UPDATE_FLAG"/>
<result property="isFixedColumn" column="IS_FIXED_COLUMN"/>
<result property="isCheckRisk" column="IS_CHECK_RISK"/>
<result property="checkRiskRemark" column="CHECK_RISK_REMARK"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
......@@ -157,7 +158,8 @@
a.ORIGINAL_SET_NAME,
a.NEW_EMP_UPDATE_FLAG,
a.IS_FIXED_COLUMN,
a.IS_CHECK_RISK
a.IS_CHECK_RISK,
a.CHECK_RISK_REMARK
</sql>
<sql id="tSalaryStandard_where">
<if test="tSalaryStandard != 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