Browse Source

修改

master
ligaode 3 days ago
parent
commit
be838ac432
  1. 51
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java
  2. 46
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java
  3. 46
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java
  4. 14
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java
  5. 20
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java
  6. 28
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java
  7. 173
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyRest.java
  8. 941
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java

51
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java

@ -28,64 +28,53 @@ package com.yxt.anrui.as.api.asoldparthandleapply;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity; import com.yxt.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApply.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApply <br/>
* Description: 旧件处理申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "旧件处理申请", description = "旧件处理申请") @ApiModel(value = "旧件处理申请", description = "旧件处理申请")
@TableName("as_oldparthandle_apply") @TableName("as_oldparthandle_apply")
public class AsOldparthandleApply extends BaseEntity { public class AsOldparthandleApply extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("制单人姓名") @ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名 private String createByName; // 制单人姓名
@ApiModelProperty("发起部门sid") @ApiModelProperty("发起部门sid")
private String deptSid; // 发起部门sid private String deptSid; // 发起部门sid
@ApiModelProperty("发起部门名称") @ApiModelProperty("发起部门名称")
private String deptName; // 发起部门名称 private String deptName; // 发起部门名称
@ApiModelProperty("单据编号") @ApiModelProperty("单据编号")
private String billNo; // 单据编号 private String billNo; // 单据编号
@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
private String filePath; // 附件路径(多个附件之间英文逗号隔开) private String filePath; // 附件路径(多个附件之间英文逗号隔开)
@ApiModelProperty("处理原因key") @ApiModelProperty("处理原因key")
private String handleReasonKey; // 处理原因key private String handleReasonKey; // 处理原因key
@ApiModelProperty("处理原因value") @ApiModelProperty("处理原因value")
private String handleReasonValue; // 处理原因value private String handleReasonValue; // 处理原因value
@ApiModelProperty("处理方式key") @ApiModelProperty("处理方式key")
private String handleModeKey; // 处理方式key private String handleModeKey; // 处理方式key
@ApiModelProperty("处理方式value") @ApiModelProperty("处理方式value")
private String handleModeValue; // 处理方式value private String handleModeValue; // 处理方式value
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName; // 分公司名称
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private String taskId; // 任务id private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("办结时间") @ApiModelProperty("办结时间")
private Date finishTime; // 办结时间 private Date finishTime; // 办结时间
} }

46
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java

