Commit f80ba65d authored by huyuchen's avatar huyuchen

Merge branch 'MVP1.6.0' into develop

parents c9ba39c0 648012a7
spring.ldap.urls=ldap://192.168.0.240:389 spring.ldap.urls=ldap://192.168.1.65:389
spring.ldap.username=cn=admin,dc=worfu,dc=com spring.ldap.username=cn=admin,dc=worfu,dc=com
spring.ldap.password=Yifu123456! spring.ldap.password=yifu123456!
spring.ldap.base=dc=worfu,dc=com spring.ldap.base=dc=worfu,dc=com
\ No newline at end of file
ldap.url=192.168.0.240 ldap.url=192.168.1.65
ldap.port=389 ldap.port=389
ldap.userName=cn=admin,dc=worfu,dc=com ldap.userName=cn=admin,dc=worfu,dc=com
ldap.password=Yifu123ABC! ldap.password=yifu123456!
ldap.dn=dc=worfu,dc=com ldap.dn=dc=worfu,dc=com
ldap.baseDn=ou=\u7696\u4FE1\u4EBA\u529B\u96C6\u56E2,ou=wanxin,dc=worfu,dc=com ldap.baseDn=ou=\u5B89\u5FBD\u7696\u4FE1\u4EBA\u529B\u8D44\u6E90\u7BA1\u7406\u6709\u9650\u516C\u53F8,ou=wanxin,dc=worfu,dc=com
\ No newline at end of file \ No newline at end of file
...@@ -288,7 +288,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap ...@@ -288,7 +288,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if (SalaryConstants.RELAY_SALARY_JAVA.equals(item.getJavaFiedName())) { if (SalaryConstants.RELAY_SALARY_JAVA.equals(item.getJavaFiedName())) {
ySalary = ySalary.add(item.getSalaryMoney()); ySalary = ySalary.add(item.getSalaryMoney());
} }
if (item.getSettlementMonth().equals(DateUtil.getMonth(DateUtil.getCurrentDateTime()))) { if (item.getSettlementMonth().equals(DateUtil.getYearAndMonth(LocalDateTime.now(),0))) {
//减除费用 //减除费用
if (SalaryConstants.COST_REDUCTION_JAVA.equals(item.getJavaFiedName())) { if (SalaryConstants.COST_REDUCTION_JAVA.equals(item.getJavaFiedName())) {
costReductionList.add(item.getSalaryMoney()); costReductionList.add(item.getSalaryMoney());
......
...@@ -83,7 +83,7 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> { ...@@ -83,7 +83,7 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
**/ **/
int updatePushStatus(@Param("idList") List<String> idList); int updatePushStatus(@Param("idList") List<String> idList);
int checkForecastChange(@Param("idSet") Set<String> idSet); List<String> checkForecastChange(@Param("idSet") Set<String> idSet);
/** /**
* @param idSet * @param idSet
......
...@@ -208,7 +208,7 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> { ...@@ -208,7 +208,7 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
* @Date: 2022/11/16 17:32 * @Date: 2022/11/16 17:32
* @return: int * @return: int
**/ **/
int checkPaymentChange(@Param("idSet") Set<String> idSet); List<String> checkPaymentChange(@Param("idSet") Set<String> idSet);
/** /**
* @param idSet * @param idSet
......
...@@ -3449,10 +3449,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -3449,10 +3449,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} }
} }
if (!idSet.isEmpty()) { if (!idSet.isEmpty()) {
// 查询是否允许划转缴费库、预估库 的 社保、公积金 // 查询是否允许划转缴费库、预估库 的 社保、公积金
boolean flag = this.checkChange(idSet); List<String> settleList = baseMapper.checkPaymentChange(idSet);
if (!flag) { if (settleList.isEmpty()) {
return R.failed("社保公积金已被结算,请先退回并删除工资表!"); settleList = tForecastLibraryMapper.checkForecastChange(idSet);
}
if (!settleList.isEmpty()) {
String idStr = Common.ListToStr(settleList,",");
return R.failed(idStr + "的社保公积金已被结算,请先退回并删除工资表!");
} }
// 1划转缴费率、预估库的项目(社保公积金) // 1划转缴费率、预估库的项目(社保公积金)
...@@ -3585,23 +3589,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -3585,23 +3589,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
return true; return true;
} }
/**
* @param idSet
* @Description: 校验是否存在已结算薪资的数据
* @Author: hgw
* @Date: 2022/11/16 17:30
* @return: boolean
**/
private boolean checkChange(Set<String> idSet) {
int settleCount = baseMapper.checkPaymentChange(idSet);
if (settleCount == 0) {
settleCount = tForecastLibraryMapper.checkForecastChange(idSet);
return settleCount == 0;
} else {
return false;
}
}
private Map<String, TSettleDomainSelectVo> getSelectVoMap() { private Map<String, TSettleDomainSelectVo> getSelectVoMap() {
R<TSettleDomainListVo> settleDomainR = archivesDaprUtil.selectAllSettleDomainSelectVos(); R<TSettleDomainListVo> settleDomainR = archivesDaprUtil.selectAllSettleDomainSelectVos();
Map<String,TSettleDomainSelectVo> mapSelectVo = null; Map<String,TSettleDomainSelectVo> mapSelectVo = null;
......
...@@ -32,7 +32,7 @@ spring: ...@@ -32,7 +32,7 @@ spring:
type: CLASS_BASED type: CLASS_BASED
tables: tables:
t_payment_info: t_payment_info:
actual-data-nodes: ds0.t_payment_info_20$->{17..23} actual-data-nodes: ds0.t_payment_info_20$->{17..24}
key-generate-strategy: key-generate-strategy:
column: ID column: ID
key-generator-name: snowflake key-generator-name: snowflake
......
...@@ -32,7 +32,7 @@ spring: ...@@ -32,7 +32,7 @@ spring:
type: CLASS_BASED type: CLASS_BASED
tables: tables:
t_payment_info: t_payment_info:
actual-data-nodes: ds0.t_payment_info_20$->{17..23} actual-data-nodes: ds0.t_payment_info_20$->{17..24}
key-generate-strategy: key-generate-strategy:
column: ID column: ID
key-generator-name: snowflake key-generator-name: snowflake
......
...@@ -32,7 +32,7 @@ spring: ...@@ -32,7 +32,7 @@ spring:
type: CLASS_BASED type: CLASS_BASED
tables: tables:
t_payment_info: t_payment_info:
actual-data-nodes: ds0.t_payment_info_20$->{17..23} actual-data-nodes: ds0.t_payment_info_20$->{17..24}
key-generate-strategy: key-generate-strategy:
column: ID column: ID
key-generator-name: snowflake key-generator-name: snowflake
......
...@@ -710,8 +710,8 @@ ...@@ -710,8 +710,8 @@
</update> </update>
<!-- 校验预估库库是否有已结算的数据,有,则不允许ekp费用划转 --> <!-- 校验预估库库是否有已结算的数据,有,则不允许ekp费用划转 -->
<select id="checkForecastChange" resultType="java.lang.Integer"> <select id="checkForecastChange" resultType="java.lang.String">
select count(1) from t_forecast_library p select p.EMP_IDCARD from t_forecast_library p
where (p.SALARY_SOCIAL_FLAG = '1' or p.SALARY_FUND_FLAG = '1') and p.id in where (p.SALARY_SOCIAL_FLAG = '1' or p.SALARY_FUND_FLAG = '1') and p.id in
<foreach item="item" index="index" collection="idSet" open="(" separator="," close=")"> <foreach item="item" index="index" collection="idSet" open="(" separator="," close=")">
#{item} #{item}
......
...@@ -2433,8 +2433,8 @@ ...@@ -2433,8 +2433,8 @@
</update> </update>
<!-- 校验缴费库是否有已结算的数据,有,则不允许ekp费用划转 --> <!-- 校验缴费库是否有已结算的数据,有,则不允许ekp费用划转 -->
<select id="checkPaymentChange" resultType="java.lang.Integer"> <select id="checkPaymentChange" resultType="java.lang.String">
select count(1) from t_payment_info p select p.EMP_IDCARD from t_payment_info p
where (p.SALARY_SOCIAL_FLAG = '1' or p.SALARY_FUND_FLAG = '1') and p.id in where (p.SALARY_SOCIAL_FLAG = '1' or p.SALARY_FUND_FLAG = '1') and p.id in
<foreach item="item" index="index" collection="idSet" open="(" separator="," close=")"> <foreach item="item" index="index" collection="idSet" open="(" separator="," close=")">
#{item} #{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