用品采购申请提交工作流选择审批人修改

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

@@ -138,22 +138,6 @@ public class AssetArticlesApplyPurchaseController {
         assetArticlesApplyPurchaseService.updateAssetArticlesPurchaseToCancellation(inputObject, outputObject);
     }
 
-    /**
-     *
-     * @Title: updateAssetArticlesListToPurchaseByIdInProcess
-     * @Description: 在工作流中编辑用品采购申请
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @RequestMapping("/post/AssetArticlesApplyPurchaseController/updateAssetArticlesListToPurchaseByIdInProcess")
-    @ResponseBody
-    public void updateAssetArticlesListToPurchaseByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception{
-        assetArticlesApplyPurchaseService.updateAssetArticlesListToPurchaseByIdInProcess(inputObject, outputObject);
-    }
-
     /**
      *
      * @Title: editAssetArticlesPurchaseToRevoke

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

@@ -31,8 +31,6 @@ public interface AssetArticlesApplyPurchaseService {
 
     public void updateAssetArticlesPurchaseToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception;
 
-    public void updateAssetArticlesListToPurchaseByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception;
-
     public void editAssetArticlesPurchaseToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception;
 
 }

skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetArticlesApplyPurchaseServiceImpl.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 AssetArticlesApplyPurchaseServiceImpl implements AssetArticlesApply
     @Autowired
     private SysEnclosureDao sysEnclosureDao;
 
+    @Autowired
+    private ActivitiUserService activitiUserService;
+
     /**
      * 用品采购关联的工作流的key
      */
@@ -75,7 +80,7 @@ public class AssetArticlesApplyPurchaseServiceImpl implements AssetArticlesApply
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void insertAssetArticlesListToPurchase(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String purchaseId = ToolUtil.getSurFaceId();//采购单主表id
@@ -95,11 +100,9 @@ public class AssetArticlesApplyPurchaseServiceImpl implements AssetArticlesApply
         map.put("createTime", DateUtil.getTimeAndToString());
         assetArticlesApplyPurchaseDao.insertAssetArticlePurchaseMation(map);
         assetArticlesApplyPurchaseDao.insertAssetArticlePurchaseGoodsMation(entitys);
-        // 判断是否提交审批
-        if("2".equals(subType)){
-            // 提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSETARTICLES_PURCHASE_PAGE_KEY).submitToActivi(purchaseId, ActivitiConstants.APPROVAL_ID);
-        }
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            ACTIVITI_ASSETARTICLES_PURCHASE_PAGE_KEY, purchaseId, map.get("approvalId").toString());
     }
 
     private List<Map<String, Object>> getAssetArticlesList(String assetArticlesStr, String purchaseId, String state) throws Exception {
@@ -156,7 +159,7 @@ public class AssetArticlesApplyPurchaseServiceImpl implements AssetArticlesApply
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editAssetArticlesUseToPurchaseSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String purchaseId = map.get("id").toString();
@@ -167,7 +170,8 @@ public class AssetArticlesApplyPurchaseServiceImpl implements AssetArticlesApply
                 || ActivitiConstants.ActivitiState.NO_PASS.getState() == state
                 || ActivitiConstants.ActivitiState.REVOKE.getState() == state){
             // 草稿、审核不通过或者撤销状态下可以提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSETARTICLES_PURCHASE_PAGE_KEY).submitToActivi(purchaseId, ActivitiConstants.APPROVAL_ID);
+            activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
+                ACTIVITI_ASSETARTICLES_PURCHASE_PAGE_KEY, purchaseId, map.get("approvalId").toString());
         }else{
             outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
         }
