项目管理

pom.xml

@@ -48,7 +48,7 @@
         <apache.httpcomponents.httpmime>4.5.6</apache.httpcomponents.httpmime>
         <apache.velocity>1.7</apache.velocity>
         <alibaba.fastjson>1.1.15</alibaba.fastjson>
-        <cn.hutool>4.1.10</cn.hutool>
+        <cn.hutool>5.7.4</cn.hutool>
         <github.penggle.kaptcha>2.3.2</github.penggle.kaptcha>
         <dom4j.version>2.1.1</dom4j.version>
         <java.jwt>3.4.1</java.jwt>

pro-base/src/main/java/com/idea/buildManage/controller/MnpBuildingController.java

@@ -1,25 +1,18 @@
 package com.idea.buildManage.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.google.common.collect.Lists;
 import com.idea.buildManage.dto.MnpBuildingDto;
-import com.idea.buildManage.dto.MnpBuildingResponse;
-import com.idea.buildManage.response.ParkRoomResponse;
 import com.idea.buildManage.service.ParkRoomService;
 import com.idea.buildManage.model.MnpBuilding;
 import com.idea.buildManage.model.MnpBuildingExample;
 import com.idea.buildManage.service.MnpBuildingService;
-import com.idea.buildManage.vo.TreeNode;
 import com.rockstar.common.base.BaseController;
 import com.rockstar.common.domain.AjaxResult;
-import com.rockstar.frame.model.FrameUser;
 import com.rockstar.frame.model.extend.DateTrans;
 import com.rockstar.frame.model.extend.TableSplitResult;
 import com.rockstar.frame.model.extend.Tablepar;
 import com.rockstar.shiro.util.ShiroUtils;
-import com.rockstar.util.StringUtils;
 import io.swagger.annotations.Api;
