1

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

@@ -35,12 +35,12 @@ public class PayrequestController {
         String processCode= prop.getProperty("fksqd_process_code");
         Map<String,String>map=new HashMap<>();
        // List<Payrequest> payrequests = payrequestService.yonyouQueryPayrequest(map);
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date now = new Date();
-        long time = 30*60*1000;//30分钟
-        Date beforeDate = new Date(now .getTime() - time);//30分钟前的时间
+        //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //Date now = new Date();
+        //long time = 30*60*1000;//30分钟
+        //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());
+        List<String> list = sysUserService.queryPayrequestDate();
         //DynamicDataSource.setDataSource("");
         if(list!=null){
             for (String payrequest:list){
@@ -51,14 +51,13 @@ public class PayrequestController {
                     if (payrequest2!=null &&!"".equals(payrequest2)){
                        // DynamicDataSource.setDataSource("slave-data-source");
                         sysUserService.autoRIdByPayequest(payrequest,payrequest2.toString());
-                        DynamicDataSource.setDataSource("");
                     }
 
                 }
 
             }
         }
-
+        DynamicDataSource.setDataSource("");
     }
 
     /**

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

@@ -35,12 +35,12 @@ public class PurchaseOrderController {
         String deptid = prop.getProperty("deptid");
         purchaseOrderService.getToaccount();
         //List<YonyouPurchaseOrder> list = purchaseOrderService.yonyouQueryPurchaseOrder(map);
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date now = new Date();
-        long time = 30*60*1000;//30分钟
-        Date beforeDate = new Date(now .getTime() - time);//30分钟前的时间
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        Date now = new Date();
+//        long time = 30*60*1000;//30分钟
+//        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());
+        List<String> list= sysUserService.queryPurchaseOrderDate();
         //DynamicDataSource.setDataSource("");
         if (list!=null){
             for (String purchaseOrders:list){
@@ -51,11 +51,11 @@ public class PurchaseOrderController {
                     if (purchaseOrder1!=null &&!"".equals(purchaseOrder1)){
                        // DynamicDataSource.setDataSource("slave-data-source");
                         sysUserService.autoRIdByOrder(purchaseOrders,purchaseOrder1.toString());
-                        DynamicDataSource.setDataSource("");
                     }
                 }
             }
         }
+        DynamicDataSource.setDataSource("");
     }
 
 

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

@@ -38,12 +38,12 @@ public class SaleOrderController {
         // Map<String,String>map=new HashMap<>();
         service.getToaccount();
        // List<YonyouSaleOrder> list = service.yonyouQuerySaleOrder(map);
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date now = new Date();
-        long time = 30*60*1000;//30分钟
-        Date beforeDate = new Date(now .getTime() - time);//30分钟前的时间
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        Date now = new Date();
+//        long time = 30*60*1000;//30分钟
+//        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());
+        List<String> list = sysUserService.querySaleOrderDate();
       //  DynamicDataSource.setDataSource("");
         if (list!=null){
             for (String saleOrder:list){
@@ -54,11 +54,11 @@ public class SaleOrderController {
                     if (order!=null &&!order.equals("")){
                     //    DynamicDataSource.setDataSource("slave-data-source");
                         sysUserService.autoRIdBySale(saleOrder,order.toString());
-                        DynamicDataSource.setDataSource("");
                     }
                 }
             }
         }
+        DynamicDataSource.setDataSource("");
 
     }
 

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

@@ -199,12 +199,14 @@ 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);
+        if (!useridshenh.equals("")){
+            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,16 @@ 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);
+        if (!useridshenh.equals("")){
+            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,14 @@ 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);
+        if (!useridshenh.equals("")){
+            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/sys/dao/SysUserMapper.java

@@ -76,7 +76,7 @@ public interface SysUserMapper extends BaseMapper<SysUserEntity> {
 	 * @param endDate
 	 * @return
 	 */
-	 List<String>querySaleOrderDate(@Param("date")String date,@Param("endDate")String endDate);
+	 List<String>querySaleOrderDate();
 
 	 int autoRIdBySale(@Param("cSOCode")String cSOCode,@Param("instanceId")String instanceId);
 	/**
@@ -85,7 +85,7 @@ public interface SysUserMapper extends BaseMapper<SysUserEntity> {
 	 * @param endDate
 	 * @return
 	 */
