1

pro-base/src/main/java/com/idea/customerManagement/controller/CustomerManagementController.java

@@ -82,7 +82,7 @@ public class CustomerManagementController extends BaseController {
     @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public Object getById(String id){
-        return getById(id);
+        return modelService.getById(id);
     }
 
 

pro-base/src/main/java/com/idea/customerManagement/dto/CustomerManagementDto.java

@@ -8,4 +8,6 @@ public class CustomerManagementDto extends CustomerManagement {
 
     private String buyerJson;
 
+    private String groupDiscName;
+
 }

pro-base/src/main/java/com/idea/customerManagement/model/CustomerManagement.java

@@ -1,7 +1,9 @@
 package com.idea.customerManagement.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -19,6 +21,8 @@ public class CustomerManagement implements Serializable {
 
     private String roomSelectionNumber;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date roomSelectionDate;
 
     private Integer status;

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

@@ -17,6 +17,7 @@ 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.system.service.SysDictService;
 import com.rockstar.util.StringUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,8 @@ public class CustomerManagementService implements BaseService<CustomerManagement
     private CustomerManagementExtendMapper extendMapper;
     @Autowired
     private BuyerService buyerService;
+    @Autowired
+    private SysDictService sysDictService;
 
     @Override
     public int deleteByPrimaryKey(String s) {
@@ -110,13 +113,33 @@ public class CustomerManagementService implements BaseService<CustomerManagement
         String userId = ShiroUtils.getUserId();
         Date date = new Date();
         List<Buyer> buyers = JSONObject.parseArray(buyerJson, Buyer.class);
+        int i = 1;
+        StringBuilder builder = new StringBuilder();
         for(Buyer buyer : buyers){
-
+            buyer.setOrderNum(i);
+            i++;
             buyer.setCustomerManagementId(id);
             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.setId(id);
+        // 待选房
+        model.setStatus(1);
         model.setCreatedAt(date);
         model.setCreatedId(userId);
         return insertWithOutId(model);

pro-base/src/main/resources/mybatis/customerManagement/CustomerManagementExtendMapper.xml

@@ -4,10 +4,14 @@
 
 
   <select id="listByModel" resultType="com.idea.customerManagement.dto.CustomerManagementDto">
-    select * from customer_management
+    select customer_management.*,
+           concat(park_info.group_name,park_floor_disc.name) groupDiscName
+    from customer_management
+    left join park_info on park_info.id = customer_management.group_id
+    left join park_floor_disc on park_floor_disc.id = customer_management.disc_id
     <where>
       <if test="buyerName != null and buyerName != ''">
-        and buyerName like concat ('%',#{buyerName},'%')
+        and buyer_name like concat ('%',#{buyerName},'%')
       </if>
       <if test="status != null and status != ''">
         and status = #{status}