Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java

@@ -27,18 +27,30 @@ import java.math.BigDecimal;
 public class BusVehicleApply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("申请日期")
+    @ApiModelProperty("申请日期")
     private String applicationDate;
     @ApiModelProperty("申请人姓名")
     private String createByName;
-	@ApiModelProperty("排产类型:计划/临时/厂家任务/客户订单")
+    @ApiModelProperty("排产类型:计划/临时/厂家任务/客户订单")
     private String schedulingType;
-	@ApiModelProperty("销售订单sid 可为空，只有客户订单时才有")
+    @ApiModelProperty("销售订单sid 可为空，只有客户订单时才有")
     private String salesSid;
-	@ApiModelProperty("申请编号")
+    @ApiModelProperty("申请编号")
     private String applicationCode;
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createByDeptSid;
     @ApiModelProperty("当前订金金额")
     private BigDecimal currentAmount;
+
+    @ApiModelProperty(value = "节点状态")
+    private String nodeState;
+    @ApiModelProperty(value = "节点id")
+    private String nodeId;
+    @ApiModelProperty(value = "流程id")
+    private String procDefId;
+    @ApiModelProperty(value = "实例id")
+    private String procInstId;
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java

@@ -6,6 +6,7 @@ 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 io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(进销存) <br/>
@@ -63,6 +65,12 @@ public interface BusVehicleApplyFeign {
 
     @ApiOperation("提交排产申请审批流程")
     @PostMapping("/submitVehicleApply")
-    public ResultBean submitVehicleApply(@RequestBody @Valid SubmitBusVehicleApplyDto dto);
+    public ResultBean submitVehicleApply(@Valid @RequestBody SubmitBusVehicleApplyDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables);
+
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java

@@ -6,6 +6,8 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * Project: anrui-scm(进销存) <br/>
  * File: BusVehicleApplyFeignFallback.java <br/>
@@ -57,4 +59,9 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign {
     public ResultBean submitVehicleApply(SubmitBusVehicleApplyDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean complete(Map<String, Object> variables) {
+        return null;
+    }
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java

@@ -56,4 +56,5 @@ public class BusVehicleApplyVo implements Vo {
     private String nodeState; // nodeState
     @ApiModelProperty("车辆排产申请详情")
     private List<BusVehicleApplyDetailVo> busVehicleApplyDetailVoList; // 车辆排产申请详情
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(进销存) <br/>
@@ -28,13 +29,15 @@ import java.util.List;
 @Mapper
 public interface BusVehicleApplyMapper extends BaseMapper<BusVehicleApply> {
 
-	//@Update("update bus_vehicle_apply set name=#{msg} where id=#{id}")
-	//IPage<BusVehicleApplyVo> voPage(IPage<BusVehicleApply> page, @Param(Constants.WRAPPER) QueryWrapper<BusVehicleApply> qw);
-	
-	IPage<BusVehicleApplyVo> selectPageVo(IPage<BusVehicleApply> page, @Param(Constants.WRAPPER) Wrapper<BusVehicleApply> qw);
-	
-	List<BusVehicleApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusVehicleApply> qw);
-	
-	@Select("select * from bus_vehicle_apply")
-	List<BusVehicleApplyVo> selectListVo();
+    //@Update("update bus_vehicle_apply set name=#{msg} where id=#{id}")
+    //IPage<BusVehicleApplyVo> voPage(IPage<BusVehicleApply> page, @Param(Constants.WRAPPER) QueryWrapper<BusVehicleApply> qw);
+
+    IPage<BusVehicleApplyVo> selectPageVo(IPage<BusVehicleApply> page, @Param(Constants.WRAPPER) Wrapper<BusVehicleApply> qw);
+
+    List<BusVehicleApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusVehicleApply> qw);
+
+    @Select("select * from bus_vehicle_apply")
+    List<BusVehicleApplyVo> selectListVo();
+
+    int updateFlowFiled(Map<String, Object> map);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml

@@ -1,16 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.base.biz.busvehicleapply.BusVehicleApplyMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo">
-		SELECT DISTINCT bva.* FROM bus_vehicle_apply bva
-		LEFT JOIN bus_vehicle_apply_detail bvad
-		ON bva.sid = bvad.`applySid`
-		<where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo">
-		SELECT * FROM bus_vehicle_apply <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo">
+        SELECT DISTINCT bva.*
+        FROM bus_vehicle_apply bva
+                 LEFT JOIN bus_vehicle_apply_detail bvad
+                           ON bva.sid = bvad.`applySid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo">
+        SELECT *
+        FROM bus_vehicle_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <update id="updateFlowFiled">
+        UPDATE bus_vehicle_apply
+        SET nodeState=#{nodeState}
+          , nodeId=#{taskDefKey}
+        <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>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java

@@ -5,6 +5,8 @@ import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyQuery;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
 import com.yxt.anrui.base.api.busvehicleapply.flow.SubmitBusVehicleApplyDto;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -13,6 +15,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 /**
  * Project: anrui-scm(进销存) <br/>
  * File: BusVehicleApplyFeignFallback.java <br/>
@@ -79,4 +83,18 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign {
     public ResultBean submitVehicleApply(SubmitBusVehicleApplyDto dto) {
         return busVehicleApplyService.submitVehicleApply(dto);
     }
+
+    @Override
+    public ResultBean complete(Map<String, Object> variables) {
+        BusinessVariables bv = BusinessVariables.builder().build();
+        bv.setUserSid(variables.get("userSid").toString());
+        bv.setOrgSidPath(variables.get("orgSidPath").toString());
+        bv.setTaskDefKey(variables.get("taskDefKey").toString());
+        bv.setTaskId(variables.get("taskId").toString());
+        bv.setInstanceId(variables.get("instanceId").toString());
+        bv.setComment(variables.get("comment").toString());
+        bv.setBusinessSid(variables.get("businessSid").toString());
+        bv.setModelId(ProcDefEnum.VEHICLEAPPLY.getProDefId());
+        return busVehicleApplyService.complete(bv);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -12,7 +12,10 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
 import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService;
+import com.yxt.anrui.flowable.api.flow.FlowableFeign;
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.sysformlink.*;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -57,6 +60,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysFormLinkFeign sysFormLinkFeign;
+    @Autowired
+    private FlowableFeign flowableFeign;
 
     public PagerVo<BusVehicleApply> listPage(PagerQuery<BusVehicleApplyQuery> pq) {
         BusVehicleApplyQuery query = pq.getParams();
@@ -246,13 +251,45 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         //创建BusinessVariables实体对象
         BusinessVariables bv = BusinessVariables.builder().build();
+        Map<String, Object> variables = BeanUtil.beanToMap(dto);
+        variables.put("businessSid", businessSid);
         bv.setOrgSidPath(orgSidPath);
+        bv.setBusinessSid(businessSid);
+        bv.setUserSid(dto.getCreateBySid());
+        bv.setFormVariables(variables);
+        bv.setModelId(ProcDefEnum.VEHICLEAPPLY.getProDefId());
+        if (StringUtils.isBlank(dto.getTaskId())) { // 新提交
+            //启动流程
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            return voResultBean;
+        } else { // 驳回到发起人后再次提交
+            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setInstanceId(dto.getInstanceId());
+            return complete(bv);
+        }
+    }
 
-        // ???待完善(根据虚拟订单审批流程)
-        Map<String, Object> variables = new HashMap<>();
-        variables.put("businessSid", businessSid);
-        variables.put("isLoan", true);
+    /**
+     * 更新流程相关的状态
+     *
+     * @param map
+     * @return
+     */
+    private int updateFlowFiled(Map<String, Object> map) {
+        return baseMapper.updateFlowFiled(map);
+    }
 
+    /**
+     * 办理
+     *
+     * @param bv
+     * @return
+     */
+    public ResultBean complete(BusinessVariables bv) {
+        ResultBean<UpdateFlowFieldVo> rb = flowableFeign.handleProsess(bv);
+        updateFlowFiled(BeanUtil.beanToMap(rb.getData()));
         return rb;
     }
 

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -13,7 +13,7 @@ public enum ProcDefEnum {
     FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
     ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
     ARREARSCARRYVEHICLE("欠款提车审批流程", "arrears_carryvehicle:1:232589"),
-    VEHICLEAPPLY("排产申请流程", "process_9egcg169:1:242660"),//TODO
+    VEHICLEAPPLY("排产申请流程", "process_9egcg169:3:247512"),//TODO
     RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:245028"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),