Prechádzať zdrojové kódy

注册街道列表修改

huZhiHao 5 rokov pred
rodič
commit
27246236a5

+ 3 - 3
src/main/java/platform/common/util/BokeWordUtils.java

@@ -273,9 +273,9 @@ public class BokeWordUtils {
 
     public static void main(String[] args) {
         //模板文件地址
-        String inputUrl = "/Users/xikaiwen/Downloads/annex6.docx";
+        String inputUrl = "/.docx";
         //新生产的模板文件
-        String outputUrl = "/Users/xikaiwen/Downloads/annex6_new.docx";
+        String outputUrl = "/.docx";
 
         Map<String, String> testMap = new HashMap<String, String>();
         testMap.put("name", "小明");
@@ -287,7 +287,7 @@ public class BokeWordUtils {
         testMap.put("companyName", "软通");
         testMap.put("bigName", "项目大类");
         testMap.put("smileName", "项目大类-小类");
-        testMap.put("phone", "18051103927");
+        testMap.put("phone", "18388888888");
         testMap.put("date", DateUtil.getTimeString(new Date()));
 
         List<String[]> tableList = new ArrayList<>();

+ 6 - 0
src/main/java/platform/modules/carrier/entity/ContractFloor.java

@@ -55,16 +55,22 @@ public class ContractFloor extends BaseEntity {
 
     @Transient
     private List<ContractFloor> floors;         //合同楼层
+
     @Transient
     private FileDown file;                      //附件
+
     @Transient
     private String status_desc;                 //状态
+
     @Transient
     private String park_name;                   //园区名称
+
     @Transient
     private Double floor_area;                  //楼层面积
+
     @Transient
     private String state_code;                  //合同状态
+
     @Transient
     private String file_down_url;
 

+ 7 - 0
src/main/java/platform/modules/home/web/HomeRefactorController.java

@@ -330,6 +330,13 @@ public class HomeRefactorController extends BaseController {
             response.setContentType("text/html;charset=utf-8");
         }
         List<Street> streetList = streetService.findList();
+        Iterator<Street> it = streetList.iterator();
+        while (it.hasNext()) {
+            Street street = it.next();
+            if (!street.getIs_start()) {
+                it.remove();
+            }
+        }
         modelMap.addAttribute("streetList", streetList);
 
         //查询企业性质

+ 1 - 2
src/main/java/platform/modules/sys/web/FileUploadController.java

@@ -49,15 +49,14 @@ public class FileUploadController extends BaseController {
 
     private static final long MAX_IMG_SIZE = 1048576;
 
-
     // 允许上传图片的格式
     private static final String[] IMAGE_TYPE = new String[]{".gif", ".jpeg", ".bmp", ".jpg", ".png"};
+
     // 允许上传文件的格式
     private static final String[] DOC_TYPE = new String[]{".doc", ".docx", ".ppt", ".pptx", ".pdf", ".xls", ".xlsx", ".gif", ".jpeg", ".bmp", ".jpg", ".png", ".txt", ".rar", ".zip", ".7z", ".flv"};
 
     //private static final String FILE_SERVER_URL = "http://172.18.1.101:8080/file/upload/";
 
-
     @PostMapping(value = "/images")
     public ResponseEntity<String> uploadImage(HttpServletRequest request, @RequestParam("file") MultipartFile file) {
         if (file.isEmpty()) {