1

src/main/java/net/chenlin/dp/modules/api/controller/PayrequestController.java

@@ -41,7 +41,7 @@ public class PayrequestController {
         Date beforeDate = new Date(now .getTime() - time);//30分钟前的时间
         DynamicDataSource.setDataSource("slave-data-source");
         List<String> list = sysUserService.queryPayrequestDate(sdf.format(beforeDate).toString(), sdf.format(now).toString());
-        DynamicDataSource.setDataSource("");
+        //DynamicDataSource.setDataSource("");
         if(list!=null){
             for (String payrequest:list){
                 Payrequest payrequest1 = payrequestService.yonyouGetPayrequest(payrequest);
@@ -49,7 +49,7 @@ public class PayrequestController {
                   //  payrequestService.createPayrequest(processCode,1313665313L,"20264331162691",412163022L,payrequest1);
                     Object payrequest2 = payrequestService.createPayrequest(processCode, Long.valueOf(agentid), userid, Long.valueOf(deptid), payrequest1);
                     if (payrequest2!=null &&!"".equals(payrequest2)){
-                        DynamicDataSource.setDataSource("slave-data-source");
+                       // DynamicDataSource.setDataSource("slave-data-source");
                         sysUserService.autoRIdByPayequest(payrequest,payrequest2.toString());
                         DynamicDataSource.setDataSource("");
                     }

src/main/java/net/chenlin/dp/modules/api/controller/PurchaseOrderController.java

@@ -41,7 +41,7 @@ public class PurchaseOrderController {
         Date beforeDate = new Date(now .getTime() - time);//30分钟前的时间
         DynamicDataSource.setDataSource("slave-data-source");
         List<String> list= sysUserService.queryPurchaseOrderDate(sdf.format(beforeDate).toString(), sdf.format(now).toString());
-        DynamicDataSource.setDataSource("");
+        //DynamicDataSource.setDataSource("");
         if (list!=null){
             for (String purchaseOrders:list){
                 YonyouPurchaseOrder purchaseOrder = purchaseOrderService.yonyouGetPurchaseOrder(purchaseOrders);
@@ -49,7 +49,7 @@ public class PurchaseOrderController {
                    // purchaseOrderService.createPurchaseOrder(processCode,1313665313L,"20264331162691",412163022L,purchaseOrder);
                     Object purchaseOrder1 = purchaseOrderService.createPurchaseOrder(processCode, Long.valueOf(agentid), userid, Long.valueOf(deptid), purchaseOrder);
                     if (purchaseOrder1!=null &&!"".equals(purchaseOrder1)){
-                        DynamicDataSource.setDataSource("slave-data-source");
+                       // DynamicDataSource.setDataSource("slave-data-source");
                         sysUserService.autoRIdByOrder(purchaseOrders,purchaseOrder1.toString());
                         DynamicDataSource.setDataSource("");
                     }

src/main/java/net/chenlin/dp/modules/api/controller/SaleOrderController.java

@@ -44,7 +44,7 @@ public class SaleOrderController {
         Date beforeDate = new Date(now .getTime() - time);//30分钟前的时间
         DynamicDataSource.setDataSource("slave-data-source");
         List<String> list = sysUserService.querySaleOrderDate(sdf.format(beforeDate).toString(), sdf.format(now).toString());
-        DynamicDataSource.setDataSource("");
+      //  DynamicDataSource.setDataSource("");
         if (list!=null){
             for (String saleOrder:list){
                 YonyouSaleOrder yonyouSaleOrder = service.yonyouGetSaleOrder(saleOrder);
@@ -52,7 +52,7 @@ public class SaleOrderController {
 //                    service.createOrder(processCode,1313665313L,"20264331162691",412163022L,yonyouSaleOrder);
                     Object order = service.createOrder(processCode, Long.valueOf(agentid), userid, Long.valueOf(deptid), yonyouSaleOrder);
                     if (order!=null &&!order.equals("")){
-                        DynamicDataSource.setDataSource("slave-data-source");
+                    //    DynamicDataSource.setDataSource("slave-data-source");
                         sysUserService.autoRIdBySale(saleOrder,order.toString());
                         DynamicDataSource.setDataSource("");
                     }

src/main/java/net/chenlin/dp/modules/api/service/PayrequestService.java

@@ -199,12 +199,12 @@ public class PayrequestService extends BaseService {
         req.setDeptId(deptid);
         req.setCcPosition("START");
         String useridshenh = prop.getProperty("shenhe_userid");
-        List<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo> processInstanceApproverVoList = new ArrayList<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo>();
-        OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo processInstanceApproverVo = new OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo();
-        processInstanceApproverVoList.add(processInstanceApproverVo);
-        processInstanceApproverVo.setTaskActionType("NONE");
-        processInstanceApproverVo.setUserIds(Arrays.asList(useridshenh));
-        req.setApproversV2(processInstanceApproverVoList);
+//        List<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo> processInstanceApproverVoList = new ArrayList<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo>();
+//        OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo processInstanceApproverVo = new OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo();
+//        processInstanceApproverVoList.add(processInstanceApproverVo);
+//        processInstanceApproverVo.setTaskActionType("NONE");
+//        processInstanceApproverVo.setUserIds(Arrays.asList(useridshenh));
+//        req.setApproversV2(processInstanceApproverVoList);
         if (so!=null){
             List<OapiProcessinstanceCreateRequest.FormComponentValueVo> formComponentValueVoList = new ArrayList<OapiProcessinstanceCreateRequest.FormComponentValueVo>();
             OapiProcessinstanceCreateRequest.FormComponentValueVo formComponentValueVo = new OapiProcessinstanceCreateRequest.FormComponentValueVo();

src/main/java/net/chenlin/dp/modules/api/service/PurchaseOrderService.java

@@ -157,12 +157,12 @@ public class PurchaseOrderService {
         req.setCcPosition("START");
         String useridshenh = prop.getProperty("shenhe_userid");
 
-        List<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo> processInstanceApproverVoList = new ArrayList<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo>();
-        OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo processInstanceApproverVo = new OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo();
-        processInstanceApproverVoList.add(processInstanceApproverVo);
-        processInstanceApproverVo.setTaskActionType("NONE");
-        processInstanceApproverVo.setUserIds(Arrays.asList(useridshenh));
-        req.setApproversV2(processInstanceApproverVoList);
+//        List<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo> processInstanceApproverVoList = new ArrayList<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo>();
+//        OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo processInstanceApproverVo = new OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo();
+//        processInstanceApproverVoList.add(processInstanceApproverVo);
+//        processInstanceApproverVo.setTaskActionType("NONE");
+//        processInstanceApproverVo.setUserIds(Arrays.asList(useridshenh));
+//        req.setApproversV2(processInstanceApproverVoList);
         if (so!=null){
             List<OapiProcessinstanceCreateRequest.FormComponentValueVo> formComponentValueVoList = new ArrayList<OapiProcessinstanceCreateRequest.FormComponentValueVo>();
             OapiProcessinstanceCreateRequest.FormComponentValueVo formComponentValueVo = new OapiProcessinstanceCreateRequest.FormComponentValueVo();

src/main/java/net/chenlin/dp/modules/api/service/SaleOrderService.java

@@ -174,12 +174,12 @@ public class SaleOrderService {
         req.setOriginatorUserId(userid);
         req.setDeptId(deptid);
         req.setCcPosition("START");
-        List<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo> processInstanceApproverVoList = new ArrayList<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo>();
-        OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo processInstanceApproverVo = new OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo();
-        processInstanceApproverVoList.add(processInstanceApproverVo);
-        processInstanceApproverVo.setTaskActionType("NONE");
-        processInstanceApproverVo.setUserIds(Arrays.asList(useridshenh));
-        req.setApproversV2(processInstanceApproverVoList);
+//        List<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo> processInstanceApproverVoList = new ArrayList<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo>();
+//        OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo processInstanceApproverVo = new OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo();
+//        processInstanceApproverVoList.add(processInstanceApproverVo);
+//        processInstanceApproverVo.setTaskActionType("NONE");
+//        processInstanceApproverVo.setUserIds(Arrays.asList(useridshenh));
+//        req.setApproversV2(processInstanceApproverVoList);
         if (so!=null){
             List<OapiProcessinstanceCreateRequest.FormComponentValueVo> formComponentValueVoList = new ArrayList<OapiProcessinstanceCreateRequest.FormComponentValueVo>();
             OapiProcessinstanceCreateRequest.FormComponentValueVo formComponentValueVo = new OapiProcessinstanceCreateRequest.FormComponentValueVo();