新增对接E10,失败重传

bpm-core/src/main/java/com/srm/bpm/facade/rest/BillFlowRestController.java

@@ -142,11 +142,11 @@ public class BillFlowRestController {
         billItemVO.setStatus(2);
         billItemVO.setTaskid(taskId);
         List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos2 = billLogic.findrequestInfo(billItemVO);
-//        String token =billLogic.getToken4();
+        String token =billLogic.getToken4();
         for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos2){
             String requestdata =o1.getRequestData(requestInfoByJsonDto,"2");
-//            o1.ofsTodoDatabyEten(requestdata,token);
-            o1.OfsTodoDataWebService(requestdata);
+            o1.ofsTodoDatabyEten(requestdata,token);
+//            o1.OfsTodoDataWebService(requestdata);
         }
 //        //发送待办
         billItemVO.setStatus(1);
@@ -154,8 +154,8 @@ public class BillFlowRestController {
         List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos1 = billLogic.findrequestInfo(billItemVO);
         for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos1){
             String requestdata =o1.getRequestData(requestInfoByJsonDto,"0");
-//           o1.ofsTodoDatabyEten(requestdata,token);
-           o1.OfsTodoDataWebService(requestdata);
+           o1.ofsTodoDatabyEten(requestdata,token);
+//           o1.OfsTodoDataWebService(requestdata);
         }
 
 
@@ -239,12 +239,12 @@ public class BillFlowRestController {
 //        //发送已办
        billItemVO.setStatus(3);
         List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos2 = billLogic.findrequestInfo(billItemVO);
-//        String token=billLogic.getToken4();
+        String token=billLogic.getToken4();
         for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos2){
             String requestdata =o1.getRequestData(requestInfoByJsonDto,"2");
 //            System.out.println("拒绝requestData:"+requestdata);
-            o1.OfsTodoDataWebService(requestdata);
-//            o1.ofsTodoDatabyEten(requestdata,token);
+//            o1.OfsTodoDataWebService(requestdata);
+            o1.ofsTodoDatabyEten(requestdata,token);
         }
         return R.empty();
     }
@@ -289,12 +289,12 @@ public class BillFlowRestController {
         billItemVO.setStatus(12);
         billItemVO.setTaskid(taskId);
         List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos2 = billLogic.findrequestInfo(billItemVO);
-//        String token = billLogic.getToken4();
+        String token = billLogic.getToken4();
         for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos2){
             String requestdata =o1.getRequestData(requestInfoByJsonDto,"2");
 //            System.out.println("打回已办requestdata="+requestdata);
-           o1.OfsTodoDataWebService(requestdata);
-//            o1.ofsTodoDatabyEten(requestdata,token);
+//           o1.OfsTodoDataWebService(requestdata);
+            o1.ofsTodoDatabyEten(requestdata,token);
         }
 //        //发送待办
         billItemVO.setStatus(1);
@@ -302,8 +302,8 @@ public class BillFlowRestController {
         for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos1){
             String requestdata =o1.getRequestData(requestInfoByJsonDto,"0");
             System.out.println("打回待办requestdata="+requestdata);
-            o1.OfsTodoDataWebService(requestdata);
-//            o1.ofsTodoDatabyEten(requestdata,token);
+//            o1.OfsTodoDataWebService(requestdata);
+            o1.ofsTodoDatabyEten(requestdata,token);
         }
         return R.empty();
     }
@@ -341,12 +341,12 @@ public class BillFlowRestController {
         billItemVO.setStatus(7);
         billItemVO.setTaskid(taskId);
         List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos2 = billLogic.findrequestInfo(billItemVO);
-//        String token = billLogic.getToken4();
+        String token = billLogic.getToken4();
         for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos2){
             String requestdata =o1.getRequestData(requestInfoByJsonDto,"2");
 //            System.out.println("打回已办requestdata="+requestdata);
-            o1.OfsTodoDataWebService(requestdata);
-//            o1.ofsTodoDatabyEten(requestdata,token);
+//            o1.OfsTodoDataWebService(requestdata);
+            o1.ofsTodoDatabyEten(requestdata,token);
         }
 
 

