From 8981d5b69388df9e37c123efed23d518f12fa46f Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Sun, 25 Jun 2023 16:41:40 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BA=A4?= =?UTF-8?q?=E8=BD=A6=E8=B5=84=E6=96=99=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCompleteRecordVo.java | 32 +++ .../busvehicledatahandover/AppListQuery.java | 17 ++ .../AppNotCompleteRecordVo.java | 26 +++ .../busvehicledatahandover/AppVinListVo.java | 20 ++ .../busvehicledatahandover/BusDetailsVo.java | 29 +++ .../BusVehicleDataDetailsVo.java | 16 ++ .../BusVehicleDataHandoverFeign.java | 29 ++- .../BusVehicleDataHandoverFeignFallback.java | 23 +- .../BusVehicleDataHandoverMapper.java | 8 +- .../BusVehicleDataHandoverMapper.xml | 38 ++- .../BusVehicleDataHandoverRest.java | 28 ++- .../BusVehicleDataHandoverService.java | 221 ++++++++++++++++-- .../CompleteRecordVo.java | 30 +++ .../vehicleinformationhandover/ListQuery.java | 17 ++ .../NotCompleteRecordVo.java | 26 +++ .../VehicleInformationHandoverFeign.java | 10 + ...hicleInformationHandoverFeignFallback.java | 10 + .../vehicleinformationhandover/VinListVo.java | 19 ++ .../VehicleInformationHandoverRest.java | 10 + .../VehicleInformationHandoverService.java | 28 +++ 20 files changed, 608 insertions(+), 29 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppCompleteRecordVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppListQuery.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppVinListVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusDetailsVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/CompleteRecordVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/ListQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VinListVo.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppCompleteRecordVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppCompleteRecordVo.java new file mode 100644 index 0000000000..67c64ea369 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppCompleteRecordVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.buscenter.api.busvehicledatahandover; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/25 14:29 + */ +@Data +public class AppCompleteRecordVo implements Vo { + + private String contractId; + private String name; + private String createInfo; + private String model; + private String vins; + private String billId; + private String createName; + @ApiModelProperty("创建日期") + private Date createTime; + private String downLoadUrl; + private List urls; + private Boolean showUpload; + private Boolean showDownload; + private String linkSid; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppListQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppListQuery.java new file mode 100644 index 0000000000..befeb2a4b1 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppListQuery.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.buscenter.api.busvehicledatahandover; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/6/25 8:53 + */ +@Data +public class AppListQuery implements Query { + private String name; + private String type; + private String userSid; + private String orgPath; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java new file mode 100644 index 0000000000..561698e738 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.buscenter.api.busvehicledatahandover; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/25 8:51 + */ +@Data +public class AppNotCompleteRecordVo implements Vo { + private String contractId; + private String customerName; + private String createInfo; + private String carModel; + private List vinList = new ArrayList<>(); + private String createName; + @ApiModelProperty("创建日期") + private Date createTime; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppVinListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppVinListVo.java new file mode 100644 index 0000000000..5fc0fcfc6c --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppVinListVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.buscenter.api.busvehicledatahandover; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/25 8:52 + */ +@Data +public class AppVinListVo implements Vo { + private String vin; + private String recordSid; + private List urls = new ArrayList<>(); + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusDetailsVo.java new file mode 100644 index 0000000000..61241a8a53 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusDetailsVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.buscenter.api.busvehicledatahandover; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/25 12:25 + */ +@Data +public class BusDetailsVo implements Vo { + @ApiModelProperty("合同号") + private String contractNo; //合同号 + @ApiModelProperty("客户名称") + private String customerName; //客户名称 + @ApiModelProperty("创建人") + private String recName; // 交接人 + @ApiModelProperty("交接日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date recDate; + private List vinList = new ArrayList<>(); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataDetailsVo.java new file mode 100644 index 0000000000..8e91b485ba --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataDetailsVo.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.buscenter.api.busvehicledatahandover; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/6/25 12:26 + */ +@Data +public class BusVehicleDataDetailsVo implements Vo { + + private String vinNo; + private String items; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeign.java index ffc7583470..c7ef6c8411 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeign.java @@ -1,12 +1,16 @@ package com.yxt.anrui.buscenter.api.busvehicledatahandover; +import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitQuery; +import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -38,19 +42,26 @@ public interface BusVehicleDataHandoverFeign { @GetMapping("/getDeliveryInfo/{sid}") @ResponseBody public ResultBean getDeliveryInfo(@PathVariable("sid") String sid); + @ApiOperation("详情") @GetMapping("/details/{sid}") @ResponseBody - public ResultBean details(@PathVariable("sid") String sid); + public ResultBean details(@PathVariable("sid") String sid); + + @ApiOperation("根据单据编号获得记录") + @GetMapping("/getOneByBillNo") + @ResponseBody + public ResultBean> getDataByBillNo(@RequestParam("billNo") String billNo); @ApiOperation("保存资料确认") @PostMapping("/saveDeliveryInfo") @ResponseBody public ResultBean saveDeliveryInfo(@RequestBody BusDeliveryInfoDto dto); - @ApiOperation(("上传交车资料确认单")) + @ApiOperation("上传资料确认单") + @ApiImplicitParam(name = "file", value = "文件", required = true, dataType = "MultipartFile", dataTypeClass = MultipartFile.class) @PostMapping("/upload") - public ResultBean uploadPdf(@RequestBody BusUploadDto dto); + public ResultBean uploadPdf(@RequestParam("sid") String sid, @RequestParam(value = "file") MultipartFile file); @ApiOperation(("查看交车资料确认单")) @PostMapping("/getImages") @@ -81,5 +92,17 @@ public interface BusVehicleDataHandoverFeign { @ResponseBody public ResultBean> findcontractList(@RequestParam("createBySid") String createBySid); + /***********************************移动端************************************************/ + + @ApiOperation("未完成列表") + @PostMapping("/getCarDocsRecordNotList") + @ResponseBody + ResultBean> getCarDocsRecordNotList(@RequestBody PagerQuery pagerQuery); + + + @ApiOperation("已完成列表") + @PostMapping("/getCarDocsConfirmList") + @ResponseBody + ResultBean> getCarDocsConfirmList(@RequestBody PagerQuery pagerQuery); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeignFallback.java index 4a61b7a4b8..2498aaf349 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeignFallback.java @@ -4,6 +4,8 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -13,7 +15,7 @@ import java.util.List; * @date 2023/5/17 14:49 */ @Component -public class BusVehicleDataHandoverFeignFallback implements BusVehicleDataHandoverFeign{ +public class BusVehicleDataHandoverFeignFallback implements BusVehicleDataHandoverFeign { @Override public ResultBean> listPage(PagerQuery pq) { return null; @@ -30,7 +32,12 @@ public class BusVehicleDataHandoverFeignFallback implements BusVehicleDataHandov } @Override - public ResultBean details(String sid) { + public ResultBean details(String sid) { + return null; + } + + @Override + public ResultBean> getDataByBillNo(String billNo) { return null; } @@ -40,7 +47,7 @@ public class BusVehicleDataHandoverFeignFallback implements BusVehicleDataHandov } @Override - public ResultBean uploadPdf(BusUploadDto dto) { + public ResultBean uploadPdf(String sid, MultipartFile file) { return null; } @@ -74,4 +81,14 @@ public class BusVehicleDataHandoverFeignFallback implements BusVehicleDataHandov public ResultBean> findcontractList(String createBySid) { return null; } + + @Override + public ResultBean> getCarDocsRecordNotList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean> getCarDocsConfirmList(PagerQuery pagerQuery) { + return null; + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.java index 0ffdac972c..7568d929cd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.buscenter.api.busvehicledatahandover.BusVehicleDataHandover; -import com.yxt.anrui.buscenter.api.busvehicledatahandover.BusVehicleDataHandoverVo; +import com.yxt.anrui.buscenter.api.busvehicledatahandover.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -26,4 +25,9 @@ public interface BusVehicleDataHandoverMapper extends BaseMapper getDataByBillNo(String billNo); + IPage notCompletePageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List selectByNo(String contractNo); + + IPage completePageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml index 33114e13c4..8279172271 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml @@ -30,6 +30,42 @@ + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverRest.java index 4b11f07273..4dfd0da0a7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverRest.java @@ -1,13 +1,17 @@ package com.yxt.anrui.buscenter.biz.busvehicledatahandover; +import com.yxt.anrui.base.api.commonappendix.CommonAppendix; +import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.buscenter.api.busvehicledatahandover.*; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.FileUploadResult; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -24,6 +28,9 @@ public class BusVehicleDataHandoverRest implements BusVehicleDataHandoverFeign { @Autowired private BusVehicleDataHandoverService busVehicleDataHandoverService; + + + @Override public ResultBean> listPage(PagerQuery pq) { return busVehicleDataHandoverService.listPage(pq); @@ -40,18 +47,23 @@ public class BusVehicleDataHandoverRest implements BusVehicleDataHandoverFeign { } @Override - public ResultBean details(String sid) { + public ResultBean details(String sid) { return busVehicleDataHandoverService.details(sid); } + @Override + public ResultBean> getDataByBillNo(String billNo) { + return busVehicleDataHandoverService.getDataByBillNo(billNo); + } + @Override public ResultBean saveDeliveryInfo(BusDeliveryInfoDto dto) { return busVehicleDataHandoverService.saveDeliveryInfo(dto); } @Override - public ResultBean uploadPdf(BusUploadDto dto) { - return busVehicleDataHandoverService.uploadPdf(dto); + public ResultBean uploadPdf(String sid, MultipartFile file) { + return busVehicleDataHandoverService.uploadPdf(sid,file); } @Override @@ -87,4 +99,14 @@ public class BusVehicleDataHandoverRest implements BusVehicleDataHandoverFeign { return busVehicleDataHandoverService.findcontractList(createBySid); } + + @Override + public ResultBean> getCarDocsRecordNotList(PagerQuery pagerQuery) { + return busVehicleDataHandoverService.getCarDocsRecordNotList(pagerQuery); + } + + @Override + public ResultBean> getCarDocsConfirmList(PagerQuery pagerQuery) { + return busVehicleDataHandoverService.getCarDocsConfirmList(pagerQuery); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java index 2bfc169b18..45199291d7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java @@ -6,6 +6,8 @@ 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.commonappendix.CommonAppendix; +import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractPackageVo; import com.yxt.anrui.base.common.enums.BillTypeEnum; @@ -14,6 +16,10 @@ import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum; import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItems; +import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWait; +import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListVo; +import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitQuery; +import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.busvehicledatahandover.*; import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService; @@ -33,10 +39,12 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.base.utils.WordConvertUtils; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.FileUploadResult; 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 org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.InputStream; @@ -365,6 +373,7 @@ public class BusVehicleDataHandoverService extends MybatisBaseService uploadPdf(BusUploadDto dto) { + public ResultBean uploadPdf(String sid, MultipartFile file) { ResultBean rb = ResultBean.fireFail(); - buscenterFileService.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.VEHICLE_SECOND_DATA_HANDOVER.getAttachType()); - List images = dto.getImgs(); - if (!images.isEmpty()) { - buscenterFileService.saveAll(dto.getSid(), images, BuscenterFileEnum.VEHICLE_SECOND_DATA_HANDOVER.getAttachType()); + if (file == null || file.isEmpty()) { + return rb.setMsg("文件为空"); + } + BusVehicleDataHandover entity = fetchBySid(sid); + String billNo = entity.getBillNo(); + rb = fileUploadComponent.uploadFile(file); + FileUploadResult data = (FileUploadResult) rb.getData(); + List entityByBillNo = getDataByBillNo(billNo).getData(); + entityByBillNo.removeAll(Collections.singleton(null)); + if (!entityByBillNo.isEmpty()) { + for (BusVehicleDataHandover handover : entityByBillNo) { + String saveSid = handover.getSid(); + buscenterFileService.delByLinkSidOrType(saveSid, BuscenterFileEnum.VEHICLE_SECOND_DATA_HANDOVER.getAttachType()); + BuscenterFile buscenterFile = new BuscenterFile(); + buscenterFile.setLinkSid(saveSid); + buscenterFile.setFilePath(data.getFilePath()); + buscenterFile.setAttachType(BuscenterFileEnum.VEHICLE_SECOND_DATA_HANDOVER.getAttachType()); + buscenterFile.setFileName(data.getSourceFileName()); + buscenterFile.setFileSize(data.getSize()); + String sourceFileName = data.getSourceFileName(); + buscenterFile.setFileType(sourceFileName.substring(sourceFileName.lastIndexOf("."))); + buscenterFileService.save(buscenterFile); + } } - return rb.success().setData(dto.getSid()); + return rb.success().setMsg("上传成功"); } @@ -437,9 +465,10 @@ public class BusVehicleDataHandoverService extends MybatisBaseService vinList = new ArrayList<>(); List sidList = new ArrayList<>(); - StringBuffer sb = new StringBuffer(); + int i = 1; for (String sid : sids) { + StringBuffer sb = new StringBuffer(); sidList.add(sid); BusVehicleDataHandover entity = fetchBySid(sid); vo.setContractNo(entity.getContractNo()); @@ -482,13 +511,13 @@ public class BusVehicleDataHandoverService extends MybatisBaseService 0) { - sb.delete(sb.length() - 1, sb.length()); + dataListVo.setVinNo(handoverItem.getVinNo()); + dataListVo.setVinSid(handoverItem.getVinSid()); + if (sb.toString().length() > 0) { + sb.delete(sb.length() - 1, sb.length()); + } } dataListVo.setItems(sb.toString()); - dataListVo.setVinNo(handoverItem.getVinNo()); - dataListVo.setVinSid(handoverItem.getVinSid()); } } vinList.add(dataListVo); @@ -504,11 +533,169 @@ public class BusVehicleDataHandoverService extends MybatisBaseService details(String sid) { - ResultBean rb = ResultBean.fireFail(); + public ResultBean details(String sid) { + ResultBean rb = ResultBean.fireFail(); BusVehicleDataHandover handover = fetchBySid(sid); - BusVehicleDataHandoverDetailsVo vo = new BusVehicleDataHandoverDetailsVo(); + BusDetailsVo vo = new BusDetailsVo(); List entityList = baseMapper.getDataByBillNo(handover.getBillNo()); - return null; + entityList.removeAll(Collections.singleton(null)); + vo.setContractNo(handover.getContractNo()); + vo.setCustomerName(handover.getCustomerName()); + vo.setRecName(handover.getRecName()); + vo.setRecDate(handover.getRecDate()); + List vinList = new ArrayList<>(); + if (!entityList.isEmpty()) { + for (BusVehicleDataHandover data : entityList) { + BusVehicleDataDetailsVo dataListVo = new BusVehicleDataDetailsVo(); + dataListVo.setVinNo(data.getVinNo()); + dataListVo.setItems(data.getItems()); + vinList.add(dataListVo); + } + } + vo.setVinList(vinList); + return rb.success().setData(vo); + } + + + public ResultBean> getCarDocsRecordNotList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + IPage page = PagerUtil.queryToPage(pagerQuery); + AppListQuery params = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + String orgPath = params.getOrgPath(); + if (org.apache.commons.lang3.StringUtils.isNotBlank(orgPath)) { + orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); + qw.eq("bvh.useOrgSid", orgPath); + } +// if (org.apache.commons.lang3.StringUtils.isNotBlank(params.getUserSid())) { +// qw.eq("bh.createBySid", params.getUserSid()); +// } + if (org.apache.commons.lang3.StringUtils.isNotBlank(params.getName())) { + qw.and(wrapper -> wrapper.like("bvh.contractNo", params.getName()).or().like("bvh.customerName", params.getName())); + } + qw.eq("bvh.isDelete", 0); + qw.eq("bvh.completeStateKey", "001"); + } + IPage pagging = baseMapper.notCompletePageVo(page, qw); + List records = pagging.getRecords(); + records.removeAll(Collections.singleton(null)); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + for (AppNotCompleteRecordVo record : records) { + String createName = record.getCreateName(); + Date createTime = record.getCreateTime(); + String createTimeFormat = sdf.format(createTime); + record.setCreateInfo(createName + "," + createTimeFormat); + String contractNo = record.getContractId(); + //根据合同编号查询车辆列表 + List vinListVos = baseMapper.selectByNo(contractNo); + vinListVos.removeAll(Collections.singleton(null)); + if (!vinListVos.isEmpty()) { + for (AppVinListVo vinVo : vinListVos) { + String recordSid = vinVo.getRecordSid(); + BusVehicleDataHandover handover = fetchBySid(recordSid); + String linkSid = handover.getLinkSid(); + //交车资料确认单 + List fileList = buscenterFileService.selectByLinkSid(linkSid, BuscenterFileEnum.ENTRUST_CONFIRM_IMAGES.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List entrustConfirmImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + vinVo.setUrls(entrustConfirmImages); + } + } + } + record.setVinList(vinListVos); + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } + + public ResultBean> getDataByBillNo(String billNo) { + ResultBean> rb = ResultBean.fireFail(); + List list = baseMapper.getDataByBillNo(billNo); + return rb.success().setData(list); + } + + /** + * 已完成 + * + * @param pagerQuery + * @return + */ + public ResultBean> getCarDocsConfirmList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + IPage page = PagerUtil.queryToPage(pagerQuery); + AppListQuery params = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + String orgPath = params.getOrgPath(); + if (org.apache.commons.lang3.StringUtils.isNotBlank(orgPath)) { + orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); + qw.eq("bvh.useOrgSid", orgPath); + } +// if (org.apache.commons.lang3.StringUtils.isNotBlank(params.getUserSid())) { +// qw.eq("bh.createBySid", params.getUserSid()); +// } + if (org.apache.commons.lang3.StringUtils.isNotBlank(params.getName())) { + qw.and(wrapper -> wrapper.like("bvh.contractNo", params.getName()).or().like("bvh.customerName", params.getName())); + } + qw.eq("bvh.isDelete", 0); + qw.eq("bvh.completeStateKey", "002"); + } + String urlPrefix = docPdfComponent.getPrefixTemplateUrl(); + IPage pagging = baseMapper.completePageVo(page, qw); + List records = pagging.getRecords(); + records.removeAll(Collections.singleton(null)); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + for (AppCompleteRecordVo record : records) { + if (StringUtils.isBlank(record.getLinkSid())) { + record.setDownLoadUrl(urlPrefix + record.getDownLoadUrl()); + record.setShowUpload(true); + record.setShowDownload(true); + } else { + record.setDownLoadUrl(""); + record.setShowDownload(false); + record.setShowUpload(false); + } + String createName = record.getCreateName(); + Date createTime = record.getCreateTime(); + String createTimeFormat = sdf.format(createTime); + record.setCreateInfo(createName + "," + createTimeFormat); + String billId = record.getBillId(); + //根据合同编号查询车辆列表 + List dataByBillNo = baseMapper.getDataByBillNo(billId); + dataByBillNo.removeAll(Collections.singleton(null)); + StringBuffer sb = new StringBuffer(); + if (!dataByBillNo.isEmpty()) { + for (BusVehicleDataHandover entity : dataByBillNo) { + String recordSid = entity.getSid(); + BusVehicleDataHandover handover = fetchBySid(recordSid); + if (StringUtils.isNotBlank(handover.getLinkSid())) { + String linkSid = handover.getLinkSid(); + //交车资料确认单 + List fileList = buscenterFileService.selectByLinkSid(linkSid, BuscenterFileEnum.ENTRUST_CONFIRM_IMAGES.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List entrustConfirmImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + record.setUrls(entrustConfirmImages); + } + } else { + String sid = entity.getSid(); + //交车资料确认单 + List fileList = buscenterFileService.selectByLinkSid(sid, BuscenterFileEnum.VEHICLE_SECOND_DATA_HANDOVER.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List entrustConfirmImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + record.setUrls(entrustConfirmImages); + } + } + sb.append(entity.getVinNo()).append(","); + } + sb.delete(sb.length() - 1, sb.length()); + record.setVins(sb.toString()); + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/CompleteRecordVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/CompleteRecordVo.java new file mode 100644 index 0000000000..e5e2296654 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/CompleteRecordVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/25 14:59 + */ +@Data +public class CompleteRecordVo implements Vo { + private String contractId; + private String name; + private String createInfo; + private String model; + private String vins; + private String billId; + private String createName; + @ApiModelProperty("创建日期") + private Date createTime; + private String downLoadUrl; + private List urls; + private Boolean showUpload; + private Boolean showDownload; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/ListQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/ListQuery.java new file mode 100644 index 0000000000..b81db8f744 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/ListQuery.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/6/25 11:11 + */ +@Data +public class ListQuery implements Query { + private String name; + private String type; + private String userSid; + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java new file mode 100644 index 0000000000..94489387ba --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/25 11:11 + */ +@Data +public class NotCompleteRecordVo implements Vo { + + private String contractId; + private String customerName; + private String createInfo; + private String carModel; + private List vinList = new ArrayList<>(); + + +} 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 70958d2d09..ee78c4823f 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 @@ -95,5 +95,15 @@ public interface VehicleInformationHandoverFeign { @ResponseBody public ResultBean> vehicleDataListPage(@RequestBody PagerQuery pq); + /**************************************交车资料管理*******************************************/ + @ApiOperation("未完成列表") + @PostMapping("/getCarDocsRecordNotList") + @ResponseBody + ResultBean> getCarDocsRecordNotList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("已完成列表") + @PostMapping("/getCarDocsConfirmList") + @ResponseBody + ResultBean> getCarDocsConfirmList(@RequestBody PagerQuery pagerQuery); } 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 f0fdb55a96..81467596f9 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 @@ -85,4 +85,14 @@ public class VehicleInformationHandoverFeignFallback implements VehicleInformati public ResultBean> vehicleDataListPage(PagerQuery pq) { return null; } + + @Override + public ResultBean> getCarDocsRecordNotList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean> getCarDocsConfirmList(PagerQuery pagerQuery) { + return null; + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VinListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VinListVo.java new file mode 100644 index 0000000000..4f149f82c9 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VinListVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/25 11:12 + */ +@Data +public class VinListVo implements Vo { + private String vin; + private String recordSid; + private List urls = new ArrayList<>(); +} 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 b9c3ca36e3..7701cc5197 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 @@ -94,4 +94,14 @@ public class VehicleInformationHandoverRest implements VehicleInformationHandove public ResultBean> vehicleDataListPage(PagerQuery pq) { return vehicleInformationHandoverService.vehicleDataListPage(pq); } + + @Override + public ResultBean> getCarDocsRecordNotList(PagerQuery pagerQuery) { + return vehicleInformationHandoverService.getCarDocsRecordNotList(pagerQuery); + } + + @Override + public ResultBean> getCarDocsConfirmList(PagerQuery pagerQuery) { + return vehicleInformationHandoverService.getCarDocsConfirmList(pagerQuery); + } } 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 c0b4a51245..ddffb55209 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 @@ -294,4 +294,32 @@ public class VehicleInformationHandoverService { } return rb.success().setData(vo); } + + public ResultBean> getCarDocsRecordNotList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pagerVo = new PagerVo(); + PagerQuery query = new PagerQuery<>(); + BeanUtil.copyProperties(pagerQuery, query); + ResultBean> resultBean = busVehicleDataHandoverFeign.getCarDocsRecordNotList(query); + if (resultBean.getSuccess()) { + PagerVo data = resultBean.getData(); + BeanUtil.copyProperties(data, pagerVo); + return rb.success().setData(pagerVo); + } + return rb.success().setData(pagerVo); + } + + public ResultBean> getCarDocsConfirmList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pagerVo = new PagerVo(); + PagerQuery query = new PagerQuery<>(); + BeanUtil.copyProperties(pagerQuery, query); + ResultBean> resultBean = busVehicleDataHandoverFeign.getCarDocsConfirmList(query); + if (resultBean.getSuccess()) { + PagerVo data = resultBean.getData(); + BeanUtil.copyProperties(data, pagerVo); + return rb.success().setData(pagerVo); + } + return rb.success().setData(pagerVo); + } } From ebecfa1186a92d895e1f41cebbde56bbd725b3df Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sun, 25 Jun 2023 17:03:13 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 11 ++++++-- .../anrui/flowable/api/utils/ProcDefEnum.java | 2 ++ .../anrui/flowable/biz/flow/FlowableRest.java | 14 +++++----- .../flowable/biz/flow/FlowableService.java | 7 ----- .../flowdefinition/FlowDefinitionService.java | 24 +++++++++++++++++ .../biz/flowtask/FlowTaskService.java | 26 +++---------------- .../risk/solutions/AppSolutionsDetailsVo.java | 3 +++ .../api/risk/solutions/AppSolutionsDto.java | 3 +++ 8 files changed, 53 insertions(+), 37 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 3be08d8c81..bedeca5102 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -4615,7 +4615,8 @@ public class BusSalesOrderService extends MybatisBaseService pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState); for (AppBusSalesOrderVo record : pagging.getRecords()) { List vinList = busSalesOrderVehicleService.selectList(record.getSaleOrderSid()); - record.setVinNo(String.join(",",vinList)); + vinList.removeAll(Collections.singleton(null)); + if(!vinList.isEmpty()){ + record.setVinNo(String.join(",",vinList)); + }else{ + record.setVinNo("暂无"); + } + record.setShowStopBtn(false); record.setShowContractBtn(false); if (StringUtils.isNotBlank(record.getCustomerImage())) { diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index e8ef40aaee..e04ba6c2fb 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -8,6 +8,8 @@ public enum ProcDefEnum { /***************************正式流程id***********************************/ + DEFAUL_TADMIN_SID("默认的管理员sid","427a2fb0-60c5-409f-bea4-4eb441041ae6"), + ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_60lvxwuh:1:960004"), ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 0438d86063..044badd58f 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -34,6 +34,7 @@ import com.yxt.anrui.flowable.api.flow.*; import com.yxt.anrui.flowable.api.flowcomment.FlowComment; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.processcomment.ProcessCommentDto; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.biz.flowtask.FlowTaskService; import com.yxt.anrui.flowable.biz.process.ProcessService; import com.yxt.anrui.flowable.biz.processcomment.ProcessCommentService; @@ -52,7 +53,6 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; -import liquibase.pro.packaged.S; import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.flowable.bpmn.model.FlowElement; import org.flowable.bpmn.model.UserTask; @@ -295,7 +295,6 @@ public class FlowableRest implements FlowableFeign { if (StringUtils.isNotBlank(dto.getOrgSidPath())) { String orgPath = dto.getOrgSidPath(); formVariables.put("createrOrgPath", orgPath);//发起人的组织结构sid - //dto.setFormVariables(formVariables); } dto.getFormVariables().put("businessSid", dto.getBusinessSid()); @@ -304,10 +303,13 @@ public class FlowableRest implements FlowableFeign { ResultBean nextNodeUserSidsOfCreate = getNextNodeUserSidsOfCreate(dto); boolean success = nextNodeUserSidsOfCreate.getSuccess(); if (!success) { - return rb.setMsg(nextNodeUserSidsOfCreate.getMsg()); +// return rb.setMsg(nextNodeUserSidsOfCreate.getMsg()); + nextNodeUserSids_ = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId(); + }else{ + nextNodeUserSids_ = nextNodeUserSidsOfCreate.getData().getUserSid(); + dto.getFormVariables().put(BusinessVariables.ORGPATH, nextNodeUserSidsOfCreate.getData().getOrgPath()); } - nextNodeUserSids_ = nextNodeUserSidsOfCreate.getData().getUserSid(); - dto.getFormVariables().put(BusinessVariables.ORGPATH, nextNodeUserSidsOfCreate.getData().getOrgPath()); + } dto.setNextNodeUserSids(nextNodeUserSids_); ResultBean resultBean1 = flowableService.businessStart(dto); @@ -392,7 +394,7 @@ public class FlowableRest implements FlowableFeign { if (!nextNodeUserSidsOfSubmit.getSuccess()) { // return rb.setMsg("nextUserSid 不能为空！"); //=================================添加系统个管理员自动审批 - nextUserSid = "427a2fb0-60c5-409f-bea4-4eb441041ae6"; + nextUserSid = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId(); adminContains = true; }else{ nextUserSid = nextNodeUserSidsOfSubmit.getData().getUserSid(); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java index 6dcae95c0e..4d718a082a 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java @@ -15,13 +15,9 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import io.swagger.annotations.ApiParam; import org.flowable.engine.TaskService; -import org.flowable.task.api.history.HistoricTaskInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; import java.util.ArrayList; import java.util.HashMap; @@ -49,9 +45,6 @@ public class FlowableService extends MybatisBaseService()); bv.getFormVariables().put("businessSid",bv.getBusinessSid()); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java index d56cd4c6f3..8387b6d5c0 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java @@ -7,12 +7,14 @@ package com.yxt.anrui.flowable.biz.flowdefinition; */ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowcomment.FlowComment; import com.yxt.anrui.flowable.api.flowdefinition.FlowDefinitionVo; import com.yxt.anrui.flowable.api.flowtask.FlowTask; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.processcomment.ProcessCommentDto; import com.yxt.anrui.flowable.api.sysform.SysForm; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.biz.flow.FlowableRest; import com.yxt.anrui.flowable.biz.flow.FlowableService; import com.yxt.anrui.flowable.biz.flowtask.FlowTaskService; @@ -254,6 +256,28 @@ public class FlowDefinitionService extends FlowServiceFactory { processCommentService.saveOrUpdateDto(processCommentDto); } taskService.setAssignee(id_,nextNodeUserSids); + if(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(nextNodeUserSids)){ + List list = flowTaskService.getLatestTasks(task.getProcessInstanceId()); + String nodeState = list.get(0).getName_(); + String task_def_key_ = list.get(0).getTask_def_key_(); + BusinessVariables businessVariables = new BusinessVariables(); + businessVariables.setModelId(procDefId); + businessVariables.setInstanceId(task.getProcessInstanceId()); + businessVariables.setTaskId(list.get(0).getId_()); + businessVariables.setUserSid(nextNodeUserSids); + businessVariables.setBusinessSid(variables.get("businessSid").toString()); + businessVariables.setTaskDefKey(task_def_key_); + businessVariables.setFormVariables(variables); + businessVariables.setOrgSidPath(variables.get("createrOrgPath").toString()); + businessVariables.setComment("系统自动跳过！"); + ResultBean updateFlowFieldVoResultBean = flowableRest.handleProsess(businessVariables, false); + ResultBean rb = new ResultBean<>(); + FlowTask flowTask = new FlowTask(); + flowTask.setTaskId(updateFlowFieldVoResultBean.getData().getTaskId()); + flowTask.setTaskName(updateFlowFieldVoResultBean.getData().getNodeState()); + flowTask.setProcInsId(updateFlowFieldVoResultBean.getData().getProcInsId()); + return rb.success().setData(flowTask).setMsg("流程启动成功"); + } ResultBean rb = new ResultBean<>(); FlowTask flowTask = new FlowTask(); flowTask.setTaskId(task.getId()); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index f980867cfd..9d901f8ce4 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -12,6 +12,7 @@ import com.yxt.anrui.flowable.api.flowcomment.FlowCommentDto; import com.yxt.anrui.flowable.api.flowtask.*; import com.yxt.anrui.flowable.api.sysform.SysForm; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.biz.flow.FlowableService; import com.yxt.anrui.flowable.biz.process.ProcessService; import com.yxt.anrui.flowable.biz.sysdeployform.SysDeployFormService; @@ -1342,14 +1343,14 @@ public class FlowTaskService extends MybatisBaseService taskUserInfos = flowTask.getTaskUserInfos(); - TaskUserInfo taskUserInfo = taskUserInfos.get(0); - if(assigneeSid0.equals(taskUserInfo.getAssigneeSid())){ - if(!FlowComment.RECALL.getType().equals( flowTask1.getComment().getType())){ - ii++; - } - continue; - }else{ - ybrsid=flowList.get(i).getTaskUserInfos().get(0).getAssigneeSid(); - break; - } - } - }else{ - ybrsid=assignee; - }*/ ybrsid=assignee; }else{ FlowTask flowTask1 = flowList.get(1); @@ -1558,7 +1540,7 @@ public class FlowTaskService extends MybatisBaseService Date: Mon, 26 Jun 2023 09:12:12 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 044badd58f..925a2752b2 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -421,6 +421,10 @@ public class FlowableRest implements FlowableFeign { } } + }else{ + if(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(nextUserSid)){ + adminContains = true; + } } String comment = dto.getComment(); if (StringUtils.isBlank(comment)) { From 7f92c90d3d086f799847471ab73c55af6edf76b3 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 26 Jun 2023 09:21:02 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 18 ------------------ .../anrui/flowable/biz/flow/FlowableRest.java | 16 ---------------- 2 files changed, 34 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index bedeca5102..4f8f6579fe 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -5122,20 +5122,12 @@ public class BusSalesOrderService extends MybatisBaseService commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo()); - CommonContract commonContract = commonContractResultBean.getData();*/ //单台成交价与单台订金相等 if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款 String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())).toString(); List vinList = appOrderModelInfoVo.getVinListsVos(); for (int i = 0; i < vinList.size(); i++) { UnCollectionDto unCollectionDto = new UnCollectionDto(); - /* if (commonContract != null) { - //合同sid - unCollectionDto.setContractSid(commonContract.getSid()); - //合同编号 - unCollectionDto.setContractNo(commonContract.getContractNo()); - }*/ unCollectionDto.setContractNo(busSalesOrder.getContractNo()); //客户名称 unCollectionDto.setCustomerName(vo.getName()); @@ -5176,16 +5168,12 @@ public class BusSalesOrderService extends MybatisBaseService commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo()); - CommonContract commonContract = commonContractResultBean.getData();*/ //单台成交价与单台订金相等 if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款 String money = new BigDecimal(solutionsDetailsVo.getRealTotal()).subtract(new BigDecimal(deposit)).toString(); List vinList = appOrderModelInfoVo.getVinListsVos(); for (int i = 0; i < vinList.size(); i++) { UnCollectionDto unCollectionDto = new UnCollectionDto(); - //合同sid -// unCollectionDto.setContractSid(commonContract.getSid()); //合同编号 unCollectionDto.setContractNo(busSalesOrder.getContractNo()); //客户名称 @@ -5227,16 +5215,12 @@ public class BusSalesOrderService extends MybatisBaseService commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo()); - CommonContract commonContract = commonContractResultBean.getData();*/ //单台成交价与单台订金相等 if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款 String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString(); List vinList = appOrderModelInfoVo.getVinListsVos(); for (int i = 0; i < vinList.size(); i++) { UnCollectionDto unCollectionDto = new UnCollectionDto(); - //合同sid -// unCollectionDto.setContractSid(commonContract.getSid()); //合同编号 unCollectionDto.setContractNo(busSalesOrder.getContractNo()); //客户名称 @@ -5282,7 +5266,6 @@ public class BusSalesOrderService extends MybatisBaseService variables = getOrderMap(busSalesOrder); bv.setFormVariables(variables); -// bv.setModelId(ProcDefEnum.SALESORDER.getProDefId()); bv.setModelId(busSalesOrder.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo @@ -5305,7 +5288,6 @@ public class BusSalesOrderService extends MybatisBaseService variables = getOrderMap(busSalesOrder); bv.setFormVariables(variables); -// bv.setModelId(ProcDefEnum.SALESORDER.getProDefId()); bv.setModelId(busSalesOrder.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 925a2752b2..2264315839 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -557,10 +557,6 @@ public class FlowableRest implements FlowableFeign { contains = true; break; } - /* if(sysUserVoLists.size() == 0){ - adminSecondsContains = true; - break; - }*/ } } if (contains) { @@ -577,14 +573,6 @@ public class FlowableRest implements FlowableFeign { dto.setComment("因与下一级审批人相同，系统自动处理，需以下一级审批人审批意见为准！"); return handleProsess(dto, false); } - /* if (adminSecondsContains) { - dto.setUserSid(nextUserSid); - dto.setTaskId(vo.getTaskId()); - dto.setTaskDefKey(taskDefKey); - dto.setComment("系统自动跳过"); - return handleProsess(dto, false); - }*/ - vo.setProcInsId(instanceId); vo.setProcDefId(task.getProcessDefinitionId()); vo.setNodeState(nodeState); @@ -792,9 +780,6 @@ public class FlowableRest implements FlowableFeign { vo.setNodeState(nodeState); vo.setTaskDefKey(taskDefKey); vo.setTaskId(taskId); - /* if (incomingSourceRef.contains("start")) { - vo.setNodeState( SysFormLinkFlowStateEnum.REJECT.getCode()); - }*/ Map formVariables = new HashMap<>(); formVariables.put(BusinessVariables.ORGPATH, orgPath); //在act_ru_variable表中增加环节上的业务参数的变量 @@ -909,7 +894,6 @@ public class FlowableRest implements FlowableFeign { mfq.setUserSids(userSids.toString()); UpdateFlowFieldVo uff = new UpdateFlowFieldVo(); -// uff.setTaskDefKey(taskDefKey); uff.setTaskDefKey(historicTaskInstance.getTaskDefinitionKey()); uff.setTaskId(taskId); uff.setProcInsId(proInstId); From c574c3bf97c8ca6a79e998691e833c58d9014ddb Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 26 Jun 2023 13:52:28 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=9A=8F=E8=BD=A6=E8=B5=84=E6=96=99?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusVehicleInformationHandover.java | 3 +- .../BusVehicleInformationHandoverDto.java | 3 ++ .../BusVehicleInformationHandoverService.java | 28 +++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandover.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandover.java index 28c3f330bf..02b3674e12 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandover.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandover.java @@ -51,5 +51,6 @@ public class BusVehicleInformationHandover extends BaseEntity { private Integer isFuelVehicle; // 是否是燃气车 0不是1是 @ApiModelProperty("使用组织全路径") private String orgSidPath; - + @ApiModelProperty("接收人sid") + private String receiverSid; } 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 f9bdef87f5..0bb7da7fa0 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 @@ -60,4 +60,7 @@ public class BusVehicleInformationHandoverDto implements Dto { private Boolean modifyState; // ture/false 是/否 @ApiModelProperty("使用组织全路径") private String orgSidPath; + @ApiModelProperty("接收人sid") + private String receiverSid; + } 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 2cc07bbe44..9ad1e78272 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 @@ -19,14 +19,18 @@ import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationVo import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.*; import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.buscenter.biz.busvehicleinformation.BusVehicleInformationService; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; 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 com.yxt.messagecenter.api.message.MessagePushTransferDto; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -61,6 +65,9 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService informationList = busVehicleInformationService.getByHandoverSid(dto.getSid()); if (null != informationList && informationList.size() > 0) { From 72ece06ced7c06d751d2a308b72c56f838c52154 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 26 Jun 2023 13:56:22 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/flowable/api/utils/ProcDefEnum.java | 1 - .../yxt/anrui/portal/biz/flow/FlowableRest.java | 15 +++++++++++---- .../retrieval/DeliveredApplyPageQuery.java | 2 ++ .../autoservice/retrieval/DeliveredPageQuery.java | 2 +- .../yxt/anrui/terminal/biz/app/AppService.java | 15 +++++++++++---- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index e04ba6c2fb..0ce5b43c53 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -21,7 +21,6 @@ public enum ProcDefEnum { QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:1:1735004"), //QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:2:1365004"), QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:4:1592512"), - BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:4:1865016"), VEHICLEAPPLY("排产申请流程", "process_9egcg169:13:1250004"), SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:9:1865007"), diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index 1d077dd0dd..780ab20c48 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java @@ -178,12 +178,19 @@ public class FlowableRest implements FlowableFeign { a.setFlowableRecordVo(stringObjectMap); a.setState(0+""); List taskUserInfos = f.getTaskUserInfos(); - if(taskUserInfos.size() == 1){ - com.yxt.anrui.flowable.api.flowtask.TaskUserInfo appUserVo = taskUserInfos.get(0); - if("admin".equals(appUserVo.getAssigneeName())){ - return; + if(taskUserInfos != null){ + taskUserInfos.removeAll(Collections.singleton(null)); + if(!taskUserInfos.isEmpty()){ + if(taskUserInfos.size() == 1){ + com.yxt.anrui.flowable.api.flowtask.TaskUserInfo appUserVo = taskUserInfos.get(0); + if("admin".equals(appUserVo.getAssigneeName())){ + return; + } + } } } + + flowList.add(a); }); //评论记录 diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageQuery.java index 4b7a813600..dab69f14b2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageQuery.java @@ -16,4 +16,6 @@ public class DeliveredApplyPageQuery implements Query { @ApiModelProperty("用户名称") private String name; + + private String menuSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageQuery.java index 31cc42091a..0f82080ef3 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageQuery.java @@ -17,6 +17,6 @@ public class DeliveredPageQuery implements Query { @ApiModelProperty("客户名称") private String name; - private String menuSid; + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java index 679e5c75c7..e2ee36421a 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java @@ -123,12 +123,19 @@ public class AppService { a.setFlowableRecordVo(f); a.setState(0 + ""); List taskUserInfos = f.getTaskUserInfos(); - if (taskUserInfos.size() == 1) { - AppUserVo appUserVo = taskUserInfos.get(0); - if ("admin".equals(appUserVo.getAssigneeName())) { - return; + if(taskUserInfos != null){ + taskUserInfos.removeAll(Collections.singleton(null)); + if(!taskUserInfos.isEmpty()){ + if (taskUserInfos.size() == 1) { + AppUserVo appUserVo = taskUserInfos.get(0); + if ("admin".equals(appUserVo.getAssigneeName())) { + return; + } + } } } + + list.add(a); }); From 58cfb1a69a0fb39b0ee6c93ccc90bda7284b1d38 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 26 Jun 2023 14:02:34 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusAdvanceGinvoiceapplyRest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyRest.java index ba1433eb62..db48c546b2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyRest.java @@ -29,7 +29,6 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.*; -import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -37,7 +36,6 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -141,7 +139,7 @@ public class BusAdvanceGinvoiceapplyRest implements BusAdvanceGinvoiceapplyFeign public ResultBean complete(AppCompleteAdvanceInvoiceDto query) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId()); +// bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId()); return busAdvanceGinvoiceapplyService.complete(bv); } @@ -149,7 +147,7 @@ public class BusAdvanceGinvoiceapplyRest implements BusAdvanceGinvoiceapplyFeign public ResultBean InitiatorToAnswer(AppCompleteAdvanceInvoiceDto query) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId()); +// bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId()); return busAdvanceGinvoiceapplyService.InitiatorToAnswer(bv); } From 2dddb22761d0dbd3fd54d8d01922429dab333a6d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 26 Jun 2023 14:11:57 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusAdvanceGinvoiceapplyService.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java index 1bd719fc23..937357f235 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java @@ -29,7 +29,8 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.base.api.basevehicle.*; +import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; @@ -43,7 +44,6 @@ import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppAdvanceIn import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppSubmitAdvanceInvoiceDto; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeQuery; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeVo; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicle; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDto; @@ -64,7 +64,6 @@ import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; -import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; @@ -347,7 +346,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService map = (Map) resultBean.getData(); saveSysFormLink(map); @@ -662,7 +661,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); @@ -982,7 +981,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService map = IsTrue(formVariables.get("businessSid")); // bv.setFormVariables(map); - bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId()); +// bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); @@ -997,7 +996,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService map = IsTrue(formVariables.get("businessSid")); // bv.setFormVariables(map); - bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId()); +// bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());