-import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -27,11 +20,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.Comparator;
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * Created by pengyq on 2020.
@@ -49,23 +38,8 @@ public class MnpBuildingController extends BaseController {
     @PostMapping(value = "list", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public Object list(Tablepar tablepar, MnpBuildingDto model, DateTrans dt) {
-//        Object user = SecurityUtils.getSubject().getPrincipal();
-//        if (user instanceof FrameUser) {
-//            FrameUser frameUser = (FrameUser) user;
-//            if (StringUtils.isNotEmpty(frameUser.getDataRoleKey())) {
-//                if (StringUtils.isNotEmpty(model.getLdmc())) {
-//                    if (!frameUser.getDataRoleKey().contains(model.getLdmc())) {
-//                        PageInfo<MnpBuilding> page = new PageInfo<MnpBuilding>();
-//                        TableSplitResult<MnpBuilding> result = new TableSplitResult<MnpBuilding>(page.getPageNum(), page.getTotal(), page.getList());
-//                        return result;
-//                    }
-//                } else {
-//                    model.setLdmc(frameUser.getDataRoleKey());
-//                }
-//            }
-//        }
-        PageInfo<MnpBuildingResponse> page = modelService.list(tablepar, model, dt);
-        TableSplitResult<MnpBuildingResponse> result = new TableSplitResult<MnpBuildingResponse>(page.getPageNum(), page.getTotal(), page.getList());
+        PageInfo<MnpBuildingDto> page = modelService.list(tablepar, model, dt);
+        TableSplitResult<MnpBuildingDto> result = new TableSplitResult<MnpBuildingDto>(page.getPageNum(), page.getTotal(), page.getList());
         return result;
     }
 

pro-base/src/main/java/com/idea/buildManage/controller/ParkFloorDiscController.java

@@ -1,7 +1,7 @@
 package com.idea.buildManage.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.idea.buildManage.dto.ParkFloorDiscRespson;
+import com.idea.buildManage.response.ParkFloorDiscRespson;
 import com.idea.buildManage.model.ParkFloorDisc;
 import com.idea.buildManage.service.ParkFloorDiscService;
 import com.rockstar.common.base.BaseController;
@@ -25,7 +25,7 @@ import java.util.Date;
  */
 @Controller
 @RequestMapping(value = "ParkFloorDiscController")
-@Api(value="楼盘管理")
+@Api(value="楼盘分期管理")
 public class ParkFloorDiscController extends BaseController {
 
     //主表
@@ -41,23 +41,23 @@ public class ParkFloorDiscController extends BaseController {
         return  result;
     }
 
-    @ApiOperation(value = "楼盘列表")
+    @ApiOperation(value = "楼盘分期列表")
     @PostMapping(value = "listAll",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public Object listAll(ParkFloorDisc model, DateTrans dt){
         return  modelService.listAll(model,dt);
     }
 
-    @ApiOperation(value = "新增楼盘")
+    @ApiOperation(value = "新增楼盘分期")
     @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public AjaxResult add(ParkFloorDisc record){
+    public AjaxResult add(ParkFloorDiscRespson record){
         record.setCreatedAt(new Date());
-        int result = modelService.insert(record);
+        int result = modelService.add(record);
         return result(result);
     }
 
-    @ApiOperation(value = "删除楼盘")
+    @ApiOperation(value = "删除楼盘分期")
     @PostMapping(value = "remove/{id}",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public AjaxResult remove(@PathVariable("id") String id){
@@ -65,23 +65,23 @@ public class ParkFloorDiscController extends BaseController {
         return result(result);
     }
 
-    @ApiOperation(value = "编辑楼盘")
+    @ApiOperation(value = "编辑楼盘分期")
     @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public AjaxResult editSave(ParkFloorDisc model){
+    public AjaxResult editSave(ParkFloorDiscRespson model){
         model.setUpdatedAt(new Date());
-        int result = modelService.updateByPrimaryKeySelective(model);
+        int result = modelService.edit(model);
         return result(result);
     }
 
-    @ApiOperation(value = "根据id查询楼盘")
+    @ApiOperation(value = "根据id查询楼盘分期")
     @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public ParkFloorDisc getById(String id) {
-        return modelService.selectByPrimaryKey(id);
+    public ParkFloorDiscRespson getById(String id) {
+        return modelService.getById(id);
     }
 
-    @ApiOperation(value = "楼盘分页")
+    @ApiOperation(value = "楼盘分期分页")
     @PostMapping(value = "listByModel",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public Object listByModel(Tablepar tablepar, ParkFloorDiscRespson model, DateTrans dt){

pro-base/src/main/java/com/idea/buildManage/dto/MnpBuildingDto.java

@@ -14,6 +14,15 @@ public class MnpBuildingDto extends MnpBuilding {
 
     private String level;
 
+    private String parkName;
+
+    public String getParkName() {
+        return parkName;
+    }
+
+    public void setParkName(String parkName) {
+        this.parkName = parkName;
+    }
 
     public String getNodeId() {
         return nodeId;

pro-base/src/main/java/com/idea/buildManage/dto/MnpBuildingResponse.java

@@ -1,16 +0,0 @@
-package com.idea.buildManage.dto;
-
-import com.idea.buildManage.model.MnpBuilding;
-import lombok.Data;
-
-/**
- * @Author xufeng
- * @Date 2023/7/24 9:25
- * @Version 1.0
- */
-@Data
-public class MnpBuildingResponse extends MnpBuilding {
-
-    private String parkName;
-
-}

pro-base/src/main/java/com/idea/buildManage/dto/ParkFloorDiscRespson.java

@@ -1,88 +0,0 @@
-package com.idea.buildManage.dto;
-
-
-import com.idea.buildManage.model.ParkFloorDisc;
-
-public class ParkFloorDiscRespson extends ParkFloorDisc {
-
-    //园区名称
-    private String groupName;
-
-    //园区类型
-    private String parkType;
-
-    //园区面积
-    private String size;
-
-    //运营人员
-    private String operateUser;
-
-    //物业人员
-    private String propertyUser;
-
-    /**
-     * 树节点id
-     */
-    private String nodeId;
-
-    /**
-     * 树层级
-     */
-    private String level;
-
-    public String getNodeId() {
-        return nodeId;
-    }
-
-    public void setNodeId(String nodeId) {
-        this.nodeId = nodeId;
-    }
-
-    public String getLevel() {
-        return level;
-    }
-
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
-    }
-
-    public String getParkType() {
-        return parkType;
-    }
-
-    public void setParkType(String parkType) {
-        this.parkType = parkType;
-    }
-
-    public String getSize() {
-        return size;
-    }
-
-    public void setSize(String size) {
-        this.size = size;
-    }
-
-    public String getOperateUser() {
-        return operateUser;
-    }
-
-    public void setOperateUser(String operateUser) {
-        this.operateUser = operateUser;
-    }
-
-    public String getPropertyUser() {
-        return propertyUser;
-    }
-
-    public void setPropertyUser(String propertyUser) {
-        this.propertyUser = propertyUser;
-    }
-}

pro-base/src/main/java/com/idea/buildManage/mapper/MnpBuildingExtendMapper.java

@@ -1,9 +1,7 @@
 package com.idea.buildManage.mapper;
 
 import com.idea.buildManage.dto.MnpBuildingDto;
-import com.idea.buildManage.dto.MnpBuildingResponse;
 import com.idea.buildManage.model.MnpBuilding;
-import com.idea.buildManage.model.MnpBuildingExample;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -13,9 +11,9 @@ public interface MnpBuildingExtendMapper {
 
     int batchInsert(@Param("list") List<MnpBuilding> list);
 
-    List<MnpBuildingResponse> listByModel(MnpBuildingDto model);
+    List<MnpBuildingDto> listByModel(MnpBuildingDto model);
 
-    List<MnpBuildingResponse> selectByCompanyId(String enterpriseId);
+    List<MnpBuildingDto> selectByCompanyId(String enterpriseId);
 
     List<MnpBuilding> selectByContractId(String contractId);
 

pro-base/src/main/java/com/idea/buildManage/mapper/ParkFloorDiscExtendMapper.java

@@ -1,9 +1,7 @@
 package com.idea.buildManage.mapper;
 
-import com.idea.buildManage.dto.ParkFloorDiscRespson;
+import com.idea.buildManage.response.ParkFloorDiscRespson;
 import com.idea.buildManage.model.ParkFloorDisc;
-import com.idea.buildManage.model.ParkFloorDiscExample;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

pro-base/src/main/java/com/idea/buildManage/model/ParkFloorDisc.java

@@ -9,20 +9,8 @@ public class ParkFloorDisc implements Serializable {
 
     private String name;
 
-    private String createdId;
-
-    private Date createdAt;
-
-    private Date updatedAt;
-
     private String groupId;
 
-    private String certificateNumber;
-
-    private Double area;
-
-    private Integer orderNum;
-
     private BigDecimal unitPrice;
 
     private BigDecimal propertyUnitPrice;
@@ -35,6 +23,14 @@ public class ParkFloorDisc implements Serializable {
 
     private Integer paymentMethods;
 
+    private String createdId;
+
+    private Date createdAt;
+
+    private String updatedId;
+
+    private Date updatedAt;
+
     private static final long serialVersionUID = 1L;
 
     public String getId() {
@@ -53,30 +49,6 @@ public class ParkFloorDisc implements Serializable {
         this.name = name == null ? null : name.trim();
     }
 
-    public String getCreatedId() {
-        return createdId;
-    }
-
-    public void setCreatedId(String createdId) {
-        this.createdId = createdId == null ? null : createdId.trim();
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
     public String getGroupId() {
         return groupId;
     }
@@ -85,30 +57,6 @@ public class ParkFloorDisc implements Serializable {
         this.groupId = groupId == null ? null : groupId.trim();
     }
 
-    public String getCertificateNumber() {
-        return certificateNumber;
-    }
-
-    public void setCertificateNumber(String certificateNumber) {
-        this.certificateNumber = certificateNumber == null ? null : certificateNumber.trim();
-    }
-
-    public Double getArea() {
-        return area;
-    }
-
-    public void setArea(Double area) {
-        this.area = area;
-    }
-
-    public Integer getOrderNum() {
-        return orderNum;
-    }
-
-    public void setOrderNum(Integer orderNum) {
-        this.orderNum = orderNum;
-    }
-
     public BigDecimal getUnitPrice() {
         return unitPrice;
     }
@@ -156,4 +104,36 @@ public class ParkFloorDisc implements Serializable {
     public void setPaymentMethods(Integer paymentMethods) {
         this.paymentMethods = paymentMethods;
     }
+
+    public String getCreatedId() {
+        return createdId;
+    }
+
+    public void setCreatedId(String createdId) {
+        this.createdId = createdId == null ? null : createdId.trim();
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public String getUpdatedId() {
+        return updatedId;
+    }
+
+    public void setUpdatedId(String updatedId) {
+        this.updatedId = updatedId == null ? null : updatedId.trim();
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
 }

pro-base/src/main/java/com/idea/buildManage/model/ParkFloorDiscExample.java

@@ -246,196 +246,6 @@ public class ParkFloorDiscExample {
             return (Criteria) this;
         }
 
-        public Criteria andCreatedIdIsNull() {
-            addCriterion("created_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedIdIsNotNull() {
-            addCriterion("created_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedIdEqualTo(String value) {
-            addCriterion("created_id =", value, "createdId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedIdNotEqualTo(String value) {
-            addCriterion("created_id <>", value, "createdId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedIdGreaterThan(String value) {
-            addCriterion("created_id >", value, "createdId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedIdGreaterThanOrEqualTo(String value) {
-            addCriterion("created_id >=", value, "createdId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedIdLessThan(String value) {
-            addCriterion("created_id <", value, "createdId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedIdLessThanOrEqualTo(String value) {
-            addCriterion("created_id <=", value, "createdId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedIdLike(String value) {
-            addCriterion("created_id like", value, "createdId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedIdNotLike(String value) {
-            addCriterion("created_id not like", value, "createdId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedIdIn(List<String> values) {
-            addCriterion("created_id in", values, "createdId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedIdNotIn(List<String> values) {
-            addCriterion("created_id not in", values, "createdId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedIdBetween(String value1, String value2) {
-            addCriterion("created_id between", value1, value2, "createdId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedIdNotBetween(String value1, String value2) {
-            addCriterion("created_id not between", value1, value2, "createdId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtIsNull() {
-            addCriterion("created_at is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtIsNotNull() {
-            addCriterion("created_at is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtEqualTo(Date value) {
-            addCriterion("created_at =", value, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtNotEqualTo(Date value) {
-            addCriterion("created_at <>", value, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtGreaterThan(Date value) {
-            addCriterion("created_at >", value, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
-            addCriterion("created_at >=", value, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtLessThan(Date value) {
-            addCriterion("created_at <", value, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
-            addCriterion("created_at <=", value, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtIn(List<Date> values) {
-            addCriterion("created_at in", values, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtNotIn(List<Date> values) {
-            addCriterion("created_at not in", values, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtBetween(Date value1, Date value2) {
-            addCriterion("created_at between", value1, value2, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
-            addCriterion("created_at not between", value1, value2, "createdAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtIsNull() {
-            addCriterion("updated_at is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtIsNotNull() {
-            addCriterion("updated_at is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtEqualTo(Date value) {
-            addCriterion("updated_at =", value, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtNotEqualTo(Date value) {
-            addCriterion("updated_at <>", value, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtGreaterThan(Date value) {
-            addCriterion("updated_at >", value, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
-            addCriterion("updated_at >=", value, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtLessThan(Date value) {
-            addCriterion("updated_at <", value, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
-            addCriterion("updated_at <=", value, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtIn(List<Date> values) {
-            addCriterion("updated_at in", values, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtNotIn(List<Date> values) {
-            addCriterion("updated_at not in", values, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
-            addCriterion("updated_at between", value1, value2, "updatedAt");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
-            addCriterion("updated_at not between", value1, value2, "updatedAt");
-            return (Criteria) this;
-        }
-
         public Criteria andGroupIdIsNull() {
             addCriterion("group_id is null");
             return (Criteria) this;
@@ -446,253 +256,63 @@ public class ParkFloorDiscExample {
             return (Criteria) this;
         }
 
-        public Criteria andGroupIdEqualTo(String value) {
-            addCriterion("group_id =", value, "groupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andGroupIdNotEqualTo(String value) {
-            addCriterion("group_id <>", value, "groupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andGroupIdGreaterThan(String value) {
-            addCriterion("group_id >", value, "groupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andGroupIdGreaterThanOrEqualTo(String value) {
-            addCriterion("group_id >=", value, "groupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andGroupIdLessThan(String value) {
-            addCriterion("group_id <", value, "groupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andGroupIdLessThanOrEqualTo(String value) {
-            addCriterion("group_id <=", value, "groupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andGroupIdLike(String value) {
-            addCriterion("group_id like", value, "groupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andGroupIdNotLike(String value) {
-            addCriterion("group_id not like", value, "groupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andGroupIdIn(List<String> values) {
-            addCriterion("group_id in", values, "groupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andGroupIdNotIn(List<String> values) {
-            addCriterion("group_id not in", values, "groupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andGroupIdBetween(String value1, String value2) {
-            addCriterion("group_id between", value1, value2, "groupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andGroupIdNotBetween(String value1, String value2) {
-            addCriterion("group_id not between", value1, value2, "groupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberIsNull() {
-            addCriterion("certificate_number is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberIsNotNull() {
-            addCriterion("certificate_number is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberEqualTo(String value) {
-            addCriterion("certificate_number =", value, "certificateNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberNotEqualTo(String value) {
-            addCriterion("certificate_number <>", value, "certificateNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberGreaterThan(String value) {
-            addCriterion("certificate_number >", value, "certificateNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberGreaterThanOrEqualTo(String value) {
-            addCriterion("certificate_number >=", value, "certificateNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberLessThan(String value) {
-            addCriterion("certificate_number <", value, "certificateNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberLessThanOrEqualTo(String value) {
-            addCriterion("certificate_number <=", value, "certificateNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberLike(String value) {
-            addCriterion("certificate_number like", value, "certificateNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberNotLike(String value) {
-            addCriterion("certificate_number not like", value, "certificateNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberIn(List<String> values) {
-            addCriterion("certificate_number in", values, "certificateNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberNotIn(List<String> values) {
-            addCriterion("certificate_number not in", values, "certificateNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberBetween(String value1, String value2) {
-            addCriterion("certificate_number between", value1, value2, "certificateNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andCertificateNumberNotBetween(String value1, String value2) {
-            addCriterion("certificate_number not between", value1, value2, "certificateNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andAreaIsNull() {
-            addCriterion("area is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAreaIsNotNull() {
-            addCriterion("area is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAreaEqualTo(Double value) {
-            addCriterion("area =", value, "area");
-            return (Criteria) this;
-        }
-
-        public Criteria andAreaNotEqualTo(Double value) {
-            addCriterion("area <>", value, "area");
-            return (Criteria) this;
-        }
-
-        public Criteria andAreaGreaterThan(Double value) {
-            addCriterion("area >", value, "area");
-            return (Criteria) this;
-        }
-
-        public Criteria andAreaGreaterThanOrEqualTo(Double value) {
-            addCriterion("area >=", value, "area");
-            return (Criteria) this;
-        }
-
-        public Criteria andAreaLessThan(Double value) {
-            addCriterion("area <", value, "area");
-            return (Criteria) this;
-        }
-
-        public Criteria andAreaLessThanOrEqualTo(Double value) {
-            addCriterion("area <=", value, "area");
-            return (Criteria) this;
-        }
-
-        public Criteria andAreaIn(List<Double> values) {
-            addCriterion("area in", values, "area");
-            return (Criteria) this;
-        }
-
-        public Criteria andAreaNotIn(List<Double> values) {
-            addCriterion("area not in", values, "area");
-            return (Criteria) this;
-        }
-
-        public Criteria andAreaBetween(Double value1, Double value2) {
-            addCriterion("area between", value1, value2, "area");
-            return (Criteria) this;
-        }
-
-        public Criteria andAreaNotBetween(Double value1, Double value2) {
-            addCriterion("area not between", value1, value2, "area");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrderNumIsNull() {
-            addCriterion("order_num is null");
+        public Criteria andGroupIdEqualTo(String value) {
+            addCriterion("group_id =", value, "groupId");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumIsNotNull() {
-            addCriterion("order_num is not null");
+        public Criteria andGroupIdNotEqualTo(String value) {
+            addCriterion("group_id <>", value, "groupId");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumEqualTo(Integer value) {
-            addCriterion("order_num =", value, "orderNum");
+        public Criteria andGroupIdGreaterThan(String value) {
+            addCriterion("group_id >", value, "groupId");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumNotEqualTo(Integer value) {
-            addCriterion("order_num <>", value, "orderNum");
+        public Criteria andGroupIdGreaterThanOrEqualTo(String value) {
+            addCriterion("group_id >=", value, "groupId");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumGreaterThan(Integer value) {
-            addCriterion("order_num >", value, "orderNum");
+        public Criteria andGroupIdLessThan(String value) {
+            addCriterion("group_id <", value, "groupId");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumGreaterThanOrEqualTo(Integer value) {
-            addCriterion("order_num >=", value, "orderNum");
+        public Criteria andGroupIdLessThanOrEqualTo(String value) {
+            addCriterion("group_id <=", value, "groupId");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumLessThan(Integer value) {
-            addCriterion("order_num <", value, "orderNum");
+        public Criteria andGroupIdLike(String value) {
+            addCriterion("group_id like", value, "groupId");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumLessThanOrEqualTo(Integer value) {
-            addCriterion("order_num <=", value, "orderNum");
+        public Criteria andGroupIdNotLike(String value) {
+            addCriterion("group_id not like", value, "groupId");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumIn(List<Integer> values) {
-            addCriterion("order_num in", values, "orderNum");
+        public Criteria andGroupIdIn(List<String> values) {
+            addCriterion("group_id in", values, "groupId");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumNotIn(List<Integer> values) {
-            addCriterion("order_num not in", values, "orderNum");
+        public Criteria andGroupIdNotIn(List<String> values) {
+            addCriterion("group_id not in", values, "groupId");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumBetween(Integer value1, Integer value2) {
-            addCriterion("order_num between", value1, value2, "orderNum");
+        public Criteria andGroupIdBetween(String value1, String value2) {
+            addCriterion("group_id between", value1, value2, "groupId");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumNotBetween(Integer value1, Integer value2) {
-            addCriterion("order_num not between", value1, value2, "orderNum");
+        public Criteria andGroupIdNotBetween(String value1, String value2) {
+            addCriterion("group_id not between", value1, value2, "groupId");
             return (Criteria) this;
         }
 
@@ -1055,6 +675,266 @@ public class ParkFloorDiscExample {
             addCriterion("payment_methods not between", value1, value2, "paymentMethods");
             return (Criteria) this;
         }
+
+        public Criteria andCreatedIdIsNull() {
+            addCriterion("created_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdIsNotNull() {
+            addCriterion("created_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdEqualTo(String value) {
+            addCriterion("created_id =", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotEqualTo(String value) {
+            addCriterion("created_id <>", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdGreaterThan(String value) {
+            addCriterion("created_id >", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdGreaterThanOrEqualTo(String value) {
+            addCriterion("created_id >=", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdLessThan(String value) {
+            addCriterion("created_id <", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdLessThanOrEqualTo(String value) {
+            addCriterion("created_id <=", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdLike(String value) {
+            addCriterion("created_id like", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotLike(String value) {
+            addCriterion("created_id not like", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdIn(List<String> values) {
+            addCriterion("created_id in", values, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotIn(List<String> values) {
+            addCriterion("created_id not in", values, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdBetween(String value1, String value2) {
+            addCriterion("created_id between", value1, value2, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotBetween(String value1, String value2) {
+            addCriterion("created_id not between", value1, value2, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdIsNull() {
+            addCriterion("updated_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdIsNotNull() {
+            addCriterion("updated_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdEqualTo(String value) {
+            addCriterion("updated_id =", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotEqualTo(String value) {
+            addCriterion("updated_id <>", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdGreaterThan(String value) {
+            addCriterion("updated_id >", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdGreaterThanOrEqualTo(String value) {
+            addCriterion("updated_id >=", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdLessThan(String value) {
+            addCriterion("updated_id <", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdLessThanOrEqualTo(String value) {
+            addCriterion("updated_id <=", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdLike(String value) {
+            addCriterion("updated_id like", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotLike(String value) {
+            addCriterion("updated_id not like", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdIn(List<String> values) {
+            addCriterion("updated_id in", values, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotIn(List<String> values) {
+            addCriterion("updated_id not in", values, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdBetween(String value1, String value2) {
+            addCriterion("updated_id between", value1, value2, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotBetween(String value1, String value2) {
+            addCriterion("updated_id not between", value1, value2, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

pro-base/src/main/java/com/idea/buildManage/response/ParkFloorDiscRespson.java

@@ -0,0 +1,37 @@
+package com.idea.buildManage.response;
+
+
+import com.idea.buildManage.model.ParkFloorDisc;
+import lombok.Data;
+
+@Data
+public class ParkFloorDiscRespson extends ParkFloorDisc {
+
+    //园区名称
+    private String groupName;
+
+    //园区面积
+    private String size;
+
+    /**
+     * 树节点id
+     */
+    private String nodeId;
+
+    /**
+     * 树层级
+     */
+    private String level;
+
+    /**
+     * 户型库
+     */
+    private String houseTypeStr;
+
+    /**
+     * 园区性质
+     */
+    private String nature;
+
+    private String preSalesLicenseNumber;
+}

pro-base/src/main/java/com/idea/buildManage/service/HouseTypeService.java

@@ -0,0 +1,68 @@
+package com.idea.buildManage.service;
+
+import cn.hutool.core.util.IdUtil;
+import com.idea.buildManage.mapper.HouseTypeMapper;
+import com.idea.buildManage.model.HouseType;
+import com.idea.buildManage.model.HouseTypeExample;
+import com.rockstar.common.base.BaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class HouseTypeService implements BaseService<HouseType, HouseTypeExample> {
+
+    @Autowired
+    private HouseTypeMapper modelMapper;
+
+    @Override
+    public int deleteByPrimaryKey(String s) {
+        return modelMapper.deleteByPrimaryKey(s);
+    }
+
+    @Override
+    public int insertSelective(HouseType houseType) {
+        houseType.setId(IdUtil.simpleUUID());
+        return modelMapper.insertSelective(houseType);
+    }
+
+    public int insertWithoutId(HouseType houseType) {
+        return modelMapper.insert(houseType);
+    }
+
+    @Override
+    public HouseType selectByPrimaryKey(String s) {
+        return modelMapper.selectByPrimaryKey(s);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(HouseType houseType) {
+        return modelMapper.updateByPrimaryKeySelective(houseType);
+    }
+
+    @Override
+    public int updateByExampleSelective(HouseType houseType, HouseTypeExample houseTypeExample) {
+        return modelMapper.updateByExampleSelective(houseType,houseTypeExample);
+    }
+
+    @Override
+    public int updateByExample(HouseType houseType, HouseTypeExample houseTypeExample) {
+        return modelMapper.updateByExample(houseType,houseTypeExample);
+    }
+
+    @Override
+    public List<HouseType> selectByExample(HouseTypeExample houseTypeExample) {
+        return modelMapper.selectByExample(houseTypeExample);
+    }
+
+    @Override
+    public long countByExample(HouseTypeExample houseTypeExample) {
+        return modelMapper.countByExample(houseTypeExample);
+    }
+
+    @Override
+    public int deleteByExample(HouseTypeExample houseTypeExample) {
+        return modelMapper.deleteByExample(houseTypeExample);
+    }
+}

pro-base/src/main/java/com/idea/buildManage/service/MnpBuildingService.java

@@ -1,13 +1,9 @@
 package com.idea.buildManage.service;
 
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import com.idea.buildManage.dto.MnpBuildingDto;
-import com.idea.buildManage.dto.MnpBuildingResponse;
 import com.idea.buildManage.mapper.MnpBuildingExtendMapper;
 import com.idea.buildManage.mapper.MnpBuildingMapper;
 import com.idea.buildManage.model.MnpBuilding;
@@ -17,16 +13,10 @@ import com.rockstar.common.base.BaseService;
 import com.rockstar.frame.mapper.FrameDataMapper;
 import com.rockstar.frame.model.extend.DateTrans;
 import com.rockstar.frame.model.extend.Tablepar;
-import com.rockstar.util.StringUtils;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 @Service
 public class MnpBuildingService implements BaseService<MnpBuilding, MnpBuildingExample> {
@@ -46,10 +36,10 @@ public class MnpBuildingService implements BaseService<MnpBuilding, MnpBuildingE
      *
      * @return
      */
-    public PageInfo<MnpBuildingResponse> list(Tablepar tablepar, MnpBuildingDto model, DateTrans dt) {
+    public PageInfo<MnpBuildingDto> list(Tablepar tablepar, MnpBuildingDto model, DateTrans dt) {
         PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
-        List<MnpBuildingResponse> list = extendMapper.listByModel(model);
-        PageInfo<MnpBuildingResponse> pageInfo = new PageInfo<>(list);
+        List<MnpBuildingDto> list = extendMapper.listByModel(model);
+        PageInfo<MnpBuildingDto> pageInfo = new PageInfo<>(list);
         return pageInfo;
     }
 
@@ -123,7 +113,6 @@ public class MnpBuildingService implements BaseService<MnpBuilding, MnpBuildingE
     }
 
     public int insert(MnpBuilding record) {
-        MnpBuildingExample mnpBuilding = new MnpBuildingExample();
         record.setId(IdUtil.simpleUUID());
         return insertWithoutId(record);
     }
@@ -139,9 +128,9 @@ public class MnpBuildingService implements BaseService<MnpBuilding, MnpBuildingE
     }
 
 
-    public List<MnpBuildingResponse> excelListAll(MnpBuildingDto model) {
+    public List<MnpBuildingDto> excelListAll(MnpBuildingDto model) {
 
-        List<MnpBuildingResponse> list = extendMapper.listByModel(model);
+        List<MnpBuildingDto> list = extendMapper.listByModel(model);
         return list;
     }
 

pro-base/src/main/java/com/idea/buildManage/service/ParkFloorDiscService.java

@@ -1,21 +1,24 @@
 package com.idea.buildManage.service;
 
-import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.idea.buildManage.dto.ParkFloorDiscRespson;
+import com.idea.buildManage.response.ParkFloorDiscRespson;
 import com.idea.buildManage.mapper.ParkFloorDiscExtendMapper;
 import com.idea.buildManage.mapper.ParkFloorDiscMapper;
 import com.idea.buildManage.model.*;
 import com.rockstar.common.base.BaseService;
 import com.rockstar.frame.model.extend.DateTrans;
 import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.shiro.util.ShiroUtils;
 import com.rockstar.util.SnowflakeIdWorker;
-import com.rockstar.util.StringUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.beans.Transient;
 import java.util.Date;
 import java.util.List;
 
@@ -29,6 +32,8 @@ public class ParkFloorDiscService implements BaseService<ParkFloorDisc, ParkFloo
     private MnpBuildingService buildingService;
     @Autowired
     private ParkFloorDiscExtendMapper extendMapper;
+    @Autowired
+    private HouseTypeService houseTypeService;
 
     /**
      * 分页查询
@@ -146,5 +151,62 @@ public class ParkFloorDiscService implements BaseService<ParkFloorDisc, ParkFloo
         return pageInfo;
     }
 
+    /**
+     * 新增分期
+     * @param model
+     * @return
+     */
+    public int add(ParkFloorDiscRespson model){
+        String houseTypeStr = model.getHouseTypeStr();
+        String id = IdUtil.simpleUUID();
+        model.setId(id);
+        List<HouseType> houseTypes = JSONObject.parseArray(houseTypeStr, HouseType.class);
+        for(HouseType houseType : houseTypes){
+            houseType.setId(IdUtil.simpleUUID());
+            houseType.setDiscId(id);
+            houseTypeService.insertSelective(houseType);
+        }
+        model.setCreatedId(ShiroUtils.getUserId());
+        return insertWithoutId(model);
+    }
+
+    /**
+     * 编辑分期
+     * @param model
+     * @return
+     */
+    public int edit(ParkFloorDiscRespson model){
+
+        //先删除对应户型库
+        HouseTypeExample houseTypeExample = new HouseTypeExample();
+        houseTypeExample.createCriteria().andDiscIdEqualTo(model.getId());
+        houseTypeService.deleteByExample(houseTypeExample);
+        String houseTypeStr = model.getHouseTypeStr();
+        List<HouseType> houseTypes = JSONObject.parseArray(houseTypeStr, HouseType.class);
+        for(HouseType houseType : houseTypes){
+            houseType.setId(IdUtil.simpleUUID());
+            houseType.setDiscId(model.getId());
+            houseTypeService.insertSelective(houseType);
+        }
+        int result = updateByPrimaryKeySelective(model);
+        return result;
+    }
+
+    public ParkFloorDiscRespson getById(String id) {
+        ParkFloorDisc parkFloorDisc = selectByPrimaryKey(id);
+        ParkFloorDiscRespson parkFloorDiscRespson = new ParkFloorDiscRespson();
+        BeanUtil.copyProperties(parkFloorDisc,parkFloorDiscRespson);
+        HouseTypeExample houseTypeExample = new HouseTypeExample();
+        houseTypeExample.createCriteria().andDiscIdEqualTo(id);
+        List<HouseType> houseTypes = houseTypeService.selectByExample(houseTypeExample);
+        if(CollectionUtils.isNotEmpty(houseTypes)){
+            String json = JSON.toJSON(houseTypes).toString();
+            parkFloorDiscRespson.setHouseTypeStr(json);
+        }
+        return parkFloorDiscRespson;
+    }
+
+
+
 
 }

pro-base/src/main/resources/mybatis/buildManage/MnpBuildingExtendMapper.xml

@@ -17,7 +17,7 @@
     </foreach>
   </insert>
 
-  <select id="listByModel" resultType="com.idea.buildManage.dto.MnpBuildingResponse">
+  <select id="listByModel" resultType="com.idea.buildManage.dto.MnpBuildingDto">
     select mnp_building.*,park_info.group_name park_name from mnp_building
     left JOIN park_info on mnp_building.group_id = park_info.id
     <where>
@@ -36,7 +36,7 @@
     </where>
   </select>
 
-  <select id="selectByCompanyId" resultType="com.idea.buildManage.dto.MnpBuildingResponse">
+  <select id="selectByCompanyId" resultType="com.idea.buildManage.dto.MnpBuildingDto">
     select * from mnp_building where id in (
     select build_id from park_room where id in (
     select house_id from contract_house where contract_id in (

pro-base/src/main/resources/mybatis/buildManage/ParkFloorDiscExtendMapper.xml

@@ -3,8 +3,26 @@
 <mapper namespace="com.idea.buildManage.mapper.ParkFloorDiscExtendMapper">
 
 
-    <select id="listByModel" resultType="com.idea.buildManage.dto.ParkFloorDiscRespson">
-
+    <select id="listByModel" resultType="com.idea.buildManage.response.ParkFloorDiscRespson">
+        SELECT
+        i.group_name,
+        i.nature,
+        i.pre_sales_license_number,
+        d.*
+        FROM
+        park_floor_disc d
+        LEFT JOIN park_info i ON d.group_id = i.id
+        <where>
+            <if test="name != null and name != ''">
+                and d.name = #{name}
+            </if>
+            <if test="level == 1">
+                and i.id = #{nodeId}
+            </if>
+            <if test="level == 2">
+                and d.id = #{nodeId}
+            </if>
+        </where>
     </select>
 
     <select id="selectByGroupId" resultType="com.idea.buildManage.model.ParkFloorDisc">

pro-base/src/main/resources/mybatis/buildManage/ParkFloorDiscMapper.xml

@@ -4,19 +4,17 @@
     <resultMap id="BaseResultMap" type="com.idea.buildManage.model.ParkFloorDisc">
         <id column="id" jdbcType="VARCHAR" property="id" />
         <result column="name" jdbcType="VARCHAR" property="name" />
-        <result column="created_id" jdbcType="VARCHAR" property="createdId" />
-        <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
-        <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
         <result column="group_id" jdbcType="VARCHAR" property="groupId" />
-        <result column="certificate_number" jdbcType="VARCHAR" property="certificateNumber" />
-        <result column="area" jdbcType="DOUBLE" property="area" />
-        <result column="order_num" jdbcType="INTEGER" property="orderNum" />
         <result column="unit_price" jdbcType="DECIMAL" property="unitPrice" />
         <result column="property_unit_price" jdbcType="DECIMAL" property="propertyUnitPrice" />
         <result column="maintenance_funds" jdbcType="DECIMAL" property="maintenanceFunds" />
         <result column="subscription_funds" jdbcType="DECIMAL" property="subscriptionFunds" />
         <result column="proportion" jdbcType="DOUBLE" property="proportion" />
         <result column="payment_methods" jdbcType="INTEGER" property="paymentMethods" />
+        <result column="created_id" jdbcType="VARCHAR" property="createdId" />
+        <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+        <result column="updated_id" jdbcType="VARCHAR" property="updatedId" />
+        <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     </resultMap>
     <sql id="Example_Where_Clause">
         <where>
@@ -77,9 +75,8 @@
         </where>
     </sql>
     <sql id="Base_Column_List">
-        id, name, created_id, created_at, updated_at, group_id, certificate_number, area,
-    order_num, unit_price, property_unit_price, maintenance_funds, subscription_funds,
-    proportion, payment_methods
+        id, name, group_id, unit_price, property_unit_price, maintenance_funds, subscription_funds,
+    proportion, payment_methods, created_id, created_at, updated_id, updated_at
     </sql>
     <select id="selectByExample" parameterType="com.idea.buildManage.model.ParkFloorDiscExample" resultMap="BaseResultMap">
         select
@@ -112,18 +109,16 @@
         </if>
     </delete>
     <insert id="insert" parameterType="com.idea.buildManage.model.ParkFloorDisc">
-        insert into park_floor_disc (id, name, created_id,
-                                     created_at, updated_at, group_id,
-                                     certificate_number, area, order_num,
+        insert into park_floor_disc (id, name, group_id,
                                      unit_price, property_unit_price, maintenance_funds,
-                                     subscription_funds, proportion, payment_methods
-        )
-        values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{createdId,jdbcType=VARCHAR},
-                #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{groupId,jdbcType=VARCHAR},
-                #{certificateNumber,jdbcType=VARCHAR}, #{area,jdbcType=DOUBLE}, #{orderNum,jdbcType=INTEGER},
+                                     subscription_funds, proportion, payment_methods,
+                                     created_id, created_at, updated_id,
+                                     updated_at)
+        values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR},
                 #{unitPrice,jdbcType=DECIMAL}, #{propertyUnitPrice,jdbcType=DECIMAL}, #{maintenanceFunds,jdbcType=DECIMAL},
-                #{subscriptionFunds,jdbcType=DECIMAL}, #{proportion,jdbcType=DOUBLE}, #{paymentMethods,jdbcType=INTEGER}
-               )
+                #{subscriptionFunds,jdbcType=DECIMAL}, #{proportion,jdbcType=DOUBLE}, #{paymentMethods,jdbcType=INTEGER},
+                #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR},
+                #{updatedAt,jdbcType=TIMESTAMP})
     </insert>
     <insert id="insertSelective" parameterType="com.idea.buildManage.model.ParkFloorDisc">
         insert into park_floor_disc
@@ -134,27 +129,9 @@
             <if test="name != null">
                 name,
             </if>
-            <if test="createdId != null">
-                created_id,
-            </if>
-            <if test="createdAt != null">
-                created_at,
-            </if>
-            <if test="updatedAt != null">
-                updated_at,
-            </if>
             <if test="groupId != null">
                 group_id,
             </if>
-            <if test="certificateNumber != null">
-                certificate_number,
-            </if>
-            <if test="area != null">
-                area,
-            </if>
-            <if test="orderNum != null">
-                order_num,
-            </if>
             <if test="unitPrice != null">
                 unit_price,
             </if>
@@ -173,6 +150,18 @@
             <if test="paymentMethods != null">
                 payment_methods,
             </if>
+            <if test="createdId != null">
+                created_id,
+            </if>
+            <if test="createdAt != null">
+                created_at,
+            </if>
+            <if test="updatedId != null">
+                updated_id,
+            </if>
+            <if test="updatedAt != null">
+                updated_at,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -181,27 +170,9 @@
             <if test="name != null">
                 #{name,jdbcType=VARCHAR},
             </if>
-            <if test="createdId != null">
-                #{createdId,jdbcType=VARCHAR},
-            </if>
-            <if test="createdAt != null">
-                #{createdAt,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updatedAt != null">
-                #{updatedAt,jdbcType=TIMESTAMP},
-            </if>
             <if test="groupId != null">
                 #{groupId,jdbcType=VARCHAR},
             </if>
-            <if test="certificateNumber != null">
-                #{certificateNumber,jdbcType=VARCHAR},
-            </if>
-            <if test="area != null">
-                #{area,jdbcType=DOUBLE},
-            </if>
-            <if test="orderNum != null">
-                #{orderNum,jdbcType=INTEGER},
-            </if>
             <if test="unitPrice != null">
                 #{unitPrice,jdbcType=DECIMAL},
             </if>
@@ -220,6 +191,18 @@
             <if test="paymentMethods != null">
                 #{paymentMethods,jdbcType=INTEGER},
             </if>
+            <if test="createdId != null">
+                #{createdId,jdbcType=VARCHAR},
+            </if>
+            <if test="createdAt != null">
+                #{createdAt,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updatedId != null">
+                #{updatedId,jdbcType=VARCHAR},
+            </if>
+            <if test="updatedAt != null">
+                #{updatedAt,jdbcType=TIMESTAMP},
+            </if>
         </trim>
     </insert>
     <select id="countByExample" parameterType="com.idea.buildManage.model.ParkFloorDiscExample" resultType="java.lang.Long">
@@ -237,27 +220,9 @@
             <if test="record.name != null">
                 name = #{record.name,jdbcType=VARCHAR},
             </if>
-            <if test="record.createdId != null">
-                created_id = #{record.createdId,jdbcType=VARCHAR},
-            </if>
-            <if test="record.createdAt != null">
-                created_at = #{record.createdAt,jdbcType=TIMESTAMP},
-            </if>
-            <if test="record.updatedAt != null">
-                updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
-            </if>
             <if test="record.groupId != null">
                 group_id = #{record.groupId,jdbcType=VARCHAR},
             </if>
-            <if test="record.certificateNumber != null">
-                certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
-            </if>
-            <if test="record.area != null">
-                area = #{record.area,jdbcType=DOUBLE},
-            </if>
-            <if test="record.orderNum != null">
-                order_num = #{record.orderNum,jdbcType=INTEGER},
-            </if>
             <if test="record.unitPrice != null">
                 unit_price = #{record.unitPrice,jdbcType=DECIMAL},
             </if>
@@ -276,6 +241,18 @@
             <if test="record.paymentMethods != null">
                 payment_methods = #{record.paymentMethods,jdbcType=INTEGER},
             </if>
+            <if test="record.createdId != null">
+                created_id = #{record.createdId,jdbcType=VARCHAR},
+            </if>
+            <if test="record.createdAt != null">
+                created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+            </if>
+            <if test="record.updatedId != null">
+                updated_id = #{record.updatedId,jdbcType=VARCHAR},
+            </if>
+            <if test="record.updatedAt != null">
+                updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+            </if>
         </set>
         <if test="_parameter != null">
             <include refid="Update_By_Example_Where_Clause" />
@@ -285,19 +262,17 @@
         update park_floor_disc
         set id = #{record.id,jdbcType=VARCHAR},
         name = #{record.name,jdbcType=VARCHAR},
-        created_id = #{record.createdId,jdbcType=VARCHAR},
-        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
-        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
         group_id = #{record.groupId,jdbcType=VARCHAR},
-        certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
-        area = #{record.area,jdbcType=DOUBLE},
-        order_num = #{record.orderNum,jdbcType=INTEGER},
         unit_price = #{record.unitPrice,jdbcType=DECIMAL},
         property_unit_price = #{record.propertyUnitPrice,jdbcType=DECIMAL},
         maintenance_funds = #{record.maintenanceFunds,jdbcType=DECIMAL},
         subscription_funds = #{record.subscriptionFunds,jdbcType=DECIMAL},
         proportion = #{record.proportion,jdbcType=DOUBLE},
-        payment_methods = #{record.paymentMethods,jdbcType=INTEGER}
+        payment_methods = #{record.paymentMethods,jdbcType=INTEGER},
+        created_id = #{record.createdId,jdbcType=VARCHAR},
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+        updated_id = #{record.updatedId,jdbcType=VARCHAR},
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}
         <if test="_parameter != null">
             <include refid="Update_By_Example_Where_Clause" />
         </if>
@@ -308,27 +283,9 @@
             <if test="name != null">
                 name = #{name,jdbcType=VARCHAR},
             </if>
-            <if test="createdId != null">
-                created_id = #{createdId,jdbcType=VARCHAR},
-            </if>
-            <if test="createdAt != null">
-                created_at = #{createdAt,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updatedAt != null">
-                updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-            </if>
             <if test="groupId != null">
                 group_id = #{groupId,jdbcType=VARCHAR},
             </if>
-            <if test="certificateNumber != null">
-                certificate_number = #{certificateNumber,jdbcType=VARCHAR},
-            </if>
-            <if test="area != null">
-                area = #{area,jdbcType=DOUBLE},
-            </if>
-            <if test="orderNum != null">
-                order_num = #{orderNum,jdbcType=INTEGER},
-            </if>
             <if test="unitPrice != null">
                 unit_price = #{unitPrice,jdbcType=DECIMAL},
             </if>
@@ -347,25 +304,35 @@
             <if test="paymentMethods != null">
                 payment_methods = #{paymentMethods,jdbcType=INTEGER},
             </if>
+            <if test="createdId != null">
+                created_id = #{createdId,jdbcType=VARCHAR},
+            </if>
+            <if test="createdAt != null">
+                created_at = #{createdAt,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updatedId != null">
+                updated_id = #{updatedId,jdbcType=VARCHAR},
+            </if>
+            <if test="updatedAt != null">
+                updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+            </if>
         </set>
         where id = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updateByPrimaryKey" parameterType="com.idea.buildManage.model.ParkFloorDisc">
         update park_floor_disc
         set name = #{name,jdbcType=VARCHAR},
-            created_id = #{createdId,jdbcType=VARCHAR},
-            created_at = #{createdAt,jdbcType=TIMESTAMP},
-            updated_at = #{updatedAt,jdbcType=TIMESTAMP},
             group_id = #{groupId,jdbcType=VARCHAR},
-            certificate_number = #{certificateNumber,jdbcType=VARCHAR},
-            area = #{area,jdbcType=DOUBLE},
-            order_num = #{orderNum,jdbcType=INTEGER},
             unit_price = #{unitPrice,jdbcType=DECIMAL},
             property_unit_price = #{propertyUnitPrice,jdbcType=DECIMAL},
             maintenance_funds = #{maintenanceFunds,jdbcType=DECIMAL},
             subscription_funds = #{subscriptionFunds,jdbcType=DECIMAL},
             proportion = #{proportion,jdbcType=DOUBLE},
-            payment_methods = #{paymentMethods,jdbcType=INTEGER}
+            payment_methods = #{paymentMethods,jdbcType=INTEGER},
+            created_id = #{createdId,jdbcType=VARCHAR},
+            created_at = #{createdAt,jdbcType=TIMESTAMP},
+            updated_id = #{updatedId,jdbcType=VARCHAR},
+            updated_at = #{updatedAt,jdbcType=TIMESTAMP}
         where id = #{id,jdbcType=VARCHAR}
     </update>
 </mapper>

pro-main/src/main/resources/application.yml

@@ -10,7 +10,7 @@ rock:
   fileSize: 209715200
   #上传路径
 #  profile: /home/project/snap_manage/upload/
-  profile: e:/upload/pro/
+  profile: d:/upload/pro/
   # 服务器运维管理
   ops:
     tag: server