From da571363c370aaa34bbdbcec66db7446d60e5021 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Fri, 12 Aug 2022 08:41:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E8=8A=82=E7=82=B9=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E6=8E=A5=E5=8F=A3,=E4=BF=AE=E6=94=B9=E6=AC=BE?= =?UTF-8?q?=E9=A1=B9=E7=A1=AE=E8=AE=A4=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basemodelconfig/BaseModelConfigMapper.xml | 4 +-- .../AppScmVehicleCarTransferSiteImageDto.java | 6 ++++ .../AppScmVehicleGressionDetailsVo.java | 4 +++ .../ScmVehicleGression.java | 4 +++ .../AppScmVehiclePatroVo.java | 2 ++ .../ScmVehicleGressionService.java | 24 ++++++++------ .../ScmVehiclePatrolinspectionMapper.xml | 3 +- .../virtualOrders/AppBusMainDepositFeign.java | 10 ++++-- .../AppBusMainDepositFeignFallback.java | 6 ++++ .../AppFinCollectionConfirmationFeign.java | 6 ++-- ...inCollectionConfirmationFeignFallback.java | 2 +- .../ConfirmationDto.java | 2 +- .../ConfirmationInitVo.java | 2 +- .../ConfirmationPageQuery.java | 2 +- .../ConfirmationPageVo.java | 2 +- .../ReceivablesPaymentDetailsQuery.java | 2 +- .../UncollectedReceivablesDetailedVo.java | 2 +- .../inspection/AppScmVehiclePatrolinVo.java | 5 +++ .../AppCarTransferSiteImageDto.java | 6 ++++ .../AppGressionDetailsVo.java | 6 ++++ .../virtualOrders/AppBusMainDepositRest.java | 6 ++++ .../AppBusMainDepositService.java | 31 +++++++++++++++++++ .../AppFinCollectionConfirmationRest.java | 4 +-- .../AppFinCollectionConfirmationService.java | 15 +++------ 24 files changed, 119 insertions(+), 37 deletions(-) rename anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/{ => collectionConfirm}/AppFinCollectionConfirmationFeign.java (96%) rename anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/{ => collectionConfirm}/AppFinCollectionConfirmationFeignFallback.java (98%) rename anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/{ => collectionConfirm}/ConfirmationDto.java (96%) rename anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/{ => collectionConfirm}/ConfirmationInitVo.java (96%) rename anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/{ => collectionConfirm}/ConfirmationPageQuery.java (85%) rename anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/{ => collectionConfirm}/ConfirmationPageVo.java (95%) rename anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/{ => collectionConfirm}/ReceivablesPaymentDetailsQuery.java (89%) rename anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/{ => collectionConfirm}/UncollectedReceivablesDetailedVo.java (93%) rename anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/{ => collectionConfirm}/AppFinCollectionConfirmationRest.java (97%) rename anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/{ => collectionConfirm}/AppFinCollectionConfirmationService.java (89%) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index a73f860e75..b93666c887 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -501,8 +501,8 @@ bvm.driveFormValue, bvm.fuelTypeValue, bvm.gearboxTypeValue, - bvm.marketSegments, - bvm.department, + bvm.marketSegmentsValue as marketSegments, + bvm.departmentValue as department, bvm.emissionStandardValue, bvm.engineTypeValue, bvm.announcementModel, diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java index 61109c650e..3fca37aa9f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java @@ -18,4 +18,10 @@ public class AppScmVehicleCarTransferSiteImageDto implements Dto { @ApiModelProperty("保存车辆移库现场照片") private List images; + @ApiModelProperty("地址") + private String address; + + @ApiModelProperty("经纬度") + private String locationCode; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java index 6e47deb62c..1409b8db75 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java @@ -94,6 +94,10 @@ public class AppScmVehicleGressionDetailsVo implements Vo { private List policyImage; @ApiModelProperty("现场照片") private List image; + @ApiModelProperty("地址") + private String address; + @ApiModelProperty("经纬度") + private String locationCode; @ApiModelProperty("任务id") private String taskId; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java index db2ba27518..c0bda44171 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java @@ -90,6 +90,10 @@ public class ScmVehicleGression extends BaseEntity { private String applicantName; // 申请人 @ApiModelProperty("申请日期") private String applicantDate; // 申请日期 + @ApiModelProperty("地址") + private String address; + @ApiModelProperty("经纬度") + private String locationCode; @ApiModelProperty(value = "节点状态") private String nodeState; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatroVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatroVo.java index ea5a0498c2..79f3af82c8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatroVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatroVo.java @@ -32,4 +32,6 @@ public class AppScmVehiclePatroVo implements Vo { private List images; @ApiModelProperty(value = "sid") private String sid; + @ApiModelProperty(value = "定位地址") + private String address; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 0e18b41504..9fc4b26329 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -482,17 +482,23 @@ public class ScmVehicleGressionService extends MybatisBaseService images = dto.getImages(); - for (String s : images) { - if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + if (images.size() > 0) { + for (String s : images) { + if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile = new ScmFile(); + scmFile.setAttachType(type); + scmFile.setFileName("车辆移库现场照片"); + scmFile.setFilePath(s1); + scmFile.setLinkSid(dto.getSid()); + scmFileService.save(scmFile); } - ScmFile scmFile = new ScmFile(); - scmFile.setAttachType(type); - scmFile.setFileName("车辆移库现场照片"); - scmFile.setFilePath(s1); - scmFile.setLinkSid(dto.getSid()); - scmFileService.save(scmFile); } + ScmVehicleGression scmVehicleGression = fetchBySid(dto.getSid()); + scmVehicleGression.setAddress(dto.getAddress()); + scmVehicleGression.setLocationCode(dto.getLocationCode()); + updateById(scmVehicleGression); return rb.success().setMsg("保存成功"); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml index 805793f736..5cf91d5890 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml @@ -48,7 +48,8 @@ svss.situationExplain, svss.problemsAndResults, svss.model, - svss.sid + svss.sid, + svss.address from scm_vehicle_patrolinspection svp left join scm_vehicle_patrolinspectionsheet svss on svss.patrolInspectionSid = svp.sid where svp.sid = #{recordSid} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java index 15c8229302..812702e152 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java @@ -1,20 +1,19 @@ package com.yxt.anrui.terminal.api.autoservice.virtualOrders; -import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.AppGetNodeQuery; -import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.AppGetNodeVo; -import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.AppScmVirtualOrderTaskQuery; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit.*; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeQuery; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeVo; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.ScmVirtualOrderTaskQuery; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle.*; +import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -138,4 +137,9 @@ public interface AppBusMainDepositFeign { @ResponseBody public ResultBean breakProcess(@Valid @RequestBody ScmVirtualOrderTaskQuery query); + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap GressionQuery query); + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java index d2979c9176..d7395e1be1 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java @@ -38,6 +38,7 @@ import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeVo; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.ScmVirtualOrderTaskQuery; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle.*; +import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -149,6 +150,11 @@ public class AppBusMainDepositFeignFallback implements AppBusMainDepositFeign { return null; } + @Override + public ResultBean getFlowOperateTitle(GressionQuery query) { + return null; + } + @Override public ResultBean> getVins(String modelSid, String configSid, String userSid) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java similarity index 96% rename from anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java rename to anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java index de30745e35..73d766e3dc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.terminal.api.finance; +package com.yxt.anrui.terminal.api.finance.collectionConfirm; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; @@ -50,8 +50,8 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "收款确认表") @FeignClient( - contextId = "anrui-fin-FinCollectionConfirmation", - name = "anrui-fin", + contextId = "anrui-terminal-AppFinCollectionConfirmationFeign", + name = "anrui-terminal", path = "finance/v1/collectionConfirm", fallback = AppFinCollectionConfirmationFeignFallback.class) public interface AppFinCollectionConfirmationFeign { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java similarity index 98% rename from anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java rename to anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java index 1bc0ac92bf..18fea5e528 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.terminal.api.finance; +package com.yxt.anrui.terminal.api.finance.collectionConfirm; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java similarity index 96% rename from anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationDto.java rename to anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java index e39bae2881..f94197c797 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.terminal.api.finance; +package com.yxt.anrui.terminal.api.finance.collectionConfirm; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; import com.yxt.common.core.dto.Dto; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java similarity index 96% rename from anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationInitVo.java rename to anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java index 989a8124e7..ad3398641b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationInitVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.terminal.api.finance; +package com.yxt.anrui.terminal.api.finance.collectionConfirm; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; import com.yxt.common.core.vo.Vo; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageQuery.java similarity index 85% rename from anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationPageQuery.java rename to anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageQuery.java index 935d8125fd..15835e3487 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.terminal.api.finance; +package com.yxt.anrui.terminal.api.finance.collectionConfirm; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java similarity index 95% rename from anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationPageVo.java rename to anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java index 59173e3d4f..5bb1bccfbc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ConfirmationPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.terminal.api.finance; +package com.yxt.anrui.terminal.api.finance.collectionConfirm; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ReceivablesPaymentDetailsQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ReceivablesPaymentDetailsQuery.java similarity index 89% rename from anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ReceivablesPaymentDetailsQuery.java rename to anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ReceivablesPaymentDetailsQuery.java index 216fca4cb8..3a7d3c086d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/ReceivablesPaymentDetailsQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ReceivablesPaymentDetailsQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.terminal.api.finance; +package com.yxt.anrui.terminal.api.finance.collectionConfirm; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/UncollectedReceivablesDetailedVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/UncollectedReceivablesDetailedVo.java similarity index 93% rename from anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/UncollectedReceivablesDetailedVo.java rename to anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/UncollectedReceivablesDetailedVo.java index 00279e2daf..abb18ec38a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/UncollectedReceivablesDetailedVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/UncollectedReceivablesDetailedVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.terminal.api.finance; +package com.yxt.anrui.terminal.api.finance.collectionConfirm; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java index 2457bb9028..5e568be50e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java @@ -18,6 +18,7 @@ public class AppScmVehiclePatrolinVo implements Vo { @ApiModelProperty("车架号") @JsonProperty("vin") private String mainSid; + @ApiModelProperty("车型") @JsonProperty("model") private String model; @@ -41,6 +42,10 @@ public class AppScmVehiclePatrolinVo implements Vo { @ApiModelProperty("存在的问题及处理结果") @JsonProperty("result") private String problemsAndResults; + @ApiModelProperty("相关附件") private List images; + + @ApiModelProperty(value = "定位地址") + private String address; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppCarTransferSiteImageDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppCarTransferSiteImageDto.java index 08aa6f92ff..8d4cdce72c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppCarTransferSiteImageDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppCarTransferSiteImageDto.java @@ -17,4 +17,10 @@ public class AppCarTransferSiteImageDto implements Dto { @ApiModelProperty("保存车辆移库现场照片") private List images; + + @ApiModelProperty("地址") + private String address; + + @ApiModelProperty("经纬度") + private String locationCode; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java index 785f7dff1d..0229cfaf48 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java @@ -84,6 +84,12 @@ public class AppGressionDetailsVo implements Vo { @ApiModelProperty("保单照片") private List policyImage; + @ApiModelProperty("地址") + private String address; + + @ApiModelProperty("经纬度") + private String locationCode; + @ApiModelProperty("临牌") @JsonProperty("proCard") private String temporaryCard; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java index eb4f2a659a..878919270c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java @@ -40,6 +40,7 @@ import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeVo; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.ScmVirtualOrderTaskQuery; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle.*; +import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -294,5 +295,10 @@ public class AppBusMainDepositRest implements AppBusMainDepositFeign { return appBusMainDepositService.breakProcess(query); } + @Override + public ResultBean getFlowOperateTitle(GressionQuery query) { + return appBusMainDepositService.getFlowOperateTitle(query); + } + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java index 6dc78971bc..6d8522b786 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java @@ -43,6 +43,7 @@ import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeVo; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.ScmVirtualOrderTaskQuery; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle.*; +import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -52,6 +53,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -418,4 +420,33 @@ public class AppBusMainDepositService { ResultBean resultBean = busMainDepositFeign.breakProcess(appScmVirtualOrderTaskQuery); return resultBean; } + + public ResultBean getFlowOperateTitle(GressionQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + AppGetNodeQuery getNodeQuery = new AppGetNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = busMainDepositFeign.getPreviousNodesForReject(getNodeQuery); + if (getPreviousNodesForReject.getSuccess()) { + getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = getPreviousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(getPreviousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> getNextNodesForSubmit = busMainDepositFeign.getNextNodesForSubmit(getNodeQuery); + if (getNextNodesForSubmit.getSuccess()) { + getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = getNextNodesForSubmit.getData().get(0).getName(); + } else { + return rb.setMsg(getNextNodesForSubmit.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + return rb.success().setData(data); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java similarity index 97% rename from anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java rename to anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java index a69128b7c3..4bc7f4a3c3 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java @@ -23,11 +23,11 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.terminal.biz.finance; +package com.yxt.anrui.terminal.biz.finance.collectionConfirm; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; -import com.yxt.anrui.terminal.api.finance.*; +import com.yxt.anrui.terminal.api.finance.collectionConfirm.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java similarity index 89% rename from anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java rename to anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java index 15644818f3..be1ec4f805 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java @@ -23,21 +23,16 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.terminal.biz.finance; +package com.yxt.anrui.terminal.biz.finance.collectionConfirm; import cn.hutool.core.bean.BeanUtil; -import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo; -import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; -import com.yxt.anrui.terminal.api.autoservice.intermediary.MiddlemanVo; -import com.yxt.anrui.terminal.api.finance.*; -import com.yxt.anrui.terminal.api.supplychain.inspection.PatrolinspectionInfoVo; -import com.yxt.anrui.terminal.api.supplychain.inspection.PatrolinspectionPageVo; -import com.yxt.anrui.terminal.api.supplychain.inspection.StayPatrolinspectionPageVo; +import com.yxt.anrui.terminal.api.finance.collectionConfirm.ConfirmationDto; +import com.yxt.anrui.terminal.api.finance.collectionConfirm.ConfirmationInitVo; +import com.yxt.anrui.terminal.api.finance.collectionConfirm.ConfirmationPageQuery; +import com.yxt.anrui.terminal.api.finance.collectionConfirm.ConfirmationPageVo; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; From 2ffc6557f2daeadcd9cee4ba0a5c58539efdd7af Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 12 Aug 2022 08:49:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusVehicleApplyService.java | 39 ++-- .../bussalesorder/BusSalesOrderService.java | 2 +- .../portal/api/sysuser/SysUserFeign.java | 4 + .../api/sysuser/SysUserFeignFallback.java | 5 + .../portal/biz/sysuser/SysUserMapper.java | 2 + .../portal/biz/sysuser/SysUserMapper.xml | 167 ++++++++++-------- .../anrui/portal/biz/sysuser/SysUserRest.java | 5 + .../portal/biz/sysuser/SysUserService.java | 46 ++--- 8 files changed, 150 insertions(+), 120 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 507412fda9..1e8cac8f2b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -41,7 +41,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.anrui.portal.api.sysuser.UserQuery; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.JPushServer; import com.yxt.common.base.utils.PagerUtil; @@ -376,7 +375,7 @@ public class BusVehicleApplyService extends MybatisBaseService> nodeVoList = getNextNodesForSubmit(getNodeQuery); - //根据组织架构、角色两个参数取相关符合条件的用户信息 - UserQuery userQuery = new UserQuery(); - userQuery.setRoleSid(nodeVoList.getData().get(0).getCandidateGroups().get(0)); - userQuery.setOrgSidPath(orgSidPath); - List sysUserVos = sysUserFeign.getUserByRole(userQuery).getData(); - StringBuilder nextNodeUserSids = new StringBuilder(); - List stringList = new ArrayList<>(); - for (SysUserVo su : sysUserVos) { - stringList.add(su.getSid()); -// nextNodeUserSids.append(su.getSid()).append(","); - } - //符合条件的用户的sid,拼接的字符串 -// String nextNodeUserSids_ = nextNodeUserSids.toString(); + List stringList = Arrays.asList(nextSid.split(",")); + //根据用户的sid查询用户的id + ResultBean stringList1 = sysUserFeign.selectIdBySid(stringList); + List stringList2 = Arrays.asList(stringList1.getData().split(",")); //标题、内容、消息类别key、消息类别名称、 - JPushServer.sendPushAlias("排产申请审批", busVehicleApply.getCreateByName() + "的排产申请", "msg_type", "系统消息", stringList.toArray(new String[stringList.size()])); + String msgSid = getMessage(stringList); + for (int i = 0; i < stringList2.size(); i++) { + JPushServer.sendPushAlias("排产申请审批", busVehicleApply.getCreateByName() + "的排产申请", "msg_type", "审批中心", stringList2.get(i)); + } + + } public String getMessage(List list) { + //1、buttons:int[]{3,4,5}、taskId、taskName、procInsId、taskDefKey + //根据taskDefKey、流程标识、以及 + + // 1、保存消息体 AppMessageDto messageDto = new AppMessageDto(); ResultBean> messageBean = messageTypeFeign.selectAppMsgTypeList("0002"); if (messageBean.getSuccess() && messageBean.getData() != null) { List typeVoList = messageBean.getData(); for (MessageTypeVo message : typeVoList) { - if (message.getMsgType().equals("系统消息")) { + if (message.getMsgType().equals("审批中心")) { messageDto.setMsgTypeSid(message.getMsgTypeSid()); messageDto.setMsgType(message.getMsgType()); } 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 155b49f126..e48094c756 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 @@ -1317,7 +1317,7 @@ public class BusSalesOrderService extends MybatisBaseService>> getUserByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("userSid") String userSid); + + @ApiOperation(value = "根据用户sid获取用户id") + @PostMapping(value = "selectIdBySid") + ResultBean selectIdBySid(@RequestBody List stringList); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java index 0ffcb8a014..de4fd4ee46 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java @@ -184,4 +184,9 @@ public class SysUserFeignFallback implements SysUserFeign { public ResultBean>> getUserByOrgSid(String orgSid, String userSid) { return null; } + + @Override + public ResultBean selectIdBySid(List stringList) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java index c62449e8b0..54b3820692 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java @@ -179,4 +179,6 @@ public interface SysUserMapper extends BaseMapper { * @return */ int updateAppIdAll(); + + String selectIdBySid(@Param("list") List stringList); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml index 63184626b0..d90db0ae87 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml @@ -5,59 +5,59 @@ @@ -146,7 +146,7 @@ @@ -154,21 +154,23 @@ @@ -201,19 +203,19 @@ @@ -224,14 +226,14 @@ sso.orgName, sp.name as postName FROM sys_user su - LEFT JOIN sys_staffinfo st - ON su.`staffSid` = st.`sid` - LEFT JOIN sys_staff_org sso - ON st.`sid` = sso.`staffSid` - LEFT JOIN sys_staff_post ssp - ON st.sid = ssp.`staffSid` - LEFT JOIN sys_post sp - ON ssp.`postSid` = sp.`sid` + LEFT JOIN sys_staffinfo st + ON su.`staffSid` = st.`sid` + LEFT JOIN sys_staff_org sso + ON st.`sid` = sso.`staffSid` + LEFT JOIN sys_staff_post ssp + ON st.sid = ssp.`staffSid` + LEFT JOIN sys_post sp + ON ssp.`postSid` = sp.`sid` WHERE su.sid != #{userSid} AND sso.`orgSidPath` LIKE concat('%' , #{orgSid} @@ -241,7 +243,7 @@ select si.name, su.sid, su.staffSid from sys_user_role sr - left join sys_user su on sr.userSid = su.sid - left join sys_staffinfo si on si.sid = su.staffSid + left join sys_user su on sr.userSid = su.sid + left join sys_staffinfo si on si.sid = su.staffSid where sr.roleSid = #{roleSid} - update sys_user set appId = NULL where mobile = #{mobile} + update sys_user + set appId = NULL + where mobile = #{mobile} - update sys_user set appId = NULL + update sys_user + set appId = NULL + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java index 24ac46018d..3b76c560d7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java @@ -589,4 +589,9 @@ public class SysUserRest implements SysUserFeign { public ResultBean>> getUserByOrgSid(String orgSid, String userSid) { return sysUserService.getUserByOrgSid(orgSid, userSid); } + + @Override + public ResultBean selectIdBySid(List stringList) { + return sysUserService.selectIdBySid(stringList); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 346ea26b36..d4afa75bc1 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -531,7 +531,7 @@ public class SysUserService extends MybatisBaseService { SysUser user = baseMapper.selectByUserName(mobile); if (user == null) { user = baseMapper.selectByMobile(mobile); - if(user == null){ + if (user == null) { return ResultBean.fireFail().setMsg("该手机号暂时还未注册，请先注册"); } @@ -860,27 +860,27 @@ public class SysUserService extends MybatisBaseService { public ResultBean getUsersByRoleSid(String roleSid) { List users = baseMapper.getUsersByRoleSid(roleSid); - List l=new ArrayList<>(); - for(SysUserVo s:users){ - l.add(s.getDepartmentName()==null?"":s.getDepartmentName()); + List l = new ArrayList<>(); + for (SysUserVo s : users) { + l.add(s.getDepartmentName() == null ? "" : s.getDepartmentName()); } HashSet set = new HashSet(l); //把List集合所有元素清空 l.clear(); //把HashSet对象添加至List集合 l.addAll(set); - List> r=new ArrayList<>(); - for(String s:l){ - if(StringUtils.isNotBlank(s)){ - Map m=new HashMap<>(); - List us=new ArrayList<>(); - for(SysUserVo su:users){ - if(s!=null&&s.equals(su.getDepartmentName())){ + List> r = new ArrayList<>(); + for (String s : l) { + if (StringUtils.isNotBlank(s)) { + Map m = new HashMap<>(); + List us = new ArrayList<>(); + for (SysUserVo su : users) { + if (s != null && s.equals(su.getDepartmentName())) { us.add(su); } } - m.put("dept",s); - m.put("users",us); + m.put("dept", s); + m.put("users", us); r.add(m); } } @@ -895,11 +895,11 @@ public class SysUserService extends MybatisBaseService { String levelTypeKey = sysRoleService.getLevelType(query.getRoleSid()); if (StringUtils.isNotBlank(levelTypeKey)) { String orgSidPath = query.getOrgSidPath(); - if(StringUtils.isBlank(orgSidPath)){ + if (StringUtils.isBlank(orgSidPath)) { sysUserVoList = baseMapper.getUserByRoleSid(query.getRoleSid()); - }else{ - if(query.getOrgSidPath().split("/").length>=Integer.parseInt(levelTypeKey)-1){ + } else { + if (query.getOrgSidPath().split("/").length >= Integer.parseInt(levelTypeKey) - 1) { String levelOrgSid = query.getOrgSidPath().split("/")[Integer.parseInt(levelTypeKey) - 1]; sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), levelOrgSid); } @@ -914,14 +914,14 @@ public class SysUserService extends MybatisBaseService { public ResultBean>> getUserByOrgSid(String orgSid, String userSid) { ResultBean rb = ResultBean.fireFail(); - List> user = baseMapper.getUserByOrgSid(orgSid,userSid); + List> user = baseMapper.getUserByOrgSid(orgSid, userSid); for (Map map : user) { StringBuilder namePath = new StringBuilder(); String name = map.get("name"); String orgName = map.get("orgName"); String postName = map.get("postName"); namePath.append(name).append("(").append(orgName).append(" ").append(postName).append(")"); - map.put("namePath",namePath.toString()); + map.put("namePath", namePath.toString()); } /*List> user = new ArrayList<>(); for (Map map : userByOrgSid) { @@ -943,11 +943,17 @@ public class SysUserService extends MybatisBaseService { public ResultBean updateAppIdByMobile(String mobile) { ResultBean rb = ResultBean.fireFail(); - if(StringUtils.isNotBlank(mobile)){ + if (StringUtils.isNotBlank(mobile)) { baseMapper.updateAppIdByMobile(mobile); - }else{ + } else { baseMapper.updateAppIdAll(); } return rb.success().setMsg("解绑成功"); } + + public ResultBean selectIdBySid(List stringList) { + ResultBean rb = ResultBean.fireFail(); + String ids = baseMapper.selectIdBySid(stringList); + return rb.success().setData(ids); + } } \ No newline at end of file From 319a7ac8660f9220b880973f2ae5980671f60dbe Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 12 Aug 2022 09:20:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E8=B0=83=E4=BB=B7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 753c91ea76..5685e79a8f 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -21,7 +21,7 @@ public enum ProcDefEnum { BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"), BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:4:495004"),//TODO - BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:5:280004"), + BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:6:505004"), BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:1:497508"), SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:5:382504"), //TODO FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"),