Merge remote-tracking branch 'origin/master'

boman-auth/src/main/resources/bootstrap-prod.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server: 
-  port: 7200
+  port: 6200
 
 # Spring
 spring: 
@@ -14,14 +14,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 118.178.139.79:8848
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        server-addr: 127.0.0.1:8848
+        namespace: shujuju
       config:
         # 配置中心地址
-        server-addr: 118.178.139.79:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        namespace: shujuju

boman-gateway/src/main/resources/bootstrap-prod.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 7090
+  port: 6090
 
 # Spring
 spring:
@@ -16,17 +16,17 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 118.178.139.79:8848
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        server-addr: 127.0.0.1:8848
+        namespace: shujuju
       config:
         # 配置中心地址
-        server-addr: 118.178.139.79:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        namespace: shujuju
     sentinel:
       # 取消控制台懒加载
       eager: true
@@ -37,7 +37,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 118.178.139.79:8848
+            server-addr: 127.0.0.1:8848
             dataId: sentinel-boman-gateway
             groupId: DEFAULT_GROUP
             data-type: json

boman-modules/boman-file/src/main/resources/bootstrap-prod.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 7300
+  port: 6300
 
 # Spring
 spring: 
@@ -14,14 +14,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 118.178.139.79:8848
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        server-addr: 127.0.0.1:8848
+        namespace: shujuju
       config:
         # 配置中心地址
-        server-addr: 118.178.139.79:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        namespace: shujuju

boman-modules/boman-gen/src/main/resources/bootstrap-prod.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 7202
+  port: 6202
 
 # Spring
 spring: 
@@ -14,14 +14,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 118.178.139.79:8848
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        server-addr: 127.0.0.1:8848
+        namespace: shujuju
       config:
         # 配置中心地址
-        server-addr: 118.178.139.79:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        namespace: shujuju

boman-modules/boman-job/src/main/resources/bootstrap-prod.yml

@@ -14,14 +14,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 118.178.139.79:8848
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        server-addr: 127.0.0.1:8848
+        namespace: shujuju
       config:
         # 配置中心地址
-        server-addr: 118.178.139.79:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        namespace: shujuju

boman-modules/boman-system/src/main/resources/bootstrap-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 7201
+  port: 6201
 
 spring: 
   application:
@@ -9,11 +9,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 118.178.139.79:8848
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        server-addr: 127.0.0.1:8848
+        namespace: shujuju
       config:
-        server-addr: 118.178.139.79:8848
+        server-addr: 127.0.0.1:8848
         file-extension: yml
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        namespace: shujuju

boman-visual/boman-monitor/src/main/resources/bootstrap-prod.yml

@@ -14,14 +14,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 118.178.139.79:8848
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        server-addr: 127.0.0.1:8848
+        namespace: shujuju
       config:
         # 配置中心地址
-        server-addr: 118.178.139.79:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        namespace: shujuju

boman-web-core/src/main/java/com/boman/web/core/mapper/StandardlyMapper.java

@@ -202,20 +202,19 @@ public interface StandardlyMapper {
             "sum(if(attendance_table_late = 'Y','1','0')) as attendanceTableLateSum,\n" +
             "sum(if(attendance_table_leave = 'Y','1','0')) as attendanceTableLeaveSum,\n" +
             "DATE_FORMAT(t.create_time,'%Y-%m') as date\n" +
-            "FROM  \n" +
-            "attendance_table t\n" +
+            "FROM attendance_table t\n" +
             "LEFT JOIN sys_dept d ON d.id = t.dept_id \n" +
             "<where>" +
             "1=1 " +
-            "<if test='date!=null'>"+
-            " and DATE_FORMAT(t.create_time,'%Y-%m') = #{date} \n" +
-            "</if>"+
+            "<if test='name != null and name != '''>and ( d.dept_name like concat('%', #{name}, '%') or t.attendance_table_username like concat('%', #{name}, '%'))</if>"+
+            "<if test='date!=null'>and DATE_FORMAT(t.create_time,'%Y-%m') = #{date} </if>"+
             "</where>" +
             "GROUP BY\n" +
             " d.dept_name,t.attendance_table_username,t.user_id,DATE_FORMAT( t.create_time, '%Y-%m' )\n" +
             "limit #{pageNo}, #{pageSize}" +
             "</script>")