@@ -207,7 +211,7 @@ public class AssetArticlesApplyPurchaseServiceImpl implements AssetArticlesApply
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void updateAssetArticlesListToPurchaseById(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String purchaseId = map.get("id").toString();//采购单主表id
@@ -222,11 +226,9 @@ public class AssetArticlesApplyPurchaseServiceImpl implements AssetArticlesApply
         assetArticlesApplyPurchaseDao.updateAssetArticlePurchaseMation(map);
         assetArticlesApplyPurchaseDao.deleteAssetArticlePurchaseGoodsMationById(map);
         assetArticlesApplyPurchaseDao.insertAssetArticlePurchaseGoodsMation(entitys);
-        // 判断是否提交审批
-        if("2".equals(subType)){
-            // 提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSETARTICLES_PURCHASE_PAGE_KEY).submitToActivi(purchaseId, ActivitiConstants.APPROVAL_ID);
-        }
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            ACTIVITI_ASSETARTICLES_PURCHASE_PAGE_KEY, purchaseId, map.get("approvalId").toString());
     }
 
     /**
@@ -257,35 +259,6 @@ public class AssetArticlesApplyPurchaseServiceImpl implements AssetArticlesApply
         }
     }
 
-    /**
-     *
-     * @Title: updateAssetArticlesListToPurchaseByIdInProcess
-     * @Description: 在工作流中编辑用品采购申请
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    @Transactional(value="transactionManager")
-    public void updateAssetArticlesListToPurchaseByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
-        Map<String, Object> map = inputObject.getParams();
-        String purchaseId = map.get("id").toString();//采购单主表id
-        // 处理数据
-        List<Map<String, Object>> entitys = getAssetArticlesList(map.get("assetArticlesStr").toString(), purchaseId, "1");
-        if(entitys.size() == 0){
-            outputObject.setreturnMessage("请选择用品");
-            return;
-        }
-        assetArticlesApplyPurchaseDao.updateAssetArticlePurchaseMation(map);
-        assetArticlesApplyPurchaseDao.deleteAssetArticlePurchaseGoodsMationById(map);
-        assetArticlesApplyPurchaseDao.insertAssetArticlePurchaseGoodsMation(entitys);
-        // 编辑流程表参数
-        ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSETARTICLES_PURCHASE_PAGE_KEY).editApplyMationInActiviti(purchaseId);
-    }
-
     /**
      *
      * @Title: editAssetArticlesPurchaseToRevoke
@@ -297,7 +270,7 @@ public class AssetArticlesApplyPurchaseServiceImpl implements AssetArticlesApply
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editAssetArticlesPurchaseToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
         ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSETARTICLES_PURCHASE_PAGE_KEY).revokeActivi();
     }

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

@@ -7,6 +7,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.annotation.transaction.ActivitiAndBaseTransaction;
 import com.skyeye.common.constans.ActivitiConstants;
 import com.skyeye.common.constans.AdminAssistantConstants;
 import com.skyeye.common.object.InputObject;
@@ -79,7 +80,7 @@ public class SealApplyBorrowServiceImpl implements SealApplyBorrowService {
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void insertBorrowSealMation(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String borrowId = ToolUtil.getSurFaceId();//借用单主表id
@@ -183,7 +184,7 @@ public class SealApplyBorrowServiceImpl implements SealApplyBorrowService {
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void updateBorrowSealMationById(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String borrowId = map.get("id").toString();//借用单主表id
@@ -214,7 +215,7 @@ public class SealApplyBorrowServiceImpl implements SealApplyBorrowService {
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editBorrowSealToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String borrowId = map.get("id").toString();
@@ -271,6 +272,7 @@ public class SealApplyBorrowServiceImpl implements SealApplyBorrowService {
      * @throws
      */
     @Override
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void updateBorrowSealToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
         ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_SEAL_USE_PAGE_KEY).revokeActivi();
     }

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

@@ -272,6 +272,7 @@ public class SealApplyRevertServiceImpl implements SealApplyRevertService {
      * @throws
      */
     @Override
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void updateRevertSealToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
         ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_SEAL_REVERT_PAGE_KEY).revokeActivi();
     }

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

@@ -193,6 +193,7 @@
         <property id="assetArticlesStr" name="assetArticlesStr" 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="assetarticles025" path="/post/AssetArticlesApplyPurchaseController/queryMyPurchaseAssetArticlesMation" val="获取我的用品采购申请单信息" allUse="1" groupName="用品采购">
         <property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
@@ -206,6 +207,7 @@
     </url>
     <url id="assetarticles027" path="/post/AssetArticlesApplyPurchaseController/editAssetArticlesUseToPurchaseSubApproval" val="用品采购申请提交审批" allUse="1" groupName="用品采购">
         <property id="rowId" name="id" ref="required" var="用品采购主表单id" />
+        <property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
     </url>
     <url id="assetarticles028" path="/post/AssetArticlesApplyPurchaseController/queryAssetArticlesListPurchaseToEditById" val="用品采购申请编辑时进行回显" allUse="2" groupName="用品采购">
         <property id="rowId" name="id" ref="required" var="用品领用主表单id" />
@@ -216,16 +218,11 @@
         <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="assetarticles031" path="/post/AssetArticlesApplyPurchaseController/updateAssetArticlesPurchaseToCancellation" val="作废用品采购申请" allUse="1" groupName="用品采购">
         <property id="rowId" name="id" ref="required" var="用品采购主表单id" />
     </url>
-    <url id="assetarticles033" path="/post/AssetArticlesApplyPurchaseController/updateAssetArticlesListToPurchaseByIdInProcess" val="在工作流中编辑用品采购申请" allUse="2" groupName="用品采购">
-        <property id="remark" name="remark" ref="" var="描述" />
-        <property id="assetArticlesStr" name="assetArticlesStr" ref="required,json" var="用品json串" />
-        <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
-        <property id="rowId" name="id" ref="required" var="用品领用主表单id" />
-    </url>
     <url id="assetarticles035" path="/post/AssetArticlesApplyPurchaseController/editAssetArticlesPurchaseToRevoke" val="撤销用品采购申请" allUse="1" groupName="用品采购">
         <property id="processInstanceId" name="processInstanceId" ref="required" var="流程id"/>
     </url>