请假申请，加班申请，会议室预定，合同审批提交工作流选择审批人修改

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

@@ -105,22 +105,6 @@ public class ConferenceRoomReserveController {
         conferenceRoomReserveService.updateReserveConferenceRoomMationById(inputObject, outputObject);
     }
 
-    /**
-     *
-     * @Title: updateReserveConferenceRoomMationToSave
-     * @Description: 编辑会议室预定申请（已提交审批）
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @RequestMapping("/post/ConferenceRoomReserveController/updateReserveConferenceRoomMationToSave")
-    @ResponseBody
-    public void updateReserveConferenceRoomMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception{
-        conferenceRoomReserveService.updateReserveConferenceRoomMationToSave(inputObject, outputObject);
-    }
-
     /**
      *
      * @Title: editReserveConferenceRoomToSubApproval

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

@@ -27,8 +27,6 @@ public interface ConferenceRoomReserveService {
 
     public void updateReserveConferenceRoomMationById(InputObject inputObject, OutputObject outputObject) throws Exception;
 
-    public void updateReserveConferenceRoomMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception;
-
     public void editReserveConferenceRoomToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception;
 
     public void updateReserveConferenceRoomToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception;

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

@@ -5,6 +5,8 @@
 package com.skyeye.eve.service.impl;
 
 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;
@@ -42,6 +44,9 @@ public class ConferenceRoomReserveServiceImpl implements ConferenceRoomReserveSe
     @Autowired
     private SysEnclosureDao sysEnclosureDao;
 
+    @Autowired
+    private ActivitiUserService activitiUserService;
+
     /**
      * 会议室预定关联的工作流的key
      */
@@ -73,7 +78,7 @@ public class ConferenceRoomReserveServiceImpl implements ConferenceRoomReserveSe
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void insertReserveConferenceRoomMation(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         // 获取该会议室预定时间段内已被其他人预定的数据
@@ -88,11 +93,9 @@ public class ConferenceRoomReserveServiceImpl implements ConferenceRoomReserveSe
             map.put("approvalState", 0);//审批状态-草稿
             map.put("reserveState", 0);//预定状态-待审批
             conferenceRoomReserveDao.insertConferenceRoomReserveMation(map);
-            // 判断是否提交审批
-            if("2".equals(map.get("subType").toString())){
-                // 提交审批
-                ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_CONFERENCEROOM_USE_PAGE_KEY).submitToActivi(rowId, ActivitiConstants.APPROVAL_ID);
-            }
+            // 操作工作流数据
+            activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+                ACTIVITI_CONFERENCEROOM_USE_PAGE_KEY, rowId, map.get("approvalId").toString());
         }else{
             outputObject.setreturnMessage("会议室已被预定，请更换会议室或更改预定时间！");
         }
@@ -152,7 +155,7 @@ public class ConferenceRoomReserveServiceImpl implements ConferenceRoomReserveSe
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void updateReserveConferenceRoomMationById(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String id = map.get("id").toString();
@@ -160,37 +163,9 @@ public class ConferenceRoomReserveServiceImpl implements ConferenceRoomReserveSe
         List<Map<String, Object>> beans = conferenceRoomReserveDao.queryConferenceRoomReserveListByTime(map);
         if(beans == null || beans.isEmpty()){
             conferenceRoomDao.updateLicenceBorrowMation(map);
-            // 判断是否提交审批
-            if("2".equals(map.get("subType").toString())){
-                // 提交审批
-                ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_CONFERENCEROOM_USE_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID);
-            }
-        }else{
-            outputObject.setreturnMessage("会议室已被预定，请更换会议室或更改预定时间！");
-        }
-    }
-
-    /**
-     *
-     * @Title: updateReserveConferenceRoomMationToSave
-     * @Description: 编辑会议室预定申请（已提交审批）
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @Override
-    @Transactional(value="transactionManager")
-    public void updateReserveConferenceRoomMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception {
-        Map<String, Object> map = inputObject.getParams();
-        String id = map.get("id").toString();
-        // 获取该会议室预定时间段内已被其他人预定的数据
-        List<Map<String, Object>> beans = conferenceRoomReserveDao.queryConferenceRoomReserveListByTime(map);
-        if(beans == null || beans.isEmpty()){
-            conferenceRoomDao.updateLicenceBorrowMation(map);
-            // 编辑流程表参数
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_CONFERENCEROOM_USE_PAGE_KEY).editApplyMationInActiviti(id);
+            // 操作工作流数据
+            activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+                ACTIVITI_CONFERENCEROOM_USE_PAGE_KEY, id, map.get("approvalId").toString());
         }else{
             outputObject.setreturnMessage("会议室已被预定，请更换会议室或更改预定时间！");
         }
@@ -207,7 +182,7 @@ public class ConferenceRoomReserveServiceImpl implements ConferenceRoomReserveSe
      * @throws
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editReserveConferenceRoomToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String id = map.get("id").toString();
@@ -218,7 +193,8 @@ public class ConferenceRoomReserveServiceImpl implements ConferenceRoomReserveSe
                 || ActivitiConstants.ActivitiState.NO_PASS.getState() == state
                 || ActivitiConstants.ActivitiState.REVOKE.getState() == state){
             // 草稿、审核不通过或者撤销状态下可以提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_CONFERENCEROOM_USE_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID);
+            activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
+                ACTIVITI_CONFERENCEROOM_USE_PAGE_KEY, id, map.get("approvalId").toString());
         }else{
             outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
         }
@@ -263,6 +239,7 @@ public class ConferenceRoomReserveServiceImpl implements ConferenceRoomReserveSe
      * @throws
      */
     @Override
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editReserveConferenceRoomToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
         ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_CONFERENCEROOM_USE_PAGE_KEY).revokeActivi();
     }

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