-	List<String>queryPurchaseOrderDate(@Param("date")String date,@Param("endDate")String endDate);
+	List<String>queryPurchaseOrderDate();
 
 	int autoRIdByOrder(@Param("cSOCode")String cSOCode,@Param("instanceId")String instanceId);
 	/**
@@ -94,6 +94,6 @@ public interface SysUserMapper extends BaseMapper<SysUserEntity> {
 	 * @param endDate
 	 * @return
 	 */
-	List<String>queryPayrequestDate(@Param("date")String date,@Param("endDate")String endDate);
+	List<String>queryPayrequestDate();
 	int autoRIdByPayequest(@Param("cSOCode")String cSOCode,@Param("instanceId")String instanceId);
 }

src/main/java/net/chenlin/dp/modules/sys/mapper/SysUserMapper.xml

@@ -119,13 +119,6 @@
 	</select>
     <select id="querySaleOrderDate" resultType="java.lang.String">
 		select cSOCode  from SO_SOMain where  (iStatus='0' or iStatus is null) and cDefine10 is null
-		<if  test="date!=null and ''!=date">
-			and CONVERT(varchar(100), dcreatesystime, 120)>=#{date}
-		</if>
-		<if test="endDate!=null and ''!=endDate">
-	and CONVERT(varchar(100), dcreatesystime, 120) &lt;=#{endDate}
-	</if>
-
 	</select>
 
 	<update id="autoRIdBySale">
@@ -134,12 +127,6 @@
 
 	<select id="queryPurchaseOrderDate" resultType="java.lang.String">
 		select cPOID from PO_Pomain where  (iverifystateex='0' or iverifystateex is null) and cDefine10 is null
-		<if  test="date!=null and ''!=date">
-			and 	CONVERT(varchar(100), cmaketime, 120)>=#{date}
-		</if>
-		<if test="endDate!=null and ''!=endDate">
-			and CONVERT(varchar(100), cmaketime, 120) &lt;=#{endDate}
-		</if>
 	</select>
 
 	<update id="autoRIdByOrder">
@@ -148,12 +135,6 @@
 
 	<select id="queryPayrequestDate" resultType="java.lang.String">
 		select cVouchID from AP_ApplyPayVouch where cCheckMan is null  and cDefine10 is null
-		<if  test="date!=null and ''!=date">
-			and 	CONVERT(varchar(100), dcreatesystime, 120)>=#{date}
-		</if>
-		<if test="endDate!=null and ''!=endDate">
-			and CONVERT(varchar(100), dcreatesystime, 120) &lt;=#{endDate}
-		</if>
 	</select>
 
 	<update id="autoRIdByPayequest">

src/main/java/net/chenlin/dp/modules/sys/service/SysUserService.java

@@ -148,9 +148,9 @@ public interface SysUserService {
 	int Payrequestshenhe(String code,String dverifysystime,String dverifydate
 			,String cVerifier);
 
-	List<String>querySaleOrderDate(String date,String endDate);
-	List<String>queryPurchaseOrderDate(String date,String endDate);
-	List<String>queryPayrequestDate(String date,String endDate);
+	List<String>querySaleOrderDate();
+	List<String>queryPurchaseOrderDate();
+	List<String>queryPayrequestDate();
 	int autoRIdBySale(String cSOCode,String instanceId);
 	int autoRIdByOrder(String cSOCode,String instanceId);
 	int autoRIdByPayequest(String cSOCode,String instanceId);

src/main/java/net/chenlin/dp/modules/sys/service/impl/SysUserServiceImpl.java

@@ -302,18 +302,18 @@ public class SysUserServiceImpl implements SysUserService {
 	}
 
 	@Override
-	public List<String> querySaleOrderDate(String date, String endDate) {
-		return sysUserMapper.querySaleOrderDate(date,endDate);
+	public List<String> querySaleOrderDate() {
+		return sysUserMapper.querySaleOrderDate();
 	}
 
 	@Override
-	public List<String> queryPurchaseOrderDate(String date, String endDate) {
-		return sysUserMapper.queryPurchaseOrderDate(date,endDate);
+	public List<String> queryPurchaseOrderDate() {
+		return sysUserMapper.queryPurchaseOrderDate();
 	}
 
 	@Override
-	public List<String> queryPayrequestDate(String date, String endDate) {
-		return sysUserMapper.queryPayrequestDate(date,endDate);
+	public List<String> queryPayrequestDate() {
+		return sysUserMapper.queryPayrequestDate();
 	}
 
 	@Override