Commit 440a0861 authored by fangxinjiang's avatar fangxinjiang

见费出单逻辑-fxj

parent 16e5ddb4
...@@ -140,6 +140,16 @@ public class SocialDaprUtils { ...@@ -140,6 +140,16 @@ public class SocialDaprUtils {
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tincomedetail/inner/deleteById", JSON.toJSONString(infoVo), Object.class, SecurityConstants.FROM_IN); HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tincomedetail/inner/deleteById", JSON.toJSONString(infoVo), Object.class, SecurityConstants.FROM_IN);
} }
/**
* @Author huyc
* @Description 通过收入id收入数据
* @Date 2022/9/2
* @Param
* @return
**/
public void deleteIncomeById(TIncomeDetail infoVo) {
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tincome/inner/deleteById", JSON.toJSONString(infoVo), Object.class, SecurityConstants.FROM_IN);
}
/** /**
* @Author huyc * @Author huyc
* @Description 更新结算信息 * @Description 更新结算信息
......
...@@ -400,22 +400,23 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -400,22 +400,23 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
LocalTime currentTime = LocalTime.now(); LocalTime currentTime = LocalTime.now();
R<TEmployeeInsuranceWorkDayVo> dataR; R<TEmployeeInsuranceWorkDayVo> dataR;
if (!currentTime.isBefore(LocalTime.of(15, 20)) && !currentTime.equals(LocalTime.of(15, 20))) { if (!currentTime.isBefore(LocalTime.of(15, 20)) && !currentTime.equals(LocalTime.of(15, 20))) {
//日期赋值 preDispatchDate = DateUtil.addDayByDate(preDispatchDate, 1);
dayVo = new TEmployeeInsuranceWorkDayVo(); }
dayVo.setType(CommonConstants.TWO_STRING); //日期赋值
dayVo.setRegistDate(preDispatchDate); dayVo = new TEmployeeInsuranceWorkDayVo();
try { dayVo.setType(CommonConstants.TWO_STRING);
dataR = socialDaprUtils.getBeforeOrAfterWorkDay(dayVo); dayVo.setRegistDate(preDispatchDate);
if (Common.isNotNull(dataR) try {
&& Common.isNotNull(dataR.getData()) dataR = socialDaprUtils.getBeforeOrAfterWorkDay(dayVo);
&& Common.isNotNull(dataR.getData().getRegistDate())) { if (Common.isNotNull(dataR)
preDispatchDate = dataR.getData().getRegistDate(); && Common.isNotNull(dataR.getData())
} else { && Common.isNotNull(dataR.getData().getRegistDate())) {
return R.failed("获取最近工作日失败!"); preDispatchDate = dataR.getData().getRegistDate();
} } else {
}catch (Exception e){ return R.failed("获取最近工作日失败!");
return R.failed("获取最近工作日异常:"+e.getMessage());
} }
}catch (Exception e){
return R.failed("获取最近工作日异常:"+e.getMessage());
} }
if (CollectionUtils.isNotEmpty(listSuccess)){ if (CollectionUtils.isNotEmpty(listSuccess)){
List<TInsuranceSettle> settleList = new ArrayList<>(); List<TInsuranceSettle> settleList = new ArrayList<>();
...@@ -9741,6 +9742,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -9741,6 +9742,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
BigDecimal sumMoney = BigDecimal.ZERO; BigDecimal sumMoney = BigDecimal.ZERO;
for (TIncomeDetail income : incomeDetailList) { for (TIncomeDetail income : incomeDetailList) {
socialDaprUtils.deleteById(income); socialDaprUtils.deleteById(income);
socialDaprUtils.deleteIncomeById(income);
//删除管理费 //删除管理费
ekpSettleService.deleteEkpManagerInfo(income.getId()); ekpSettleService.deleteEkpManagerInfo(income.getId());
//删除风险金 //删除风险金
......
...@@ -242,4 +242,16 @@ public class TIncomeController { ...@@ -242,4 +242,16 @@ public class TIncomeController {
public Boolean updateSocialSettleStatus(@RequestBody List<EkpInsuranceViewVo> viewVo) { public Boolean updateSocialSettleStatus(@RequestBody List<EkpInsuranceViewVo> viewVo) {
return tIncomeService.updateIncomeSettleStatus(viewVo); return tIncomeService.updateIncomeSettleStatus(viewVo);
} }
/**
* 通过id删除收入明细表
*
* @param tIncomeDetail
* @return R
*/
@Inner
@PostMapping("/deleteById")
public void deleteMainById(@RequestBody TIncomeDetail tIncomeDetail) {
tIncomeService.removeById(tIncomeDetail.getId());
}
} }
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