@@ -71,6 +71,7 @@
         <property id="remark" name="remark" ref="" var="备注" />
         <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="conferenceroomreserve003" path="/post/ConferenceRoomReserveController/queryReserveConferenceRoomMationToDetails" val="会议室预定申请详情" allUse="2" groupName="会议室预定">
         <property id="rowId" name="id" ref="required" var="会议室预定主表单id" />
@@ -87,22 +88,15 @@
         <property id="remark" name="remark" ref="" var="备注" />
         <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="conferenceroomreserve006" path="/post/ConferenceRoomReserveController/editReserveConferenceRoomToSubApproval" val="会议室预定申请提交审批" allUse="1" groupName="会议室预定">
         <property id="rowId" name="id" ref="required" var="会议室预定id" />
+        <property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
     </url>
     <url id="conferenceroomreserve007" path="/post/ConferenceRoomReserveController/updateReserveConferenceRoomToCancellation" val="作废会议室预定申请" allUse="1" groupName="会议室预定">
         <property id="rowId" name="id" ref="required" var="会议室预定id" />
     </url>
-    <url id="conferenceroomreserve009" path="/post/ConferenceRoomReserveController/updateReserveConferenceRoomMationToSave" val="编辑会议室预定申请(已提交审批)" allUse="2" groupName="会议室预定">
-    	<property id="rowId" name="id" ref="required" var="会议室预定id" />
-        <property id="conferenceRoom" name="conferenceRoom" ref="required" var="会议室" />
-        <property id="startTime" name="startTime" ref="required" var="开始时间" />
-        <property id="endTime" name="endTime" ref="required" var="结束时间" />
-        <property id="reserveReason" name="reserveReason" ref="required" var="使用事由" />
-        <property id="remark" name="remark" ref="" var="备注" />
-        <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
-    </url>
     <url id="conferenceroomreserve010" path="/post/ConferenceRoomReserveController/editReserveConferenceRoomToRevoke" val="撤销会议室预定申请" allUse="1" groupName="会议室预定">
         <property id="processInstanceId" name="processInstanceId" ref="required" var="流程id"/>
     </url>

skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkLeaveController.java

@@ -97,22 +97,6 @@ public class CheckWorkLeaveController {
         checkWorkLeaveService.queryCheckWorkLeaveDetailsById(inputObject, outputObject);
     }
 
