印章归还申请提交工作流选择审批人修改

skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/SealApplyRevertController.java

@@ -106,22 +106,6 @@ public class SealApplyRevertController {
         sealApplyRevertService.updateRevertSealMationById(inputObject, outputObject);
     }
 
-    /**
-     *
-     * @Title: updateRevertSealMationToSave
-     * @Description: 编辑印章归还申请（已提交审批）
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @RequestMapping("/post/SealApplyRevertController/updateRevertSealMationToSave")
-    @ResponseBody
-    public void updateRevertSealMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception{
-        sealApplyRevertService.updateRevertSealMationToSave(inputObject, outputObject);
-    }
-
     /**
      *
      * @Title: editRevertSealToSubApproval

skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/SealApplyRevertService.java

@@ -27,8 +27,6 @@ public interface SealApplyRevertService {
 
     public void updateRevertSealMationById(InputObject inputObject, OutputObject outputObject) throws Exception;
 
-    public void updateRevertSealMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception;
-
     public void editRevertSealToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception;
 
     public void updateRevertSealToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception;

skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/SealApplyRevertServiceImpl.java

@@ -6,6 +6,8 @@ package com.skyeye.eve.service.impl;
 
 import cn.hutool.json.JSONUtil;
 import com.skyeye.activiti.factory.ActivitiRunFactory;
+import com.skyeye.activiti.service.ActivitiUserService;
+import com.skyeye.annotation.transaction.ActivitiAndBaseTransaction;
 import com.skyeye.common.constans.ActivitiConstants;
 import com.skyeye.common.constans.AdminAssistantConstants;
 import com.skyeye.common.object.InputObject;
@@ -44,6 +46,9 @@ public class SealApplyRevertServiceImpl implements SealApplyRevertService {
     @Autowired
     private SysEnclosureDao sysEnclosureDao;
 
+    @Autowired
+    private ActivitiUserService activitiUserService;
+
     /**
      * 印章归还关联的工作流的key
      */
