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

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

@@ -106,22 +106,6 @@ public class SealApplyBorrowController {
         sealApplyBorrowService.updateBorrowSealMationById(inputObject, outputObject);
     }
 
-    /**
-     *
-     * @Title: updateBorrowSealMationToSave
-     * @Description: 编辑印章借用申请（已提交审批）
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @RequestMapping("/post/SealApplyBorrowController/updateBorrowSealMationToSave")
-    @ResponseBody
-    public void updateBorrowSealMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception{
-        sealApplyBorrowService.updateBorrowSealMationToSave(inputObject, outputObject);
-    }
-
     /**
      *
      * @Title: editBorrowSealToSubApproval

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

@@ -27,8 +27,6 @@ public interface SealApplyBorrowService {
 
     public void updateBorrowSealMationById(InputObject inputObject, OutputObject outputObject) throws Exception;
 
-    public void updateBorrowSealMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception;
-
     public void editBorrowSealToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception;
 
     public void updateBorrowSealToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception;

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

@@ -6,6 +6,7 @@ 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.common.constans.ActivitiConstants;
 import com.skyeye.common.constans.AdminAssistantConstants;
 import com.skyeye.common.object.InputObject;
@@ -44,6 +45,9 @@ public class SealApplyBorrowServiceImpl implements SealApplyBorrowService {
     @Autowired
     private SysEnclosureDao sysEnclosureDao;
 
+    @Autowired
+    private ActivitiUserService activitiUserService;
+
     /**
      * 印章借用关联的工作流的key
      */
@@ -95,11 +99,9 @@ public class SealApplyBorrowServiceImpl implements SealApplyBorrowService {
         map.put("createTime", DateUtil.getTimeAndToString());
         sealApplyBorrowDao.insertSealBorrowMation(map);
         sealApplyBorrowDao.insertSealBorrowGoodsMation(entitys);
-        // 判断是否提交审批
-        if("2".equals(subType)){
-            // 提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_SEAL_USE_PAGE_KEY).submitToActivi(borrowId, ActivitiConstants.APPROVAL_ID);
-        }
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            ACTIVITI_SEAL_USE_PAGE_KEY, borrowId, map.get("approvalId").toString());
     }
 
     private List<Map<String, Object>> getSealList(String sealBorrowStr, String borrowId, String state) throws Exception {
@@ -156,7 +158,6 @@ public class SealApplyBorrowServiceImpl implements SealApplyBorrowService {
      * @return void    返回类型
      * @throws
      */
-    @SuppressWarnings("unchecked")
     @Override
     public void queryBorrowSealMationToEdit(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
@@ -181,7 +182,6 @@ public class SealApplyBorrowServiceImpl implements SealApplyBorrowService {
      * @return void    返回类型
      * @throws
      */
-    @SuppressWarnings("unchecked")
     @Override
     @Transactional(value="transactionManager")
     public void updateBorrowSealMationById(InputObject inputObject, OutputObject outputObject) throws Exception {
@@ -198,39 +198,9 @@ public class SealApplyBorrowServiceImpl implements SealApplyBorrowService {
         sealApplyBorrowDao.updateSealBorrowMation(map);
         sealApplyBorrowDao.deleteSealBorrowGoodsMationById(map);
         sealApplyBorrowDao.insertSealBorrowGoodsMation(entitys);
-        // 判断是否提交审批
-        if("2".equals(map.get("subType").toString())){
-            // 提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_SEAL_USE_PAGE_KEY).submitToActivi(borrowId, ActivitiConstants.APPROVAL_ID);
-        }
-    }
-
-    /**
-     *
-     * @Title: updateBorrowSealMationToSave
-     * @Description: 编辑印章借用申请（已提交审批）
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @Override
-    @Transactional(value="transactionManager")
-    public void updateBorrowSealMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception {
-        Map<String, Object> map = inputObject.getParams();
-        String borrowId = map.get("id").toString();//借用单主表id
-        // 处理数据
-        List<Map<String, Object>> entitys = getSealList(map.get("sealStr").toString(), borrowId, "1");
-        if(entitys.size() == 0){
-            outputObject.setreturnMessage("请选择印章");
-            return;
-        }
-        sealApplyBorrowDao.updateSealBorrowMation(map);
-        sealApplyBorrowDao.deleteSealBorrowGoodsMationById(map);
-        sealApplyBorrowDao.insertSealBorrowGoodsMation(entitys);
-        // 修改流程中的数据
-        ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_SEAL_USE_PAGE_KEY).editApplyMationInActiviti(borrowId);
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            ACTIVITI_SEAL_USE_PAGE_KEY, borrowId, map.get("approvalId").toString());
     }
 
     /**
@@ -255,7 +225,8 @@ public class SealApplyBorrowServiceImpl implements SealApplyBorrowService {
                 || ActivitiConstants.ActivitiState.NO_PASS.getState() == state
                 || ActivitiConstants.ActivitiState.REVOKE.getState() == state){
             // 草稿、审核不通过或者撤销状态下可以提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_SEAL_USE_PAGE_KEY).submitToActivi(borrowId, ActivitiConstants.APPROVAL_ID);
+            activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
+                ACTIVITI_SEAL_USE_PAGE_KEY, borrowId, map.get("approvalId").toString());
         }else{
             outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
         }

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

@@ -700,6 +700,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="sealborrow003" path="/post/SealApplyBorrowController/queryBorrowSealMationToDetails" val="印章借用申请详情" allUse="2" groupName="印章借用">
         <property id="rowId" name="id" ref="required" var="印章借用主表单id" />
@@ -713,19 +714,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="sealborrow006" path="/post/SealApplyBorrowController/editBorrowSealToSubApproval" val="印章借用申请提交审批" allUse="1" groupName="印章借用">
         <property id="rowId" name="id" ref="required" var="印章借用主表单id" />
+        <property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
     </url>
     <url id="sealborrow007" path="/post/SealApplyBorrowController/updateBorrowSealToCancellation" val="作废印章借用申请" allUse="1" groupName="印章借用">
         <property id="rowId" name="id" ref="required" var="印章借用主表单id" />
     </url>
-    <url id="sealborrow009" path="/post/SealApplyBorrowController/updateBorrowSealMationToSave" 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="sealborrow010" path="/post/SealApplyBorrowController/updateBorrowSealToRevoke" val="撤销印章借用申请" allUse="1" groupName="印章借用">
         <property id="processInstanceId" name="processInstanceId" ref="required" var="流程id" />
     </url>