-    /**
-     *
-     * @Title: updateCheckWorkLeaveByIdInProcess
-     * @Description: 在工作流中编辑请假申请
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @RequestMapping("/post/CheckWorkLeaveController/updateCheckWorkLeaveByIdInProcess")
-    @ResponseBody
-    public void updateCheckWorkLeaveByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception{
-        checkWorkLeaveService.updateCheckWorkLeaveByIdInProcess(inputObject, outputObject);
-    }
-
     /**
      *
      * @Title: editCheckWorkLeaveToSubApproval

skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkOvertimeController.java

@@ -109,22 +109,6 @@ public class CheckWorkOvertimeController {
         checkWorkOvertimeService.queryCheckWorkOvertimeDetailsById(inputObject, outputObject);
     }
 
-    /**
-     *
-     * @Title: updateCheckWorkOvertimeByIdInProcess
-     * @Description: 在工作流中编辑加班申请
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception    参数
-     * @return void    返回类型
-     * @throws
-     */
-    @RequestMapping("/post/CheckWorkOvertimeController/updateCheckWorkOvertimeByIdInProcess")
-    @ResponseBody
-    public void updateCheckWorkOvertimeByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception{
-        checkWorkOvertimeService.updateCheckWorkOvertimeByIdInProcess(inputObject, outputObject);
-    }
-
     /**
      *
      * @Title: editCheckWorkOvertimeToSubApproval

skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkLeaveService.java

 /*******************************************************************************
  * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
  ******************************************************************************/
+
 package com.skyeye.eve.service;
 
 import com.skyeye.common.object.InputObject;
