任务流转

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js

@@ -238,6 +238,17 @@ function rejectForm() {
 
 }
 
+function checkThrough(){
+    $('#exPass').ajaxSubmit({
+        url: web_app.name + '/sapNonProdApplyNext/rejectNonProdApplyDept.ajax',
+        param: {meId:getMeId()},
+        success: function (data) {
+            Public.successTip("检查通过！");
+            _self.close();
+        }
+    });
+}
+
 
 /**
  * 根据选择的驳回的部门生成输入框

topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/BsnMessageApplication.java

@@ -26,16 +26,23 @@ public interface BsnMessageApplication {
     void publishTasks(String bId);
 
     /**
-     * 保存任务并发布
+     * 保存并发布任务
      */
     void keepAndPublishTasks(BsnMessageSponsor bsnMessageSponsor);
 
     /**
      * 发布人驳回任务
      * @param exMap put("驳回部门","驳回信息")
-     * @param bid 表单id
+     * @param mId 表单id
      */
-    void rejectTasks(Map<String ,Object> exMap,String bid);
+    void rejectTasksByMeId(Map<String ,Object> exMap,String meId);
+
+    /**
+     * 发布人驳回任务
+     * @param exMap put("驳回部门","驳回信息")
+     * @param bId 表单id
+     */
+    void rejectTasksByBId(Map<String ,Object> exMap,String bId);
 
     /**
      * 发布人批准任务
@@ -45,9 +52,9 @@ public interface BsnMessageApplication {
 
     /**
      * 执行人提交任务
-     * @param mId
+     * @param meId
      */
-    void submitTask(String mId);
+    void submitTask(String meId);
 
 
     /**

topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/impl/BsnMessageApplicationImpl.java

@@ -83,9 +83,7 @@ public class BsnMessageApplicationImpl extends BaseApplication implements BsnMes
         this.saveBsnMessageSponsor(sponsor);
     }
 
-    @Override
-    public void rejectTasks(Map<String, Object> exMap, String bId) {
-        BsnMessageSponsor sponsor = this.getSponsorByBId(bId);
+    public void rejectTasks(Map<String, Object> exMap, BsnMessageSponsor sponsor) {
         if (sponsor != null) {
             List<BsnMessageExecute> brotherExecuteAll = sponsor.getExecutes();
             Map<String, BsnMessageExecute> executeMap = new HashMap<>();
@@ -120,10 +118,24 @@ public class BsnMessageApplicationImpl extends BaseApplication implements BsnMes
 
     }
 
+    @Override
+    public void rejectTasksByMeId(Map<String, Object> exMap, String mId) {
+        BsnMessageExecute execute = messageExecuteRepository.findOne(mId);
+        List<BsnMessageExecute> executes = this.getExecutesByMsId(execute.getMessageSponsorId());
+        BsnMessageSponsor sponsor = messageSponsorRepository.findOne(execute.getMessageSponsorId());
+        sponsor.setExecutes(executes);
+        this.rejectTasks(exMap,sponsor);
+    }
 
     @Override
-    public void submitTask(String mId) {
-        BsnMessageExecute execute = this.getExecuteByMeId(mId);
+    public void rejectTasksByBId(Map<String, Object> exMap, String bId) {
+        BsnMessageSponsor sponsor = this.getSponsorByBId(bId);
+        this.rejectTasks(exMap,sponsor);
+    }
+
+    @Override
+    public void submitTask(String meId) {
+        BsnMessageExecute execute = this.getExecuteByMeId(meId);
         execute.setActive(ActiveStatus.FINISHED.getValue());
         this.saveBsnMessageExecute(execute);
     }
@@ -225,8 +237,8 @@ public class BsnMessageApplicationImpl extends BaseApplication implements BsnMes
     }
 
 
-    public BsnMessageExecute getExecuteByMeId(String id) {
-        return messageExecuteRepository.findOne(id);
+    public BsnMessageExecute getExecuteByMeId(String mId) {
+        return messageExecuteRepository.findOne(mId);
     }
 
     //获取审批任务

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java

@@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class NonProdApplyDeptApplicationImpl extends BaseApplication implements NonProdApplyDeptApplication {
@@ -92,38 +91,12 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
     @Override
     public void rejectNonProdApplyDept(SDO sdo) {
         String meId = sdo.getString("meId");
-
-
-//        //需要被驳回的部门
-//        List<BsnMessageExecute> brotherExecuteAll = bsnMessageApplication.getBrotherExecuteByMeId(meId);
-//        Map<String, BsnMessageExecute> executeMap = new HashMap<>();
-//        for (BsnMessageExecute execute : brotherExecuteAll) {
-//            executeMap.put(execute.getTaskExecute(), execute);
-//        }
-
-
-
-//        // 遍历 SDO 对象中的 key
-//        for (String key : sdo.getProperties().keySet()) {
-//            // 如果存在对应的 BsnMessageExecute，进行操作
-//            BsnMessageExecute execute = executeMap.get(key);
-//            if (execute != null) {
-//                //更改驳回状态
-//                execute.setActive(ActiveStatus.REJECTED.getValue());
-//                //更新时间
-//                execute.setUpdateDate(new Date());
-//                //封装驳回详细
-//                BsnMessageReject reject = new BsnMessageReject();
-//                reject.setRejectMsg(sdo.getString(key));
-//                reject.setRejectDate(new Date());
-//                reject.setBsnExecuteId(execute.getId());
-//                execute.addReject(reject);
-//                bsnMessageApplication.saveBsnMessageExecute(execute);
-//            }
-//        }
-//        //当前审核任务回退
-//        BsnMessageExecute systemExecute = bsnMessageApplication.getExecuteByMeId(meId);
-//        systemExecute.setActive(ActiveStatus.SAVED.getValue());
-//        bsnMessageApplication.saveBsnMessageExecute(systemExecute);
+        Map<String,Object> map = new HashMap<>();
+        String auditDept = sdo.getString("auditDept");
+        List<String> deptList = Arrays.asList(auditDept.split(","));
+        for (String key : deptList) {
+            map.put(key,sdo.getString(key));
+        }
+        bsnMessageApplication.rejectTasksByMeId(map,meId);
     }
 }