流程调整

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyBuyingMoreController.java

@@ -108,12 +108,16 @@ public class ApplyBuyingMoreController extends BaseController {
             }
         }
 
-        String waitUrl = modelService.getWaitUrl();
+        String waitUrl = parkWaitHandleService.getUrl("流程审批","付款审批流程");
         FlowMain flowMain = flowMainService.selectByPrimaryKey(flowMainPush.getFlowMainId());
         String flowId = flowMain.getId();
         // 进行审核操作后 就要处理待办 清除数据
         String param = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
         parkWaitHandleService.userHandle(HandleTypeEnum.HG, param, ShiroUtils.getUserId());
+        // 泛微处理待办 清除数据
+        parkWaitHandleService.userHandleOa(flowMainPush, flowMain);
+        HandleTypeEnum typeEnum = HandleTypeEnum.HG;
+        HandleTypeEnum.HG.setUrl(waitUrl);
 
         Boolean isEnd = false;//是否结束
         Boolean isAgree = false;//是否同意
@@ -125,12 +129,12 @@ public class ApplyBuyingMoreController extends BaseController {
                 isEnd = true;
                 isAgree = true;
             } else {
-                modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+                parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
             }
         } else if (addConfirmResult.getConfirmResult().equals("2")) { // 退回发起人
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         } else if (addConfirmResult.getConfirmResult().equals("3")) { // 退回上一节点
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         }
         //添加业务信息(将请假信息中的修改掉,剩余年假,剩余调休,冻结年假,冻结调休都修改掉)
         if (isEnd) {
@@ -227,7 +231,10 @@ public class ApplyBuyingMoreController extends BaseController {
         String applyTheme = "" + ShiroUtils.getUser().getTruename() + "的回购申请单";
         AjaxResult ajaxResult = flowMainService.doFlowMain(applyTheme, record.getId(), addSystemRemark, record.getCcList(), ConstantFlowType.BUYING_MORE_PROCESSDEFINE, ConstantFlowType.BUYING_MORE_DEPLOYMENTID, feeMoneyTotalMap, ConstantFlowType.BUYING_MORE_NAME, ConstantFlowType.BUYING_MORE, ShiroUtils.getUser(), deptId, tagerUserId);
 
-        modelService.startOaAndHandle(record.getId(), applyTheme);
+        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款审批流程");
+        HandleTypeEnum typeEnum = HandleTypeEnum.HG;
+        HandleTypeEnum.HG.setUrl(waitUrl);
+        parkWaitHandleService.startOaAndHandle(record.getId(), applyTheme, typeEnum);
         if (ajaxResult.get("code").equals(1688)) {
             return AjaxResult.success();
         } else {

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyCheckInController.java

@@ -107,12 +107,16 @@ public class ApplyCheckInController extends BaseController {
             }
         }
 
-        String waitUrl = modelService.getWaitUrl();
+        String waitUrl = parkWaitHandleService.getUrl("流程审批","付款审批流程");
         FlowMain flowMain = flowMainService.selectByPrimaryKey(flowMainPush.getFlowMainId());
         String flowId = flowMain.getId();
         // 进行审核操作后 就要处理待办 清除数据
         String param = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
-        parkWaitHandleService.userHandle(HandleTypeEnum.FK, param, ShiroUtils.getUserId());
+        parkWaitHandleService.userHandle(HandleTypeEnum.RZ, param, ShiroUtils.getUserId());
+        // 泛微处理待办 清除数据
+        parkWaitHandleService.userHandleOa(flowMainPush, flowMain);
+        HandleTypeEnum typeEnum = HandleTypeEnum.RZ;
+        HandleTypeEnum.RZ.setUrl(waitUrl);
 
         Boolean isEnd = false;//是否结束
         Boolean isAgree = false;//是否同意
@@ -124,12 +128,12 @@ public class ApplyCheckInController extends BaseController {
                 isEnd = true;
                 isAgree = true;
             } else {
-                modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+                parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
             }
         } else if (addConfirmResult.getConfirmResult().equals("2")) { // 退回发起人
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         } else if (addConfirmResult.getConfirmResult().equals("3")) { // 退回上一节点
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         }
         //添加业务信息(将请假信息中的修改掉,剩余年假,剩余调休,冻结年假,冻结调休都修改掉)
         if (isEnd) {
@@ -225,7 +229,10 @@ public class ApplyCheckInController extends BaseController {
                 ConstantFlowType.CHECK_IN_PROCESSDEFINE, ConstantFlowType.CHECK_IN_DEPLOYMENTID, feeMoneyTotalMap,
                 ConstantFlowType.CHECK_IN_NAME, ConstantFlowType.CHECK_IN, ShiroUtils.getUser(), deptId, tagerUserId);
 
-        modelService.startOaAndHandle(record.getId(), applyTheme);
+        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款审批流程");
+        HandleTypeEnum typeEnum = HandleTypeEnum.RZ;
+        HandleTypeEnum.RZ.setUrl(waitUrl);
+        parkWaitHandleService.startOaAndHandle(record.getId(), applyTheme, typeEnum);
         if (ajaxResult.get("code").equals(1688)) {
             return AjaxResult.success();
         } else {

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyContractController.java

@@ -107,12 +107,16 @@ public class ApplyContractController extends BaseController {
             }
         }
 
-        String waitUrl = modelService.getWaitUrl();
+        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款审批流程");
         FlowMain flowMain = flowMainService.selectByPrimaryKey(flowMainPush.getFlowMainId());
         String flowId = flowMain.getId();
         // 进行审核操作后 就要处理待办 清除数据
         String param = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
-        parkWaitHandleService.userHandle(HandleTypeEnum.FK, param, ShiroUtils.getUserId());
+        parkWaitHandleService.userHandle(HandleTypeEnum.HTYZ, param, ShiroUtils.getUserId());
+        // 泛微处理待办 清除数据
+        parkWaitHandleService.userHandleOa(flowMainPush, flowMain);
+        HandleTypeEnum typeEnum = HandleTypeEnum.HTYZ;
+        HandleTypeEnum.HTYZ.setUrl(waitUrl);
 
         Boolean isEnd = false;//是否结束
         Boolean isAgree = false;//是否同意
@@ -124,12 +128,12 @@ public class ApplyContractController extends BaseController {
                 isEnd = true;
                 isAgree = true;
             } else {
-                modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+                parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
             }
         } else if (addConfirmResult.getConfirmResult().equals("2")) { // 退回发起人
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         } else if (addConfirmResult.getConfirmResult().equals("3")) { // 退回上一节点
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         }
         //添加业务信息(将请假信息中的修改掉,剩余年假,剩余调休,冻结年假,冻结调休都修改掉)
         if (isEnd) {
@@ -149,12 +153,12 @@ public class ApplyContractController extends BaseController {
     @PostMapping(value = "addApplyContract", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     @Transactional
-    public AjaxResult addApplyContract(ApplyContractDto record,String deptId, String tagerUserId) throws FlowException {
+    public AjaxResult addApplyContract(ApplyContractDto record, String deptId, String tagerUserId) throws FlowException {
         System.out.println(record);
         if (false) {
             return AjaxResult.error("这是一个错误测试信息");
         }
-        return myaddApplyContract(record, null, deptId,  tagerUserId);
+        return myaddApplyContract(record, null, deptId, tagerUserId);
     }
 
     /**
@@ -166,7 +170,7 @@ public class ApplyContractController extends BaseController {
     @PostMapping(value = "addApplyContractAgain", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     @Transactional
-    public AjaxResult addApplyContractAgain(ApplyContractDto record,String deptId, String tagerUserId) throws FlowException {
+    public AjaxResult addApplyContractAgain(ApplyContractDto record, String deptId, String tagerUserId) throws FlowException {
         System.out.println("addApplyContractAgain");
         if (StringUtils.isEmpty(record.getFlowMainId())) {
             return AjaxResult.error("没有传入flowMainId的值");
@@ -181,7 +185,7 @@ public class ApplyContractController extends BaseController {
             flowMain1.setUpdatedBy(ShiroUtils.getUser().getId());
             flowMainService.updateByPrimaryKeySelective(flowMain1);
         }
-        return myaddApplyContract(record, "重新发起申请[" + record.getFlowMainId() + "],", deptId,  tagerUserId);
+        return myaddApplyContract(record, "重新发起申请[" + record.getFlowMainId() + "],", deptId, tagerUserId);
     }
 
     /**
@@ -190,7 +194,7 @@ public class ApplyContractController extends BaseController {
      * @param record
      * @return
      */
-    public AjaxResult myaddApplyContract(ApplyContractDto record, String addSystemRemark,String deptId, String tagerUserId) throws FlowException {
+    public AjaxResult myaddApplyContract(ApplyContractDto record, String addSystemRemark, String deptId, String tagerUserId) throws FlowException {
 
 
         String id = UUIDUtils.middleUUID();
@@ -198,15 +202,15 @@ public class ApplyContractController extends BaseController {
             StringBuilder builder = new StringBuilder();
             String houseId = record.getHouseId();
             String[] split = houseId.split(",");
-            for (String s : split){
+            for (String s : split) {
                 ParkRoomResponse response = roomExtendMapper.getFullName(s);
                 builder.append(response.getGroupName()).append("-")
                         .append(response.getDiscName()).append("-")
                         .append(response.getBuildName()).append("-")
                         .append(response.getRoomNo()).append(",");
             }
-            if(builder.length()>1){
-                builder.deleteCharAt(builder.length()-1);
+            if (builder.length() > 1) {
+                builder.deleteCharAt(builder.length() - 1);
             }
             record.setHouseName(builder.toString());
             record.setFlowNum(modelService.getMaxNum());
@@ -225,7 +229,10 @@ public class ApplyContractController extends BaseController {
         String applyTheme = "" + ShiroUtils.getUser().getTruename() + "的合同用章申请单";
         AjaxResult ajaxResult = flowMainService.doFlowMain(applyTheme, record.getId(), addSystemRemark, record.getCcList(), ConstantFlowType.CONTRACT_PROCESSDEFINE, ConstantFlowType.CONTRACT_DEPLOYMENTID, feeMoneyTotalMap, ConstantFlowType.CONTRACT_NAME, ConstantFlowType.CONTRACT, ShiroUtils.getUser(), deptId, tagerUserId);
 
-        modelService.startOaAndHandle(record.getId(), applyTheme);
+        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款审批流程");
+        HandleTypeEnum typeEnum = HandleTypeEnum.HTYZ;
+        HandleTypeEnum.HTYZ.setUrl(waitUrl);
+        parkWaitHandleService.startOaAndHandle(record.getId(), applyTheme, typeEnum);
         if (ajaxResult.get("code").equals(1688)) {
             return AjaxResult.success();
         } else {
@@ -300,10 +307,5 @@ public class ApplyContractController extends BaseController {
     }
 
 
-
-
-
-
-
 }
 

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyFinanceController.java

@@ -110,12 +110,16 @@ public class ApplyFinanceController extends BaseController {
             }
         }
 
-        String waitUrl = modelService.getWaitUrl();
+        String waitUrl = parkWaitHandleService.getUrl("流程审批","付款审批流程");
         FlowMain flowMain = flowMainService.selectByPrimaryKey(flowMainPush.getFlowMainId());
         String flowId = flowMain.getId();
         // 进行审核操作后 就要处理待办 清除数据
         String param = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
         parkWaitHandleService.userHandle(HandleTypeEnum.SJCZ, param, ShiroUtils.getUserId());
+        // 泛微处理待办 清除数据
+        parkWaitHandleService.userHandleOa(flowMainPush, flowMain);
+        HandleTypeEnum typeEnum = HandleTypeEnum.SJCZ;
+        HandleTypeEnum.SJCZ.setUrl(waitUrl);
 
         Boolean isEnd = false;//是否结束
         Boolean isAgree = false;//是否同意
@@ -127,12 +131,12 @@ public class ApplyFinanceController extends BaseController {
                 isEnd = true;
                 isAgree = true;
             } else {
-                modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+                parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
             }
         } else if (addConfirmResult.getConfirmResult().equals("2")) { // 退回发起人
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         } else if (addConfirmResult.getConfirmResult().equals("3")) { // 退回上一节点
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         }
         //添加业务信息(将请假信息中的修改掉,剩余年假,剩余调休,冻结年假,冻结调休都修改掉)
         if (isEnd) {
@@ -229,7 +233,10 @@ public class ApplyFinanceController extends BaseController {
         String applyTheme = "" + ShiroUtils.getUser().getTruename() + "的付款申请单";
         AjaxResult ajaxResult = flowMainService.doFlowMain(applyTheme, record.getId(), addSystemRemark, record.getCcList(), ConstantFlowType.FINANCE_PROCESSDEFINE, ConstantFlowType.FINANCE_DEPLOYMENTID, feeMoneyTotalMap, ConstantFlowType.FINANCE_NAME, ConstantFlowType.FINANCE, ShiroUtils.getUser(), deptId, tagerUserId);
 
-        modelService.startOaAndHandle(record.getId(), applyTheme);
+        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款审批流程");
+        HandleTypeEnum typeEnum = HandleTypeEnum.SJCZ;
+        HandleTypeEnum.SJCZ.setUrl(waitUrl);
+        parkWaitHandleService.startOaAndHandle(record.getId(), applyTheme, typeEnum);
         if (ajaxResult.get("code").equals(1688)) {
 
             return AjaxResult.success();

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyInvoiceRedController.java

@@ -109,12 +109,16 @@ public class ApplyInvoiceRedController extends BaseController {
             }
         }
 
-        String waitUrl = modelService.getWaitUrl();
+        String waitUrl = parkWaitHandleService.getUrl("流程审批","付款审批流程");
         FlowMain flowMain = flowMainService.selectByPrimaryKey(flowMainPush.getFlowMainId());
         String flowId = flowMain.getId();
         // 进行审核操作后 就要处理待办 清除数据
         String param = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
         parkWaitHandleService.userHandle(HandleTypeEnum.YSKTZ, param, ShiroUtils.getUserId());
+        // 泛微处理待办 清除数据
+        parkWaitHandleService.userHandleOa(flowMainPush, flowMain);
+        HandleTypeEnum typeEnum = HandleTypeEnum.YSKTZ;
+        HandleTypeEnum.YSKTZ.setUrl(waitUrl);
 
         Boolean isEnd = false;//是否结束
         Boolean isAgree = false;//是否同意
@@ -126,12 +130,12 @@ public class ApplyInvoiceRedController extends BaseController {
                 isEnd = true;
                 isAgree = true;
             } else {
-                modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+                parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
             }
         } else if (addConfirmResult.getConfirmResult().equals("2")) { // 退回发起人
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         } else if (addConfirmResult.getConfirmResult().equals("3")) { // 退回上一节点
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         }
         //添加业务信息(将请假信息中的修改掉,剩余年假,剩余调休,冻结年假,冻结调休都修改掉)
         if (isEnd) {
@@ -227,7 +231,10 @@ public class ApplyInvoiceRedController extends BaseController {
         String applyTheme = "" + ShiroUtils.getUser().getTruename() + "的合同用章申请单";
         AjaxResult ajaxResult = flowMainService.doFlowMain(applyTheme, record.getId(), addSystemRemark, record.getCcList(), ConstantFlowType.INVOICE_RED_PROCESSDEFINE, ConstantFlowType.INVOICE_RED_DEPLOYMENTID, feeMoneyTotalMap, ConstantFlowType.INVOICE_RED_NAME, ConstantFlowType.INVOICE_RED, ShiroUtils.getUser(), deptId, tagerUserId);
 
-        modelService.startOaAndHandle(record.getId(), applyTheme);
+        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款审批流程");
+        HandleTypeEnum typeEnum = HandleTypeEnum.FPHC;
+        HandleTypeEnum.FPHC.setUrl(waitUrl);
+        parkWaitHandleService.startOaAndHandle(record.getId(), applyTheme, typeEnum);
         if (ajaxResult.get("code").equals(1688)) {
             return AjaxResult.success();
         } else {

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyPaymentSettleController.java

@@ -126,12 +126,16 @@ public class ApplyPaymentSettleController extends BaseController {
             }
         }
 
-        String waitUrl = modelService.getWaitUrl();
+        String waitUrl = parkWaitHandleService.getUrl("流程审批","付款审批流程");
         FlowMain flowMain = flowMainService.selectByPrimaryKey(flowMainPush.getFlowMainId());
         String flowId = flowMain.getId();
         // 进行审核操作后 就要处理待办 清除数据
         String param = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
         parkWaitHandleService.userHandle(HandleTypeEnum.FK, param, ShiroUtils.getUserId());
+        // 泛微处理待办 清除数据
+        parkWaitHandleService.userHandleOa(flowMainPush, flowMain);
+        HandleTypeEnum typeEnum = HandleTypeEnum.FK;
+        HandleTypeEnum.FK.setUrl(waitUrl);
 
         Boolean isEnd = false;//是否结束
         Boolean isAgree = false;//是否同意
@@ -143,12 +147,12 @@ public class ApplyPaymentSettleController extends BaseController {
                 isEnd = true;
                 isAgree = true;
             } else {
-                modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+                parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
             }
         } else if (addConfirmResult.getConfirmResult().equals("2")) { // 退回发起人
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         } else if (addConfirmResult.getConfirmResult().equals("3")) { // 退回上一节点
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         }
         //添加业务信息(将请假信息中的修改掉,剩余年假,剩余调休,冻结年假,冻结调休都修改掉)
         if (isEnd) {
@@ -230,7 +234,10 @@ public class ApplyPaymentSettleController extends BaseController {
         String applyTheme = "" + ShiroUtils.getUser().getTruename() + "的付款申请单";
         AjaxResult ajaxResult = flowMainService.doFlowMain(applyTheme, record.getId(), addSystemRemark, record.getCcList(), ConstantFlowType.PAYMENT_PROCESSDEFINE, ConstantFlowType.PAYMENT_DEPLOYMENTID, feeMoneyTotalMap, ConstantFlowType.PAYMENT_NAME, ConstantFlowType.PAYMENT, ShiroUtils.getUser(), deptId, tagerUserId);
 
-        modelService.startOaAndHandle(record.getId(), applyTheme);
+        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款审批流程");
+        HandleTypeEnum typeEnum = HandleTypeEnum.FK;
+        HandleTypeEnum.FK.setUrl(waitUrl);
+        parkWaitHandleService.startOaAndHandle(record.getId(), applyTheme, typeEnum);
         if (ajaxResult.get("code").equals(1688)) {
 //            //表成功了 且已经审核完成
 ////            需要进行后续的处理

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyReceivablesAdjustController.java

@@ -110,12 +110,16 @@ public class ApplyReceivablesAdjustController extends BaseController {
             }
         }
 
-        String waitUrl = modelService.getWaitUrl();
+        String waitUrl = parkWaitHandleService.getUrl("流程审批","付款审批流程");
         FlowMain flowMain = flowMainService.selectByPrimaryKey(flowMainPush.getFlowMainId());
         String flowId = flowMain.getId();
         // 进行审核操作后 就要处理待办 清除数据
         String param = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
         parkWaitHandleService.userHandle(HandleTypeEnum.YSKTZ, param, ShiroUtils.getUserId());
+        // 泛微处理待办 清除数据
+        parkWaitHandleService.userHandleOa(flowMainPush, flowMain);
+        HandleTypeEnum typeEnum = HandleTypeEnum.YSKTZ;
+        HandleTypeEnum.YSKTZ.setUrl(waitUrl);
 
         Boolean isEnd = false;//是否结束
         Boolean isAgree = false;//是否同意
@@ -127,12 +131,12 @@ public class ApplyReceivablesAdjustController extends BaseController {
                 isEnd = true;
                 isAgree = true;
             } else {
-                modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+                parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
             }
         } else if (addConfirmResult.getConfirmResult().equals("2")) { // 退回发起人
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         } else if (addConfirmResult.getConfirmResult().equals("3")) { // 退回上一节点
-            modelService.pushOaAndHandle(flowMainPush, flowMain, waitUrl);
+            parkWaitHandleService.pushOaAndHandle(flowMainPush, flowMain, typeEnum);
         }
         //添加业务信息(将请假信息中的修改掉,剩余年假,剩余调休,冻结年假,冻结调休都修改掉)
         if (isEnd) {
@@ -228,7 +232,10 @@ public class ApplyReceivablesAdjustController extends BaseController {
         String applyTheme = "" + ShiroUtils.getUser().getTruename() + "的合同用章申请单";
         AjaxResult ajaxResult = flowMainService.doFlowMain(applyTheme, record.getId(), addSystemRemark, record.getCcList(), ConstantFlowType.RECEIVABLES_ADJUST_PROCESSDEFINE, ConstantFlowType.RECEIVABLES_ADJUST_DEPLOYMENTID, feeMoneyTotalMap, ConstantFlowType.RECEIVABLES_ADJUST_NAME, ConstantFlowType.RECEIVABLES_ADJUST, ShiroUtils.getUser(), deptId, tagerUserId);
 
-        modelService.startOaAndHandle(record.getId(), applyTheme);
+        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款审批流程");
+        HandleTypeEnum typeEnum = HandleTypeEnum.YSKTZ;
+        HandleTypeEnum.YSKTZ.setUrl(waitUrl);
+        parkWaitHandleService.startOaAndHandle(record.getId(), applyTheme, typeEnum);
         if (ajaxResult.get("code").equals(1688)) {
             return AjaxResult.success();
         } else {

pro-base/src/main/java/com/idea/oa/apply/service/ApplyBuyingMoreService.java

@@ -154,251 +154,5 @@ public class ApplyBuyingMoreService implements BaseService<ApplyBuyingMore, Appl
         return flowNum;
     }
 
-    /**
-     * 发起流程 推送泛微和工作台待办
-     * @param id
-     * @param applyTheme
-     */
-    public void startOaAndHandle(String id,String applyTheme) {
-
-        try {
-
-            String flowId = "";
-            String nodeName = "";
-
-            FlowMainExample flowMainExample = new FlowMainExample();
-            flowMainExample.createCriteria().andFormIdEqualTo(id).andFlowTypeEqualTo(ConstantFlowType.BUYING_MORE);
-            List<FlowMain> flowMains = flowMainService.selectByExample(flowMainExample);
-            if (CollectionUtils.isNotEmpty(flowMains)) {
-                FlowMain flowMain = flowMains.get(0);
-                flowId = flowMain.getId();
-
-                FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-                flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-                List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-                if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                    FlowMainPush flowMainPush = flowMainPushes.get(0);
-                    nodeName = flowMainPush.getNodeName();
-
-                    // 给本系统下一个节点的人推送待办
-                    /**
-                     * 添加待办
-                     * @param title 显示标题
-                     * @param typeEnum 处理类型枚举
-                     * @param srcUserType 来源用户类型 0管理,1企业
-                     * @param srcUserId 来源用户id
-                     * @param srcUserName 来源用户名称
-                     * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                     * @param routeParam 跳转携带参数，例： id=***&type=**
-                     */
-
-                    String waitUrl = "";
-                    // 查询待办页面的 菜单id
-                    FramePermissionExample framePermissionExample = new FramePermissionExample();
-                    framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-                    List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-                    if (CollectionUtils.isNotEmpty(framePermissions)) {
-                        String menuIndex = framePermissions.get(0).getId();
-                        FramePermissionExample permissionExample = new FramePermissionExample();
-                        permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-                        List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-                        if (CollectionUtils.isNotEmpty(permissions)) {
-                            String subMenu = permissions.get(0).getId();
-                            waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-                        }
-
-                    }
-
-                    String title = applyTheme;
-                    HandleTypeEnum typeEnum = HandleTypeEnum.RZ;
-                    Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                    String srcUserId = ShiroUtils.getUserId();
-                    String srcUserName = ShiroUtils.getUser().getTruename();
-                    String receiveUserId = flowMainPush.getPushUser();
-                    String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
-                    HandleTypeEnum.RZ.setUrl(waitUrl);
-                    parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                    // TODO: 2024/11/21   和泛OA对接 推送待办
-                    FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                    String username = encryptUsername(receiveUser.getUsername());
-                    String syscode = "AJ";
-                    String requestname = applyTheme;
-                    String workflowname = ConstantFlowType.BUYING_MORE_NAME;
-                    String pcurl = serverUrl + "?loginid=" + username;
-                    String appurl = "";
-                    String isremark = "0";
-                    String viewtype = "0";
-                    // TODO: 2024/11/15 创建者和接收者需求oa协商
-                    String creator = "ceshi";
-                    String receiver = "ceshi";
-                    String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                    String receivets = System.currentTimeMillis() + "";
-                    Map map = new HashMap<String, Object>();
-                    map.put("syscode", syscode);
-                    map.put("flowid", flowId);
-                    map.put("requestname", requestname);
-                    map.put("workflowname", workflowname);
-                    map.put("nodeName", nodeName);
-                    map.put("pcurl", pcurl);
-                    map.put("appurl", appurl);
-                    map.put("creator", creator);
-                    map.put("createdatetime", date);
-                    map.put("receiver", receiver);
-                    map.put("receivedatetime", date);
-                    map.put("isremark", isremark);
-                    map.put("viewtype", viewtype);
-                    map.put("receivets", receivets);
-
-                    log.info("泛微推送详情:{}", map);
-                    String result = OAUtil.receiveRequestInfoByJson(map);
-                    log.info("泛微推送结果:{}", result);
-
-                }
-
-            }
-
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
-    }
-
-
-    /**
-     * 推送泛微和工作台待办
-     *
-     * @param flowMainPush
-     * @param flowMain
-     * @param waitUrl
-     */
-    public void pushOaAndHandle(FlowMainPush flowMainPush, FlowMain flowMain, String waitUrl) {
-
-        try {
-            String flowId = flowMain.getId();
-            FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-            flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-            List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-            if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                FlowMainPush push = flowMainPushes.get(0);
-
-                // 给本系统下一个节点的人推送待办
-                /**
-                 * 添加待办
-                 * @param title 显示标题
-                 * @param typeEnum 处理类型枚举
-                 * @param srcUserType 来源用户类型 0管理,1企业
-                 * @param srcUserId 来源用户id
-                 * @param srcUserName 来源用户名称
-                 * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                 * @param routeParam 跳转携带参数，例： id=***&type=**
-                 */
-                String title = flowMain.getApplyTheme();
-                HandleTypeEnum typeEnum = HandleTypeEnum.RZ;
-                Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                String srcUserId = ShiroUtils.getUserId();
-                String srcUserName = ShiroUtils.getUser().getTruename();
-                String receiveUserId = push.getPushUser();
-                String routeParam = "id=" + flowId + "&flowMainPushId=" + push.getId() + "&applyUser=" + flowMain.getApplyUser();
-                HandleTypeEnum.RZ.setUrl(waitUrl);
-                parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                // TODO: 2024/11/21 和泛微对接 推送信息
-                FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                String username = encryptUsername(receiveUser.getUsername());
-                String syscode = "AJ";
-                String requestname = flowMain.getApplyTheme();
-                String workflowname = ConstantFlowType.BUYING_MORE_NAME;
-                String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "?loginid=" + username;
-                String appurl = "";
-                String isremark = "0";
-                String viewtype = "0";
-                // TODO: 2024/11/15 创建者和接收者需求oa协商
-                String creator = "ceshi";
-                String receiver = "ceshi";
-                String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                String receivets = System.currentTimeMillis() + "";
-
-                Map map = new HashMap<String, Object>();
-                map.put("syscode", syscode);
-                map.put("flowid", flowId);
-                map.put("requestname", requestname);
-                map.put("workflowname", workflowname);
-                map.put("nodeName", nodeName);
-                map.put("pcurl", pcurl);
-                map.put("appurl", appurl);
-                map.put("creator", creator);
-                map.put("createdatetime", date);
-                map.put("receiver", receiver);
-                map.put("receivedatetime", date);
-                map.put("isremark", isremark);
-                map.put("viewtype", viewtype);
-                map.put("receivets", receivets);
-
-                log.info("泛微推送详情:{}", map);
-                String result = OAUtil.receiveRequestInfoByJson(map);
-                log.info("泛微推送结果:{}", result);
-
-            }
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
-
-    }
 
-
-    /**
-     * 获取待办页面的url
-     *
-     * @return
-     */
-    public String getWaitUrl() {
-
-        String waitUrl = "";
-        // 查询待办页面的 菜单id
-        FramePermissionExample framePermissionExample = new FramePermissionExample();
-        framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-        List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-        if (CollectionUtils.isNotEmpty(framePermissions)) {
-            String menuIndex = framePermissions.get(0).getId();
-            FramePermissionExample permissionExample = new FramePermissionExample();
-            permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-            List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-            if (CollectionUtils.isNotEmpty(permissions)) {
-                String subMenu = permissions.get(0).getId();
-                waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-            }
-
-        }
-        return waitUrl;
-    }
-
-
-    /**
-     * 加密用户名
-     *
-     * @param username
-     * @return
-     */
-    public String encryptUsername(String username) {
-
-        byte[] key = Base64.decode(ssoKey);
-        // 构建
-        AES aes = SecureUtil.aes(key);
-        return aes.encryptHex(username);
-    }
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
 }

pro-base/src/main/java/com/idea/oa/apply/service/ApplyCheckInService.java

@@ -155,251 +155,5 @@ public class ApplyCheckInService implements BaseService<ApplyCheckIn, ApplyCheck
         return flowNum;
     }
 
-    /**
-     * 发起流程 推送泛微和工作台待办
-     * @param id
-     * @param applyTheme
-     */
-    public void startOaAndHandle(String id,String applyTheme) {
-
-        try {
-
-            String flowId = "";
-            String nodeName = "";
-
-            FlowMainExample flowMainExample = new FlowMainExample();
-            flowMainExample.createCriteria().andFormIdEqualTo(id).andFlowTypeEqualTo(ConstantFlowType.CHECK_IN);
-            List<FlowMain> flowMains = flowMainService.selectByExample(flowMainExample);
-            if (CollectionUtils.isNotEmpty(flowMains)) {
-                FlowMain flowMain = flowMains.get(0);
-                flowId = flowMain.getId();
-
-                FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-                flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-                List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-                if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                    FlowMainPush flowMainPush = flowMainPushes.get(0);
-                    nodeName = flowMainPush.getNodeName();
-
-                    // 给本系统下一个节点的人推送待办
-                    /**
-                     * 添加待办
-                     * @param title 显示标题
-                     * @param typeEnum 处理类型枚举
-                     * @param srcUserType 来源用户类型 0管理,1企业
-                     * @param srcUserId 来源用户id
-                     * @param srcUserName 来源用户名称
-                     * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                     * @param routeParam 跳转携带参数，例： id=***&type=**
-                     */
-
-                    String waitUrl = "";
-                    // 查询待办页面的 菜单id
-                    FramePermissionExample framePermissionExample = new FramePermissionExample();
-                    framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-                    List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-                    if (CollectionUtils.isNotEmpty(framePermissions)) {
-                        String menuIndex = framePermissions.get(0).getId();
-                        FramePermissionExample permissionExample = new FramePermissionExample();
-                        permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-                        List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-                        if (CollectionUtils.isNotEmpty(permissions)) {
-                            String subMenu = permissions.get(0).getId();
-                            waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-                        }
-
-                    }
-
-                    String title = applyTheme;
-                    HandleTypeEnum typeEnum = HandleTypeEnum.RZ;
-                    Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                    String srcUserId = ShiroUtils.getUserId();
-                    String srcUserName = ShiroUtils.getUser().getTruename();
-                    String receiveUserId = flowMainPush.getPushUser();
-                    String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
-                    HandleTypeEnum.RZ.setUrl(waitUrl);
-                    parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                    // TODO: 2024/11/21   和泛OA对接 推送待办
-                    FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                    String username = encryptUsername(receiveUser.getUsername());
-                    String syscode = "AJ";
-                    String requestname = applyTheme;
-                    String workflowname = ConstantFlowType.CHECK_IN_NAME;
-                    String pcurl = serverUrl + "?loginid=" + username;
-                    String appurl = "";
-                    String isremark = "0";
-                    String viewtype = "0";
-                    // TODO: 2024/11/15 创建者和接收者需求oa协商
-                    String creator = "ceshi";
-                    String receiver = "ceshi";
-                    String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                    String receivets = System.currentTimeMillis() + "";
-                    Map map = new HashMap<String, Object>();
-                    map.put("syscode", syscode);
-                    map.put("flowid", flowId);
-                    map.put("requestname", requestname);
-                    map.put("workflowname", workflowname);
-                    map.put("nodeName", nodeName);
-                    map.put("pcurl", pcurl);
-                    map.put("appurl", appurl);
-                    map.put("creator", creator);
-                    map.put("createdatetime", date);
-                    map.put("receiver", receiver);
-                    map.put("receivedatetime", date);
-                    map.put("isremark", isremark);
-                    map.put("viewtype", viewtype);
-                    map.put("receivets", receivets);
-
-                    log.info("泛微推送详情:{}", map);
-                    String result = OAUtil.receiveRequestInfoByJson(map);
-                    log.info("泛微推送结果:{}", result);
-
-                }
-
-            }
-
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
-    }
-
-
-    /**
-     * 推送泛微和工作台待办
-     *
-     * @param flowMainPush
-     * @param flowMain
-     * @param waitUrl
-     */
-    public void pushOaAndHandle(FlowMainPush flowMainPush, FlowMain flowMain, String waitUrl) {
-
-        try {
-            String flowId = flowMain.getId();
-            FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-            flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-            List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-            if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                FlowMainPush push = flowMainPushes.get(0);
-
-                // 给本系统下一个节点的人推送待办
-                /**
-                 * 添加待办
-                 * @param title 显示标题
-                 * @param typeEnum 处理类型枚举
-                 * @param srcUserType 来源用户类型 0管理,1企业
-                 * @param srcUserId 来源用户id
-                 * @param srcUserName 来源用户名称
-                 * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                 * @param routeParam 跳转携带参数，例： id=***&type=**
-                 */
-                String title = flowMain.getApplyTheme();
-                HandleTypeEnum typeEnum = HandleTypeEnum.RZ;
-                Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                String srcUserId = ShiroUtils.getUserId();
-                String srcUserName = ShiroUtils.getUser().getTruename();
-                String receiveUserId = push.getPushUser();
-                String routeParam = "id=" + flowId + "&flowMainPushId=" + push.getId() + "&applyUser=" + flowMain.getApplyUser();
-                HandleTypeEnum.RZ.setUrl(waitUrl);
-                parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                // TODO: 2024/11/21 和泛微对接 推送信息
-                FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                String username = encryptUsername(receiveUser.getUsername());
-                String syscode = "AJ";
-                String requestname = flowMain.getApplyTheme();
-                String workflowname = ConstantFlowType.CHECK_IN_NAME;
-                String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "?loginid=" + username;
-                String appurl = "";
-                String isremark = "0";
-                String viewtype = "0";
-                // TODO: 2024/11/15 创建者和接收者需求oa协商
-                String creator = "ceshi";
-                String receiver = "ceshi";
-                String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                String receivets = System.currentTimeMillis() + "";
-
-                Map map = new HashMap<String, Object>();
-                map.put("syscode", syscode);
-                map.put("flowid", flowId);
-                map.put("requestname", requestname);
-                map.put("workflowname", workflowname);
-                map.put("nodeName", nodeName);
-                map.put("pcurl", pcurl);
-                map.put("appurl", appurl);
-                map.put("creator", creator);
-                map.put("createdatetime", date);
-                map.put("receiver", receiver);
-                map.put("receivedatetime", date);
-                map.put("isremark", isremark);
-                map.put("viewtype", viewtype);
-                map.put("receivets", receivets);
-
-                log.info("泛微推送详情:{}", map);
-                String result = OAUtil.receiveRequestInfoByJson(map);
-                log.info("泛微推送结果:{}", result);
-
-            }
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
-
-    }
-
-
-    /**
-     * 获取待办页面的url
-     *
-     * @return
-     */
-    public String getWaitUrl() {
-
-        String waitUrl = "";
-        // 查询待办页面的 菜单id
-        FramePermissionExample framePermissionExample = new FramePermissionExample();
-        framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-        List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-        if (CollectionUtils.isNotEmpty(framePermissions)) {
-            String menuIndex = framePermissions.get(0).getId();
-            FramePermissionExample permissionExample = new FramePermissionExample();
-            permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-            List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-            if (CollectionUtils.isNotEmpty(permissions)) {
-                String subMenu = permissions.get(0).getId();
-                waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-            }
-
-        }
-        return waitUrl;
-    }
-
-
-    /**
-     * 加密用户名
-     *
-     * @param username
-     * @return
-     */
-    public String encryptUsername(String username) {
-
-        byte[] key = Base64.decode(ssoKey);
-        // 构建
-        AES aes = SecureUtil.aes(key);
-        return aes.encryptHex(username);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 }

pro-base/src/main/java/com/idea/oa/apply/service/ApplyContractService.java

@@ -151,250 +151,6 @@ public class ApplyContractService implements BaseService<ApplyContract, ApplyCon
         return flowNum;
     }
 
-    /**
-     * 发起流程 推送泛微和工作台待办
-     * @param id
-     * @param applyTheme
-     */
-    public void startOaAndHandle(String id,String applyTheme) {
-
-        try {
-
-            String flowId = "";
-            String nodeName = "";
-
-            FlowMainExample flowMainExample = new FlowMainExample();
-            flowMainExample.createCriteria().andFormIdEqualTo(id).andFlowTypeEqualTo(ConstantFlowType.CONTRACT);
-            List<FlowMain> flowMains = flowMainService.selectByExample(flowMainExample);
-            if (CollectionUtils.isNotEmpty(flowMains)) {
-                FlowMain flowMain = flowMains.get(0);
-                flowId = flowMain.getId();
-
-                FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-                flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-                List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-                if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                    FlowMainPush flowMainPush = flowMainPushes.get(0);
-                    nodeName = flowMainPush.getNodeName();
-
-                    // 给本系统下一个节点的人推送待办
-                    /**
-                     * 添加待办
-                     * @param title 显示标题
-                     * @param typeEnum 处理类型枚举
-                     * @param srcUserType 来源用户类型 0管理,1企业
-                     * @param srcUserId 来源用户id
-                     * @param srcUserName 来源用户名称
-                     * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                     * @param routeParam 跳转携带参数，例： id=***&type=**
-                     */
-
-                    String waitUrl = "";
-                    // 查询待办页面的 菜单id
-                    FramePermissionExample framePermissionExample = new FramePermissionExample();
-                    framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-                    List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-                    if (CollectionUtils.isNotEmpty(framePermissions)) {
-                        String menuIndex = framePermissions.get(0).getId();
-                        FramePermissionExample permissionExample = new FramePermissionExample();
-                        permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-                        List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-                        if (CollectionUtils.isNotEmpty(permissions)) {
-                            String subMenu = permissions.get(0).getId();
-                            waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-                        }
-
-                    }
-
-                    String title = applyTheme;
-                    HandleTypeEnum typeEnum = HandleTypeEnum.HTYZ;
-                    Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                    String srcUserId = ShiroUtils.getUserId();
-                    String srcUserName = ShiroUtils.getUser().getTruename();
-                    String receiveUserId = flowMainPush.getPushUser();
-                    String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
-                    HandleTypeEnum.HTYZ.setUrl(waitUrl);
-                    parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                    // TODO: 2024/11/21   和泛OA对接 推送待办
-                    FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                    String username = encryptUsername(receiveUser.getUsername());
-                    String syscode = "AJ";
-                    String requestname = applyTheme;
-                    String workflowname = ConstantFlowType.CONTRACT_NAME;
-                    String pcurl = serverUrl + "?loginid=" + username;
-                    String appurl = "";
-                    String isremark = "0";
-                    String viewtype = "0";
-                    // TODO: 2024/11/15 创建者和接收者需求oa协商
-                    String creator = "ceshi";
-                    String receiver = "ceshi";
-                    String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                    String receivets = System.currentTimeMillis() + "";
-                    Map map = new HashMap<String, Object>();
-                    map.put("syscode", syscode);
-                    map.put("flowid", flowId);
-                    map.put("requestname", requestname);
-                    map.put("workflowname", workflowname);
-                    map.put("nodeName", nodeName);
-                    map.put("pcurl", pcurl);
-                    map.put("appurl", appurl);
-                    map.put("creator", creator);
-                    map.put("createdatetime", date);
-                    map.put("receiver", receiver);
-                    map.put("receivedatetime", date);
-                    map.put("isremark", isremark);
-                    map.put("viewtype", viewtype);
-                    map.put("receivets", receivets);
-
-                    log.info("泛微推送详情:{}", map);
-                    String result = OAUtil.receiveRequestInfoByJson(map);
-                    log.info("泛微推送结果:{}", result);
-
-                }
-
-            }
-
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
-    }
-
-
-    /**
-     * 推送泛微和工作台待办
-     *
-     * @param flowMainPush
-     * @param flowMain
-     * @param waitUrl
-     */
-    public void pushOaAndHandle(FlowMainPush flowMainPush, FlowMain flowMain, String waitUrl) {
-
-        try {
-            String flowId = flowMain.getId();
-            FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-            flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-            List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-            if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                FlowMainPush push = flowMainPushes.get(0);
-
-                // 给本系统下一个节点的人推送待办
-                /**
-                 * 添加待办
-                 * @param title 显示标题
-                 * @param typeEnum 处理类型枚举
-                 * @param srcUserType 来源用户类型 0管理,1企业
-                 * @param srcUserId 来源用户id
-                 * @param srcUserName 来源用户名称
-                 * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                 * @param routeParam 跳转携带参数，例： id=***&type=**
-                 */
-                String title = flowMain.getApplyTheme();
-                HandleTypeEnum typeEnum = HandleTypeEnum.HTYZ;
-                Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                String srcUserId = ShiroUtils.getUserId();
-                String srcUserName = ShiroUtils.getUser().getTruename();
-                String receiveUserId = push.getPushUser();
-                String routeParam = "id=" + flowId + "&flowMainPushId=" + push.getId() + "&applyUser=" + flowMain.getApplyUser();
-                HandleTypeEnum.HTYZ.setUrl(waitUrl);
-                parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                // TODO: 2024/11/21 和泛微对接 推送信息
-                FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                String username = encryptUsername(receiveUser.getUsername());
-                String syscode = "AJ";
-                String requestname = flowMain.getApplyTheme();
-                String workflowname = ConstantFlowType.CONTRACT_NAME;
-                String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "?loginid=" + username;
-                String appurl = "";
-                String isremark = "0";
-                String viewtype = "0";
-                // TODO: 2024/11/15 创建者和接收者需求oa协商
-                String creator = "ceshi";
-                String receiver = "ceshi";
-                String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                String receivets = System.currentTimeMillis() + "";
-
-                Map map = new HashMap<String, Object>();
-                map.put("syscode", syscode);
-                map.put("flowid", flowId);
-                map.put("requestname", requestname);
-                map.put("workflowname", workflowname);
-                map.put("nodeName", nodeName);
-                map.put("pcurl", pcurl);
-                map.put("appurl", appurl);
-                map.put("creator", creator);
-                map.put("createdatetime", date);
-                map.put("receiver", receiver);
-                map.put("receivedatetime", date);
-                map.put("isremark", isremark);
-                map.put("viewtype", viewtype);
-                map.put("receivets", receivets);
-
-                log.info("泛微推送详情:{}", map);
-                String result = OAUtil.receiveRequestInfoByJson(map);
-                log.info("泛微推送结果:{}", result);
-
-            }
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
-
-    }
-
-
-    /**
-     * 获取待办页面的url
-     *
-     * @return
-     */
-    public String getWaitUrl() {
-
-        String waitUrl = "";
-        // 查询待办页面的 菜单id
-        FramePermissionExample framePermissionExample = new FramePermissionExample();
-        framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-        List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-        if (CollectionUtils.isNotEmpty(framePermissions)) {
-            String menuIndex = framePermissions.get(0).getId();
-            FramePermissionExample permissionExample = new FramePermissionExample();
-            permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-            List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-            if (CollectionUtils.isNotEmpty(permissions)) {
-                String subMenu = permissions.get(0).getId();
-                waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-            }
-
-        }
-        return waitUrl;
-    }
-
-
-    /**
-     * 加密用户名
-     *
-     * @param username
-     * @return
-     */
-    public String encryptUsername(String username) {
-
-        byte[] key = Base64.decode(ssoKey);
-        // 构建
-        AES aes = SecureUtil.aes(key);
-        return aes.encryptHex(username);
-    }
-
-
-
-
-
-
-
-
-
-
-
 
 
 

pro-base/src/main/java/com/idea/oa/apply/service/ApplyFinanceService.java

@@ -154,247 +154,6 @@ public class ApplyFinanceService implements BaseService<ApplyFinance, ApplyFinan
         return flowNum;
     }
 
-    /**
-     * 发起流程 推送泛微和工作台待办
-     * @param id
-     * @param applyTheme
-     */
-    public void startOaAndHandle(String id,String applyTheme) {
-
-        try {
-
-            String flowId = "";
-            String nodeName = "";
-
-            FlowMainExample flowMainExample = new FlowMainExample();
-            flowMainExample.createCriteria().andFormIdEqualTo(id).andFlowTypeEqualTo(ConstantFlowType.FINANCE);
-            List<FlowMain> flowMains = flowMainService.selectByExample(flowMainExample);
-            if (CollectionUtils.isNotEmpty(flowMains)) {
-                FlowMain flowMain = flowMains.get(0);
-                flowId = flowMain.getId();
-
-                FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-                flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-                List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-                if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                    FlowMainPush flowMainPush = flowMainPushes.get(0);
-                    nodeName = flowMainPush.getNodeName();
-
-                    // 给本系统下一个节点的人推送待办
-                    /**
-                     * 添加待办
-                     * @param title 显示标题
-                     * @param typeEnum 处理类型枚举
-                     * @param srcUserType 来源用户类型 0管理,1企业
-                     * @param srcUserId 来源用户id
-                     * @param srcUserName 来源用户名称
-                     * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                     * @param routeParam 跳转携带参数，例： id=***&type=**
-                     */
-
-                    String waitUrl = "";
-                    // 查询待办页面的 菜单id
-                    FramePermissionExample framePermissionExample = new FramePermissionExample();
-                    framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-                    List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-                    if (CollectionUtils.isNotEmpty(framePermissions)) {
-                        String menuIndex = framePermissions.get(0).getId();
-                        FramePermissionExample permissionExample = new FramePermissionExample();
-                        permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-                        List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-                        if (CollectionUtils.isNotEmpty(permissions)) {
-                            String subMenu = permissions.get(0).getId();
-                            waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-                        }
-
-                    }
-
-                    String title = applyTheme;
-                    HandleTypeEnum typeEnum = HandleTypeEnum.YSKTZ;
-                    Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                    String srcUserId = ShiroUtils.getUserId();
-                    String srcUserName = ShiroUtils.getUser().getTruename();
-                    String receiveUserId = flowMainPush.getPushUser();
-                    String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
-                    HandleTypeEnum.YSKTZ.setUrl(waitUrl);
-                    parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                    // TODO: 2024/11/21   和泛OA对接 推送待办
-                    FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                    String username = encryptUsername(receiveUser.getUsername());
-                    String syscode = "AJ";
-                    String requestname = applyTheme;
-                    String workflowname = ConstantFlowType.FINANCE_NAME;
-                    String pcurl = serverUrl + "?loginid=" + username;
-                    String appurl = "";
-                    String isremark = "0";
-                    String viewtype = "0";
-                    // TODO: 2024/11/15 创建者和接收者需求oa协商
-                    String creator = "ceshi";
-                    String receiver = "ceshi";
-                    String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                    String receivets = System.currentTimeMillis() + "";
-                    Map map = new HashMap<String, Object>();
-                    map.put("syscode", syscode);
-                    map.put("flowid", flowId);
-                    map.put("requestname", requestname);
-                    map.put("workflowname", workflowname);
-                    map.put("nodeName", nodeName);
-                    map.put("pcurl", pcurl);
-                    map.put("appurl", appurl);
-                    map.put("creator", creator);
-                    map.put("createdatetime", date);
-                    map.put("receiver", receiver);
-                    map.put("receivedatetime", date);
-                    map.put("isremark", isremark);
-                    map.put("viewtype", viewtype);
-                    map.put("receivets", receivets);
-
-                    log.info("泛微推送详情:{}", map);
-                    String result = OAUtil.receiveRequestInfoByJson(map);
-                    log.info("泛微推送结果:{}", result);
-
-                }
-
-            }
-
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
-    }
-
-
-    /**
-     * 推送泛微和工作台待办
-     *
-     * @param flowMainPush
-     * @param flowMain
-     * @param waitUrl
-     */
-    public void pushOaAndHandle(FlowMainPush flowMainPush, FlowMain flowMain, String waitUrl) {
-
-        try {
-            String flowId = flowMain.getId();
-            FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-            flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-            List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-            if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                FlowMainPush push = flowMainPushes.get(0);
-
-                // 给本系统下一个节点的人推送待办
-                /**
-                 * 添加待办
-                 * @param title 显示标题
-                 * @param typeEnum 处理类型枚举
-                 * @param srcUserType 来源用户类型 0管理,1企业
-                 * @param srcUserId 来源用户id
-                 * @param srcUserName 来源用户名称
-                 * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                 * @param routeParam 跳转携带参数，例： id=***&type=**
-                 */
-                String title = flowMain.getApplyTheme();
-                HandleTypeEnum typeEnum = HandleTypeEnum.YSKTZ;
-                Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                String srcUserId = ShiroUtils.getUserId();
-                String srcUserName = ShiroUtils.getUser().getTruename();
-                String receiveUserId = push.getPushUser();
-                String routeParam = "id=" + flowId + "&flowMainPushId=" + push.getId() + "&applyUser=" + flowMain.getApplyUser();
-                HandleTypeEnum.YSKTZ.setUrl(waitUrl);
-                parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                // TODO: 2024/11/21 和泛微对接 推送信息
-                FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                String username = encryptUsername(receiveUser.getUsername());
-                String syscode = "AJ";
-                String requestname = flowMain.getApplyTheme();
-                String workflowname = ConstantFlowType.FINANCE_NAME;
-                String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "?loginid=" + username;
-                String appurl = "";
-                String isremark = "0";
-                String viewtype = "0";
-                // TODO: 2024/11/15 创建者和接收者需求oa协商
-                String creator = "ceshi";
-                String receiver = "ceshi";
-                String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                String receivets = System.currentTimeMillis() + "";
-
-                Map map = new HashMap<String, Object>();
-                map.put("syscode", syscode);
-                map.put("flowid", flowId);
-                map.put("requestname", requestname);
-                map.put("workflowname", workflowname);
-                map.put("nodeName", nodeName);
-                map.put("pcurl", pcurl);
-                map.put("appurl", appurl);
-                map.put("creator", creator);
-                map.put("createdatetime", date);
-                map.put("receiver", receiver);
-                map.put("receivedatetime", date);
-                map.put("isremark", isremark);
-                map.put("viewtype", viewtype);
-                map.put("receivets", receivets);
-
-                log.info("泛微推送详情:{}", map);
-                String result = OAUtil.receiveRequestInfoByJson(map);
-                log.info("泛微推送结果:{}", result);
-
-            }
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
-
-    }
-
-
-    /**
-     * 获取待办页面的url
-     *
-     * @return
-     */
-    public String getWaitUrl() {
-
-        String waitUrl = "";
-        // 查询待办页面的 菜单id
-        FramePermissionExample framePermissionExample = new FramePermissionExample();
-        framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-        List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-        if (CollectionUtils.isNotEmpty(framePermissions)) {
-            String menuIndex = framePermissions.get(0).getId();
-            FramePermissionExample permissionExample = new FramePermissionExample();
-            permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-            List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-            if (CollectionUtils.isNotEmpty(permissions)) {
-                String subMenu = permissions.get(0).getId();
-                waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-            }
-
-        }
-        return waitUrl;
-    }
-
-
-    /**
-     * 加密用户名
-     *
-     * @param username
-     * @return
-     */
-    public String encryptUsername(String username) {
-
-        byte[] key = Base64.decode(ssoKey);
-        // 构建
-        AES aes = SecureUtil.aes(key);
-        return aes.encryptHex(username);
-    }
-
-
-
-
-
-
-
-
 
 
 

pro-base/src/main/java/com/idea/oa/apply/service/ApplyInvoiceRedService.java

@@ -161,245 +161,7 @@ public class ApplyInvoiceRedService implements BaseService<ApplyInvoiceRed, Appl
         return flowNum;
     }
 
-    /**
-     * 发起流程 推送泛微和工作台待办
-     * @param id
-     * @param applyTheme
-     */
-    public void startOaAndHandle(String id,String applyTheme) {
-
-        try {
-
-            String flowId = "";
-            String nodeName = "";
-
-            FlowMainExample flowMainExample = new FlowMainExample();
-            flowMainExample.createCriteria().andFormIdEqualTo(id).andFlowTypeEqualTo(ConstantFlowType.INVOICE_RED);
-            List<FlowMain> flowMains = flowMainService.selectByExample(flowMainExample);
-            if (CollectionUtils.isNotEmpty(flowMains)) {
-                FlowMain flowMain = flowMains.get(0);
-                flowId = flowMain.getId();
-
-                FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-                flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-                List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-                if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                    FlowMainPush flowMainPush = flowMainPushes.get(0);
-                    nodeName = flowMainPush.getNodeName();
-
-                    // 给本系统下一个节点的人推送待办
-                    /**
-                     * 添加待办
-                     * @param title 显示标题
-                     * @param typeEnum 处理类型枚举
-                     * @param srcUserType 来源用户类型 0管理,1企业
-                     * @param srcUserId 来源用户id
-                     * @param srcUserName 来源用户名称
-                     * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                     * @param routeParam 跳转携带参数，例： id=***&type=**
-                     */
-
-                    String waitUrl = "";
-                    // 查询待办页面的 菜单id
-                    FramePermissionExample framePermissionExample = new FramePermissionExample();
-                    framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-                    List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-                    if (CollectionUtils.isNotEmpty(framePermissions)) {
-                        String menuIndex = framePermissions.get(0).getId();
-                        FramePermissionExample permissionExample = new FramePermissionExample();
-                        permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-                        List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-                        if (CollectionUtils.isNotEmpty(permissions)) {
-                            String subMenu = permissions.get(0).getId();
-                            waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-                        }
-
-                    }
-
-                    String title = applyTheme;
-                    HandleTypeEnum typeEnum = HandleTypeEnum.FPHC;
-                    Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                    String srcUserId = ShiroUtils.getUserId();
-                    String srcUserName = ShiroUtils.getUser().getTruename();
-                    String receiveUserId = flowMainPush.getPushUser();
-                    String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
-                    HandleTypeEnum.FPHC.setUrl(waitUrl);
-                    parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                    // TODO: 2024/11/21   和泛OA对接 推送待办
-                    FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                    String username = encryptUsername(receiveUser.getUsername());
-                    String syscode = "AJ";
-                    String requestname = applyTheme;
-                    String workflowname = ConstantFlowType.INVOICE_RED_NAME;
-                    String pcurl = serverUrl + "?loginid=" + username;
-                    String appurl = "";
-                    String isremark = "0";
-                    String viewtype = "0";
-                    // TODO: 2024/11/15 创建者和接收者需求oa协商
-                    String creator = "ceshi";
-                    String receiver = "ceshi";
-                    String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                    String receivets = System.currentTimeMillis() + "";
-                    Map map = new HashMap<String, Object>();
-                    map.put("syscode", syscode);
-                    map.put("flowid", flowId);
-                    map.put("requestname", requestname);
-                    map.put("workflowname", workflowname);
-                    map.put("nodeName", nodeName);
-                    map.put("pcurl", pcurl);
-                    map.put("appurl", appurl);
-                    map.put("creator", creator);
-                    map.put("createdatetime", date);
-                    map.put("receiver", receiver);
-                    map.put("receivedatetime", date);
-                    map.put("isremark", isremark);
-                    map.put("viewtype", viewtype);
-                    map.put("receivets", receivets);
-
-                    log.info("泛微推送详情:{}", map);
-                    String result = OAUtil.receiveRequestInfoByJson(map);
-                    log.info("泛微推送结果:{}", result);
-
-                }
-
-            }
-
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
-    }
-
-
-    /**
-     * 推送泛微和工作台待办
-     *
-     * @param flowMainPush
-     * @param flowMain
-     * @param waitUrl
-     */
-    public void pushOaAndHandle(FlowMainPush flowMainPush, FlowMain flowMain, String waitUrl) {
-
-        try {
-            String flowId = flowMain.getId();
-            FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-            flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-            List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-            if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                FlowMainPush push = flowMainPushes.get(0);
-
-                // 给本系统下一个节点的人推送待办
-                /**
-                 * 添加待办
-                 * @param title 显示标题
-                 * @param typeEnum 处理类型枚举
-                 * @param srcUserType 来源用户类型 0管理,1企业
-                 * @param srcUserId 来源用户id
-                 * @param srcUserName 来源用户名称
-                 * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                 * @param routeParam 跳转携带参数，例： id=***&type=**
-                 */
-                String title = flowMain.getApplyTheme();
-                HandleTypeEnum typeEnum = HandleTypeEnum.FPHC;
-                Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                String srcUserId = ShiroUtils.getUserId();
-                String srcUserName = ShiroUtils.getUser().getTruename();
-                String receiveUserId = push.getPushUser();
-                String routeParam = "id=" + flowId + "&flowMainPushId=" + push.getId() + "&applyUser=" + flowMain.getApplyUser();
-                HandleTypeEnum.FPHC.setUrl(waitUrl);
-                parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                // TODO: 2024/11/21 和泛微对接 推送信息
-                FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                String username = encryptUsername(receiveUser.getUsername());
-                String syscode = "AJ";
-                String requestname = flowMain.getApplyTheme();
-                String workflowname = ConstantFlowType.INVOICE_RED_NAME;
-                String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "?loginid=" + username;
-                String appurl = "";
-                String isremark = "0";
-                String viewtype = "0";
-                // TODO: 2024/11/15 创建者和接收者需求oa协商
-                String creator = "ceshi";
-                String receiver = "ceshi";
-                String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                String receivets = System.currentTimeMillis() + "";
-
-                Map map = new HashMap<String, Object>();
-                map.put("syscode", syscode);
-                map.put("flowid", flowId);
-                map.put("requestname", requestname);
-                map.put("workflowname", workflowname);
-                map.put("nodeName", nodeName);
-                map.put("pcurl", pcurl);
-                map.put("appurl", appurl);
-                map.put("creator", creator);
-                map.put("createdatetime", date);
-                map.put("receiver", receiver);
-                map.put("receivedatetime", date);
-                map.put("isremark", isremark);
-                map.put("viewtype", viewtype);
-                map.put("receivets", receivets);
-
-                log.info("泛微推送详情:{}", map);
-                String result = OAUtil.receiveRequestInfoByJson(map);
-                log.info("泛微推送结果:{}", result);
 
-            }
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
-
-    }
-
-
-    /**
-     * 获取待办页面的url
-     *
-     * @return
-     */
-    public String getWaitUrl() {
-
-        String waitUrl = "";
-        // 查询待办页面的 菜单id
-        FramePermissionExample framePermissionExample = new FramePermissionExample();
-        framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-        List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-        if (CollectionUtils.isNotEmpty(framePermissions)) {
-            String menuIndex = framePermissions.get(0).getId();
-            FramePermissionExample permissionExample = new FramePermissionExample();
-            permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-            List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-            if (CollectionUtils.isNotEmpty(permissions)) {
-                String subMenu = permissions.get(0).getId();
-                waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-            }
-
-        }
-        return waitUrl;
-    }
-
-
-    /**
-     * 加密用户名
-     *
-     * @param username
-     * @return
-     */
-    public String encryptUsername(String username) {
-
-        byte[] key = Base64.decode(ssoKey);
-        // 构建
-        AES aes = SecureUtil.aes(key);
-        return aes.encryptHex(username);
-    }
-    
-    
-    
-    
-    
-    
     
     
     

pro-base/src/main/java/com/idea/oa/apply/service/ApplyPaymentSettleService.java

@@ -66,10 +66,7 @@ public class ApplyPaymentSettleService implements BaseService<ApplyPaymentSettle
     private FramePermissionService framePermissionService;
     @Autowired
     private FrameUserService frameUserService;
-    @Value("${serverUrl}")
-    private String serverUrl;
-    @Value("${ssoKey}")
-    private String ssoKey;
+
 
 
     /**
@@ -216,239 +213,13 @@ public class ApplyPaymentSettleService implements BaseService<ApplyPaymentSettle
         return maxnum;
     }
 
-    /**
-     * 发起流程 推送泛微和工作台待办
-     * @param id
-     * @param applyTheme
-     */
-    public void startOaAndHandle(String id,String applyTheme) {
-
-        try {
-
-            String flowId = "";
-            String nodeName = "";
-
-            FlowMainExample flowMainExample = new FlowMainExample();
-            flowMainExample.createCriteria().andFormIdEqualTo(id).andFlowTypeEqualTo(ConstantFlowType.PAYMENT);
-            List<FlowMain> flowMains = flowMainService.selectByExample(flowMainExample);
-            if (CollectionUtils.isNotEmpty(flowMains)) {
-                FlowMain flowMain = flowMains.get(0);
-                flowId = flowMain.getId();
-
-                FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-                flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-                List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-                if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                    FlowMainPush flowMainPush = flowMainPushes.get(0);
-                    nodeName = flowMainPush.getNodeName();
-
-                    // 给本系统下一个节点的人推送待办
-                    /**
-                     * 添加待办
-                     * @param title 显示标题
-                     * @param typeEnum 处理类型枚举
-                     * @param srcUserType 来源用户类型 0管理,1企业
-                     * @param srcUserId 来源用户id
-                     * @param srcUserName 来源用户名称
-                     * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                     * @param routeParam 跳转携带参数，例： id=***&type=**
-                     */
-
-                    String waitUrl = "";
-                    // 查询待办页面的 菜单id
-                    FramePermissionExample framePermissionExample = new FramePermissionExample();
-                    framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-                    List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-                    if (CollectionUtils.isNotEmpty(framePermissions)) {
-                        String menuIndex = framePermissions.get(0).getId();
-                        FramePermissionExample permissionExample = new FramePermissionExample();
-                        permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-                        List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-                        if (CollectionUtils.isNotEmpty(permissions)) {
-                            String subMenu = permissions.get(0).getId();
-                            waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-                        }
-
-                    }
-
-                    String title = applyTheme;
-                    HandleTypeEnum typeEnum = HandleTypeEnum.FK;
-                    Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                    String srcUserId = ShiroUtils.getUserId();
-                    String srcUserName = ShiroUtils.getUser().getTruename();
-                    String receiveUserId = flowMainPush.getPushUser();
-                    String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
-                    HandleTypeEnum.FK.setUrl(waitUrl);
-                    parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                    // TODO: 2024/11/21   和泛OA对接 推送待办
-                    FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                    String username = encryptUsername(receiveUser.getUsername());
-                    String syscode = "AJ";
-                    String requestname = applyTheme;
-                    String workflowname = ConstantFlowType.PAYMENT_NAME;
-                    String pcurl = serverUrl + "&loginid=" + username;
-                    String appurl = "";
-                    String isremark = "0";
-                    String viewtype = "0";
-                    // TODO: 2024/11/15 创建者和接收者需求oa协商
-                    String creator = "ceshi";
-                    String receiver = "ceshi";
-                    String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                    String receivets = System.currentTimeMillis() + "";
-                    Map map = new HashMap<String, Object>();
-                    map.put("syscode", syscode);
-                    map.put("flowid", flowId);
-                    map.put("requestname", requestname);
-                    map.put("workflowname", workflowname);
-                    map.put("nodeName", nodeName);
-                    map.put("pcurl", pcurl);
-                    map.put("appurl", appurl);
-                    map.put("creator", creator);
-                    map.put("createdatetime", date);
-                    map.put("receiver", receiver);
-                    map.put("receivedatetime", date);
-                    map.put("isremark", isremark);
-                    map.put("viewtype", viewtype);
-                    map.put("receivets", receivets);
-
-                    log.info("泛微推送详情:{}", map);
-                    String result = OAUtil.receiveRequestInfoByJson(map);
-                    log.info("泛微推送结果:{}", result);
-
-                }
-
-            }
-
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
-    }
-
-
-    /**
-     * 推送泛微和工作台待办
-     *
-     * @param flowMainPush
-     * @param flowMain
-     * @param waitUrl
-     */
-    public void pushOaAndHandle(FlowMainPush flowMainPush, FlowMain flowMain, String waitUrl) {
-
-        try {
-            String flowId = flowMain.getId();
-            FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-            flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-            List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-            if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                FlowMainPush push = flowMainPushes.get(0);
-
-                // 给本系统下一个节点的人推送待办
-                /**
-                 * 添加待办
-                 * @param title 显示标题
-                 * @param typeEnum 处理类型枚举
-                 * @param srcUserType 来源用户类型 0管理,1企业
-                 * @param srcUserId 来源用户id
-                 * @param srcUserName 来源用户名称
-                 * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                 * @param routeParam 跳转携带参数，例： id=***&type=**
-                 */
-                String title = flowMain.getApplyTheme();
-                HandleTypeEnum typeEnum = HandleTypeEnum.FK;
-                Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                String srcUserId = ShiroUtils.getUserId();
-                String srcUserName = ShiroUtils.getUser().getTruename();
-                String receiveUserId = push.getPushUser();
-                String routeParam = "id=" + flowId + "&flowMainPushId=" + push.getId() + "&applyUser=" + flowMain.getApplyUser();
-                HandleTypeEnum.FK.setUrl(waitUrl);
-                parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                // TODO: 2024/11/21 和泛微对接 推送信息
-                FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                String username = encryptUsername(receiveUser.getUsername());
-                String syscode = "AJ";
-                String requestname = flowMain.getApplyTheme();
-                String workflowname = ConstantFlowType.PAYMENT_NAME;
-                String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "&loginid=" + username;
-                String appurl = "";
-                String isremark = "0";
-                String viewtype = "0";
-                // TODO: 2024/11/15 创建者和接收者需求oa协商
-                String creator = "ceshi";
-                String receiver = "ceshi";
-                String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                String receivets = System.currentTimeMillis() + "";
-
-                Map map = new HashMap<String, Object>();
-                map.put("syscode", syscode);
-                map.put("flowid", flowId);
-                map.put("requestname", requestname);
-                map.put("workflowname", workflowname);
-                map.put("nodeName", nodeName);
-                map.put("pcurl", pcurl);
-                map.put("appurl", appurl);
-                map.put("creator", creator);
-                map.put("createdatetime", date);
-                map.put("receiver", receiver);
-                map.put("receivedatetime", date);
-                map.put("isremark", isremark);
-                map.put("viewtype", viewtype);
-                map.put("receivets", receivets);
-
-                log.info("泛微推送详情:{}", map);
-                String result = OAUtil.receiveRequestInfoByJson(map);
-                log.info("泛微推送结果:{}", result);
 
-            }
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
 
-    }
 
 
-    /**
-     * 获取待办页面的url
-     *
-     * @return
-     */
-    public String getWaitUrl() {
-
-        String waitUrl = "";
-        // 查询待办页面的 菜单id
-        FramePermissionExample framePermissionExample = new FramePermissionExample();
-        framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-        List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-        if (CollectionUtils.isNotEmpty(framePermissions)) {
-            String menuIndex = framePermissions.get(0).getId();
-            FramePermissionExample permissionExample = new FramePermissionExample();
-            permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-            List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-            if (CollectionUtils.isNotEmpty(permissions)) {
-                String subMenu = permissions.get(0).getId();
-                waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-            }
-
-        }
-        return waitUrl;
-    }
 
 
-    /**
-     * 加密用户名
-     *
-     * @param username
-     * @return
-     */
-    public String encryptUsername(String username) {
 
-        byte[] key = Base64.decode(ssoKey);
-        // 构建
-        AES aes = SecureUtil.aes(key);
-        return aes.encryptHex(username);
-    }
 
 
 }

pro-base/src/main/java/com/idea/oa/apply/service/ApplyReceivablesAdjustService.java

@@ -154,246 +154,6 @@ public class ApplyReceivablesAdjustService implements BaseService<ApplyReceivabl
         return flowNum;
     }
 
-    /**
-     * 发起流程 推送泛微和工作台待办
-     * @param id
-     * @param applyTheme
-     */
-    public void startOaAndHandle(String id,String applyTheme) {
-
-        try {
-
-            String flowId = "";
-            String nodeName = "";
-
-            FlowMainExample flowMainExample = new FlowMainExample();
-            flowMainExample.createCriteria().andFormIdEqualTo(id).andFlowTypeEqualTo(ConstantFlowType.RECEIVABLES_ADJUST);
-            List<FlowMain> flowMains = flowMainService.selectByExample(flowMainExample);
-            if (CollectionUtils.isNotEmpty(flowMains)) {
-                FlowMain flowMain = flowMains.get(0);
-                flowId = flowMain.getId();
-
-                FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-                flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-                List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-                if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                    FlowMainPush flowMainPush = flowMainPushes.get(0);
-                    nodeName = flowMainPush.getNodeName();
-
-                    // 给本系统下一个节点的人推送待办
-                    /**
-                     * 添加待办
-                     * @param title 显示标题
-                     * @param typeEnum 处理类型枚举
-                     * @param srcUserType 来源用户类型 0管理,1企业
-                     * @param srcUserId 来源用户id
-                     * @param srcUserName 来源用户名称
-                     * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                     * @param routeParam 跳转携带参数，例： id=***&type=**
-                     */
-
-                    String waitUrl = "";
-                    // 查询待办页面的 菜单id
-                    FramePermissionExample framePermissionExample = new FramePermissionExample();
-                    framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-                    List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-                    if (CollectionUtils.isNotEmpty(framePermissions)) {
-                        String menuIndex = framePermissions.get(0).getId();
-                        FramePermissionExample permissionExample = new FramePermissionExample();
-                        permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-                        List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-                        if (CollectionUtils.isNotEmpty(permissions)) {
-                            String subMenu = permissions.get(0).getId();
-                            waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-                        }
-
-                    }
-
-                    String title = applyTheme;
-                    HandleTypeEnum typeEnum = HandleTypeEnum.YSKTZ;
-                    Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                    String srcUserId = ShiroUtils.getUserId();
-                    String srcUserName = ShiroUtils.getUser().getTruename();
-                    String receiveUserId = flowMainPush.getPushUser();
-                    String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
-                    HandleTypeEnum.YSKTZ.setUrl(waitUrl);
-                    parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                    // TODO: 2024/11/21   和泛OA对接 推送待办
-                    FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                    String username = encryptUsername(receiveUser.getUsername());
-                    String syscode = "AJ";
-                    String requestname = applyTheme;
-                    String workflowname = ConstantFlowType.RECEIVABLES_ADJUST_NAME;
-                    String pcurl = serverUrl + "?loginid=" + username;
-                    String appurl = "";
-                    String isremark = "0";
-                    String viewtype = "0";
-                    // TODO: 2024/11/15 创建者和接收者需求oa协商
-                    String creator = "ceshi";
-                    String receiver = "ceshi";
-                    String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                    String receivets = System.currentTimeMillis() + "";
-                    Map map = new HashMap<String, Object>();
-                    map.put("syscode", syscode);
-                    map.put("flowid", flowId);
-                    map.put("requestname", requestname);
-                    map.put("workflowname", workflowname);
-                    map.put("nodeName", nodeName);
-                    map.put("pcurl", pcurl);
-                    map.put("appurl", appurl);
-                    map.put("creator", creator);
-                    map.put("createdatetime", date);
-                    map.put("receiver", receiver);
-                    map.put("receivedatetime", date);
-                    map.put("isremark", isremark);
-                    map.put("viewtype", viewtype);
-                    map.put("receivets", receivets);
-
-                    log.info("泛微推送详情:{}", map);
-                    String result = OAUtil.receiveRequestInfoByJson(map);
-                    log.info("泛微推送结果:{}", result);
-
-                }
-
-            }
-
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
-    }
-
-
-    /**
-     * 推送泛微和工作台待办
-     *
-     * @param flowMainPush
-     * @param flowMain
-     * @param waitUrl
-     */
-    public void pushOaAndHandle(FlowMainPush flowMainPush, FlowMain flowMain, String waitUrl) {
-
-        try {
-            String flowId = flowMain.getId();
-            FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-            flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-            List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-            if (CollectionUtils.isNotEmpty(flowMainPushes)) {
-                FlowMainPush push = flowMainPushes.get(0);
-
-                // 给本系统下一个节点的人推送待办
-                /**
-                 * 添加待办
-                 * @param title 显示标题
-                 * @param typeEnum 处理类型枚举
-                 * @param srcUserType 来源用户类型 0管理,1企业
-                 * @param srcUserId 来源用户id
-                 * @param srcUserName 来源用户名称
-                 * @param receiveUserId 接收用户id or 0=全部  or 角色id
-                 * @param routeParam 跳转携带参数，例： id=***&type=**
-                 */
-                String title = flowMain.getApplyTheme();
-                HandleTypeEnum typeEnum = HandleTypeEnum.YSKTZ;
-                Integer srcUserType = 0;//来源用户类型 0管理,1企业
-                String srcUserId = ShiroUtils.getUserId();
-                String srcUserName = ShiroUtils.getUser().getTruename();
-                String receiveUserId = push.getPushUser();
-                String routeParam = "id=" + flowId + "&flowMainPushId=" + push.getId() + "&applyUser=" + flowMain.getApplyUser();
-                HandleTypeEnum.YSKTZ.setUrl(waitUrl);
-                parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
-
-                // TODO: 2024/11/21 和泛微对接 推送信息
-                FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
-                String username = encryptUsername(receiveUser.getUsername());
-                String syscode = "AJ";
-                String requestname = flowMain.getApplyTheme();
-                String workflowname = ConstantFlowType.RECEIVABLES_ADJUST_NAME;
-                String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "?loginid=" + username;
-                String appurl = "";
-                String isremark = "0";
-                String viewtype = "0";
-                // TODO: 2024/11/15 创建者和接收者需求oa协商
-                String creator = "ceshi";
-                String receiver = "ceshi";
-                String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-                String receivets = System.currentTimeMillis() + "";
-
-                Map map = new HashMap<String, Object>();
-                map.put("syscode", syscode);
-                map.put("flowid", flowId);
-                map.put("requestname", requestname);
-                map.put("workflowname", workflowname);
-                map.put("nodeName", nodeName);
-                map.put("pcurl", pcurl);
-                map.put("appurl", appurl);
-                map.put("creator", creator);
-                map.put("createdatetime", date);
-                map.put("receiver", receiver);
-                map.put("receivedatetime", date);
-                map.put("isremark", isremark);
-                map.put("viewtype", viewtype);
-                map.put("receivets", receivets);
-
-                log.info("泛微推送详情:{}", map);
-                String result = OAUtil.receiveRequestInfoByJson(map);
-                log.info("泛微推送结果:{}", result);
-
-            }
-        } catch (Exception e) {
-            log.error("推送异常", e);
-        }
-
-    }
-
-
-    /**
-     * 获取待办页面的url
-     *
-     * @return
-     */
-    public String getWaitUrl() {
-
-        String waitUrl = "";
-        // 查询待办页面的 菜单id
-        FramePermissionExample framePermissionExample = new FramePermissionExample();
-        framePermissionExample.createCriteria().andNameEqualTo("流程审批");
-        List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
-        if (CollectionUtils.isNotEmpty(framePermissions)) {
-            String menuIndex = framePermissions.get(0).getId();
-            FramePermissionExample permissionExample = new FramePermissionExample();
-            permissionExample.createCriteria().andNameEqualTo("付款审批流程");
-            List<FramePermission> permissions = framePermissionService.selectByExample(framePermissionExample);
-            if (CollectionUtils.isNotEmpty(permissions)) {
-                String subMenu = permissions.get(0).getId();
-                waitUrl = "/backstage?menuIndex=" + menuIndex + "&subMenu=" + subMenu;
-            }
-
-        }
-        return waitUrl;
-    }
-
 
-    /**
-     * 加密用户名
-     *
-     * @param username
-     * @return
-     */
-    public String encryptUsername(String username) {
-
-        byte[] key = Base64.decode(ssoKey);
-        // 构建
-        AES aes = SecureUtil.aes(key);
-        return aes.encryptHex(username);
-    }
-    
-    
-    
-    
-    
-    
-    
-    
     
 }

pro-base/src/main/java/com/idea/oa/flow2/controller/FlowMainController.java

@@ -576,43 +576,91 @@ public class FlowMainController extends BaseController {
 
                 try {
                     FlowMain flowMain = modelService.selectByPrimaryKey(flowMainPush.getFlowMainId());
-                    String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款流程审批");
                     // 进行审核操作后 就要处理待办 清除数据
                     String param = "id=" + flowMain.getId() + "&flowMainPushId=" + entity.getFlowMainPushId() + "&applyUser=" + flowMain.getApplyUser();
                     // 付款申请
                     if(flowMain.getFlowType().equals(ConstantFlowType.PAYMENT)){
+                        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款流程审批");
+                        HandleTypeEnum typeEnum = HandleTypeEnum.FK;
+                        HandleTypeEnum.FK.setUrl(waitUrl);
+                        // 处理待办
                         parkWaitHandleService.userHandle(HandleTypeEnum.FK, param, ShiroUtils.getUserId());
-                        applyPaymentSettleService.pushOaAndHandle(newflowMainPush,flowMain,waitUrl);
+                        // 泛微处理待办
+                        parkWaitHandleService.userHandleOa(entity.getFlowMainPushId(),flowMain);
+                        // 推送待办和泛微待办
+                        parkWaitHandleService.pushOaAndHandle(newflowMainPush,flowMain,typeEnum);
                     }
                     // 入驻申请
                     if(flowMain.getFlowType().equals(ConstantFlowType.CHECK_IN)){
+                        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款流程审批");
+                        HandleTypeEnum typeEnum = HandleTypeEnum.RZ;
+                        HandleTypeEnum.RZ.setUrl(waitUrl);
+                        // 处理待办
                         parkWaitHandleService.userHandle(HandleTypeEnum.RZ, param, ShiroUtils.getUserId());
-                        applyCheckInService.pushOaAndHandle(newflowMainPush,flowMain,waitUrl);
+                        // 泛微处理待办
+                        parkWaitHandleService.userHandleOa(entity.getFlowMainPushId(),flowMain);
+                        // 推送待办和泛微待办
+                        parkWaitHandleService.pushOaAndHandle(newflowMainPush,flowMain,typeEnum);
                     }
                     // 合同用章申请
                     if(flowMain.getFlowType().equals(ConstantFlowType.CONTRACT)){
+                        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款流程审批");
+                        HandleTypeEnum typeEnum = HandleTypeEnum.HTYZ;
+                        HandleTypeEnum.HTYZ.setUrl(waitUrl);
+                        // 处理待办
                         parkWaitHandleService.userHandle(HandleTypeEnum.HTYZ, param, ShiroUtils.getUserId());
-                        applyContractService.pushOaAndHandle(newflowMainPush,flowMain,waitUrl);
+                        // 泛微处理待办
+                        parkWaitHandleService.userHandleOa(entity.getFlowMainPushId(),flowMain);
+                        // 推送待办和泛微待办
+                        parkWaitHandleService.pushOaAndHandle(newflowMainPush,flowMain,typeEnum);
                     }
                     // 应收款调整申请
                     if(flowMain.getFlowType().equals(ConstantFlowType.RECEIVABLES_ADJUST)){
+                        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款流程审批");
+                        HandleTypeEnum typeEnum = HandleTypeEnum.YSKTZ;
+                        HandleTypeEnum.YSKTZ.setUrl(waitUrl);
+                        // 处理待办
                         parkWaitHandleService.userHandle(HandleTypeEnum.YSKTZ, param, ShiroUtils.getUserId());
-                        applyReceivablesAdjustService.pushOaAndHandle(newflowMainPush,flowMain,waitUrl);
+                        // 泛微处理待办
+                        parkWaitHandleService.userHandleOa(entity.getFlowMainPushId(),flowMain);
+                        // 推送待办和泛微待办
+                        parkWaitHandleService.pushOaAndHandle(newflowMainPush,flowMain,typeEnum);
                     }
                     // 发票红冲申请
                     if(flowMain.getFlowType().equals(ConstantFlowType.INVOICE_RED)){
+                        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款流程审批");
+                        HandleTypeEnum typeEnum = HandleTypeEnum.FPHC;
+                        HandleTypeEnum.FPHC.setUrl(waitUrl);
+                        // 处理待办
                         parkWaitHandleService.userHandle(HandleTypeEnum.FPHC, param, ShiroUtils.getUserId());
-                        applyInvoiceRedService.pushOaAndHandle(newflowMainPush,flowMain,waitUrl);
+                        // 泛微处理待办
+                        parkWaitHandleService.userHandleOa(entity.getFlowMainPushId(),flowMain);
+                        // 推送待办和泛微待办
+                        parkWaitHandleService.pushOaAndHandle(newflowMainPush,flowMain,typeEnum);
                     }
                     // 回购申请
                     if(flowMain.getFlowType().equals(ConstantFlowType.BUYING_MORE)){
+                        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款流程审批");
+                        HandleTypeEnum typeEnum = HandleTypeEnum.HG;
+                        HandleTypeEnum.HG.setUrl(waitUrl);
+                        // 处理待办
                         parkWaitHandleService.userHandle(HandleTypeEnum.HG, param, ShiroUtils.getUserId());
-                        applyBuyingMoreService.pushOaAndHandle(newflowMainPush,flowMain,waitUrl);
+                        // 泛微处理待办
+                        parkWaitHandleService.userHandleOa(entity.getFlowMainPushId(),flowMain);
+                        // 推送待办和泛微待办
+                        parkWaitHandleService.pushOaAndHandle(newflowMainPush,flowMain,typeEnum);
                     }
                     // 上交财政申请
                     if(flowMain.getFlowType().equals(ConstantFlowType.FINANCE)){
+                        String waitUrl = parkWaitHandleService.getUrl("流程审批", "付款流程审批");
+                        HandleTypeEnum typeEnum = HandleTypeEnum.SJCZ;
+                        HandleTypeEnum.SJCZ.setUrl(waitUrl);
+                        // 处理待办
                         parkWaitHandleService.userHandle(HandleTypeEnum.SJCZ, param, ShiroUtils.getUserId());
-                        applyFinanceService.pushOaAndHandle(newflowMainPush,flowMain,waitUrl);
+                        // 泛微处理待办
+                        parkWaitHandleService.userHandleOa(entity.getFlowMainPushId(),flowMain);
+                        // 推送待办和泛微待办
+                        parkWaitHandleService.pushOaAndHandle(newflowMainPush,flowMain,typeEnum);
                     }
                 }catch (Exception e){
                     log.error("推送异常", e);

pro-base/src/main/java/com/idea/util/OAUtil.java

@@ -33,24 +33,23 @@ public class OAUtil {
 
     public static String receiveRequestInfoByJson(Map<String,Object>  parma) {
 
-//        String url = prefix + "/rest/ofs/ReceiveRequestInfoByJson";
-//        String body = JSON.toJSONString(parma);
-//        // 发送POST请求
-//        HttpResponse response = HttpRequest.post(url)
-//                .header(headers)
-//                .body(body)
-//                .execute();
-//
-//        System.out.println("请求参数:" + JSON.toJSONString(parma));
-//        // 获取响应状态码
-//        int statusCode = response.getStatus();
-////        System.out.println("Status Code: " + statusCode);
-//
-//        // 获取响应体
-//        String responseBody = response.body();
-////        System.out.println("Response Body: " + responseBody);
-//        return responseBody;
-        return null;
+        String url = prefix + "/rest/ofs/ReceiveRequestInfoByJson";
+        String body = JSON.toJSONString(parma);
+        // 发送POST请求
+        HttpResponse response = HttpRequest.post(url)
+                .header(headers)
+                .body(body)
+                .execute();
+
+        System.out.println("请求参数:" + JSON.toJSONString(parma));
+        // 获取响应状态码
+        int statusCode = response.getStatus();
+//        System.out.println("Status Code: " + statusCode);
+
+        // 获取响应体
+        String responseBody = response.body();
+//        System.out.println("Response Body: " + responseBody);
+        return responseBody;
     }
 
     public static void main(String[] args) {

pro-base/src/main/java/com/idea/workPanel/service/ParkWaitHandleService.java

@@ -1,9 +1,21 @@
 package com.idea.workPanel.service;
 
+import cn.hutool.core.codec.Base64;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.symmetric.AES;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.idea.oa.apply.util.constant.ConstantFlowType;
+import com.idea.oa.flow2.model.FlowMain;
+import com.idea.oa.flow2.model.FlowMainExample;
+import com.idea.oa.flow2.model.FlowMainPush;
+import com.idea.oa.flow2.model.FlowMainPushExample;
+import com.idea.oa.flow2.service.FlowMainPushService;
+import com.idea.oa.flow2.service.FlowMainService;
+import com.idea.util.DateUtils;
+import com.idea.util.OAUtil;
 import com.idea.workPanel.enume.HandleTypeEnum;
 import com.idea.workPanel.mapper.ParkWaitHandleMapper;
 import com.idea.workPanel.mapper.ParkWaitHandleOnMapper;
@@ -26,12 +38,11 @@ import com.rockstar.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -45,6 +56,14 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
     private ParkWaitHandleOnMapper modelOnMapper;
     @Autowired
     private FramePermissionService framePermissionService;
+    @Value("${serverUrl}")
+    private String serverUrl;
+    @Value("${ssoKey}")
+    private String ssoKey;
+    @Autowired
+    private FlowMainPushService flowMainPushService;
+    @Autowired
+    private FlowMainService flowMainService;
 
     @Override
     public int deleteByPrimaryKey(String ids) {
@@ -302,4 +321,278 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
 
 
 
+    /**
+     * 泛微刷新 待办
+     * @param flowMainPush
+     * @param flowMain
+     */
+    public void userHandleOa(FlowMainPush flowMainPush, FlowMain flowMain) {
+
+        try {
+            String flowId = flowMain.getId();
+            String receiveUserId = flowMainPush.getPushUser();
+            FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
+            String username = encryptUsername(receiveUser.getUsername());
+            String syscode = "AJ";
+            String requestname = flowMain.getApplyTheme();
+            String workflowname = ConstantFlowType.PAYMENT_NAME;
+            String nodeName = flowMainPush.getNodeName();
+            String pcurl = serverUrl + "&loginid=" + username;
+            String appurl = "";
+            String isremark = "0";
+            String viewtype = "0";
+            // TODO: 2024/11/15 创建者和接收者需求oa协商
+            String creator = "ceshi";
+            String receiver = "ceshi";
+            String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
+            String receivets = System.currentTimeMillis() + "";
+
+            Map map = new HashMap<String, Object>();
+            map.put("syscode", syscode);
+            map.put("flowid", flowId);
+            map.put("requestname", requestname);
+            map.put("workflowname", workflowname);
+            map.put("nodeName", nodeName);
+            map.put("pcurl", pcurl);
+            map.put("appurl", appurl);
+            map.put("creator", creator);
+            map.put("createdatetime", date);
+            map.put("receiver", receiver);
+            map.put("receivedatetime", date);
+            map.put("isremark", isremark);
+            map.put("viewtype", viewtype);
+            map.put("receivets", receivets);
+
+            log.info("泛微刷新待办详情:{}", map);
+            String result = OAUtil.receiveRequestInfoByJson(map);
+            log.info("泛微刷新待办结果:{}", result);
+        } catch (Exception e) {
+            log.error("推送异常", e);
+        }
+
+    }
+
+
+    /**
+     * 泛微刷新 待办
+     * @param flowMainPushId
+     * @param flowMain
+     */
+    public void userHandleOa(String flowMainPushId, FlowMain flowMain) {
+
+        try {
+
+            FlowMainPush flowMainPush = flowMainPushService.selectByPrimaryKey(flowMainPushId);
+            String flowId = flowMain.getId();
+            String receiveUserId = flowMainPush.getPushUser();
+            FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
+            String username = encryptUsername(receiveUser.getUsername());
+            String syscode = "AJ";
+            String requestname = flowMain.getApplyTheme();
+            String workflowname = ConstantFlowType.PAYMENT_NAME;
+            String nodeName = flowMainPush.getNodeName();
+            String pcurl = serverUrl + "&loginid=" + username;
+            String appurl = "";
+            String isremark = "0";
+            String viewtype = "0";
+            // TODO: 2024/11/15 创建者和接收者需求oa协商
+            String creator = "ceshi";
+            String receiver = "ceshi";
+            String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
+            String receivets = System.currentTimeMillis() + "";
+
+            Map map = new HashMap<String, Object>();
+            map.put("syscode", syscode);
+            map.put("flowid", flowId);
+            map.put("requestname", requestname);
+            map.put("workflowname", workflowname);
+            map.put("nodeName", nodeName);
+            map.put("pcurl", pcurl);
+            map.put("appurl", appurl);
+            map.put("creator", creator);
+            map.put("createdatetime", date);
+            map.put("receiver", receiver);
+            map.put("receivedatetime", date);
+            map.put("isremark", isremark);
+            map.put("viewtype", viewtype);
+            map.put("receivets", receivets);
+
+            log.info("泛微刷新待办详情:{}", map);
+            String result = OAUtil.receiveRequestInfoByJson(map);
+            log.info("泛微刷新待办结果:{}", result);
+        } catch (Exception e) {
+            log.error("推送异常", e);
+        }
+
+    }
+
+
+    /**
+     * 发起流程 推送泛微和工作台待办
+     * @param id
+     * @param applyTheme
+     */
+    public void startOaAndHandle(String id,String applyTheme,HandleTypeEnum typeEnum) {
+
+        try {
+
+            String flowId = "";
+            String nodeName = "";
+
+            FlowMainExample flowMainExample = new FlowMainExample();
+            flowMainExample.createCriteria().andFormIdEqualTo(id).andFlowTypeEqualTo(ConstantFlowType.PAYMENT);
+            List<FlowMain> flowMains = flowMainService.selectByExample(flowMainExample);
+            if (CollectionUtils.isNotEmpty(flowMains)) {
+                FlowMain flowMain = flowMains.get(0);
+                flowId = flowMain.getId();
+
+                FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
+                flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
+                List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
+                if (CollectionUtils.isNotEmpty(flowMainPushes)) {
+                    FlowMainPush flowMainPush = flowMainPushes.get(0);
+                    nodeName = flowMainPush.getNodeName();
+
+                    String title = applyTheme;
+
+                    Integer srcUserType = 0;//来源用户类型 0管理,1企业
+                    String srcUserId = ShiroUtils.getUserId();
+                    String srcUserName = ShiroUtils.getUser().getTruename();
+                    String receiveUserId = flowMainPush.getPushUser();
+                    String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
+                    addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
+
+                    // TODO: 2024/11/21   和泛OA对接 推送待办
+                    FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
+                    String username = encryptUsername(receiveUser.getUsername());
+                    String syscode = "AJ";
+                    String requestname = applyTheme;
+                    String workflowname = ConstantFlowType.PAYMENT_NAME;
+                    String pcurl = serverUrl + "&loginid=" + username;
+                    String appurl = "";
+                    String isremark = "0";
+                    String viewtype = "0";
+                    // TODO: 2024/11/15 创建者和接收者需求oa协商
+                    String creator = "ceshi";
+                    String receiver = "ceshi";
+                    String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
+                    String receivets = System.currentTimeMillis() + "";
+                    Map map = new HashMap<String, Object>();
+                    map.put("syscode", syscode);
+                    map.put("flowid", flowId);
+                    map.put("requestname", requestname);
+                    map.put("workflowname", workflowname);
+                    map.put("nodeName", nodeName);
+                    map.put("pcurl", pcurl);
+                    map.put("appurl", appurl);
+                    map.put("creator", creator);
+                    map.put("createdatetime", date);
+                    map.put("receiver", receiver);
+                    map.put("receivedatetime", date);
+                    map.put("isremark", isremark);
+                    map.put("viewtype", viewtype);
+                    map.put("receivets", receivets);
+
+                    log.info("泛微推送详情:{}", map);
+                    String result = OAUtil.receiveRequestInfoByJson(map);
+                    log.info("泛微推送结果:{}", result);
+
+                }
+
+            }
+
+        } catch (Exception e) {
+            log.error("推送异常", e);
+        }
+    }
+
+
+
+    /**
+     * 推送泛微和工作台待办
+     *
+     * @param flowMainPush
+     * @param flowMain
+     * @param typeEnum
+     */
+    public void pushOaAndHandle(FlowMainPush flowMainPush, FlowMain flowMain, HandleTypeEnum typeEnum) {
+
+        try {
+            String flowId = flowMain.getId();
+            FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
+            flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
+            List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
+            if (CollectionUtils.isNotEmpty(flowMainPushes)) {
+                FlowMainPush push = flowMainPushes.get(0);
+
+                String title = flowMain.getApplyTheme();
+
+                Integer srcUserType = 0;//来源用户类型 0管理,1企业
+                String srcUserId = ShiroUtils.getUserId();
+                String srcUserName = ShiroUtils.getUser().getTruename();
+                String receiveUserId = push.getPushUser();
+                String routeParam = "id=" + flowId + "&flowMainPushId=" + push.getId() + "&applyUser=" + flowMain.getApplyUser();
+                addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
+
+                // TODO: 2024/11/21 和泛微对接 推送信息
+                FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
+                String username = encryptUsername(receiveUser.getUsername());
+                String syscode = "AJ";
+                String requestname = flowMain.getApplyTheme();
+                String workflowname = ConstantFlowType.PAYMENT_NAME;
+                String nodeName = flowMainPush.getNodeName();
+                String pcurl = serverUrl + "&loginid=" + username;
+                String appurl = "";
+                String isremark = "0";
+                String viewtype = "0";
+                // TODO: 2024/11/15 创建者和接收者需求oa协商
+                String creator = "ceshi";
+                String receiver = "ceshi";
+                String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
+                String receivets = System.currentTimeMillis() + "";
+
+                Map map = new HashMap<String, Object>();
+                map.put("syscode", syscode);
+                map.put("flowid", flowId);
+                map.put("requestname", requestname);
+                map.put("workflowname", workflowname);
+                map.put("nodeName", nodeName);
+                map.put("pcurl", pcurl);
+                map.put("appurl", appurl);
+                map.put("creator", creator);
+                map.put("createdatetime", date);
+                map.put("receiver", receiver);
+                map.put("receivedatetime", date);
+                map.put("isremark", isremark);
+                map.put("viewtype", viewtype);
+                map.put("receivets", receivets);
+
+                log.info("泛微推送待办详情:{}", map);
+                String result = OAUtil.receiveRequestInfoByJson(map);
+                log.info("泛微推送待办结果:{}", result);
+
+            }
+        } catch (Exception e) {
+            log.error("推送异常", e);
+        }
+
+    }
+
+
+
+    /**
+     * 加密用户名
+     *
+     * @param username
+     * @return
+     */
+    public String encryptUsername(String username) {
+
+        byte[] key = Base64.decode(ssoKey);
+        // 构建
+        AES aes = SecureUtil.aes(key);
+        return aes.encryptHex(username);
+    }
+
+
 }