bug修复

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

@@ -3,6 +3,7 @@ package com.idea.buildManage.controller;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
+import com.idea.buildManage.dto.ParkFloorDiscDto;
 import com.idea.buildManage.excel.MnpBuildingExcel;
 import com.idea.buildManage.excel.MnpBuildingListener;
 import com.idea.buildManage.excel.ParkFloorDiscExcel;
@@ -46,7 +47,7 @@ public class ParkFloorDiscController extends BaseController {
 
     @PostMapping(value = "list",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public Object list(Tablepar tablepar, ParkFloorDisc model, DateTrans dt){
+    public Object list(Tablepar tablepar, ParkFloorDiscDto model, DateTrans dt){
         PageInfo<ParkFloorDisc> page= modelService.list(tablepar,model,dt);
         TableSplitResult<ParkFloorDisc> result = new TableSplitResult<ParkFloorDisc>(page.getPageNum(), page.getTotal(), page.getList());
         return  result;
@@ -55,7 +56,7 @@ public class ParkFloorDiscController extends BaseController {
     @ApiOperation(value = "楼盘分期列表")
     @PostMapping(value = "listAll",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public Object listAll(ParkFloorDisc model, DateTrans dt){
+    public Object listAll(ParkFloorDiscDto model, DateTrans dt){
         return  modelService.listAll(model,dt);
     }
 

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

@@ -0,0 +1,12 @@
+package com.idea.buildManage.dto;
+
+import com.idea.buildManage.model.ParkFloorDisc;
+import lombok.Data;
+
+@Data
+public class ParkFloorDiscDto extends ParkFloorDisc {
+
+    private String groupIds;
+
+
+}

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

@@ -88,4 +88,6 @@ public class ParkRoomResponse extends ParkRoom {
 
     private String customerManagementId;
 
+    private String chooseStatus;
+
 }

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

@@ -6,6 +6,7 @@ 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.ParkFloorDiscDto;
 import com.idea.buildManage.response.ParkFloorDiscRespson;
 import com.idea.buildManage.mapper.ParkFloorDiscExtendMapper;
 import com.idea.buildManage.mapper.ParkFloorDiscMapper;
@@ -21,10 +22,7 @@ import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -45,7 +43,7 @@ public class ParkFloorDiscService implements BaseService<ParkFloorDisc, ParkFloo
      *
      * @return
      */
-    public PageInfo<ParkFloorDisc> list(Tablepar tablepar, ParkFloorDisc model, DateTrans dt) {
+    public PageInfo<ParkFloorDisc> list(Tablepar tablepar, ParkFloorDiscDto model, DateTrans dt) {
         PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
         List<ParkFloorDisc> list = modelMapper.selectByExample(getCondition(model, dt));
         PageInfo<ParkFloorDisc> pageInfo = new PageInfo<>(list);
@@ -57,15 +55,18 @@ public class ParkFloorDiscService implements BaseService<ParkFloorDisc, ParkFloo
      *
      * @return
      */
-    public List<ParkFloorDisc> listAll(ParkFloorDisc model, DateTrans dt) {
+    public List<ParkFloorDisc> listAll(ParkFloorDiscDto model, DateTrans dt) {
         return modelMapper.selectByExample(getCondition(model, dt));
     }
 
-    private ParkFloorDiscExample getCondition(ParkFloorDisc model, DateTrans dt) {
+    private ParkFloorDiscExample getCondition(ParkFloorDiscDto model, DateTrans dt) {
         ParkFloorDiscExample ex = new ParkFloorDiscExample();
         ex.setOrderByClause("created_at asc");
         ParkFloorDiscExample.Criteria criteria = ex.createCriteria();
-
+        if(StringUtils.isNotEmpty(model.getGroupIds())){
+            List<String> groupIds = Arrays.asList(model.getGroupIds().split(","));
+            criteria.andGroupIdIn(groupIds);
+        }
         return ex;
     }
 
@@ -123,7 +124,7 @@ public class ParkFloorDiscService implements BaseService<ParkFloorDisc, ParkFloo
         return modelMapper.countByExample(example);
     }
 
-    public long countByExample(ParkFloorDisc model, DateTrans dt) {
+    public long countByExample(ParkFloorDiscDto model, DateTrans dt) {
         return modelMapper.countByExample(getCondition(model, dt));
     }
 

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

@@ -71,7 +71,7 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
 
     private ParkInfoExample getCondition(ParkInfo model, DateTrans dt) {
         ParkInfoExample ex = new ParkInfoExample();
-        ex.setOrderByClause("created_at asc");
+        ex.setOrderByClause("created_at desc");
         ParkInfoExample.Criteria criteria = ex.createCriteria();
         return ex;
     }
@@ -224,6 +224,7 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
                     children.put("value", parkFloorDisc.getId());
                     //楼栋
                     MnpBuildingExample buildingExample = new MnpBuildingExample();
+                    buildingExample.setOrderByClause("created_at desc");
                     buildingExample.createCriteria().andDiscIdEqualTo(parkFloorDisc.getId());
                     List<MnpBuilding> parkBuilds = mnpBuildingService.selectByExample(buildingExample);
                     if (null != parkBuilds && parkBuilds.size() > 0) {
@@ -235,6 +236,7 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
                             parkBuildChildren.put("value", parkBuild.getId());
                             //房间
                             ParkRoomExample parkRoomExample = new ParkRoomExample();
+                            parkRoomExample.setOrderByClause("created_at desc");
                             parkRoomExample.createCriteria().andBuildIdEqualTo(parkBuild.getId());
                             List<ParkRoom> parkRooms = parkRoomService.selectByExample(parkRoomExample);
                             if (null != parkRooms && parkRooms.size() > 0) {
@@ -281,7 +283,7 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
                     children.put("value", parkFloorDisc.getId());
                     //楼栋
                     MnpBuildingExample buildingExample = new MnpBuildingExample();
-                    buildingExample.setOrderByClause("order_num asc");
+                    buildingExample.setOrderByClause("created_at desc");
                     buildingExample.createCriteria().andDiscIdEqualTo(parkFloorDisc.getId());
                     List<MnpBuilding> parkBuilds = mnpBuildingService.selectByExample(buildingExample);
                     if (null != parkBuilds && parkBuilds.size() > 0) {

pro-base/src/main/java/com/idea/customerManagement/service/CustomerManagementService.java

@@ -123,6 +123,14 @@ public class CustomerManagementService implements BaseService<CustomerManagement
      */
     public int add(CustomerManagementDto model){
 
+        CustomerManagementExample example = new CustomerManagementExample();
+        example.createCriteria().andBatchNumberEqualTo(model.getBatchNumber())
+                .andRoomSelectionNumberEqualTo(model.getRoomSelectionNumber());
+        long count = countByExample(example);
+        if(count>0){
+            throw new RuntimeException("批次号选房号重复!!!");
+        }
+
         String buyerJson = model.getBuyerJson();
         String id = IdUtil.simpleUUID();
         String userId = ShiroUtils.getUserId();
@@ -184,6 +192,7 @@ public class CustomerManagementService implements BaseService<CustomerManagement
         // 再新增
         List<Buyer> buyers = JSONObject.parseArray(buyerJson, Buyer.class);
         int i = 1;
+        StringBuilder builder = new StringBuilder();
         for(Buyer buyer : buyers){
             buyer.setOrderNum(i);
             i++;
@@ -191,8 +200,21 @@ public class CustomerManagementService implements BaseService<CustomerManagement
             buyer.setCreatedAt(date);
             buyer.setCreatedId(userId);
             buyerService.insertSelective(buyer);
-
+            if(StringUtils.isEmpty(buyer.getRelationship())){
+                builder.append(buyer.getName()).append(",");
+            }else {
+                String dictLabel = sysDictService.getDictLabel("RELATIONSHIP", buyer.getRelationship());
+                builder.append(buyer.getName())
+                        .append("(")
+                        .append(dictLabel)
+                        .append(")")
+                        .append(",");
+            }
         }
+        if(builder.length() > 0){
+            builder.deleteCharAt(builder.length()-1);
+        }
+        model.setBuyerName(builder.toString());
         model.setUpdatedAt(date);
         model.setUpdatedId(userId);
         return updateByPrimaryKeySelective(model);

pro-base/src/main/java/com/idea/customerManagement/service/RoomSelectionInfoService.java

@@ -124,11 +124,16 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         StringBuilder builder = new StringBuilder();
         // 先删除
         RoomSelectionInfoExample example = new RoomSelectionInfoExample();
-        example.createCriteria().andCustomerManagementIdEqualTo(customerManagementId).andHouseIdIn(Arrays.asList(split));
+        example.createCriteria().andCustomerManagementIdEqualTo(customerManagementId);
         List<RoomSelectionInfo> list = selectByExample(example);
         if (CollectionUtils.isNotEmpty(list)) {
             for (RoomSelectionInfo info : list) {
                 deleteByPrimaryKey(info.getId());
+                // 还原房间选房状态
+                ParkRoom parkRoom = new ParkRoom();
+                parkRoom.setId(info.getHouseId());
+                parkRoom.setIsChoose(0);
+                parkRoomMapper.updateByPrimaryKeySelective(parkRoom);
             }
         }
         // 再新增

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

@@ -45,6 +45,7 @@
         and mnp_building.id = #{nodeId}
       </if>
     </where>
+    order by park_floor_disc.created_at desc,park_floor_disc.created_at desc,mnp_building.created_at desc
   </select>
 
   <select id="selectByCompanyId" resultType="com.idea.buildManage.dto.MnpBuildingDto">

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

@@ -23,6 +23,7 @@
                 and d.id = #{nodeId}
             </if>
         </where>
+        order by created_at desc
     </select>
 
     <select id="selectByGroupId" resultType="com.idea.buildManage.model.ParkFloorDisc">
@@ -30,7 +31,7 @@
         *
         from park_floor_disc
         where group_id = #{id,jdbcType=VARCHAR}
-        order by name asc
+        order by created_at desc
     </select>
 
     <insert id="insertBatch">

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

@@ -21,6 +21,9 @@
       <if test="soldStatus != null and soldStatus != ''">
         and r.sold_status in (${soldStatus})
       </if>
+      <if test="chooseStatus != null and chooseStatus != ''">
+        and r.is_choose in (${chooseStatus})
+      </if>
       <if test="actualInternalArea != null and actualInternalArea != ''">
         and r.actual_internal_area = #{actualInternalArea}
       </if>
@@ -46,6 +49,8 @@
         and r.id = #{nodeId}
       </if>
     </where>
+    order by p.created_at desc,d.created_at desc,b.created_at desc,r.created_at desc
+
   </select>