Merge branch 'master' of http://gitlab.scsmile.cn/zxf/refined-platform

refined-manager-ui/admin/src/assets/utils/ajax.js

@@ -41,8 +41,8 @@ instance.interceptors.request.use(
 
     if (config.url.startsWith("/")) {
       // 字符串以 / 开头
-      config.url = `http://112.19.80.237:11080${baseURL}${config.url}`;
-      // config.url = `http://${hostname}:${port}${baseURL}${config.url}`;
+      //config.url = `http://112.19.80.237:11080${baseURL}${config.url}`;
+       config.url = `http://${hostname}:${port}${baseURL}${config.url}`;
     }
 
     //config.url = `http://${hostname}:${port}${baseURL}/${config.url}`;

refined-manager/pom.xml

@@ -17,9 +17,7 @@
     <profiles>
         <profile>
             <id>develop</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+
             <properties>
                 <profiles.active>develop</profiles.active>
                 <profiles.platform.type>standalone</profiles.platform.type>
@@ -46,6 +44,9 @@
         </profile>
         <profile>
             <id>test</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
                 <profiles.active>test</profiles.active>
                 <profiles.platform.type>cloud</profiles.platform.type>

refined-manager/src/main/java/com/mortals/xhx/module/appointment/web/AppointmentConstraintController.java

@@ -69,14 +69,14 @@ public class AppointmentConstraintController extends BaseCRUDJsonBodyMappingCont
         this.addDict(model, "idCardType", IdCardTypeEnum.getEnumMap());
         this.addDict(model, "constraint", paramService.getParamBySecondOrganize("AppointmentConstraint", "constraint"));
 
-//        Map<String, String> personCollect = personService.find(new PersonQuery()).stream()
-//                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n));
-//        this.addDict(model, "personId", personCollect);
-//
-//        Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
-//                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
-//        this.addDict(model, "operator", collect);
-//        this.addDict(model, "createUserId", collect);
+        Map<String, String> personCollect = personService.find(new PersonQuery()).stream()
+                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n));
+        this.addDict(model, "personId", personCollect);
+
+        Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
+                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
+        this.addDict(model, "operator", collect);
+        this.addDict(model, "createUserId", collect);
         super.init(model, context);
     }
 

refined-manager/src/main/java/com/mortals/xhx/module/care/web/CareConstraintController.java

@@ -58,14 +58,14 @@ public class CareConstraintController extends BaseCRUDJsonBodyMappingController<
         this.addDict(model, "track", paramService.getParamBySecondOrganize("CareConstraint","track"));
         this.addDict(model, "idCardType", IdCardTypeEnum.getEnumMap());
 
-//        Map<String, String> personCollect = personService.find(new PersonQuery()).stream()
-//                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n));
-//        this.addDict(model, "personId", personCollect);
-//
-//        Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
-//                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
-//        this.addDict(model, "operator", collect);
-//        this.addDict(model, "createUserId", collect);
+        Map<String, String> personCollect = personService.find(new PersonQuery()).stream()
+                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n));
+        this.addDict(model, "personId", personCollect);
+
+        Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
+                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
+        this.addDict(model, "operator", collect);
+        this.addDict(model, "createUserId", collect);
 
 
         super.init(model, context);

refined-manager/src/main/java/com/mortals/xhx/module/person/web/PersonController.java

@@ -56,14 +56,14 @@ public class PersonController extends BaseCRUDJsonBodyMappingController<PersonSe
         super.init(model, context);
     }
 
-    @Override
-    public void doExportBefore(Context context, PersonEntity query, List<String> properties) throws AppException {
-      properties.add("性别");
-       // super.doExportBefore(context, query, properties);
-    }
-
-    @Override
-    public void doImportExcelAfter(MultipartFile file, List<PersonEntity> list, Context context) throws AppException {
-        String filePath = uploadService.saveFileUpload(file, "file/fileupload",null);
-    }
+//    @Override
+//    public void doExportBefore(Context context, PersonEntity query, List<String> properties) throws AppException {
+//      properties.add("性别");
+//       // super.doExportBefore(context, query, properties);
+//    }
+//
+//    @Override
+//    public void doImportExcelAfter(MultipartFile file, List<PersonEntity> list, Context context) throws AppException {
+//        String filePath = uploadService.saveFileUpload(file, "file/fileupload",null);
+//    }
 }
\ No newline at end of file