Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/service/common/ExportService.java

@@ -55,21 +55,15 @@ public class ExportService {
         List list = null;
         try {
             Class interfz = Class.forName(constant.getInterfz());
-            Object instance;
+            Object instance = Proxy.newProxyInstance(interfz.getClassLoader(),new Class[]{interfz} ,new MesProxy(sqlSession.getMapper(interfz)));
             Method selectMethod;
-            if (constant.getInterfz().endsWith("Feign")){
-                instance = ApplicationContextUtil.getBean(interfz);
+            // 查询条件是map
+            if(constant.getMapFlag()){
                 selectMethod = instance.getClass().getDeclaredMethod(constant.getMethod(),Map.class);
-            } else {
-                instance = Proxy.newProxyInstance(interfz.getClassLoader(),new Class[]{interfz} ,new MesProxy(sqlSession.getMapper(interfz)));
+            }else{
                 selectMethod = instance.getClass().getDeclaredMethod(constant.getMethod(),Object.class);
             }
-            if (constant.getInterfz().endsWith("Feign")){
-                ResponseResultVO<PageList> resultVO = (ResponseResultVO<PageList>) selectMethod.invoke(instance, param);
-                list = (resultVO).getData().getList();
-            } else {
-                list = (List)selectMethod.invoke(instance,param);
-            }
+            list = (List)selectMethod.invoke(instance,param);
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/com/dk/mdm/service/report/ReportService.java

@@ -127,9 +127,7 @@ public class ReportService {
      */
     public ResponseResultVO<List<Map<String, Object>>> getRecPayDetailReport(Map<String, Object> param) {
         // 获取系统基础数据
-        List<Map<String, Object>> list=new ArrayList<>();
-        // 查询主表
-        list= reportMapper.getRecPayDetailReport(param);
+        List<Map<String, Object>> list = reportMapper.getRecPayDetailReport(param);
         return ResponseResultUtil.success(list);
     }
 

src/main/resources/test/bootstrap.yml

@@ -178,7 +178,7 @@ apk-version-smtt: 23.05.18.01
 apk-file-name-crosswalk: crosswalk-v23.05.18.01.apk
 apk-version-crosswalk: 23.05.18.01
 
-excel-folder: /data/java_project/dkic/mdm-server/excel/
+excel-folder: /data/java_project/dkic/excel/
 
 #文件上传
 upload-path: /data/java_project/dkic/file/