bpm-core/src/main/java/com/srm/bpm/facade/rest/ThirdPartBillController.java

@@ -60,13 +60,13 @@ public class ThirdPartBillController {
         BillItemVO billItemVO = new BillItemVO();
         billItemVO.setId(billItem.getId());
         List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos2 = billLogic.findrequestInfo(billItemVO);
-//        String token =billLogic.getToken4();
+        String token =billLogic.getToken4();
         OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client o1= new OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client();
         for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos2){
             if ("1".equals(requestInfoByJsonDto.getIsremark())){
                 String  requestData = o1.getRequestData(requestInfoByJsonDto,"0");
-                  o1.OfsTodoDataWebService(requestData);
-       //         o1.ofsTodoDatabyEten(requestData,token);
+        //          o1.OfsTodoDataWebService(requestData);
+                o1.ofsTodoDatabyEten(requestData,token);
             }
 
         }

bpm-core/src/main/resources/mapper/bpm/infra/ToaBillDao.xml

@@ -135,15 +135,12 @@
     <select id="selectCreateByEmployee" resultType="com.srm.bpm.infra.po.BillItemPO">
         SELECT tb.id, tb.code, tb.title, tb.completion_time, tb.start_time, tb.priority, tb.status,
         tb.replies, tb.archived_time,tb.attachment_flag,tb.sender,tb.print_size,
-        approver.node_name, approver.task_id,approver.action,
+        (select node_name from bill_task where bill_id=tb.id and is_deleted = 0 order by sort desc LIMIT 0 ,1 ) as node_name,
+        (select task_id from bill_task where bill_id=tb.id and is_deleted = 0 order by sort desc LIMIT 0 ,1 ) as task_id,
+        (select action from bill_task where bill_id=tb.id and is_deleted = 0 order by sort desc LIMIT 0 ,1 ) as action,
         tp.id AS process_id,tp.name AS process_name,fs.form_link,fs.approve_link,tp.assistant
         FROM toa_bill tb INNER JOIN toa_process tp ON tp.id = tb.process_id
         INNER JOIN bill_data_json bdj ON bdj.bill_id = tb.id and bdj.is_deleted = 0
-        LEFT JOIN (SELECT ba.id, ba.bill_id, ba.node_name, ba.task_id, ba.user_code,ba.action
-        FROM (SELECT bill_id, max(sort) AS ct FROM bill_task where  is_deleted=0 GROUP BY bill_id) AS bt
-        INNER JOIN bill_task ba ON bt.ct = ba.sort AND bt.bill_id = ba.bill_id GROUP BY ba.bill_id)
-        approver
-        ON approver.bill_id = tb.id
         LEFT JOIN toa_form tf ON tf.process_id=tp.id AND tf.is_deleted=0
         LEFT JOIN form_setting fs ON fs.form_id=tf.id AND fs.is_deleted=0
         WHERE tb.is_deleted = 0 and tb.sender = #{userCode} and tb.status > 0
@@ -285,7 +282,7 @@
     </select>
 
     <select id="findrequestInfo" resultType="com.srm.bpm.facde.oa.ReceiveRequestInfoByJsonDto">
-        select DISTINCT 'SRM' syscode,toa.id as flowid,title as requestname,pro.id as workflowcode,pro.name as workflowname,task.node_name as nodename,'/test.jsp' pcurl,'' appurl,task.node_status isremark,'0' viewtype, su1.accountname as creator,from_unixtime(toa.creation_time/1000,'%Y-%m-%d') as createdatetime,
+        select DISTINCT 'SRM1' syscode,toa.id as flowid,title as requestname,pro.id as workflowcode,pro.name as workflowname,task.node_name as nodename,'/test.jsp' pcurl,'' appurl,task.node_status isremark,'0' viewtype, su1.accountname as creator,from_unixtime(toa.creation_time/1000,'%Y-%m-%d') as createdatetime,
         su2.accountname receiver,DATE_FORMAT(NOW(),'%Y-%m-%d') as receivedatetime
         from
         toa_bill toa