合并

whole-estate/src/main/java/com/example/wholeestate/controller/BuildingController.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.bind.annotation.*;
@@ -97,17 +98,21 @@ public class BuildingController extends BaseController {
             @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageNum",value = "分页第几页" ),
             @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:每页长度" ),
             @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "buildingId",value = "buildingId:楼盘ID" ),
-            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "username",value = "username:用户名称" )
-
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "username",value = "username:用户名称" ),
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "phone",value = "phone:用户名称" ),
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "status",value = "status:用户名称" )
     })
 //    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/appointmentlist", method = RequestMethod.GET)
     public ResponseBean appointmentList(@RequestParam("pageNum")Integer pageNum,
                                         @RequestParam("pageSize")Integer pageSize, HttpSession session,
-                                        @RequestParam("buildingId")Integer buildingId,
-                                        @RequestParam("username")String username){
+                                        @RequestParam(value="buildingId",required = false)String buildingId,
+                                        @RequestParam(value="username",required = false)String username,
+                                        @RequestParam(value="phone",required = false)String phone,
+                                        @RequestParam(value="status",required = false)String status
+                                        ){
 //        SysUser sessionUser= getSessionUser(session);
-        ResponseBean  responseBean = iBuildingService.appointmentList(pageNum,pageSize,buildingId,username);
+        ResponseBean  responseBean = iBuildingService.appointmentList(pageNum,pageSize,buildingId,username,phone,status);
         return responseBean;
     }
 
@@ -206,4 +211,38 @@ public class BuildingController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/buildingApartment/{id}", method = RequestMethod.GET)
+    @ApiOperation(value = "楼盘户型详情", notes = "楼盘户型详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass=String.class, name = "id", value = "楼盘id"),
+    })
+    public ResponseBean buildingApartmentSelectId(@PathVariable(value = "id") String id, HttpSession session){
+        ResponseBean  responseBean = iBuildingService.buildingApartmentSelectId(id);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "核销备注", notes = "核销备注")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "id", value = "核销id"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "writeoffRemark", value = "核销备注")
+
+    })
+    @RequestMapping(value = "/appointment/writeoff/{id}", method = RequestMethod.PUT)
+    public ResponseBean appointmentUpdate(@PathVariable(value = "id") String id,
+                                        @RequestParam(value="writeoffRemark",required = false)String writeoffRemark){
+        ResponseBean  responseBean = iBuildingService.appointmentUpdate(id,writeoffRemark);
+        return responseBean;
+    }
+
+//    @ApiOperation(value = "户型列表", notes = "户型列表")
+////    @ApiImplicitParams({
+////            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "id", value = "核销id"),
+////    })
+////    @RequestMapping(value = "/buildingApartment/{id}", method = RequestMethod.GET)
+////    public ResponseBean buildingApartmentSelectId(@PathVariable(value = "id") String id,
+////                                     @RequestParam("pageSize")Integer pageSize){
+////        ResponseBean  responseBean = iBuildingService.buildingApartmentSelectId(id);
+////        return responseBean;
+////    }
+
 }

whole-estate/src/main/java/com/example/wholeestate/controller/CustomerController.java

@@ -32,11 +32,13 @@ public class CustomerController extends BaseController {
     @ApiOperation(value = "会员列表", notes = "会员列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "pageNum:分页第几页" +
-                    "pageSize:每页长度")
+                    "pageSize:每页长度,phone:手机号，name：姓名"
+
+            )
 
     })
 //    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
