From 0baa148746c4ed17679019a10a42e07db9f40dc7 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 3 Mar 2023 16:16:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busvehicleapply/BusVehicleApplyService.java | 6 ++++++ .../biz/commoncontract/CommonContractService.java | 4 ++-- .../FinCollectionConfirmationDto.java | 2 ++ .../FinSelectedReceivablesDetailedDto.java | 3 +++ .../FinCollectionConfirmationRest.java | 3 ++- .../anrui/flowable/api/flow/FlowableFallback.java | 5 +++++ .../yxt/anrui/flowable/api/flow/FlowableFeign.java | 5 +++++ .../yxt/anrui/flowable/biz/flow/FlowableRest.java | 13 +++++++++++++ .../portal/biz/sysstaffinfo/SysStaffinfoMapper.xml | 2 +- .../yxt/anrui/portal/biz/sysuser/SysUserMapper.xml | 3 ++- .../vehicleApply/ShareVehicleApplyQuery.java | 2 ++ .../vehicleApply/VehicleApplyService.java | 12 ++++++++---- 12 files changed, 51 insertions(+), 9 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 9288db77e0..8243392dab 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 @@ -1012,6 +1012,12 @@ public class BusVehicleApplyService extends MybatisBaseService> flowResultBean = flowableFeign.selectFlow(taskId); + if(flowResultBean.getData() != null){ + mfq.setModuleName(flowResultBean.getData().get("NAME_")); + mfq.setMsgTitle(flowResultBean.getData().get("NAME_")); + } ResultBean stringResultBean = messageFeign.pushMessageShare(mfq); log.info("分享成功-resultBean:{}", resultBean); if (!resultBean.getSuccess()) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 0b639150ee..ae1f74b945 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1603,13 +1603,13 @@ public class CommonContractService extends MybatisBaseService finSelectedReceivablesDetaileds; // 已选应收款项明细 @ApiModelProperty("打款凭证附件") private List paymentVoucherAppendixs; // 打款凭证附件 diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java index 1fa7aff5dc..2a8aa4bba0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * Project: anrui-fin(销售相关)
* File: FinSelectedReceivablesDetailedDto.java
@@ -73,6 +75,7 @@ public class FinSelectedReceivablesDetailedDto implements Dto { /* @ApiModelProperty("上次认款金额") private String lastSubscriptionMoney; // 上次认款金额*/ @ApiModelProperty("认款金额") + @NotBlank(message = "认款金额不能为空") private String subscriptionMoney; // 认款金额 @ApiModelProperty("认款申请日期") private String subscriptionDate; // 认款申请日期 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index de5a0c484a..087e7e682a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -40,6 +40,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; /** @@ -82,7 +83,7 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF @Override @ApiOperation("提交新增保存") @PostMapping("/save") - public ResultBean save(@RequestBody FinCollectionConfirmationDto dto) { + public ResultBean save(@Valid @RequestBody FinCollectionConfirmationDto dto) { return finCollectionConfirmationService.saveAllDto(dto); } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java index f0a644a648..6496943813 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java @@ -86,5 +86,10 @@ public class FlowableFallback implements FlowableFeign { return null; } + @Override + public ResultBean> selectFlow(String id) { + return null; + } + } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java index d9582b1c5c..b6bae4ba9e 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java @@ -131,4 +131,9 @@ public interface FlowableFeign { @GetMapping(value = "/selectFlowVaributes") @ResponseBody ResultBean> selectFlowVaributes(@RequestParam("taskId")String taskId); + + @ApiOperation(value = "查询流程的信息") + @GetMapping(value = "/selectFlow") + @ResponseBody + ResultBean> selectFlow(@RequestParam("id")String id); } 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 96abf66f10..0d799834e8 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 @@ -605,4 +605,17 @@ public class FlowableRest implements FlowableFeign { Map processVariables = historicTaskInstance.getProcessVariables(); return rb.success().setData(processVariables); } + + @Override + public ResultBean> selectFlow(String taskId) { + ResultBean> rb = ResultBean.fireFail(); + HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery() + .includeProcessVariables().taskId(taskId).singleResult(); + Map process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId()); + log.info("分享-process:{}", process); + if (process == null) { + log.info("分享-process:{}", process); + } + return rb.success().setData(process); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index 3eb322cd48..4dcbb28624 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -69,7 +69,7 @@ INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid LEFT JOIN sys_user user ON staff.sid = user.staffSid - WHERE org.orgSid = #{sid} + WHERE org.orgSid = #{sid} and staff.personTypeKey != '01' \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/ShareVehicleApplyQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/ShareVehicleApplyQuery.java index 4a0c62fe4b..be0b9ad151 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/ShareVehicleApplyQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/ShareVehicleApplyQuery.java @@ -20,4 +20,6 @@ public class ShareVehicleApplyQuery implements Query { private List members; @ApiModelProperty("部门") private List groups; + + private String userSid; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java index abf4eb94ae..0d14863555 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java @@ -3,6 +3,7 @@ package com.yxt.anrui.terminal.biz.supplychain.vehicleApply; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign; +import com.yxt.anrui.base.api.busvehicleapply.ShareBusVehicleApplyQuery; import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplySzVo; import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyVo; import com.yxt.anrui.base.api.busvehicleapply.flow.BusVehicleApplyCompleteDto; @@ -13,7 +14,6 @@ import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.portal.api.sysuser.ShareUserQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.*; @@ -176,8 +176,12 @@ public class VehicleApplyService { public ResultBean shareMessage(ShareVehicleApplyQuery shareQuery) { ResultBean rb = ResultBean.fireFail(); - - - return null; + ShareBusVehicleApplyQuery shareBusVehicleApplyQuery = new ShareBusVehicleApplyQuery(); + BeanUtil.copyProperties(shareQuery,shareBusVehicleApplyQuery); + ResultBean resultBean = busVehicleApplyFeign.shareBusVehicleApply(shareBusVehicleApplyQuery); + if(!resultBean.getSuccess()){ + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); } }