Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/ApprovalInformation.java

@@ -33,7 +33,7 @@ public class ApprovalInformation {
     private String userId;
 
     @ApiModelProperty(value = "提交审批用户姓名",example = "1")
-    private String name;
+    private String userName;
 
     @ApiModelProperty(value = "审批用户id1",example = "1")
     private String approvalUserIdOne;

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/ApprovalInformationServiceImpl.java

@@ -242,7 +242,11 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         return approvalInformationDao.save(approvalInformation);
     }
 
-
+    /**
+     * 查找所有我提交的审批
+     * @param pageRequest
+     * @return
+     */
     @Override
     public PageResponse<ApprovalInformation> findAllApproval(PageRequestAtten pageRequest) {
         PageResponse<ApprovalInformation> pageResponse = new PageResponse();
@@ -259,6 +263,11 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
                 }else{
                     totalPage = (approvalInformations.size())/pageSize + 1;
                 }
+                if(end>=approvalInformations.size()){
+                    approvalInformations.subList(start,approvalInformations.size());
+                }else{
+                    approvalInformations.subList(start,end);
+                }
                 pageResponse.setRows(approvalInformations);
                 pageResponse.setTotalCount(approvalInformations.size());
             }else {
@@ -346,6 +355,11 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
             }else{
                 totalPage = (approvalInformationList.size())/pageSize + 1;
             }
+            if(end>=approvalInformationList.size()){
+                approvalInformationList.subList(start,approvalInformationList.size());
+            }else{
+                approvalInformationList.subList(start,end);
+            }
             pageResponse.setRows(approvalInformationList);
             pageResponse.setTotalCount(approvalInformationList.size());
         }else {
@@ -424,6 +438,11 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
                 }else{
                     totalPage = (workoverAppros.size())/pageSize + 1;
                 }
+                if(end>=workoverAppros.size()){
+                    workoverAppros.subList(start,workoverAppros.size());
+                }else{
+                    workoverAppros.subList(start,end);
+                }
                 pageResponse.setRows(workoverAppros);
                 pageResponse.setTotalCount(workoverAppros.size());
             }else {
@@ -480,7 +499,6 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
                     }
                 });
             }
-            workoverApproList.addAll(workoverAppros);
         }
         if(workoverApproList!=null){
             int currentPage = pageRequest.getCurrentPage();
@@ -493,6 +511,11 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
             }else{
                 totalPage = (workoverApproList.size())/pageSize + 1;
             }
+            if(end>=workoverApproList.size()){
+                workoverApproList.subList(start,workoverApproList.size());
+            }else{
+                workoverApproList.subList(start,end);
+            }
             pageResponse.setRows(workoverApproList);
             pageResponse.setTotalCount(workoverApproList.size());
         }else {

notes-union/src/main/java/com/zjty/tynotes/union/UnionApplication.java

@@ -24,7 +24,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
         "com.zjty.tynotes.weekly",
         "com.zjty.tynotes.misc",
         "com.zjty.tynotes.union"
-//        , "com.zjty.tynotes.attendance"
+        , "com.zjty.tynotes.attendance"
 })
 @EnableCaching
 @EnableScheduling
@@ -33,21 +33,21 @@ public class UnionApplication {
         SpringApplication.run(UnionApplication.class, args);
     }
 //    开始支持http
-    @Bean
-    public ServletWebServerFactory servletContainer() {
-        TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
-        tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
-        return tomcat;
-    }
-
-    private Connector createHTTPConnector() {
-        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
-        //同时启用http（8080）、https（8443）两个端口
-        connector.setScheme("http");
-        connector.setSecure(false);
-        connector.setPort(8084);
-        connector.setRedirectPort(8289);
-        return connector;
-    }
+//    @Bean
+//    public ServletWebServerFactory servletContainer() {
+//        TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
+//        tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
+//        return tomcat;
+//    }
+//
+//    private Connector  createHTTPConnector() {
+//        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
+//        //同时启用http（8080）、https（8443）两个端口
+//        connector.setScheme("http");
+//        connector.setSecure(false);
+//        connector.setPort(8084);
+//        connector.setRedirectPort(8289);
+//        return connector;
+//    }
 
 }

notes-union/src/main/resources/application.properties

@@ -3,13 +3,13 @@ spring.application.name=workbook
 ## https端口号.
 server.port=8289
 # 证书的路径.
-server.ssl.key-store=classpath:2586377_workbook.zjtys.com.cn.pfx
-# 证书密码，请修改为您自己证书的密码.
-server.ssl.key-store-password=bMEPW9BG
-# 秘钥库类型
-server.ssl.keyStoreType=PKCS12
-# 证书别名
-server.ssl.keyAlias= alias
+#server.ssl.key-store=classpath:2586377_workbook.zjtys.com.cn.pfx
+## 证书密码，请修改为您自己证书的密码.
+#server.ssl.key-store-password=bMEPW9BG
+## 秘钥库类型
+#server.ssl.keyStoreType=PKCS12
+## 证书别名
+#server.ssl.keyAlias= alias
 
 #mongodb configuration
 spring.data.mongodb.uri=mongodb://localhost:27017/notes2