@@ -20,8 +21,6 @@ public interface CheckWorkLeaveService {
 
     public void queryCheckWorkLeaveDetailsById(InputObject inputObject, OutputObject outputObject) throws Exception;
 
-    public void updateCheckWorkLeaveByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception;
-
     public void editCheckWorkLeaveToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception;
 
     public void updateCheckWorkLeaveToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception;

skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkOvertimeService.java

@@ -20,8 +20,6 @@ public interface CheckWorkOvertimeService {
 
     public void queryCheckWorkOvertimeDetailsById(InputObject inputObject, OutputObject outputObject) throws Exception;
 
-    public void updateCheckWorkOvertimeByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception;
-
     public void editCheckWorkOvertimeToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception;
 
     public void updateCheckWorkOvertimeToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception;

skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkLeaveServiceImpl.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.CheckWorkConstants;
 import com.skyeye.common.constans.Constants;
@@ -43,6 +45,9 @@ public class CheckWorkLeaveServiceImpl implements CheckWorkLeaveService {
     @Autowired
     private SysEnclosureDao sysEnclosureDao;
 
+    @Autowired
+    private ActivitiUserService activitiUserService;
+
     /**
      * 请假申请关联的工作流的key
      */
@@ -68,7 +73,7 @@ public class CheckWorkLeaveServiceImpl implements CheckWorkLeaveService {
      * @throws Exception
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void insertCheckWorkLeaveMation(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         // 请假申请id
@@ -87,11 +92,9 @@ public class CheckWorkLeaveServiceImpl implements CheckWorkLeaveService {
         map.put("createTime", DateUtil.getTimeAndToString());
         checkWorkLeaveDao.insertCheckWorkLeaveMation(map);
         checkWorkLeaveDao.insertCheckWorkLeaveDaysMation(beans);
-        // 判断是否提交审批
-        if("2".equals(map.get("subType").toString())){
-            // 提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, CHECK_WORK_LEAVE_PAGE_KEY).submitToActivi(leaveId, ActivitiConstants.APPROVAL_ID);
-        }
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            CHECK_WORK_LEAVE_PAGE_KEY, leaveId, map.get("approvalId").toString());
     }
 
     private List<Map<String, Object>> getLeaveDays(String leaveDayStr, String leaveId) {
@@ -134,7 +137,7 @@ public class CheckWorkLeaveServiceImpl implements CheckWorkLeaveService {
      * @throws Exception
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void updateCheckWorkLeaveById(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         // 请假申请id
@@ -148,11 +151,9 @@ public class CheckWorkLeaveServiceImpl implements CheckWorkLeaveService {
         checkWorkLeaveDao.updateCheckWorkLeaveMation(map);
         checkWorkLeaveDao.deleteCheckWorkLeaveDaysMationByLeaveId(leaveId);
         checkWorkLeaveDao.insertCheckWorkLeaveDaysMation(beans);
-        // 判断是否提交审批
-        if("2".equals(map.get("subType").toString())){
-            // 提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, CHECK_WORK_LEAVE_PAGE_KEY).submitToActivi(leaveId, ActivitiConstants.APPROVAL_ID);
-        }
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            CHECK_WORK_LEAVE_PAGE_KEY, leaveId, map.get("approvalId").toString());
     }
 
     /**
@@ -175,32 +176,6 @@ public class CheckWorkLeaveServiceImpl implements CheckWorkLeaveService {
         outputObject.setBean(bean);
     }
 
-    /**
-     * 在工作流中编辑请假申请
-     *
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception
-     */
-    @Override
-    @Transactional(value="transactionManager")
-    public void updateCheckWorkLeaveByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
-        Map<String, Object> map = inputObject.getParams();
-        // 请假申请id
-        String leaveId = map.get("id").toString();
-        // 处理请假天数
-        List<Map<String, Object>> beans = getLeaveDays(map.get("leaveDayStr").toString(), leaveId);
-        if(beans.size() == 0){
-            outputObject.setreturnMessage("请填写请假日期.");
-            return;
-        }
-        checkWorkLeaveDao.updateCheckWorkLeaveMation(map);
-        checkWorkLeaveDao.deleteCheckWorkLeaveDaysMationByLeaveId(leaveId);
-        checkWorkLeaveDao.insertCheckWorkLeaveDaysMation(beans);
-        // 更新工作流中的数据
-        ActivitiRunFactory.run(inputObject, outputObject, CHECK_WORK_LEAVE_PAGE_KEY).editApplyMationInActiviti(leaveId);
-    }
-
     /**
      * 提交审批请假申请
      *
@@ -209,7 +184,7 @@ public class CheckWorkLeaveServiceImpl implements CheckWorkLeaveService {
      * @throws Exception
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editCheckWorkLeaveToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String leaveId = map.get("id").toString();
@@ -219,7 +194,8 @@ public class CheckWorkLeaveServiceImpl implements CheckWorkLeaveService {
                 || ActivitiConstants.ActivitiState.NO_PASS.getState() == state
                 || ActivitiConstants.ActivitiState.REVOKE.getState() == state){
             // 草稿、审核不通过或者撤销状态下可以提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, CHECK_WORK_LEAVE_PAGE_KEY).submitToActivi(leaveId, ActivitiConstants.APPROVAL_ID);
+            activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
+                CHECK_WORK_LEAVE_PAGE_KEY, leaveId, map.get("approvalId").toString());
         }else{
             outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
         }
@@ -257,7 +233,7 @@ public class CheckWorkLeaveServiceImpl implements CheckWorkLeaveService {
      * @throws Exception
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editCheckWorkLeaveToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
         ActivitiRunFactory.run(inputObject, outputObject, CHECK_WORK_LEAVE_PAGE_KEY).revokeActivi();
     }

skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkOvertimeServiceImpl.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.CheckWorkConstants;
 import com.skyeye.common.constans.Constants;
@@ -43,6 +45,9 @@ public class CheckWorkOvertimeServiceImpl implements CheckWorkOvertimeService {
     @Autowired
     private SysEnclosureDao sysEnclosureDao;
 
+    @Autowired
+    private ActivitiUserService activitiUserService;
+
     /**
      * 加班申请关联的工作流的key
      */
@@ -68,7 +73,7 @@ public class CheckWorkOvertimeServiceImpl implements CheckWorkOvertimeService {
      * @throws Exception
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void insertCheckWorkOvertimeMation(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         // 加班申请id
@@ -87,11 +92,9 @@ public class CheckWorkOvertimeServiceImpl implements CheckWorkOvertimeService {
         map.put("createTime", DateUtil.getTimeAndToString());
         checkWorkOvertimeDao.insertCheckWorkOvertimeMation(map);
         checkWorkOvertimeDao.insertCheckWorkOvertimeDaysMation(beans);
-        // 判断是否提交审批
-        if("2".equals(map.get("subType").toString())){
-            // 提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, CHECK_WORK_OVERTIME_PAGE_KEY).submitToActivi(overtimeId, ActivitiConstants.APPROVAL_ID);
-        }
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            CHECK_WORK_OVERTIME_PAGE_KEY, overtimeId, map.get("approvalId").toString());
     }
 
     private List<Map<String, Object>> getOverTimeDays(String overtimeDayStr, String overtimeId) {
@@ -134,7 +137,7 @@ public class CheckWorkOvertimeServiceImpl implements CheckWorkOvertimeService {
      * @throws Exception
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void updateCheckWorkOvertimeById(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         // 加班申请id
@@ -148,11 +151,9 @@ public class CheckWorkOvertimeServiceImpl implements CheckWorkOvertimeService {
         checkWorkOvertimeDao.updateCheckWorkOvertimeMation(map);
         checkWorkOvertimeDao.deleteCheckWorkOvertimeDaysMationByOvertimeId(overtimeId);
         checkWorkOvertimeDao.insertCheckWorkOvertimeDaysMation(beans);
-        // 判断是否提交审批
-        if("2".equals(map.get("subType").toString())){
-            // 提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, CHECK_WORK_OVERTIME_PAGE_KEY).submitToActivi(overtimeId, ActivitiConstants.APPROVAL_ID);
-        }
+        // 操作工作流数据
+        activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+            CHECK_WORK_OVERTIME_PAGE_KEY, overtimeId, map.get("approvalId").toString());
     }
 
     /**
@@ -175,32 +176,6 @@ public class CheckWorkOvertimeServiceImpl implements CheckWorkOvertimeService {
         outputObject.setBean(bean);
     }
 
-    /**
-     * 在工作流中编辑加班申请
-     *
-     * @param inputObject
-     * @param outputObject
-     * @throws Exception
-     */
-    @Override
-    @Transactional(value="transactionManager")
-    public void updateCheckWorkOvertimeByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
-        Map<String, Object> map = inputObject.getParams();
-        // 加班申请id
-        String overtimeId = map.get("id").toString();
-        // 处理加班天数
-        List<Map<String, Object>> beans = getOverTimeDays(map.get("overtimeDayStr").toString(), overtimeId);
-        if(beans.size() == 0){
-            outputObject.setreturnMessage("请填写加班日期.");
-            return;
-        }
-        checkWorkOvertimeDao.updateCheckWorkOvertimeMation(map);
-        checkWorkOvertimeDao.deleteCheckWorkOvertimeDaysMationByOvertimeId(overtimeId);
-        checkWorkOvertimeDao.insertCheckWorkOvertimeDaysMation(beans);
-        // 编辑工作流中的数据
-        ActivitiRunFactory.run(inputObject, outputObject, CHECK_WORK_OVERTIME_PAGE_KEY).editApplyMationInActiviti(overtimeId);
-    }
-
     /**
      * 提交审批加班申请
      *
@@ -209,7 +184,7 @@ public class CheckWorkOvertimeServiceImpl implements CheckWorkOvertimeService {
      * @throws Exception
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editCheckWorkOvertimeToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String overtimeId = map.get("id").toString();
@@ -219,7 +194,9 @@ public class CheckWorkOvertimeServiceImpl implements CheckWorkOvertimeService {
                 || ActivitiConstants.ActivitiState.NO_PASS.getState() == state
                 || ActivitiConstants.ActivitiState.REVOKE.getState() == state){
             // 草稿、审核不通过或者撤销状态下可以提交审批
-            ActivitiRunFactory.run(inputObject, outputObject, CHECK_WORK_OVERTIME_PAGE_KEY).submitToActivi(overtimeId, ActivitiConstants.APPROVAL_ID);
+            // 操作工作流数据
+            activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
+                CHECK_WORK_OVERTIME_PAGE_KEY, overtimeId, map.get("approvalId").toString());
         }else{
             outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
         }
@@ -257,7 +234,7 @@ public class CheckWorkOvertimeServiceImpl implements CheckWorkOvertimeService {
      * @throws Exception
      */
     @Override
-    @Transactional(value="transactionManager")
+    @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
     public void editCheckWorkOvertimeToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
         ActivitiRunFactory.run(inputObject, outputObject, CHECK_WORK_OVERTIME_PAGE_KEY).revokeActivi();
     }

skyeye-checkwork/src/main/resources/reqmapping/mapping/checkwork.xml

@@ -216,6 +216,7 @@
 		<property id="remark" name="remark" ref="" var="备注" />
 		<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="checkworkleave003" path="/post/CheckWorkLeaveController/queryCheckWorkLeaveDetailsById" val="请假申请详情" allUse="2" method="GET" groupName="请假申请">
 		<property id="rowId" name="id" ref="required" var="请假申请主表单id" />
@@ -229,19 +230,15 @@
 		<property id="remark" name="remark" ref="" var="备注" />
 		<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="checkworkleave006" path="/post/CheckWorkLeaveController/editCheckWorkLeaveToSubApproval" val="提交审批请假申请" allUse="1" groupName="请假申请">
 		<property id="rowId" name="id" ref="required" var="请假申请id" />
+		<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
 	</url>
 	<url id="checkworkleave007" path="/post/CheckWorkLeaveController/updateCheckWorkLeaveToCancellation" val="作废请假申请" allUse="1" groupName="请假申请">
 		<property id="rowId" name="id" ref="required" var="请假申请id" />
 	</url>
-	<url id="checkworkleave008" path="/post/CheckWorkLeaveController/updateCheckWorkLeaveByIdInProcess" val="在工作流中编辑请假申请" allUse="2" method="PUT" groupName="请假申请">
-		<property id="rowId" name="id" ref="required" var="请假申请id" />
-		<property id="leaveDayStr" name="leaveDayStr" ref="required,json" var="请假天数json串" />
-		<property id="remark" name="remark" ref="" var="备注" />
-		<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
-	</url>
 	<url id="checkworkleave009" path="/post/CheckWorkLeaveController/editCheckWorkLeaveToRevoke" val="撤销请假申请" allUse="1" groupName="请假申请">
 		<property id="processInstanceId" name="processInstanceId" ref="required" var="流程id"/>
 	</url>
@@ -308,6 +305,7 @@
 		<property id="remark" name="remark" ref="" var="备注" />
 		<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="checkworkovertime003" path="/post/CheckWorkOvertimeController/queryCheckWorkOvertimeDetailsById" val="加班申请详情" allUse="2" method="GET" groupName="加班申请">
 		<property id="rowId" name="id" ref="required" var="加班申请主表单id" />
@@ -322,20 +320,15 @@
 		<property id="remark" name="remark" ref="" var="备注" />
 		<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="checkworkovertime006" path="/post/CheckWorkOvertimeController/editCheckWorkOvertimeToSubApproval" val="提交审批加班申请" allUse="1" groupName="加班申请">
 		<property id="rowId" name="id" ref="required" var="加班申请id" />
+		<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
 	</url>
 	<url id="checkworkovertime007" path="/post/CheckWorkOvertimeController/updateCheckWorkOvertimeToCancellation" val="作废加班申请" allUse="1" groupName="加班申请">
 		<property id="rowId" name="id" ref="required" var="加班申请id" />
 	</url>
-	<url id="checkworkovertime008" path="/post/CheckWorkOvertimeController/updateCheckWorkOvertimeByIdInProcess" val="在工作流中编辑加班申请" allUse="2" method="PUT" groupName="加班申请">
-		<property id="rowId" name="id" ref="required" var="加班申请id" />
-		<property id="overtimeDayStr" name="overtimeDayStr" ref="required,json" var="加班天数json串" />
-		<property id="content" name="content" ref="required" var="加班内容" />
-		<property id="remark" name="remark" ref="" var="备注" />
-		<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
-	</url>
 	<url id="checkworkovertime009" path="/post/CheckWorkOvertimeController/editCheckWorkOvertimeToRevoke" val="撤销加班申请" allUse="1" groupName="加班申请">
 		<property id="processInstanceId" name="processInstanceId" ref="required" var="流程id"/>
 	</url>

skyeye-crm/src/main/java/com/skyeye/controller/CrmContractController.java

@@ -130,22 +130,6 @@ public class CrmContractController {
 		crmContractService.editCrmContractMationById(inputObject, outputObject);
 	}
 	
-	/**
-	 *
-	 * @Title: editCrmContractMationToSave
-	 * @Description: 编辑合同信息(已提交审核)
-	 * @param inputObject
-	 * @param outputObject
-	 * @throws Exception 参数
-	 * @return void 返回类型
-	 * @throws
-	 */
-	@RequestMapping("/post/CrmContractController/editCrmContractMationToSave")
-	@ResponseBody
-	public void editCrmContractMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception {
-		crmContractService.editCrmContractMationToSave(inputObject, outputObject);
-	}
-	
 	/**
 	 *
 	 * @Title: queryCrmContractListToChoose

skyeye-crm/src/main/java/com/skyeye/service/CrmContractService.java

@@ -22,8 +22,6 @@ public interface CrmContractService {
     
     public void editCrmContractMationById(InputObject inputObject, OutputObject outputObject) throws Exception;
     
-    public void editCrmContractMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception;
-    
     public void queryCrmContractListToChoose(InputObject inputObject, OutputObject outputObject) throws Exception;
     
     public void editCrmContractToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception;

skyeye-crm/src/main/java/com/skyeye/service/impl/CrmContractServiceImpl.java

@@ -8,6 +8,8 @@ import cn.hutool.json.JSONUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 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.CrmConstants;
 import com.skyeye.common.object.InputObject;
@@ -52,6 +54,9 @@ public class CrmContractServiceImpl implements CrmContractService {
 	@Autowired
     private SysEveUserStaffDao sysEveUserStaffDao;
 
+	@Autowired
+	private ActivitiUserService activitiUserService;
+
 	/**
 	 * 客户合同提交到工作流中的key
 	 */
@@ -139,7 +144,7 @@ public class CrmContractServiceImpl implements CrmContractService {
 	 * @throws Exception
 	 */
 	@Override
-	@Transactional(value = "transactionManager")
+	@ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
 	public void insertCrmContractMation(InputObject inputObject, OutputObject outputObject) throws Exception {
 		Map<String, Object> map = inputObject.getParams();
 		judgeParams(map);
@@ -156,11 +161,9 @@ public class CrmContractServiceImpl implements CrmContractService {
 			map.put("createTime", DateUtil.getTimeAndToString());
 			crmContractDao.insertCrmContractMation(map);
 			jedisClient.del(CrmConstants.sysContractListById(map.get("customerId").toString()));
-			// 判断是否提交审批
-			if("2".equals(map.get("subType").toString())){
-				// 提交审批
-				ActivitiRunFactory.run(inputObject, outputObject, CRM_CONTRACT_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID);
-			}
+			// 操作工作流数据
+			activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+				CRM_CONTRACT_PAGE_KEY, id, map.get("approvalId").toString());
 		}
 	}
 
@@ -238,7 +241,7 @@ public class CrmContractServiceImpl implements CrmContractService {
 	* @throws Exception
 	*/
 	@Override
-	@Transactional(value = "transactionManager")
+	@ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
 	public void editCrmContractMationById(InputObject inputObject, OutputObject outputObject) throws Exception {
 		Map<String, Object> map = inputObject.getParams();
 		judgeParams(map);
@@ -249,36 +252,9 @@ public class CrmContractServiceImpl implements CrmContractService {
 			String id = map.get("id").toString();
 			crmContractDao.editCrmContractMationById(map);
 			jedisClient.del(CrmConstants.sysContractListById(map.get("customerId").toString()));
-			// 判断是否提交审批
-			if("2".equals(map.get("subType").toString())){
-				// 提交审批
-				ActivitiRunFactory.run(inputObject, outputObject, CRM_CONTRACT_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID);
-			}
-		}
-	}
-	
-	/**
-	*
-	* @Title: editCrmContractMationToSave
-	* @Description: 编辑合同信息(已提交审核)
-	* @param inputObject
-	* @param outputObject
-	* @throws Exception
-	*/
-	@Override
-	@Transactional(value = "transactionManager")
-	public void editCrmContractMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception {
-		Map<String, Object> map = inputObject.getParams();
-		judgeParams(map);
-		List<Map<String, Object>> list = crmContractDao.queryCrmContractMationByNameAndId(map);
-		if(list != null && list.size() > 0){
-			outputObject.setreturnMessage("合同名称或编号已存在！");
-		}else{
-			String id = map.get("id").toString();
-			crmContractDao.editCrmContractMationById(map);
-			jedisClient.del(CrmConstants.sysContractListById(map.get("customerId").toString()));
-			// 编辑工作流中的数据
-			ActivitiRunFactory.run(inputObject, outputObject, CRM_CONTRACT_PAGE_KEY).editApplyMationInActiviti(id);
+			// 操作工作流数据
+			activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
+				CRM_CONTRACT_PAGE_KEY, id, map.get("approvalId").toString());
 		}
 	}
 	
@@ -316,7 +292,7 @@ public class CrmContractServiceImpl implements CrmContractService {
          * @throws
      */
 	@Override
-	@Transactional(value="transactionManager")
+	@ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
 	public void editCrmContractToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception {
 		Map<String, Object> map = inputObject.getParams();
 		String id = map.get("id").toString();
@@ -324,7 +300,8 @@ public class CrmContractServiceImpl implements CrmContractService {
 		int state = Integer.parseInt(bean.get("state").toString());
 		if(0 == state || 12 == state || 4 == state){
 			// 草稿、审核不通过或者撤销状态下可以提交审批
-			ActivitiRunFactory.run(inputObject, outputObject, CRM_CONTRACT_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID);
+			activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
+				CRM_CONTRACT_PAGE_KEY, id, map.get("approvalId").toString());
 		}else{
 			outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
 		}
@@ -462,6 +439,7 @@ public class CrmContractServiceImpl implements CrmContractService {
 	     * @throws
 	 */
 	@Override
+	@ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
 	public void editCrmContractToRevokeByProcessInstanceId(InputObject inputObject, OutputObject outputObject) throws Exception {
 		ActivitiRunFactory.run(inputObject, outputObject, CRM_CONTRACT_PAGE_KEY).revokeActivi();
 	}

skyeye-crm/src/main/resources/reqmapping/mapping/crm.xml

@@ -337,6 +337,7 @@
 		<property id="relationUserId" name="relationUserId" ref="required" var="关联人员"/>
 		<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/>
 		<property id="subType" name="subType" ref="" var="提交类型"/>
+		<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
 	</url>
 	<url id="mycrmcontract003" path="/post/CrmContractController/editCrmContractMationById" val="编辑我的合同信息" allUse="1" groupName="合同模块">
 		<property id="rowId" name="id" ref="required" var="合同id"/>
@@ -360,6 +361,7 @@
 		<property id="relationUserId" name="relationUserId" ref="required" var="关联人员"/>
 		<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/>
 		<property id="subType" name="subType" ref="" var="提交类型"/>
+		<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
 	</url>
 	<url id="mycrmcontract004" path="/post/CrmContractController/queryCrmContractMationById" val="获取合同信息进行回显" allUse="2" groupName="合同模块">
 		<property id="rowId" name="id" ref="required" var="合同id"/>
@@ -382,6 +384,7 @@
 	</url>
 	<url id="mycrmcontract009" path="/post/CrmContractController/editCrmContractToSubApproval" val="合同提交审批" allUse="1" groupName="合同模块">
 		<property id="rowId" name="id" ref="required" var="合同id"/>
+		<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
 	</url>
 	<url id="mycrmcontract010" path="/post/CrmContractController/editCrmContractToPerform" val="合同执行" allUse="1" groupName="合同模块">
 		<property id="rowId" name="id" ref="required" var="合同id"/>
@@ -395,28 +398,6 @@
 	<url id="mycrmcontract013" path="/post/CrmContractController/editCrmContractToRecovery" val="合同恢复" allUse="1" groupName="合同模块">
 		<property id="rowId" name="id" ref="required" var="合同id"/>
 	</url>
-	<url id="mycrmcontract014" path="/post/CrmContractController/editCrmContractMationToSave" val="编辑我的合同信息(已提交审核)" allUse="2" groupName="合同模块">
-		<property id="rowId" name="id" ref="required" var="合同id"/>
-		<property id="city" name="city" ref="" var="所在城市"/>
-		<property id="detailAddress" name="detailAddress" ref="" var="详细地址"/>
-		<property id="title" name="title" ref="required" var="合同名称"/>
-		<property id="num" name="num" ref="required" var="合同编号"/>
-		<property id="price" name="price" ref="double" var="合同金额"/>
-		<property id="signingTime" name="signingTime" ref="required" var="签约日期"/>
-		<property id="effectTime" name="effectTime" ref="" var="生效日期"/>
-		<property id="serviceEndTime" name="serviceEndTime" ref="" var="服务结束日期"/>
-		<property id="contacts" name="contacts" ref="required" var="联系人"/>
-		<property id="workPhone" name="workPhone" ref="" var="固定电话"/>
-		<property id="mobilePhone" name="mobilePhone" ref="phone" var="移动电话"/>
-		<property id="email" name="email" ref="email" var="邮箱"/>
-		<property id="qq" name="qq" ref="" var="QQ号"/>
-		<property id="technicalTerms" name="technicalTerms" ref="" var="主要技术条款"/>
-		<property id="businessTerms" name="businessTerms" ref="" var="主要商务条款"/>
-		<property id="customerId" name="customerId" ref="required" var="客户id"/>
-		<property id="departmentId" name="departmentId" ref="required" var="所属部门id"/>
-		<property id="relationUserId" name="relationUserId" ref="required" var="关联人员"/>
-		<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/>
-	</url>
 	<url id="mycrmcontract015" path="/post/CrmContractController/deleteCrmContractById" val="删除合同信息" allUse="1" groupName="合同模块">
 		<property id="rowId" name="id" ref="required" var="合同id"/>
 	</url>