合并分支 'gwj' 到 'master'

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();
@@ -495,7 +499,6 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
                     }
                 });
             }
-
         }
         if(workoverApproList!=null){
             int currentPage = pageRequest.getCurrentPage();

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
@@ -40,7 +40,7 @@ public class UnionApplication {
         return tomcat;
     }
 
-    private Connector createHTTPConnector() {
+    private Connector  createHTTPConnector() {
         Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
         //同时启用http（8080）、https（8443）两个端口
         connector.setScheme("http");

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

@@ -12,15 +12,15 @@ server.ssl.keyStoreType=PKCS12
 server.ssl.keyAlias= alias
 
 #mongodb configuration
-spring.data.mongodb.uri=mongodb://localhost:27017/notes3
+spring.data.mongodb.uri=mongodb://192.168.1.246:27017/notes2
 # servlet configuration
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=1000MB
 
-spring.redis.host=localhost
+spring.redis.host=192.168.1.246
 spring.redis.port=6379
 spring.redis.timeout=5000ms
 
 # es configuraiton
-es.ip=localhost
+es.ip=192.168.1.246
 logging.file=./log/note.log

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Array;
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.util.*;
@@ -83,13 +84,29 @@ public class UserManageServiceImpl implements UserManageService {
         return user;
     }
 
+    public static void main(String[] args) {
+        DecimalFormat df = new DecimalFormat("#.00");
+        double a = 0.3333333333333333333333333333333d;
+        BigDecimal bg = new BigDecimal(a);
+        double v = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+        String format = df.format(a);
+        Number parse = null;
+        try {
+            parse = df.parse(format);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        System.out.println(parse.doubleValue());
+        System.out.println(v);
+    }
+
     /**
      * 查询人员列表
      * @param pageRequest
      * @return
      */
     @Override
-    public PageResponse<UserVo> findUserList(PageRequest pageRequest) throws ParseException {
+    public PageResponse<UserVo> findUserList (PageRequest pageRequest) throws ParseException {
         DecimalFormat df = new DecimalFormat("#.00");
         List<UserVo> userVos = new ArrayList<>();
         PageResponse<UserVo> pageResponse = new PageResponse();