Merge branch 'master' of http://47.92.104.23:3000/project/hongtaiyang

app/workSheetSystem/pom.xml

@@ -226,9 +226,7 @@
     <profiles>
         <profile>
             <id>dev</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+
             <dependencies>
                 <!-- 开发环境特有的依赖 -->
                 <dependency>

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/mapper/PersonWorkMapper.xml

@@ -25,6 +25,7 @@
         where whre.CFEmployeeID=#{employeeID}
         and whre.FPARENTID != #{id}
         and whr.CFDATASOURCE='employeeReport'
+        and whr.fbillState!=4
         group by whre.CFData,whre.CFEmployeeID) hre on hre.CFdata=item.FDate
         WHERE
         item.FDate BETWEEN to_date(#{startDate},'YYYY-MM-DD')
@@ -49,6 +50,7 @@
         left join CT_PRO_WorkHoursReport whr on whr.fid=whre.FPARENTID
         where whre.CFEmployeeID=#{employeeID}
         and whr.CFDATASOURCE='employeeReport'
+        and whr.fbillState!=4
         group by whre.CFData,whre.CFEmployeeID) hre on hre.CFdata=item.FDate
         WHERE
         item.FDate BETWEEN to_date(#{startDate},'YYYY-MM-DD')

app/workSheetSystem/src/test/java/com/qy/worksheetsystem/Test.java

@@ -37,8 +37,8 @@ public class Test {
         //RYKFLyB3QzCMPQnnOeCykYDvfe0=
         //I42pen9cRNCHYflg/fhmoIDvfe0=
         Algorithm algorithm = Algorithm.HMAC256("htyshr");
-        Date date = new Date(System.currentTimeMillis() + 1000);
-        String token2 = JWTUtil.encrypt("/NP9IOpwTXS3wwhAfDGBF4Dvfe0=,"+System.currentTimeMillis(),"htyshr");
+        Date date = new Date(System.currentTimeMillis() + 10000);
+        String token2 = JWTUtil.encrypt("VfSso6eBS9ynvnYoaDu39YDvfe0=,"+System.currentTimeMillis(),"htyshr");
         System.out.println(JWTUtil.decrypt(token2,"htyshr"));
         System.out.println(token2);
 //        String token = JWT.create()