From 2f5c40aa4b52ccbf297c81853651e44a65df6883 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 19 Jun 2023 17:31:56 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E7=94=B3=E8=AF=B7=E4=BA=BA=E7=BB=88?= =?UTF-8?q?=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinBillApplicationService.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 7d518d0fe2..9dd6354a14 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -32,7 +32,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basedistributor.BaseDistributorFeign; import com.yxt.anrui.base.api.baseinternalpurchase.flow.GetNodeVo; -import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; import com.yxt.anrui.base.api.basetrailer.TrailerVo; @@ -41,7 +40,6 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; -import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; @@ -53,14 +51,8 @@ import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFL; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderSourceLCVo; -import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDiscountListVo; -import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; -import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; @@ -95,17 +87,14 @@ import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList; -import com.yxt.anrui.portal.api.sysorganization.SysOrganization; 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.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.UserRoleQuery; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.Base64; @@ -136,7 +125,6 @@ import java.net.URLEncoder; import java.util.*; import java.util.stream.Collectors; -import static com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService.image2Base64; import static java.util.Comparator.comparing; /** @@ -1014,7 +1002,7 @@ public class FinBillApplicationService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -1025,7 +1013,21 @@ public class FinBillApplicationService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + finBillVehicleService.updateByMainSid(finBillApplication.getSid()); + return rb.success().setData(resultBean.getData()); + } } + } return rb.setMsg("操作失败!提交的数据不一致!"); } From 57b743cfeb583484508574abd23fbfae539e530a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 19 Jun 2023 17:41:07 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/basevehicle/BaseVehicleRest.java | 4 +- .../BusDeliveredApplyService.java | 13 +++ .../FinVehicleInvoiceFeign.java | 6 + .../FinVehicleInvoiceFeignFallback.java | 5 + .../FinVehicleInvoiceMapper.java | 4 + .../FinVehicleInvoiceRest.java | 5 + .../FinVehicleInvoiceService.java | 6 + .../ScmApplyInboundMapper.java | 35 +++--- .../ScmApplyInboundService.java | 103 ++++++++++++------ 9 files changed, 129 insertions(+), 52 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 5e5660f6ed..5fe471c0ab 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -474,11 +474,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { scmApplyInboundQueryDto.setMakeListSid(scmApplyInboundVo.getApplicationSid()); scmApplyInboundQueryDto.setMakeListName(scmApplyInboundVo.getApplicationName()); scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date())); - String name = baseVehicleDto.getName(); + /* String name = baseVehicleDto.getName(); String[] names = name.split(","); scmApplyInboundQueryDto.setConfirmSid(names[0]); scmApplyInboundQueryDto.setConfirmName(names[1]); - scmApplyInboundQueryDto.setConfirmDate(names[2]); + scmApplyInboundQueryDto.setConfirmDate(names[2]);*/ scmApplyInboundQueryDto.setCreateOrgSid(scmApplyInboundVo.getUseOrgSid()); scmApplyInboundQueryDto.setCreateOrgName(scmApplyInboundVo.getUseOrgName()); scmApplyInboundQueryDto.setDownNum("0"); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 7f8544202d..96f0f282df 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -87,6 +87,8 @@ import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveInvoiceVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveSeleteVo; +import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice; +import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; import com.yxt.anrui.fin.api.finvehicleinvoice.InvoiceVo; import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -200,6 +202,8 @@ public class BusDeliveredApplyService extends MybatisBaseService busDeliveredApplyDetails = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid()); + for (BusDeliveredApplyDetails busDeliveredApplyDetail : busDeliveredApplyDetails) { + String vinSid = busDeliveredApplyDetail.getVinSid(); + FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(vinSid, busDeliveredApply.getContractNo()).getData(); + if (StringUtils.isNotBlank(finVehicleInvoice.getSid())){ + finVehicleInvoiceFeign.updateBySid(finVehicleInvoice.getSid()); + } + } } else { if ("重新提交".equals(bv.getComment())) { //将待出库中的车辆更改状态为出库申请0 diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java index bd638d8149..1a4b353014 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java @@ -81,6 +81,10 @@ public interface FinVehicleInvoiceFeign { @PostMapping("/updateBybillingSid") public ResultBean updateBybillingSid(@RequestParam("billingSid") String billingSid); + @ApiOperation("根据开票管理sid修改是否领票") + @PostMapping("/updateBySid") + public ResultBean updateBySid(@RequestParam("sid") String sid); + @ApiOperation("根据车辆sid获取发票信息") @GetMapping("/selectByVinSid") ResultBean selectByVinSid(@RequestParam("vinSid") String vinSid); @@ -113,4 +117,6 @@ public interface FinVehicleInvoiceFeign { @GetMapping("/selectByVinAndContractNo") @ResponseBody ResultBean selectByVinAndContractNo(@RequestParam("vinSid") String vinSid, @RequestParam("contractNo") String contractNo); + + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java index a41deec5a7..373fd86c9e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java @@ -89,6 +89,11 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign { return null; } + @Override + public ResultBean updateBySid(String sid) { + return null; + } + @Override public ResultBean selectByVinSid(String vinSid) { return null; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java index dab1820df5..a7b3d6309c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.fin.api.finvehicleinvoice.*; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -64,4 +65,7 @@ public interface FinVehicleInvoiceMapper extends BaseMapper { void updateTransferState(@Param("sid") String sid,@Param("code") String code,@Param("remarks") String remarks); FinVehicleInvoice selectByVinAndContractNo(@Param("vinSid") String vinSid, @Param("contractNo") String contractNo); + + @Update("update fin_vehicle_invoice set isTakeTicket = '是' where sid = #{sid}") + void updateIsLPBySid(String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java index b409011201..965d4fe835 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java @@ -205,6 +205,11 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign { return finVehicleInvoiceService.updateBybillingSid(billingSid); } + @Override + public ResultBean updateBySid(String sid) { + return finVehicleInvoiceService.updateIsLPBySid(sid); + } + @Override public ResultBean selectByVinSid(String vinSid) { return finVehicleInvoiceService.selectByVinSids(vinSid); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index 0ac89eda55..ef99330ff1 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -544,4 +544,10 @@ public class FinVehicleInvoiceService extends MybatisBaseService { - //@Update("update scm_apply_inbound set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from scm_apply_inbound") - List selectListVo(); - - int updateFlowFiled(Map map); - - int selectNum(@Param("bill")String bill); - - @Update("update scm_apply_inbound set num = #{num} where sid = #{busSid}") - void updateNumBySid(@Param("num") String num,@Param("busSid") String busSid); + //@Update("update scm_apply_inbound set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from scm_apply_inbound") + List selectListVo(); + + int updateFlowFiled(Map map); + + int selectNum(@Param("bill") String bill); + + @Update("update scm_apply_inbound set num = #{num} where sid = #{busSid}") + void updateNumBySid(@Param("num") String num, @Param("busSid") String busSid); + + @Update("update scm_apply_inbound set nodeState = '已办结' where sid = #{businessSid}") + void updateNodeState(String businessSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 672e0c657f..1fc94336d4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -275,13 +275,13 @@ public class ScmApplyInboundService extends MybatisBaseService 0) { return new ResultBean().setMsg(vinNoList.get(i) + "车架号已经存在"); } if (data != null) { - if (StringUtils.isNotBlank(data.getVinNo())){ + if (StringUtils.isNotBlank(data.getVinNo())) { return new ResultBean().setMsg(vinNoList.get(i) + "车架号已经存在"); } } @@ -329,16 +329,16 @@ public class ScmApplyInboundService extends MybatisBaseService list = scmApplyInboundVehicleService.selectListByAppSid(sid); @@ -423,7 +423,7 @@ public class ScmApplyInboundService extends MybatisBaseService stringList = Arrays.asList(split); - if (stringList.size() < 2){ + if (stringList.size() < 2) { return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可提交"); } List vehicleList = dto.getVehicleList(); @@ -487,7 +487,7 @@ public class ScmApplyInboundService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); return rb.success().setData(resultBean.getData()); - }else{ - scmApplyInbound.setNodeState("终止"); - scmApplyInbound.setTaskDefKey("Event_end"); - baseMapper.updateById(scmApplyInbound); + } else { + scmApplyInbound.setNodeState("终止"); + scmApplyInbound.setTaskDefKey("Event_end"); + baseMapper.updateById(scmApplyInbound); } return rb.success(); } @@ -1005,13 +1005,12 @@ public class ScmApplyInboundService extends MybatisBaseService stringList = Arrays.asList(split); - if (stringList.size() < 2){ + if (stringList.size() < 2) { return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可确认"); } List vehicleList = dto.getVehicleList(); ScmApplyInbound scmApplyInbound1 = fetchBySid(busSid); if (StringUtils.isBlank(busSid)) { - Map variables = BeanUtil.beanToMap(dto); ResultBean resultBean = saveOrUpdateApplyInBound(dto); if (!resultBean.getSuccess()) { return ResultBean.fireFail().setMsg(resultBean.getMsg()); @@ -1041,6 +1040,7 @@ public class ScmApplyInboundService extends MybatisBaseService scmApplyInboundVehicleDtos = scmApplyInboundVehicleService.fetchByMainSid(businessSid); ResultBean> sids = scmVehicleExamineService.saveEntryCarInspectedInfoBatch(booad, scmApplyInboundVehicleDtos); saveItem(sids); - FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(booad.getProcInsId()).getData(); - List flowList = flowRecordVo.getFlowList(); - for (FlowTask flowTask : flowList) { - if (flowTask.getTaskName().equals("账务部审批")) { - confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid(); - confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName(); - confirmDate = DateUtil.formatDate(flowTask.getFinishTime()); - break; - }else if (flowTask.getTaskName().equals("销售支持部经理审批")) { - confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid(); - confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName(); - confirmDate = DateUtil.formatDate(flowTask.getFinishTime()); - } - } name = confirmSid + "," + confirmName + "," + confirmDate; newBaseVehicleDto(booad, scmApplyInboundVehicleDtos, name); //入账审批通关修改采购订单状态 state = 1 if (booad.getManPurOrderTypeKey().equals(ManPurOrderType.ManOrderType.PC_ORDER.getCode())) { busVehicleOrderFeign.updateState(booad.getVehicleOrderSid()); } - return null; + return resultBean; } - return submitBusinessData(dto, busSid, scmApplyInbound1); + return confirmRZUpdate(dto, busSid, scmApplyInbound1); + } + + private synchronized ResultBean confirmRZUpdate(SubmitScmApplyInboundDto dto, String businessSid, ScmApplyInbound scmApplyInbound) { + List scmApplyInboundVehicleDtos1 = new ArrayList<>(); + List scmApplyInboundVehicleDtos2 = new ArrayList<>(); + ScmApplyInboundDto scmApplyInboundDto = new ScmApplyInboundDto(); + List vehicleList = dto.getVehicleList(); + for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) { + String vinNo = scmApplyInboundVehicleDto.getVinNo(); + if (StringUtils.isBlank(vinNo)) { + scmApplyInboundVehicleService.deleteBySid(scmApplyInboundVehicleDto.getSid()); + BeanUtil.copyProperties(dto, scmApplyInboundDto); + scmApplyInboundDto.setSid(null); + scmApplyInboundVehicleDtos1.add(scmApplyInboundVehicleDto); + } else { + scmApplyInboundVehicleDtos2.add(scmApplyInboundVehicleDto); + } + } + if (scmApplyInboundVehicleDtos1.size() > 0) { + scmApplyInboundDto.setVehicleList(scmApplyInboundVehicleDtos1); + scmApplyInboundDto.setNum(String.valueOf(scmApplyInboundVehicleDtos1.size())); + scmApplyInboundDto.setPcApplicationCode(scmApplyInbound.getPcApplicationCode()); + saveOrUpdateApplyInBound(scmApplyInboundDto); + } + baseMapper.updateNumBySid(String.valueOf(scmApplyInboundVehicleDtos2.size()), businessSid); + baseMapper.updateNodeState(businessSid); + dto.setVehicleList(scmApplyInboundVehicleDtos2); + dto.setNum(String.valueOf(scmApplyInboundVehicleDtos2.size())); + dto.setNodeState("已办结"); + ResultBean stringResultBean = saveOrUpdateApplyInBound(dto); + if (!stringResultBean.getSuccess()) { + return ResultBean.fireFail().setMsg(stringResultBean.getMsg()); + } + //数据推送 + String name = ""; + String confirmSid = ""; + String confirmName = ""; + String confirmDate = ""; + ScmApplyInbound booad = fetchBySid(businessSid); + List scmApplyInboundVehicleDtos = scmApplyInboundVehicleService.fetchByMainSid(businessSid); + ResultBean> sids = scmVehicleExamineService.saveEntryCarInspectedInfoBatch(booad, scmApplyInboundVehicleDtos); + saveItem(sids); + name = confirmSid + "," + confirmName + "," + confirmDate; + newBaseVehicleDto(booad, scmApplyInboundVehicleDtos, name); + //入账审批通关修改采购订单状态 state = 1 + if (booad.getManPurOrderTypeKey().equals(ManPurOrderType.ManOrderType.PC_ORDER.getCode())) { + busVehicleOrderFeign.updateState(booad.getVehicleOrderSid()); + } + return ResultBean.fireSuccess(); } } \ No newline at end of file From 3afa09700e2526953f4d3ee90a7bbe453b25597b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 19 Jun 2023 17:58:34 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/flowable/biz/flow/FlowableRest.java | 32 ++++++++++--------- .../flowdefinition/FlowDefinitionService.java | 32 ++++++++++--------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index b433561d18..f123c537bd 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -394,21 +394,23 @@ public class FlowableRest implements FlowableFeign { }else{ nextUserSid = nextNodeUserSidsOfSubmit.getData().getUserSid(); formVariables.put(BusinessVariables.ORGPATH, nextNodeUserSidsOfSubmit.getData().getOrgPath()); - List nextUserList = Arrays.asList(nextUserSid.split(",")); - if(nextUserList.size() == 1){ - firstSid = nextUserList.get(0); - ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(firstSid); - if(sysUserVoResultBean.getData() != null){ - firstName = sysUserVoResultBean.getData().getName(); - } - SysFlowableConfigQuery sysFlowableConfigQuery = new SysFlowableConfigQuery(); - sysFlowableConfigQuery.setUserSid(firstSid); - sysFlowableConfigQuery.setNowDate(new Date()); - ResultBean sysFlowableConfigVvoResultBean = sysFlowableConfigFeign.selectByUserSid(sysFlowableConfigQuery); - if(sysFlowableConfigVvoResultBean.getData() != null){ - if(StringUtils.isNotBlank(sysFlowableConfigVvoResultBean.getData().getChangeUserSid())){ - nextUserSid = sysFlowableConfigVvoResultBean.getData().getChangeUserSid(); - isChange = true; + if(nextUserSid != null){ + List nextUserList = Arrays.asList(nextUserSid.split(",")); + if(nextUserList.size() == 1){ + firstSid = nextUserList.get(0); + ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(firstSid); + if(sysUserVoResultBean.getData() != null){ + firstName = sysUserVoResultBean.getData().getName(); + } + SysFlowableConfigQuery sysFlowableConfigQuery = new SysFlowableConfigQuery(); + sysFlowableConfigQuery.setUserSid(firstSid); + sysFlowableConfigQuery.setNowDate(new Date()); + ResultBean sysFlowableConfigVvoResultBean = sysFlowableConfigFeign.selectByUserSid(sysFlowableConfigQuery); + if(sysFlowableConfigVvoResultBean.getData() != null){ + if(StringUtils.isNotBlank(sysFlowableConfigVvoResultBean.getData().getChangeUserSid())){ + nextUserSid = sysFlowableConfigVvoResultBean.getData().getChangeUserSid(); + isChange = true; + } } } } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java index 4887ce091d..ac6a9217ff 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java @@ -215,23 +215,25 @@ public class FlowDefinitionService extends FlowServiceFactory { String firstSid = ""; String firstName = ""; boolean isChange = false; - List nextUserList = Arrays.asList(nextNodeUserSids.split(",")); - if(nextUserList.size() == 1){ - firstSid = nextUserList.get(0); - ResultBean userVoResultBean = sysUserFeign.fetchBySid(firstSid); - if(userVoResultBean.getData() != null){ - firstName = userVoResultBean.getData().getName(); - } - SysFlowableConfigQuery sysFlowableConfigQuery = new SysFlowableConfigQuery(); - sysFlowableConfigQuery.setUserSid(firstSid); - sysFlowableConfigQuery.setNowDate(new Date()); - ResultBean sysFlowableConfigVvoResultBean = sysFlowableConfigFeign.selectByUserSid(sysFlowableConfigQuery); - if(sysFlowableConfigVvoResultBean.getData() != null){ - if(StringUtils.isNotBlank(sysFlowableConfigVvoResultBean.getData().getChangeUserSid())){ - nextNodeUserSids = sysFlowableConfigVvoResultBean.getData().getChangeUserSid(); - isChange = true; + if(StringUtils.isNotBlank(nextNodeUserSids)){ + List nextUserList = Arrays.asList(nextNodeUserSids.split(",")); + if(nextUserList.size() == 1){ + firstSid = nextUserList.get(0); + ResultBean userVoResultBean = sysUserFeign.fetchBySid(firstSid); + if(userVoResultBean.getData() != null){ + firstName = userVoResultBean.getData().getName(); } + SysFlowableConfigQuery sysFlowableConfigQuery = new SysFlowableConfigQuery(); + sysFlowableConfigQuery.setUserSid(firstSid); + sysFlowableConfigQuery.setNowDate(new Date()); + ResultBean sysFlowableConfigVvoResultBean = sysFlowableConfigFeign.selectByUserSid(sysFlowableConfigQuery); + if(sysFlowableConfigVvoResultBean.getData() != null){ + if(StringUtils.isNotBlank(sysFlowableConfigVvoResultBean.getData().getChangeUserSid())){ + nextNodeUserSids = sysFlowableConfigVvoResultBean.getData().getChangeUserSid(); + isChange = true; + } + } } } ResultBean> latestTasksNew = flowTaskService.getLatestTasksNew(processInstance.getId()); From fb4c802d98fcafbb682fba6d3ad605abf245cdf3 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 19 Jun 2023 18:17:38 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java | 3 +-- .../flowable/biz/flowdefinition/FlowDefinitionService.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index f123c537bd..bb32b92003 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -469,8 +469,7 @@ public class FlowableRest implements FlowableFeign { processCommentDto.setContent("交"+changeName+"转办"); } processCommentDto.setTime(new Date()); - processCommentDto.setProcessId(dto.getModelId()); - processCommentDto.setProcessInstSid(dto.getInstanceId()); + processCommentDto.setProcessId(dto.getInstanceId()); processCommentService.saveOrUpdateDto(processCommentDto); } taskService.setAssignee(id_, nextUserSid); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java index ac6a9217ff..d56cd4c6f3 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java @@ -250,8 +250,7 @@ public class FlowDefinitionService extends FlowServiceFactory { processCommentDto.setContent("交"+changeName+"转办"); } processCommentDto.setTime(new Date()); - processCommentDto.setProcessId(procDefId); - processCommentDto.setProcessInstSid(processInstance.getProcessInstanceId()); + processCommentDto.setProcessId(processInstance.getProcessInstanceId()); processCommentService.saveOrUpdateDto(processCommentDto); } taskService.setAssignee(id_,nextNodeUserSids); From b33e309c977fd20e8c11fe1f6ea2908846f5dee1 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 20 Jun 2023 08:55:17 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=8C=85=E4=BA=A4=E6=8E=A5=E3=80=81PC=E4=BA=A4?= =?UTF-8?q?=E8=BD=A6=E5=8A=9E=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDiscountpackageHandoverFeign.java | 20 ++- ...sDiscountpackageHandoverFeignFallback.java | 19 ++- .../app/AppBusDiscountpackageHandoverVo.java | 19 ++- ...ppBusDiscountpackageHandoversDetailVo.java | 52 ++++++ .../AppBusDiscountpackageHandoversListVo.java | 29 ++++ .../app/AppUploadPicture.java | 17 ++ .../api/bushandover/BusHandoverVos.java | 3 +- .../BusDiscountpackageHandoverMapper.java | 2 + .../BusDiscountpackageHandoverMapper.xml | 32 ++-- .../BusDiscountpackageHandoverRest.java | 19 ++- .../BusDiscountpackageHandoverService.java | 150 +++++++++++++++--- .../biz/bushandover/BusHandoverMapper.xml | 4 +- .../BusVehicleInformationHandoverService.java | 1 - .../FinVehicleInvoiceExportVo.java | 5 + .../FinVehicleInvoiceFeign.java | 4 +- .../FinVehicleInvoiceFeignFallback.java | 2 +- ...UncollectedReceivablesDetailedService.java | 14 +- .../FinVehicleInvoiceMapper.java | 22 +-- .../FinVehicleInvoiceMapper.xml | 58 +++++-- .../FinVehicleInvoiceRest.java | 50 +++--- .../FinVehicleInvoiceService.java | 108 +++++++------ .../AppBusDiscountpackageHandoversVo.java | 16 +- .../AppDiscountPackageHandoverFegin.java | 24 ++- ...pDiscountPackageHandoverFeginFallback.java | 21 +++ .../BusDiscountpackageHandoverInitVo.java | 50 ++++++ .../BusDiscountpackageHandoversDetailVo.java | 51 ++++++ .../BusDiscountpackageHandoversListVo.java | 26 +++ .../UploadPicture.java | 17 ++ .../AppDiscountPackageHandoverRest.java | 26 ++- .../AppDiscountPackageHandoverService.java | 59 ++++++- 30 files changed, 738 insertions(+), 182 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversDetailVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversListVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppUploadPicture.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoverInitVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversDetailVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversListVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/UploadPicture.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java index 3a32cdb6f4..88ab631b06 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java @@ -1,8 +1,6 @@ package com.yxt.anrui.buscenter.api.busdiscountpackagehandover; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -83,4 +81,20 @@ public interface BusDiscountpackageHandoverFeign { @PostMapping("/appUploadPicture") public ResultBean appUploadPicture(@RequestBody AppBusDiscountpackageHandoverDto dto); + @ApiOperation("移动端详情页") + @GetMapping("/getDiscountPackageHandoverDetail/{sid}") + @ResponseBody + ResultBean getDiscountPackageHandoverDetail(@PathVariable("sid") String sid); + + @ApiOperation("移动端交接操作") + @PostMapping("/confirmPackageHandover") + @ResponseBody + public ResultBean confirmPackageHandover(@RequestBody AppBusDiscountpackageHandoverDto dto); + + + @ApiOperation("保存优惠包交接照片") + @PutMapping("/saveConfirmPackageHandoverImg") + @ResponseBody + public ResultBean> saveConfirmPackageHandoverImg(@RequestBody AppUploadPicture uploadPicture); + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java index eb1bf1de1f..35c9d93dff 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java @@ -1,8 +1,6 @@ package com.yxt.anrui.buscenter.api.busdiscountpackagehandover; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -81,5 +79,20 @@ public class BusDiscountpackageHandoverFeignFallback implements BusDiscountpacka return null; } + @Override + public ResultBean getDiscountPackageHandoverDetail(String sid) { + return null; + } + + @Override + public ResultBean confirmPackageHandover(AppBusDiscountpackageHandoverDto dto) { + return null; + } + + @Override + public ResultBean> saveConfirmPackageHandoverImg(AppUploadPicture uploadPicture) { + return null; + } + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java index 6fe71de522..a8b5f6493f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java @@ -33,13 +33,16 @@ public class AppBusDiscountpackageHandoverVo implements Vo { private String model; // 车型名称 @ApiModelProperty("车辆台数") private String carNum; // 车辆台数 - @ApiModelProperty("优惠包数量") - private String discountNum; // 优惠包数量 - @ApiModelProperty("优惠包总价值") - private String price; // 接收人电话 - @ApiModelProperty("办理显示") - private Boolean showHandleBtn; // 办理显示 - @ApiModelProperty("上传显示") - private Boolean showUploadBtn; // 上传显示 + @ApiModelProperty("移交人") + private String receiveName; // 接收人姓名 + @ApiModelProperty("移交人电话") + private String receivePhone; // 接收人电话 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("接收时间") + private Date receiveDate; // 接收时间 + @ApiModelProperty("待交接显示") + private Boolean showHandleBtn; // 待交接显示 + @ApiModelProperty("已交接显示") + private Boolean showUploadBtn; // 已交接显示 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversDetailVo.java new file mode 100644 index 0000000000..107545d285 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversDetailVo.java @@ -0,0 +1,52 @@ +package com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/19 11:15 + */ +@Data +public class AppBusDiscountpackageHandoversDetailVo implements Vo { + + private String sid; + private String orgPath; + @ApiModelProperty("userSid") + private String userSid; // userSid + @ApiModelProperty("合同编号") + private String contractId; // 合同编号 + @ApiModelProperty("车型名称") + private String model; // 车型名称 + @ApiModelProperty("车辆台数") + private String carNumber; // 车辆台数 + @ApiModelProperty("车架号") + private String vins; // 车架号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("接收人姓名") + private String recName; // 接收人姓名 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("接收时间") + private Date recTime; // 接收时间 + @ApiModelProperty("接收备注") + private String remarks; // 接收备注 + @ApiModelProperty("移交备注") + private String remarks2; // 移交备注 + @ApiModelProperty("优惠包交接优惠包列表") + private List discountPackageList; + @ApiModelProperty("业务关联附件表") + private List busFiles = new ArrayList<>(); + private String modelOrgPath; // + private String modelSid; // + private String configSid; // + private String saleOrderSid; // + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversListVo.java new file mode 100644 index 0000000000..d030872b8c --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversListVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @author Administrator + * @description + * @date 2023/6/19 11:44 + */ +@Data +public class AppBusDiscountpackageHandoversListVo implements Vo { + @ApiModelProperty("sid") + private String discountSid; // sid + @ApiModelProperty("价值") + private String price; // 价值 + @ApiModelProperty("数量") + private String number; // 数量 + @ApiModelProperty("优惠包说明") + private String explain; // 优惠包说明 + @ApiModelProperty("总价值") + private String totalPrice; // 总价值 + @ApiModelProperty("优惠包名称") + private String discountName; // 优惠包名 +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppUploadPicture.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppUploadPicture.java new file mode 100644 index 0000000000..6153ccc3a4 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppUploadPicture.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/19 14:39 + */ +@Data +public class AppUploadPicture { + private String sid; + private List imgs = new ArrayList<>(); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVos.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVos.java index ff5c429b67..072c42c156 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVos.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVos.java @@ -39,5 +39,6 @@ public class BusHandoverVos implements Vo { private Boolean showGcDownload; @ApiModelProperty("挂车确认按钮") private boolean showGcBtn2; - + private String procDefId; + private String procInstId; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java index 93a58550db..a5a378b711 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandover; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverVo; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoversDetailVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -23,6 +24,7 @@ public interface BusDiscountpackageHandoverMapper extends BaseMapper selectAppPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + AppBusDiscountpackageHandoversDetailVo getDiscountPackageHandoverDetail(String sid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml index 1085c9f724..f1aaa7d27d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml @@ -34,22 +34,30 @@ customerName, vehModel AS model, vehCount AS carNum, - recName, - recPhone, - recTime, - CASE - `state` - WHEN 1 THEN - '待准备' - WHEN 2 THEN - '待交接' - WHEN 3 THEN - '已交接' - END AS nodeState + recTime as receiveDate, + transferName as receiveName, + transferPhone as receivePhone, + transferStateValue as nodeState FROM bus_discountpackage_handover ${ew.sqlSegment} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java index e4cc8ac6cc..2a4b81b514 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java @@ -1,9 +1,7 @@ package com.yxt.anrui.buscenter.biz.busdiscountpackagehandover; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.*; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -118,4 +116,19 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove busDiscountpackageHandoverService.appUploadPicture(dto); return rb.success(); } + + @Override + public ResultBean getDiscountPackageHandoverDetail(String sid) { + return busDiscountpackageHandoverService.getDiscountPackageHandoverDetail(sid); + } + + @Override + public ResultBean confirmPackageHandover(AppBusDiscountpackageHandoverDto dto) { + return busDiscountpackageHandoverService.confirmPackageHandover(dto); + } + + @Override + public ResultBean> saveConfirmPackageHandoverImg(AppUploadPicture uploadPicture) { + return busDiscountpackageHandoverService.saveConfirmPackageHandoverImg(uploadPicture); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java index 9e03afcfc8..626708bfde 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java @@ -8,14 +8,14 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.*; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverListDto; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.*; import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList; import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo; import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService; import com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListService; +import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo; import com.yxt.anrui.portal.api.sysrole.SysRoleFeign; import com.yxt.anrui.portal.api.sysrole.SysRoleVo; @@ -45,6 +45,7 @@ import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * @author Administrator @@ -72,6 +73,9 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); @@ -597,11 +601,14 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService wrapper.like("contractNo", query.getName()).or().like("customerName", query.getName())); } @@ -633,12 +640,12 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService buscenterFiles = buscenterFileService.selectByLinkSid(record.getSid(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); if (buscenterFiles.size() > 0) { @@ -646,25 +653,26 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService listByMainSid = busDiscountpackageHandoverListService.findListByMainSid(record.getSid()); - if (listByMainSid.size() > 0) { - BigDecimal price = new BigDecimal(0); - int discountNum = 0; - for (BusDiscountpackageHandoverList handoverList : listByMainSid) { - if (null != handoverList) { - //优惠包数量 - String number = handoverList.getNumber(); - discountNum = discountNum + Integer.valueOf(number); - BigDecimal totalPrice = handoverList.getTotalPrice(); - price = price.add(totalPrice); - } - } - record.setDiscountNum(String.valueOf(discountNum)); - record.setPrice(String.valueOf(price)); } +// List listByMainSid = busDiscountpackageHandoverListService.findListByMainSid(record.getSid()); +// if (listByMainSid.size() > 0) { +// BigDecimal price = new BigDecimal(0); +// int discountNum = 0; +// for (BusDiscountpackageHandoverList handoverList : listByMainSid) { +// if (null != handoverList) { +// //优惠包数量 +// String number = handoverList.getNumber(); +// discountNum = discountNum + Integer.valueOf(number); +// BigDecimal totalPrice = handoverList.getTotalPrice(); +// price = price.add(totalPrice); +// } +// } +// record.setDiscountNum(String.valueOf(discountNum)); +// record.setPrice(String.valueOf(price)); +// } } } PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -802,4 +810,94 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService getDiscountPackageHandoverDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppBusDiscountpackageHandoversDetailVo vo = baseMapper.getDiscountPackageHandoverDetail(sid); + List listVos = new ArrayList<>(); + List filePath = new ArrayList<>(); + if (null != vo) { + List listByMainSid = busDiscountpackageHandoverListService.findListByMainSid(sid); + listByMainSid.removeAll(Collections.singleton(null)); + if (!listByMainSid.isEmpty()) { + for (BusDiscountpackageHandoverList handoverList : listByMainSid) { + AppBusDiscountpackageHandoversListVo handoversListVo = new AppBusDiscountpackageHandoversListVo(); + handoversListVo.setDiscountSid(sid); + handoversListVo.setExplain(handoverList.getPackageExplain()); + handoversListVo.setNumber(handoverList.getNumber()); + handoversListVo.setTotalPrice(String.valueOf(handoverList.getTotalPrice())); + handoversListVo.setPrice(String.valueOf(handoverList.getPrice())); + handoversListVo.setDiscountName(handoverList.getDiscountName()); + listVos.add(handoversListVo); + } + } + vo.setDiscountPackageList(listVos); + List fileList = buscenterFileService.selectByLinkSid(sid, BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List handoverImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + vo.setBusFiles(handoverImages); + } + if (StringUtils.isNotBlank(vo.getContractId())) { + CommonContract contract = commonContractFeign.selectByNo(vo.getContractId()).getData(); + if (null != contract) { + if (StringUtils.isNotBlank(contract.getBusSid())) { + vo.setSaleOrderSid(contract.getBusSid()); + } + if (StringUtils.isNotBlank(contract.getModelSid())) { + vo.setModelSid(contract.getModelSid()); + } + if (StringUtils.isNotBlank(contract.getConfigSid())) { + vo.setConfigSid(contract.getConfigSid()); + } + } + } + if (StringUtils.isNotBlank(vo.getSaleOrderSid())) { + BusSalesOrderDetailsVo orderDetailsVo = busSalesOrderService.fetchDetailsVoBySid(vo.getSaleOrderSid()).getData(); + if (null != orderDetailsVo) { + String orgSidPath = orderDetailsVo.getOrgSidPath(); + vo.setModelOrgPath(orgSidPath); + } + } + } + return rb.success().setData(vo); + } + + + public ResultBean confirmPackageHandover(AppBusDiscountpackageHandoverDto dto) { + ResultBean rb = ResultBean.fireFail(); + BusDiscountpackageHandover entity = fetchBySid(dto.getSid()); + if (StringUtils.isNotBlank(dto.getRemarks())) { + entity.setRemarks(dto.getRemarks()); + } + entity.setRecTime(new Date()); + entity.setTransferStateValue("已移交"); + entity.setTransferStateKey("004"); + baseMapper.updateById(entity); + return rb.success(); + } + + public ResultBean> saveConfirmPackageHandoverImg(AppUploadPicture uploadPicture) { + ResultBean rb = ResultBean.fireFail(); + buscenterFileService.delByLinkSidOrType(uploadPicture.getSid(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); + List imgs = uploadPicture.getImgs(); + if (!imgs.isEmpty()) { + buscenterFileService.saveAll(uploadPicture.getSid(), imgs, BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); + } + List fileList = buscenterFileService.selectByLinkSid(uploadPicture.getSid(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + List handoverImages = new ArrayList<>(); + if (!fileList.isEmpty()) { + handoverImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + } + return rb.success().setData(handoverImages); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml index fe327d7665..90c367a32f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml @@ -129,7 +129,9 @@ bh.carNum, bh.nodeState, bh.filePath, - bh.trailerFilePath + bh.trailerFilePath, + bh.procDefId, + bh.procInstId from bus_handover bh ${ew.sqlSegment} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java index 6c310ef7b7..8155b4e016 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java @@ -262,7 +262,6 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java index 747a7c526b..9f0de5ef10 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java @@ -1,4 +1,5 @@ package com.yxt.anrui.fin.api.finvehicleinvoice; + import com.yxt.common.core.utils.ExportEntityMap; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; @@ -20,6 +21,8 @@ public class FinVehicleInvoiceExportVo implements Vo { private String transferState; @ExportEntityMap(CnName = "业务状态", EnName = "businessState") private String businessState; + @ExportEntityMap(CnName = "是否领票", EnName = "isTakeTicket") + private String isTakeTicket; @ExportEntityMap(CnName = "开票单位", EnName = "invoiceTitle") private String invoiceTitle; @ExportEntityMap(CnName = "开票类型", EnName = "invoiceType") @@ -38,5 +41,7 @@ public class FinVehicleInvoiceExportVo implements Vo { private String createTime; @ExportEntityMap(CnName = "发票代码", EnName = "invoiceCode") private String invoiceCode; + @ExportEntityMap(CnName = "发票号", EnName = "invoiceNo") + private String invoiceNo; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java index bd638d8149..78209173ee 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java @@ -66,7 +66,7 @@ public interface FinVehicleInvoiceFeign { @PostMapping("/exportExcel") @ApiOperation(value = "车辆发票信息列表导出") @ResponseBody - public void exportExcel(@RequestBody FinVehicleInvoiceQuery query); + public void exportExcel(@RequestBody FinVehicleInvoiceQuery pq); @ApiOperation("作废") @PostMapping("/cancellation") @@ -113,4 +113,6 @@ public interface FinVehicleInvoiceFeign { @GetMapping("/selectByVinAndContractNo") @ResponseBody ResultBean selectByVinAndContractNo(@RequestParam("vinSid") String vinSid, @RequestParam("contractNo") String contractNo); + + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java index a41deec5a7..57b8819a3d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java @@ -70,7 +70,7 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign { } @Override - public void exportExcel(FinVehicleInvoiceQuery query) { + public void exportExcel(FinVehicleInvoiceQuery pq) { } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index da784e9d03..abab231fc6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -382,7 +382,9 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService privilegeQuery.setMenuUrl(params.getMenuUrl()); privilegeQuery.setUserSid(params.getCreateBySid()); ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if(StringUtils.isNotBlank(defaultIdReltBean.getData())){ + String data1 = defaultIdReltBean.getData(); + System.out.println(data1); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) orgPath = orgPath + "/"; int i1 = orgPath.indexOf("/"); @@ -402,13 +404,13 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService } else if ("4".equals(orgLevelKey)) { orgPath = orgPath.substring(0, i4); qw.like("orgSidPath", orgPath); - } else if("5".equals(orgLevelKey)){ - qw.eq("createBySid",params.getCreateBySid()); - }else{ + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", params.getCreateBySid()); + } else { PagerVo p = new PagerVo<>(); return p; } - }else{ + } else { PagerVo p = new PagerVo<>(); return p; } @@ -870,7 +872,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService for (int i = 0; i < receiveSeleteVoList.size(); i++) { ReceiveSeleteVo receiveSeleteVo = receiveSeleteVoList.get(i); BigDecimal subscriptionMoneyAll = BigDecimal.ZERO; - if(StringUtils.isNotBlank(receiveSeleteVo.getSubscriptionMoneyAll())){ + if (StringUtils.isNotBlank(receiveSeleteVo.getSubscriptionMoneyAll())) { subscriptionMoneyAll = new BigDecimal(receiveSeleteVo.getSubscriptionMoneyAll()); } BigDecimal notSubscriptionMoney = new BigDecimal(receiveSeleteVo.getReveivableMoney()).subtract(subscriptionMoneyAll); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java index dab1820df5..eb8ed7f8d7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java @@ -29,22 +29,22 @@ import java.util.List; @Mapper public interface FinVehicleInvoiceMapper extends BaseMapper { - //@Update("update fin_vehicle_invoice set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + //@Update("update fin_vehicle_invoice set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List selectListVo(); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selByExcel(@Param(Constants.WRAPPER)QueryWrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid); + List selectListVo(); + + List selByExcel(@Param(Constants.WRAPPER) QueryWrapper qw); + + FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid); FinVehicleInvoice selectByVinSid(String vinSid); - int cancellation(@Param("sid")String sid); + int cancellation(@Param("sid") String sid); FinInvoiceInformationVo invoiceInformation(@Param("sid") String sid); @@ -61,7 +61,7 @@ public interface FinVehicleInvoiceMapper extends BaseMapper { FinVehicleInvoice selectByVinSidss(String vinSid); @Update("update fin_vehicle_invoice set transferStateKey = #{code},transferState = #{remarks} where sid = #{sid}") - void updateTransferState(@Param("sid") String sid,@Param("code") String code,@Param("remarks") String remarks); + void updateTransferState(@Param("sid") String sid, @Param("code") String code, @Param("remarks") String remarks); FinVehicleInvoice selectByVinAndContractNo(@Param("vinSid") String vinSid, @Param("contractNo") String contractNo); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml index c14250e79b..16a90f3f52 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml @@ -104,26 +104,46 @@ + - SELECT DISTINCT - billingState, - transferState, - businessState, - invoiceTitle, - invoiceType, - contractNo, - customerName, - VIN, - invoicingName, - invoiceAmount, - createTime, - invoiceCode - FROM fin_vehicle_invoice + v.useOrgSid, + v.sid, + v.`state`, + v.billingStateKey, + v.billingState, + v.businessStateKey, + v.businessState, + v.transferStateKey, + v.transferState, + v.invoiceTitle, + v.invoiceType, + v.invoiceTypeKey, + v.contractNo, + v.customerName, + v.VIN as vinNo, + v.invoicingName, + v.invoiceAmount, + v.invoiceDate as createTime, + v.invoiceCode, + v.invoiceNo, + v.filePath, + v.address, + v.telPhone, + v.openingBank, + v.bankNum, + v.recipient, + v.transferTime, + so.orgSidPath, + v.isTakeTicket + FROM fin_vehicle_invoice as v + left join anrui_portal.sys_organization so on v.useOrgSid = so.sid ${ew.sqlSegment} + ORDER BY v.billingStateKey ASC,v.invoiceDate DESC @@ -223,7 +243,10 @@ \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java index b409011201..b795aceae8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java @@ -20,6 +20,7 @@ import java.net.URLEncoder; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -155,32 +156,35 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign { } @Override - public void exportExcel(FinVehicleInvoiceQuery query) { - //得到所有要导出的数据 - List invoiceExportVoList = finVehicleInvoiceService.listExcel(query); + public void exportExcel(FinVehicleInvoiceQuery pq) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - for (FinVehicleInvoiceExportVo invoiceExportVo : invoiceExportVoList) { - if (StringUtils.isNotBlank(invoiceExportVo.getCreateTime())) { - String createTime = invoiceExportVo.getCreateTime(); - try { - Date date = sdf.parse(createTime); - String createTimeBySdf = sdf.format(date); - invoiceExportVo.setCreateTime(createTimeBySdf); - } catch (ParseException e) { - e.printStackTrace(); + //得到所有要导出的数据 + List records = finVehicleInvoiceService.listExcel(pq); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) { + for (FinVehicleInvoiceExportVo invoiceExportVo : records) { + if (StringUtils.isNotBlank(invoiceExportVo.getCreateTime())) { + String createTime = invoiceExportVo.getCreateTime(); + try { + Date date = sdf.parse(createTime); + String createTimeBySdf = sdf.format(date); + invoiceExportVo.setCreateTime(createTimeBySdf); + } catch (ParseException e) { + e.printStackTrace(); + } } } + //定义导出的excel名字 + String excelName = "开票管理列表"; + String fileNameURL = ""; + try { + fileNameURL = URLEncoder.encode(excelName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + //导出车辆管理列表 + ExportExcelUtils.export(fileNameURL, records, FinVehicleInvoiceExportVo.class, response); } - //定义导出的excel名字 - String excelName = "车辆发票信息列表"; - String fileNameURL = ""; - try { - fileNameURL = URLEncoder.encode(excelName, "UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - //导出车辆管理列表 - ExportExcelUtils.export(fileNameURL, invoiceExportVoList, FinVehicleInvoiceExportVo.class, response); } @Override @@ -237,7 +241,7 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign { @Override public ResultBean selectByVinAndContractNo(String vinSid, String contractNo) { - return finVehicleInvoiceService.selectByVinAndContractNo(vinSid,contractNo); + return finVehicleInvoiceService.selectByVinAndContractNo(vinSid, contractNo); } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index 0ac89eda55..6f8c948b67 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -38,10 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Project: anrui-fin(财务管理)
@@ -157,8 +154,8 @@ public class FinVehicleInvoiceService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (v.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (v.invoiceDate,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (v.invoiceDate,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); return qw; } @@ -195,57 +192,74 @@ public class FinVehicleInvoiceService extends MybatisBaseService listExcel(FinVehicleInvoiceQuery query) { + QueryWrapper qw = new QueryWrapper<>(); - qw.eq("isDelete", "0"); + qw.eq("v.isDelete", "0"); + //层级筛选 + String orgSidPath = query.getOrgSidPath(); + SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData(); + String orgLevelKey = data.getOrgLevelKey(); + if ("2".equals(orgLevelKey)) { + String[] split = orgSidPath.split("/"); + String s = split[0] + "/" + split[1]; + // orgSidPath = orgSidPath.substring(0, 73); + qw.like("so.orgSidPath", s); + } else if ("3".equals(orgLevelKey)) { + qw.eq("v.useOrgSid", query.getCreateOrgSid()); + } + if (StringUtils.isNotBlank(query.getInvoiceTitle())) { - qw.like("invoiceTitle", query.getInvoiceTitle()); + qw.like("v.invoiceTitle", query.getInvoiceTitle()); } if (StringUtils.isNotBlank(query.getInvoiceType())) { - qw.like("invoiceType", query.getInvoiceType()); + qw.like("v.invoiceType", query.getInvoiceType()); } if (StringUtils.isNotBlank(query.getInvoiceTypeKey())) { - qw.like("invoiceTypeKey", query.getInvoiceTypeKey()); + qw.like("v.invoiceTypeKey", query.getInvoiceTypeKey()); } if (StringUtils.isNotBlank(query.getContractNo())) { - qw.like("contractNo", query.getContractNo()); + qw.like("v.contractNo", query.getContractNo()); } if (StringUtils.isNotBlank(query.getCustomerName())) { - qw.like("customerName", query.getCustomerName()); + qw.like("v.customerName", query.getCustomerName()); } if (StringUtils.isNotBlank(query.getVinNo())) { - qw.like("VIN", query.getVinNo()); + qw.like("v.VIN", query.getVinNo()); } if (StringUtils.isNotBlank(query.getTransferState())) { - qw.eq("transferState", query.getTransferState()); + qw.eq("v.transferState", query.getTransferState()); } if (StringUtils.isNotBlank(query.getBillingState())) { - qw.eq("billingState", query.getBillingState()); + qw.eq("v.billingState", query.getBillingState()); } if (StringUtils.isNotBlank(query.getTransferStateKey())) { - qw.eq("transferStateKey", query.getTransferStateKey()); + qw.eq("v.transferStateKey", query.getTransferStateKey()); } if (StringUtils.isNotBlank(query.getBillingStateKey())) { - qw.eq("billingStateKey", query.getBillingStateKey()); + qw.eq("v.billingStateKey", query.getBillingStateKey()); } if (StringUtils.isNotBlank(query.getInvoicingName())) { - qw.like("invoicingName", query.getInvoicingName()); + qw.like("v.invoicingName", query.getInvoicingName()); } if (StringUtils.isNotBlank(query.getInvoiceCode())) { - qw.like("invoiceCode", query.getInvoiceCode()); + qw.like("v.invoiceCode", query.getInvoiceCode()); } String createStartTime = query.getCreateStartTime(); String createEndTime = query.getCreateEndTime(); - qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (v.invoiceDate,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (v.invoiceDate,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); - qw.orderByDesc("createTime"); - List invoiceExportVoList = baseMapper.selByExcel(qw); - int id = 1; - for (FinVehicleInvoiceExportVo invoiceExportVo : invoiceExportVoList) { - invoiceExportVo.setRankNo(id); - id = id + 1; - } - return invoiceExportVoList; + + List records = baseMapper.selByExcel(qw); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) { + int id = 1; + for (FinVehicleInvoiceExportVo invoiceExportVo : records) { + invoiceExportVo.setRankNo(id); + id = id + 1; + } + } + return records; } public FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid) { @@ -395,7 +409,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService selectByVinSids(String vinSid) { ResultBean rb = ResultBean.fireFail(); VehicleInvoiceVo vehicleInvoiceVo = baseMapper.selectByVinSids(vinSid); - if(StringUtils.isNotBlank(vehicleInvoiceVo.getFilePath())){ + if (StringUtils.isNotBlank(vehicleInvoiceVo.getFilePath())) { List filePathList = Arrays.asList(vehicleInvoiceVo.getFilePath().split(",")); vehicleInvoiceVo.setInvoiceImages(filePathList); } @@ -423,10 +437,10 @@ public class FinVehicleInvoiceService extends MybatisBaseService finBillFileVos = finBillFileService.fetchFileByBillSid(billingSid); String transferFilesString = ""; - if (!finBillFileVos.isEmpty()){ + if (!finBillFileVos.isEmpty()) { for (FinBillFileVo finBillFileVo : finBillFileVos) { transferFilesString = transferFilesString + finBillFileVo.getFileUrl() + ","; } } - if (StringUtils.isNotBlank(transferFilesString)){ - busTransferRecordsDto.setTransferFiles(transferFilesString.substring(0,transferFilesString.length() - 1)); + if (StringUtils.isNotBlank(transferFilesString)) { + busTransferRecordsDto.setTransferFiles(transferFilesString.substring(0, transferFilesString.length() - 1)); } busTransferRecordsFeign.saveRecords(busTransferRecordsDto); //消息推送 @@ -501,8 +515,8 @@ public class FinVehicleInvoiceService extends MybatisBaseService selectByVinAndContractNo(String vinSid, String contractNo) { ResultBean rb = ResultBean.fireFail(); - FinVehicleInvoice finVehicleInvoice = baseMapper.selectByVinAndContractNo(vinSid,contractNo); + FinVehicleInvoice finVehicleInvoice = baseMapper.selectByVinAndContractNo(vinSid, contractNo); return rb.success().setData(finVehicleInvoice); } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java index e6750f8c12..9a38109d55 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java @@ -21,7 +21,7 @@ public class AppBusDiscountpackageHandoversVo implements Vo { @ApiModelProperty("销售订单sid") private String salesOrderSid; // 销售订单sid @ApiModelProperty("交接状态 1待准备，2待交接，3已交接") - private String nodeSate; // 交接状态 + private String nodeState; // 交接状态 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createDate; // 合同编号 @@ -33,13 +33,17 @@ public class AppBusDiscountpackageHandoversVo implements Vo { private String model; // 车型名称 @ApiModelProperty("车辆台数") private String carNum; // 车辆台数 - @ApiModelProperty("接收人姓名") - private String recName; // 接收人姓名 - @ApiModelProperty("接收人电话") - private String recPhone; // 接收人电话 + @ApiModelProperty("移交人") + private String receiveName; // 接收人姓名 + @ApiModelProperty("移交人电话") + private String receivePhone; // 接收人电话 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("接收时间") + private Date receiveDate; // 接收时间 @ApiModelProperty("待交接显示") private Boolean showHandleBtn; // 待交接显示 @ApiModelProperty("已交接显示") - private Boolean showDownloadBtn; // 已交接显示 + private Boolean showUploadBtn; // 已交接显示 + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java index 1b7332070e..4fb9fbaec1 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.*; import java.lang.reflect.InvocationTargetException; import java.text.ParseException; +import java.util.List; /** * @author Administrator @@ -31,9 +32,20 @@ public interface AppDiscountPackageHandoverFegin { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); - @ApiOperation("移动端优惠包交接详情编辑回显") + @ApiOperation("移动端优惠包交接详情") + @GetMapping("/getDiscountPackageHandoverDetail") + @ResponseBody + public ResultBean getDiscountPackageHandoverDetail(@RequestParam("sid") String sid); + + + @ApiOperation("编辑初始化") @GetMapping("/getDiscountHandoverInfo/{sid}") @ResponseBody + public ResultBean getDiscountHandoverInitInfo(@PathVariable("sid") String sid); + + @ApiOperation("移动端优惠包交接详情编辑回显") + @GetMapping("/getDiscountHandoverInfor/{sid}") + @ResponseBody public ResultBean getDiscountHandoverInfo(@PathVariable("sid") String sid) throws InvocationTargetException, IllegalAccessException; @ApiOperation("移动端交接操作") @@ -46,5 +58,15 @@ public interface AppDiscountPackageHandoverFegin { @ResponseBody public ResultBean uploadPicture(@RequestBody AppBusDiscountpackageHandoversDto dto) throws InvocationTargetException, IllegalAccessException; + @ApiOperation("移动端交接操作") + @PostMapping("/confirmPackageHandover") + @ResponseBody + public ResultBean confirmPackageHandover(@RequestBody AppBusDiscountpackageHandoversDto dto); + + + @ApiOperation("保存优惠包交接照片") + @PutMapping("/saveConfirmPackageHandoverImg") + @ResponseBody + public ResultBean> confirmPackageHandoverImg(@RequestBody UploadPicture uploadPicture); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFeginFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFeginFallback.java index 3523aa0ed5..fe0e7bc79e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFeginFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFeginFallback.java @@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo; import java.lang.reflect.InvocationTargetException; import java.text.ParseException; +import java.util.List; /** * @author Administrator @@ -18,6 +19,16 @@ public class AppDiscountPackageHandoverFeginFallback implements AppDiscountPacka return null; } + @Override + public ResultBean getDiscountPackageHandoverDetail(String sid) { + return null; + } + + @Override + public ResultBean getDiscountHandoverInitInfo(String sid) { + return null; + } + @Override public ResultBean getDiscountHandoverInfo(String sid) { return null; @@ -32,4 +43,14 @@ public class AppDiscountPackageHandoverFeginFallback implements AppDiscountPacka public ResultBean uploadPicture(AppBusDiscountpackageHandoversDto dto) { return null; } + + @Override + public ResultBean confirmPackageHandover(AppBusDiscountpackageHandoversDto dto) { + return null; + } + + @Override + public ResultBean> confirmPackageHandoverImg(UploadPicture uploadPicture) { + return null; + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoverInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoverInitVo.java new file mode 100644 index 0000000000..e3339b1bbc --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoverInitVo.java @@ -0,0 +1,50 @@ +package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/19 13:43 + */ +@Data +public class BusDiscountpackageHandoverInitVo implements Vo { + private String sid; + private String orgPath; + @ApiModelProperty("userSid") + private String userSid; // userSid + @ApiModelProperty("合同编号") + private String contractId; // 合同编号 + @ApiModelProperty("车型名称") + private String model; // 车型名称 + @ApiModelProperty("车辆台数") + private String carNumber; // 车辆台数 + @ApiModelProperty("车架号") + private String vins; // 车架号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("接收人姓名") + private String recName; // 接收人姓名 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("接收时间") + private Date recTime; // 接收时间 + @ApiModelProperty("移交备注") + private String remarks; // 移交备注 + @ApiModelProperty("接收备注") + private String remarks2; // 接收备注 + @ApiModelProperty("优惠包交接优惠包列表") + private List discountPackageList; + @ApiModelProperty("业务关联附件表") + private List busFiles = new ArrayList<>(); + private String modelOrgPath; // + private String modelSid; // + private String configSid; // + private String saleOrderSid; // +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversDetailVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversDetailVo.java new file mode 100644 index 0000000000..75eb0d7941 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversDetailVo.java @@ -0,0 +1,51 @@ +package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/19 10:39 + */ +@Data +public class BusDiscountpackageHandoversDetailVo implements Vo { + + private String sid; + private String orgPath; + @ApiModelProperty("userSid") + private String userSid; // userSid + @ApiModelProperty("合同编号") + private String contractId; // 合同编号 + @ApiModelProperty("车型名称") + private String model; // 车型名称 + @ApiModelProperty("车辆台数") + private String carNumber; // 车辆台数 + @ApiModelProperty("车架号") + private String vins; // 车架号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("接收人姓名") + private String recName; // 接收人姓名 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("接收时间") + private Date recTime; // 接收时间 + @ApiModelProperty("接收备注") + private String remarks; // 接收备注 + @ApiModelProperty("移交备注") + private String remarks2; // 移交备注 + @ApiModelProperty("优惠包交接优惠包列表") + private List discountPackageList; + @ApiModelProperty("业务关联附件表") + private List busFiles = new ArrayList<>(); + private String saleOrderSid; // + private String modelOrgPath; // + private String modelSid; // + private String configSid; // +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversListVo.java new file mode 100644 index 0000000000..80b30a6328 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversListVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/6/19 12:02 + */ +@Data +public class BusDiscountpackageHandoversListVo implements Vo { + @ApiModelProperty("sid") + private String discountSid; // sid + @ApiModelProperty("价值") + private String price; // 价值 + @ApiModelProperty("数量") + private String number; // 数量 + @ApiModelProperty("优惠包说明") + private String explain; // 优惠包说明 + @ApiModelProperty("总价值") + private String totalPrice; // 总价值 + @ApiModelProperty("优惠包名称") + private String discountName; // 优惠包名 +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/UploadPicture.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/UploadPicture.java new file mode 100644 index 0000000000..82464b3fef --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/UploadPicture.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/19 14:36 + */ +@Data +public class UploadPicture { + private String sid; + private List imgs = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverRest.java index c4a9f19c60..0cb67f61c4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverRest.java @@ -1,9 +1,6 @@ package com.yxt.anrui.terminal.biz.autoservice.discountPackageHandover; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversDto; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversQuery; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversVo; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppDiscountPackageHandoverFegin; +import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -14,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController; import java.lang.reflect.InvocationTargetException; import java.text.ParseException; +import java.util.List; /** * @author Administrator @@ -34,6 +32,16 @@ public class AppDiscountPackageHandoverRest implements AppDiscountPackageHandove return appDiscountPackageHandoverService.listPage(pq); } + @Override + public ResultBean getDiscountPackageHandoverDetail(String sid) { + return appDiscountPackageHandoverService.getDiscountPackageHandoverDetail(sid); + } + + @Override + public ResultBean getDiscountHandoverInitInfo(String sid) { + return appDiscountPackageHandoverService.getDiscountHandoverInitInfo(sid); + } + @Override public ResultBean getDiscountHandoverInfo(String sid) throws InvocationTargetException, IllegalAccessException { return appDiscountPackageHandoverService.getDiscountHandoverInfo(sid); @@ -48,4 +56,14 @@ public class AppDiscountPackageHandoverRest implements AppDiscountPackageHandove public ResultBean uploadPicture(AppBusDiscountpackageHandoversDto dto) throws InvocationTargetException, IllegalAccessException { return appDiscountPackageHandoverService.uploadPicture(dto); } + + @Override + public ResultBean confirmPackageHandover(AppBusDiscountpackageHandoversDto dto) { + return appDiscountPackageHandoverService.confirmPackageHandover(dto); + } + + @Override + public ResultBean> confirmPackageHandoverImg(UploadPicture uploadPicture) { + return appDiscountPackageHandoverService.confirmPackageHandoverImg(uploadPicture); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java index dddfbeeace..bc518220fc 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java @@ -2,14 +2,11 @@ package com.yxt.anrui.terminal.biz.autoservice.discountPackageHandover; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.*; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverFeign; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversDto; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversQuery; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversVo; +import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.*; import com.yxt.anrui.terminal.config.CoverUtils; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -44,12 +41,12 @@ public class AppDiscountPackageHandoverService { public ResultBean> listPage(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); PagerQuery pq = new PagerQuery<>(); - BeanUtil.copyProperties(pagerQuery,pq); + BeanUtil.copyProperties(pagerQuery, pq); ResultBean> voResultBean = busDiscountpackageHandoverFeign.getDiscountHandoverList(pq); PagerVo vo = new PagerVo<>(); if (voResultBean.getSuccess()) { PagerVo data = voResultBean.getData(); - BeanUtil.copyProperties(data,vo); + BeanUtil.copyProperties(data, vo); } return rb.success().setData(vo); } @@ -100,4 +97,50 @@ public class AppDiscountPackageHandoverService { System.out.println(phDto); return busDiscountpackageHandoverFeign.appUploadPicture(phDto); } + + /** + * 移动端详情页 + * + * @param + * @return + */ + public ResultBean getDiscountPackageHandoverDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusDiscountpackageHandoversDetailVo vo = new BusDiscountpackageHandoversDetailVo(); + AppBusDiscountpackageHandoversDetailVo data = busDiscountpackageHandoverFeign.getDiscountPackageHandoverDetail(sid).getData(); + if (null != data) { + BeanUtil.copyProperties(data, vo); + } + return rb.success().setData(vo); + } + + public ResultBean confirmPackageHandover(AppBusDiscountpackageHandoversDto dto) { + ResultBean rb = ResultBean.fireFail(); + AppBusDiscountpackageHandoverDto handoverDto = new AppBusDiscountpackageHandoverDto(); + BeanUtil.copyProperties(dto, handoverDto); + busDiscountpackageHandoverFeign.confirmPackageHandover(handoverDto); + return rb.success(); + } + + public ResultBean getDiscountHandoverInitInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusDiscountpackageHandoverInitVo vo = new BusDiscountpackageHandoverInitVo(); + AppBusDiscountpackageHandoversDetailVo data = busDiscountpackageHandoverFeign.getDiscountPackageHandoverDetail(sid).getData(); + if (null != data) { + BeanUtil.copyProperties(data, vo); + } + return rb.success().setData(vo); + } + + public ResultBean> confirmPackageHandoverImg(UploadPicture uploadPicture) { + ResultBean> rb = ResultBean.fireFail(); + AppUploadPicture dtoApp = new AppUploadPicture(); + List strings = new ArrayList<>(); + BeanUtil.copyProperties(uploadPicture, dtoApp); + ResultBean> listResultBean = busDiscountpackageHandoverFeign.saveConfirmPackageHandoverImg(dtoApp); + if (listResultBean.getSuccess()) { + strings = listResultBean.getData(); + } + return rb.success().setData(strings); + } } From 2e8670fe05ee013fb1b5b145c38cd7c84c58137c Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 20 Jun 2023 09:50:40 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index efc5d70e9e..70464aa2e3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -16,6 +16,7 @@ bd.modelName, bd.billNo, bd.paymentMethod, + bd.createBySid, (select count(*) from bus_delivered_apply_details bad where bad.applySid = bd.sid) as num FROM bus_delivered_apply bd From dbf6e16e111e6b441bb63e56d9551c88f5c1cb6f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 20 Jun 2023 11:36:06 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleOutApplyVoNew.java | 14 ++++++++ .../BaseVehicleOutApplyService.java | 1 + .../api/bussalesorder/BusSalesOrderVo.java | 8 ----- .../app/order/AppBusSalesOrderVo.java | 20 +++++++++++ .../bussalesorder/app/order/OrderQuery.java | 11 ++++++ .../biz/bussalesorder/BusSalesOrderMapper.xml | 10 +++++- .../bussalesorder/BusSalesOrderService.java | 36 ++++++++++++++++--- .../FinVehicleInvoiceService.java | 10 +++++- 8 files changed, 96 insertions(+), 14 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java index 1ee41728c8..1d4dfda2a3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java @@ -110,4 +110,18 @@ public class BaseVehicleOutApplyVoNew implements Vo { private String vehModelConfigSid; @ApiModelProperty("车型配置简称") private String modelName; + + @ApiModelProperty("采购系统") + private String purchaseSystemName; + @ApiModelProperty("排产订单编号") + private String orderingNo; + @ApiModelProperty("订单状态") + private String nodeState; + @ApiModelProperty("贴息") + private String factoryDiscount; + @ApiModelProperty("中介返利") + private String distributorPriceAll; + @ApiModelProperty("开票类型") + private String kpType; } + diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java index 168ce4aa7f..867de9b5f8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java @@ -134,6 +134,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); //p.setTotal(countTotal); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java index e3661d87d6..abeec91f32 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderVo.java @@ -76,12 +76,4 @@ public class BusSalesOrderVo implements Vo { private String depositAll; @ApiModelProperty(value = "是否保险") private String isInsurance; - - //销售部门 - //申请人 - //申请日期 - //车型 - //提车方式 - - } 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 40abdf69af..83cec33f33 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 @@ -153,6 +153,7 @@ public class AppBusSalesOrderVo implements Vo { @ApiModelProperty(value = "合同编号") private String contractId; + @ApiModelProperty("销售顾问") private String saler; @ApiModelProperty("是否显示打印按钮") private boolean printOrderBtn; @@ -166,4 +167,23 @@ public class AppBusSalesOrderVo implements Vo { private String endTime; @ApiModelProperty("车架号显示") private String vinNo; + + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("采购系统") + private String purchaseSystemName; + @ApiModelProperty("车型小名") + private String modelName; + @ApiModelProperty("销售部门") + private String orgName; + @ApiModelProperty("采购订单sid") + private String linkSid; + @ApiModelProperty("排产订单编号") + private String orderingNo; + @ApiModelProperty("贴息") + private String factoryDiscount; + @ApiModelProperty("中介返利") + private String distributorPriceAll; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderQuery.java index 6efdd9df75..9ddfe75ba7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderQuery.java @@ -35,4 +35,15 @@ public class OrderQuery implements Query { private String createByDept; @ApiModelProperty("销售类型") private String saleTypeKey; + + @ApiModelProperty("销售人员") + private String saler; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("采购系统") + private String purchaseSystemName; + @ApiModelProperty("销售部门") + private String orgName; + @ApiModelProperty("中介返利") + private String distributorPriceAll; } 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 f8e84e77c1..4af3ce4c83 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 @@ -64,11 +64,19 @@ bo.contractNo as contractId, bo.staffName as saler, bo.procDefId, - bo.procInstId + bo.procInstId, + bo.useOrgSid, + bo.purchaseSystemName, + bo.orgName, + bm.modelName, + bsvo.linkSid, + bsos.distributorPriceAll FROM bus_sales_order bo left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid left join bus_sales_order_model bm on bm.salesOrderSid = bo.sid + left join bus_sales_vehicle_order bsvo on bsvo.salesOrderSid = bo.sid + left join bus_sales_order_submit bsos on bsos.salesOrderSid = bo.sid ${ew.sqlSegment} 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 af454f3cbf..ccb14b2243 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 @@ -5770,7 +5770,26 @@ public class BusSalesOrderService extends MybatisBaseService pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState); for (AppBusSalesOrderVo record : pagging.getRecords()) { @@ -5791,10 +5810,8 @@ public class BusSalesOrderService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index ef99330ff1..247d048404 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -3,6 +3,7 @@ package com.yxt.anrui.fin.biz.finvehicleinvoice; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; @@ -424,7 +425,14 @@ public class FinVehicleInvoiceService extends MybatisBaseService Date: Tue, 20 Jun 2023 14:45:28 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 132 ++++++++++-------- .../anrui/flowable/biz/flow/FlowableRest.java | 53 ++++--- .../biz/flowtask/FlowTaskService.java | 7 - .../AppFlowableRecordAndCommentVo.java | 2 + .../api/app/flowable/AppFlowableRecordVo.java | 1 - .../terminal/api/app/flowable/AppUserVo.java | 1 - 6 files changed, 110 insertions(+), 86 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index af454f3cbf..43a619589b 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 @@ -1458,66 +1458,18 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - Map map = BeanUtil.beanToMap(resultBean.getData()); - updateFlowFiled(map); - //再加回来 - BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid()); - if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(busSalesOrderDeposit.getDepositTypeKey())) { - //根据订金sid查询虚拟订单和订金的关联 - List listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid()); - listVos.removeAll(Collections.singleton(null)); - if (!listVos.isEmpty()) { - for (AppBusSalesOrderDepositListVo listVo : listVos) { - //添加负的记录 - BusDepositFictitious busDepositFictitious = new BusDepositFictitious(); - BeanUtil.copyProperties(listVo, busDepositFictitious, "sid"); - busDepositFictitious.setPrice(new BigDecimal(listVo.getPayMoney()).negate()); - busDepositFictitious.setDepositSid(busSalesOrderDeposit.getSid()); - busDepositFictitious.setDepositBillNo(listVo.getVirtualOrderId()); - busDepositFictitious.setDepositBillSid(listVo.getVirtualOrderSid()); - busDepositFictitiousService.save(busDepositFictitious); - //查询该虚拟订金单已使用的订金值 - String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId()); - //更新该虚拟订单的订金值 - busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId()); - } - } - } - ResultBean details = getSaleOrderDetails(query.getBusinessSid()); - AppOrderDetailsVo vo = details.getData(); - if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) { - //更新已选择的车架号的状态为未锁定 - List list = busSalesOrderVehicleService.selectVehicleSid(query.getBusinessSid()); - BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); - busMainDepositUpdateQuery.setVinSidList(list); - busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode()); - busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks()); - baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); - } - if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getRemarks().equals(vo.getOrderType())) { - List list = busSalesVehicleOrderService.selectLinkSid(query.getBusinessSid()); - for (BusSalesVehicleOrder b : list) { - String linkSid = b.getLinkSid(); - int count = b.getUsingNum(); - //查询该采购订单的已使用台数 - int num = busSalesVehicleOrderService.selectByLinkSid1(linkSid); - //更新 - ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(num)); - } - } - - return rb.success().setData(resultBean.getData()); - }else{ - if (businessTaskId.equals(query.getTaskId())) { + if(busSalesOrder == null){ + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setMsg("该销售订单不存在，流程已终止"); + }else{ + String businessTaskId = busSalesOrder.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if(query.getUserSid().equals(busSalesOrder.getCreateBySid())){ FlowTaskVo flowTaskVo = new FlowTaskVo(); BeanUtil.copyProperties(query, flowTaskVo); ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -1573,9 +1525,67 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + //再加回来 + BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid()); + if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(busSalesOrderDeposit.getDepositTypeKey())) { + //根据订金sid查询虚拟订单和订金的关联 + List listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid()); + listVos.removeAll(Collections.singleton(null)); + if (!listVos.isEmpty()) { + for (AppBusSalesOrderDepositListVo listVo : listVos) { + //添加负的记录 + BusDepositFictitious busDepositFictitious = new BusDepositFictitious(); + BeanUtil.copyProperties(listVo, busDepositFictitious, "sid"); + busDepositFictitious.setPrice(new BigDecimal(listVo.getPayMoney()).negate()); + busDepositFictitious.setDepositSid(busSalesOrderDeposit.getSid()); + busDepositFictitious.setDepositBillNo(listVo.getVirtualOrderId()); + busDepositFictitious.setDepositBillSid(listVo.getVirtualOrderSid()); + busDepositFictitiousService.save(busDepositFictitious); + //查询该虚拟订金单已使用的订金值 + String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId()); + //更新该虚拟订单的订金值 + busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId()); + } + } + } + ResultBean details = getSaleOrderDetails(query.getBusinessSid()); + AppOrderDetailsVo vo = details.getData(); + if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) { + //更新已选择的车架号的状态为未锁定 + List list = busSalesOrderVehicleService.selectVehicleSid(query.getBusinessSid()); + BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); + busMainDepositUpdateQuery.setVinSidList(list); + busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode()); + busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks()); + baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); + } + if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getRemarks().equals(vo.getOrderType())) { + List list = busSalesVehicleOrderService.selectLinkSid(query.getBusinessSid()); + for (BusSalesVehicleOrder b : list) { + String linkSid = b.getLinkSid(); + int count = b.getUsingNum(); + //查询该采购订单的已使用台数 + int num = busSalesVehicleOrderService.selectByLinkSid1(linkSid); + //更新 + ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(num)); + } + } + + return rb.success().setData(resultBean.getData()); + } } - } + } } return rb.setMsg("操作失败!提交的数据不一致!"); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index b433561d18..cb476d8633 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -394,24 +394,27 @@ public class FlowableRest implements FlowableFeign { }else{ nextUserSid = nextNodeUserSidsOfSubmit.getData().getUserSid(); formVariables.put(BusinessVariables.ORGPATH, nextNodeUserSidsOfSubmit.getData().getOrgPath()); - List nextUserList = Arrays.asList(nextUserSid.split(",")); - if(nextUserList.size() == 1){ - firstSid = nextUserList.get(0); - ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(firstSid); - if(sysUserVoResultBean.getData() != null){ - firstName = sysUserVoResultBean.getData().getName(); - } - SysFlowableConfigQuery sysFlowableConfigQuery = new SysFlowableConfigQuery(); - sysFlowableConfigQuery.setUserSid(firstSid); - sysFlowableConfigQuery.setNowDate(new Date()); - ResultBean sysFlowableConfigVvoResultBean = sysFlowableConfigFeign.selectByUserSid(sysFlowableConfigQuery); - if(sysFlowableConfigVvoResultBean.getData() != null){ - if(StringUtils.isNotBlank(sysFlowableConfigVvoResultBean.getData().getChangeUserSid())){ - nextUserSid = sysFlowableConfigVvoResultBean.getData().getChangeUserSid(); - isChange = true; + if(nextUserSid != null){ + List nextUserList = Arrays.asList(nextUserSid.split(",")); + if(nextUserList.size() == 1){ + firstSid = nextUserList.get(0); + ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(firstSid); + if(sysUserVoResultBean.getData() != null){ + firstName = sysUserVoResultBean.getData().getName(); + } + SysFlowableConfigQuery sysFlowableConfigQuery = new SysFlowableConfigQuery(); + sysFlowableConfigQuery.setUserSid(firstSid); + sysFlowableConfigQuery.setNowDate(new Date()); + ResultBean sysFlowableConfigVvoResultBean = sysFlowableConfigFeign.selectByUserSid(sysFlowableConfigQuery); + if(sysFlowableConfigVvoResultBean.getData() != null){ + if(StringUtils.isNotBlank(sysFlowableConfigVvoResultBean.getData().getChangeUserSid())){ + nextUserSid = sysFlowableConfigVvoResultBean.getData().getChangeUserSid(); + isChange = true; + } } } } + } } String comment = dto.getComment(); @@ -499,6 +502,24 @@ public class FlowableRest implements FlowableFeign { String id = flowElement.getId(); if (taskDefKey.equals(id) && i + 1 < flowElements.size()) { FlowElement flowElement1 = flowElements.get(i + 1); + FlowElement flowElement2 = flowElements.get(i + 2); + List sysUserVoLists2 = new ArrayList<>(); + if (flowElement2 instanceof UserTask) { + UserTask userTask = (UserTask) flowElement2; + List candidateGroups = userTask.getCandidateGroups(); + //根据角色查询用户 + for (String roleSid : candidateGroups) { + UserQuery userQuery = new UserQuery(); + userQuery.setRoleSid(roleSid); + userQuery.setOrgSidPath(dto.getOrgSidPath()); + ResultBean> userByRole = sysUserFeign.getUserByRole(userQuery); + boolean success = userByRole.getSuccess(); + if (!success) { + continue; + } + sysUserVoLists2.addAll(userByRole.getData()); + } + } if (flowElement1 instanceof UserTask) { UserTask userTask = (UserTask) flowElement1; List candidateGroups = userTask.getCandidateGroups(); @@ -522,7 +543,7 @@ public class FlowableRest implements FlowableFeign { break; } //如果下一环节无用户，则默认系统管理员自动审批 - if(sysUserVoLists.size() == 0 && StringUtils.isNotBlank(nextUserSid)){ + if(sysUserVoLists.size() == 0 && sysUserVoLists2.size() == 1 && sysUserVoLists2.get(0).getSid().equals(nextUserSid)){ contains = true; break; } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 15093cc847..a3d80f122c 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -311,7 +311,6 @@ public class FlowTaskService extends MybatisBaseService hisFlowList = new ArrayList<>(); for (HistoricActivityInstance histIns : list) { if (StringUtils.isNotBlank(histIns.getTaskId())) { - boolean isStop = false; FlowTask flowTask = new FlowTask(); flowTask.setTaskId(histIns.getTaskId()); flowTask.setTaskName(histIns.getActivityName()); @@ -335,9 +334,6 @@ public class FlowTaskService extends MybatisBaseService data1 = sysUserVoResultBean.getData(); List taskUserInfos=new ArrayList<>(); for( SysUserVo data:data1){ - if("admin".equals(data.getName())){ - isStop = true; - } TaskUserInfo taskUserInfo=new TaskUserInfo(); taskUserInfo.setAssigneeName(data.getName()); taskUserInfo.setAssigneeSid(data.getSid()); @@ -348,9 +344,6 @@ public class FlowTaskService extends MybatisBaseService linksForTask = historyService.getHistoricIdentityLinksForTask(histIns.getTaskId()); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordAndCommentVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordAndCommentVo.java index 3976d579df..9a0669c6e6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordAndCommentVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordAndCommentVo.java @@ -30,4 +30,6 @@ public class AppFlowableRecordAndCommentVo implements Vo { @JsonProperty("processCommentVo") private ProcessCommentVo processCommentVo; + + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java index 506a35f8a0..e975897d0a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java @@ -63,5 +63,4 @@ public class AppFlowableRecordVo implements Vo { private String procDefId; private Map procVars; - } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppUserVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppUserVo.java index a26f40ff07..b3c0610ccb 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppUserVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppUserVo.java @@ -19,5 +19,4 @@ public class AppUserVo implements Vo { @ApiModelProperty(value = "头像") @JsonProperty("image") private String assigneeHeadImage; - } From e3bd739c1eff63037adca79d7d811a3f3a221211 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 20 Jun 2023 14:45:39 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/terminal/biz/app/AppService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java index 4f41416286..889da5060e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java @@ -86,6 +86,13 @@ public class AppService { a.setTime(f.getFinishTime() == null ? new Date() : f.getFinishTime()); a.setFlowableRecordVo(f); a.setState(0 + ""); + List taskUserInfos = f.getTaskUserInfos(); + if(taskUserInfos.size() == 1){ + AppUserVo appUserVo = taskUserInfos.get(0); + if("admin".equals(appUserVo.getAssigneeName())){ + return; + } + } list.add(a); }); From bab5d4c7723ecae53eff1e35015145c6996c025e Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 20 Jun 2023 15:12:30 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java | 4 ++-- .../java/com/yxt/anrui/portal/biz/flow/FlowableRest.java | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index a1ef482d2b..f91585c2d5 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -489,7 +489,7 @@ public class FlowableRest implements FlowableFeign { dto.setUserSid(nextUserSid); dto.setTaskId(vo.getTaskId()); dto.setTaskDefKey(taskDefKey); - dto.setComment("系统管理员已自动审批"); + dto.setComment("系统自动跳过"); return handleProsess(dto, false); } List flowElements = processService.calApprovePath(dto.getModelId(), dto.getModelId(), @@ -570,7 +570,7 @@ public class FlowableRest implements FlowableFeign { dto.setUserSid(nextUserSid); dto.setTaskId(vo.getTaskId()); dto.setTaskDefKey(taskDefKey); - dto.setComment("系统管理员已自动审批"); + dto.setComment("系统自动跳过"); return handleProsess(dto, false); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index 92bd44b4cc..1d077dd0dd 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java @@ -177,6 +177,13 @@ public class FlowableRest implements FlowableFeign { stringObjectMap.put("createTime",DateUtil.format(f.getCreateTime(),"yyyy-MM-dd HH:mm:ss")); a.setFlowableRecordVo(stringObjectMap); a.setState(0+""); + List taskUserInfos = f.getTaskUserInfos(); + if(taskUserInfos.size() == 1){ + com.yxt.anrui.flowable.api.flowtask.TaskUserInfo appUserVo = taskUserInfos.get(0); + if("admin".equals(appUserVo.getAssigneeName())){ + return; + } + } flowList.add(a); }); //评论记录 From a2bfe4249de1d06c471ece29dc58b704fe595f48 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 20 Jun 2023 15:27:08 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleOutApplyVoNew.java | 2 + .../BaseVehicleOutApplyMapper.xml | 1 + .../BaseVehicleOutApplyService.java | 42 +++++++++++++++++++ .../bussalesorder/BusSalesOrderService.java | 10 +++-- 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java index 1d4dfda2a3..b2091f3138 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java @@ -50,6 +50,8 @@ public class BaseVehicleOutApplyVoNew implements Vo { @ApiModelProperty("sid") private String sid; + @ApiModelProperty("车辆sid") + private String vinSid; @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("分公司sid") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml index 3e5a8ef499..98313417ec 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml @@ -6,6 +6,7 @@