From 6b3fe5c3ed9f1b90d0466b09af5c98b7ba335610 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 9 Nov 2022 12:10:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E6=9D=83=E9=99=90=E3=80=81=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E7=AE=80=E6=98=93=E8=AE=A2=E5=8D=95-=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E9=A2=84=E5=AE=9A=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E5=90=8E?= =?UTF-8?q?3=E6=97=A5=E5=AE=9A=E6=97=B6=E8=87=AA=E5=8A=A8=E8=A7=A3?= =?UTF-8?q?=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/BusCenterApplication.java | 2 + .../BusDepositVehicleMapper.java | 3 + .../BusDepositVehicleMapper.xml | 8 ++ .../BusDepositVehicleService.java | 7 ++ .../busdepositvehicle/ScheduledService.java | 76 +++++++++++++++++++ .../busmaindeposit/BusMainDepositMapper.java | 3 + .../busmaindeposit/BusMainDepositMapper.xml | 4 + .../busmaindeposit/BusMainDepositService.java | 2 + .../anrui/portal/biz/index/AppIndexRest.java | 42 ++-------- 9 files changed, 112 insertions(+), 35 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java index ea8c045da6..3b6f2b253e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java @@ -5,6 +5,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.scheduling.annotation.EnableScheduling; /** * @author dimengzhe @@ -13,6 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.common.base.config", "com.yxt.anrui.buscenter" }) +@EnableScheduling @EnableDiscoveryClient @EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.fin"}) public class BusCenterApplication { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.java index 095264f737..3917e6bbf1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.buscenter.api.busdepositvehicle.*; +import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -72,4 +73,6 @@ public interface BusDepositVehicleMapper extends BaseMapper { int selByUserSid(@Param("createBySid") String createBySid); + + List selectListByState(@Param("date") String tomorrow,@Param("nodeState") String nodeState, @Param("key") String key); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml index c3b720d4ba..b8464e0dad 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml @@ -87,4 +87,12 @@ WHERE sid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java index 97546456fa..c78df6834e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java @@ -2,6 +2,7 @@ package com.yxt.anrui.buscenter.biz.busdepositvehicle; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.common.enums.DictCommonEnum; import com.yxt.anrui.buscenter.api.busdepositvehicle.*; import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomerVo; import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit; @@ -296,6 +297,12 @@ public class BusDepositVehicleService extends MybatisBaseService().success().setData(vo); } + public List selectListByState(String tomorrow) { + String nodeState = "已办结"; + String key = DictCommonEnum.DepositBillType.JYDD_DC.getCode(); + return baseMapper.selectListByState(tomorrow, nodeState,key); + } + /* public ResultBean submitVirtualOrderVehicle(SubmitVirtualOrderVehicleDto dto) { ResultBean rb = ResultBean.fireFail(); //根据用户sid获取staffSid diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java new file mode 100644 index 0000000000..65035e6841 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java @@ -0,0 +1,76 @@ +package com.yxt.anrui.buscenter.biz.busdepositvehicle; + +import cn.hutool.core.date.DateUtil; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BusMainDepositUpdateQuery; +import com.yxt.anrui.base.common.enums.VehicleState; +import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDetailVo; +import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleListVo; +import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @Author dimengzhe + * @Date 2022/11/8 13:37 + * @Description + */ +@Component +public class ScheduledService { + + @Autowired + private BusDepositVehicleService busDepositVehicleService; + @Autowired + private BaseVehicleFeign baseVehicleFeign; + + @Scheduled(cron = "0 0 0 * * ?") +// @Scheduled(cron = "0 0/5 12 * * ?") + public void remindVehicle() { + Date now = new Date(); + //获取当前时间 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + //得到今天凌晨时间 + Calendar calendar = Calendar.getInstance(); + calendar.setTime(now); + //+1今天的时间加一天 + calendar.add(Calendar.DAY_OF_MONTH, -4); + String tomorrow = sdf.format(calendar.getTime()); + //查询简易订单-车辆预定中 + //查询修改日期包含该日期的已经通过的简易订车单 + List strList = busDepositVehicleService.selectListByState(tomorrow); + for (BusMainDeposit strDeposit : strList) { + String sid = strDeposit.getSid(); + AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(sid).getData(); + List list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); + BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); + busMainDepositUpdateQuery.setVinSidList(list); + busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode()); + busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks()); + baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); + } + } + + + public static void main(String[] args) { + String today = DateUtil.today(); + Date now = new Date(); + //获取当前时间 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + //得到今天凌晨时间 + String nowStr = sdf.format(now) + " 00:00:00"; + Calendar calendar = Calendar.getInstance(); + calendar.setTime(now); + //+1今天的时间加一天 + calendar.add(Calendar.DAY_OF_MONTH, -4); + String tomorrow = sdf.format(calendar.getTime()); + System.out.println(tomorrow); + + } +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java index 85edcd4195..1cec9079eb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java @@ -40,6 +40,7 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -136,4 +137,6 @@ public interface BusMainDepositMapper extends BaseMapper { IPage pageAppList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); String selectNum(String bill); + + int updateModify(@Param("date") Date date, @Param("sid") String businessSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml index 9ffd2a8f52..9b85e15f77 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml @@ -342,4 +342,8 @@ order by id desc limit 1 + + + update bus_main_deposit set modifyTime = #{date} where sid = #{sid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index dc41faa434..f35615e425 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -1997,6 +1997,8 @@ public class BusMainDepositService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); } else { + //更新修改时间 + baseMapper.updateModify(new Date(),bv.getBusinessSid()); //如果类型为订金，推送款项确认 if (DictCommonEnum.DepositBillType.JYDD_DJ.getCode().equals(busMainDeposit.getDepositBillTypeKey())) { BusDeposit busDeposit = busDepositService.selectByBillSid(bv.getBusinessSid()); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java index 142cdcc2b7..31e1de314f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java @@ -25,10 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @Description @@ -93,39 +90,14 @@ public class AppIndexRest implements AppIndexFeign { //查询用户的权限 //查询该用户是否有权限 List stringList = sysMobileMenuRoleService.selectAppSidList(userSid); -// List subsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid, path); - List subsetVersionVoList = appSubsetVersionService.selectVersionListOne(linkSid, path,stringList); - subsetVersionVoList.stream().forEach(item -> { - /*if ("98ff0724-5df4-4fc7-ab6d-3996e7706acd".equals(item.getAppSid())) { - //供应链 - ResultBean indexCountVo = appScmBaseInfoFeign.getToDoNum(userSid); - int count = 0; - if (indexCountVo.getSuccess()) { - AppScmBaseInfoVo appScmBaseInfoVo = indexCountVo.getData(); - if (StringUtils.isNotBlank(appScmBaseInfoVo.getInspectedCarNum())) { - count = count + Integer.valueOf(appScmBaseInfoVo.getInspectedCarNum()).intValue(); - } - if (StringUtils.isNotBlank(appScmBaseInfoVo.getInspectinoCarNum())) { - count = count + Integer.valueOf(appScmBaseInfoVo.getInspectinoCarNum()).intValue(); - } - if (StringUtils.isNotBlank(appScmBaseInfoVo.getMoveCarNum())) { - count = count + Integer.valueOf(appScmBaseInfoVo.getMoveCarNum()).intValue(); - } - if (StringUtils.isNotBlank(appScmBaseInfoVo.getStorageCarNum())) { - count = count + Integer.valueOf(appScmBaseInfoVo.getStorageCarNum()).intValue(); - } - if (StringUtils.isNotBlank(appScmBaseInfoVo.getInventoryCarNum())) { - count = count + Integer.valueOf(appScmBaseInfoVo.getInventoryCarNum()).intValue(); - } - } -// item.setCornerNum(String.valueOf(count)); + List subsetVersionVoList = new ArrayList<>(); + if(!stringList.isEmpty()){ + subsetVersionVoList = appSubsetVersionService.selectVersionListOne(linkSid, path,stringList); + subsetVersionVoList.stream().forEach(item -> { item.setCornerNum(""); - } else { - item.setCornerNum(""); - }*/ - item.setCornerNum(""); + }); + } - }); map.put("apps", subsetVersionVoList); // 轮播图 From 3699fceb85376ef94cedaec73008b837d84aac06 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 9 Nov 2022 13:12:12 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=BD=A6=E5=9E=8B=E7=9A=84=E5=85=AC=E5=91=8A=E5=9E=8B?= =?UTF-8?q?=E5=8F=B7=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E3=80=81=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C=E7=9A=84=E8=BD=AC?= =?UTF-8?q?pdf=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AnnouncementVo.java | 21 ++++++++++++ .../BaseVehmodelAnnouncementmodelFeign.java | 5 +++ ...ehmodelAnnouncementmodelFeignFallback.java | 5 +++ .../BaseVehmodelAnnouncementmodelMapper.java | 3 ++ .../BaseVehmodelAnnouncementmodelMapper.xml | 14 ++++++++ .../BaseVehmodelAnnouncementmodelRest.java | 5 +++ .../BaseVehmodelAnnouncementmodelService.java | 9 +++-- .../commoncontract/CommonContractService.java | 6 ++-- .../terminal/api/base/common/CommonFeign.java | 30 +++++++++++++++++ .../api/base/common/CommonFeignFallback.java | 12 +++++++ .../api/base/common/PublicModelVo.java | 21 ++++++++++++ .../terminal/biz/base/common/CommonRest.java | 30 +++++++++++++++++ .../biz/base/common/CommonService.java | 33 +++++++++++++++++++ 13 files changed, 187 insertions(+), 7 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/AnnouncementVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeignFallback.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/PublicModelVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/AnnouncementVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/AnnouncementVo.java new file mode 100644 index 0000000000..0ce51f6c2f --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/AnnouncementVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.base.api.basevehmodelannouncementmodel; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/11/9 12:49 + * @Description + */ +@Data +public class AnnouncementVo implements Vo { + private static final long serialVersionUID = -347631276593210436L; + @ApiModelProperty("公告型号sid") + private String sid; + @ApiModelProperty("公告型号sid") + private String dictKey; + @ApiModelProperty("公告型号名称") + private String dictValue; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeign.java index c1d6a53f80..227faf5611 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeign.java @@ -80,4 +80,9 @@ public interface BaseVehmodelAnnouncementmodelFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("销售订单-app查询合格证公告型号") + @GetMapping("/getAnnounceList") + @ResponseBody + ResultBean> getAnnounceList(@RequestParam("modelSid")String modelSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeignFallback.java index 83d82f001a..474353cb6e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeignFallback.java @@ -74,4 +74,9 @@ public class BaseVehmodelAnnouncementmodelFeignFallback implements BaseVehmodelA ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-base/basevehmodelannouncementmodel/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean> getAnnounceList(String modelSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.java index 43640c5be9..4fed59ca53 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.basevehmodelannouncementmodel.AnnouncementVo; import com.yxt.anrui.base.api.basevehmodelannouncementmodel.BaseAnnouncementmodelAndParamVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -66,4 +67,6 @@ public interface BaseVehmodelAnnouncementmodelMapper extends BaseMapper selectListVo(); + + List getAnnounceList(String modelSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.xml index 9efbe729f5..f6d9afe48c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.xml @@ -54,4 +54,18 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelRest.java index 80dca605e5..b1571d0920 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelRest.java @@ -97,4 +97,9 @@ public class BaseVehmodelAnnouncementmodelRest implements BaseVehmodelAnnounceme BaseVehmodelAnnouncementmodelDetailsVo vo = baseVehmodelAnnouncementmodelService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean> getAnnounceList(String modelSid) { + return baseVehmodelAnnouncementmodelService.getAnnounceList(modelSid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelService.java index a7a9cf9003..9f2ee3bb0f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelService.java @@ -28,15 +28,13 @@ package com.yxt.anrui.base.biz.basevehmodelannouncementmodel; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.api.R; import com.yxt.anrui.base.api.basevehmodelannouncementmodel.*; -import org.apache.commons.lang3.StringUtils; 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.stereotype.Service; import java.util.List; @@ -128,4 +126,9 @@ public class BaseVehmodelAnnouncementmodelService extends MybatisBaseService> getAnnounceList(String modelSid) { + ResultBean> rb = ResultBean.fireFail(); + List list = baseMapper.getAnnounceList(modelSid); + return rb.success().setData(list); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 5a06f37a65..10d17e716a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -74,7 +74,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.File; import java.math.BigDecimal; -import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; @@ -1342,7 +1341,6 @@ public class CommonContractService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - Future future1 = pool.submit(() -> { + /* Future future1 = pool.submit(() -> { return genCarSaleContract(dto, map, appOrderDetailsVo); }); PrintConfirmVo printConfirmVo = null; @@ -1416,7 +1414,7 @@ public class CommonContractService extends MybatisBaseService> getPublicModelList(@RequestParam("modelSid") String modelSid); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeignFallback.java new file mode 100644 index 0000000000..8f22f2c7d2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.terminal.api.base.common; + +import org.springframework.stereotype.Component; + +/** + * @Author dimengzhe + * @Date 2022/11/9 13:00 + * @Description + */ +@Component +public class CommonFeignFallback { +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/PublicModelVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/PublicModelVo.java new file mode 100644 index 0000000000..5046708daa --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/PublicModelVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.terminal.api.base.common; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/11/9 13:00 + * @Description + */ +@Data +public class PublicModelVo implements Vo { + private static final long serialVersionUID = 207273803006524752L; + @ApiModelProperty("公告型号sid") + private String sid; + @ApiModelProperty("公告型号sid") + private String dictKey; + @ApiModelProperty("公告型号名称") + private String dictValue; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java new file mode 100644 index 0000000000..84a0f18680 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.terminal.biz.base.common; + +import com.yxt.anrui.terminal.api.base.common.CommonFeign; +import com.yxt.anrui.terminal.api.base.common.PublicModelVo; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/11/9 13:05 + * @Description + */ +@Api(tags = "app公共") +@Controller +@RequestMapping("/base/v1") +public class CommonRest implements CommonFeign { + + @Autowired + private CommonService commonService; + + @Override + public ResultBean> getPublicModelList(String modelSid) { + return commonService.getPublicModelList(modelSid); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java new file mode 100644 index 0000000000..3e1f9dd83a --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.terminal.biz.base.common; + +import com.alibaba.fastjson.JSON; +import com.yxt.anrui.base.api.basevehmodelannouncementmodel.AnnouncementVo; +import com.yxt.anrui.base.api.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelFeign; +import com.yxt.anrui.terminal.api.base.common.PublicModelVo; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * @Author dimengzhe + * @Date 2022/11/9 13:05 + * @Description + */ +@Service +public class CommonService { + + @Autowired + private BaseVehmodelAnnouncementmodelFeign baseVehmodelAnnouncementmodelFeign; + + public ResultBean> getPublicModelList(String modelSid) { + ResultBean> rb = ResultBean.fireFail(); + ResultBean> resultBean = baseVehmodelAnnouncementmodelFeign.getAnnounceList(modelSid); + List list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), PublicModelVo.class)).collect(Collectors.toList()); + return rb.success().setData(list); + } +} From 93365928331ae18f6a63e3b343b0bbda0e125b2b Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Wed, 9 Nov 2022 15:52:37 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E6=8F=90=E8=BD=A6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/commoncontract/CommonContractVo.java | 2 + .../AppAdvanceInvoiceInfoQuery.java | 13 + .../BusAdvanceGinvoiceapplyFeign.java | 9 +- .../BusAdvanceGinvoiceapplyFeignFallback.java | 5 +- .../AdCarListDto.java | 16 + .../AdCarListVo.java | 16 + .../AppAdvanceArrearsInfoQuery.java | 13 + .../AppArrearsCarryDto.java | 44 ++ .../AppArrearsCarryInfoVo.java | 45 ++ .../AppArrearsCarryVehiclePageVo.java | 41 +- .../AppArrearsCarryVinDto.java | 23 + .../BusArrearsCarryVehicleApply.java | 64 +- .../BusArrearsCarryVehicleApplyFeign.java | 70 ++- ...ArrearsCarryVehicleApplyFeignFallback.java | 59 +- .../flowable/AppAdvanceArrearsTaskQuery.java | 43 ++ .../AppCompleteAdvanceArrearsDto.java | 35 ++ .../flowable/AppSubmitAdvanceArrearsDto.java | 17 + .../flowable/GetNodeQuery.java | 11 + .../flowable/GetNodeVo.java | 22 + .../BusArrearsCarryVehicleDetailsVo.java | 4 + .../BusAdvanceGinvoiceapplyRest.java | 9 +- .../BusAdvanceGinvoiceapplyService.java | 6 +- .../BusArrearsCarryVehicleApplyMapper.java | 15 + .../BusArrearsCarryVehicleApplyMapper.xml | 39 +- .../BusArrearsCarryVehicleApplyRest.java | 70 ++- .../BusArrearsCarryVehicleApplyService.java | 582 +++++++++++++++++- .../BusArrearsCarryVehicleDetailsService.java | 2 +- .../anrui/flowable/api/utils/ProcDefEnum.java | 7 +- .../AdvanceInvoiceInfoQuery.java | 14 + .../AppBusAdvanceGinvoiceapplyFeign.java | 8 +- .../arrearsTakeCar/AdvanceArrearsDto.java | 53 ++ .../AdvanceArrearsInfoQuery.java | 13 + .../arrearsTakeCar/AdvanceArrearsInfoVo.java | 55 ++ .../arrearsTakeCar/AdvanceArrearsVinDto.java | 22 + .../AppBusArrearsCarryVehicleApplyFeign.java | 76 ++- ...ArrearsCarryVehicleApplyFeignFallback.java | 56 +- .../arrearsTakeCar/AppCarListDto.java | 22 + .../arrearsTakeCar/AppCarListVo.java | 24 + .../ArrearsCarryVehiclePageVo.java | 48 +- .../flowable/AdvanceArrearsQuery.java | 21 + .../flowable/AdvanceArrearsTakeCarQuery.java | 43 ++ .../flowable/CompleteArrearsTakeCarDto.java | 32 + .../flowable/SubmitArrearsTakeCarDto.java | 17 + .../collectionConfirm/ConfirmationDto.java | 3 + .../ConfirmationPageQuery.java | 3 + .../AppBusArrearsCarryVehicleApplyRest.java | 65 +- ...AppBusArrearsCarryVehicleApplyService.java | 193 +++++- .../AppBusAdvanceGinvoiceapplyRest.java | 8 +- .../AppBusAdvanceGinvoiceapplyService.java | 12 +- 49 files changed, 1942 insertions(+), 128 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoQuery.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListDto.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppAdvanceArrearsInfoQuery.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVinDto.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppAdvanceArrearsTaskQuery.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppCompleteAdvanceArrearsDto.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppSubmitAdvanceArrearsDto.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsVinDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AdvanceArrearsQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AdvanceArrearsTakeCarQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/CompleteArrearsTakeCarDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/SubmitArrearsTakeCarDto.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java index 63e7c72093..8343d36537 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java @@ -46,6 +46,8 @@ public class CommonContractVo implements Vo { private String partyA; @ApiModelProperty("乙方名称") private String partyB; + @ApiModelProperty("车型Sid") + private String modelSid; @ApiModelProperty("车型名称") private String modelName; @ApiModelProperty("台数") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoQuery.java new file mode 100644 index 0000000000..3b2eec8f9d --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoQuery.java @@ -0,0 +1,13 @@ +package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppAdvanceInvoiceInfoQuery implements Query { + private static final long serialVersionUID = -4420699298916976735L; + + @ApiModelProperty("申请sid") + private String contractSid; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java index 40e885e4c5..b9d52e923d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java @@ -32,6 +32,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -99,9 +100,9 @@ public interface BusAdvanceGinvoiceapplyFeign { ResultBean> getAdvanceInvoiceList(@RequestBody PagerQuery pagerQuery); @ApiOperation("手机端-初始化提前开票申请") - @GetMapping("/initAdvanceInvoice/{contractSid}") + @GetMapping("/initAdvanceInvoice") @ResponseBody - public ResultBean initAdvanceInvoice(@PathVariable("contractSid") String contractSid); + public ResultBean initAdvanceInvoice(@SpringQueryMap AppAdvanceInvoiceInfoQuery query); @ApiOperation("移动端-新增提前开票申请") @PostMapping("/addAdvanceInvoice") @@ -114,9 +115,9 @@ public interface BusAdvanceGinvoiceapplyFeign { public ResultBean saveAdvanceInvoice(@Valid @RequestBody AppAdvanceInvoiceDto dto); @ApiOperation("手机端-删除提前开票") - @DeleteMapping("/deleteAdvanceInvoice/{contractSid}") + @DeleteMapping("/deleteAdvanceInvoice") @ResponseBody - public ResultBean deleteAdvanceInvoice(@PathVariable("contractSid") String contractSid); + public ResultBean deleteAdvanceInvoice(@SpringQueryMap AppAdvanceInvoiceInfoQuery query); /*************************************************APP提前开票流程接口***************************************************/ diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeignFallback.java index 310419e4c4..a78bcdf1f7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeignFallback.java @@ -29,6 +29,7 @@ import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.stereotype.Component; import java.util.List; @@ -87,7 +88,7 @@ public class BusAdvanceGinvoiceapplyFeignFallback implements BusAdvanceGinvoicea } @Override - public ResultBean initAdvanceInvoice(String contractSid) { + public ResultBean initAdvanceInvoice(AppAdvanceInvoiceInfoQuery query) { return null; } @@ -102,7 +103,7 @@ public class BusAdvanceGinvoiceapplyFeignFallback implements BusAdvanceGinvoicea } @Override - public ResultBean deleteAdvanceInvoice(String contractSid) { + public ResultBean deleteAdvanceInvoice(AppAdvanceInvoiceInfoQuery query) { return null; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListDto.java new file mode 100644 index 0000000000..3d82485445 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListDto.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AdCarListDto implements Dto { + private static final long serialVersionUID = -1495695891564098295L; + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("成交价") + private String price; + @ApiModelProperty("备注") + private String remarks; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListVo.java new file mode 100644 index 0000000000..f0437d25d6 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListVo.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AdCarListVo implements Vo { + private static final long serialVersionUID = -1495695891564098295L; + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("成交价") + private String price; + @ApiModelProperty("备注") + private String remarks; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppAdvanceArrearsInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppAdvanceArrearsInfoQuery.java new file mode 100644 index 0000000000..d151a3d6b5 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppAdvanceArrearsInfoQuery.java @@ -0,0 +1,13 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppAdvanceArrearsInfoQuery implements Query { + private static final long serialVersionUID = -9121199885742205263L; + + @ApiModelProperty("申请sid") + private String contractSid; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java new file mode 100644 index 0000000000..0367b219a3 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class AppArrearsCarryDto implements Dto { + private static final long serialVersionUID = -1972581222399264301L; + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("合同sid") + private String contractSid; + @ApiModelProperty("合同id") + private String contractNo; + @ApiModelProperty("收款金额") + private String contractCollectionMoney; + @ApiModelProperty("合同金额") + private String contractMoney; + @ApiModelProperty("车型") + private String modelName; + @ApiModelProperty("客户") + private String customerName; + @ApiModelProperty("申请日期") + private String applyDate; + @ApiModelProperty("回款日期") + private String commitmentMoneyDate; + @ApiModelProperty("欠款金额") + private String arrearsMoney; + @ApiModelProperty("欠款提车原因") + private String reason; + @ApiModelProperty("选择车辆列表") + private List carList = new ArrayList<>(); + @ApiModelProperty("所有车辆列表") + private List vinList = new ArrayList<>(); + @ApiModelProperty("流程实列id") + private String procInsId; + @ApiModelProperty("用户sid") + private String taskId; +} 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 new file mode 100644 index 0000000000..9333911845 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java @@ -0,0 +1,45 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class AppArrearsCarryInfoVo implements Vo { + private static final long serialVersionUID = -3423056894840667092L; + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("合同sid") + private String contractSid; + @ApiModelProperty("合同id") + private String contractNo; + @ApiModelProperty("收款金额") + private String contractCollectionMoney; + @ApiModelProperty("合同金额") + private String contractMoney; + @ApiModelProperty("车型") + private String modelName; + @ApiModelProperty("客户") + private String customerName; + @ApiModelProperty("申请日期") + private String applyDate; + @ApiModelProperty("回款日期") + private String commitmentMoneyDate; + @ApiModelProperty("欠款金额") + private String arrearsMoney; + @ApiModelProperty("欠款提车原因") + private String reason; + @ApiModelProperty("选择车辆列表") + private List carList = new ArrayList<>(); + @ApiModelProperty("所有车辆列表") + private List vinList = new ArrayList<>(); + @ApiModelProperty("流程实列id") + private String procInsId; + @ApiModelProperty("用户sid") + private String taskId; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehiclePageVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehiclePageVo.java index 55d08af161..5e25733b58 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehiclePageVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehiclePageVo.java @@ -11,33 +11,28 @@ import java.math.BigDecimal; @Data public class AppArrearsCarryVehiclePageVo implements Vo { - @ApiModelProperty("车辆sid") - private String vehicleSid; - - @ApiModelProperty("车架号") - @JsonProperty("VINNo") - private String VINNo; + private static final long serialVersionUID = -4031129440179580368L; + @ApiModelProperty("合同sid") + private String sid; + @ApiModelProperty("合同状态") + private String nodeState; @ApiModelProperty("合同编号") private String contractNo; - - @ApiModelProperty("客户sid") - private String customerSid; - - @ApiModelProperty("客户名称") - private String customerName; - @ApiModelProperty("车型名称") private String modelName; - - @ApiModelProperty("车型Sid") - private String modelSid; - - @ApiModelProperty("成交价") - private BigDecimal dealMoney; - - @ApiModelProperty("申请日期") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("欠款金额") + private String arrearsMoney; + @ApiModelProperty("回款日期") + private String commitmentMoneyDate; + @ApiModelProperty("申请人") + private String applyName; + @ApiModelProperty("申请时间") private String applyDate; - + @ApiModelProperty("是否显示办理") + private boolean showUpdateBtn; + @ApiModelProperty("是否显示删除") + private boolean showDeleteBtn; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVinDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVinDto.java new file mode 100644 index 0000000000..c85a6ddee7 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVinDto.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + + +@Data +public class AppArrearsCarryVinDto implements Dto { + private static final long serialVersionUID = 4571956522478600189L; + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("车架号集合") + private List vinList; + + @ApiModelProperty("合同sid") + private String contractSid; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java index b82d54b24d..ddf9aaadb9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java @@ -27,43 +27,57 @@ import java.math.BigDecimal; public class BusArrearsCarryVehicleApply extends BaseEntity { private static final long serialVersionUID = 1L; - - @ApiModelProperty("客户名称") + + @ApiModelProperty("客户名称") private String customerName; - - @ApiModelProperty("车型sid") + + @ApiModelProperty("车型sid") private String modelSid; - - @ApiModelProperty("车型名称") + + @ApiModelProperty("车型名称") private String modelName; - - @ApiModelProperty("合同编号") + + @ApiModelProperty("合同编号") private String contractNo; - - @ApiModelProperty("合同总金额") + + @ApiModelProperty("合同总金额") private BigDecimal contractMoney; - - @ApiModelProperty("合同收款金额") + + @ApiModelProperty("合同收款金额") private BigDecimal contractCollectionMoney; - - @ApiModelProperty("欠款金额") + + @ApiModelProperty("欠款金额") private BigDecimal arrearsMoney; - - @ApiModelProperty("承诺回款日期") + + @ApiModelProperty("承诺回款日期") private String commitmentMoneyDate; - - @ApiModelProperty("申请日期") + + @ApiModelProperty("申请日期") private String applyDate; - - @ApiModelProperty("申请人") + + @ApiModelProperty("申请人") private String applyName; - - @ApiModelProperty("欠款提车原因") + + @ApiModelProperty("欠款提车原因") private String reason; - - @ApiModelProperty("累计欠款金额") + + @ApiModelProperty("累计欠款金额") private BigDecimal cumulativeArrearsMoney; - @ApiModelProperty("流程状态") + @ApiModelProperty("分公司sid") + private String useOrgSid; + + @ApiModelProperty("分公司名称") + private String useOrgName; + + @ApiModelProperty(value = "节点状态") private String nodeState; + @ApiModelProperty(value = "节点id") + private String nodeId; + @ApiModelProperty(value = "流程id") + private String procDefId; + @ApiModelProperty(value = "实例id") + private String procInstId; + @ApiModelProperty(value = "任务id") + private String taskId; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java index 5399f5a59b..cb2f28bfae 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java @@ -1,11 +1,17 @@ package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceDto; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceInfoVo; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceVinDto; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -28,7 +34,7 @@ import java.util.List; @FeignClient( contextId = "anrui-buscenter-BusArrearsCarryVehicleApply", name = "anrui-buscenter", - path = "busarrearscarryvehicleapply", + path = "v1/busarrearscarryvehicleapply", fallback = BusArrearsCarryVehicleApplyFeignFallback.class) public interface BusArrearsCarryVehicleApplyFeign { @@ -68,13 +74,71 @@ public interface BusArrearsCarryVehicleApplyFeign { @PostMapping("/saveArrearsAppendix") public ResultBean saveArrearsAppendix(@RequestBody List dto); + + /********************************App接口************************************/ + @ApiOperation("手机端-获取欠款提车列表") @PostMapping("/getArrearsTakeCarList") @ResponseBody ResultBean> getArrearsTakeCarList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("手机端-初始化欠款提车申请") + @GetMapping("/initArrearsApply") + @ResponseBody + public ResultBean initArrearsApply(@SpringQueryMap AppAdvanceArrearsInfoQuery query); + + @ApiOperation("移动端-新增欠款提车申请") + @PostMapping("/addArrearsApply") + @ResponseBody + public ResultBean addArrearsApply(@Valid @RequestBody AppArrearsCarryVinDto dto); + + @ApiOperation("移动端-保存欠款提车申请") + @PostMapping("/saveArrearsApply") + @ResponseBody + public ResultBean saveArrearsApply(@Valid @RequestBody AppArrearsCarryDto dto); + @ApiOperation("手机端-删除欠款提车") - @GetMapping("/deleteArrearsTakeCar/{contractSid}") + @GetMapping("/deleteArrearsTakeCar") + @ResponseBody + public ResultBean deleteArrearsTakeCar(@SpringQueryMap AppAdvanceArrearsInfoQuery query); + + @ApiOperation("提交流程") + @PostMapping("/submitAdvanceArrearsInfo") + @ResponseBody + ResultBean submitAdvanceArrearsInfo(@RequestBody AppSubmitAdvanceArrearsDto dto); + + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete") + @ResponseBody + public ResultBean complete(@Valid @RequestBody AppCompleteAdvanceArrearsDto query); + + @ApiOperation(value = "办理（同意）") + @PostMapping("/InitiatorToAnswerInfo") + @ResponseBody + public ResultBean InitiatorToAnswerInfo(@Valid @RequestBody AppCompleteAdvanceArrearsDto query); + + @ApiOperation(value = "获取上一个环节") + @PostMapping(value = "/getPreviousNodesForReject") + @ResponseBody + ResultBean> getPreviousNodesForReject(@Valid @RequestBody GetNodeQuery query); + + @ApiOperation(value = "获取下一个环节") + @PostMapping(value = "/getNextNodesForSubmit") + @ResponseBody + ResultBean> getNextNodesForSubmit(@Valid @RequestBody GetNodeQuery query); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + @ResponseBody + public ResultBean taskReject(@Valid @RequestBody AppAdvanceArrearsTaskQuery query); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + @ResponseBody + public ResultBean revokeProcess(@Valid @RequestBody AppAdvanceArrearsTaskQuery query); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") @ResponseBody - public ResultBean deleteArrearsTakeCar(@PathVariable("contractSid") String contractSid); + public ResultBean breakProcess(@Valid @RequestBody AppAdvanceArrearsTaskQuery query); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java index ab20630081..3ec1aee4e3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java @@ -1,5 +1,7 @@ package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -75,9 +77,64 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry return null; } + @Override + public ResultBean initArrearsApply(AppAdvanceArrearsInfoQuery query) { + return null; + } + + @Override + public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) { + return null; + } + + @Override + public ResultBean saveArrearsApply(AppArrearsCarryDto dto) { + return null; + } + + @Override + public ResultBean deleteArrearsTakeCar(AppAdvanceArrearsInfoQuery query) { + return null; + } + + + @Override + public ResultBean submitAdvanceArrearsInfo(AppSubmitAdvanceArrearsDto dto) { + return null; + } + + @Override + public ResultBean complete(AppCompleteAdvanceArrearsDto query) { + return null; + } + + @Override + public ResultBean InitiatorToAnswerInfo(AppCompleteAdvanceArrearsDto query) { + return null; + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return null; + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return null; + } + + @Override + public ResultBean taskReject(AppAdvanceArrearsTaskQuery query) { + return null; + } + + @Override + public ResultBean revokeProcess(AppAdvanceArrearsTaskQuery query) { + return null; + } @Override - public ResultBean deleteArrearsTakeCar(String contractSid) { + public ResultBean breakProcess(AppAdvanceArrearsTaskQuery query) { return null; } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppAdvanceArrearsTaskQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppAdvanceArrearsTaskQuery.java new file mode 100644 index 0000000000..07ccd5927e --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppAdvanceArrearsTaskQuery.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class AppAdvanceArrearsTaskQuery implements Query { + private static final long serialVersionUID = -2545459972114348165L; + + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + private String instanceId; + +// @ApiModelProperty("节点") +// private String targetKey; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppCompleteAdvanceArrearsDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppCompleteAdvanceArrearsDto.java new file mode 100644 index 0000000000..751c994d26 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppCompleteAdvanceArrearsDto.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class AppCompleteAdvanceArrearsDto implements Dto { + private static final long serialVersionUID = -1436734962233066703L; + + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "用户全路径sid") + @NotBlank(message = "参数错误：orgSidPath") + private String orgSidPath; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：instanceId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; +// @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？") +// private Map formVariables; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppSubmitAdvanceArrearsDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppSubmitAdvanceArrearsDto.java new file mode 100644 index 0000000000..b1661d2bcb --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppSubmitAdvanceArrearsDto.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable; + +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppSubmitAdvanceArrearsDto extends AppArrearsCarryDto { + private static final long serialVersionUID = 9148028768206972924L; + + @ApiModelProperty("意见") + private String comment; + @ApiModelProperty("流程实例id") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java new file mode 100644 index 0000000000..1501f1c07b --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java @@ -0,0 +1,11 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +@Data +public class GetNodeQuery implements Query { + private static final long serialVersionUID = -6541874437751241596L; + + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeVo.java new file mode 100644 index 0000000000..8178c8c6eb --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeVo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class GetNodeVo implements Vo { + private static final long serialVersionUID = 8103455420805041019L; + + @ApiModelProperty(value = "节点名称") + private String name; + @ApiModelProperty(value = "节点id") + private String id; + @ApiModelProperty(value = "审批组") + private List candidateGroups; + @ApiModelProperty(value = "是否是最后环节") + private String endTask; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsVo.java index f053bcd3b2..daad2ef8a0 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsVo.java @@ -38,5 +38,9 @@ public class BusArrearsCarryVehicleDetailsVo implements Vo { @ApiModelProperty("成交价") private BigDecimal dealMoney; + @ApiModelProperty("备注") + private String remarks; + + } 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 73386228fd..ba1433eb62 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 @@ -37,6 +37,7 @@ 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; @@ -112,8 +113,8 @@ public class BusAdvanceGinvoiceapplyRest implements BusAdvanceGinvoiceapplyFeign } @Override - public ResultBean initAdvanceInvoice(String contractSid) { - return busAdvanceGinvoiceapplyService.initAdvanceInvoice(contractSid); + public ResultBean initAdvanceInvoice(AppAdvanceInvoiceInfoQuery query) { + return busAdvanceGinvoiceapplyService.initAdvanceInvoice(query); } @Override @@ -127,8 +128,8 @@ public class BusAdvanceGinvoiceapplyRest implements BusAdvanceGinvoiceapplyFeign } @Override - public ResultBean deleteAdvanceInvoice(String contractSid) { - return busAdvanceGinvoiceapplyService.deleteAdvanceInvoice(contractSid); + public ResultBean deleteAdvanceInvoice(AppAdvanceInvoiceInfoQuery query) { + return busAdvanceGinvoiceapplyService.deleteAdvanceInvoice(query); } @Override 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 c64f6d7684..1c765856d5 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 @@ -393,8 +393,9 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService initAdvanceInvoice(String contractSid) { + public ResultBean initAdvanceInvoice(AppAdvanceInvoiceInfoQuery query) { ResultBean rb = ResultBean.fireFail(); + String contractSid = query.getContractSid(); AppAdvanceInvoiceInfoVo vo = new AppAdvanceInvoiceInfoVo(); BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(contractSid); BeanUtil.copyProperties(busAdvanceGinvoiceapply, vo, "sid"); @@ -551,8 +552,9 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService @@ -57,6 +58,20 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper getArrearsVehicleList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + /** + * 欠款提车列表 + * @param page + * @param qw + * @param name + * @return + */ IPage getAdvanceInvoiceList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + /** + * 更新流程相关的状态 + * + * @param map + * @return + */ + int updateFlowFiled(Map map); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml index 8b8c58d7f6..3c9b8e3071 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml @@ -54,8 +54,45 @@ ORDER BY bo.contractNo desc + + + + UPDATE bus_arrears_carry_vehicle_apply + SET nodeState=#{nodeState} + , nodeId=#{taskDefKey} + + , procDefId=#{procDefId} + + + , procInstId=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid = #{sid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java index 1fc440152b..d18677b7bf 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java @@ -1,7 +1,12 @@ package com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -156,8 +161,69 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp } @Override - public ResultBean deleteArrearsTakeCar(String contractSid) { - return busArrearsCarryVehicleApplyService.deleteArrearsTakeCar(contractSid); + public ResultBean initArrearsApply(AppAdvanceArrearsInfoQuery query) { + return busArrearsCarryVehicleApplyService.initArrearsApply(query); + } + + @Override + public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) { + return busArrearsCarryVehicleApplyService.addArrearsApply(dto); + } + + @Override + public ResultBean saveArrearsApply(AppArrearsCarryDto dto) { + return busArrearsCarryVehicleApplyService.saveArrearsApply(dto); + } + + @Override + public ResultBean deleteArrearsTakeCar(AppAdvanceArrearsInfoQuery query) { + return busArrearsCarryVehicleApplyService.deleteArrearsTakeCar(query); + } + + @Override + public ResultBean submitAdvanceArrearsInfo(AppSubmitAdvanceArrearsDto dto) { + return busArrearsCarryVehicleApplyService.submitAdvanceArrearsInfo(dto); + } + + @Override + public ResultBean complete(AppCompleteAdvanceArrearsDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId()); + return busArrearsCarryVehicleApplyService.complete(bv); + } + + @Override + public ResultBean InitiatorToAnswerInfo(AppCompleteAdvanceArrearsDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId()); + return busArrearsCarryVehicleApplyService.InitiatorToAnswerInfo(bv); + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return busArrearsCarryVehicleApplyService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return busArrearsCarryVehicleApplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean taskReject(AppAdvanceArrearsTaskQuery query) { + return busArrearsCarryVehicleApplyService.taskReject(query); + } + + @Override + public ResultBean revokeProcess(AppAdvanceArrearsTaskQuery query) { + return busArrearsCarryVehicleApplyService.revokeProcess(query); + } + + @Override + public ResultBean breakProcess(AppAdvanceArrearsTaskQuery query) { + return busArrearsCarryVehicleApplyService.breakProcess(query); } 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 a47d352af3..a5d139b94c 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 @@ -1,34 +1,65 @@ package com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply; +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.BaseVehicle; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; +import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; +import com.yxt.anrui.base.api.commoncontract.CommonContractVo; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceInfoVo; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppSubmitAdvanceInvoiceDto; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetails; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; import com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsService; +import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.buscenter.biz.flow.FlowableService; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; +import com.yxt.anrui.flowable.api.flow.FlowableFeign; +import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; +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; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.portal.api.sysuser.UserQuery; +import com.yxt.anrui.portal.api.sysuser.UserRoleQuery; 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.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * Project: bus(bus)
@@ -58,6 +89,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName()); return iPage; } + + public ResultBean initArrearsApply(AppAdvanceArrearsInfoQuery query) { + ResultBean rb = ResultBean.fireFail(); + String contractSid = query.getContractSid(); + List carList = new ArrayList<>(); + List vinList = new ArrayList<>(); + AppArrearsCarryInfoVo vo = new AppArrearsCarryInfoVo(); + //根据申请sid查询 + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(contractSid); + BeanUtil.copyProperties(busArrearsCarryVehicleApply, vo, "sid"); + vo.setUserSid(busArrearsCarryVehicleApply.getCreateBySid()); // 返回创建人sid + vo.setContractSid(contractSid);//返回申请sid + //根据申请sid查询车辆数据 + List carLists = busArrearsCarryVehicleDetailsService.selByArrearsSid(contractSid); + if (carLists.size() > 0) { + for (BusArrearsCarryVehicleDetailsVo carryVehicleDetailsVo : carLists) { + AdCarListVo adCarListVo = new AdCarListVo(); + adCarListVo.setPrice(String.valueOf(carryVehicleDetailsVo.getDealMoney())); //成交价 + adCarListVo.setVin(carryVehicleDetailsVo.getVinNo());//车架号 + adCarListVo.setRemarks(carryVehicleDetailsVo.getRemarks());//备注 + carList.add(adCarListVo); + } + } + vo.setCarList(carList); + List vinLists = busSalesOrderService.selectByContractNo(busArrearsCarryVehicleApply.getContractNo()); + if (carLists.size() > 0) { + for (AppRovalContractPageVo appRovalContractPageVo : vinLists) { + AdCarListVo adCarListVo = new AdCarListVo(); + adCarListVo.setVin(appRovalContractPageVo.getVin()); + CommonContractVo commonContractVo = commonContractFeign.getContractBySalesOrderSid(appRovalContractPageVo.getBusSid()).getData(); + if (commonContractVo != null) { + adCarListVo.setPrice(commonContractVo.getPrice()); + } + vinList.add(adCarListVo); + } + } + vo.setVinList(vinList); + return rb.success().setData(vo); + } + + /** + * 移动端-新增欠款提车申请 + * + * @param dto + * @return + */ + public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) { + ResultBean rb = ResultBean.fireFail(); + // 取出分公司sid + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); + // 取出分公司名称 + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + // 取出当前登录用户信息 + SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); + // 时间转换 + SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd"); + String price = ""; + String modelName = ""; + String modelSid = ""; + String customerName = ""; + String contractNo = ""; + String contractAmount = ""; + if (StringUtils.isNotBlank(dto.getContractSid())) { + // 根据合同Sid取出 合同编号 车型名称 车型sid + CommonContractVo commonContractVo = commonContractFeign.fetchBySid(dto.getContractSid()).getData(); + if (commonContractVo != null) { + // 根据客户sid取出 客户名称 + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(commonContractVo.getCustomerSid()).getData(); + if (crmCustomerTempVo != null) { + customerName = crmCustomerTempVo.getName(); + } + price = commonContractVo.getPrice(); + contractNo = commonContractVo.getContractNo(); + modelName = commonContractVo.getModelName(); + modelSid = commonContractVo.getModelSid(); + contractAmount = commonContractVo.getContractAmount(); + } + } + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = new BusArrearsCarryVehicleApply(); + busArrearsCarryVehicleApply.setCreateBySid(dto.getUserSid());//创建人sid + busArrearsCarryVehicleApply.setApplyName(sysUserVo.getName());//申请人 + busArrearsCarryVehicleApply.setApplyDate(sf.format(new Date()));//申请日期 + busArrearsCarryVehicleApply.setUseOrgSid(useOrgSid);//分公司sid + busArrearsCarryVehicleApply.setUseOrgName(sysOrganizationVo.getName());//分公司名称 + busArrearsCarryVehicleApply.setModelSid(modelSid);// 车型sid + busArrearsCarryVehicleApply.setModelName(modelName);// 车型名称 + busArrearsCarryVehicleApply.setCustomerName(customerName);// 客户名称 + busArrearsCarryVehicleApply.setContractNo(contractNo);// 合同编号 + busArrearsCarryVehicleApply.setContractMoney(new BigDecimal(contractAmount));//合同总金额 +// busArrearsCarryVehicleApply.setContractCollectionMoney(new BigDecimal());//合同收款金额 +// busArrearsCarryVehicleApply.setArrearsMoney();//欠款金额 + // 添加欠款提车 车辆表数据 + if (dto.getVinList().size() > 0) { + List vinList = dto.getVinList(); + for (String vinNo : vinList) { + BusArrearsCarryVehicleDetails busArrearsCarryVehicle = new BusArrearsCarryVehicleDetails(); + busArrearsCarryVehicle.setArrearsVehicleSid(busArrearsCarryVehicleApply.getSid()); // 申请表sid + busArrearsCarryVehicle.setVinNo(vinNo); // 车架号 + //获取车辆sid + BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vinNo, useOrgSid).getData(); + if (baseVehicle != null) { + busArrearsCarryVehicle.setVehicleSid(baseVehicle.getSid()); + } + //成交价 + busArrearsCarryVehicle.setDealMoney(new BigDecimal(price)); + busArrearsCarryVehicleDetailsService.save(busArrearsCarryVehicle); + } + } + save(busArrearsCarryVehicleApply); + return rb.success().setData(busArrearsCarryVehicleApply.getSid()); + } + + /** + * 移动端-保存欠款提车申请 + * + * @param dto + * @return + */ + public ResultBean saveArrearsApply(AppArrearsCarryDto dto) { + ResultBean rb = ResultBean.fireFail(); + // 取出分公司sid + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); + // 取出当前登录用户信息 + SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); + //根据申请sid查询数据 + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid()); + BeanUtil.copyProperties(dto, busArrearsCarryVehicleApply); + //根据欠款提车Sid删除车辆信息 并重新添加 + busArrearsCarryVehicleDetailsService.deleteByArrearsVehicleSid(dto.getContractSid()); + // 添加欠款提车 车辆表数据 + if (dto.getCarList().size() > 0) { + List carList = dto.getCarList(); + for (AdCarListDto adCarListDto : carList) { + BusArrearsCarryVehicleDetails busArrearsCarryVehicle = new BusArrearsCarryVehicleDetails(); + busArrearsCarryVehicle.setArrearsVehicleSid(busArrearsCarryVehicleApply.getSid()); // 申请表sid + busArrearsCarryVehicle.setVinNo(adCarListDto.getVin()); // 车架号 + //获取车辆sid + BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(adCarListDto.getVin(), useOrgSid).getData(); + if (baseVehicle != null) { + busArrearsCarryVehicle.setVehicleSid(baseVehicle.getSid()); + } + //成交价 + busArrearsCarryVehicle.setDealMoney(new BigDecimal(adCarListDto.getPrice())); + busArrearsCarryVehicle.setRemarks(adCarListDto.getRemarks());// 备注 + busArrearsCarryVehicleDetailsService.save(busArrearsCarryVehicle); + } + } + //修改欠款提车申请 + updateById(busArrearsCarryVehicleApply); + return rb.success().setData(busArrearsCarryVehicleApply.getSid()); + } + + public ResultBean submitAdvanceArrearsInfo(AppSubmitAdvanceArrearsDto 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(); + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid()); + int r = submitBusinessData(dto, busArrearsCarryVehicleApply); + if (r == 3) { + return rb.setMsg("该申请不存在"); + } + if (r == 0) { + return rb.setMsg("操作失败!提交的数据不一致"); + } + //新增修改保存 + ResultBean resultBean = saveArrearsApply(dto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + String businessSid = resultBean.getData(); + //创建BusinessVariables实体对象 + BusinessVariables bv = new BusinessVariables(); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //用户的部门全路径sid + bv.setOrgSidPath(orgSidPath); + //业务sid + bv.setBusinessSid(businessSid); + //用户sid + bv.setUserSid(dto.getUserSid()); + bv.setFormVariables(variables); + //若app移动端有此功能，则传递appMap参数 + Map appMap = new HashMap<>(); + //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 + appMap.put("contractSid", businessSid); + variables.put("app", appMap); + //流程定义id + bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId()); + if (r == 1) { + ResultBean voResultBean = flowableFeign.startProcess(bv); + UpdateFlowFieldVo ufVo = voResultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(ufVo)); + //极光推送 + busArrearsCarryVehicleApply = fetchBySid(businessSid); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("欠款提车申请"); + messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("欠款提车申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + return voResultBean; + } + if (r == 2) { + // ToDo:驳回到发起人后再次提交 + if (StringUtils.isBlank(dto.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + bv.setTaskId(busArrearsCarryVehicleApply.getTaskId()); + bv.setTaskDefKey(busArrearsCarryVehicleApply.getNodeId()); + bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); + bv.setInstanceId(dto.getInstanceId()); +// return complete(bv); + } + return rb; + } + + /** + * 判断提交的流程是否被允许 + * + * @param dto + * @return + */ + private synchronized int submitBusinessData(AppSubmitAdvanceArrearsDto dto, BusArrearsCarryVehicleApply busArrearsCarryVehicleApply) { + int r = 0; + if (StringUtils.isBlank(dto.getContractSid())) { + r = 1; + } else { + if (busArrearsCarryVehicleApply != null) { + String businessTaskId = busArrearsCarryVehicleApply.getTaskId(); + if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) { + //新提交 + r = 1; + } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { + //二次提交//只有数据一致的时候才能进行下一步 + r = 2; + } + } else { + r = 3; + } + + } + return r; + } + + /** + * 更新流程相关的状态 + * + * @param map + * @return + */ + private int updateFlowFiled(Map map) { + return baseMapper.updateFlowFiled(map); + } + + public ResultBean complete(BusinessVariables bv) { + ResultBean rb = ResultBean.fireFail(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(bv.getUserSid()).getData(); + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid()); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("contractSid", bv.getBusinessSid()); + variables.put("app", appMap); + bv.setFormVariables(variables); + if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) { + ResultBean resultBean = flowableFeign.handleProsess(bv); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + UpdateFlowFieldVo ufVo = resultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + if (!"Event_end".equals(ufVo.getTaskDefKey())) { + //极光推送 + busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid()); + ufVo.setProcInsId(busArrearsCarryVehicleApply.getProcInstId()); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + ufVo.setProcInsId(busArrearsCarryVehicleApply.getProcInstId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(bv.getBusinessSid()); + messageFlowableQuery.setModuleName("欠款提车申请"); + messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("欠款提车申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + } else { + AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery(); + Map appMaps = new HashMap<>(); + appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid()); + List recipientSidList = new ArrayList<>(); + + // 风控中心总经理角色用户 + UserRoleQuery userRoleQuery = new UserRoleQuery(); + userRoleQuery.setRoleSid("537bea8f-75e8-430c-9a5f-3140bda41f39"); + List list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); + for (SysUserVo userVo : list1) { + recipientSidList.add(userVo.getSid()); + } + // 分公司会计角色用户 + UserQuery userQuery = new UserQuery(); + userQuery.setRoleSid("94e3e298-e934-42d2-af02-50e93eee583a"); + userQuery.setOrgSidPath(bv.getOrgSidPath()); + List list = sysUserFeign.getUserByRole(userQuery).getData(); + for (SysUserVo userVo : list) { + recipientSidList.add(userVo.getSid()); + } + //财务中心总经理角色用户 + UserRoleQuery userRoleQuery3 = new UserRoleQuery(); + userRoleQuery3.setRoleSid("b2bcdfd6-ac51-408c-9c7a-7e9818d23155"); + List list3 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery3).getData(); + for (SysUserVo userVo : list3) { + recipientSidList.add(userVo.getSid()); + } + //事业部运营经理角色用户 + UserRoleQuery userRoleQuery2 = new UserRoleQuery(); + userRoleQuery2.setRoleSid("f60b30b0-c7ad-4533-8367-b3ff95cbe725"); + List list2 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery2).getData(); + for (SysUserVo userVo : list2) { + recipientSidList.add(userVo.getSid()); + } + query.setRecipientSidList(recipientSidList); + query.setAppMap(appMaps); + query.setMsgTitle("业务"); + query.setMsgContent(sysUserVo.getName() + "提交的欠款提车申请,请查阅"); + query.setMsgSource("业务"); + query.setMsgTargetUri(MsgTargetUriEnum.TQKPSQTS.getUri()); + query.setApp_type("2"); + query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028"); + query.setName("业务"); + // 消息推送 + messageFeign.sendAutoserviceMessage(query); + } + return rb.success().setData(resultBean.getData()); + } else { + return rb.setMsg("操作失败!提交的数据不一致"); + } + } + + public ResultBean InitiatorToAnswerInfo(BusinessVariables bv) { + ResultBean rb = ResultBean.fireFail(); + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid()); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("contractSid", bv.getBusinessSid()); + variables.put("app", appMap); + bv.setFormVariables(variables); + 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()); + List candidateGroups = voList.get(0).getCandidateGroups(); + UserRoleQuery userRoleQuery = new UserRoleQuery(); + userRoleQuery.setRoleSid(candidateGroups.get(0)); + List sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); + StringBuilder nextNodeUserSids = new StringBuilder(); + if (sysUserVos.size() > 0) { + for (SysUserVo sysUserVo : sysUserVos) { + String sid = sysUserVo.getSid(); + nextNodeUserSids.append(sid).append(","); + } + } + if (StringUtils.isBlank(nextNodeUserSids)) { + return rb.setMsg("下一环节暂无操作人员"); + } + String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); + bv.setNextNodeUserSids(substring); + if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) { + ResultBean resultBean1 = flowableFeign.handleProsess(bv); + if (!resultBean1.getSuccess()) { + return rb.setMsg(resultBean1.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData())); + return rb.success().setData(resultBean1.getData()); + } else { + return rb.setMsg("操作失败!提交的数据不一致"); + } + } + + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + ResultBean> rb = new ResultBean<>(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); +// Map formVariables = query.getFormVariables(); + //判断流程分支 +// Map map = IsTrue(formVariables.get("businessSid")); +// bv.setFormVariables(map); + bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.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()); + return rb.success().setData(voList); + } + + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); +// Map formVariables = query.getFormVariables(); + //判断流程分支 +// Map map = IsTrue(formVariables.get("businessSid")); +// bv.setFormVariables(map); + bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.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()); + return rb.success().setData(voList); + } + + public ResultBean taskReject(AppAdvanceArrearsTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getComment())) { + return rb.setMsg("意见不能为空"); + } + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid()); + if (busArrearsCarryVehicleApply == null) { + return rb.setMsg("该申请不存在"); + } + String businessTaskId = busArrearsCarryVehicleApply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("contractSid", query.getBusinessSid()); + variables.put("app", appMap); + flowTaskVo.setValues(variables); + ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + UpdateFlowFieldVo ufVo = resultBean.getData(); + Map map = BeanUtil.beanToMap(resultBean.getData()); + //更新业务中的流程相关的参数 + updateFlowFiled(map); + busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid()); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + String procId = busArrearsCarryVehicleApply.getProcInstId(); + ufVo.setProcInsId(procId); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(query.getBusinessSid()); + messageFlowableQuery.setModuleName("提前开票申请"); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busArrearsCarryVehicleApply.getCreateBySid())) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + messageFlowableQuery.setMsgTitle("提前开票申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + return rb.success(); + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } + + public ResultBean revokeProcess(AppAdvanceArrearsTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + //根据业务sid查询移库申请 + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid()); + String businessTaskId = busArrearsCarryVehicleApply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg("操作失败!"); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + return rb.success().setData(resultBean.getData()); + } + } + return rb.setMsg("操作失败，提交的数据不一致!"); + } + + public ResultBean breakProcess(AppAdvanceArrearsTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + if (StringUtils.isBlank(query.getComment())) { + return rb.setMsg("意见不能为空"); + } + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid()); + String businessTaskId = busArrearsCarryVehicleApply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + return rb.success().setData(resultBean.getData()); + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java index a6f6668df4..5e1aad4537 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java @@ -120,7 +120,7 @@ public class BusArrearsCarryVehicleDetailsService extends MybatisBaseService initAdvanceInvoice(@PathVariable("contractSid") String contractSid); + public ResultBean initAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query); @ApiOperation("移动端-保存提前开票申请") @PostMapping("/saveAdvanceInvoice") @@ -85,9 +85,9 @@ public interface AppBusAdvanceGinvoiceapplyFeign { public ResultBean saveAdvanceInvoice(@Valid @RequestBody AdvanceInvoiceDto dto); @ApiOperation("手机端-删除提前开票") - @DeleteMapping("/deleteAdvanceInvoice/{contractSid}") + @DeleteMapping("/deleteAdvanceInvoice") @ResponseBody - public ResultBean deleteAdvanceInvoice(@PathVariable("contractSid") String contractSid); + public ResultBean deleteAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query); @ApiOperation("提交流程") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsDto.java new file mode 100644 index 0000000000..f122cfc5fc --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsDto.java @@ -0,0 +1,53 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class AdvanceArrearsDto implements Dto { + private static final long serialVersionUID = 6445736018244517900L; + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("合同sid") + @JsonProperty("contractSid") + private String sid; + @ApiModelProperty("合同id") + @JsonProperty("contractId") + private String contractNo; + @ApiModelProperty("收款金额") + @JsonProperty("collectedPrice") + private String contractCollectionMoney; + @ApiModelProperty("合同金额") + @JsonProperty("contractPrice") + private String contractMoney; + @ApiModelProperty("车型") + @JsonProperty("model") + private String modelName; + @ApiModelProperty("客户") + private String customerName; + @ApiModelProperty("申请日期") + @JsonProperty("applicationDate") + private String applyDate; + @ApiModelProperty("回款日期") + @JsonProperty("paymentDate") + private String commitmentMoneyDate; + @ApiModelProperty("欠款金额") + @JsonProperty("cumulativeArrearsPrice") + private String arrearsMoney; + @ApiModelProperty("欠款提车原因") + private String reason; + @ApiModelProperty("选择车辆列表") + private List carList = new ArrayList<>(); + @ApiModelProperty("所有车辆列表") + private List vinList = new ArrayList<>(); + @ApiModelProperty("流程实列id") + private String procInsId; + @ApiModelProperty("用户sid") + private String taskId; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoQuery.java new file mode 100644 index 0000000000..a0a526d5ad --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoQuery.java @@ -0,0 +1,13 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AdvanceArrearsInfoQuery implements Query { + private static final long serialVersionUID = -8535705004903885760L; + + @ApiModelProperty("申请sid") + private String contractSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java new file mode 100644 index 0000000000..3d6c76f3fc --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java @@ -0,0 +1,55 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class AdvanceArrearsInfoVo implements Vo { + private static final long serialVersionUID = 6617819819692518547L; + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("合同sid") + @JsonProperty("contractSid") + private String sid; + @ApiModelProperty("合同id") + @JsonProperty("contractId") + private String contractNo; + @ApiModelProperty("收款金额") + @JsonProperty("collectedPrice") + private String contractCollectionMoney; + @ApiModelProperty("合同金额") + @JsonProperty("contractPrice") + private String contractMoney; + @ApiModelProperty("车型") + @JsonProperty("model") + private String modelName; + @ApiModelProperty("客户") + private String customerName; + @ApiModelProperty("申请日期") + @JsonProperty("applicationDate") + private String applyDate; + @ApiModelProperty("回款日期") + @JsonProperty("paymentDate") + private String commitmentMoneyDate; + @ApiModelProperty("欠款金额") + @JsonProperty("cumulativeArrearsPrice") + private String arrearsMoney; + @ApiModelProperty("欠款提车原因") + private String reason; + @ApiModelProperty("选择车辆列表") + private List carList = new ArrayList<>(); + @ApiModelProperty("所有车辆列表") + private List vinList = new ArrayList<>(); + @ApiModelProperty("流程实列id") + private String procInsId; + @ApiModelProperty("用户sid") + private String taskId; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsVinDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsVinDto.java new file mode 100644 index 0000000000..0619f9c35d --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsVinDto.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AdvanceArrearsVinDto implements Dto { + private static final long serialVersionUID = -6803789056412970209L; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("车架号集合") + private List vinList; + + @ApiModelProperty("合同sid") + private String contractSid; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java index a34c7a6dd1..e62b6a352b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java @@ -1,12 +1,24 @@ package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceDto; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceInfoVo; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceVinDto; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.SubmitAdvanceInvoiceDto; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto; 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.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -27,19 +39,71 @@ import java.util.List; */ @Api(tags = "欠款提车申请") @FeignClient( - contextId = "bus-BusArrearsCarryVehicleApply", - name = "bus", - path = "v1/busarrearscarryvehicleapply", + contextId = "anrui-terminal-BusArrearsCarryVehicleApply", + name = "anrui-terminal", + path = "autoservice/v1/arrearsTakeCar", fallback = AppBusArrearsCarryVehicleApplyFeignFallback.class) public interface AppBusArrearsCarryVehicleApplyFeign { - @ApiOperation("手机端-获取提前开票列表") + @ApiOperation("手机端-获取欠款提车列表") @PostMapping("/getArrearsTakeCarList") @ResponseBody ResultBean> getArrearsTakeCarList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("移动端-新增欠款提车申请") + @PostMapping("/addArrearsApply") + @ResponseBody + public ResultBean addArrearsApply(@Valid @RequestBody AdvanceArrearsVinDto dto); + + @ApiOperation("手机端-初始化欠款提车申请") + @GetMapping("/initArrearsApply") + @ResponseBody + public ResultBean initArrearsApply(@SpringQueryMap AdvanceArrearsInfoQuery query); + + @ApiOperation("移动端-保存欠款提车申请") + @PostMapping("/saveArrearsApply") + @ResponseBody + public ResultBean saveArrearsApply(@Valid @RequestBody AdvanceArrearsDto dto); + @ApiOperation("手机端-删除欠款提车") - @GetMapping("/deleteArrearsTakeCar/{contractSid}") + @GetMapping("/deleteArrearsTakeCar") + @ResponseBody + public ResultBean deleteArrearsTakeCar(@SpringQueryMap AdvanceArrearsInfoQuery query); + + /******************************流程接口*************************************/ + + @ApiOperation("提交流程") + @PostMapping("/submitArrearsApplyInfo") + @ResponseBody + ResultBean submitArrearsApplyInfo(@RequestBody SubmitArrearsTakeCarDto dto); + + @ApiOperation("办理") + @PutMapping("/agreeArrearsApplyInfo") + @ResponseBody + ResultBean agreeArrearsApplyInfo(@RequestBody CompleteArrearsTakeCarDto dto); + + @ApiOperation("办理 跨机构") + @PutMapping("/initiatorToAnswerInfo") + @ResponseBody + ResultBean initiatorToAnswer(@RequestBody CompleteArrearsTakeCarDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectArrearsApplyInfo") + @ResponseBody + ResultBean rejectAdvanceInvoiceInfo(@RequestBody AdvanceArrearsTakeCarQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallArrearsApplyInfo") + @ResponseBody + ResultBean recallArrearsApplyInfo(@RequestBody AdvanceArrearsTakeCarQuery query); + + @ApiOperation("终止") + @PutMapping("/stopArrearsApplyInfo") + @ResponseBody + ResultBean stopArrearsApplyInfo(@RequestBody AdvanceArrearsTakeCarQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") @ResponseBody - public ResultBean deleteArrearsTakeCar(@PathVariable("contractSid") String contractSid); + ResultBean getFlowOperateTitle(@SpringQueryMap AdvanceArrearsQuery query); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java index 3e672e46d4..57bb25cc1f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java @@ -1,6 +1,10 @@ package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -30,7 +34,57 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear } @Override - public ResultBean deleteArrearsTakeCar(String contractSid) { + public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) { + return null; + } + + @Override + public ResultBean initArrearsApply(AdvanceArrearsInfoQuery query) { + return null; + } + + @Override + public ResultBean saveArrearsApply(AdvanceArrearsDto dto) { + return null; + } + + @Override + public ResultBean deleteArrearsTakeCar( AdvanceArrearsInfoQuery query) { + return null; + } + + @Override + public ResultBean submitArrearsApplyInfo(SubmitArrearsTakeCarDto dto) { + return null; + } + + @Override + public ResultBean agreeArrearsApplyInfo(CompleteArrearsTakeCarDto dto) { + return null; + } + + @Override + public ResultBean initiatorToAnswer(CompleteArrearsTakeCarDto dto) { + return null; + } + + @Override + public ResultBean rejectAdvanceInvoiceInfo(AdvanceArrearsTakeCarQuery query) { + return null; + } + + @Override + public ResultBean recallArrearsApplyInfo(AdvanceArrearsTakeCarQuery query) { + return null; + } + + @Override + public ResultBean stopArrearsApplyInfo(AdvanceArrearsTakeCarQuery query) { + return null; + } + + @Override + public ResultBean getFlowOperateTitle(AdvanceArrearsQuery query) { return null; } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListDto.java new file mode 100644 index 0000000000..1fcad97003 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListDto.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppCarListDto implements Dto { + private static final long serialVersionUID = -5142700461134754266L; + + @ApiModelProperty("车辆sid") + private String carSid; + + @ApiModelProperty("车架号") + private String vin; + + @ApiModelProperty("成交价") + private String price; + + @ApiModelProperty("备注") + private String remarks; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListVo.java new file mode 100644 index 0000000000..872d395f97 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppCarListVo implements Vo { + private static final long serialVersionUID = 1080671707643102846L; + + @ApiModelProperty("车辆sid") + private String carSid; + + @ApiModelProperty("车架号") + private String vin; + + @ApiModelProperty("成交价") + private String price; + + @ApiModelProperty("备注") + private String remarks; + + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java index 661888345d..72d3b6a55e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java @@ -12,33 +12,35 @@ import java.math.BigDecimal; public class ArrearsCarryVehiclePageVo implements Vo { private static final long serialVersionUID = 1607000479637135351L; - @ApiModelProperty("车辆sid") - private String vehicleSid; - - @ApiModelProperty("车架号") - @JsonProperty("VINNo") - private String VINNo; - + @ApiModelProperty("合同sid") + @JsonProperty("contractSid") + private String sid; + @ApiModelProperty("合同状态") + @JsonProperty("contractType") + private String nodeState; @ApiModelProperty("合同编号") + @JsonProperty("contractId") private String contractNo; - - @ApiModelProperty("客户sid") - private String customerSid; - - @ApiModelProperty("客户名称") - private String customerName; - @ApiModelProperty("车型名称") + @JsonProperty("model") private String modelName; - - @ApiModelProperty("车型Sid") - private String modelSid; - - @ApiModelProperty("成交价") - private BigDecimal dealMoney; - - @ApiModelProperty("申请日期") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("欠款金额") + @JsonProperty("arrears") + private String arrearsMoney; + @ApiModelProperty("回款日期") + @JsonProperty("paymentDate") + private String commitmentMoneyDate; + @ApiModelProperty("申请人") + @JsonProperty("applicant") + private String applyName; + @ApiModelProperty("申请时间") + @JsonProperty("date") private String applyDate; + @ApiModelProperty("是否显示办理") + private boolean showUpdateBtn; + @ApiModelProperty("是否显示删除") + private boolean showDeleteBtn; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AdvanceArrearsQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AdvanceArrearsQuery.java new file mode 100644 index 0000000000..8eac97e5fa --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AdvanceArrearsQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class AdvanceArrearsQuery implements Query { + private static final long serialVersionUID = -6443664256741305075L; + + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + @NotNull(message = "参数错误：next") + private Integer next; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AdvanceArrearsTakeCarQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AdvanceArrearsTakeCarQuery.java new file mode 100644 index 0000000000..dd95574b81 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AdvanceArrearsTakeCarQuery.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class AdvanceArrearsTakeCarQuery implements Query { + private static final long serialVersionUID = -6364879849166421242L; + + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + @JsonProperty("procInsId") + private String instanceId; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/CompleteArrearsTakeCarDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/CompleteArrearsTakeCarDto.java new file mode 100644 index 0000000000..765fa4ab81 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/CompleteArrearsTakeCarDto.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class CompleteArrearsTakeCarDto implements Dto { + private static final long serialVersionUID = 288881914449642282L; + + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：procInsId") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/SubmitArrearsTakeCarDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/SubmitArrearsTakeCarDto.java new file mode 100644 index 0000000000..8148ca3aa5 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/SubmitArrearsTakeCarDto.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SubmitArrearsTakeCarDto implements Dto { + private static final long serialVersionUID = 2950377650362576923L; + + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java index 8c6f63a12d..92ca165114 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java @@ -72,4 +72,7 @@ public class ConfirmationDto implements Dto { @ApiModelProperty("用户sid") private String userSid; + @ApiModelProperty("机构sid") + private String orgPath; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageQuery.java index 15835e3487..f3cfacb9bc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageQuery.java @@ -13,4 +13,7 @@ public class ConfirmationPageQuery implements Query { @ApiModelProperty("付款方名称") private String name; + + @ApiModelProperty("机构sid") + private String orgPath; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java index df2c1f49dc..b53f736cec 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java @@ -2,9 +2,12 @@ package com.yxt.anrui.terminal.biz.arrearsTakeCar; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.AppBusArrearsCarryVehicleApplyFeign; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehiclePageVo; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.*; import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehicleQuery; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -32,7 +35,7 @@ import java.util.List; */ @Api(tags = "欠款提车申请") @RestController -@RequestMapping("v1/busarrearscarryvehicleapply") +@RequestMapping("autoservice/v1/arrearsTakeCar") public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVehicleApplyFeign { @Autowired @@ -45,7 +48,59 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh } @Override - public ResultBean deleteArrearsTakeCar(String contractSid) { - return appBusArrearsCarryVehicleApplyService.deleteArrearsTakeCar(contractSid); + public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) { + return appBusArrearsCarryVehicleApplyService.addArrearsApply(dto); + } + + @Override + public ResultBean initArrearsApply(AdvanceArrearsInfoQuery query) { + return appBusArrearsCarryVehicleApplyService.initArrearsApply(query); + } + + @Override + public ResultBean saveArrearsApply(AdvanceArrearsDto dto) { + return appBusArrearsCarryVehicleApplyService.saveArrearsApply(dto); + } + + @Override + public ResultBean deleteArrearsTakeCar( AdvanceArrearsInfoQuery query) { + return appBusArrearsCarryVehicleApplyService.deleteArrearsTakeCar(query); + } + + /******************************************流程接口********************************************/ + + @Override + public ResultBean submitArrearsApplyInfo(SubmitArrearsTakeCarDto dto) { + return appBusArrearsCarryVehicleApplyService.submitArrearsApplyInfo(dto); + } + + @Override + public ResultBean agreeArrearsApplyInfo(CompleteArrearsTakeCarDto dto) { + return appBusArrearsCarryVehicleApplyService.agreeArrearsApplyInfo(dto); + } + + @Override + public ResultBean initiatorToAnswer(CompleteArrearsTakeCarDto dto) { + return appBusArrearsCarryVehicleApplyService.initiatorToAnswer(dto); + } + + @Override + public ResultBean rejectAdvanceInvoiceInfo(AdvanceArrearsTakeCarQuery query) { + return appBusArrearsCarryVehicleApplyService.rejectAdvanceInvoiceInfo(query); + } + + @Override + public ResultBean recallArrearsApplyInfo(AdvanceArrearsTakeCarQuery query) { + return appBusArrearsCarryVehicleApplyService.recallArrearsApplyInfo(query); + } + + @Override + public ResultBean stopArrearsApplyInfo(AdvanceArrearsTakeCarQuery query) { + return appBusArrearsCarryVehicleApplyService.stopArrearsApplyInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(AdvanceArrearsQuery query) { + return appBusArrearsCarryVehicleApplyService.getFlowOperateTitle(query); } } 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 8657de0fc5..2aa553699b 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 @@ -1,11 +1,20 @@ package com.yxt.anrui.terminal.biz.arrearsTakeCar; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehiclePageVo; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehicleQuery; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehiclePageVo; +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.*; import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehicleQuery; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -13,6 +22,12 @@ 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; +import java.util.Optional; +import java.util.stream.Collectors; + /** * Project: bus(bus)
@@ -32,18 +47,178 @@ public class AppBusArrearsCarryVehicleApplyService { @Autowired - BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign; + private BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; public ResultBean> getArrearsTakeCarList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); - ResultBean> advanceInvoiceList = busArrearsCarryVehicleApplyFeign.getArrearsTakeCarList(pq); - PagerVo vo = CoverUtils.selectPagerVo(advanceInvoiceList.getData()); + ResultBean> resultBean = busArrearsCarryVehicleApplyFeign.getArrearsTakeCarList(pq); + List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), ArrearsCarryVehiclePageVo.class)).collect(Collectors.toList()); + PagerVo v = new PagerVo<>(); + BeanUtil.copyProperties(resultBean.getData(), v); + v.setRecords(voList); + return rb.success().setData(v); + } + + public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) { + AppArrearsCarryVinDto advanceArrearsVinDto = new AppArrearsCarryVinDto(); + BeanUtil.copyProperties(dto, advanceArrearsVinDto); + ResultBean resultBean = busArrearsCarryVehicleApplyFeign.addArrearsApply(advanceArrearsVinDto); + return resultBean; + } + + public ResultBean initArrearsApply(AdvanceArrearsInfoQuery query) { + ResultBean rb = ResultBean.fireFail(); + AdvanceArrearsInfoVo vo = new AdvanceArrearsInfoVo(); + AppAdvanceArrearsInfoQuery appAdvanceArrearsInfoQuery = new AppAdvanceArrearsInfoQuery(); + BeanUtil.copyProperties(query, appAdvanceArrearsInfoQuery); + ResultBean resultBean = busArrearsCarryVehicleApplyFeign.initArrearsApply(appAdvanceArrearsInfoQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + AppArrearsCarryInfoVo appArrearsCarryInfoVo = resultBean.getData(); + BeanUtil.copyProperties(appArrearsCarryInfoVo, vo); return rb.success().setData(vo); } - public ResultBean deleteArrearsTakeCar(String contractSid) { - ResultBean resultBean = busArrearsCarryVehicleApplyFeign.deleteArrearsTakeCar(contractSid); + public ResultBean saveArrearsApply(AdvanceArrearsDto dto) { + AppArrearsCarryDto appArrearsCarryDto = new AppArrearsCarryDto(); + BeanUtil.copyProperties(dto, appArrearsCarryDto); + ResultBean resultBean = busArrearsCarryVehicleApplyFeign.saveArrearsApply(appArrearsCarryDto); + return resultBean; + } + + public ResultBean deleteArrearsTakeCar(AdvanceArrearsInfoQuery query) { + AppAdvanceArrearsInfoQuery appAdvanceArrearsInfoQuery = new AppAdvanceArrearsInfoQuery(); + BeanUtil.copyProperties(query, appAdvanceArrearsInfoQuery); + ResultBean resultBean = busArrearsCarryVehicleApplyFeign.deleteArrearsTakeCar(appAdvanceArrearsInfoQuery); return resultBean; } + + public ResultBean submitArrearsApplyInfo(SubmitArrearsTakeCarDto dto) { + ResultBean rb = ResultBean.fireFail(); + AppSubmitAdvanceArrearsDto appSubmitAdvanceArrearsDto = new AppSubmitAdvanceArrearsDto(); + BeanUtil.copyProperties(dto, appSubmitAdvanceArrearsDto); + ResultBean resultBean = busArrearsCarryVehicleApplyFeign.submitAdvanceArrearsInfo(appSubmitAdvanceArrearsDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } + + public ResultBean agreeArrearsApplyInfo(CompleteArrearsTakeCarDto 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(); + AppCompleteAdvanceArrearsDto appCompleteAdvanceArrearsDto = new AppCompleteAdvanceArrearsDto(); + BeanUtil.copyProperties(dto, appCompleteAdvanceArrearsDto); + appCompleteAdvanceArrearsDto.setOrgSidPath(orgSidPath); + ResultBean resultBean = busArrearsCarryVehicleApplyFeign.complete(appCompleteAdvanceArrearsDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean initiatorToAnswer(CompleteArrearsTakeCarDto 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(); + AppCompleteAdvanceArrearsDto appCompleteAdvanceArrearsDto = new AppCompleteAdvanceArrearsDto(); + BeanUtil.copyProperties(dto, appCompleteAdvanceArrearsDto); + appCompleteAdvanceArrearsDto.setOrgSidPath(orgSidPath); + ResultBean resultBean = busArrearsCarryVehicleApplyFeign.InitiatorToAnswerInfo(appCompleteAdvanceArrearsDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean rejectAdvanceInvoiceInfo(AdvanceArrearsTakeCarQuery query) { + ResultBean rb = ResultBean.fireFail(); + AppAdvanceArrearsTaskQuery taskQuery = new AppAdvanceArrearsTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = busArrearsCarryVehicleApplyFeign.taskReject(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallArrearsApplyInfo(AdvanceArrearsTakeCarQuery query) { + ResultBean rb = ResultBean.fireFail(); + AppAdvanceArrearsTaskQuery taskQuery = new AppAdvanceArrearsTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = busArrearsCarryVehicleApplyFeign.revokeProcess(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopArrearsApplyInfo(AdvanceArrearsTakeCarQuery query) { + ResultBean rb = ResultBean.fireFail(); + AppAdvanceArrearsTaskQuery taskQuery = new AppAdvanceArrearsTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = busArrearsCarryVehicleApplyFeign.breakProcess(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(AdvanceArrearsQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + GetNodeQuery getNodeQuery = new GetNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = busArrearsCarryVehicleApplyFeign.getPreviousNodesForReject(getNodeQuery); + if (getPreviousNodesForReject.getSuccess()) { + getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = getPreviousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(getPreviousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> getNextNodesForSubmit = busArrearsCarryVehicleApplyFeign.getNextNodesForSubmit(getNodeQuery); + if (getNextNodesForSubmit.getSuccess()) { + getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = getNextNodesForSubmit.getData().get(0).getName(); + } else { + return rb.setMsg(getNextNodesForSubmit.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + return rb.success().setData(data); + } + + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java index 2cdb400195..6fbae7124c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java @@ -69,8 +69,8 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl } @Override - public ResultBean initAdvanceInvoice(String contractSid) { - return appBusAdvanceGinvoiceapplyService.initAdvanceInvoice(contractSid); + public ResultBean initAdvanceInvoice(AdvanceInvoiceInfoQuery query) { + return appBusAdvanceGinvoiceapplyService.initAdvanceInvoice(query); } @Override @@ -79,8 +79,8 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl } @Override - public ResultBean deleteAdvanceInvoice(String contractSid) { - return appBusAdvanceGinvoiceapplyService.deleteAdvanceInvoice(contractSid); + public ResultBean deleteAdvanceInvoice(AdvanceInvoiceInfoQuery query) { + return appBusAdvanceGinvoiceapplyService.deleteAdvanceInvoice(query); } @Override diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index 758e50085b..38305607e3 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -101,10 +101,12 @@ public class AppBusAdvanceGinvoiceapplyService { return resultBean; } - public ResultBean initAdvanceInvoice(String contractSid) { + public ResultBean initAdvanceInvoice(AdvanceInvoiceInfoQuery query) { ResultBean rb = ResultBean.fireFail(); AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo(); - ResultBean resultBean = busAdvanceGinvoiceapplyFeign.initAdvanceInvoice(contractSid); + AppAdvanceInvoiceInfoQuery appAdvanceInvoiceInfoQuery = new AppAdvanceInvoiceInfoQuery(); + BeanUtil.copyProperties(query, appAdvanceInvoiceInfoQuery); + ResultBean resultBean = busAdvanceGinvoiceapplyFeign.initAdvanceInvoice(appAdvanceInvoiceInfoQuery); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } @@ -120,8 +122,10 @@ public class AppBusAdvanceGinvoiceapplyService { return resultBean; } - public ResultBean deleteAdvanceInvoice(String contractSid) { - ResultBean resultBean = busAdvanceGinvoiceapplyFeign.deleteAdvanceInvoice(contractSid); + public ResultBean deleteAdvanceInvoice(AdvanceInvoiceInfoQuery query) { + AppAdvanceInvoiceInfoQuery appAdvanceInvoiceInfoQuery = new AppAdvanceInvoiceInfoQuery(); + BeanUtil.copyProperties(query, appAdvanceInvoiceInfoQuery); + ResultBean resultBean = busAdvanceGinvoiceapplyFeign.deleteAdvanceInvoice(appAdvanceInvoiceInfoQuery); return resultBean; } From 624e03e9e91b1d12e7609bbb214a387cfadcec82 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 9 Nov 2022 16:36:57 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95-=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=91=8A=E5=9E=8B=E5=8F=B7?= =?UTF-8?q?=E5=92=8C=E6=98=AF=E5=90=A6=E5=8C=85=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/api/bussalesorder/BusSalesOrder.java | 5 +++++ .../bussalesorder/app/order/AppBusSalesOrderAllDto.java | 5 +++++ .../app/order/AppBusSalesOrderBillInfoVo.java | 5 +++++ .../api/bussalesorder/app/order/AppBusSalesOrderVo.java | 3 +++ .../api/bussalesorder/app/order/AppOrderDetailsVo.java | 3 +++ .../api/bussalesorder/app/order/AppOrderModelInfoVo.java | 3 +++ .../buscenter/biz/bussalesorder/BusSalesOrderMapper.xml | 7 +++++-- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 5 +++-- .../biz/bussalesordermodel/BusSalesOrderModelMapper.xml | 3 ++- .../api/autoservice/saleOrders/model/ModelDto.java | 1 + .../api/autoservice/saleOrders/order/BusOrderSalesVo.java | 3 +++ .../autoservice/saleOrders/order/BusOrerSalesAllDto.java | 5 +++++ .../saleOrders/order/BusSalesOrderBillInfoVo.java | 5 +++++ .../api/autoservice/saleOrders/order/OrderDetailsVo.java | 3 +++ .../api/autoservice/saleOrders/order/OrderModelInfoVo.java | 3 +++ 15 files changed, 54 insertions(+), 5 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java index 080926dea7..0c8a869505 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java @@ -121,4 +121,9 @@ public class BusSalesOrder extends BaseEntity { @ApiModelProperty("分公司sid") private String useOrgSid; + + @ApiModelProperty("是否包牌：1是，0否") + private String licensePlateKey; + @ApiModelProperty("是否包牌") + private String licensePlateValue; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java index c814e1b876..49f1ac217a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java @@ -61,4 +61,9 @@ public class AppBusSalesOrderAllDto implements Dto { @ApiModelProperty(value = "意向车型sid") private String intentionSid; + @ApiModelProperty("是否包牌：1是，0否") + private String licensePlateKey; + @ApiModelProperty("是否包牌") + private String licensePlateValue; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java index ddcb686293..f33ada737a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java @@ -59,4 +59,9 @@ public class AppBusSalesOrderBillInfoVo implements Vo { @ApiModelProperty(value = "金融方案value") private String financePlanValue; + @ApiModelProperty("是否包牌：1是，0否") + private String licensePlateKey; + @ApiModelProperty("是否包牌") + private String licensePlateValue; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java index ffbcd28b3d..bbce8dc936 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java @@ -145,4 +145,7 @@ public class AppBusSalesOrderVo implements Vo { private String makeUpDeposit; @JsonIgnore private String type; + + @ApiModelProperty("是否显示终止订单按钮") + private boolean showStopBtn; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index e5659c2c2f..7e114285f9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -91,4 +91,7 @@ public class AppOrderDetailsVo implements Vo { @ApiModelProperty("分公司sid") private String useOrgSid; + + @ApiModelProperty("是否包牌") + private String licensePlateValue; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java index b620b25629..220013b9a8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java @@ -39,4 +39,7 @@ public class AppOrderModelInfoVo implements Vo { private String config; private String specialInstructions; + + @ApiModelProperty("公告型号") + private String publicModel; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 02cf9b0eba..68d9e1dfa8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -102,7 +102,9 @@ affiliatedCompany, affiliatedCompanySid as affiliatedOrgSid, financePlan, - financePlanValue + financePlanValue, + licensePlateKey, + licensePlateValue FROM bus_sales_order bo WHERE bo.sid = #{saleOrderSid} @@ -196,7 +198,8 @@ bo.billNo, bo.financePlanValue, bo.payTypeKey, - bo.useOrgSid + bo.useOrgSid, + bo.licensePlateValue from bus_sales_order bo where sid = #{sid} 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 66842b6438..a0ae2bff14 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 @@ -1257,6 +1257,7 @@ public class BusSalesOrderService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName()); for (AppBusSalesOrderVo record : pagging.getRecords()) { + record.setShowStopBtn(false); if (StringUtils.isNotBlank(record.getCustomerImage())) { record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage()); } @@ -1738,8 +1739,8 @@ public class BusSalesOrderService extends MybatisBaseService Date: Wed, 9 Nov 2022 16:37:16 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E6=8F=90=E8=BD=A6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBusAdvanceGinvoiceapplyFeignFallback.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java index 35750e3240..9defb82c38 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java @@ -62,7 +62,7 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin } @Override - public ResultBean initAdvanceInvoice(String contractSid) { + public ResultBean initAdvanceInvoice(AdvanceInvoiceInfoQuery query) { return null; } @@ -72,7 +72,7 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin } @Override - public ResultBean deleteAdvanceInvoice(String contractSid) { + public ResultBean deleteAdvanceInvoice(AdvanceInvoiceInfoQuery query) { return null; } From 5439e50a1ce55fa32fc5dc7e34c48b20c0ce3309 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Wed, 9 Nov 2022 17:27:58 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=87=91=E8=9D=B6=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=89=B9=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json index 63257fba81..f765a8b552 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json @@ -54,7 +54,7 @@ "FCountCycle": "1", "FCountDay": 1, "FIsMustCounting": false, - "FIsBatchManage": true, + "FIsBatchManage": false, "FIsKFPeriod": false, "FIsExpParToFlot": false, "FCurrencyId": { @@ -236,7 +236,7 @@ "FInvPtyId": { "FNumber": "04" }, - "FIsEnable": true, + "FIsEnable": false, "FIsAffectPrice": false, "FIsAffectPlan": false, "FIsAffectCost": false