-    @RequestMapping(value = "/customerList", method = RequestMethod.POST)
+    @RequestMapping(value = "/customerList", method = RequestMethod.GET)
     public ResponseBean buildingList(@RequestBody String parameter, HttpSession session){
         ResponseBean  responseBean = iCustomerService.customerList(parameter);
         return responseBean;

whole-estate/src/main/java/com/example/wholeestate/dao/AppointmentMapper.java

@@ -21,7 +21,7 @@ public interface AppointmentMapper extends BaseMapper<Appointment> {
      * @param page
      * @return
      */
-    IPage<Appendable> appendableList(Page<Appendable> page);
+//    IPage<Appendable> appendableList(Page<Appendable> page);
 
     @Select("SELECT " +
             "taa.*, " +
@@ -33,6 +33,6 @@ public interface AppointmentMapper extends BaseMapper<Appointment> {
             "WHERE tac.openid = #{openid}")
     IPage<Appointment> getOpenidAppendableList(Page<Appointment> page, @Param("openid") String openid);
 
-    IPage<Appointment> appendableList(Page page, @Param("buildingId") Integer buildingId, @Param("username")String username);
+    IPage<Appointment> appendableList(Page page, @Param("buildingId") String buildingId, @Param("username")String username,@Param("phone") String phone,@Param("status") String status);
 
 }

whole-estate/src/main/java/com/example/wholeestate/dao/CustomerMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.wholeestate.model.Customer;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -20,5 +21,5 @@ public interface CustomerMapper extends BaseMapper<Customer> {
      * @param page
      * @return
      */
-    IPage<Customer> customerList(Page<Customer> page);
+    IPage<Customer> customerList(Page<Customer> page, @Param("Name") String name,@Param("phone")String phone);
 }

whole-estate/src/main/java/com/example/wholeestate/dao/PageImgMapper.java

@@ -0,0 +1,16 @@
+package com.example.wholeestate.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.wholeestate.model.PageImg;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-22
+ */
+public interface PageImgMapper extends BaseMapper<PageImg> {
+
+}

whole-estate/src/main/java/com/example/wholeestate/model/Appointment.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 import lombok.Data;
@@ -88,5 +89,13 @@ public class Appointment implements Serializable {
     @TableField(exist = false)
     private List<Building> arrayListbuilding;
 
+    /**
+     * 核销备注
+     */
+    private String writeoffRemark;
 
+    /**
+     * 核销时间
+     */
+    private LocalDateTime writeoffDate;
 }

whole-estate/src/main/java/com/example/wholeestate/model/BuildingApartment.java

@@ -1,8 +1,11 @@
 package com.example.wholeestate.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -35,5 +38,10 @@ public class BuildingApartment implements Serializable {
 
     private LocalDateTime createDate;
 
+    /**
+     * 户型图片列表
+     */
+    @TableField(exist = false)
+    private List<BuildingImg> buildingImgList;
 
 }

whole-estate/src/main/java/com/example/wholeestate/model/PageImg.java

@@ -0,0 +1,43 @@
+package com.example.wholeestate.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_page_img")
+public class PageImg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String pageId;
+
+    private String imgLocation;
+
+    private String imgType;
+
+    private String url;
+
+    private String link;
+
+    private Integer status;
+
+    private LocalDateTime createDate;
+
+    private Integer orderNo;
+
+
+}

whole-estate/src/main/java/com/example/wholeestate/service/IBuildingService.java

@@ -41,7 +41,7 @@ public interface IBuildingService extends IService<Building> {
      * @param
      * @return
      */
-    ResponseBean appointmentList(Integer pageNum, Integer pageSize,Integer buildingId,String username);
+    ResponseBean appointmentList(Integer pageNum, Integer pageSize,String buildingId,String username,String phone,String status);
 
     /**
      * 添加楼盘
@@ -76,4 +76,17 @@ public interface IBuildingService extends IService<Building> {
      * @return
      */
     ResponseBean buildingApartmentUpdate(String parameter);
+
+    /**
+     * 户型详情
+     * @param id
+     * @return
+     */
+    ResponseBean buildingApartmentSelectId(String id);
+
+    /**
+     * 修改核销备注
+     * @return
+     */
+    ResponseBean appointmentUpdate(String id,String writeoffRemark);
 }

whole-estate/src/main/java/com/example/wholeestate/service/impl/BuildingServiceImpl.java

@@ -13,6 +13,7 @@ import com.example.wholeestate.model.*;
 import com.example.wholeestate.service.IBuildingService;
 import com.fasterxml.jackson.databind.util.ArrayBuilders;
 import com.sun.org.apache.bcel.internal.generic.NEW;
+import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -43,12 +44,16 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 
     @Autowired
     private BuildingImgMapper buildingImgMapper;
+
     @Autowired
     private ApartmentImgMapper apartmentImgMapper;
 
     @Autowired
     private  BuildingApartmentMapper buildingApartmentMapper;
 
+//    @Autowired
+//    private  ApartmentImgMapper apartmentImgMapper;
+
     private IdGen idGen = IdGen.get();
 
     @Override
@@ -122,36 +127,34 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
     @Override
-    public ResponseBean appointmentList(Integer pageNum,Integer pageSize,Integer buildingId,String username) {
+    public ResponseBean appointmentList(Integer pageNum,Integer pageSize,String buildingId,String username,String phone,String status) {
         ResponseBean response= new ResponseBean();
         Page<Appointment> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
-        page.setCurrent(pageNum == null ? 1 : pageNum);
-        IPage<Appointment> building= AppointmentMapper.appendableList(page,buildingId,username);
+        page.setCurrent(pageNum == null ? 0 : pageNum);
+        IPage<Appointment> building= AppointmentMapper.appendableList(page,buildingId,username,phone,status);
         List<Appointment> buildingList=building.getRecords();
         //预约的用户，
-        ArrayList  arrayListUser= new ArrayList<>();
+//        ArrayList  arrayListUser= new ArrayList<>();
 
         //预约的楼盘，
-        ArrayList  arrayListbuilding= new ArrayList<>();
-       for (Appointment bui:buildingList){
-          Building buil= new Building();
-           QueryWrapper<Building> buildingtWrapper = new QueryWrapper<>();
-           buildingtWrapper.lambda().eq(Building::getStatus,0);
-           buildingtWrapper.lambda().eq(Building::getBuildingId,bui.getBuildingId());
-           Building bu= buildingMapper.selectOne(buildingtWrapper);
-           arrayListUser.add(bu);
-
-           QueryWrapper<Customer> customerWrapper = new QueryWrapper<>();
-           customerWrapper.lambda().eq(Customer::getStatus,0);
-           customerWrapper.lambda().eq(Customer::getCustomerId,bui.getCustomerId());
-           Customer cust= customerMapper.selectOne(customerWrapper);
-           arrayListbuilding.add(cust);
-
-           bui.setArrayListUser(arrayListUser);
-           bui.setArrayListbuilding(arrayListbuilding);
-       }
-
+//        ArrayList  arrayListbuilding= new ArrayList<>();
+//       for (Appointment bui:buildingList){
+//          Building buil= new Building();
+//           QueryWrapper<Building> buildingtWrapper = new QueryWrapper<>();
+//           buildingtWrapper.lambda().eq(Building::getStatus,0);
+//           buildingtWrapper.lambda().eq(Building::getBuildingId,bui.getBuildingId());
+//           Building bu= buildingMapper.selectOne(buildingtWrapper);
+//           arrayListUser.add(bu);
+//
+//           QueryWrapper<Customer> customerWrapper = new QueryWrapper<>();
+//           customerWrapper.lambda().eq(Customer::getStatus,0);
+//           customerWrapper.lambda().eq(Customer::getCustomerId,bui.getCustomerId());
+//           Customer cust= customerMapper.selectOne(customerWrapper);
+//           arrayListbuilding.add(cust);
+//           bui.setArrayListUser(arrayListUser);
+//           bui.setArrayListbuilding(arrayListbuilding);
+//       }
         HashMap hashMap= new HashMap<>();
         hashMap.put("list",buildingList);
         hashMap.put("total",building.getTotal());
@@ -320,7 +323,49 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         return responseBean;
     }
 
-    
+    @Override
+    public ResponseBean buildingApartmentSelectId(String id) {
+        ResponseBean responseBean = new ResponseBean();
+        //查询户型详情
+        QueryWrapper<BuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
+        buildingApartmentQueryWrapper.eq("apartment_id", id);
+        //拿到当前户型信息
+         BuildingApartment buildingApartment = buildingApartmentMapper.selectOne(buildingApartmentQueryWrapper);
+         if ( null == buildingApartment ){
+             responseBean.addSuccess("此楼盘没有户型图请上传");
+             return responseBean;
+         }
+         //根据户型ID查楼盘户型对应图片表
+        ArrayList arrayList= new ArrayList<>();
+        QueryWrapper< ApartmentImg> ApartmentImgQueryWrapper = new QueryWrapper<>();
+        ApartmentImgQueryWrapper.eq("apartment_id", buildingApartment.getApartmentId());
+        List<ApartmentImg> buildingImg= apartmentImgMapper.selectList(ApartmentImgQueryWrapper);
+        for (ApartmentImg apartmentImg:buildingImg){
+            QueryWrapper<BuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
+            buildingImgQueryWrapper.eq("img_id",apartmentImg.getImgId());
+             List<BuildingImg> buildingImgList= buildingImgMapper.selectList(buildingImgQueryWrapper);
+             arrayList.add(buildingImgList);
+        }
+        buildingApartment.setBuildingImgList(arrayList);
+        responseBean .addSuccess(buildingApartment);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean appointmentUpdate(String id,String writeoffRemark) {
+        ResponseBean responseBean= new ResponseBean();
+       Appointment appointment= new Appointment();
+        appointment.setAppointmentId(id);
+        appointment.setWriteoffRemark(writeoffRemark);
+        appointment.setStatus(2);
+//        new DateTimeLiteralExpression.DateTime()
+//        appointment.setWriteoffDate(LocalDateTime.now());
+        QueryWrapper<Appointment> AppointmentQueryWrapper = new QueryWrapper<>();
+        AppointmentQueryWrapper.eq("appointment_id", id);
+        AppointmentMapper.update(appointment,AppointmentQueryWrapper);
+        responseBean.addSuccess("成功");
+        return responseBean;
+    }
 
 
 }

whole-estate/src/main/java/com/example/wholeestate/service/impl/CustomerServiceImpl.java

@@ -40,14 +40,15 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     public ResponseBean customerList(String parameter) {
         ResponseBean response= new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
-
+        String phone = object.getString("phone");
+        String name = object.getString("name");
         Integer pageNum = object.getInteger("pageNum");
         Integer pageSize = object.getInteger("pageSize");
 
         Page<Customer> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        IPage<Customer> customer= customerMapper.customerList(page);
+        IPage<Customer> customer= customerMapper.customerList(page,name,phone);
         List<Customer> customerList=customer.getRecords();
 
         HashMap hashMap= new HashMap<>();

whole-estate/src/main/resources/mapper/AppointmentMapper.xml

@@ -3,16 +3,35 @@
 <mapper namespace="com.example.wholeestate.dao.AppointmentMapper">
 
     <select id="appendableList" resultType="com.example.wholeestate.model.Appointment">
-        SELECT * FROM ta_appointment
+        SELECT appointment_id,
+        building_id,
+        customer_id,
+        appointment_date,
+        customer_name,
+        phone,
+        remark,
+        status,
+        create_date,
+        writeoff_date,
+        writeoff_remark
+        FROM ta_appointment
       <where>
         <if test="buildingId != null and buildingId != ''">
-            and  ta_appointment.building_id like concat('%',#{buildingId,jdbcType=INTEGER},'%')
+            and  ta_appointment.building_id like concat('%',#{buildingId,jdbcType=VARCHAR},'%')
         </if>
 
           <if test="username != null and username != ''">
               and  ta_appointment.customer_name like concat('%',#{username,jdbcType=VARCHAR},'%')
           </if>
 
+          <if test="phone != null and phone != ''">
+              and  ta_appointment.phone like concat('%',#{phone,jdbcType=VARCHAR},'%')
+          </if>
+
+          <if test="status != null and status != ''">
+              and  ta_appointment.status like concat('%',#{status,jdbcType=VARCHAR},'%')
+          </if>
+
       </where>
     </select>
 </mapper>

whole-estate/src/main/resources/mapper/CustomerMapper.xml

@@ -3,6 +3,17 @@
 <mapper namespace="com.example.wholeestate.dao.CustomerMapper">
     <select id="customerList" resultType="com.example.wholeestate.model.Customer">
         select * from ta_customer;
+        <where>
+            <where>
+                status > -1
+                <if test="Name != null and Name != ''">
+                    and  (ta_customer.name like concat('%',#{Name,jdbcType=VARCHAR},'%') or ta_customer.customer_name like concat('%',#{Name,jdbcType=VARCHAR},'%'))
+                </if>
+                <if test="phone != null and phone != ''">
+                    and  ta_customer.phone like concat('%',#{phone,jdbcType=VARCHAR},'%')
+                </if>
+            </where>
+        </where>
     </select>
 
 </mapper>

whole-estate/src/main/resources/mapper/PageImgMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.wholeestate.dao.PageImgMapper">
+
+</mapper>