职称备案申请流程接口开发，备案状态提交、办结、终止时修改对应的状态

yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleVo.java

@@ -51,6 +51,8 @@ public class AsTechTitleVo implements Vo {
 
     private String sid;
 
+    @ApiModelProperty("备案状态")
+    private String state;
 	@ApiModelProperty("职称名称")
     private String titleNameValue;
 	@ApiModelProperty("权重")
@@ -63,6 +65,4 @@ public class AsTechTitleVo implements Vo {
     private String techName;
 	@ApiModelProperty("排序")
     private Integer sortNo;
-    @ApiModelProperty("备案状态")
-    private String filingState;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/flowable/CompleteTechTitleApplyDto.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.as.api.astechtitleapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class CompleteTechTitleApplyDto {
+
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/flowable/SubmitTechTitleApplyDto.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.as.api.astechtitleapply.flowable;
+
+import com.yxt.anrui.as.api.asbwdiffapply.AsBwdiffapplyDto;
+import com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class SubmitTechTitleApplyDto extends AsTechTitleApplyDto {
+
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/flowable/TechTitleApplyDelegateQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.as.api.astechtitleapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class TechTitleApplyDelegateQuery {
+
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/flowable/TechTitleApplyNodeQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.as.api.astechtitleapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class TechTitleApplyNodeQuery {
+
+    @ApiModelProperty(value = "环节定义id")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/flowable/TechTitleApplyNodeVo.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.as.api.astechtitleapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class TechTitleApplyNodeVo {
+
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/flowable/TechTitleApplyTaskQuery.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.as.api.astechtitleapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class TechTitleApplyTaskQuery {
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java

@@ -68,4 +68,7 @@ public interface AsTechTitleMapper extends BaseMapper<AsTechTitle> {
 
 	@Select("select * from as_tech_title where sid = #{sid} and isDelete = '0'")
 	AsTechTitle fetchIsDeleteBySid(String sid);
+
+	@Update("update as_tech_title set state = #{state} where sid = #{sid}")
+	void updateState(@Param("sid") String sid,@Param("state") String state);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java

@@ -128,9 +128,12 @@ public class AsTechTitleService extends MybatisBaseService<AsTechTitleMapper, As
 		IPage<AsTechTitle> page = PagerUtil.queryToPage(pq);
 		IPage<AsTechTitleVo> pagging = baseMapper.selectPageVo(page, qw);
 		for (AsTechTitleVo record : pagging.getRecords()) {
-			String nodeState = asTechTitleApplyService.selNodeState(record.getSid());
-			if ("已办结".equals(nodeState)){
-				//record.
+			if ("1".equals(record.getState())){
+				record.setState("未备案");
+			}else if ("2".equals(record.getState())){
+				record.setState("备案中");
+			}else if ("0".equals(record.getState())){
+				record.setState("已备案");
 			}
 		}
 		PagerVo<AsTechTitleVo> p = PagerUtil.pageToVo(pagging, null);
@@ -213,4 +216,8 @@ public class AsTechTitleService extends MybatisBaseService<AsTechTitleMapper, As
 			baseMapper.updateIsDeleteBySid(sid);
 		}
 	}
+
+	public void updateState(String sid, String state) {
+		baseMapper.updateState(sid,state);
+	}
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyMapper.java

@@ -31,11 +31,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApply;
 import com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyVo;
 
-import java.util.List;
+import java.util.Map;
 
 /**
  * Project: yxt-as(维修技师职称备案申请) <br/>
@@ -59,5 +58,5 @@ public interface AsTechTitleApplyMapper extends BaseMapper<AsTechTitleApply> {
 
 	String selectNum(String billNo);
 
-    String selNodeState(String titleSid);
+    int updateFlowFiled(Map<String, Object> beanToMap);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyMapper.xml

@@ -24,13 +24,21 @@
 				limit 1
 	</select>
 
-	<select id="selNodeState" resultType="java.lang.String">
-		SELECT
-				a.`nodeState`
-		FROM
-				as_tech_title_apply a
-						LEFT JOIN as_tech_title_detail d
-						ON a.`sid` = d.`mainSid`
-		WHERE d.titleSid = #{titleSid}
-    </select>
+	<update id="updateFlowFiled">
+		UPDATE as_tech_title_apply
+		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
+		<if test="nodeState == '已办结' or nodeState == '终止'">
+			, finishTime = NOW()
+		</if>
+		<if test="procDefId != null and procDefId != ''">
+			, procDefId=#{procDefId}
+		</if>
+		<if test="procInsId != null and procInsId != ''">
+			, procInstId=#{procInsId}
+		</if>
+		<if test="taskId != null and taskId != ''">
+			, taskId=#{taskId}
+		</if>
+		WHERE sid=#{sid}
+    </update>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyRest.java

@@ -25,12 +25,17 @@
  *********************************************************/
 package com.yxt.anrui.as.biz.astechtitleapply;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.as.api.asbwdiffapply.flowable.*;
+import com.yxt.anrui.as.api.astechtitleapply.flowable.*;
+import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyQuery;
@@ -38,6 +43,9 @@ import com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyVo;
 import com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyDetailsVo;
 import com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyDto;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * Project: yxt-as(维修技师职称备案申请) <br/>
  * File: AsTechTitleApplyFeignFallback.java <br/>
@@ -94,4 +102,56 @@ public class AsTechTitleApplyRest {
 		AsTechTitleApplyDetailsVo vo = asTechTitleApplyService.init(techSids);
 		return rb.success().setData(vo);
 	}
+
+	@ApiOperation("提交")
+	@PostMapping("/submitApply")
+	public ResultBean submitApply(@Valid @RequestBody SubmitTechTitleApplyDto dto) {
+		return asTechTitleApplyService.submitApply(dto);
+	}
+
+	@ApiOperation(value = "办理（同意）")
+	@PostMapping("/complete")
+	public ResultBean complete(@Valid @RequestBody CompleteTechTitleApplyDto query) {
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId("");
+		return asTechTitleApplyService.complete(bv);
+	}
+
+	@ApiOperation(value = "获取上一个环节")
+	@GetMapping(value = "/getPreviousNodesForReject")
+	ResultBean<List<TechTitleApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap TechTitleApplyNodeQuery query) {
+		return asTechTitleApplyService.getPreviousNodesForReject(query);
+	}
+
+	@ApiOperation(value = "获取下一个环节")
+	@GetMapping(value = "/getNextNodesForSubmit")
+	ResultBean<List<TechTitleApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap TechTitleApplyNodeQuery query) {
+		return asTechTitleApplyService.getNextNodesForSubmit(query);
+	}
+
+	@ApiOperation(value = "驳回任务")
+	@PostMapping(value = "/reject")
+	public ResultBean taskReject(@Valid @RequestBody TechTitleApplyTaskQuery query) {
+		return asTechTitleApplyService.taskReject(query);
+	}
+
+	@ApiOperation(value = "撤回流程")
+	@PostMapping(value = "/revokeProcess")
+	public ResultBean revokeProcess(@Valid @RequestBody TechTitleApplyTaskQuery query) {
+		return asTechTitleApplyService.revokeProcess(query);
+	}
+
+	@ApiOperation(value = "终止任务")
+	@PostMapping(value = "/breakProcess")
+	public ResultBean breakProcess(@Valid @RequestBody TechTitleApplyTaskQuery query) {
+		return asTechTitleApplyService.breakProcess(query);
+	}
+
+	@ApiOperation(value = "加签")
+	@PostMapping(value = "/delegate")
+	@ResponseBody
+	public ResultBean delegate(@RequestBody TechTitleApplyDelegateQuery query) {
+		return asTechTitleApplyService.delegate(query);
+	}
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java

@@ -27,13 +27,14 @@ package com.yxt.anrui.as.biz.astechtitleapply;
 
 import cn.hutool.core.bean.BeanUtil;
 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.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.as.api.asappendix.AsAppendix;
-import com.yxt.anrui.as.api.asbwdiffapply.AsBwdiffapplyFile;
-import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo;
 import com.yxt.anrui.as.api.astechtitle.AsTechTitle;
 import com.yxt.anrui.as.api.astechtitleapply.*;
+import com.yxt.anrui.as.api.astechtitleapply.flowable.*;
 import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetail;
 import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetailDetailsVo;
 import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetailDto;
@@ -42,10 +43,18 @@ import com.yxt.anrui.as.biz.astechtitle.AsTechTitleService;
 import com.yxt.anrui.as.biz.astechtitledetail.AsTechTitleDetailService;
 import com.yxt.anrui.as.feign.base.billno.Rule;
 import com.yxt.anrui.as.feign.file.AsFileEnum;
+import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
 import com.yxt.anrui.as.feign.flowable.flow.FlowableFeign;
+import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum;
+import com.yxt.anrui.as.feign.flowable.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery;
 import com.yxt.anrui.as.feign.flowable.flow2.FlowFeign;
 import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskFeign;
+import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskVo;
+import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo;
 import com.yxt.anrui.as.feign.message.MessageFeign;
+import com.yxt.anrui.as.feign.message.MessageFlowVo;
+import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
 import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
@@ -59,12 +68,13 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
 
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
 
 /**
  * Project: yxt-as(维修技师职称备案申请) <br/>
@@ -104,7 +114,7 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
 	private AsTechTitleService asTechTitleService;
 	@Autowired
 	private AsAppendixService asAppendixService;
-	
+
 	public PagerVo<AsTechTitleApplyVo> listPageVo(PagerQuery<AsTechTitleApplyQuery> pq) {
 		AsTechTitleApplyQuery query = pq.getParams();
 		QueryWrapper<AsTechTitleApply> qw = new QueryWrapper<>();
@@ -175,7 +185,7 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
 		PagerVo<AsTechTitleApplyVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
-	
+
 	public ResultBean<String> saveOrUpdateDto(AsTechTitleApplyDto dto){
 		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
@@ -213,7 +223,7 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
 				asAppendixService.save(asAppendix);
 			}
 			return rb.success().setData(sid);
-        } 
+        }
 		this.updateByDto(dto);
 		asTechTitleDetailService.delByMainSid(dtoSid);
 		asAppendixService.delByLinkSid(dtoSid);
@@ -231,7 +241,7 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
 		}
 		return rb.success().setData(dtoSid);
 	}
-	
+
 	public String insertByDto(AsTechTitleApplyDto dto){
 		AsTechTitleApply entity = new AsTechTitleApply();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
@@ -239,17 +249,17 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
 		baseMapper.insert(entity);
 		return entity.getSid();
 	}
-	
+
 	public void updateByDto(AsTechTitleApplyDto dto){
           String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
+        }
 		AsTechTitleApply entity = fetchBySid(dtoSid);
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.updateById(entity);
 	}
-	
+
 	public AsTechTitleApplyDetailsVo fetchDetailsVoBySid(String sid){
 		AsTechTitleApply entity = fetchBySid(sid);
 		AsTechTitleApplyDetailsVo vo = new AsTechTitleApplyDetailsVo();
@@ -311,7 +321,325 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
 		return asTechTitleApplyDetailsVo;
 	}
 
-	public String selNodeState(String titleSid) {
-		return baseMapper.selNodeState(titleSid);
+	public ResultBean submitApply(SubmitTechTitleApplyDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		AsTechTitleApply asTechTitleApply = fetchBySid(dto.getSid());
+		int r = submitBusinessData(dto, asTechTitleApply);
+		if (r == 3) {
+			return rb.setMsg("该申请不存在");
+		}
+		if (r == 0) {
+			return rb.setMsg("操作失败!提交的数据不一致");
+		}
+		String businessSid = saveOrUpdateDto(dto).getData();
+		asTechTitleApply = fetchBySid(businessSid);
+		//创建BusinessVariables实体对象
+		BusinessVariables bv = new BusinessVariables();
+		//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+		Map<String, Object> variables = new HashMap<>();
+		Map<String, Object> appMap = new HashMap<>();
+		appMap.put("sid", businessSid);
+		variables.put("app", appMap);
+		//用户的部门全路径sid
+		SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asTechTitleApply.getDeptSid()).getData();
+		if (sysOrganization != null) {
+			bv.setOrgSidPath(sysOrganization.getOrgSidPath());
+		}
+		bv.setBusinessSid(businessSid);
+		bv.setUserSid(dto.getCreateBySid());
+		bv.setFormVariables(variables);
+		if (r == 1) {
+			//ToDo:流程定义id
+			bv.setModelId(ProcDefEnum.ASTECHTITLEAPPLY.getProDefId());
+			ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
+			if (!voResultBean.getSuccess()) {
+				return rb.setMsg(voResultBean.getMsg());
+			}
+			UpdateFlowFieldVo ufVo = voResultBean.getData();
+			updateFlowFiled(BeanUtil.beanToMap(ufVo));
+			//提交后修改职称管理中备案状态为备案中
+			List<AsTechTitleDetailDto> asTechTitleDetailDetailsList = dto.getAsTechTitleDetailDetailsList();
+			for (AsTechTitleDetailDto asTechTitleDetailDto : asTechTitleDetailDetailsList) {
+				asTechTitleService.updateState(asTechTitleDetailDto.getTitleSid(),"2");
+			}
+			asTechTitleApply = fetchBySid(businessSid);
+			//==================================添加线程
+			try {
+				ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+						.setNameFormat("demo-pool-%d").build();
+				ExecutorService pool = new ThreadPoolExecutor(2, 100,
+						0L, TimeUnit.MILLISECONDS,
+						new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+				AsTechTitleApply finalAsTechTitleApply = asTechTitleApply;
+				Future future1 = pool.submit(() -> {
+					//极光推送
+					MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+					MessageFlowVo messageFlowVo = new MessageFlowVo();
+					BeanUtil.copyProperties(ufVo, messageFlowVo);
+					messageFlowableQuery.setUfVo(messageFlowVo);
+					messageFlowableQuery.setAppMap(appMap);
+					messageFlowableQuery.setBusinessSid(businessSid);
+					messageFlowableQuery.setModuleName("维修技师职称备案申请");
+					messageFlowableQuery.setMsgContent(finalAsTechTitleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+					messageFlowableQuery.setMsgTitle("维修技师职称备案申请");
+					ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+				});
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			//==================================添加线程
+			return voResultBean;
+		}
+		if (r == 2) {
+			// ToDo:驳回到发起人后再次提交
+			if (StringUtils.isBlank(dto.getInstanceId())) {
+				return rb.setMsg("参数错误：instanceId");
+			}
+			bv.setTaskId(asTechTitleApply.getTaskId());
+			bv.setTaskDefKey(asTechTitleApply.getNodeId());
+			bv.setComment("重新提交");
+			bv.setInstanceId(dto.getInstanceId());
+			return complete(bv);
+		}
+		return rb;
+	}
+
+	private int updateFlowFiled(Map<String, Object> beanToMap) {
+		return baseMapper.updateFlowFiled(beanToMap);
+	}
+
+
+	private int submitBusinessData(SubmitTechTitleApplyDto dto, AsTechTitleApply asTechTitleApply) {
+		int r = 0;
+		if (StringUtils.isBlank(dto.getSid())) {
+			r = 1;
+		} else {
+			if (asTechTitleApply != null) {
+				String businessTaskId = asTechTitleApply.getTaskId();
+				if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+					//新提交
+					r = 1;
+				} else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+					//二次提交//只有数据一致的时候才能进行下一步
+					r = 2;
+				}
+			} else {
+				r = 3;
+			}
+		}
+		return r;
+	}
+
+	public ResultBean complete(BusinessVariables bv) {
+		ResultBean rb = ResultBean.fireFail();
+		String businessSid = bv.getBusinessSid();
+		AsTechTitleApply asTechTitleApply = fetchBySid(businessSid);
+		Map<String, Object> variables = new HashMap<>();
+		Map<String, Object> appMap = new HashMap<>();
+		appMap.put("sid", businessSid);
+		variables.put("app", appMap);
+		bv.setFormVariables(variables);
+		SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asTechTitleApply.getDeptSid()).getData();
+		if (sysOrganization != null) {
+			bv.setOrgSidPath(sysOrganization.getOrgSidPath());
+		}
+		bv.setModelId(asTechTitleApply.getProcDefId());
+		if (bv.getTaskId().equals(asTechTitleApply.getTaskId())) {
+			ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
+			if (!resultBean.getSuccess()) {
+				return rb.setMsg(resultBean.getMsg());
+			}
+			UpdateFlowFieldVo ufVo = resultBean.getData();
+			updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+			if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+				//办结后修改职称管理中备案状态为已备案
+				List<AsTechTitleDetailDetailsVo> asTechTitleDetailDetailsVos = asTechTitleDetailService.selByMainSid(businessSid);
+				for (AsTechTitleDetailDetailsVo asTechTitleDetailDetailsVo : asTechTitleDetailDetailsVos) {
+					asTechTitleService.updateState(asTechTitleDetailDetailsVo.getTitleSid(),"0");
+				}
+			} else {
+				//极光推送
+				asTechTitleApply = fetchBySid(businessSid);
+				MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+				MessageFlowVo messageFlowVo = new MessageFlowVo();
+				BeanUtil.copyProperties(ufVo, messageFlowVo);
+				messageFlowVo.setProcDefId(asTechTitleApply.getProcDefId());
+				messageFlowVo.setProcInsId(asTechTitleApply.getProcInstId());
+				messageFlowableQuery.setUfVo(messageFlowVo);
+				messageFlowableQuery.setAppMap(appMap);
+				messageFlowableQuery.setBusinessSid(businessSid);
+				messageFlowableQuery.setModuleName("维修技师职称备案申请");
+				messageFlowableQuery.setMsgContent(asTechTitleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+				messageFlowableQuery.setMsgTitle("维修技师职称备案申请");
+				ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+			}
+			return rb.success().setData(resultBean.getData());
+		} else {
+			return rb.setMsg("操作失败!提交的数据不一致");
+		}
+	}
+
+	public ResultBean<List<TechTitleApplyNodeVo>> getPreviousNodesForReject(TechTitleApplyNodeQuery query) {
+		ResultBean<List<TechTitleApplyNodeVo>> rb = ResultBean.fireFail();
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		AsTechTitleApply asTechTitleApply = fetchBySid(query.getBusinessSid());
+		bv.setModelId(asTechTitleApply.getProcDefId());
+		ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+		//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
+		List<TechTitleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), TechTitleApplyNodeVo.class)).collect(Collectors.toList());
+		return rb.success().setData(voList);
+	}
+
+	public ResultBean<List<TechTitleApplyNodeVo>> getNextNodesForSubmit(TechTitleApplyNodeQuery query) {
+		ResultBean<List<TechTitleApplyNodeVo>> rb = ResultBean.fireFail();
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		AsTechTitleApply asTechTitleApply = fetchBySid(query.getBusinessSid());
+		bv.setModelId(asTechTitleApply.getProcDefId());
+		ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+		//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
+		List<TechTitleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), TechTitleApplyNodeVo.class)).collect(Collectors.toList());
+		return rb.success().setData(voList);
+	}
+
+	public ResultBean taskReject(TechTitleApplyTaskQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		String businessSid = query.getBusinessSid();
+		AsTechTitleApply asTechTitleApply = fetchBySid(businessSid);
+		if (asTechTitleApply == null) {
+			return rb.setMsg("该申请不存在");
+		}
+		String businessTaskId = asTechTitleApply.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (businessTaskId.equals(query.getTaskId())) {
+				if (StringUtils.isBlank(query.getComment())) {
+					return rb.setMsg("请填写意见");
+				}
+				if (StringUtils.isBlank(query.getUserSid())) {
+					return rb.setMsg("参数错误：userSid");
+				}
+				FlowTaskVo flowTaskVo = new FlowTaskVo();
+				BeanUtil.copyProperties(query, flowTaskVo);
+				Map<String, Object> variables = new HashMap<>();
+				Map<String, Object> appMap = new HashMap<>();
+				appMap.put("sid", businessSid);
+				variables.put("app", appMap);
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+				if (!resultBean.getSuccess()) {
+					return rb.setMsg(resultBean.getMsg());
+				}
+				UpdateFlowFieldVo ufVo = resultBean.getData();
+				Map<String, Object> map = BeanUtil.beanToMap(ufVo);
+				//更新业务中的流程相关的参数
+				updateFlowFiled(map);
+				//极光推送
+				asTechTitleApply = fetchBySid(businessSid);
+				MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+				MessageFlowVo messageFlowVo = new MessageFlowVo();
+				BeanUtil.copyProperties(ufVo, messageFlowVo);
+				String procId = asTechTitleApply.getProcInstId();
+				messageFlowVo.setProcInsId(procId);
+				messageFlowVo.setProcDefId(asTechTitleApply.getProcDefId());
+				messageFlowableQuery.setUfVo(messageFlowVo);
+				messageFlowableQuery.setAppMap(appMap);
+				messageFlowableQuery.setBusinessSid(businessSid);
+				messageFlowableQuery.setModuleName("维修技师职称备案申请");
+				ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+				String nextName = listResultBean.getData().get(0).getName_();
+				String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+				if ("发起申请".equals(nextName)) {
+					messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+				} else {
+					messageFlowableQuery.setMsgContent(asTechTitleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+				}
+
+				messageFlowableQuery.setMsgTitle("维修技师职称备案申请");
+				ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+				return rb.success();
+			}
+		}
+		return rb.setMsg("操作失败!提交的数据不一致!");
+	}
+
+	public ResultBean revokeProcess(TechTitleApplyTaskQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		if (StringUtils.isBlank(query.getUserSid())) {
+			return rb.setMsg("参数错误：userSid");
+		}
+		AsTechTitleApply asTechTitleApply = fetchBySid(query.getBusinessSid());
+		String businessTaskId = asTechTitleApply.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (businessTaskId.equals(query.getTaskId())) {
+				FlowTaskVo flowTaskVo = new FlowTaskVo();
+				BeanUtil.copyProperties(query, flowTaskVo);
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+				if (!resultBean.getSuccess()) {
+					return rb.setMsg(resultBean.getMsg());
+				}
+				updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+				return rb.success().setData(resultBean.getData());
+			}
+		}
+		return rb.setMsg("操作失败，提交的数据不一致!");
+	}
+
+	public ResultBean breakProcess(TechTitleApplyTaskQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		if (StringUtils.isBlank(query.getInstanceId())) {
+			return rb.setMsg("参数错误：instanceId");
+		}
+		if (StringUtils.isBlank(query.getUserSid())) {
+			return rb.setMsg("参数错误：userSid");
+		}
+		if (StringUtils.isBlank(query.getComment())) {
+			return rb.setMsg("请填写意见");
+		}
+		AsTechTitleApply asTechTitleApply = fetchBySid(query.getBusinessSid());
+		String businessTaskId = asTechTitleApply.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (query.getUserSid().equals(asTechTitleApply.getCreateBySid())) {
+				FlowTaskVo flowTaskVo = new FlowTaskVo();
+				BeanUtil.copyProperties(query, flowTaskVo);
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+				if (!resultBean.getSuccess()) {
+					return rb.setMsg(resultBean.getMsg());
+				}
+				Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+				updateFlowFiled(map);
+				//终止后修改职称管理中备案状态为未备案
+				List<AsTechTitleDetailDetailsVo> asTechTitleDetailDetailsVos = asTechTitleDetailService.selByMainSid(query.getBusinessSid());
+				for (AsTechTitleDetailDetailsVo asTechTitleDetailDetailsVo : asTechTitleDetailDetailsVos) {
+					asTechTitleService.updateState(asTechTitleDetailDetailsVo.getTitleSid(),"1");
+				}
+				return rb.success().setData(resultBean.getData());
+			} else {
+				if (businessTaskId.equals(query.getTaskId())) {
+					FlowTaskVo flowTaskVo = new FlowTaskVo();
+					BeanUtil.copyProperties(query, flowTaskVo);
+					ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+					if (!resultBean.getSuccess()) {
+						return rb.setMsg(resultBean.getMsg());
+					}
+					Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+					updateFlowFiled(map);
+					//终止后修改职称管理中备案状态为未备案
+					List<AsTechTitleDetailDetailsVo> asTechTitleDetailDetailsVos = asTechTitleDetailService.selByMainSid(query.getBusinessSid());
+					for (AsTechTitleDetailDetailsVo asTechTitleDetailDetailsVo : asTechTitleDetailDetailsVos) {
+						asTechTitleService.updateState(asTechTitleDetailDetailsVo.getTitleSid(),"1");
+					}
+					return rb.success().setData(resultBean.getData());
+				}
+			}
+		}
+		return rb.setMsg("操作失败!提交的数据不一致!");
+	}
+
+	public ResultBean delegate(TechTitleApplyDelegateQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
+		BeanUtil.copyProperties(query, delegateQuery);
+		flowFeign.delegate(delegateQuery);
+		return rb.success();
 	}
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java

@@ -15,6 +15,7 @@ public enum ProcDefEnum {
     ASBUSCLAIMCHECKAPPLY("索赔单调整申请", "process_7icw4lhq:1:11310004"),
     ASBWDIFFAPPLY("工单应收调差申请", "process_zcxxb6de:1:12097508"),
     ASBWINVOICEAPPLY("工单开票申请", "process_j8zlnkl1:1:12097504"),
+    ASTECHTITLEAPPLY("维修技师职称备案申请", ""),
     ;
 
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDetailsVo.java

@@ -97,5 +97,5 @@ public class WmsInventoryCheckbillReportDetailsVo implements Vo {
     List<WmsInventoryCheckbillReportSumVo> ware = new ArrayList<>();
 
     //库区盘点情况
-    List<WmsInventoryCheckbillReportSumVo> Area = new ArrayList<>();
+    List<WmsInventoryCheckbillReportSumVo> area = new ArrayList<>();
 }