资产领用，资产归还申请提交工作流选择审批人修改

skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/ActivitiTaskServiceImpl.java

@@ -526,7 +526,9 @@ public class ActivitiTaskServiceImpl implements ActivitiTaskService {
 
         // 获取流程关联页面类型
         Map<String, Object> process = actUserProcessInstanceIdDao.queryProcessInstanceMationByProcessInstanceId(task.getProcessInstanceId());
-        map.put("pageTypes", process.get("pageTypes"));
+        if(process != null){
+            map.put("pageTypes", process.get("pageTypes"));
+        }
 
         // 获取提交时候的信息
         Map<String, Object> params = this.getCurrentTaskParamsByTaskId(taskId);

skyeye-activiti/src/main/resources/mapper/activiti/ActUserProcessInstanceIdMapper.xml

@@ -44,7 +44,7 @@
 		FROM
 			act_user_processinstanceid a
 			LEFT JOIN act_model b ON a.act_id = b.act_id AND b.state != '4'
-			LEFT JOIN sys_eve_user_staff seus on b.create_id = seus.user_id
+			LEFT JOIN sys_eve_user_staff seus on a.create_id = seus.user_id
 		WHERE
 			a.process_instance_id = #{processInstanceId}
 		GROUP BY a.process_instance_id

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

@@ -154,22 +154,6 @@ public class AssetApplyReturnController {
         assetApplyReturnService.updateAssetListToReturnById(inputObject, outputObject);
     }
 
-    /**
-     *
-     * @Title: updateAssetListToReturnByIdInProcess
-     * @Description: 在工作流中编辑资产归还申请
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @RequestMapping("/post/AssetApplyReturnController/updateAssetListToReturnByIdInProcess")
-    @ResponseBody
-    public void updateAssetListToReturnByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception{
-        assetApplyReturnService.updateAssetListToReturnByIdInProcess(inputObject, outputObject);
-    }
-
     /**
      *
      * @Title: editAssetReturnToRevoke

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

@@ -138,22 +138,6 @@ public class AssetApplyUseController {
         assetApplyUseService.editAssetUseToSubApproval(inputObject, outputObject);
     }
 
-    /**
-     *
-     * @Title: updateAssetListToUseByIdInProcess
-     * @Description: 在工作流中编辑资产领用申请
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @RequestMapping("/post/AssetApplyUseController/updateAssetListToUseByIdInProcess")
-    @ResponseBody
-    public void updateAssetListToUseByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception{
-        assetApplyUseService.updateAssetListToUseByIdInProcess(inputObject, outputObject);
-    }
-
     /**
      *
      * @Title: editAssetUseToRevoke

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

@@ -33,8 +33,6 @@ public interface AssetApplyReturnService {
 
     public void updateAssetListToReturnById(InputObject inputObject, OutputObject outputObject) throws Exception;
 
-    public void updateAssetListToReturnByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception;
-
     public void editAssetReturnToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception;
 
 }

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

@@ -31,8 +31,6 @@ public interface AssetApplyUseService {
 
     public void editAssetUseToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception;
 
-    public void updateAssetListToUseByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception;
-
     public void editAssetUseToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception;
 
 }

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

@@ -127,7 +127,7 @@ public class AssetApplyPurchaseServiceImpl implements AssetApplyPurchaseService
      * @throws Exception
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editAssetPurchaseToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String purchaseId = map.get("id").toString();
@@ -221,7 +221,7 @@ public class AssetApplyPurchaseServiceImpl implements AssetApplyPurchaseService
      * @throws Exception
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void updateAssetListToPurchaseById(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String purchaseId = map.get("id").toString();//采购单主表id
@@ -250,7 +250,7 @@ public class AssetApplyPurchaseServiceImpl implements AssetApplyPurchaseService
      * @throws Exception
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editAssetPurchaseToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
         ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSET_PURCHAES_PAGE_KEY).revokeActivi();
     }

skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetApplyReturnServiceImpl.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 AssetApplyReturnServiceImpl implements AssetApplyReturnService {
     @Autowired
     private SysEnclosureDao sysEnclosureDao;
 
+    @Autowired
+    private ActivitiUserService activitiUserService;
+
     /**
      * 资产归还关联的工作流的key
      */
@@ -94,9 +99,8 @@ public class AssetApplyReturnServiceImpl implements AssetApplyReturnService {
      * @return void    返回类型
      * @throws
      */
-    @SuppressWarnings("unchecked")
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void insertAssetListToReturn(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String returnId = ToolUtil.getSurFaceId();//归还单主表id
@@ -116,11 +120,9 @@ public class AssetApplyReturnServiceImpl implements AssetApplyReturnService {
         map.put("createTime", DateUtil.getTimeAndToString());
         assetApplyReturnDao.insertAssetReturnMation(map);
         assetApplyReturnDao.insertAssetReturnGoodsMation(entitys);
-        // 判断是否提交审批
-        if("2".equals(map.get("subType").toString())){
-            // 提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSET_RETURN_PAGE_KEY).submitToActivi(returnId, ActivitiConstants.APPROVAL_ID);
-        }
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            ACTIVITI_ASSET_RETURN_PAGE_KEY, returnId, map.get("approvalId").toString());
     }
 
     /**
@@ -134,7 +136,7 @@ public class AssetApplyReturnServiceImpl implements AssetApplyReturnService {
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editAssetReturnToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String returnId = map.get("id").toString();
@@ -145,7 +147,8 @@ public class AssetApplyReturnServiceImpl implements AssetApplyReturnService {
                 || ActivitiConstants.ActivitiState.NO_PASS.getState() == state
                 || ActivitiConstants.ActivitiState.REVOKE.getState() == state){
             // 草稿、审核不通过或者撤销状态下可以作废
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSET_RETURN_PAGE_KEY).submitToActivi(returnId, ActivitiConstants.APPROVAL_ID);
+            activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
+                ACTIVITI_ASSET_RETURN_PAGE_KEY, returnId, map.get("approvalId").toString());
         }else{
             outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
         }
@@ -239,7 +242,7 @@ public class AssetApplyReturnServiceImpl implements AssetApplyReturnService {
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void updateAssetListToReturnById(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String returnId = map.get("id").toString();//归还单主表id
@@ -254,39 +257,9 @@ public class AssetApplyReturnServiceImpl implements AssetApplyReturnService {
         assetApplyReturnDao.updateAssetReturnMation(map);
         assetApplyReturnDao.deleteAssetReturnGoodsMationById(map);
         assetApplyReturnDao.insertAssetReturnGoodsMation(entitys);
-        //判断是否提交审批
-        if("2".equals(map.get("subType").toString())){
-            //提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSET_RETURN_PAGE_KEY).submitToActivi(returnId, ActivitiConstants.APPROVAL_ID);
-        }
-    }
-
-    /**
-     *
-     * @Title: updateAssetListToReturnByIdInProcess
-     * @Description: 在工作流中编辑资产归还申请
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @Override
-    @Transactional(value="transactionManager")
-    public void updateAssetListToReturnByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
-        Map<String, Object> map = inputObject.getParams();
-        String returnId = map.get("id").toString();//归还单主表id
-        // 处理数据
-        List<Map<String, Object>> entitys = getAssetList(map, returnId, "1");
-        if(entitys.size() == 0){
-            outputObject.setreturnMessage("请选择资产");
-            return;
-        }
-        assetApplyReturnDao.updateAssetReturnMation(map);
-        assetApplyReturnDao.deleteAssetReturnGoodsMationById(map);
-        assetApplyReturnDao.insertAssetReturnGoodsMation(entitys);
-        // 编辑流程表参数
-        ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSET_RETURN_PAGE_KEY).editApplyMationInActiviti(returnId);
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            ACTIVITI_ASSET_RETURN_PAGE_KEY, returnId, map.get("approvalId").toString());
     }
 
     private List<Map<String, Object>> getAssetList(Map<String, Object> map, String returnId, String state) throws Exception {
@@ -316,7 +289,7 @@ public class AssetApplyReturnServiceImpl implements AssetApplyReturnService {
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editAssetReturnToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
         ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSET_RETURN_PAGE_KEY).revokeActivi();
     }

skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetApplyUseServiceImpl.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 AssetApplyUseServiceImpl implements AssetApplyUseService {
     @Autowired
     private SysEnclosureDao sysEnclosureDao;
 
+    @Autowired
+    private ActivitiUserService activitiUserService;
+
     /**
      * 资产领用关联的工作流的key
      */
@@ -59,7 +64,6 @@ public class AssetApplyUseServiceImpl implements AssetApplyUseService {
      * @return void    返回类型
      * @throws
      */
-    @SuppressWarnings("unchecked")
     @Override
     public void queryMyUseAssetMation(InputObject inputObject, OutputObject outputObject) throws Exception {
         ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSET_USE_PAGE_KEY).queryWithActivitiList();
@@ -76,7 +80,7 @@ public class AssetApplyUseServiceImpl implements AssetApplyUseService {
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void insertAssetListToUse(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String useId = ToolUtil.getSurFaceId();//领用单主表id
@@ -96,11 +100,9 @@ public class AssetApplyUseServiceImpl implements AssetApplyUseService {
         map.put("createTime", DateUtil.getTimeAndToString());
         assetApplyUseDao.insertAssetUseMation(map);
         assetApplyUseDao.insertAssetUseGoodsMation(entitys);
-        // 判断是否提交审批
-        if("2".equals(subType)){
-            // 提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSET_USE_PAGE_KEY).submitToActivi(useId, ActivitiConstants.APPROVAL_ID);
-        }
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            ACTIVITI_ASSET_USE_PAGE_KEY, useId, map.get("approvalId").toString());
     }
 
     /**
@@ -188,7 +190,7 @@ public class AssetApplyUseServiceImpl implements AssetApplyUseService {
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void updateAssetListToUseById(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String useId = map.get("id").toString();//领用单主表id
@@ -203,11 +205,9 @@ public class AssetApplyUseServiceImpl implements AssetApplyUseService {
         assetApplyUseDao.updateAssetUseMation(map);
         assetApplyUseDao.deleteAssetUseGoodsMationById(map);
         assetApplyUseDao.insertAssetUseGoodsMation(entitys);
-        // 判断是否提交审批
-        if("2".equals(subType)){
-            //提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSET_USE_PAGE_KEY).submitToActivi(useId, ActivitiConstants.APPROVAL_ID);
-        }
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            ACTIVITI_ASSET_USE_PAGE_KEY, useId, map.get("approvalId").toString());
     }
 
     /**
@@ -249,7 +249,7 @@ public class AssetApplyUseServiceImpl implements AssetApplyUseService {
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editAssetUseToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String useId = map.get("id").toString();
@@ -260,40 +260,13 @@ public class AssetApplyUseServiceImpl implements AssetApplyUseService {
             || ActivitiConstants.ActivitiState.NO_PASS.getState() == state
             || ActivitiConstants.ActivitiState.REVOKE.getState() == state){
             // 草稿、审核不通过或者撤销状态下可以提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSET_USE_PAGE_KEY).submitToActivi(useId, ActivitiConstants.APPROVAL_ID);
+            activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
+                ACTIVITI_ASSET_USE_PAGE_KEY, useId, map.get("approvalId").toString());
         }else{
             outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
         }
     }
 
-    /**
-     *
-     * @Title: updateAssetListToUseByIdInProcess
-     * @Description: 在工作流中编辑资产领用申请
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @Override
-    @Transactional(value="transactionManager")
-    public void updateAssetListToUseByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
-        Map<String, Object> map = inputObject.getParams();
-        String useId = map.get("id").toString();//领用单主表id
-        //处理数据
-        List<Map<String, Object>> entitys = getAssetMationList(map.get("assetListStr").toString(), useId, "1");
-        if(entitys.size() == 0){
-            outputObject.setreturnMessage("请选择资产");
-            return;
-        }
-        assetApplyUseDao.updateAssetUseMation(map);
-        assetApplyUseDao.deleteAssetUseGoodsMationById(map);
-        assetApplyUseDao.insertAssetUseGoodsMation(entitys);
-        // 编辑流程表参数
-        ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSET_USE_PAGE_KEY).editApplyMationInActiviti(useId);
-    }
-
     /**
      * 撤销资产领用申请
      *
@@ -302,7 +275,7 @@ public class AssetApplyUseServiceImpl implements AssetApplyUseService {
      * @throws Exception
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editAssetUseToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
         ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_ASSET_USE_PAGE_KEY).revokeActivi();
     }

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

@@ -985,6 +985,7 @@
         <property id="assetListStr" name="assetListStr" 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="asset013" path="/post/AssetApplyUseController/queryAssetListUseDetailsById" val="资产领用申请详情" allUse="2" method="GET" groupName="资产领用申请">
         <property id="rowId" name="id" ref="required" var="资产领用主表单id" />
@@ -998,18 +999,14 @@
         <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="asset016" path="/post/AssetApplyUseController/updateAssetToCancellation" val="作废资产领用申请" allUse="1" groupName="资产领用申请">
         <property id="rowId" name="id" ref="required" var="资产领用主表单id" />
     </url>
     <url id="asset017" path="/post/AssetApplyUseController/editAssetUseToSubApproval" val="资产领用申请提交审批" allUse="1" groupName="资产领用申请">
         <property id="rowId" name="id" ref="required" var="资产领用主表单id" />
-    </url>
-    <url id="asset033" path="/post/AssetApplyUseController/updateAssetListToUseByIdInProcess" val="在工作流中编辑资产领用申请" allUse="2" groupName="资产领用申请">
-        <property id="remark" name="remark" ref="" var="描述" />
-        <property id="assetListStr" name="assetListStr" ref="required,json" var="领用资产json串" />
-        <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
-        <property id="rowId" name="id" ref="required" var="资产领用主表单id" />
+        <property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
     </url>
     <url id="asset036" path="/post/AssetApplyUseController/editAssetUseToRevoke" val="撤销资产领用申请" allUse="1" groupName="资产领用申请">
         <property id="processInstanceId" name="processInstanceId" ref="required" var="流程id"/>
@@ -1072,9 +1069,11 @@
         <property id="assetListStr" name="assetListStr" 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="asset028" path="/post/AssetApplyReturnController/editAssetReturnToSubApproval" val="资产归还申请提交审批" allUse="1" groupName="资产归还申请">
         <property id="rowId" name="id" ref="required" var="资产归还主表单id" />
+        <property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
     </url>
     <url id="asset029" path="/post/AssetApplyReturnController/queryAssetListReturnDetailsById" val="资产归还申请详情" allUse="2" groupName="资产归还申请">
         <property id="rowId" name="id" ref="required" var="资产归还主表单id" />
@@ -1085,18 +1084,13 @@
     <url id="asset031" path="/post/AssetApplyReturnController/queryAssetListReturnToEditById" val="资产归还申请编辑时进行回显" allUse="2" groupName="资产归还申请">
         <property id="rowId" name="id" ref="required" var="资产归还主表单id" />
     </url>
-    <url id="asset032" path="/post/AssetApplyReturnController/updateAssetListToReturnById" val="编辑资产归还申请" allUse="1" groupName="资产归还申请">
+    <url id="asset032" path="/post/AssetApplyReturnController/updateAssetListToReturnById" val="编辑资产归还申请" allUse="1" method="PUT" groupName="资产归还申请">
         <property id="remark" name="remark" ref="" var="描述" />
         <property id="assetListStr" name="assetListStr" ref="required,json" var="归还资产json串" />
         <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="表单提交类型" />
-    </url>
-    <url id="asset035" path="/post/AssetApplyReturnController/updateAssetListToReturnByIdInProcess" val="在工作流中编辑资产归还申请" allUse="2" groupName="资产归还申请">
-        <property id="remark" name="remark" ref="" var="描述" />
-        <property id="assetListStr" name="assetListStr" ref="required,json" var="归还资产json串" />
-        <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
-        <property id="rowId" name="id" ref="required" var="资产归还主表单id" />
+        <property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
     </url>
     <url id="asset038" path="/post/AssetApplyReturnController/editAssetReturnToRevoke" val="撤销资产归还申请" allUse="1" groupName="资产归还申请">
         <property id="processInstanceId" name="processInstanceId" ref="required" var="流程id"/>