@ -25,7 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.as.api.asoldparthandleapply; package com.yxt.anrui.as.api.asoldparthandleapply;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
@ -40,19 +39,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyVo.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo <br/>
* Description: 旧件处理申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "旧件处理申请 视图数据详情", description = "旧件处理申请 视图数据详情") @ApiModel(value = "旧件处理申请 视图数据详情", description = "旧件处理申请 视图数据详情")
public class AsOldparthandleApplyDetailsVo implements Vo { public class AsOldparthandleApplyDetailsVo implements Vo {
@ -63,7 +49,7 @@ public class AsOldparthandleApplyDetailsVo implements Vo {
private String remarks; private String remarks;
@ApiModelProperty("制单人sid") @ApiModelProperty("制单人sid")
private String createBySid; private String createBySid;
@ApiModelProperty("制单人姓名") @ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名 private String createByName; // 制单人姓名
@ApiModelProperty("发起部门sid") @ApiModelProperty("发起部门sid")
private String deptSid; // 发起部门sid private String deptSid; // 发起部门sid
@ -72,34 +58,34 @@ public class AsOldparthandleApplyDetailsVo implements Vo {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("申请日期") @ApiModelProperty("申请日期")
private Date createTime; private Date createTime;
@ApiModelProperty("单据编号") @ApiModelProperty("单据编号")
private String billNo; // 单据编号 private String billNo; // 单据编号
@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
private List<String> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开) private List<String> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开)
@ApiModelProperty("处理原因key") @ApiModelProperty("处理原因key")
private String handleReasonKey; // 处理原因key private String handleReasonKey; // 处理原因key
@ApiModelProperty("处理原因value") @ApiModelProperty("处理原因value")
private String handleReasonValue; // 处理原因value private String handleReasonValue; // 处理原因value
@ApiModelProperty("处理方式key") @ApiModelProperty("处理方式key")
private String handleModeKey; // 处理方式key private String handleModeKey; // 处理方式key
@ApiModelProperty("处理方式value") @ApiModelProperty("处理方式value")
private String handleModeValue; // 处理方式value private String handleModeValue; // 处理方式value
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName; // 分公司名称
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private String taskId; // 任务id private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("办结时间") @ApiModelProperty("办结时间")
private Date finishTime; // 办结时间 private Date finishTime; // 办结时间
@ApiModelProperty("待处理旧件列表") @ApiModelProperty("待处理旧件列表")
private List<AsOldparthandleDetailsVo> asOldparthandleList; private List<AsOldparthandleDetailsVo> asOldparthandleList;

46
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java

@ -25,7 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.as.api.asoldparthandleapply; package com.yxt.anrui.as.api.asoldparthandleapply;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
@ -39,19 +38,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyDto.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDto <br/>
* Description: 旧件处理申请 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "旧件处理申请 数据传输对象", description = "旧件处理申请 数据传输对象") @ApiModel(value = "旧件处理申请 数据传输对象", description = "旧件处理申请 数据传输对象")
public class AsOldparthandleApplyDto implements Dto { public class AsOldparthandleApplyDto implements Dto {
@ -62,7 +48,7 @@ public class AsOldparthandleApplyDto implements Dto {
private String remarks; private String remarks;
@ApiModelProperty("制单人sid") @ApiModelProperty("制单人sid")
private String createBySid; private String createBySid;
@ApiModelProperty("制单人姓名") @ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名 private String createByName; // 制单人姓名
@ApiModelProperty("发起部门sid") @ApiModelProperty("发起部门sid")
private String deptSid; // 发起部门sid private String deptSid; // 发起部门sid
@ -71,34 +57,34 @@ public class AsOldparthandleApplyDto implements Dto {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("申请日期") @ApiModelProperty("申请日期")
private Date createTime; private Date createTime;
@ApiModelProperty("单据编号") @ApiModelProperty("单据编号")
private String billNo; // 单据编号 private String billNo; // 单据编号
@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
private List<String> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开) private List<String> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开)
@ApiModelProperty("处理原因key") @ApiModelProperty("处理原因key")
private String handleReasonKey; // 处理原因key private String handleReasonKey; // 处理原因key
@ApiModelProperty("处理原因value") @ApiModelProperty("处理原因value")
private String handleReasonValue; // 处理原因value private String handleReasonValue; // 处理原因value
@ApiModelProperty("处理方式key") @ApiModelProperty("处理方式key")
private String handleModeKey; // 处理方式key private String handleModeKey; // 处理方式key
@ApiModelProperty("处理方式value") @ApiModelProperty("处理方式value")
private String handleModeValue; // 处理方式value private String handleModeValue; // 处理方式value
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName; // 分公司名称
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private String taskId; // 任务id private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("办结时间") @ApiModelProperty("办结时间")
private Date finishTime; // 办结时间 private Date finishTime; // 办结时间
@ApiModelProperty("待处理旧件列表") @ApiModelProperty("待处理旧件列表")
private List<AsOldparthandleDto> asOldparthandleList = new ArrayList<>(); private List<AsOldparthandleDto> asOldparthandleList = new ArrayList<>();

14
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java

@ -25,7 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.as.api.asoldparthandleapply; package com.yxt.anrui.as.api.asoldparthandleapply;
import com.yxt.common.core.query.Query; import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@ -34,19 +33,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyQuery.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyQuery <br/>
* Description: 旧件处理申请 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "旧件处理申请 查询条件", description = "旧件处理申请 查询条件") @ApiModel(value = "旧件处理申请 查询条件", description = "旧件处理申请 查询条件")
public class AsOldparthandleApplyQuery implements Query { public class AsOldparthandleApplyQuery implements Query {

20
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java

@ -25,28 +25,16 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.as.api.asoldparthandleapply; package com.yxt.anrui.as.api.asoldparthandleapply;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyVo.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo <br/>
* Description: 旧件处理申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "旧件处理申请 视图数据对象", description = "旧件处理申请 视图数据对象") @ApiModel(value = "旧件处理申请 视图数据对象", description = "旧件处理申请 视图数据对象")
public class AsOldparthandleApplyVo implements Vo { public class AsOldparthandleApplyVo implements Vo {
@ -75,8 +63,8 @@ public class AsOldparthandleApplyVo implements Vo {
private String handleModeValue; private String handleModeValue;
@ApiModelProperty("收益总额") @ApiModelProperty("收益总额")
private String profitTotal; private String profitTotal;
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; private String procDefId;
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstId; private String procInstId;
} }

28
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java

@ -38,35 +38,19 @@ import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyMapper.java <br/>
* Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyMapper <br/>
* Description: 旧件处理申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper @Mapper
public interface AsOldparthandleApplyMapper extends BaseMapper<AsOldparthandleApply> { public interface AsOldparthandleApplyMapper extends BaseMapper<AsOldparthandleApply> {
//@Update("update as_oldparthandle_apply set name=#{msg} where id=#{id}") IPage<AsOldparthandleApplyVo> selectPageVo(IPage<AsOldparthandleApply> page, @Param(Constants.WRAPPER) Wrapper<AsOldparthandleApply> qw);
//IPage<AsOldparthandleApplyVo> voPage(IPage<AsOldparthandleApply> page, @Param(Constants.WRAPPER) QueryWrapper<AsOldparthandleApply> qw);
IPage<AsOldparthandleApplyVo> selectPageVo(IPage<AsOldparthandleApply> page, @Param(Constants.WRAPPER) Wrapper<AsOldparthandleApply> qw); List<AsOldparthandleApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsOldparthandleApply> qw);
List<AsOldparthandleApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsOldparthandleApply> qw); @Select("select * from as_oldparthandle_apply")
List<AsOldparthandleApplyVo> selectListVo();
@Select("select * from as_oldparthandle_apply") int selectBySid(String join);
List<AsOldparthandleApplyVo> selectListVo();
int selectBySid(String join); int updateFlowFiled(Map<String, Object> map);
int updateFlowFiled(Map<String, Object> map);
String selectNum(String billNo); String selectNum(String billNo);
} }

173
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyRest.java

@ -47,105 +47,92 @@ import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDto;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.List; import java.util.List;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyRest <br/>
* Description: 旧件处理申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "旧件处理申请") @Api(tags = "旧件处理申请")
@RestController @RestController
@RequestMapping("v1/asoldparthandleapply") @RequestMapping("v1/asoldparthandleapply")
public class AsOldparthandleApplyRest { public class AsOldparthandleApplyRest {
@Autowired @Autowired
private AsOldparthandleApplyService asOldparthandleApplyService; private AsOldparthandleApplyService asOldparthandleApplyService;
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage") @PostMapping("/listPage")
public ResultBean<PagerVo<AsOldparthandleApplyVo>> listPage(@RequestBody PagerQuery<AsOldparthandleApplyQuery> pq){ public ResultBean<PagerVo<AsOldparthandleApplyVo>> listPage(@RequestBody PagerQuery<AsOldparthandleApplyQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
PagerVo<AsOldparthandleApplyVo> pv = asOldparthandleApplyService.listPageVo(pq); PagerVo<AsOldparthandleApplyVo> pv = asOldparthandleApplyService.listPageVo(pq);
return rb.success().setData(pv); return rb.success().setData(pv);
} }
@ApiOperation("新增或修改") @ApiOperation("新增或修改")
@PostMapping("/save") @PostMapping("/save")
public ResultBean save(@RequestBody AsOldparthandleApplyDto dto){ public ResultBean save(@RequestBody AsOldparthandleApplyDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
asOldparthandleApplyService.saveOrUpdateDto(dto); asOldparthandleApplyService.saveOrUpdateDto(dto);
return rb.success(); return rb.success();
} }
@ApiOperation("根据sid批量删除") @ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids") @DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){ public ResultBean delBySids(@RequestBody String[] sids) {
return asOldparthandleApplyService.delAll(sids); return asOldparthandleApplyService.delAll(sids);
} }
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}") @GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AsOldparthandleApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){ public ResultBean<AsOldparthandleApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
AsOldparthandleApplyDetailsVo vo = asOldparthandleApplyService.fetchDetailsVoBySid(sid); AsOldparthandleApplyDetailsVo vo = asOldparthandleApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@ApiOperation("提交审批流程") @ApiOperation("提交审批流程")
@PostMapping("/submit") @PostMapping("/submit")
public ResultBean submit(@RequestBody @Valid SubmitAsOldparthandleApplyDto dto) { public ResultBean submit(@RequestBody @Valid SubmitAsOldparthandleApplyDto dto) {
return asOldparthandleApplyService.submit(dto); return asOldparthandleApplyService.submit(dto);
} }
@ApiOperation(value = "办理(同意)") @ApiOperation(value = "办理(同意)")
@PostMapping("/complete") @PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody AsOldparthandleApplyCompleteDto query) { public ResultBean complete(@Valid @RequestBody AsOldparthandleApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv); BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId());
return asOldparthandleApplyService.complete(bv); return asOldparthandleApplyService.complete(bv);
} }
@ApiOperation(value = "获取上一个环节") @ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject") @GetMapping(value = "/getPreviousNodesForReject")
public ResultBean<List<AsOldparthandleApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) { public ResultBean<List<AsOldparthandleApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) {
return asOldparthandleApplyService.getPreviousNodesForReject(query); return asOldparthandleApplyService.getPreviousNodesForReject(query);
} }
@ApiOperation(value = "获取下一个环节") @ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit") @GetMapping(value = "/getNextNodesForSubmit")
public ResultBean<List<AsOldparthandleApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) { public ResultBean<List<AsOldparthandleApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) {
return asOldparthandleApplyService.getNextNodesForSubmit(query); return asOldparthandleApplyService.getNextNodesForSubmit(query);
} }
@ApiOperation(value = "驳回任务") @ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject") @PostMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) { public ResultBean reject(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) {
return asOldparthandleApplyService.reject(query); return asOldparthandleApplyService.reject(query);
} }
@ApiOperation(value = "撤回流程") @ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess") @PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) { public ResultBean revokeProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) {
return asOldparthandleApplyService.revokeProcess(query); return asOldparthandleApplyService.revokeProcess(query);
} }
@ApiOperation(value = "终止任务") @ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess") @PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) { public ResultBean breakProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) {
return asOldparthandleApplyService.breakProcess(query); return asOldparthandleApplyService.breakProcess(query);
} }
@ApiOperation(value = "加签") @ApiOperation(value = "加签")
@PostMapping(value = "/delegate") @PostMapping(value = "/delegate")
public ResultBean delegate(@RequestBody AsOldparthandleApplyDelegateQuery query) { public ResultBean delegate(@RequestBody AsOldparthandleApplyDelegateQuery query) {
return asOldparthandleApplyService.delegate(query); return asOldparthandleApplyService.delegate(query);
} }
} }

