Commit a199dd3f authored by hongguangwu's avatar hongguangwu

MVP1.7.8-优化BUG

parent 7c42f7f8
...@@ -819,7 +819,7 @@ public class TInsuranceDetailController { ...@@ -819,7 +819,7 @@ public class TInsuranceDetailController {
* @Date: 2025/1/14 9:56 * @Date: 2025/1/14 9:56
* @return: com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskListVo * @return: com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskListVo
**/ **/
@SysLog("重新更新结算状态同步失败的数据") @SysLog("获取商险是否在保")
@Inner @Inner
@PostMapping("/inner/getRiskByIdCard") @PostMapping("/inner/getRiskByIdCard")
public SalaryRiskListVo getRiskByIdCard(@RequestBody List<TSalaryAccount> idCardList) { public SalaryRiskListVo getRiskByIdCard(@RequestBody List<TSalaryAccount> idCardList) {
......
...@@ -223,29 +223,31 @@ public class DoJointInsuranceTask { ...@@ -223,29 +223,31 @@ public class DoJointInsuranceTask {
String insuranceId; String insuranceId;
for (EkpInsuranceViewVo viewVo : viewVoList) { for (EkpInsuranceViewVo viewVo : viewVoList) {
//获取所有的明细id //获取所有的明细id
insuranceId = viewVo.getId().substring(0, 19); if (Common.isNotNull(viewVo.getId())) {
detail = insuranceDetailMapper.selectById(insuranceId); insuranceId = viewVo.getId().substring(0, 19);
if (Common.isNotNull(detail)) { detail = insuranceDetailMapper.selectById(insuranceId);
//判断订单类型是预估还是实缴 if (Common.isNotNull(detail)) {
if (InsurancesConstants.ACTUAL_SETTLE_BILL.equals(viewVo.getOrderType())) { //判断订单类型是预估还是实缴
//判断是收入还是支出结算单号 if (InsurancesConstants.ACTUAL_SETTLE_BILL.equals(viewVo.getOrderType())) {
if (CommonConstants.ZERO_STRING.equals(vo.getPayFlag())) { //判断是收入还是支出结算单号
detail.setSincomeSettleFlag(viewVo.getIncomeSettleFlag()); if (CommonConstants.ZERO_STRING.equals(vo.getPayFlag())) {
detail.setSincomeCollectFlag(viewVo.getIncomeCollectFlag()); detail.setSincomeSettleFlag(viewVo.getIncomeSettleFlag());
detail.setSincomeCollectFlag(viewVo.getIncomeCollectFlag());
} else {
detail.setSpaySettleFlag(viewVo.getPaySettleFlag());
detail.setSpayCollectFlag(viewVo.getPayCollectFlag());
}
} else { } else {
detail.setSpaySettleFlag(viewVo.getPaySettleFlag()); if (CommonConstants.ZERO_STRING.equals(vo.getPayFlag())) {
detail.setSpayCollectFlag(viewVo.getPayCollectFlag()); detail.setIncomeSettleFlag(viewVo.getIncomeSettleFlag());
} detail.setIncomeCollectFlag(viewVo.getIncomeCollectFlag());
} else { } else {
if (CommonConstants.ZERO_STRING.equals(vo.getPayFlag())) { detail.setPaySettleFlag(viewVo.getPaySettleFlag());
detail.setIncomeSettleFlag(viewVo.getIncomeSettleFlag()); detail.setPayCollectFlag(viewVo.getPayCollectFlag());
detail.setIncomeCollectFlag(viewVo.getIncomeCollectFlag()); }
} else {
detail.setPaySettleFlag(viewVo.getPaySettleFlag());
detail.setPayCollectFlag(viewVo.getPayCollectFlag());
} }
insuranceDetailMapper.updateById(detail);
} }
insuranceDetailMapper.updateById(detail);
} }
} }
} }
...@@ -393,29 +395,31 @@ public class DoJointInsuranceTask { ...@@ -393,29 +395,31 @@ public class DoJointInsuranceTask {
String insuranceId; String insuranceId;
for (EkpInsuranceViewVo viewVo : viewVoList) { for (EkpInsuranceViewVo viewVo : viewVoList) {
//获取所有的明细id //获取所有的明细id
insuranceId = viewVo.getId().substring(0, 19); if (Common.isNotNull(viewVo.getId())) {
detail = insuranceDetailMapper.selectById(insuranceId); insuranceId = viewVo.getId().substring(0, 19);
if (Common.isNotNull(detail)) { detail = insuranceDetailMapper.selectById(insuranceId);
//判断订单类型是预估还是实缴 if (Common.isNotNull(detail)) {
if (InsurancesConstants.ACTUAL_SETTLE_BILL.equals(viewVo.getOrderType())) { //判断订单类型是预估还是实缴
//判断是收入还是支出结算单号 if (InsurancesConstants.ACTUAL_SETTLE_BILL.equals(viewVo.getOrderType())) {
if (CommonConstants.ZERO_STRING.equals(error.getSettleType())) { //判断是收入还是支出结算单号
detail.setSincomeSettleFlag(viewVo.getIncomeSettleFlag()); if (CommonConstants.ZERO_STRING.equals(error.getSettleType())) {
detail.setSincomeCollectFlag(viewVo.getIncomeCollectFlag()); detail.setSincomeSettleFlag(viewVo.getIncomeSettleFlag());
} else { detail.setSincomeCollectFlag(viewVo.getIncomeCollectFlag());
detail.setSpaySettleFlag(viewVo.getPaySettleFlag()); } else {
detail.setSpayCollectFlag(viewVo.getPayCollectFlag()); detail.setSpaySettleFlag(viewVo.getPaySettleFlag());
} detail.setSpayCollectFlag(viewVo.getPayCollectFlag());
} else { }
if (CommonConstants.ZERO_STRING.equals(error.getSettleType())) {
detail.setIncomeSettleFlag(viewVo.getIncomeSettleFlag());
detail.setIncomeCollectFlag(viewVo.getIncomeCollectFlag());
} else { } else {
detail.setPaySettleFlag(viewVo.getPaySettleFlag()); if (CommonConstants.ZERO_STRING.equals(error.getSettleType())) {
detail.setPayCollectFlag(viewVo.getPayCollectFlag()); detail.setIncomeSettleFlag(viewVo.getIncomeSettleFlag());
detail.setIncomeCollectFlag(viewVo.getIncomeCollectFlag());
} else {
detail.setPaySettleFlag(viewVo.getPaySettleFlag());
detail.setPayCollectFlag(viewVo.getPayCollectFlag());
}
} }
insuranceDetailMapper.updateById(detail);
} }
insuranceDetailMapper.updateById(detail);
} }
} }
error.setStatus(CommonConstants.ONE_INT); error.setStatus(CommonConstants.ONE_INT);
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
from from
view_insurance_info b view_insurance_info b
where where
1 = 1 b.detailsId is not null
<if test="payFlag != null and payFlag != '' and payFlag == 0"> <if test="payFlag != null and payFlag != '' and payFlag == 0">
and b.earningNo = #{settleNo} and b.earningNo = #{settleNo}
</if> </if>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
from from
view_social_info a view_social_info a
where where
1 = 1 a.detailsId is not null
<if test="payFlag != null and payFlag != '' and payFlag == 0"> <if test="payFlag != null and payFlag != '' and payFlag == 0">
and a.earningNo = #{settleNo} and a.earningNo = #{settleNo}
</if> </if>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
from from
view_funds_info a view_funds_info a
where where
1 = 1 a.detailsId is not null
<if test="payFlag != null and payFlag != '' and payFlag == 0"> <if test="payFlag != null and payFlag != '' and payFlag == 0">
and a.earningNo = #{settleNo} and a.earningNo = #{settleNo}
</if> </if>
......
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