-    List<JSONObject> statisticsByMonth(@Param("date") String date,@Param("pageNo") int pageNo,@Param("pageSize") int pageSize);
+    List<JSONObject> statisticsByMonth(@Param("date") String date, @Param("name") String name
+            , @Param("pageNo") int pageNo, @Param("pageSize") int pageSize);
 
     /**
      * 查询用户某月的上班打卡时间
@@ -811,7 +810,8 @@ public interface StandardlyMapper {
          */
         private String covert(String queryType, String columnType, String key, Object valueObj) {
             // false 不需要转义
-            boolean needEscape = columnType.contains(VARCHAR) || columnType.contains(CHAR)|| columnType.contains(DATETIME) || columnType.contains(TIMESTAMP);
+            boolean needEscape = columnType.contains(VARCHAR) || columnType.contains(CHAR)
+                    || columnType.contains(DATETIME) || columnType.contains(TIMESTAMP)|| columnType.contains(DATE);
             Object value;
             switch (queryType) {
                 case EQ:

boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -518,7 +518,8 @@ public class TableServiceCmdService {
         List<String> permses = map(menus, SysMenu::getPerms);
         List<String> btns = Lists.newArrayListWithCapacity(permses.size());
         for (String perms : permses) {
-            if (perms.contains(tableName)) {
+            String[] split = perms.split(":");
+            if (split[0].equals(tableName)) {
                 btns.add(RoleMenuDto.getBtnFromPerms(perms));
             }
         }

boman-web-core/src/main/java/com/boman/web/core/service/attendance/AttendanceServiceImpl.java

@@ -291,7 +291,7 @@ public class AttendanceServiceImpl implements AttendanceService {
 
         JSONObject commitData = new JSONObject();
         commitData.put(ATTENDANCE_USER_NAME, SecurityUtils.getUsername());
-        commitData.put(ATTENDANCE_TABLE_TODAYTIME, Lists.newArrayList(DateUtils.getDate()));
+        commitData.put(ATTENDANCE_TABLE_TODAYTIME, DateUtils.getDate());
         commitData.put(ATTENDANCE_TABLE_LONGITUDE, dto.getLongitude());
         commitData.put(ATTENDANCE_TABLE_LATITUDE, dto.getLatitude());
         commitData.put(ATTENDANCE_USER_ID, SecurityUtils.getUserId());
@@ -300,34 +300,40 @@ public class AttendanceServiceImpl implements AttendanceService {
         if (checkIsLeave()) {
             //
         }
-        if (checkIsLate(currentTime,type)) {
-            commitData.put(ATTENDANCE_ABNORMAL, Y);
-            commitData.put(ATTENDANCE_TABLE_LATE, Y);
-        }
+
         UpdateDto updateDto = new UpdateDto();
         JSONObject commitDataUpdate = new JSONObject();
         if (GO_TO_WORK_TYPE == type) {
+            if (checkIsLate(currentTime,type)) {
+                commitData.put(ATTENDANCE_ABNORMAL, Y);
+                commitData.put(ATTENDANCE_TABLE_LATE, Y);
+            }
             commitData.put(ATTENDANCE_TABLE_WORK, currentTime);
             commitDataUpdate.put(ATTENDANCE_TABLE_WORK, currentTime);
         } else if (GO_OFF_WORK_TYPE == type) {
             commitData.put(ATTENDANCE_TABLE_OFFWORK, currentTime);
             commitDataUpdate.put(ATTENDANCE_TABLE_OFFWORK, currentTime);
         }else if(GO_TO_WORK_TYPE_PM == type){
+            if (checkIsLate(currentTime,type)) {
+                commitData.put(ATTENDANCE_ABNORMAL, Y);
+                commitData.put(ATTENDANCE_TABLE_LATE, Y);
+            }
             commitData.put(ATTENDANCE_TABLE_WORK_PM, currentTime);
             commitDataUpdate.put(ATTENDANCE_TABLE_WORK_PM, currentTime);
         }else if(GO_OFF_WORK_TYPE_PM == type){
             commitData.put(ATTENDANCE_TABLE_OFFWORK_PM, currentTime);
             commitDataUpdate.put(ATTENDANCE_TABLE_OFFWORK_PM, currentTime);
         }
-        JSONObject jsonObject = JSONObjectUtils.putValue(ATTENDANCE_USER_NAME, SecurityUtils.getUsername(), ATTENDANCE_TABLE_TODAYTIME, Lists.newArrayList(DateUtils.getDate()));
+        JSONObject jsonObject = JSONObjectUtils.putValue(ATTENDANCE_USER_NAME, SecurityUtils.getUsername(), ATTENDANCE_TABLE_TODAYTIME, DateUtils.getDate());
         JSONObject oneByMap = commonService.getOneByMap(tableName, jsonObject);
         if (MapUtils.isEmpty(oneByMap)){
             saveClockOn(tableName, commitData);
         }else {
             Long id = oneByMap.getLong("id");
             updateDto.setCommitData(commitDataUpdate);
-            JSONObjectUtils.putValue("id",id);
+            JSONObject condition = JSONObjectUtils.putValue("id", id);
             updateDto.setTableName(tableName);
+            updateDto.setCondition(condition);
             commonService.update(updateDto);
         }
         return commitData;
@@ -342,10 +348,11 @@ public class AttendanceServiceImpl implements AttendanceService {
     @Override
     public AjaxResult statisticsByMonth(Map<String, Object> map) {
         String date = String.valueOf(map.get("date"));
+        String name = String.valueOf(map.get("name"));
         int page = ((Integer) map.get("page"));
         int pageSize = ((Integer) map.get("pageSize"));
         int pageNo = (page - 1) * pageSize;
-        List<JSONObject> jsonObjects = standardlyMapper.statisticsByMonth(date, pageNo, pageSize);
+        List<JSONObject> jsonObjects = standardlyMapper.statisticsByMonth(date, name, pageNo, pageSize);
         return AjaxResult.success(jsonObjects);
     }
 

boman-web-core/src/main/java/com/boman/web/core/service/jflow/impl/JFlowTaskServiceImpl.java

@@ -116,6 +116,7 @@ public class JFlowTaskServiceImpl implements JFlowTaskService {
      * @param dto condition
      * @return com.boman.domain.dto.AjaxResult
      */
+    @Override
     public AjaxResult getBusinessCandidators(FormDataDto dto) {
         String tableName = dto.getCandidatorTableName();
         GenTable genTable = tableServiceCmdService.getTableFromRedisByTableName(RedisKey.TABLE_INFO, tableName);

boman-web-core/src/main/resources/bootstrap-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 7000
+  port: 6000
 
 spring: 
   application:
@@ -9,11 +9,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 118.178.139.79:8848
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        server-addr: 127.0.0.1:8848
+        namespace: shujuju
       config:
-        server-addr: 118.178.139.79:8848
+        server-addr: 127.0.0.1:8848
         file-extension: yml
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+        namespace: shujuju