修改删除组

boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/service/a/JmReportDbService.java

@@ -370,6 +370,7 @@ public class JmReportDbService implements IJmReportDbService {
         }
     }
 
+    @Override
     public Map loadDbData(String dbId) {
         HashMap var2 = new HashMap();
         JmReportDb var3 = this.reportDbDao.get(dbId);
@@ -386,6 +387,7 @@ public class JmReportDbService implements IJmReportDbService {
         }
     }
 
+    @Override
     public List<JmReportDataSource> initDataSource(String createBy) {
         List var2 = this.jmReportDbSourceService.querySourceList(createBy);
         if (oConvertUtils.isNotEmpty(var2)) {
@@ -403,10 +405,12 @@ public class JmReportDbService implements IJmReportDbService {
         return var2;
     }
 
+    @Override
     public void saveDbSource(JmReportDataSource sysDataSource) {
         this.jmReportDbSourceService.saveOrUpdate(sysDataSource);
     }
 
+    @Override
     public boolean querySourceCode(JmReportDataSource sysDataSource) {
         boolean var2 = false;
         Integer var3 = 0;
@@ -437,10 +441,12 @@ public class JmReportDbService implements IJmReportDbService {
         return var2;
     }
 
+    @Override
     public void delDataSource(JmReportDataSource sysDataSource) {
         this.jmReportDbSourceService.removeById(sysDataSource.getId());
     }
 
+    @Override
     public List<Map<String, Object>> qurestechSql(JmReportDb jmReportDb) {
         if (jmReportDb == null) {
             return null;
@@ -466,6 +472,7 @@ public class JmReportDbService implements IJmReportDbService {
         }
     }
 
+    @Override
     public List<Map> parseData(Map<String, Object> map) {
         ArrayList var2 = new ArrayList();
         ArrayList var3 = (ArrayList) map.get("records");
@@ -492,6 +499,7 @@ public class JmReportDbService implements IJmReportDbService {
         return var2;
     }
 
+    @Override
     public List<Map<String, Object>> loadDataSourceTable(String dbKey) {
         List var2 = null;
         JmreportDynamicDataSourceVo var3 = JmreportDataSourceCachePool.getCacheDynamicDataSourceModel(dbKey);
@@ -523,6 +531,7 @@ public class JmReportDbService implements IJmReportDbService {
         return var2;
     }
 
+    @Override
     public Map<String, Object> loadTableData(String dbKey, String tableName, Integer pageNo, Integer pageSize, String sql, String paramArray) {
         HashMap var7 = new HashMap();
         if (oConvertUtils.isNotEmpty(paramArray)) {
@@ -555,6 +564,7 @@ public class JmReportDbService implements IJmReportDbService {
         return var7;
     }
 
+    @Override
     @Transactional
     public void delDbData(String dbId) {
         this.reportDbDao.deleteById(dbId);
@@ -774,18 +784,22 @@ public class JmReportDbService implements IJmReportDbService {
         }
     }
 
+    @Override
     public void updateById(JmReportDb reportDb) {
         this.reportDbDao.update(reportDb);
     }
 
+    @Override
     public JmReportDb getById(String apiSelectId) {
         return this.reportDbDao.get(apiSelectId);
     }
 
+    @Override
     public int getCount(String reportId, String code) {
         return this.reportDbDao.getCount(reportId, code);
     }
 
+    @Override
     public List<JmReportDb> getListReportDb(String reportId) {
         return this.reportDbDao.selectList(reportId);
     }

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

@@ -6,14 +6,14 @@ spring:
     name: boman-report
   profiles:
     active: prod
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
-        namespace: bbba8691-596e-436f-9b72-a28e8db0da40
-      config:
-        server-addr: 127.0.0.1:8848
-        file-extension: yml
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: bbba8691-596e-436f-9b72-a28e8db0da40
+#  cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 127.0.0.1:8848
+#        namespace: bbba8691-596e-436f-9b72-a28e8db0da40
+#      config:
+#        server-addr: 127.0.0.1:8848
+#        file-extension: yml
+#        shared-configs:
+#          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+#        namespace: bbba8691-596e-436f-9b72-a28e8db0da40

boman-report/src/main/resources/bootstrap.yml

@@ -6,14 +6,14 @@ spring:
     name: boman-report
   profiles:
     active: jiaoyu
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.101.10:8848
-        namespace: d8110874-ad03-4826-80bc-ff00126c1644  #潜山教育局
-      config:
-        server-addr: 192.168.101.10:8848
-        file-extension: yml
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: d8110874-ad03-4826-80bc-ff00126c1644  #潜山教育局
+#  cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 192.168.101.10:8848
+#        namespace: d8110874-ad03-4826-80bc-ff00126c1644  #潜山教育局
+#      config:
+#        server-addr: 192.168.101.10:8848
+#        file-extension: yml
+#        shared-configs:
+#          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+#        namespace: d8110874-ad03-4826-80bc-ff00126c1644  #潜山教育局

boman-web-core/src/main/java/com/boman/web/core/controller/AttendanceController.java

@@ -1,5 +1,6 @@
 package com.boman.web.core.controller;
 
+import com.boman.common.core.utils.DateUtils;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.dto.ClockOnDto;
 import com.boman.domain.dto.FormDataDto;