941
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java

@ -33,12 +33,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
import com.yxt.anrui.as.api.asoldparthandleapply.flowable.*; import com.yxt.anrui.as.api.asoldparthandleapply.flowable.*;
import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo;
import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto;
import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApply;
import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyQuery;
import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyVo;
import com.yxt.anrui.as.api.asoldpartreturnapply.flowable.*;
import com.yxt.anrui.as.biz.asoldparthandle.AsOldparthandleService; import com.yxt.anrui.as.biz.asoldparthandle.AsOldparthandleService;
import com.yxt.anrui.as.feign.base.billno.Rule; import com.yxt.anrui.as.feign.base.billno.Rule;
import com.yxt.anrui.as.feign.flowable.flow.*; import com.yxt.anrui.as.feign.flowable.flow.*;
@ -74,505 +68,492 @@ import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyService.java <br/>
* Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyService <br/>
* Description: 旧件处理申请 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service @Service
public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthandleApplyMapper, AsOldparthandleApply> { public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthandleApplyMapper, AsOldparthandleApply> {
@Autowired @Autowired
private FileUploadComponent fileUploadComponent; private FileUploadComponent fileUploadComponent;
@Autowired @Autowired
private SysOrganizationFeign sysOrganizationFeign; private SysOrganizationFeign sysOrganizationFeign;
@Autowired @Autowired
private SysStaffOrgFeign sysStaffOrgFeign; private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired @Autowired
private SysUserFeign sysUserFeign; private SysUserFeign sysUserFeign;
@Autowired @Autowired
private FlowableFeign flowableFeign; private FlowableFeign flowableFeign;
@Autowired @Autowired
private FlowTaskFeign flowTaskFeign; private FlowTaskFeign flowTaskFeign;
@Autowired @Autowired
private FlowFeign flowFeign; private FlowFeign flowFeign;
@Autowired @Autowired
private MessageFeign messageFeign; private MessageFeign messageFeign;
@Autowired @Autowired
private AsOldparthandleService asOldparthandleService; private AsOldparthandleService asOldparthandleService;
public PagerVo<AsOldparthandleApplyVo> listPageVo(PagerQuery<AsOldparthandleApplyQuery> pq) { public PagerVo<AsOldparthandleApplyVo> listPageVo(PagerQuery<AsOldparthandleApplyQuery> pq) {
AsOldparthandleApplyQuery query = pq.getParams(); AsOldparthandleApplyQuery query = pq.getParams();
QueryWrapper<AsOldparthandleApply> qw = new QueryWrapper<>(); QueryWrapper<AsOldparthandleApply> qw = new QueryWrapper<>();
//========================================数据授权开始 //========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) { if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath()); privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl()); privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid()); privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid()); privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人) //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath(); String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/"; orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/"); int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1); int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1); int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1); int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData(); String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) { if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1); orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath); qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) { } else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2); orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath); qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) { } else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3); orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath); qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) { } else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4); orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath); qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) { } else if ("5".equals(orgLevelKey)) {
qw.eq("aoa.createBySid", query.getUserSid()); qw.eq("aoa.createBySid", query.getUserSid());
} else { } else {
PagerVo<AsOldparthandleApplyVo> p = new PagerVo<>(); PagerVo<AsOldparthandleApplyVo> p = new PagerVo<>();
return p; return p;
} }
} else { } else {
PagerVo<AsOldparthandleApplyVo> p = new PagerVo<>(); PagerVo<AsOldparthandleApplyVo> p = new PagerVo<>();
return p; return p;
} }
} }
if (StringUtils.isNotBlank(query.getUseOrgName())){ if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("aoa.useOrgName",query.getUseOrgName()); qw.like("aoa.useOrgName", query.getUseOrgName());
} }
if (StringUtils.isNotBlank(query.getCreateDeptName())){ if (StringUtils.isNotBlank(query.getCreateDeptName())) {
qw.like("aoa.deptName",query.getCreateDeptName()); qw.like("aoa.deptName", query.getCreateDeptName());
} }
if (StringUtils.isNotBlank(query.getCreateByName())){ if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("aoa.createByName",query.getCreateByName()); qw.like("aoa.createByName", query.getCreateByName());
} }
if (StringUtils.isNotBlank(query.getBillNo())){ if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("aoa.billNo",query.getBillNo()); qw.like("aoa.billNo", query.getBillNo());
} }
if (StringUtils.isNotBlank(query.getHandleReasonKey())){ if (StringUtils.isNotBlank(query.getHandleReasonKey())) {
qw.like("aoa.handleReasonKey",query.getHandleReasonKey()); qw.like("aoa.handleReasonKey", query.getHandleReasonKey());
} }
if (StringUtils.isNotBlank(query.getHandleModeKey())){ if (StringUtils.isNotBlank(query.getHandleModeKey())) {
qw.like("aoa.handleModeKey",query.getHandleModeKey()); qw.like("aoa.handleModeKey", query.getHandleModeKey());
} }
String createStartTime = query.getCreateStartTime(); String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime(); String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (aoa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (aoa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (aoa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" apply(StringUtils.isNotEmpty(createEndTime), "date_format (aoa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
); );
String finishStartTime = query.getFinishStartTime(); String finishStartTime = query.getFinishStartTime();
String finishEndTime = query.getFinishEndTime(); String finishEndTime = query.getFinishEndTime();
qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (aoa.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')"). qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (aoa.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(finishEndTime), "date_format (aoa.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" apply(StringUtils.isNotEmpty(finishEndTime), "date_format (aoa.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
); );
qw.groupBy("aoa.sid"); qw.groupBy("aoa.sid");
qw.orderByDesc("aoa.createTime"); qw.orderByDesc("aoa.createTime");
IPage<AsOldparthandleApply> page = PagerUtil.queryToPage(pq); IPage<AsOldparthandleApply> page = PagerUtil.queryToPage(pq);
IPage<AsOldparthandleApplyVo> pagging = baseMapper.selectPageVo(page, qw); IPage<AsOldparthandleApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AsOldparthandleApplyVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<AsOldparthandleApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }
public String saveOrUpdateDto(AsOldparthandleApplyDto dto){ public String saveOrUpdateDto(AsOldparthandleApplyDto dto) {
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
List<AsOldparthandleDto> asOldparthandleList = dto.getAsOldparthandleList(); List<AsOldparthandleDto> asOldparthandleList = dto.getAsOldparthandleList();
String deptSid = dto.getDeptSid(); String deptSid = dto.getDeptSid();
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
dto.setUseOrgSid(useOrgSid); dto.setUseOrgSid(useOrgSid);
dto.setUseOrgName(organizationVo.getName()); dto.setUseOrgName(organizationVo.getName());
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
//生成单据编号 //生成单据编号
String billNo = ""; String billNo = "";
String date = DateUtil.format(DateUtil.date(), "yyyyMM"); String date = DateUtil.format(DateUtil.date(), "yyyyMM");
billNo = "JJCL" + organizationVo.getOrgCode() + date; billNo = "JJCL" + organizationVo.getOrgCode() + date;
String i = baseMapper.selectNum(billNo); String i = baseMapper.selectNum(billNo);
if (StringUtils.isNotBlank(i)) { if (StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
} else { } else {
billNo = Rule.getBillNo(billNo, 0); billNo = Rule.getBillNo(billNo, 0);
} }
dto.setBillNo(billNo); dto.setBillNo(billNo);
String sid = this.insertByDto(dto); String sid = this.insertByDto(dto);
for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) { for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) {
asOldparthandleDto.setMainSid(sid); asOldparthandleDto.setMainSid(sid);
asOldparthandleService.insertByDto(asOldparthandleDto); asOldparthandleService.insertByDto(asOldparthandleDto);
} }
return sid; return sid;
} }
this.updateByDto(dto); this.updateByDto(dto);
asOldparthandleService.delByMainSid(dtoSid); asOldparthandleService.delByMainSid(dtoSid);
for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) { for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) {
asOldparthandleDto.setMainSid(dtoSid); asOldparthandleDto.setMainSid(dtoSid);
asOldparthandleService.insertByDto(asOldparthandleDto); asOldparthandleService.insertByDto(asOldparthandleDto);
} }
return dtoSid; return dtoSid;
} }
public String insertByDto(AsOldparthandleApplyDto dto){ public String insertByDto(AsOldparthandleApplyDto dto) {
AsOldparthandleApply entity = new AsOldparthandleApply(); AsOldparthandleApply entity = new AsOldparthandleApply();
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
List<String> filePaths = dto.getFilePaths(); List<String> filePaths = dto.getFilePaths();
String url = ""; String url = "";
for (String filePath : filePaths) { for (String filePath : filePaths) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
url = url + filePath + ","; url = url + filePath + ",";
} }
entity.setFilePath(url); entity.setFilePath(url);
entity.setNodeState("待提交"); entity.setNodeState("待提交");
baseMapper.insert(entity); baseMapper.insert(entity);
return entity.getSid(); return entity.getSid();
} }
public void updateByDto(AsOldparthandleApplyDto dto){ public void updateByDto(AsOldparthandleApplyDto dto) {
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
return; return;
} }
AsOldparthandleApply entity = fetchBySid(dtoSid); AsOldparthandleApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity); baseMapper.updateById(entity);
} }
public AsOldparthandleApplyDetailsVo fetchDetailsVoBySid(String sid){ public AsOldparthandleApplyDetailsVo fetchDetailsVoBySid(String sid) {
AsOldparthandleApply entity = fetchBySid(sid); AsOldparthandleApply entity = fetchBySid(sid);
AsOldparthandleApplyDetailsVo vo = new AsOldparthandleApplyDetailsVo(); AsOldparthandleApplyDetailsVo vo = new AsOldparthandleApplyDetailsVo();
BeanUtil.copyProperties(entity, vo); BeanUtil.copyProperties(entity, vo);
String filePath = entity.getFilePath(); String filePath = entity.getFilePath();
String[] filePaths = filePath.split(","); String[] filePaths = filePath.split(",");
List<String> urlPahts = new ArrayList<>(); List<String> urlPahts = new ArrayList<>();
for (String path : filePaths) { for (String path : filePaths) {
String url = fileUploadComponent.getUrlPrefix() + path; String url = fileUploadComponent.getUrlPrefix() + path;
urlPahts.add(url); urlPahts.add(url);
} }
vo.setFilePaths(urlPahts); vo.setFilePaths(urlPahts);
List<AsOldparthandleDetailsVo> asOldpartreturnDetailsVos = asOldparthandleService.selByMainSid(sid); List<AsOldparthandleDetailsVo> asOldpartreturnDetailsVos = asOldparthandleService.selByMainSid(sid);
vo.setAsOldparthandleList(asOldpartreturnDetailsVos); vo.setAsOldparthandleList(asOldpartreturnDetailsVos);
return vo; return vo;
} }
public ResultBean delAll(String[] sids) { public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
//查询该sid中是否有流程不是待提交的 //查询该sid中是否有流程不是待提交的
int count = baseMapper.selectBySid(StringUtils.join(sids, ",")); int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
if (count > 0) { if (count > 0) {
return rb.setMsg("删除的数据中包含已提交或已办结审批的数据,删除失败"); return rb.setMsg("删除的数据中包含已提交或已办结审批的数据,删除失败");
} }
delBySids(sids); delBySids(sids);
for (String sid : sids) { for (String sid : sids) {
asOldparthandleService.delByMainSid(sid); asOldparthandleService.delByMainSid(sid);
} }
return rb.success(); return rb.success();
} }
public ResultBean submit(SubmitAsOldparthandleApplyDto dto) { public ResultBean submit(SubmitAsOldparthandleApplyDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
AsOldparthandleApply asOldparthandleApply = fetchBySid(dto.getSid()); AsOldparthandleApply asOldparthandleApply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, asOldparthandleApply); int r = submitBusinessData(dto, asOldparthandleApply);
if (r == 3) { if (r == 3) {
return rb.setMsg("该申请不存在"); return rb.setMsg("该申请不存在");
} }
if (r == 0) { if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致"); return rb.setMsg("操作失败!提交的数据不一致");
} }
//新增修改保存 //新增修改保存
String businessSid = saveOrUpdateDto(dto); String businessSid = saveOrUpdateDto(dto);
asOldparthandleApply = fetchBySid(businessSid); asOldparthandleApply = fetchBySid(businessSid);
//创建BusinessVariables实体对象 //创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。 //流程中的参数赋值、若有网关,则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
//用户的部门全路径sid //用户的部门全路径sid
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData();
bv.setOrgSidPath(deptVo.getOrgSidPath()); bv.setOrgSidPath(deptVo.getOrgSidPath());
//业务sid //业务sid
bv.setBusinessSid(businessSid); bv.setBusinessSid(businessSid);
//用户sid //用户sid
bv.setUserSid(asOldparthandleApply.getCreateBySid()); bv.setUserSid(asOldparthandleApply.getCreateBySid());
//若app移动端有此功能,则传递appMap参数 //若app移动端有此功能,则传递appMap参数
Map<String, Object> appMap = new HashMap<>(); Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid); appMap.put("sid", businessSid);
//需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。
variables.put("app", appMap); variables.put("app", appMap);
//流程定义id //流程定义id
bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId());
bv.setFormVariables(variables); bv.setFormVariables(variables);
if (r == 1) { if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData(); UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo)); updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送 //极光推送
asOldparthandleApply = fetchBySid(businessSid); asOldparthandleApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo(); MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo); BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap); messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid); messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("旧件处理申请"); messageFlowableQuery.setModuleName("旧件处理申请");
messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("旧件处理申请"); messageFlowableQuery.setMsgTitle("旧件处理申请");
messageFeign.pushMessage(messageFlowableQuery); messageFeign.pushMessage(messageFlowableQuery);
return voResultBean; return voResultBean;
} }
if (r == 2) { if (r == 2) {
// ToDo:驳回到发起人后再次提交 // ToDo:驳回到发起人后再次提交
if (StringUtils.isBlank(dto.getInstanceId())) { if (StringUtils.isBlank(dto.getInstanceId())) {
return rb.setMsg("参数错误:instanceId"); return rb.setMsg("参数错误:instanceId");
} }
bv.setTaskId(asOldparthandleApply.getTaskId()); bv.setTaskId(asOldparthandleApply.getTaskId());
bv.setTaskDefKey(asOldparthandleApply.getNodeId()); bv.setTaskDefKey(asOldparthandleApply.getNodeId());
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(dto.getInstanceId()); bv.setInstanceId(dto.getInstanceId());
return complete(bv); return complete(bv);
} }
return rb; return rb;
} }
private synchronized int submitBusinessData(SubmitAsOldparthandleApplyDto dto, AsOldparthandleApply asOldparthandleApply) { private synchronized int submitBusinessData(SubmitAsOldparthandleApplyDto dto, AsOldparthandleApply asOldparthandleApply) {
int r = 0; int r = 0;
if (StringUtils.isBlank(dto.getSid())) { if (StringUtils.isBlank(dto.getSid())) {
r = 1; r = 1;
} else { } else {
if (asOldparthandleApply != null) { if (asOldparthandleApply != null) {
String businessTaskId = asOldparthandleApply.getTaskId(); String businessTaskId = asOldparthandleApply.getTaskId();
if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) { if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
//新提交 //新提交
r = 1; r = 1;
} else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
//二次提交//只有数据一致的时候才能进行下一步 //二次提交//只有数据一致的时候才能进行下一步
r = 2; r = 2;
} }
} else { } else {
r = 3; r = 3;
} }
} }
return r; return r;
} }
private int updateFlowFiled(Map<String, Object> map) { private int updateFlowFiled(Map<String, Object> map) {
return baseMapper.updateFlowFiled(map); return baseMapper.updateFlowFiled(map);
} }
public ResultBean complete(BusinessVariables bv) { public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
String businessSid = bv.getBusinessSid(); String businessSid = bv.getBusinessSid();
AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid); AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid);
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>(); Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid); appMap.put("sid", businessSid);
variables.put("app", appMap); variables.put("app", appMap);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
if (StringUtils.isBlank(asOldparthandleApply.getProcDefId())) { if (StringUtils.isBlank(asOldparthandleApply.getProcDefId())) {
flowProcessMapQuery.setProDefKey(bv.getModelId()); flowProcessMapQuery.setProDefKey(bv.getModelId());
} else { } else {
flowProcessMapQuery.setProDefKey(asOldparthandleApply.getProcDefId()); flowProcessMapQuery.setProDefKey(asOldparthandleApply.getProcDefId());
} }
flowProcessMapQuery.setVariables(variables); flowProcessMapQuery.setVariables(variables);
variables = flowableFeign.getMap(flowProcessMapQuery).getData(); variables = flowableFeign.getMap(flowProcessMapQuery).getData();
//======================================= //=======================================
bv.setFormVariables(variables); bv.setFormVariables(variables);
//用户的部门全路径sid //用户的部门全路径sid
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData();
bv.setOrgSidPath(deptVo.getOrgSidPath()); bv.setOrgSidPath(deptVo.getOrgSidPath());
if (bv.getTaskId().equals(asOldparthandleApply.getTaskId())) { if (bv.getTaskId().equals(asOldparthandleApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
UpdateFlowFieldVo ufVo = resultBean.getData(); UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
} else { } else {
//极光推送 //极光推送
asOldparthandleApply = fetchBySid(businessSid); asOldparthandleApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo(); MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo); BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(asOldparthandleApply.getProcDefId()); ufVo.setProcDefId(asOldparthandleApply.getProcDefId());
ufVo.setProcInsId(asOldparthandleApply.getProcInstId()); ufVo.setProcInsId(asOldparthandleApply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap); messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid); messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("旧件处理申请"); messageFlowableQuery.setModuleName("旧件处理申请");
messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("旧件处理申请"); messageFlowableQuery.setMsgTitle("旧件处理申请");
messageFeign.pushMessage(messageFlowableQuery); messageFeign.pushMessage(messageFlowableQuery);
} }
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
} else { } else {
return rb.setMsg("操作失败!提交的数据不一致"); return rb.setMsg("操作失败!提交的数据不一致");
} }
} }
public ResultBean<List<AsOldparthandleApplyNodeVo>> getPreviousNodesForReject(AsOldparthandleApplyNodeQuery query) { public ResultBean<List<AsOldparthandleApplyNodeVo>> getPreviousNodesForReject(AsOldparthandleApplyNodeQuery query) {
ResultBean<List<AsOldparthandleApplyNodeVo>> rb = ResultBean.fireFail(); ResultBean<List<AsOldparthandleApplyNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv); BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo //判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<AsOldparthandleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList()); List<AsOldparthandleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList); return rb.success().setData(voList);
} }
public ResultBean<List<AsOldparthandleApplyNodeVo>> getNextNodesForSubmit(AsOldparthandleApplyNodeQuery query) { public ResultBean<List<AsOldparthandleApplyNodeVo>> getNextNodesForSubmit(AsOldparthandleApplyNodeQuery query) {
ResultBean<List<AsOldparthandleApplyNodeVo>> rb = ResultBean.fireFail(); ResultBean<List<AsOldparthandleApplyNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv); BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo //判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<AsOldparthandleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList()); List<AsOldparthandleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList); return rb.success().setData(voList);
} }
public ResultBean reject(AsOldparthandleApplyTaskQuery query) { public ResultBean reject(AsOldparthandleApplyTaskQuery query) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
String businessSid = query.getBusinessSid(); String businessSid = query.getBusinessSid();
AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid); AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid);
if (asOldparthandleApply == null) { if (asOldparthandleApply == null) {
return rb.setMsg("该申请不存在"); return rb.setMsg("该申请不存在");
} }
String businessTaskId = asOldparthandleApply.getTaskId(); String businessTaskId = asOldparthandleApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) { if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) { if (businessTaskId.equals(query.getTaskId())) {
if (StringUtils.isBlank(query.getComment())) { if (StringUtils.isBlank(query.getComment())) {
return rb.setMsg("请填写意见"); return rb.setMsg("请填写意见");
} }
if (StringUtils.isBlank(query.getUserSid())) { if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid"); return rb.setMsg("参数错误:userSid");
} }
FlowTaskVo flowTaskVo = new FlowTaskVo(); FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo); BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>(); Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid); appMap.put("sid", businessSid);
variables.put("app", appMap); variables.put("app", appMap);
flowTaskVo.setValues(variables); flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo); ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
UpdateFlowFieldVo ufVo = resultBean.getData(); UpdateFlowFieldVo ufVo = resultBean.getData();
Map<String, Object> map = BeanUtil.beanToMap(ufVo); Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数 //更新业务中的流程相关的参数
updateFlowFiled(map); updateFlowFiled(map);
//极光推送 //极光推送
asOldparthandleApply = fetchBySid(businessSid); asOldparthandleApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo(); MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo); BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = asOldparthandleApply.getProcInstId(); String procId = asOldparthandleApply.getProcInstId();
ufVo.setProcInsId(procId); ufVo.setProcInsId(procId);
ufVo.setProcDefId(asOldparthandleApply.getProcDefId()); ufVo.setProcDefId(asOldparthandleApply.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap); messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid); messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("旧件处理申请"); messageFlowableQuery.setModuleName("旧件处理申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId); ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(asOldparthandleApply.getCreateBySid())) { if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(asOldparthandleApply.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else { } else {
messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
} }
messageFlowableQuery.setMsgTitle("旧件处理申请"); messageFlowableQuery.setMsgTitle("旧件处理申请");
messageFeign.pushMessage(messageFlowableQuery); messageFeign.pushMessage(messageFlowableQuery);
return rb.success(); return rb.success();
} }
} }
return rb.setMsg("操作失败!提交的数据不一致!"); return rb.setMsg("操作失败!提交的数据不一致!");
} }
public ResultBean revokeProcess(AsOldparthandleApplyTaskQuery query) { public ResultBean revokeProcess(AsOldparthandleApplyTaskQuery query) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getUserSid())) { if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid"); return rb.setMsg("参数错误:userSid");
} }
AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid()); AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid());
String businessTaskId = asOldparthandleApply.getTaskId(); String businessTaskId = asOldparthandleApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) { if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) { if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo(); FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo); BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo); ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
} }
} }
return rb.setMsg("操作失败,提交的数据不一致!"); return rb.setMsg("操作失败,提交的数据不一致!");
} }
public ResultBean breakProcess(AsOldparthandleApplyTaskQuery query) { public ResultBean breakProcess(AsOldparthandleApplyTaskQuery query) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getInstanceId())) { if (StringUtils.isBlank(query.getInstanceId())) {
return rb.setMsg("参数错误:instanceId"); return rb.setMsg("参数错误:instanceId");
} }
if (StringUtils.isBlank(query.getUserSid())) { if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid"); return rb.setMsg("参数错误:userSid");
} }
if (StringUtils.isBlank(query.getComment())) { if (StringUtils.isBlank(query.getComment())) {
return rb.setMsg("请填写意见"); return rb.setMsg("请填写意见");
} }
AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid()); AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid());
String businessTaskId = asOldparthandleApply.getTaskId(); String businessTaskId = asOldparthandleApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) { if (StringUtils.isNotBlank(businessTaskId)) {
if (query.getUserSid().equals(asOldparthandleApply.getCreateBySid())) { if (query.getUserSid().equals(asOldparthandleApply.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo(); FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo); BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo); ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData()); Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map); updateFlowFiled(map);
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
} else { } else {
if (businessTaskId.equals(query.getTaskId())) { if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo(); FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo); BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo); ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData()); Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map); updateFlowFiled(map);
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
} }
} }
} }
return rb.setMsg("操作失败!提交的数据不一致!"); return rb.setMsg("操作失败!提交的数据不一致!");
} }
public ResultBean delegate(AsOldparthandleApplyDelegateQuery query) { public ResultBean delegate(AsOldparthandleApplyDelegateQuery query) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
FlowDelegateQuery delegateQuery = new FlowDelegateQuery(); FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
BeanUtil.copyProperties(query, delegateQuery); BeanUtil.copyProperties(query, delegateQuery);
flowFeign.delegate(delegateQuery); flowFeign.delegate(delegateQuery);
return rb.success(); return rb.success();
} }
} }
Loading…
Cancel
Save