From 888282441d02a0ecd0590a0e81a6c068b012decd Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 28 Jun 2022 16:34:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E7=94=B3=E8=AF=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=88=86=E9=A1=B5=E3=80=81=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busvehicleapply/BusVehicleApply.java | 2 + .../BusVehicleApplyDetailsVo.java | 36 ++++++++ .../busvehicleapply/BusVehicleApplyDto.java | 18 ++-- .../busvehicleapply/BusVehicleApplyFeign.java | 10 +-- .../BusVehicleApplyFeignFallback.java | 2 +- .../busvehicleapply/BusVehicleApplyVo.java | 38 ++++----- .../flow/BusVehicleApplyCompleteDto.java | 2 +- .../busvehicleapply/flow/GetNodeQuery.java | 2 +- .../BusVehicleApplyDetailVo.java | 2 +- .../BusVehicleApplyMapper.java | 10 --- .../busvehicleapply/BusVehicleApplyMapper.xml | 16 ++-- .../busvehicleapply/BusVehicleApplyRest.java | 9 +- .../BusVehicleApplyService.java | 83 +++++++++---------- .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- .../anrui/portal/biz/sysuser/SysUserRest.java | 6 +- 15 files changed, 123 insertions(+), 115 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java index 5cc0c39542..1ea8f70165 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java @@ -33,6 +33,8 @@ public class BusVehicleApply extends BaseEntity { private String createByName; @ApiModelProperty("排产类型:计划/临时/厂家任务/客户订单") private String schedulingType; + @ApiModelProperty(value = "排产类型key") + private String schedulingTypeKey; @ApiModelProperty("销售订单sid 可为空，只有客户订单时才有") private String salesSid; @ApiModelProperty("申请编号") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java new file mode 100644 index 0000000000..f9ec1f9dcb --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.base.api.busvehicleapply; + +import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/28 16:05 + * @Description + */ +@Data +public class BusVehicleApplyDetailsVo implements Vo { + private static final long serialVersionUID = 4245006554844990468L; + + @ApiModelProperty("排产类型:计划/临时/厂家任务/客户订单") + private String schedulingType; + @ApiModelProperty(value = "排产类型key") + private String schedulingTypeKey; + @ApiModelProperty("申请编号") + private String applicationCode; + @ApiModelProperty("申请日期") + private String applicationDate; + @ApiModelProperty("申请人姓名") + private String createByName; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("申请人sid") + private String createBySid; + @ApiModelProperty("车辆排产申请详情") + private List busVehicleApplyDetailVoList = new ArrayList<>(); +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java index dfbffdedcb..abab890ac0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java @@ -26,10 +26,11 @@ import java.util.List; @Data public class BusVehicleApplyDto implements Dto { + private static final long serialVersionUID = -1705267005489620427L; @ApiModelProperty("排产申请单sid") - private String sid; // 排产申请单sid + private String sid; @ApiModelProperty("备注") - private String remarks; // 备注 + private String remarks; @ApiModelProperty("申请人sid") private String createBySid; @ApiModelProperty("申请日期") @@ -38,17 +39,18 @@ public class BusVehicleApplyDto implements Dto { private String createByName; @ApiModelProperty("排产类型:计划/临时/厂家任务/客户订单") private String schedulingType; - - @ApiModelProperty("申请编号") - private String applicationCode; - /* @ApiModelProperty("创建组织sid") - private String createByDeptSid;*/ + @ApiModelProperty(value = "排产类型key") + private String schedulingTypeKey; @ApiModelProperty("当前订金金额") private String currentAmount; @ApiModelProperty("车辆排产申请详情") - private List busVehicleApplyDetailDtoList; // 车辆排产申请详情 + private List busVehicleApplyDetailDtoList; @ApiModelProperty("销售订单sid 可为空，只有客户订单时才有") private String salesSid; + /* @ApiModelProperty("创建组织sid") + private String createByDeptSid;*/ + // @ApiModelProperty("申请编号") +// private String applicationCode; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java index a318eaed95..d374c54751 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java @@ -48,21 +48,13 @@ public interface BusVehicleApplyFeign { @PostMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids); - /* @ApiOperation("新增保存") - @PostMapping("/save") - public ResultBean save(@RequestBody BusVehicleApplyDto dto); - - @ApiOperation("修改保存") - @PostMapping("/update") - public ResultBean update(@RequestBody BusVehicleApplyDto dto);*/ - @ApiOperation("新增修改") @PostMapping("/saveOrUpdate") ResultBean saveOrUpdate(@RequestBody BusVehicleApplyDto dto); @ApiOperation("获取一条记录") @GetMapping("/fetchSid/{sid}") - public ResultBean fetchSid(@PathVariable("sid") String sid); + public ResultBean fetchSid(@PathVariable("sid") String sid); /*************************************************PC排产审批流程***************************************************/ diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java index 4509a8a729..6841cdb162 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java @@ -44,7 +44,7 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign { } @Override - public ResultBean fetchSid(String sid) { + public ResultBean fetchSid(String sid) { return null; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java index 11cee38352..e535c8cf0f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java @@ -1,14 +1,11 @@ package com.yxt.anrui.base.api.busvehicleapply; -import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.List; - /** * Project: anrui-scm(进销存)
* File: BusVehicleApplyVo.java
@@ -26,35 +23,36 @@ import java.util.List; @Data public class BusVehicleApplyVo implements Vo { - @ApiModelProperty("申请人sid") - private String createBySid; + private static final long serialVersionUID = 1442276021129143790L; + private String sid; + @ApiModelProperty("节点状态") + private String nodeState; + @ApiModelProperty("排产类型:计划/临时/厂家任务/客户订单") + private String schedulingType; + @ApiModelProperty("申请编号") + private String applicationCode; @ApiModelProperty("申请日期") private String applicationDate; @ApiModelProperty("申请人姓名") private String createByName; - @ApiModelProperty("排产类型:计划/临时/厂家任务/客户订单") - private String schedulingType; + @ApiModelProperty("备注") + private String remarks; + /* @ApiModelProperty("本次需使用金额") + private String amountToBeUsedThisTime; + @ApiModelProperty("本次申请金额") + private String amountAppliedThisTime;*/ + /* @ApiModelProperty("申请人sid") + private String createBySid; @ApiModelProperty("销售订单sid 可为空，只有客户订单时才有") private String salesSid; - @ApiModelProperty("申请编号") - private String applicationCode; @ApiModelProperty("创建组织sid") private String createByDeptSid; @ApiModelProperty("当前订金金额") private String currentAmount; - @ApiModelProperty("本次需使用金额") - private String amountToBeUsedThisTime; - @ApiModelProperty("本次申请金额") - private String amountAppliedThisTime; @ApiModelProperty("内部编码") private String insideCode; - @ApiModelProperty("备注") - private String remarks; // 备注 - @ApiModelProperty("sid") - private String sid; // sid - @ApiModelProperty("节点状态") - private String nodeState; // nodeState + @ApiModelProperty("车辆排产申请详情") - private List busVehicleApplyDetailVoList; // 车辆排产申请详情 + private List busVehicleApplyDetailVoList;*/ } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java index 55afc8fe68..5cbd0575b7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java @@ -28,6 +28,6 @@ public class BusVehicleApplyCompleteDto implements Dto { private String comment; @ApiModelProperty(value = "业务sid") private String businessSid; - @ApiModelProperty(value = "业务参数：按需传递") + @ApiModelProperty(value = "暂不确定是不是后端需要的：有分支的时候传") private Map formVariables; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java index 50c9eb4df1..0644a6e8e1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java @@ -18,6 +18,6 @@ public class GetNodeQuery implements Query { @ApiModelProperty(value = "环节定义id") private String taskDefKey; - @ApiModelProperty(value = "业务参数，按需传递") + @ApiModelProperty(value = "后端需要的：有分支网关的时候传") private Map formVariables; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java index c32ce834ee..81b4fa682a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java @@ -44,7 +44,7 @@ public class BusVehicleApplyDetailVo implements Vo { @ApiModelProperty("申请订金") private String applyForDeposit; @ApiModelProperty("备注") - private String remarks; // 备注 + private String remarks; @ApiModelProperty("内部编码") private String insideCode; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java index 9dc1d9f2c6..7cedd65910 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java @@ -8,9 +8,7 @@ import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import java.util.List; import java.util.Map; /** @@ -29,15 +27,7 @@ import java.util.Map; @Mapper public interface BusVehicleApplyMapper extends BaseMapper { - //@Update("update bus_vehicle_apply 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 bus_vehicle_apply") - List selectListVo(); - int updateFlowFiled(Map map); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml index 2bd278a833..3821d03a73 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml @@ -4,7 +4,13 @@ - - UPDATE bus_vehicle_apply SET nodeState=#{nodeState} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java index e6ecd154b5..6801376730 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java @@ -1,10 +1,7 @@ package com.yxt.anrui.base.biz.busvehicleapply; import cn.hutool.core.bean.BeanUtil; -import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDto; -import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign; -import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyQuery; -import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo; +import com.yxt.anrui.base.api.busvehicleapply.*; import com.yxt.anrui.base.api.busvehicleapply.flow.BusVehicleApplyCompleteDto; import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery; import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo; @@ -65,9 +62,9 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign { @Override @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchSid/{sid}") - public ResultBean fetchSid(@PathVariable("sid") String sid) { + public ResultBean fetchSid(@PathVariable("sid") String sid) { ResultBean rb = ResultBean.fireFail(); - BusVehicleApplyVo vo = busVehicleApplyService.fetchAllBySid(sid); + BusVehicleApplyDetailsVo vo = busVehicleApplyService.fetchAllBySid(sid); return rb.success().setData(vo); } 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 3c6b4a0d1f..a2b95e533a 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 @@ -5,10 +5,7 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply; -import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDto; -import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyQuery; -import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo; +import com.yxt.anrui.base.api.busvehicleapply.*; import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery; import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo; import com.yxt.anrui.base.api.busvehicleapply.flow.SubmitBusVehicleApplyDto; @@ -33,6 +30,7 @@ import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -67,49 +65,38 @@ public class BusVehicleApplyService extends MybatisBaseService createQueryWrapper(BusVehicleApplyQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - String applicationDateStart = query.getApplicationDateStart(); - String applicationDateEnd = query.getApplicationDateEnd(); - - qw.apply(StringUtils.isNotEmpty(applicationDateStart), "date_format (bva.applicationDate,'%Y-%m-%d') >= date_format('" + applicationDateStart + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(applicationDateEnd), "date_format (bva.applicationDate,'%Y-%m-%d') <= date_format('" + applicationDateEnd + "','%Y-%m-%d')" - ); - if (StringUtils.isNotBlank(query.getModelName())) { - qw.like("bvad.vehicleName", query.getModelName()); - } - return qw; - } - + /** + * 分页列表 + * + * @param pq 查询条件 + * @return + */ public PagerVo listPageVo(PagerQuery pq) { BusVehicleApplyQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); + QueryWrapper qw = new QueryWrapper<>(); + BusVehicleApplyQuery params = pq.getParams(); + if (params != null) { + String applicationDateStart = query.getApplicationDateStart(); + String applicationDateEnd = query.getApplicationDateEnd(); + qw.apply(StringUtils.isNotBlank(applicationDateStart), "date_format (bva.applicationDate,'%Y-%m-%d') >= date_format('" + applicationDateStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(applicationDateEnd), "date_format (bva.applicationDate,'%Y-%m-%d') <= date_format('" + applicationDateEnd + "','%Y-%m-%d')" + ); + if (StringUtils.isNotBlank(query.getModelName())) { + qw.like("bvad.vehicleName", query.getModelName()); + } + } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = p.getRecords(); - for (BusVehicleApplyVo record : records) { - String createBySid = record.getCreateBySid(); - ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(createBySid); - String name = sysUserVoResultBean.getData().getName(); - record.setCreateByName(name); - if (StringUtils.isBlank(record.getNodeState())) { - record.setNodeState("待提交"); - } - } return p; } - - public BusVehicleApplyVo fetchByIdVo(String id) { - BusVehicleApply entity = this.fetchById(id); - BusVehicleApplyVo vo = new BusVehicleApplyVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - + /** + * 批量删除 + * + * @param sids 排产申请sid数组 + */ + @Transactional(rollbackFor = Exception.class) public void delAllBySids(String[] sids) { this.delBySids(sids); for (String sid : sids) { @@ -117,13 +104,19 @@ public class BusVehicleApplyService extends MybatisBaseService busVehicleApplyDetailVos = busVehicleApplyDetailService.fetchByApplySid(sid); - busVehicleApplyVo.setBusVehicleApplyDetailVoList(busVehicleApplyDetailVos); - return busVehicleApplyVo; + busVehicleApplyDetailsVo.setBusVehicleApplyDetailVoList(busVehicleApplyDetailVos); + return busVehicleApplyDetailsVo; } /** @@ -270,7 +263,7 @@ public class BusVehicleApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId()); + bv.setModelId(ProcDefEnum.VEHICLEAPPLY.getProDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); 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 b7a1f15a4d..a0b25c57ec 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 @@ -13,7 +13,7 @@ public enum ProcDefEnum { FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"), ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), ARREARSCARRYVEHICLE("欠款提车审批流程", "arrears_carryvehicle:1:232589"), - VEHICLEAPPLY("排产申请流程", "process_9egcg169:3:247512"),//TODO + VEHICLEAPPLY("排产申请流程", "process_9egcg169:4:255004"),//TODO RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:245028"), SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ), 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 501ccc4f92..0694cecde2 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 @@ -319,7 +319,7 @@ public class SysUserRest implements SysUserFeign { String captcha = redisUtil.get(uuid); List list = JSONObject.parseArray(captcha, Map.class); - /* if (StringUtils.isEmpty(verifyCode)) { + if (StringUtils.isEmpty(verifyCode)) { return new ResultBean().fail().setMsg("验证码不能为空"); } @@ -384,7 +384,7 @@ public class SysUserRest implements SysUserFeign { isCorrect = true; } else { return new ResultBean().fail().setMsg("验证码错误"); - }*/ + } if (StringUtils.isBlank(userName)) { return new ResultBean().fail().setMsg("用户名不能为空"); } @@ -580,6 +580,6 @@ public class SysUserRest implements SysUserFeign { @Override public ResultBean>> getUserByOrgSid(String orgSid, String userSid) { - return sysUserService.getUserByOrgSid(orgSid,userSid); + return sysUserService.getUserByOrgSid(orgSid, userSid); } }