From d9121c0d78d5908e04be0a5c429f0dce9489e347 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 29 May 2023 11:56:12 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/basevehicle/BaseVehicleService.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index d91f214b12..0ba62b1476 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -2375,7 +2375,7 @@ public class BaseVehicleService extends MybatisBaseService baseExistingCarListVo = baseMapper.selExistingCar(qw); for (BaseExistingCarListVo existingCarListVo : baseExistingCarListVo) { - List busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(existingCarListVo.getVehSid()).getData(); + /*List busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(existingCarListVo.getVehSid()).getData(); for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid(); BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData(); @@ -2390,7 +2390,13 @@ public class BaseVehicleService extends MybatisBaseService wrapper.eq("bv.vehicleState", "0001").or().eq("bv.vehicleState", "0002")); List baseExistingCarListVo = baseMapper.selExistingCar(qw); for (BaseExistingCarListVo existingCarListVo : baseExistingCarListVo) { - List busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(existingCarListVo.getVehSid()).getData(); + /*List busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(existingCarListVo.getVehSid()).getData(); for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid(); BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData(); @@ -3851,7 +3857,13 @@ public class BaseVehicleService extends MybatisBaseService Date: Mon, 29 May 2023 12:54:56 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8C=85=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=92=8C=E5=86=85=E9=83=A8=E9=9A=8F=E8=BD=A6=E8=B5=84?= =?UTF-8?q?=E6=96=99=E4=BA=A4=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDiscountpackageFeign.java | 2 +- .../AppDiscountpackageApplyDto.java | 2 + .../BaseDiscountpackageApply.java | 4 +- .../BaseDiscountpackageApplyDetailsVo.java | 4 + .../BaseDiscountpackageApplyQuery.java | 10 + .../BaseDiscountpackageApplyVo.java | 8 +- .../BaseDiscountpackageApplyCompleteDto.java | 1 - .../BaseDiscountpackagelistFeign.java | 5 + .../BaseDiscountpackagelistFeignFallback.java | 5 + .../BaseDiscountpackageApplyRest.java | 213 +++++++------- .../BaseDiscountpackageApplyService.java | 75 +++-- .../BaseDiscountpackagelistMapper.java | 2 + .../BaseDiscountpackagelistMapper.xml | 6 + .../BaseDiscountpackagelistRest.java | 7 + .../BaseDiscountpackagelistService.java | 4 + .../BusVehicleInformation.java | 3 + .../BusVehicleInformationDto.java | 4 + .../BusVehicleInformationFeignFallback.java | 2 + .../BusVehicleInformationVo.java | 17 +- ...hicleInformationHandoverDetailsListVo.java | 34 +++ ...usVehicleInformationHandoverDetailsVo.java | 6 +- .../BusVehicleInformationHandoverDto.java | 2 - .../BusVehicleInformationHandoverFeign.java | 11 +- ...hicleInformationHandoverFeignFallback.java | 7 +- .../BusVehicleInformationHandoverVo.java | 3 - .../BusVehicleInformationMapper.java | 2 + .../BusVehicleInformationMapper.xml | 8 + .../BusVehicleInformationService.java | 5 + .../BusVehicleInformationHandoverMapper.xml | 1 - .../BusVehicleInformationHandoverRest.java | 10 +- .../BusVehicleInformationHandoverService.java | 267 +++++++++++++++--- .../AppBaseDiscountpackageByApplyDto.java | 27 ++ .../AppBaseDiscountpackagelistDto.java | 28 ++ .../AppCommonContractPackageVo.java | 24 ++ .../AppDiscountpackageApplyDetailsVo.java | 51 ++-- .../AppDiscountpackageApplyDto.java | 46 ++- .../AppDiscountpackageFegin.java | 17 ++ .../AppDiscountpackageFeginFallback.java | 18 ++ .../AppDiscountpackageVo.java | 25 +- .../BaseDiscountpackageApplysCompleteDto.java | 4 +- .../AppBuscenterFile.java | 4 - .../VehicleInformationHandoverFeign.java | 8 +- ...hicleInformationHandoverFeignFallback.java | 8 +- .../AppDiscountPackageApplyRest.java | 17 ++ .../AppDiscountPackageApplyService.java | 104 +++++-- .../VehicleInformationHandoverRest.java | 15 +- .../VehicleInformationHandoverService.java | 74 ++--- 47 files changed, 871 insertions(+), 329 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsListVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppBaseDiscountpackageByApplyDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppBaseDiscountpackagelistDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppCommonContractPackageVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java index 03a7f40517..f1854abc36 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java @@ -67,7 +67,7 @@ public interface BaseDiscountpackageFeign { @ApiOperation("查询本公司下优惠政策列表") @GetMapping("/getAppPackageByUseOrg") - ResultBean> getAppPackageByUseOrg(String userOrg); + ResultBean> getAppPackageByUseOrg(@RequestParam("userOrg") String userOrg); @ApiOperation("移动端-销售订单获取销售政策优惠包:切换机构") @GetMapping("/getAppPackage") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/AppDiscountpackageApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/AppDiscountpackageApplyDto.java index d8da67443f..754f9a70ae 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/AppDiscountpackageApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/AppDiscountpackageApplyDto.java @@ -90,6 +90,8 @@ public class AppDiscountpackageApplyDto implements Dto { private String taskId; // taskId @ApiModelProperty("申请人组织路径") private String orgSidPath; // 申请人组织路径 + @ApiModelProperty("备注") + private String remarks; // 备注 // @ApiModelProperty("合同sid") // private String contractSid; // @ApiModelProperty("车型sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApply.java index b3357af1f7..e2fc5ecfb5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApply.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApply.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-base(优惠包申请)
* File: BaseDiscountpackageApply.java
@@ -57,7 +59,7 @@ public class BaseDiscountpackageApply extends BaseEntity { @ApiModelProperty("客户名称") private String customerName; // 客户名称 @ApiModelProperty("申请日期") - private String applyDate; // 申请日期 + private Date applyDate; // 申请日期 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyDetailsVo.java index 82c7b400d7..10dbaeb492 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyDetailsVo.java @@ -54,6 +54,8 @@ public class BaseDiscountpackageApplyDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("userSid") + private String userSid; // userSid @ApiModelProperty("合同编号") private String contractId; // 合同编号 @ApiModelProperty("申请人") @@ -88,6 +90,8 @@ public class BaseDiscountpackageApplyDetailsVo implements Vo { private String taskId; // taskId @ApiModelProperty("申请人组织路径") private String orgSidPath; // 申请人组织路径 + @ApiModelProperty("备注") + private String remarks; // 备注 // @ApiModelProperty("合同sid") // private String contractSid; // @ApiModelProperty("车型sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyQuery.java index cd7ce5f648..9259ba21af 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyQuery.java @@ -59,6 +59,16 @@ public class BaseDiscountpackageApplyQuery implements Query { private String createStartTime; // 申请开始时间 @ApiModelProperty("申请结束时间") private String createEndTime; // 申请结束时间 + @ApiModelProperty("组织机构sid") + private String orgPath; + @ApiModelProperty("合同编号 客户名称") + private String names; + @ApiModelProperty("申请日期") + private String date; + @ApiModelProperty("1待办 2已办") + private String type; + + // @ApiModelProperty("申请日期") // private String applyDate; // 申请日期 // @ApiModelProperty("创建组织sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyVo.java index 73c81a4db7..53f18e5731 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.base.api.basediscountpackageapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -33,6 +34,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * Project: anrui-base(优惠包申请)
* File: BaseDiscountpackageApplyVo.java
@@ -58,8 +61,9 @@ public class BaseDiscountpackageApplyVo implements Vo { private String applyName; // 申请人 @ApiModelProperty("客户名称") private String customerName; // 客户名称 - @ApiModelProperty("申请日期") - private String applyDate; // 申请日期 + @ApiModelProperty("发起日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date applyDate; // 申请日期 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/flow/BaseDiscountpackageApplyCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/flow/BaseDiscountpackageApplyCompleteDto.java index 1c3063f701..65eb772967 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/flow/BaseDiscountpackageApplyCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/flow/BaseDiscountpackageApplyCompleteDto.java @@ -21,7 +21,6 @@ public class BaseDiscountpackageApplyCompleteDto implements Dto { @NotBlank(message = "参数错误：userSid") private String userSid; @ApiModelProperty(value = "用户全路径sid") - @NotBlank(message = "参数错误：orgSidPath") private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeign.java index ca01c99e0a..757f32f437 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeign.java @@ -81,4 +81,9 @@ public interface BaseDiscountpackagelistFeign { @ResponseBody public ResultBean> fetchDetailsByDiscountSid(String discountSid); + @ApiOperation("根据主表SID获取记录") + @GetMapping("/getlistByDiscountSid}") + @ResponseBody + public ResultBean> getlistByDiscountSid(String discountSid); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeignFallback.java index 0a1de51aab..c33648d9e5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeignFallback.java @@ -74,4 +74,9 @@ public class BaseDiscountpackagelistFeignFallback implements BaseDiscountpackage public ResultBean> fetchDetailsByDiscountSid(String discountSid) { return null; } + + @Override + public ResultBean> getlistByDiscountSid(String discountSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyRest.java index 337f5a9633..a538408a07 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyRest.java @@ -34,6 +34,7 @@ import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageA import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery; import com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto; import com.yxt.anrui.base.api.flow.FlowTaskVo; +import com.yxt.anrui.base.biz.basediscountpackagelist.BaseDiscountpackagelistService; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.base.utils.PagerUtil; @@ -66,103 +67,121 @@ import java.util.List; @RequestMapping("v1/basediscountpackageapply") public class BaseDiscountpackageApplyRest implements BaseDiscountpackageApplyFeign { - @Autowired - private BaseDiscountpackageApplyService baseDiscountpackageApplyService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = baseDiscountpackageApplyService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody BaseDiscountpackageApplyDto dto){ - ResultBean rb = ResultBean.fireFail(); - baseDiscountpackageApplyService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private BaseDiscountpackageApplyService baseDiscountpackageApplyService; + + @Autowired + private BaseDiscountpackagelistService baseDiscountpackagelistService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = baseDiscountpackageApplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BaseDiscountpackageApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + baseDiscountpackageApplyService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - baseDiscountpackageApplyService.delBySids(sids); - return rb.success(); - } - - @Override - @ApiOperation("根据SID获取一条记录") + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + if (sids.length > 0) { + for (String sid : sids) { + BaseDiscountpackageApply apply = baseDiscountpackageApplyService.fetchBySid(sid); + if (null != apply) { + if (!apply.getNodeState().equals("待提交")) { + return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); + } + } + } + } + baseDiscountpackageApplyService.delBySids(sids); + if (sids.length > 0) { + for (String sid : sids) { + baseDiscountpackagelistService.delByDiscountSid(sid); + } + } + return rb.success().setMsg("删除成功"); + } + + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - BaseDiscountpackageApplyDetailsVo vo = baseDiscountpackageApplyService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - - @Override - public ResultBean> getDiscountManageApplyList(PagerQuery pq) { - PagerVo page = new PagerVo<>(); - IPage iPage = baseDiscountpackageApplyService.getDiscountManageApplyList(pq); - PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); - return new ResultBean>().success().setData(pagerVo); - } - - @Override - public ResultBean saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) { - return baseDiscountpackageApplyService.saveDiscountPackageApplyInfo(dto); - } - - @Override - public ResultBean getDiscountPackageApplyInfo(String sid) { - return baseDiscountpackageApplyService.getDiscountPackageApplyInfo(sid); - } - - @Override - public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) { - return baseDiscountpackageApplyService.submitRecordApplication(dto); - } - - @Override - public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId()); - return baseDiscountpackageApplyService.complete(bv); - } - - @Override - public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { - return baseDiscountpackageApplyService.revokeProcess(flowTaskVo); - } - - @Override - public ResultBean taskReject(FlowTaskVo flowTaskVo) { - return baseDiscountpackageApplyService.taskReject(flowTaskVo); - } - - @Override - public ResultBean breakProcess(FlowTaskVo flowTaskVo) { - return baseDiscountpackageApplyService.breakProcess(flowTaskVo); - } - - @Override - public ResultBean flowRecord(String procInsId) { - return baseDiscountpackageApplyService.flowRecord(procInsId); - } - - @Override - public ResultBean getNextNodesForSubmit(GetNodeQuery query) { - return baseDiscountpackageApplyService.getNextNodesForSubmit(query); - } - - @Override - public ResultBean getPreviousNodesForReject(GetNodeQuery query) { - return baseDiscountpackageApplyService.getPreviousNodesForReject(query); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseDiscountpackageApplyDetailsVo vo = baseDiscountpackageApplyService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean> getDiscountManageApplyList(PagerQuery pq) { + PagerVo page = new PagerVo<>(); + IPage iPage = baseDiscountpackageApplyService.getDiscountManageApplyList(pq); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); + } + + @Override + public ResultBean saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) { + return baseDiscountpackageApplyService.saveDiscountPackageApplyInfo(dto); + } + + @Override + public ResultBean getDiscountPackageApplyInfo(String sid) { + return baseDiscountpackageApplyService.getDiscountPackageApplyInfo(sid); + } + + @Override + public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) { + return baseDiscountpackageApplyService.submitRecordApplication(dto); + } + + @Override + public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(dto, bv); + bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId()); + return baseDiscountpackageApplyService.complete(bv); + } + + @Override + public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { + return baseDiscountpackageApplyService.revokeProcess(flowTaskVo); + } + + @Override + public ResultBean taskReject(FlowTaskVo flowTaskVo) { + return baseDiscountpackageApplyService.taskReject(flowTaskVo); + } + + @Override + public ResultBean breakProcess(FlowTaskVo flowTaskVo) { + return baseDiscountpackageApplyService.breakProcess(flowTaskVo); + } + + @Override + public ResultBean flowRecord(String procInsId) { + return baseDiscountpackageApplyService.flowRecord(procInsId); + } + + @Override + public ResultBean getNextNodesForSubmit(GetNodeQuery query) { + return baseDiscountpackageApplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean getPreviousNodesForReject(GetNodeQuery query) { + return baseDiscountpackageApplyService.getPreviousNodesForReject(query); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java index 8c2340a5e1..045e1516c0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java @@ -114,7 +114,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService qw = new QueryWrapper<>(); String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData(); qw.eq("createOrgSid", orgSid); - qw.eq("createBySid",query.getUserSid()); + qw.eq("createBySid", query.getUserSid()); if (StringUtils.isNotBlank(query.getContractId())) { qw.like("contractId", query.getContractId()); } @@ -126,6 +126,19 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(createEndTime), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + if (StringUtils.isNotBlank(query.getNames())) { + qw.and(wrapper -> wrapper.like("contractId", query.getNames()).or().like("customerName", query.getNames())); + } + if (StringUtils.isNotBlank(query.getType())) { + if ("2".equals(query.getType())) { + qw.and(wrapper -> wrapper.ne("nodeState", "待提交").ne("nodeState", "销售专员申请")); + } + if ("1".equals(query.getType())) { + qw.and(wrapper -> wrapper.eq("nodeState", "待提交").or().eq("nodeState", "销售专员申请")); + } + } + qw.apply(StringUtils.isNotEmpty(query.getDate()), "date_format (applyDate,'%Y-%m-%d') = date_format('" + query.getDate() + "','%Y-%m-%d')"); + qw.orderByDesc("applyDate"); return qw; } @@ -166,11 +179,10 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService dtoList = baseDiscountpackagelistService.fetchDetailsByDiscountSid(sid); vo.setDiscountPackageList(dtoList); @@ -200,7 +215,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService qw = new QueryWrapper<>(); AppDiscountpackageQuery params = pq.getParams(); String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); - qw.eq("createBySid",params.getUserSid()); + qw.eq("createBySid", params.getUserSid()); qw.eq("createOrgSid", orgSid); // qw.eq("state", params.getType()); qw.eq("isDelete", 0); @@ -217,46 +232,52 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) { ResultBean rb = ResultBean.fireFail(); //根据用户sid获取staffSid - ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!staffOrgResultBean.getSuccess()) { - return rb.setMsg(staffOrgResultBean.getMsg()); - } - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + // ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); +// if (!userVoResultBean.getSuccess()) { +// return rb.setMsg(userVoResultBean.getMsg()); +// } +// //根据staffSid获取用户的组织全路径 +// ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); +// if (!staffOrgResultBean.getSuccess()) { +// return rb.setMsg(staffOrgResultBean.getMsg()); +// } +// String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); String dtoSid = dto.getSid(); List appDiscountpackagelists = dto.getDiscountPackageList(); if (StringUtils.isBlank(dtoSid)) { BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto(); BeanUtil.copyProperties(dto, baseDiscountpackageApplyDto); - baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath); + baseDiscountpackageApplyDto.setOrgSidPath(dto.getOrgSidPath()); baseDiscountpackageApplyDto.setCreateBySid(dto.getUserSid()); String sid = this.insertByDto(baseDiscountpackageApplyDto); - for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) { - BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto(); - BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist); - baseDiscountpackagelist.setDiscountSid(sid); - baseDiscountpackagelistService.saveOrUpdateDto(baseDiscountpackagelist); + if (null != appDiscountpackagelists && appDiscountpackagelists.size() > 0) { + for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) { + BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto(); + BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist); + baseDiscountpackagelist.setDiscountSid(sid); + baseDiscountpackagelistService.saveOrUpdateDto(baseDiscountpackagelist); + } } + return rb.success().setMsg("添加成功").setData(sid); } BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(dtoSid); if (baseDiscountpackageApply == null) { return rb.setMsg("该优惠包申请不存在"); } - baseDiscountpackagelistService.delByDiscountSid(dtoSid); + // baseDiscountpackagelistService.delByDiscountSid(dtoSid); BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto(); BeanUtil.copyProperties(dto, baseDiscountpackageApplyDto); - baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath); + baseDiscountpackageApplyDto.setOrgSidPath(dto.getOrgSidPath()); this.updateByDto(baseDiscountpackageApplyDto); - for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) { - BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto(); - BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist); - baseDiscountpackagelist.setDiscountSid(dtoSid); - baseDiscountpackagelistService.saveOrUpdateDto(baseDiscountpackagelist); + if (null != appDiscountpackagelists && appDiscountpackagelists.size() > 0) { + for (AppDiscountpackagelistDto packageList : appDiscountpackagelists) { + BaseDiscountpackagelist baseDiscountpackagelist = baseDiscountpackagelistService.fetchBySid(packageList.getSid()); + if (null != baseDiscountpackagelist) { + BeanUtil.copyProperties(packageList, baseDiscountpackagelist, "id", "sid"); + baseDiscountpackagelistService.updateById(baseDiscountpackagelist); + } + } } return rb.success().setMsg("修改成功").setData(dtoSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.java index 8f8c05d1ca..9d92520450 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.java @@ -73,4 +73,6 @@ public interface BaseDiscountpackagelistMapper extends BaseMapper fetchByDiscountSid(String sid); List fetchDetailsByDiscountSid(@Param("discountSid") String discountSid); + + List getlistByDiscountSid(@Param("discountSid")String discountSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.xml index d266db70d5..dd09573537 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.xml @@ -19,4 +19,10 @@ FROM base_discountpackagelist WHERE discountSid = #{discountSid} + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistRest.java index ed3dc77c8a..56fb40cd7a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistRest.java @@ -105,4 +105,11 @@ public class BaseDiscountpackagelistRest implements BaseDiscountpackagelistFeign List dtos = baseDiscountpackagelistService.fetchDetailsByDiscountSid(discountSid); return rb.success().setData(dtos); } + + @Override + public ResultBean> getlistByDiscountSid(String discountSid) { + ResultBean rb = ResultBean.fireFail(); + List dtos = baseDiscountpackagelistService.getlistByDiscountSid(discountSid); + return rb.success().setData(dtos); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistService.java index b936893638..ba4b331fb2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistService.java @@ -114,4 +114,8 @@ public class BaseDiscountpackagelistService extends MybatisBaseService fetchDetailsByDiscountSid(String discountSid) { return baseMapper.fetchDetailsByDiscountSid(discountSid); } + + public List getlistByDiscountSid(String discountSid) { + return baseMapper.getlistByDiscountSid(discountSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java index 6de6039682..b2a646d1c7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java @@ -48,4 +48,7 @@ public class BusVehicleInformation extends BaseEntity { private Date recTime; // 接收时间 @ApiModelProperty("移交人") private String transferName; // 移交人 + @ApiModelProperty("剩余随车资料") + private String vehicleHandoverData; //剩余随车资料 + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationDto.java index d203f3e168..1559d4c605 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationDto.java @@ -39,4 +39,8 @@ public class BusVehicleInformationDto implements Dto { private Date recTime; // 接收时间 @ApiModelProperty("移交人") private String transferName; // 移交人 + @ApiModelProperty("备注信息") + private String remarks; + @ApiModelProperty("随车资料") + private String vehicleHandoverData; //剩余随车资料 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationFeignFallback.java index 252e7da6a6..753cc4bc45 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationFeignFallback.java @@ -1,6 +1,7 @@ package com.yxt.anrui.buscenter.api.busvehicleinformation; import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Component; import java.util.List; @@ -9,6 +10,7 @@ import java.util.List; * @description * @date 2023/5/16 14:15 */ +@Component public class BusVehicleInformationFeignFallback implements BusVehicleInformationFeign{ @Override public ResultBean> getByHandoverSid(String handoverSid) { diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationVo.java index 22920357d0..e9f036ce24 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationVo.java @@ -1,9 +1,12 @@ package com.yxt.anrui.buscenter.api.busvehicleinformation; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @author Administrator * @description @@ -12,9 +15,10 @@ import lombok.Data; @Data public class BusVehicleInformationVo implements Vo { + private String informationSid; @ApiModelProperty("车钥匙个数") private String vehicleKeyNum; // 车钥匙个数 -// @ApiModelProperty("发票0无1有") + // @ApiModelProperty("发票0无1有") // private Integer invoice; // 发票 @ApiModelProperty("一致性证书0无1有") private String certificate; // 一致性证书0无1有 @@ -28,5 +32,16 @@ public class BusVehicleInformationVo implements Vo { private String dirverCard; // 驾驶员卡0无1有 @ApiModelProperty("气瓶产品质量证明书（燃气车）0无1有") private String gasCertificate; // 气瓶产品质量证明书（燃气车）0无1有 + @ApiModelProperty("接收人") + private String recName; // 接收人 + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("接收时间") + private Date recTime; // 接收时间 + @ApiModelProperty("移交人") + private String transferName; // 移交人 + @ApiModelProperty("备注信息") + private String remarks; + @ApiModelProperty("剩余随车资料") + private String vehicleHandoverData; //剩余随车资料 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsListVo.java new file mode 100644 index 0000000000..1f2abe1538 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsListVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.buscenter.api.busvehicleinformationhandover; + +import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/5/25 14:34 + */ +@Data +public class BusVehicleInformationHandoverDetailsListVo implements Vo { + + private String sid; + @ApiModelProperty("车辆sid") + private String vehicleSid; // 车辆sid + @ApiModelProperty("是否是燃气车 0不是1是") + private String isFuelVehicle; // 是否是燃气车 0不是1是 + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车型") + private String model; + @ApiModelProperty("合同号") + private String contractNo; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("随车资料") + private List informations; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java index fa366ef1d5..651a57801a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java @@ -32,11 +32,7 @@ public class BusVehicleInformationHandoverDetailsVo implements Vo { private String customerName; @ApiModelProperty("接收人") private String recName; // 接收人 - @ApiModelProperty("接收日期") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date recTime; @ApiModelProperty("随车资料") private BusVehicleInformationVo busVehicleInformation; - @ApiModelProperty("备注信息") - private String remarks; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java index d18a0ea439..063a060ca7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java @@ -48,8 +48,6 @@ public class BusVehicleInformationHandoverDto implements Dto { private String busSid; @ApiModelProperty("随车资料") private BusVehicleInformationDto busVehicleInformation; - @ApiModelProperty("备注信息") - private String remarks; @ApiModelProperty("是否是燃气车 0不是1是") private Integer isFuelVehicle; // 是否是燃气车 0不是1是 @ApiModelProperty("是否完成") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverFeign.java index f6cf19316e..f66eaeb97b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverFeign.java @@ -44,14 +44,19 @@ public interface BusVehicleInformationHandoverFeign { @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") + @ApiOperation("编辑回显") + @GetMapping("/fetchDetailsBySid/{sid}/{times}") @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid, @PathVariable("times") String times); @ApiOperation("根据车辆sid获取一条记录") @PostMapping("/selectByVehicleSid") @ResponseBody public ResultBean selectByVehicleSid(@RequestParam("vehicleSid") String vehicleSid); + @ApiOperation("随车资料交接详情") + @GetMapping("/details/{sid}") + @ResponseBody + public ResultBean details(@PathVariable("sid") String sid); + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverFeignFallback.java index 41cdfe3cee..b0c8c5c193 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverFeignFallback.java @@ -34,7 +34,7 @@ public class BusVehicleInformationHandoverFeignFallback implements BusVehicleInf } @Override - public ResultBean fetchDetailsBySid(String sid) { + public ResultBean fetchDetailsBySid(String sid,String times) { return null; } @@ -42,4 +42,9 @@ public class BusVehicleInformationHandoverFeignFallback implements BusVehicleInf public ResultBean selectByVehicleSid(String vehicleSid) { return null; } + + @Override + public ResultBean details(String sid) { + return null; + } } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverVo.java index cf09f96c17..25b868d96f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverVo.java @@ -30,9 +30,6 @@ public class BusVehicleInformationHandoverVo implements Vo { private String model; @ApiModelProperty("合同号") private String contractNo; - @ApiModelProperty("接收日期") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date recTime; @ApiModelProperty("客户名称") private String customerName; @ApiModelProperty("接收人") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java index 4c68cb191b..e007542481 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java @@ -15,4 +15,6 @@ import java.util.List; @Mapper public interface BusVehicleInformationMapper extends BaseMapper { List getByHandoverSid(@Param("handoverSid") String handoverSid); + + BusVehicleInformation selectByHandoverNumAndHandoverSid(@Param("handoverNum")String handoverNum, @Param("sid")String sid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml index d4a55eae05..b850d708d2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml @@ -11,4 +11,12 @@ where handoverSid = #{handoverSid} and isDelete = '0' + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java index 70af18d2bd..60d1010c94 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java @@ -2,6 +2,7 @@ package com.yxt.anrui.buscenter.biz.busvehicleinformation; import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation; import com.yxt.common.base.service.MybatisBaseService; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import java.util.List; @@ -17,4 +18,8 @@ public class BusVehicleInformationService extends MybatisBaseService getByHandoverSid(String handoverSid) { return baseMapper.getByHandoverSid(handoverSid); } + + public BusVehicleInformation selectByHandoverNumAndHandoverSid(String handoverNum, String sid) { + return baseMapper.selectByHandoverNumAndHandoverSid(handoverNum,sid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml index 19e0d97185..751d797a56 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml @@ -13,7 +13,6 @@ vehicleSid, model, contractNo, - recTime, customerName, recName, recPhone, diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverRest.java index 791fd2e869..2b73e6d321 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverRest.java @@ -29,6 +29,7 @@ public class BusVehicleInformationHandoverRest implements BusVehicleInformationH /** * 新增或修改 + * * @param dto * @return */ @@ -51,8 +52,8 @@ public class BusVehicleInformationHandoverRest implements BusVehicleInformationH } @Override - public ResultBean fetchDetailsBySid(String sid) { - return busVehicleInformationHandoverService.fetchDetailsBySid(sid); + public ResultBean fetchDetailsBySid(String sid, String times) { + return busVehicleInformationHandoverService.fetchDetailsBySid(sid, times); } @Override @@ -60,4 +61,9 @@ public class BusVehicleInformationHandoverRest implements BusVehicleInformationH return busVehicleInformationHandoverService.selectByVehicleSid(vehicleSid); } + @Override + public ResultBean details(String sid) { + return busVehicleInformationHandoverService.details(sid); + } + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java index 69aeb794c3..635a3ff280 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java @@ -5,14 +5,8 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; -import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; -import com.yxt.anrui.buscenter.api.bussealapply.BusSealApply; -import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyQuery; -import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo; import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation; import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationDto; import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationVo; @@ -28,6 +22,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -42,8 +37,6 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService 0) { + Integer num = busVehicleInformation.getVehicleKeyNum(); + int value = num.intValue(); + str.append("车钥匙" + value + "把、"); + } + //一致性证书 + if (busVehicleInformation.getCertificate() > 0) { + str.append("一致性证书、"); + } + //申请表 + if (busVehicleInformation.getApplyForm() > 0) { + str.append("申请表、"); + } + //保修手册、说明书 + if (busVehicleInformation.getManual() > 0) { + str.append("保修手册、说明书、"); + } + //环保清单 + + if (busVehicleInformation.getEnvironmentalList() > 0) { + str.append("环保清单、"); + } + //驾驶员卡 + if (busVehicleInformation.getDirverCard() > 0) { + str.append("驾驶员卡、"); + } + if (busVehicleInformation.getGasCertificate() > 0) { + if (busVehicleInformation.getIsFuelVehicle() != 0) { + str.append("气瓶检测合格证、"); + } + } + str.delete(str.length() - 1, str.length()); + busVehicleInformation.setVehicleHandoverData(str.toString()); + busVehicleInformationService.updateById(busVehicleInformation); } - List informationList = busVehicleInformationService.getByHandoverSid(sid); - if (null != informationList) { - entity.setHandoverState(1); + List informationList = busVehicleInformationService.getByHandoverSid(dto.getSid()); + if (null != informationList && informationList.size() > 0) { + for (BusVehicleInformation busVehicleInformation : informationList) { + if ("001".equals(busVehicleInformation.getHandoverNum())) { + if (busVehicleInformation.getVehicleKeyNum() < 1 + || busVehicleInformation.getCertificate() < 1 + || busVehicleInformation.getApplyForm() < 1 + || busVehicleInformation.getManual() < 1 + || busVehicleInformation.getEnvironmentalList() < 1 + || busVehicleInformation.getDirverCard() < 1 + ) { + entity.setHandoverState(1); + } else { + if (busVehicleInformation.getGasCertificate() < 1) { + if (busVehicleInformation.getIsFuelVehicle() == 0) { + entity.setHandoverState(2); + } else { + entity.setHandoverState(1); + } + } else { + entity.setHandoverState(2); + } + } + } + if ("002".equals(busVehicleInformation.getHandoverNum())) { + entity.setHandoverState(2); + } + } } baseMapper.updateById(entity); return rb.success().setData(sid); @@ -177,40 +234,111 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService fetchDetailsBySid(String sid) { + public ResultBean fetchDetailsBySid(String sid, String times) { ResultBean rb = ResultBean.fireFail(); BusVehicleInformationHandover informationHandover = fetchBySid(sid); BusVehicleInformationHandoverDetailsVo vo = new BusVehicleInformationHandoverDetailsVo(); BeanUtil.copyProperties(informationHandover, vo, "id", "sid"); vo.setSid(sid); + String recName = ""; + if (StringUtils.isNotBlank(vo.getRecName())) { + recName = vo.getRecName(); + } List busVehicleInformations = busVehicleInformationService.getByHandoverSid(sid); - - if (null != busVehicleInformations) { + if (null != busVehicleInformations && busVehicleInformations.size() > 0) { for (BusVehicleInformation informationServiceByHandoverSid : busVehicleInformations) { - BusVehicleInformationVo informationVo = new BusVehicleInformationVo(); - BeanUtil.copyProperties(informationServiceByHandoverSid, informationVo, "id", "sid"); - if (null == informationServiceByHandoverSid.getApplyForm()) { - informationVo.setApplyForm(""); - } - if (null == informationServiceByHandoverSid.getCertificate()) { - informationVo.setCertificate(""); - } - if (null == informationServiceByHandoverSid.getVehicleKeyNum()) { - informationVo.setVehicleKeyNum(""); - } - if (null == informationServiceByHandoverSid.getManual()) { - informationVo.setManual(""); - } - if (null == informationServiceByHandoverSid.getEnvironmentalList()) { - informationVo.setEnvironmentalList(""); - } - if (null == informationServiceByHandoverSid.getDirverCard()) { - informationVo.setDirverCard(""); + //第一次的记录编辑回显 + if (times.equals("1") && informationServiceByHandoverSid.getHandoverNum().equals("001")) { + BusVehicleInformationVo informationVo = new BusVehicleInformationVo(); + BeanUtil.copyProperties(informationServiceByHandoverSid, informationVo, "id", "sid"); + if (null == informationServiceByHandoverSid.getApplyForm()) { + informationVo.setApplyForm(""); + } + if (null == informationServiceByHandoverSid.getCertificate()) { + informationVo.setCertificate(""); + } + if (null == informationServiceByHandoverSid.getVehicleKeyNum()) { + informationVo.setVehicleKeyNum(""); + } + if (null == informationServiceByHandoverSid.getManual()) { + informationVo.setManual(""); + } + if (null == informationServiceByHandoverSid.getEnvironmentalList()) { + informationVo.setEnvironmentalList(""); + } + if (null == informationServiceByHandoverSid.getDirverCard()) { + informationVo.setDirverCard(""); + } + if (null == informationServiceByHandoverSid.getGasCertificate()) { + informationVo.setGasCertificate(""); + } + informationVo.setVehicleHandoverData(informationServiceByHandoverSid.getVehicleHandoverData()); + informationVo.setInformationSid(informationServiceByHandoverSid.getSid()); + informationVo.setRecName(recName); + vo.setBusVehicleInformation(informationVo); } - if (null == informationServiceByHandoverSid.getGasCertificate()) { - informationVo.setGasCertificate(""); + if (times.equals("2")) { + BusVehicleInformationVo informationVo = new BusVehicleInformationVo(); + BeanUtil.copyProperties(informationServiceByHandoverSid, informationVo, "id", "sid"); + if (null == informationServiceByHandoverSid.getApplyForm()) { + informationVo.setApplyForm(""); + } + if (null == informationServiceByHandoverSid.getCertificate()) { + informationVo.setCertificate(""); + } + if (null == informationServiceByHandoverSid.getVehicleKeyNum()) { + informationVo.setVehicleKeyNum(""); + } + if (null == informationServiceByHandoverSid.getManual()) { + informationVo.setManual(""); + } + if (null == informationServiceByHandoverSid.getEnvironmentalList()) { + informationVo.setEnvironmentalList(""); + } + if (null == informationServiceByHandoverSid.getDirverCard()) { + informationVo.setDirverCard(""); + } + if (null == informationServiceByHandoverSid.getGasCertificate()) { + informationVo.setGasCertificate(""); + } + String handoverNum = "001"; + StringBuffer str = new StringBuffer(); + BusVehicleInformation infor = busVehicleInformationService.selectByHandoverNumAndHandoverSid(handoverNum, sid); + //车钥匙 + if (infor.getVehicleKeyNum() < 1) { + str.append("车钥匙、"); + } + //一致性证书 + if (infor.getCertificate() < 1) { + str.append("一致性证书、"); + } + //申请表 + if (infor.getApplyForm() < 1) { + str.append("申请表、"); + } + //保修手册、说明书 + if (infor.getManual() < 1) { + str.append("保修手册、说明书、"); + } + //环保清单 + if (infor.getEnvironmentalList() < 1) { + str.append("环保清单、"); + } + //驾驶员卡 + if (infor.getDirverCard() < 1) { + str.append("驾驶员卡、"); + } + if (infor.getGasCertificate() < 1) { + if (infor.getIsFuelVehicle() != 0) { + str.append("气瓶检测合格证、"); + } + } + str.delete(str.length() - 1, str.length()); + informationVo.setVehicleHandoverData(str.toString()); + informationVo.setInformationSid(informationServiceByHandoverSid.getSid()); + informationVo.setRecName(recName); + vo.setBusVehicleInformation(informationVo); } - vo.setBusVehicleInformation(informationVo); } } else { BusVehicleInformationVo informationVo = new BusVehicleInformationVo(); @@ -221,22 +349,24 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService vehicleInformation = busVehicleInformationService.getByHandoverSid(sid); + if (null != vehicleInformation && vehicleInformation.size() > 0) { + for (BusVehicleInformation busVehicleInformation : vehicleInformation) { + busVehicleInformationService.deleteBySid(busVehicleInformation.getSid()); + } + } + } } - public ResultBean selectByVehicleSid(String vehicleSid) { ResultBean rb = ResultBean.fireFail(); BusVehicleInformationHandover busVehicleInformationHandover = baseMapper.selectByVehicleSid(vehicleSid); @@ -253,9 +383,21 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService informationList = busVehicleInformationService.getByHandoverSid(dto.getSid()); + BusVehicleInformationDto informationDto = dto.getBusVehicleInformation(); if (null != informationList) { for (BusVehicleInformation busVehicleInformation : informationList) { if ("001".equals(busVehicleInformation.getHandoverNum())) { + if (informationList.size() < 2) { + if (null != informationDto) { + if (null != informationDto.getRecTime()) { + busVehicleInformation.setRecTime(informationDto.getRecTime()); + } + if (StringUtils.isNotBlank(informationDto.getTransferName())) { + busVehicleInformation.setTransferName(informationDto.getTransferName()); + } + busVehicleInformationService.updateById(busVehicleInformation); + } + } if (busVehicleInformation.getVehicleKeyNum() < 1 || busVehicleInformation.getCertificate() < 1 || busVehicleInformation.getApplyForm() < 1 @@ -277,6 +419,15 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService details(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusVehicleInformationHandoverDetailsListVo vo = new BusVehicleInformationHandoverDetailsListVo(); + BusVehicleInformationHandover entity = fetchBySid(sid); + if (null != entity) { + BeanUtil.copyProperties(entity, vo); + } + List voList = new ArrayList<>(); + List informations = busVehicleInformationService.getByHandoverSid(sid); + if (null != informations && informations.size() > 0) { + for (BusVehicleInformation information : informations) { + BusVehicleInformationVo informationVo = new BusVehicleInformationVo(); + BeanUtil.copyProperties(information, informationVo); + voList.add(informationVo); + } + } + vo.setInformations(voList); + return rb.success().setData(vo); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppBaseDiscountpackageByApplyDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppBaseDiscountpackageByApplyDto.java new file mode 100644 index 0000000000..1ebc6c9be0 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppBaseDiscountpackageByApplyDto.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.terminal.api.autoservice.discountPackageApply; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Administrator + * @description + * @date 2023/5/29 11:04 + */ +@Data +public class AppBaseDiscountpackageByApplyDto implements Dto { + + @ApiModelProperty("优惠项目名称") + private String discountName; + @ApiModelProperty("价值") + private BigDecimal price; + @ApiModelProperty("优惠项目说明") + private String packageExplain; + @ApiModelProperty("数量") + private Integer number; + @ApiModelProperty("总价值") + private BigDecimal totalPrice; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppBaseDiscountpackagelistDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppBaseDiscountpackagelistDto.java new file mode 100644 index 0000000000..4057c6618b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppBaseDiscountpackagelistDto.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.terminal.api.autoservice.discountPackageApply; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/5/29 10:43 + */ +@Data +public class AppBaseDiscountpackagelistDto implements Dto { + + private String sid; // sid + @ApiModelProperty("价值") + private String price; // 价值 + @ApiModelProperty("数量") + private String number; // 数量 + @ApiModelProperty("说明") + private String packageExplain; // 说明 + @ApiModelProperty("优惠表申请sid") + private String discountSid; // 优惠表申请sid + @ApiModelProperty("总价值") + private String totalPrice; // 总价值 + @ApiModelProperty("优惠包名称") + private String discountName; // 优惠包名称 +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppCommonContractPackageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppCommonContractPackageVo.java new file mode 100644 index 0000000000..daffbb15bd --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppCommonContractPackageVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.terminal.api.autoservice.discountPackageApply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/5/29 10:55 + */ +@Data +public class AppCommonContractPackageVo implements Vo { + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("车型名称") + private String model; + @ApiModelProperty("订单台数") + private String number; + @ApiModelProperty("业务订单sid") + private String busSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDetailsVo.java index 35959db47a..49b027448f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDetailsVo.java @@ -51,51 +51,44 @@ import java.util.List; public class AppDiscountpackageApplyDetailsVo implements Vo { private String sid; // sid - - @ApiModelProperty("合同编号") + @ApiModelProperty("userSid") + private String userSid; // userSid + @ApiModelProperty("合同编号") private String contractId; // 合同编号 - @ApiModelProperty("申请人") + @ApiModelProperty("申请人") private String applyName; // 申请人 - @ApiModelProperty("客户名称") + @ApiModelProperty("客户名称") private String customerName; // 客户名称 - @ApiModelProperty("申请日期") + @ApiModelProperty("申请日期") private String applyDate; // 申请日期 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("是否显示办理按钮 提交后不显示") + @ApiModelProperty("是否显示办理按钮 提交后不显示") private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示 - @ApiModelProperty("车型名称") + @ApiModelProperty("车型名称") private String model; // 车型名称 - @ApiModelProperty("台数") + @ApiModelProperty("台数") private String number; // 台数 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; // taskId - @ApiModelProperty("申请人组织路径") + @ApiModelProperty("申请人组织路径") private String orgSidPath; // 申请人组织路径 - @ApiModelProperty("合同sid") - private String contractSid; - @ApiModelProperty("车型sid") - private String modelSid; - @ApiModelProperty("配置sid") - private String configSid; - @ApiModelProperty("销售订单sid") - private String saleOrderSid; - @ApiModelProperty("成交价") - private String price; + @ApiModelProperty("备注") + private String remarks; // 备注 @ApiModelProperty("优惠包列表") - private List appDiscountpackagelists; // 优惠包列表 + private List discountPackageList; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDto.java index f92cd1671c..ef602fb843 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDto.java @@ -54,50 +54,42 @@ public class AppDiscountpackageApplyDto implements Dto { @ApiModelProperty("用户sid") private String userSid; - @ApiModelProperty("合同编号") + @ApiModelProperty("合同编号") private String contractId; // 合同编号 - @ApiModelProperty("申请人") + @ApiModelProperty("申请人") private String applyName; // 申请人 - @ApiModelProperty("客户名称") + @ApiModelProperty("客户名称") private String customerName; // 客户名称 - @ApiModelProperty("申请日期") + @ApiModelProperty("申请日期") private String applyDate; // 申请日期 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("是否显示办理按钮 提交后不显示") + @ApiModelProperty("是否显示办理按钮 提交后不显示") private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示 - @ApiModelProperty("车型名称") + @ApiModelProperty("车型名称") private String model; // 车型名称 - @ApiModelProperty("台数") + @ApiModelProperty("台数") private String number; // 台数 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; // taskId - @ApiModelProperty("申请人组织路径") + @ApiModelProperty("申请人组织路径") private String orgSidPath; // 申请人组织路径 - @ApiModelProperty("合同sid") - private String contractSid; - @ApiModelProperty("车型sid") - private String modelSid; - @ApiModelProperty("配置sid") - private String configSid; - @ApiModelProperty("销售订单sid") - private String saleOrderSid; - @ApiModelProperty("成交价") - private String price; + @ApiModelProperty("备注") + private String remarks; // 备注 @ApiModelProperty("优惠包列表") private List discountPackageList; // 优惠包列表 } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFegin.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFegin.java index b2f92e5310..a9d1b55edd 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFegin.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFegin.java @@ -12,6 +12,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.List; @Api(tags = "优惠包申请列表") @FeignClient( @@ -36,6 +37,22 @@ public interface AppDiscountpackageFegin { @ResponseBody public ResultBean getDiscountPackageApplyInfo(@RequestParam("sid") String sid); + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据创建人sid查询合同") + @ResponseBody + @GetMapping("/selectContractBycreateBySid") + public ResultBean> selectByCreateUserSid(@RequestParam("createBySid") String createBySid); + + @ApiOperation("查询本公司下优惠政策列表") + @GetMapping("/getAppPackageByUseOrg") + @ResponseBody + ResultBean> getAppPackageByUseOrg(@RequestParam("userOrg") String userOrg); + + @ApiOperation("提交入账申请") @PostMapping("/submitDiscountPackageApplyInfo") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFeginFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFeginFallback.java index 76d384ca23..59bf6a4913 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFeginFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFeginFallback.java @@ -4,8 +4,11 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import java.util.List; + public class AppDiscountpackageFeginFallback implements AppDiscountpackageFegin{ + @Override public ResultBean> getDiscountManageApplyList(PagerQuery pq) { return null; @@ -21,6 +24,21 @@ public class AppDiscountpackageFeginFallback implements AppDiscountpackageFegin{ return null; } + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public ResultBean> selectByCreateUserSid(String createBySid) { + return null; + } + + @Override + public ResultBean> getAppPackageByUseOrg(String userOrg) { + return null; + } + @Override public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageVo.java index 4ef31b909e..7b750314bb 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageVo.java @@ -1,10 +1,13 @@ package com.yxt.anrui.terminal.api.autoservice.discountPackageApply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @ApiModel(value = "优惠包 视图数据对象", description = "优惠包 视图数据对象") @Data public class AppDiscountpackageVo implements Vo { @@ -20,19 +23,27 @@ public class AppDiscountpackageVo implements Vo { @ApiModelProperty("客户名称") private String customerName; - @ApiModelProperty("流程状态") private String nodeState; - - @ApiModelProperty("申请日期") - private String applyDate; - @ApiModelProperty("是否显示办理按钮 提交后不显示") private Boolean showHandleBtn; - @ApiModelProperty("车型名称") private String model; - @ApiModelProperty("台数") private String number; + @ApiModelProperty("发起日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date applyDate; // 申请日期 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("taskId") + private String taskId; // taskId + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 + @ApiModelProperty("销售订单sid") + private String saleOrderSid; // 销售订单sid } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseDiscountpackageApplysCompleteDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseDiscountpackageApplysCompleteDto.java index f5b0022eb0..8e33aed46f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseDiscountpackageApplysCompleteDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseDiscountpackageApplysCompleteDto.java @@ -39,6 +39,6 @@ public class BaseDiscountpackageApplysCompleteDto implements Dto { private String businessSid; @ApiModelProperty(value = "分支字段及业务字段") private Map formVariables; - @ApiModelProperty("调账车辆列表") - private List baseInternalPurchaseVehicles; // 调账车辆列表 +// @ApiModelProperty("调账车辆列表") +// private List baseInternalPurchaseVehicles; // 调账车辆列表 } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBuscenterFile.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBuscenterFile.java index 8c25364bd7..096edde869 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBuscenterFile.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBuscenterFile.java @@ -1,12 +1,8 @@ package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * @author Administrator * @description diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java index 78d53affe1..099badcbab 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java @@ -51,10 +51,10 @@ public interface VehicleInformationHandoverFeign { public ResultBean saveVehicleData(@RequestBody AppVehicleDataHandoverDto dto); - @ApiOperation("对外二次交付查看交车资料确认单详情") - @GetMapping("/fetchVehicleDataBySid/{sid}") - @ResponseBody - public ResultBean fetchVehicleDataBySid(@PathVariable("sid") String sid); +// @ApiOperation("对外二次交付查看交车资料确认单详情") +// @GetMapping("/fetchVehicleDataBySid/{sid}") +// @ResponseBody +// public ResultBean fetchVehicleDataBySid(@PathVariable("sid") String sid); @ApiOperation(("打印交车资料确认单")) @PostMapping("/createPdf") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java index 58b8050de7..d893f7523d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java @@ -39,10 +39,10 @@ public class VehicleInformationHandoverFeignFallback implements VehicleInformati return null; } - @Override - public ResultBean fetchVehicleDataBySid(String sid) { - return null; - } +// @Override +// public ResultBean fetchVehicleDataBySid(String sid) { +// return null; +// } @Override public ResultBean createPdf(AppVehicleDataHandoverDto dto) throws Exception { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyRest.java index db3fe49b16..881168373d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyRest.java @@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import java.util.List; + @Api(tags = "优惠包申请列表") @Controller @RequestMapping("/autoservice/v1/discountPackageApply") @@ -32,6 +34,21 @@ public class AppDiscountPackageApplyRest implements AppDiscountpackageFegin { return appDiscountPackageApplyService.getDiscountPackageApplyInfo(sid); } + @Override + public ResultBean delBySids(String[] sids) { + return appDiscountPackageApplyService.delBySids(sids); + } + + @Override + public ResultBean> selectByCreateUserSid(String createBySid) { + return appDiscountPackageApplyService.selectByCreateUserSid(createBySid); + } + + @Override + public ResultBean> getAppPackageByUseOrg(String userOrg) { + return appDiscountPackageApplyService.getAppPackageByUseOrg(userOrg); + } + @Override public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) { return appDiscountPackageApplyService.submitRecordApplication(dto); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java index d784a9b95d..c867320576 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java @@ -1,19 +1,28 @@ package com.yxt.anrui.terminal.biz.autoservice.discountPackageApply; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageByApplyDto; +import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign; +import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyDetailsVo; import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyFeign; +import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyQuery; +import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyVo; import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto; import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery; import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo; +import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; +import com.yxt.anrui.base.api.commoncontract.CommonContractPackageVo; import com.yxt.anrui.base.api.flow.FlowTaskVo; import com.yxt.anrui.terminal.api.autoservice.discountPackageApply.*; import com.yxt.anrui.terminal.config.CoverUtils; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -23,20 +32,32 @@ public class AppDiscountPackageApplyService { @Autowired private BaseDiscountpackageApplyFeign baseDiscountpackageApplyFeign; + @Autowired + private CommonContractFeign commonContractFeign; + + @Autowired + private BaseDiscountpackageFeign baseDiscountpackageFeign; + + public ResultBean> getDiscountManageApplyList(PagerQuery query) { ResultBean> rb = ResultBean.fireFail(); - PagerQuery pq = CoverUtils.getPagerQuery(query); - ResultBean> discountManageApplyList = baseDiscountpackageApplyFeign.getDiscountManageApplyList(pq); - PagerVo pagerVo = CoverUtils.selectPagerVo(discountManageApplyList.getData()); + PagerQuery pagerQuery = new PagerQuery<>(); + BeanUtil.copyProperties(query, pagerQuery); + ResultBean> listPage = baseDiscountpackageApplyFeign.listPage(pagerQuery); + PagerVo pagerVo = new PagerVo<>(); + if (listPage.getSuccess()) { + PagerVo data = listPage.getData(); + BeanUtil.copyProperties(data, pagerVo); + } return rb.success().setData(pagerVo); } public ResultBean saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) { ResultBean rb = ResultBean.fireFail(); com.yxt.anrui.base.api.basediscountpackageapply.AppDiscountpackageApplyDto appDiscountpackageApplyDto = new com.yxt.anrui.base.api.basediscountpackageapply.AppDiscountpackageApplyDto(); - BeanUtil.copyProperties(dto,appDiscountpackageApplyDto); + BeanUtil.copyProperties(dto, appDiscountpackageApplyDto); ResultBean resultBean = baseDiscountpackageApplyFeign.saveDiscountPackageApplyInfo(appDiscountpackageApplyDto); - if (resultBean.getSuccess() != true){ + if (resultBean.getSuccess() != true) { return rb.setMsg(resultBean.getMsg()); } return rb.success().setMsg(resultBean.getMsg()); @@ -44,32 +65,35 @@ public class AppDiscountPackageApplyService { public ResultBean getDiscountPackageApplyInfo(String sid) { ResultBean rb = ResultBean.fireFail(); - ResultBean discountPackageApplyInfo = baseDiscountpackageApplyFeign.getDiscountPackageApplyInfo(sid); - AppDiscountpackageApplyDetailsVo appDiscountpackageApplyDetailsVo = new AppDiscountpackageApplyDetailsVo(); - BeanUtil.copyProperties(discountPackageApplyInfo,appDiscountpackageApplyDetailsVo); - return rb.success().setData(appDiscountpackageApplyDetailsVo); + ResultBean voResultBean = baseDiscountpackageApplyFeign.fetchDetailsBySid(sid); + AppDiscountpackageApplyDetailsVo vo = new AppDiscountpackageApplyDetailsVo(); + if (voResultBean.getSuccess()) { + BaseDiscountpackageApplyDetailsVo data = voResultBean.getData(); + BeanUtil.copyProperties(data,vo); + } + return rb.success().setData(vo); } public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) { ResultBean rb = ResultBean.fireFail(); com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto submitBaseDiscountpackageApplyDto = new com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto(); - BeanUtil.copyProperties(dto,submitBaseDiscountpackageApplyDto); - baseDiscountpackageApplyFeign.submitRecordApplication(submitBaseDiscountpackageApplyDto); - return rb.success(); + BeanUtil.copyProperties(dto, submitBaseDiscountpackageApplyDto); + ResultBean resultBean = baseDiscountpackageApplyFeign.submitRecordApplication(submitBaseDiscountpackageApplyDto); + return rb.success().setData(resultBean.getData()); } public ResultBean complete(BaseDiscountpackageApplysCompleteDto dto) { ResultBean rb = ResultBean.fireFail(); BaseDiscountpackageApplyCompleteDto baseDiscountpackageApplyCompleteDto = new BaseDiscountpackageApplyCompleteDto(); - BeanUtil.copyProperties(dto,baseDiscountpackageApplyCompleteDto); - baseDiscountpackageApplyFeign.complete(baseDiscountpackageApplyCompleteDto); - return rb.success(); + BeanUtil.copyProperties(dto, baseDiscountpackageApplyCompleteDto); + ResultBean complete = baseDiscountpackageApplyFeign.complete(baseDiscountpackageApplyCompleteDto); + return rb.success().setData(complete.getData()); } public ResultBean revokeProcess(FlowTasksVo flowTaskVo) { ResultBean rb = ResultBean.fireFail(); FlowTaskVo flowTaskVo1 = new FlowTaskVo(); - BeanUtil.copyProperties(flowTaskVo,flowTaskVo1); + BeanUtil.copyProperties(flowTaskVo, flowTaskVo1); baseDiscountpackageApplyFeign.revokeProcess(flowTaskVo1); return rb.success(); } @@ -77,7 +101,7 @@ public class AppDiscountPackageApplyService { public ResultBean taskReject(FlowTasksVo flowTaskVo) { ResultBean rb = ResultBean.fireFail(); FlowTaskVo flowTaskVo1 = new FlowTaskVo(); - BeanUtil.copyProperties(flowTaskVo,flowTaskVo1); + BeanUtil.copyProperties(flowTaskVo, flowTaskVo1); baseDiscountpackageApplyFeign.taskReject(flowTaskVo1); return rb.success(); } @@ -85,7 +109,7 @@ public class AppDiscountPackageApplyService { public ResultBean breakProcess(FlowTasksVo flowTaskVo) { ResultBean rb = ResultBean.fireFail(); FlowTaskVo flowTaskVo1 = new FlowTaskVo(); - BeanUtil.copyProperties(flowTaskVo,flowTaskVo1); + BeanUtil.copyProperties(flowTaskVo, flowTaskVo1); baseDiscountpackageApplyFeign.breakProcess(flowTaskVo1); return rb.success(); } @@ -96,6 +120,9 @@ public class AppDiscountPackageApplyService { int next = discountpackageQuery.getNext(); GetNodeQuery getNodeQuery = new GetNodeQuery(); BeanUtil.copyProperties(discountpackageQuery, getNodeQuery); + if (StringUtils.isNotBlank(discountpackageQuery.getBusinessSid())) { + getNodeQuery.setSid(discountpackageQuery.getBusinessSid()); + } String data = ""; if (next == 0) { ResultBean> getPreviousNodesForReject = baseDiscountpackageApplyFeign.getPreviousNodesForReject(getNodeQuery); @@ -118,4 +145,45 @@ public class AppDiscountPackageApplyService { } return rb.success().setData(data); } + + public ResultBean delBySids(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + String msg = baseDiscountpackageApplyFeign.delBySids(sids).getMsg(); + return rb.success().setMsg(msg); + } + + + public ResultBean> selectByCreateUserSid(String createBySid) { + ResultBean rb = ResultBean.fireFail(); + ResultBean> listResultBean = commonContractFeign.selectByCreateUserSid(createBySid); + List voList = new ArrayList<>(); + if (listResultBean.getSuccess()) { + List data = listResultBean.getData(); + if (null != data && data.size() > 0) { + for (CommonContractPackageVo datum : data) { + AppCommonContractPackageVo vo = new AppCommonContractPackageVo(); + BeanUtil.copyProperties(datum,vo); + voList.add(vo); + } + } + } + return rb.success().setData(voList); + } + + public ResultBean> getAppPackageByUseOrg(String userOrg) { + ResultBean rb = ResultBean.fireFail(); + ResultBean> packageByUseOrg = baseDiscountpackageFeign.getAppPackageByUseOrg(userOrg); + List voList = new ArrayList<>(); + if (packageByUseOrg.getSuccess()) { + List data = packageByUseOrg.getData(); + if (null != data && data.size() > 0) { + for (BaseDiscountpackageByApplyDto datum : data) { + AppBaseDiscountpackageByApplyDto vo = new AppBaseDiscountpackageByApplyDto(); + BeanUtil.copyProperties(datum,vo); + voList.add(vo); + } + } + } + return rb.success().setData(voList); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java index 3e22a71da8..b06b3457bb 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java @@ -37,9 +37,14 @@ public class VehicleInformationHandoverRest implements VehicleInformationHandove @Override public ResultBean fetchDetailsBySid(String sid) { - return vehicleInformationHandoverService.fetchDetailsBySid(sid); + return null; } +// @Override +// public ResultBean fetchDetailsBySid(String sid) { +// return vehicleInformationHandoverService.fetchDetailsBySid(sid); +// } + @Override public ResultBean> contractForHandover(PagerQuery pq) { return vehicleInformationHandoverService.contractForHandover(pq); @@ -50,10 +55,10 @@ public class VehicleInformationHandoverRest implements VehicleInformationHandove return vehicleInformationHandoverService.saveVehicleData(dto); } - @Override - public ResultBean fetchVehicleDataBySid(String sid) { - return vehicleInformationHandoverService.fetchVehicleDataBySid(sid); - } +// @Override +// public ResultBean fetchVehicleDataBySid(String sid) { +// return vehicleInformationHandoverService.fetchVehicleDataBySid(sid); +// } @Override public ResultBean createPdf(AppVehicleDataHandoverDto dto) throws Exception { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java index 54cc960dc8..5246ebd0f9 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java @@ -77,43 +77,43 @@ public class VehicleInformationHandoverService { return rb.success().setData(sid); } - /** - * 详情编辑回显 - * - * @param sid - * @return - */ - public ResultBean fetchDetailsBySid(String sid) { - ResultBean rb = ResultBean.fireFail(); - BusVehicleInformationHandoverDetailsVo detailsVo = busVehicleInformationHandoverFeign.fetchDetailsBySid(sid).getData(); - AppVehicleInformationHandoverDetailsVo vo = new AppVehicleInformationHandoverDetailsVo(); - if (null != detailsVo) { - BeanUtil.copyProperties(detailsVo, vo); - if (null != vo.getBusVehicleInformation()) { - BusVehicleInformationVo informationServiceByHandoverSid = detailsVo.getBusVehicleInformation(); - AppVehicleInformationVo informationVo = vo.getBusVehicleInformation(); - if (null == informationServiceByHandoverSid.getApplyForm()) { - informationVo.setApplyForm(""); - } - if (null == informationServiceByHandoverSid.getVehicleKeyNum()) { - informationVo.setVehicleKeyNum(""); - } - if (null == informationServiceByHandoverSid.getManual()) { - informationVo.setManual(""); - } - if (null == informationServiceByHandoverSid.getEnvironmentalList()) { - informationVo.setEnvironmentalList(""); - } - if (null == informationServiceByHandoverSid.getDirverCard()) { - informationVo.setDirverCard(""); - } - if (null == informationServiceByHandoverSid.getGasCertificate()) { - informationVo.setGasCertificate(""); - } - } - } - return rb.success().setData(vo); - } +// /** +// * 详情编辑回显 +// * +// * @param sid +// * @return +// */ +// public ResultBean fetchDetailsBySid(String sid) { +// ResultBean rb = ResultBean.fireFail(); +// BusVehicleInformationHandoverDetailsVo detailsVo = busVehicleInformationHandoverFeign.fetchDetailsBySid(sid).getData(); +// AppVehicleInformationHandoverDetailsVo vo = new AppVehicleInformationHandoverDetailsVo(); +// if (null != detailsVo) { +// BeanUtil.copyProperties(detailsVo, vo); +// if (null != vo.getBusVehicleInformation()) { +// BusVehicleInformationVo informationServiceByHandoverSid = detailsVo.getBusVehicleInformation(); +// AppVehicleInformationVo informationVo = vo.getBusVehicleInformation(); +// if (null == informationServiceByHandoverSid.getApplyForm()) { +// informationVo.setApplyForm(""); +// } +// if (null == informationServiceByHandoverSid.getVehicleKeyNum()) { +// informationVo.setVehicleKeyNum(""); +// } +// if (null == informationServiceByHandoverSid.getManual()) { +// informationVo.setManual(""); +// } +// if (null == informationServiceByHandoverSid.getEnvironmentalList()) { +// informationVo.setEnvironmentalList(""); +// } +// if (null == informationServiceByHandoverSid.getDirverCard()) { +// informationVo.setDirverCard(""); +// } +// if (null == informationServiceByHandoverSid.getGasCertificate()) { +// informationVo.setGasCertificate(""); +// } +// } +// } +// return rb.success().setData(vo); +// } /** From d7cd3136e305a2a329c19c2f98cf5979772fad0e Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 29 May 2023 13:54:13 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8C=85=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E8=8E=B7=E5=8F=96=E4=B8=8B=E4=B8=80=E7=8E=AF=E8=8A=82?= =?UTF-8?q?=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDiscountpackageApplyFeign.java | 5 +++-- .../AppDiscountPackageApplyService.java | 11 +++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java index f343198b58..3ca7e45887 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java @@ -27,6 +27,7 @@ package com.yxt.anrui.base.api.basediscountpackageapply; import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageQuery; import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo; +import com.yxt.anrui.base.api.basediscountpackage.flow.GetNodeVo; import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery; import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto; import com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto; @@ -129,10 +130,10 @@ public interface BaseDiscountpackageApplyFeign { @ApiOperation(value = "获取下一个环节") @GetMapping(value = "/getNextNodesForSubmit") - ResultBean getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); + ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); @ApiOperation(value = "获取上一个环节") @GetMapping(value = "/getPreviousNodesForReject") - ResultBean getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java index c867320576..4f7e5a61cc 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java @@ -14,7 +14,6 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractPackageVo; import com.yxt.anrui.base.api.flow.FlowTaskVo; import com.yxt.anrui.terminal.api.autoservice.discountPackageApply.*; -import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -69,7 +68,7 @@ public class AppDiscountPackageApplyService { AppDiscountpackageApplyDetailsVo vo = new AppDiscountpackageApplyDetailsVo(); if (voResultBean.getSuccess()) { BaseDiscountpackageApplyDetailsVo data = voResultBean.getData(); - BeanUtil.copyProperties(data,vo); + BeanUtil.copyProperties(data, vo); } return rb.success().setData(vo); } @@ -125,7 +124,7 @@ public class AppDiscountPackageApplyService { } String data = ""; if (next == 0) { - ResultBean> getPreviousNodesForReject = baseDiscountpackageApplyFeign.getPreviousNodesForReject(getNodeQuery); + ResultBean> getPreviousNodesForReject = baseDiscountpackageApplyFeign.getPreviousNodesForReject(getNodeQuery); if (getPreviousNodesForReject.getSuccess()) { getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); data = getPreviousNodesForReject.getData().get(0).getName(); @@ -133,7 +132,7 @@ public class AppDiscountPackageApplyService { return rb.setMsg(getPreviousNodesForReject.getMsg()); } } else if (next == 1) { - ResultBean> getNextNodesForSubmit = baseDiscountpackageApplyFeign.getNextNodesForSubmit(getNodeQuery); + ResultBean> getNextNodesForSubmit = baseDiscountpackageApplyFeign.getNextNodesForSubmit(getNodeQuery); if (getNextNodesForSubmit.getSuccess()) { getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); data = getNextNodesForSubmit.getData().get(0).getName(); @@ -162,7 +161,7 @@ public class AppDiscountPackageApplyService { if (null != data && data.size() > 0) { for (CommonContractPackageVo datum : data) { AppCommonContractPackageVo vo = new AppCommonContractPackageVo(); - BeanUtil.copyProperties(datum,vo); + BeanUtil.copyProperties(datum, vo); voList.add(vo); } } @@ -179,7 +178,7 @@ public class AppDiscountPackageApplyService { if (null != data && data.size() > 0) { for (BaseDiscountpackageByApplyDto datum : data) { AppBaseDiscountpackageByApplyDto vo = new AppBaseDiscountpackageByApplyDto(); - BeanUtil.copyProperties(datum,vo); + BeanUtil.copyProperties(datum, vo); voList.add(vo); } } From 9549bc0425a7f66bbc3a5446572bb7b6c6613c66 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 29 May 2023 15:01:56 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=BA=94=E6=94=B6=E6=9C=AA=E6=94=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusHandoverPrepareAddDto.java | 4 ++ .../app/AppHandoverPreparePageQuery.java | 4 ++ .../app/AppHandoverPreparePageVo.java | 2 + .../BusDeliveredApplyService.java | 8 ++- .../BusHandoverPrepareRest.java | 9 +-- .../BusHandoverPrepareService.java | 57 +++++++++++++++++-- .../FinCollectionConfirmationService.java | 2 + ...inUncollectedReceivablesDetailedMapper.xml | 1 + ...UncollectedReceivablesDetailedService.java | 1 + .../HandoverPreparePageQuery.java | 9 ++- .../deliveryPlan/HandoverPreparePageVo.java | 3 +- 11 files changed, 83 insertions(+), 17 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java index 9ec1f9a808..798d0967b7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java @@ -11,6 +11,8 @@ import java.util.List; public class BusHandoverPrepareAddDto implements Dto { private static final long serialVersionUID = -5503119838818185683L; + private String createBySid; + @ApiModelProperty("合同编号") private String contractNo; @ApiModelProperty("客户Sid") @@ -42,4 +44,6 @@ public class BusHandoverPrepareAddDto implements Dto { @ApiModelProperty("车辆信息") private List appBusHandoverPrepareVehicleDtos; + private String model; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageQuery.java index 1a26690389..d7d8f08101 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageQuery.java @@ -25,5 +25,9 @@ public class AppHandoverPreparePageQuery implements Query { private String payTypeKey; @ApiModelProperty("组织机构全路径") private String orgPath; + @ApiModelProperty("移动端菜单应用sid") + private String menuSid; + @ApiModelProperty("PC端菜单url") + private String menuUrl; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageVo.java index 554ca65eff..78a2b9f804 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.buscenter.api.bushandoverprepare.app; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -31,6 +32,7 @@ public class AppHandoverPreparePageVo implements Vo { @ApiModelProperty("交车准备状态key") private String handoverPrepareStateKey; @ApiModelProperty("是否显示办理") + @JsonProperty("isShowUpData") private boolean isShowUpData; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 3aef4ebb28..50e7fd10f4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -741,16 +741,20 @@ public class BusDeliveredApplyService extends MybatisBaseService> getDeliveryPlanList(PagerQuery pagerQuery) { - PagerVo page = new PagerVo<>(); - IPage iPage = busHandoverPrepareService.getDeliveryPlanList(pagerQuery); - PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); - return new ResultBean>().success().setData(pagerVo); + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = busHandoverPrepareService.getDeliveryPlanList(pagerQuery); + return rb.success().setData(pv); } @Override diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java index 527f8aa050..c8b2a667e6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java @@ -47,11 +47,14 @@ import com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitService; import com.yxt.anrui.fin.api.finbillvehicle.AppInvoicingInfoVinNoVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; 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.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -91,6 +94,8 @@ public class BusHandoverPrepareService extends MybatisBaseService createQueryWrapper(BusHandoverPrepareQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -165,23 +170,62 @@ public class BusHandoverPrepareService extends MybatisBaseService getDeliveryPlanList(PagerQuery pagerQuery) { + public PagerVo getDeliveryPlanList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); AppHandoverPreparePageQuery params = pagerQuery.getParams(); String userSid = params.getUserSid(); - String useOrgSid = ""; + /* String useOrgSid = ""; if(StringUtils.isNotBlank(params.getOrgPath())){ useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); }else{ useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - } + }*/ QueryWrapper qw = new QueryWrapper<>(); + //======================= + params.setMenuSid("ace04aa4-c970-4960-b211-984052f204c3"); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(params.getOrgPath()); + privilegeQuery.setMenuSid(params.getMenuSid()); + privilegeQuery.setMenuUrl(params.getMenuUrl()); + privilegeQuery.setUserSid(params.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if(StringUtils.isNotBlank(defaultIdReltBean.getData())){ + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = params.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgSidPath", orgSidPath); + } else if("5".equals(orgLevelKey)){ + qw.eq("createBySid",params.getUserSid()); + }else{ + PagerVo p = new PagerVo<>(); + return p; + } + }else{ + PagerVo p = new PagerVo<>(); + return p; + } if (StringUtils.isNotBlank(params.getType())) {//1待准备，2已准备 qw.eq("handoverPrepareStateKey", params.getType()); } - if (StringUtils.isNotBlank(useOrgSid)) { + /* if (StringUtils.isNotBlank(useOrgSid)) { qw.eq("useOrgSid", useOrgSid); - } + }*/ if(StringUtils.isNotBlank(params.getContractNo())){ qw.like("contractNo",params.getContractNo()); } @@ -203,7 +247,8 @@ public class BusHandoverPrepareService extends MybatisBaseService p = PagerUtil.pageToVo(iPage, null); + return p; } /** 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 68ce67a1f2..d9f07ead9a 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 @@ -1092,6 +1092,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService new TreeSet<>(Comparator.comparing(AppFinUncollectedReceivablesDetailedVo::getSid))), ArrayList::new)); + //根据合同编号倒序排序 + collList = collList.stream().sorted(Comparator.comparing(AppFinUncollectedReceivablesDetailedVo::getContractId).reversed()).collect(Collectors.toList()); //分页 IPage page1 = new Page<>(); page1.setRecords(collList); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 8285c2d90b..992b24fc52 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -51,6 +51,7 @@ ${ew.sqlSegment} and length(busVinSid) > 0 + order by id asc + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java index 1dda9fa5a6..283569fe6d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java @@ -207,4 +207,9 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign { return finVehicleInvoiceService.updateBybillingSid(billingSid); } + @Override + public ResultBean selectByVinSid(String vinSid) { + return finVehicleInvoiceService.selectByVinSids(vinSid); + } + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index 2bbf9590be..023f2fb983 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -29,6 +29,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -375,4 +376,14 @@ public class FinVehicleInvoiceService extends MybatisBaseService selectByVinSids(String vinSid) { + ResultBean rb = ResultBean.fireFail(); + VehicleInvoiceVo vehicleInvoiceVo = baseMapper.selectByVinSids(vinSid); + if(StringUtils.isNotBlank(vehicleInvoiceVo.getFilePath())){ + List filePathList = Arrays.asList(vehicleInvoiceVo.getFilePath().split(",")); + vehicleInvoiceVo.setInvoiceImages(filePathList); + } + return rb.success().setData(vehicleInvoiceVo); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/InvoicingInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/InvoicingInfoVo.java index 8e6a297d39..5bf4b24f04 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/InvoicingInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/InvoicingInfoVo.java @@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -15,12 +16,18 @@ public class InvoicingInfoVo implements Vo { @JsonProperty("vinSid") private String sid; @ApiModelProperty("车架号") - private String vin; - @ApiModelProperty("发票代码") - private String invoice; + @JsonProperty("vin") + private String vinNo; + @ApiModelProperty("开票人") + @JsonProperty("name") + private String drawer; @ApiModelProperty("开票日期") - private String date; - @ApiModelProperty("开票附件") - private List invoiceImages; + @JsonProperty("date") + private String invoiceDate; + @ApiModelProperty("发票号") + @JsonProperty("invoice") + private String invoiceNo; + @ApiModelProperty("发票图片") + private List invoiceImages = new ArrayList<>(); } From 2800dd932bb151df8822132b5007ff8818461cc2 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 29 May 2023 18:11:46 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDistributorListVo.java | 10 +- .../BaseDistributorService.java | 3 + .../CrmCustomerBillApplicationDto.java | 50 +++++++++ .../crmcustomertemp/CrmCustomerTempDto.java | 5 +- .../crmcustomertemp/CrmCustomerTempFeign.java | 10 ++ .../CrmCustomerTempFeignFallback.java | 9 +- .../crmcustomertemp/CrmCustomerTempRest.java | 5 + .../CrmCustomerTempService.java | 53 +++++++++- .../FinCompanyInvoicingFeign.java | 2 +- .../FinCompanyInvoicingFeignFallback.java | 100 +++++++++--------- .../FinCompanyInvoicingQuery.java | 2 + .../FinCompanyInvoicingMapper.java | 4 +- .../FinCompanyInvoicingMapper.xml | 12 +++ .../FinCompanyInvoicingRest.java | 4 +- .../FinCompanyInvoicingService.java | 15 ++- 15 files changed, 211 insertions(+), 73 deletions(-) create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerBillApplicationDto.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java index b257eb276c..cfc33a3c81 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java @@ -12,14 +12,16 @@ import lombok.Data; public class BaseDistributorListVo implements Vo { private static final long serialVersionUID = 7567158573644935938L; - private String name; - private String sid; + private String name;//名称 + private String sid;//sid - private String registNum;//税号 + private String registNum;//税号或身份证号 private String registDetailAddress;//地址 private String invoPhone;//开票联系电话 private String invoBank;//开票开户行 private String invoBankNum;//开票银行账号 - private String openTickRemarks; + private String openTickRemarks;//拼接的开票信息 + + private String nameAndPhone;//个人名字手机号拼接 } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 7e1b4da2f1..880d5f7d53 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -903,6 +903,9 @@ public class BaseDistributorService extends MybatisBaseService + * File: CrmCustomerTempDto.java
+ * Class: com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto
+ * Description: 潜在客户信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-01-12 11:21:16
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "潜在客户信息 数据传输对象", description = "潜在客户信息 数据传输对象") +@Data +public class CrmCustomerBillApplicationDto implements Dto { + + @ApiModelProperty("sid") + private String sid; + + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("身份证号") + private String taxpayerNo; + @ApiModelProperty("电话") + private String phone; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("组织全路径") + private String orgSidPath; + @ApiModelProperty("业务员sid") + private String staffSid; + @ApiModelProperty("用户sid") + private String createBySid; +} \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java index a0f473f5e1..e0bce64fec 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.ArrayList; import java.util.List; /** @@ -132,10 +133,10 @@ public class CrmCustomerTempDto implements Dto { //运营信息 @ApiModelProperty(value = "运营信息") - private CrmBusinessDto crmBusinessDto; + private CrmBusinessDto crmBusinessDto = new CrmBusinessDto(); //见证材料集合 @ApiModelProperty(value = "见证材料的集合，编辑保存时无此字段") - private List crmVisitAppendixDtoList; + private List crmVisitAppendixDtoList = new ArrayList<>(); private String orgPath; diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java index b30b462087..9dd6c1b91b 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java @@ -86,6 +86,16 @@ public interface CrmCustomerTempFeign { @PostMapping("/save") public ResultBean save(@Valid @RequestBody CrmCustomerTempDto dto); + /** + * 开票信息维护客户新增修改 + * + * @return + */ + @ApiOperation("开票信息维护客户新增修改") + @PostMapping("/billApplicatSaveCust") + public ResultBean billApplicatSaveCust(@Valid @RequestBody CrmCustomerBillApplicationDto dto); + + /** * pc端潜在客户编辑保存 * diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java index 2e0a1d9240..9843960385 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java @@ -67,8 +67,13 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { public ResultBean save(CrmCustomerTempDto dto){ return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomertemp/save无法访问"); } - - @Override + + @Override + public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) { + return null; + } + + @Override public ResultBean update(CrmCustomerTempUpdateDto dto,String sid){ return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomertemp/update无法访问"); } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java index b9dfde9895..3342f0ebaa 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java @@ -114,6 +114,11 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return crmCustomerTempService.saveCrmCustomer(dto); } + @Override + public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) { + return crmCustomerTempService.billApplicatSaveCust(dto); + } + /** * 潜在客户修改保存 * diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 1c39fd2022..72ed1cfb42 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -995,11 +995,11 @@ public class CrmCustomerTempService extends MybatisBaseService list = baseMapper.selectCustomerList(qw); @@ -1100,4 +1100,51 @@ public class CrmCustomerTempService extends MybatisBaseService> qyFetchListByName(@RequestParam("name") String name); + public ResultBean> qyFetchListByName(@RequestParam("name") String name,@RequestParam("useOrgSid") String useOrgSid); @ApiOperation("企业开票信息管理新增或保存") @PostMapping("/qySaveOrUpdate") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java index dff7a1b6e4..a6a7609d7c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java @@ -48,65 +48,65 @@ import java.util.List; @Component public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-fin/fincompanyinvoicing/listPage无法访问"); - } + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-fin/fincompanyinvoicing/listPage无法访问"); + } - @Override - public ResultBean save(FinCompanyInvoicingDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/save无法访问"); - } + @Override + public ResultBean save(FinCompanyInvoicingDto dto) { + return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/save无法访问"); + } - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/delBySids无法访问"); - } + @Override + public ResultBean delBySids(String[] sids) { + return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/delBySids无法访问"); + } - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-fin/fincompanyinvoicing/fetchDetailsBySid无法访问"); - } + @Override + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-fin/fincompanyinvoicing/fetchDetailsBySid无法访问"); + } - @Override - public ResultBean fetchDetailsByUseOrgSid(String useOrgSid) { - return null; - } + @Override + public ResultBean fetchDetailsByUseOrgSid(String useOrgSid) { + return null; + } - @Override - public ResultBean getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) { - return null; - } + @Override + public ResultBean getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) { + return null; + } - @Override - public ResultBean> selectInvoingList(String busSid) { - return null; - } + @Override + public ResultBean> selectInvoingList(String busSid) { + return null; + } - @Override - public ResultBean> qyListPage(PagerQuery pq) { - return null; - } + @Override + public ResultBean> qyListPage(PagerQuery pq) { + return null; + } - @Override - public ResultBean> qyFetchListByName(String name) { - return null; - } + @Override + public ResultBean> qyFetchListByName(String name, String useOrgSid) { + return null; + } - @Override - public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) { - return null; - } + @Override + public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) { + return null; + } - @Override - public List qySelByUseOrgSid(String orgSid) { - return null; - } + @Override + public List qySelByUseOrgSid(String orgSid) { + return null; + } - @Override - public List qyAppSelByUseOrgSid(String useOrgSid, String search) { - return null; - } + @Override + public List qyAppSelByUseOrgSid(String useOrgSid, String search) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java index a0beb0a664..78f8cd126c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java @@ -66,4 +66,6 @@ public class FinCompanyInvoicingQuery implements Query { private String name; @ApiModelProperty("纳税人识别号") private String taxpayerNo; + + private String appName;//移动端查询条件 } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java index a1423d3a46..d460927c05 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java @@ -56,8 +56,10 @@ public interface FinCompanyInvoicingMapper extends BaseMapper voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage selectPageVoGS(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @Select("select * from fin_company_invoicing") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml index 87a49a827c..db3baf7ff4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml @@ -3,6 +3,13 @@ + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java index ce77a4d927..9c0fb0e759 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java @@ -118,9 +118,9 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign { } @Override - public ResultBean> qyFetchListByName(String name) { + public ResultBean> qyFetchListByName(String name,String useOrgSid) { ResultBean rb = ResultBean.fireFail(); - List finCompanyInvoicingDetailsVos = finCompanyInvoicingService.qyFetchListByName(name); + List finCompanyInvoicingDetailsVos = finCompanyInvoicingService.qyFetchListByName(name,useOrgSid); return rb.success().setData(finCompanyInvoicingDetailsVos); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index f7ec0a77e5..db117055d6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java @@ -130,7 +130,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); + IPage pagging = baseMapper.selectPageVoGS(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -239,12 +239,15 @@ public class FinCompanyInvoicingService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -261,12 +264,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService(); qw1.eq("useOrgSid", useOrgSid); qw1.eq("name", name); - qw1.isNull("purchaseSystemSid"); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo1 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw1); QueryWrapper qw2 = new QueryWrapper<>(); qw2.eq("useOrgSid", useOrgSid); qw2.eq("taxpayerNo", taxpayerNo); - qw1.isNull("purchaseSystemSid"); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo2 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw2); if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) { return rb.setMsg("该企业开票信息已存在"); @@ -278,13 +279,11 @@ public class FinCompanyInvoicingService extends MybatisBaseService(); qw2.eq("useOrgSid", useOrgSid); qw1.notIn("sid", dtoSid); qw2.eq("taxpayerNo", taxpayerNo); - qw1.isNull("purchaseSystemSid"); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo2 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw2); if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) { return rb.setMsg("该企业开票信息已存在"); @@ -293,8 +292,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService qyFetchListByName(String name) { + public List qyFetchListByName(String name,String useOrgSid) { QueryWrapper qw = new QueryWrapper<>(); + qw.eq("useOrgSid", useOrgSid); + qw.eq("isDelete", 0); qw.like("name", name); List finCompanyInvoicingDetailsVos = baseMapper.qyFetchListByName(qw); return finCompanyInvoicingDetailsVos; @@ -304,7 +305,6 @@ public class FinCompanyInvoicingService extends MybatisBaseService(); qw.eq("useOrgSid", orgSid); qw.eq("isDelete", 0); - qw.isNull("purchaseSystemSid"); List finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); return finCompanyInvoicingBillListVos; } @@ -313,7 +313,6 @@ public class FinCompanyInvoicingService extends MybatisBaseService(); qw.eq("useOrgSid", useOrgSid); qw.eq("isDelete", 0); - qw.isNull("purchaseSystemSid"); qw.like("name",search); List finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); return finCompanyInvoicingBillListVos; From 6c02dd82b50c989bbb7ca117489d85b97424e883 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 29 May 2023 18:32:42 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index db117055d6..680c6e8683 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java @@ -282,7 +282,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService(); qw2.eq("useOrgSid", useOrgSid); - qw1.notIn("sid", dtoSid); + qw2.notIn("sid", dtoSid); qw2.eq("taxpayerNo", taxpayerNo); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo2 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw2); if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) { From 6ccaebd263adefda4a059a571e3e3afe41561ee4 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 29 May 2023 18:36:00 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/fincompanyinvoicing/FinCompanyInvoicingService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index 680c6e8683..905b975f1e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java @@ -277,12 +277,12 @@ public class FinCompanyInvoicingService extends MybatisBaseService(); qw1.eq("useOrgSid", useOrgSid); - qw1.notIn("sid", dtoSid); + qw1.ne("sid", dtoSid); qw1.eq("name", name); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo1 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw1); QueryWrapper qw2 = new QueryWrapper<>(); qw2.eq("useOrgSid", useOrgSid); - qw2.notIn("sid", dtoSid); + qw2.ne("sid", dtoSid); qw2.eq("taxpayerNo", taxpayerNo); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo2 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw2); if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) { From 4d268c491620b8fd6dc5a788bb1afe1da396e8e0 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 30 May 2023 08:41:16 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E6=8F=90=E8=BD=A6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E6=98=AF=E5=90=A6=E6=98=AF?= =?UTF-8?q?=E8=87=AA=E8=90=A5=E9=9D=9E=E6=8B=85=E4=BF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppArrearsCarryInfoVo.java | 2 +- .../AppBusArrearsCarryVehicleApplyService.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java index 370bd9f95f..9f2c0e1018 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java @@ -149,7 +149,7 @@ public class AppArrearsCarryInfoVo implements Vo { @ApiModelProperty("销售订单sid") private String busSalesOrderSid; - @ApiModelProperty("是否有金融方案") + @ApiModelProperty("是否是自营非担保") private boolean finType; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java index 2afa9a254d..51eab0a402 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java @@ -316,6 +316,11 @@ public class AppBusArrearsCarryVehicleApplyService { arrearVo.setType(1); arrearVo.setKey("guaranteeLetter"); arrearVo.setNullAble(false); + if(advanceArrearsInfoVo.isFinType()){//自营非担保 + arrearVo.setNullAble(true); + }else{//可不填 + arrearVo.setNullAble(false); + } List guaranteeLetter = advanceArrearsInfoVo.getGuaranteeLetter(); arrearVo.setFilesPath(guaranteeLetter); list.add(arrearVo); @@ -324,12 +329,7 @@ public class AppBusArrearsCarryVehicleApplyService { arrearVo.setTitle("股东会对外担保决议"); arrearVo.setType(1); arrearVo.setKey("gdLetter"); - if(advanceArrearsInfoVo.isFinType()){ - arrearVo.setNullAble(false); - }else{ - arrearVo.setNullAble(true); - } - + arrearVo.setNullAble(true); List gdLetter = advanceArrearsInfoVo.getGdLetter(); arrearVo.setFilesPath(gdLetter); list.add(arrearVo); From 5e79d8b94d11d7c7dd236f6cff94486eae5afe17 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 30 May 2023 08:42:45 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E6=8F=90=E8=BD=A6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E6=98=AF=E5=90=A6=E6=98=AF?= =?UTF-8?q?=E8=87=AA=E8=90=A5=E9=9D=9E=E6=8B=85=E4=BF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusArrearsCarryVehicleApplyService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index fe06f3154b..54fa1f06c6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -633,6 +633,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService