瀏覽代碼

【U审批】【待审批推送调整默认推送2条】

wuyx 4 年之前
父節點
當前提交
421d5af9ec

+ 3 - 3
uas-office-qywx-server/src/main/resources/application.yaml

@@ -17,7 +17,7 @@ spring:
   datasource:
     primary:
       driver-class-name: org.h2.Driver
-      jdbc-url: jdbc:h2:file:${user.home}/.office/data/server;FILE_LOCK=NO;DB_CLOSE_ON_EXIT=FALSE
+      jdbc-url: jdbc:h2:file:C:/office/.office/data/server;FILE_LOCK=NO;DB_CLOSE_ON_EXIT=FALSE
       username: admin
       password: select111***
     hikari:
@@ -27,12 +27,12 @@ spring:
       max-lifetime: 1800000
       connection-timeout: 30000
   redis:
-    host: 127.0.0.1
+    host: 10.1.81.211
     port: 6379
   jackson:
     serialization:
       write-dates-as-timestamps: true
 logging:
-  path: ${user.home}/.office/logs/
+  path: C:/office/.office/logs/
   level:
     com.usoftchina.uas.office: debug

+ 1 - 1
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/service/UasJProcessService.java

@@ -46,7 +46,7 @@ public class UasJProcessService extends AbstractService {
             resList = jdbcTemplate.queryForList("SELECT * FROM (SELECT ROW_NUMBER() OVER(ORDER BY JP_LAUNCHTIME ASC) RN , count(JP_ID) OVER(ORDER BY JP_NODEDEALMAN DESC) COUNTS, " +
                     "TRUNC(SYSDATE-JP_LAUNCHTIME) PASSTIME,JP_LAUNCHERNAME,Jp_nodeid,TYPECODE,JP_NODEDEALMAN,JP_LAUNCHTIME,JP_NAME,CURRENTMASTER " +
                     "FROM JPROCESSVIEW WHERE (JP_NODEDEALMAN = ? AND JP_STATUS = '待审批')  ) " +
-                    "WHERE RN<=5 ORDER BY CASE TYPECODE  WHEN 'process' THEN 1 WHEN 'transferprocess' THEN 2 WHEN 'procand' THEN 3 END,RN ASC",emCode);
+                    "WHERE RN<=2 ORDER BY CASE TYPECODE  WHEN 'process' THEN 1 WHEN 'transferprocess' THEN 2 WHEN 'procand' THEN 3 END,RN ASC",emCode);
         } catch (EmptyResultDataAccessException e) {
             return resList;
         }

+ 1 - 1
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/task/QywxProcessTask.java

@@ -71,7 +71,7 @@ public class QywxProcessTask {
                                 content.append("> 【停留").append(remind.get("PASSTIME")).append("天】\n ")
                                         .append(remind.get("JP_LAUNCHERNAME")).append("的[").append(remind.get("JP_NAME")).append("]("+msgUrl+")\n");
                             }
-                            if(Integer.valueOf(String.valueOf(remindList.get(0).get("COUNTS")))>5){
+                            if(Integer.valueOf(String.valueOf(remindList.get(0).get("COUNTS")))>2){
                                 String moreUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agent.getOuterUrl(),
                                         dataCenter.getOuterUrl() + "api/authorize", "uas/uasApproval/"+dataCenter.getUsername()+"/receive");
                                 content.append("[更多...](").append(moreUrl).append(")");