@@ -75,7 +80,7 @@ public class SealApplyRevertServiceImpl implements SealApplyRevertService {
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void insertRevertSealMation(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String revertId = ToolUtil.getSurFaceId();//归还单主表id
@@ -95,11 +100,9 @@ public class SealApplyRevertServiceImpl implements SealApplyRevertService {
         map.put("createTime", DateUtil.getTimeAndToString());
         sealApplyRevertDao.insertSealRevertMation(map);
         sealApplyRevertDao.insertSealRevertGoodsMation(entitys);
-        // 判断是否提交审批
-        if("2".equals(subType)){
-            // 提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_SEAL_REVERT_PAGE_KEY).submitToActivi(revertId, ActivitiConstants.APPROVAL_ID);
-        }
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            ACTIVITI_SEAL_REVERT_PAGE_KEY, revertId, map.get("approvalId").toString());
     }
 
     private List<Map<String, Object>> getSealList(String sealRevertStr, String revertId, String state) throws Exception {
@@ -180,7 +183,7 @@ public class SealApplyRevertServiceImpl implements SealApplyRevertService {
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void updateRevertSealMationById(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String revertId = map.get("id").toString();//归还单主表id
@@ -195,39 +198,9 @@ public class SealApplyRevertServiceImpl implements SealApplyRevertService {
         sealApplyRevertDao.updateSealRevertMation(map);
         sealApplyRevertDao.deleteSealRevertGoodsMationById(map);
         sealApplyRevertDao.insertSealRevertGoodsMation(entitys);
-        // 判断是否提交审批
-        if("2".equals(subType)){
-            // 提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_SEAL_REVERT_PAGE_KEY).submitToActivi(revertId, ActivitiConstants.APPROVAL_ID);
-        }
-    }
-
-    /**
-     *
-     * @Title: updateRevertSealMationToSave
-     * @Description: 编辑印章归还申请（已提交审批）
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @Override
-    @Transactional(value="transactionManager")
-    public void updateRevertSealMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception {
-        Map<String, Object> map = inputObject.getParams();
-        String revertId = map.get("id").toString();//归还单主表id
-        // 处理数据
-        List<Map<String, Object>> entitys = getSealList(map.get("sealStr").toString(), revertId, "1");
-        if(entitys.size() == 0){
-            outputObject.setreturnMessage("请选择印章");
-            return;
-        }
-        sealApplyRevertDao.updateSealRevertMation(map);
-        sealApplyRevertDao.deleteSealRevertGoodsMationById(map);
-        sealApplyRevertDao.insertSealRevertGoodsMation(entitys);
-        // 编辑工作流中的数据
-        ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_SEAL_REVERT_PAGE_KEY).editApplyMationInActiviti(revertId);
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            ACTIVITI_SEAL_REVERT_PAGE_KEY, revertId, map.get("approvalId").toString());
     }
 
     /**
@@ -241,7 +214,7 @@ public class SealApplyRevertServiceImpl implements SealApplyRevertService {
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editRevertSealToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String revertId = map.get("id").toString();
@@ -252,7 +225,8 @@ public class SealApplyRevertServiceImpl implements SealApplyRevertService {
                 || ActivitiConstants.ActivitiState.NO_PASS.getState() == state
                 || ActivitiConstants.ActivitiState.REVOKE.getState() == state){
             // 草稿、审核不通过或者撤销状态下可以提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_SEAL_REVERT_PAGE_KEY).submitToActivi(revertId, ActivitiConstants.APPROVAL_ID);
+            activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
+                ACTIVITI_SEAL_REVERT_PAGE_KEY, revertId, map.get("approvalId").toString());
         }else{
             outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
         }

skyeye-admin-assistant/src/main/resources/reqmapping/mapping/assistant.xml

@@ -745,6 +745,7 @@
         <property id="sealStr" name="sealStr" ref="required,json" var="印章json串" />
         <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
         <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
+        <property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
     </url>
     <url id="sealrevert003" path="/post/SealApplyRevertController/queryRevertSealMationToDetails" val="印章归还申请详情" allUse="2" groupName="印章归还">
         <property id="rowId" name="id" ref="required" var="印章归还主表单id" />
@@ -758,19 +759,15 @@
         <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
         <property id="rowId" name="id" ref="required" var="印章归还主表单id" />
         <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
+        <property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
     </url>
     <url id="sealrevert006" path="/post/SealApplyRevertController/editRevertSealToSubApproval" val="印章归还申请提交审批" allUse="1" groupName="印章归还">
         <property id="rowId" name="id" ref="required" var="印章归还主表单id" />
+        <property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
     </url>
     <url id="sealrevert007" path="/post/SealApplyRevertController/updateRevertSealToCancellation" val="作废印章归还申请" allUse="1" groupName="印章归还">
         <property id="rowId" name="id" ref="required" var="印章归还主表单id" />
     </url>
-    <url id="sealrevert009" path="/post/SealApplyRevertController/updateRevertSealMationToSave" val="编辑印章归还申请（已提交审核）" allUse="2" groupName="印章归还">
-        <property id="remark" name="remark" ref="" var="描述" />
-        <property id="sealStr" name="sealStr" ref="required,json" var="印章json串" />
-        <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
-        <property id="rowId" name="id" ref="required" var="印章归还主表单id" />
-    </url>
     <url id="sealrevert010" path="/post/SealApplyRevertController/updateRevertSealToRevoke" val="撤销印章归还申请" allUse="1" groupName="印章归还">
         <property id="processInstanceId" name="processInstanceId" ref="required" var="流程id" />
     </url>

skyeye-common/src/main/java/com/skyeye/common/constans/ActivitiConstants.java

@@ -422,6 +422,9 @@ public class ActivitiConstants {
         } else if ("2".equals(subType)) {
             // 保存为提交审批，状态为等待审批
             state = "1";
+        }else if ("3".equals(subType)) {
+            // 工作流保存数据
+            state = "1";
         }
         return state;
     }