diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 3d70ef84f6..494a7fba9b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -99,6 +99,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeign; import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffFeign; import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffsDto; import com.yxt.anrui.riskcenter.api.loandiffdetails.LoanDiffDetailssDto; @@ -123,6 +124,8 @@ import com.yxt.anrui.riskcenter.api.loansettleapply.SettleFinVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy; +import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo; +import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFeign; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVehDto; @@ -234,6 +237,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -1488,7 +1495,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { qw.notIn("furd.sid", params.getSidList()); @@ -4027,8 +4034,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { return rb.setMsg("存在未支付垫款数据，认款失败！"); } @@ -4341,6 +4348,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService data = loanVehClearanceVehFeign.selByMainSid(finUncollectedReceivablesDetailedJR.getApplySid()).getData(); + for (LoanVehClearanceVehDetailsVo datum : data) { + loanBeCollectionVehFeign.updateLockState(datum.getSaleVehSid(), "3", "4"); + } + } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdfTimes = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String collectionDate = confirmation.getCollectionDate(); @@ -4382,7 +4398,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVoList, String collectionDate,Voucher voucher) { + private void pushToRiskToFin(FinCollectionConfirmation finalConfirmation, List finSelectedReceivablesDetailedVoList, String collectionDate, Voucher voucher) { List list = new ArrayList<>(); List list2 = new ArrayList<>(); BigDecimal all = BigDecimal.ZERO;//赎回 @@ -4713,7 +4727,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService0){ + if (all.compareTo(BigDecimal.ZERO) > 0) { Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto(); if (StringUtils.isNotBlank(finalConfirmation.getCollectionBankNum())) { voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum()); @@ -4892,7 +4906,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService0){ + if (otherMoney.compareTo(BigDecimal.ZERO) > 0) { Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto(); all2 = all2.subtract(otherMoney); voucherResultDetailDtoJf2.setSummary("**扣回车辆再次销售-费用（违章、年检、保险、过户）"); @@ -4904,7 +4918,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService0){ + if (all2.compareTo(BigDecimal.ZERO) > 0) { Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto(); if (StringUtils.isNotBlank(finalConfirmation.getCollectionBankNum())) { voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum()); @@ -4915,11 +4929,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService0){ + if (allM.compareTo(BigDecimal.ZERO) > 0) { voucherResultDetailDtoDf2.setSummary("收款-赎回款"); voucherResultDetailDtoDf2.setSubjectNo("1201.03.01"); //核算部门 @@ -6222,7 +6236,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService ruleList = finUncollectedReceivablesDetailedJRService.getRskPaymentDetailsListForRule(loanContractNo, vinNo, finCollectionConfirmation.getUseOrgSid(), finCollectionConfirmation.getPurchaseSystemSid()); if (!ruleList.isEmpty()) { for (AppFinUncollectedReceivablesDetailedRskVo r : ruleList) { 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 22665aac74..8a69884635 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 @@ -72,6 +72,8 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper fetchByCillSid(String sid); + @Select("select * from fin_selected_receivables_detailed where collSid = #{collSid} and receivablesName = '远程控制费'") + FinSelectedReceivablesDetailedVo fetchKzfByCillSid(String collSid); /** * 手机端—查询可使用款项明细列表 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 e67429a170..7000ff63fe 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 @@ -906,4 +906,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.riskcenter.api.loanbecollectionveh; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.stereotype.Component; - -@Component -public class LoanBeCollectionVehFeignFallback implements LoanBeCollectionVehFeign { - - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-riskcenter/loanbecollectionveh/listPage无法访问"); - } - - @Override - public ResultBean save(LoanBeCollectionVehDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanbecollectionveh/save无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanbecollectionveh/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-riskcenter/loanbecollectionveh/fetchDetailsBySid无法访问"); - } - - @Override - public ResultBean initDbr(String saleVehSid) { - return null; - } - - @Override - public ResultBean saveDbr(LoanBeCollectionVehDbrDto dto) { - return null; - } -} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFeign.java index a0929c3d8e..f95d93b49c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFeign.java @@ -35,44 +35,15 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * Project: anrui-riskcenter(车辆远程解控申请)
- * File: LoanVehClearanceVehFeign.java
- * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFeign
- * Description: 车辆远程解控车辆.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-29 10:25:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "车辆远程解控车辆") @FeignClient( contextId = "anrui-riskcenter-LoanVehClearanceVeh", name = "anrui-riskcenter", - path = "v1/loanvehclearanceveh", - fallback = LoanVehClearanceVehFeignFallback.class) + path = "v1/loanvehclearanceveh") public interface LoanVehClearanceVehFeign { - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") + @ApiOperation("根据申请sid获取子表") + @GetMapping("/selByMainSid/{sid}") @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增或修改") - @PostMapping("/save") - @ResponseBody - public ResultBean save(@RequestBody LoanVehClearanceVehDto dto); - - @ApiOperation("根据sid删除记录") - @DeleteMapping("/delBySids") - @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + ResultBean> selByMainSid(@PathVariable("applySid") String applySid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFeignFallback.java deleted file mode 100644 index c4c09dc7eb..0000000000 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFeignFallback.java +++ /dev/null @@ -1,72 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.riskcenter.api.loanvehclearanceveh; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * Project: anrui-riskcenter(车辆远程解控申请)
- * File: LoanVehClearanceVehFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFeignFallback
- * Description: 车辆远程解控车辆.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-29 10:25:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Component -public class LoanVehClearanceVehFeignFallback implements LoanVehClearanceVehFeign { - - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-riskcenter/loanvehclearanceveh/listPage无法访问"); - } - - @Override - public ResultBean save(LoanVehClearanceVehDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanvehclearanceveh/save无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanvehclearanceveh/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-riskcenter/loanvehclearanceveh/fetchDetailsBySid无法访问"); - } -} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java index df75914064..85c2421f39 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java @@ -37,74 +37,68 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * Project: anrui-riskcenter(催收措施申请)
- * File: LoanBeCollectionVehFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehRest
- * Description: 逾期催收车辆.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-12 16:06:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "逾期催收车辆") -@RestController("com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehRest") +@RestController @RequestMapping("v1/loanbecollectionveh") public class LoanBeCollectionVehRest implements LoanBeCollectionVehFeign { - @Autowired - private LoanBeCollectionVehService loanBeCollectionVehService; + @Autowired + private LoanBeCollectionVehService loanBeCollectionVehService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = loanBeCollectionVehService.listPageVo(pq); - return rb.success().setData(pv); - } + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanBeCollectionVehService.listPageVo(pq); + return rb.success().setData(pv); + } - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody LoanBeCollectionVehDto dto){ - ResultBean rb = ResultBean.fireFail(); - loanBeCollectionVehService.saveOrUpdateDto(dto); - return rb.success(); - } + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody LoanBeCollectionVehDto dto) { + ResultBean rb = ResultBean.fireFail(); + loanBeCollectionVehService.saveOrUpdateDto(dto); + return rb.success(); + } - @Override - @ApiOperation("根据sid批量删除") + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - loanBeCollectionVehService.delBySids(sids); - return rb.success(); - } + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + loanBeCollectionVehService.delBySids(sids); + return rb.success(); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - LoanBeCollectionVehDetailsVo vo = loanBeCollectionVehService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanBeCollectionVehDetailsVo vo = loanBeCollectionVehService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } - @Override - public ResultBean initDbr(String saleVehSid) { - ResultBean rb = ResultBean.fireFail(); - LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehService.initDbr(saleVehSid); - return rb.success().setData(loanBeCollectionVehDbrDetailsVo); - } + @Override + public ResultBean initDbr(String saleVehSid) { + ResultBean rb = ResultBean.fireFail(); + LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehService.initDbr(saleVehSid); + return rb.success().setData(loanBeCollectionVehDbrDetailsVo); + } - @Override - public ResultBean saveDbr(LoanBeCollectionVehDbrDto dto) { - ResultBean rb = ResultBean.fireFail(); - loanBeCollectionVehService.saveDbr(dto); - return rb.success(); - } + @Override + public ResultBean saveDbr(LoanBeCollectionVehDbrDto dto) { + ResultBean rb = ResultBean.fireFail(); + loanBeCollectionVehService.saveDbr(dto); + return rb.success(); + } + + @Override + public ResultBean updateLockState(String saleVehSid, String s, String x) { + ResultBean rb = ResultBean.fireFail(); + loanBeCollectionVehService.updateLockState(saleVehSid, s, x); + return rb.success(); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java index 9279efe77f..1f73c93ccb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java @@ -56,19 +56,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -/** - * Project: anrui-riskcenter(催收措施申请)
- * File: LoanBeCollectionVehService.java
- * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehService
- * Description: 逾期催收车辆 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-12 16:06:20
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class LoanBeCollectionVehService extends MybatisBaseService { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.java index bf5ac42dbd..656ad13377 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.java @@ -39,35 +39,12 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo; import java.util.List; -/** - * Project: anrui-riskcenter(车辆远程解控申请)
- * File: LoanVehClearanceVehMapper.java
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehMapper
- * Description: 车辆远程解控车辆.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-29 10:25:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface LoanVehClearanceVehMapper extends BaseMapper { - //@Update("update loan_veh_clearance_veh set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from loan_veh_clearance_veh") - List selectListVo(); - - @Delete("delete from loan_veh_clearance_veh where mainSid = #{dtoSid}") + @Delete("delete from loan_veh_clearance_veh where mainSid = #{dtoSid}") void delByMainSid(String dtoSid); - @Select("select * from loan_veh_clearance_veh where mainSid = #{sid}") - List selByMainSid(String sid); + @Select("select * from loan_veh_clearance_veh where mainSid = #{sid}") + List selByMainSid(String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.xml index 5047d88b51..2764f89c46 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.xml @@ -3,11 +3,4 @@ - - - \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehRest.java index d35f4e7b66..70411adbd3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehRest.java @@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; + import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVeh; import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehQuery; import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo; @@ -41,60 +42,18 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetai import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDto; import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFeign; -/** - * Project: anrui-riskcenter(车辆远程解控申请)
- * File: LoanVehClearanceVehFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehRest
- * Description: 车辆远程解控车辆.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-29 10:25:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "车辆远程解控车辆") -@RestController("com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehRest") +@RestController @RequestMapping("v1/loanvehclearanceveh") public class LoanVehClearanceVehRest implements LoanVehClearanceVehFeign { - @Autowired - private LoanVehClearanceVehService loanVehClearanceVehService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = loanVehClearanceVehService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody LoanVehClearanceVehDto dto){ - ResultBean rb = ResultBean.fireFail(); - loanVehClearanceVehService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - loanVehClearanceVehService.delBySids(sids); - return rb.success(); - } + @Autowired + private LoanVehClearanceVehService loanVehClearanceVehService; - @Override - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - LoanVehClearanceVehDetailsVo vo = loanVehClearanceVehService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + @Override + public ResultBean> selByMainSid(String applySid) { + ResultBean rb = ResultBean.fireFail(); + List loanVehClearanceVehDetailsVos = loanVehClearanceVehService.selByMainSid(applySid); + return rb.success().setData(loanVehClearanceVehDetailsVos); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehService.java index e277eed5ed..9a615484ff 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehService.java @@ -45,74 +45,39 @@ import org.springframework.stereotype.Service; import java.util.List; -/** - * Project: anrui-riskcenter(车辆远程解控申请)
- * File: LoanVehClearanceVehService.java
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehService
- * Description: 车辆远程解控车辆 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-12-29 10:25:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class LoanVehClearanceVehService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(LoanVehClearanceVehQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - LoanVehClearanceVehQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(LoanVehClearanceVehDto dto){ + + public void saveOrUpdateDto(LoanVehClearanceVehDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(LoanVehClearanceVehDto dto){ - LoanVehClearanceVeh entity = new LoanVehClearanceVeh(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(LoanVehClearanceVehDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(LoanVehClearanceVehDto dto) { + LoanVehClearanceVeh entity = new LoanVehClearanceVeh(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(LoanVehClearanceVehDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - LoanVehClearanceVeh entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public LoanVehClearanceVehDetailsVo fetchDetailsVoBySid(String sid){ - LoanVehClearanceVeh entity = fetchBySid(sid); - LoanVehClearanceVehDetailsVo vo = new LoanVehClearanceVehDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + LoanVehClearanceVeh entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } - public void delByMainSid(String dtoSid) { - baseMapper.delByMainSid(dtoSid); - } + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } - public List selByMainSid(String sid) { - return baseMapper.selByMainSid(sid); - } + public List selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } } \ No newline at end of file