diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java index 58c0ce0def..7f067b381a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java @@ -33,6 +33,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.List; /** @@ -92,4 +93,7 @@ public interface FinSelectedReceivablesDetailedFeign { @PostMapping("/saveAll") ResultBean saveAll(List list); + @ApiOperation("根据维修工单sid查询待审核和已审核的认款金额之和") + @GetMapping("/selRkByBillSid") + ResultBean selRkByBillSid(@RequestParam("billSid") String billSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java index 0277180ab2..1edf946c66 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java @@ -30,6 +30,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import java.math.BigDecimal; import java.util.List; /** @@ -93,4 +94,9 @@ public class FinSelectedReceivablesDetailedFeignFallback implements FinSelectedR return null; } + @Override + public ResultBean selRkByBillSid(String billSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java index 98b87fce4a..69da0119eb 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java @@ -33,6 +33,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.List; /** @@ -140,4 +141,8 @@ public interface FinUncollectedReceivablesDetailedFeign { @ApiOperation("根据销售订单车辆sid查询已审核订金总和") @PostMapping("/selectDjByBusVinSid") ResultBean selectDjByBusVinSid(@RequestParam("busVinSid") String busVinSid); + + @ApiOperation("根据维修工单sid查询应收金额之和") + @PostMapping("/selYsByBillSid") + ResultBean selYsByBillSid(@RequestParam("billSid") String billSid); } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java index 152b299fd3..f90b735399 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java @@ -30,6 +30,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import java.math.BigDecimal; import java.util.List; /** @@ -156,4 +157,9 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll return null; } + @Override + public ResultBean selYsByBillSid(String billSid) { + return null; + } + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index ea44f45527..22665aac74 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -37,6 +37,7 @@ import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import org.apache.ibatis.annotations.*; +import java.math.BigDecimal; import java.util.List; /** @@ -159,4 +160,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper selectLiBy(String sid); + + BigDecimal selRkByBillSid(String billSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index e81df75b91..91fdb049ce 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -593,4 +593,13 @@ resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed"> select * from fin_selected_receivables_detailed where collSid = #{sid} and receivablesName = '融资放款' + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java index de61ff0909..1d27853f35 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.fin.biz.finselectedreceivablesdetailed; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; import com.yxt.common.base.utils.PagerUtil; @@ -37,6 +38,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.List; /** @@ -118,4 +120,9 @@ public class FinSelectedReceivablesDetailedRest implements FinSelectedReceivable return finSelectedReceivablesDetailedService.saveAll(list); } + @Override + public ResultBean selRkByBillSid(String billSid) { + return finSelectedReceivablesDetailedService.selRkByBillSid(billSid); + } + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index fcb3f85f24..e67429a170 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -900,4 +900,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService selRkByBillSid(String billSid) { + ResultBean rb = ResultBean.fireFail(); + BigDecimal rkMoney = baseMapper.selRkByBillSid(billSid); + return rb.success().setData(rkMoney); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index da2570e869..ae22af4d68 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -36,6 +36,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; +import java.math.BigDecimal; import java.util.List; /** @@ -126,4 +127,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper exportExcel( @Param(Constants.WRAPPER) QueryWrapper qw); String selectDjByBusVinSid(String busVinSid); + + @Select("SELECT SUM(reveivableMoney) FROM fin_uncollected_receivables_detailed WHERE contractSid = #{billSid}") + BigDecimal selYsByBillSid(String billSid); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index 200ab90240..5f84e72b3b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java @@ -37,6 +37,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; import java.net.URLEncoder; import java.util.List; @@ -197,6 +198,11 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece return finUncollectedReceivablesDetailedService.selectDjByBusVinSid(busVinSid); } + @Override + public ResultBean selYsByBillSid(String billSid) { + return finUncollectedReceivablesDetailedService.selYsByBillSid(billSid); + } + @Override public ResultBean> selectByContractNo(String contractNo) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 99d981b1d3..85b0e80e57 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -1227,4 +1227,10 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService String djTotal = baseMapper.selectDjByBusVinSid(busVinSid); return rb.success().setData(djTotal); } + + public ResultBean selYsByBillSid(String billSid) { + ResultBean rb = ResultBean.fireFail(); + BigDecimal ysMoney = baseMapper.selYsByBillSid(billSid); + return rb.success().setData(ysMoney); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java index 8920f05b17..9cdb1b086a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java @@ -24,9 +24,7 @@ import java.util.List; public interface AsBusrepairBillMapper extends BaseMapper { IPage getList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage carOutFactory(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - @Update("update as_busrepair_bill set outDoorState = '1' where sid = #{sid}") + @Update("update as_busrepair_bill set outDoorState = '1',outDoorTime = NOW() where sid = #{sid}") void updateOutDoorState(String sid); int selectNum(String bill); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml index 568e267b86..1a06d812f5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -15,13 +15,6 @@ where nodeCode = 3 -