Commit 4a326a7a authored by fangxinjiang's avatar fangxinjiang

见费出单逻辑-fxj

parent 7f8e22bb
...@@ -341,7 +341,7 @@ public class TEmployeeContractPreController { ...@@ -341,7 +341,7 @@ public class TEmployeeContractPreController {
* @return R * @return R
*/ */
@Operation(summary = "通过id查询", description = "通过id查询") @Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/getInfoByRegistId " ) @GetMapping("/getInfoByRegistId" )
public R<TEmployeeContractPre> getInfoByRegistId(@RequestParam("registId" ) String registId) { public R<TEmployeeContractPre> getInfoByRegistId(@RequestParam("registId" ) String registId) {
return tEmployeeContractPreService.getInfoByRegistId(registId); return tEmployeeContractPreService.getInfoByRegistId(registId);
} }
......
...@@ -1250,7 +1250,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -1250,7 +1250,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
return R.failed(CommonConstants.PARAM_INFO_ERROR); return R.failed(CommonConstants.PARAM_INFO_ERROR);
} }
return R.ok(baseMapper.selectOne(Wrappers.<TEmployeeContractPre>query().lambda() return R.ok(baseMapper.selectOne(Wrappers.<TEmployeeContractPre>query().lambda()
.in(TEmployeeContractPre::getProcessStatus, Arrays.asList("0","1","3","5","7","10","11")) .notIn(TEmployeeContractPre::getProcessStatus, Arrays.asList("0","1","3","5","7","10","11"))
.eq(TEmployeeContractPre::getRegisterId, registId) .eq(TEmployeeContractPre::getRegisterId, registId)
.last(CommonConstants.LAST_ONE_SQL))); .last(CommonConstants.LAST_ONE_SQL)));
} }
......
...@@ -337,7 +337,7 @@ public class TEmployeeInsurancePreController { ...@@ -337,7 +337,7 @@ public class TEmployeeInsurancePreController {
* @return R * @return R
*/ */
@Operation(summary = "通过id查询", description = "通过id查询") @Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/getInfoByRegistId " ) @GetMapping("/getInfoByRegistId" )
public R<TEmployeeInsurancePre> getInfoByRegistId(@RequestParam("registId" ) String registId) { public R<TEmployeeInsurancePre> getInfoByRegistId(@RequestParam("registId" ) String registId) {
return tEmployeeInsurancePreService.getInfoByRegistId(registId); return tEmployeeInsurancePreService.getInfoByRegistId(registId);
} }
......
...@@ -1008,7 +1008,7 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur ...@@ -1008,7 +1008,7 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
return R.failed(CommonConstants.PARAM_INFO_ERROR); return R.failed(CommonConstants.PARAM_INFO_ERROR);
} }
return R.ok(baseMapper.selectOne(Wrappers.<TEmployeeInsurancePre>query().lambda() return R.ok(baseMapper.selectOne(Wrappers.<TEmployeeInsurancePre>query().lambda()
.in(TEmployeeInsurancePre::getProcessStatus, Arrays.asList("0","1","2","5")) .notIn(TEmployeeInsurancePre::getProcessStatus, Arrays.asList("0","1","2","5"))
.eq(TEmployeeInsurancePre::getRegisterId, registId).last(CommonConstants.LAST_ONE_SQL))); .eq(TEmployeeInsurancePre::getRegisterId, registId).last(CommonConstants.LAST_ONE_SQL)));
} }
} }
...@@ -1811,6 +1811,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1811,6 +1811,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//如果是见费出单,投保中,推送作废 2026-01-22 v1.7.19 //如果是见费出单,投保中,推送作废 2026-01-22 v1.7.19
if (CommonConstants.ZERO_STRING.equals(detail.getIsJfcd())){ if (CommonConstants.ZERO_STRING.equals(detail.getIsJfcd())){
//红冲预估推送 //红冲预估推送
detail.setDefaultSettleId(burden.getId());
pushResult = pushEstimate(detail, CommonConstants.THREE_INT); pushResult = pushEstimate(detail, CommonConstants.THREE_INT);
//已投保 需要处理实缴和差额数据 (已支出或支出中禁止退保) //已投保 需要处理实缴和差额数据 (已支出或支出中禁止退保)
if (CommonConstants.THREE_INT == detail.getBuyHandleStatus()){ if (CommonConstants.THREE_INT == detail.getBuyHandleStatus()){
...@@ -1880,14 +1881,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1880,14 +1881,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
operateList.add(e); operateList.add(e);
} }
}); });
//如果是见费出单,投保中,推送作废 2026-01-22 v1.7.19 updateEmployeeInsurancePreById(detail,Stream.of("3","4","6").collect(Collectors.toList()),CommonConstants.FIVE_STRING);
if (CommonConstants.ZERO_STRING.equals(detail.getIsJfcd())){ updateEmployeeInsurancePreRenewById(detail,Stream.of("3","4","6").collect(Collectors.toList()),CommonConstants.FIVE_STRING, true);
updateEmployeeInsurancePreById(detail,Stream.of("3","4","6").collect(Collectors.toList()),CommonConstants.SEVEN_STRING);
updateEmployeeInsurancePreRenewById(detail,Stream.of("3","4","6").collect(Collectors.toList()),CommonConstants.SEVEN_STRING, true);
}else {
updateEmployeeInsurancePreById(detail,Stream.of("3","4","6").collect(Collectors.toList()),CommonConstants.FIVE_STRING);
updateEmployeeInsurancePreRenewById(detail,Stream.of("3","4","6").collect(Collectors.toList()),CommonConstants.FIVE_STRING, true);
}
} }
//更新状态 //更新状态
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
from from
ekp_insurances_info ekp_insurances_info
where where
fd_3b0a5743acab7e = #{id} and fd_3adfe6af71a1cc = '实缴' limit 1 fd_3b0a5743acab7e like CONCAT(#{id},'%') and fd_3adfe6af71a1cc = '实缴' limit 1
</select> </select>
<select id="getSettleStatusFromEkpAsso" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSettleStatusVo"> <select id="getSettleStatusFromEkpAsso" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSettleStatusVo">
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
ekp_insurances_info ekp_insurances_info
where where
fd_3adfe6af71a1cc = '差额' and fd_jfcd='是' and fd_3adfe6af71a1cc = '差额' and fd_jfcd='是' and
fd_3b0a5743acab7e like concact(#{id},'%') fd_3b0a5743acab7e like CONCAT(#{id},'%')
</select> </select>
<delete id="deleteEkpInsuranceDetail"> <delete id="deleteEkpInsuranceDetail">
delete from ekp_insurances_info where fd_3b0a5743acab7e=#{id} and fd_jfcd='是' and fd_3adfe6af71a1cc = '预估' delete from ekp_insurances_info where fd_3b0a5743acab7e=#{id} and fd_jfcd='是' and fd_3adfe6af71a1cc = '预估'
......
...@@ -410,7 +410,7 @@ public class TDispatchInfoPreController { ...@@ -410,7 +410,7 @@ public class TDispatchInfoPreController {
* @return R * @return R
*/ */
@Operation(summary = "通过id查询", description = "通过id查询") @Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/getInfoByRegistId " ) @GetMapping("/getInfoByRegistId" )
public R<TDispatchInfoPre> getInfoByRegistId(@RequestParam("registId" ) String registId, @RequestParam("type" ) String type) { public R<TDispatchInfoPre> getInfoByRegistId(@RequestParam("registId" ) String registId, @RequestParam("type" ) String type) {
return tDispatchInfoPreService.getInfoByRegistId(registId,type); return tDispatchInfoPreService.getInfoByRegistId(registId,type);
} }
......
...@@ -1069,7 +1069,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -1069,7 +1069,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
return R.failed(CommonConstants.PARAM_INFO_ERROR); return R.failed(CommonConstants.PARAM_INFO_ERROR);
} }
return R.ok(baseMapper.selectOne(Wrappers.<TDispatchInfoPre>query().lambda() return R.ok(baseMapper.selectOne(Wrappers.<TDispatchInfoPre>query().lambda()
.in(TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4", "8")) .notIn(TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4", "8"))
.eq(TDispatchInfoPre::getTypeSub,type) .eq(TDispatchInfoPre::getTypeSub,type)
.eq(TDispatchInfoPre::getRegisterId, registId).last(CommonConstants.LAST_ONE_SQL))); .eq(TDispatchInfoPre::getRegisterId, registId).last(CommonConstants.LAST_ONE_SQL)));
} }
......
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