u

.gitignore

@@ -7,8 +7,8 @@
 bin/
 logs/
 target/
-/src/test/
-/test/
+/src/test
+/test
 
 /logs/
 .idea/

up-bmls/up-bmls-admin/src/main/java/com/up/mls/controller/assess/LookOfficeController.java

@@ -19,7 +19,11 @@ import com.up.mls.util.SpringSecurityUtils;
 import com.up.mls.vo.assess.LookOffice;
 import com.up.mls.vo.system.User;
 import com.up.mls.web.page.TableDataInfo;
-
+/**
+ * 写字楼委托
+ * @author joker
+ *
+ */
 @Controller
 @RequestMapping("lookOffice")
 public class LookOfficeController extends AbstractController{

up-bmls/up-bmls-admin/src/main/java/com/up/mls/controller/flow/OfficeFlowController.java

@@ -54,7 +54,7 @@ public class OfficeFlowController extends AbstractController{
 			projectOrder.setProjectId(null);
 		projectOrder.setProjectType(projectType);
 		projectOrder.setSonType(sonType);
-		List<ProjectOrder> list = projectOrderService.selectProjectFlow(projectOrder);
+		List<ProjectOrder> list = projectOrderService.selectOfficeFlow(projectOrder);
 		list.forEach(o ->{
 			o.setDfNum(projectOrderTrackService.selectProjectOrderTrackCount(o.getOrderNo(), "1"));
 			o.setRgNum(projectOrderTrackService.selectProjectOrderTrackCount(o.getOrderNo(), "2"));

up-bmls/up-bmls-admin/src/main/java/com/up/mls/controller/flow/ShopFlowController.java

@@ -1,5 +1,64 @@
 package com.up.mls.controller.flow;
 
-public class ShopFlowController {
+import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.up.mls.controller.AbstractController;
+import com.up.mls.service.deal.ProjectOrderService;
+import com.up.mls.service.deal.ProjectOrderTrackService;
+import com.up.mls.vo.deal.ProjectOrder;
+import com.up.mls.web.page.TableDataInfo;
+
+@Controller
+@RequestMapping("shop/flow")
+public class ShopFlowController extends AbstractController{
+
+	@Autowired
+	private ProjectOrderService projectOrderService;
+	
+	private ProjectOrderTrackService projectOrderTrackService;
+	
+	/**
+	 * 写字楼-出租流程列表
+	 * @return
+	 */
+	@RequestMapping("list/{projectType}/{sonType}")
+	public String officeList(@PathVariable("projectType") String projectType,@PathVariable("sonType") String sonType,
+			ModelMap mmap,HttpServletRequest request) {
+		String projectIdStr = request.getParameter("projectId");
+		Long projectId = 0L;
+		if(projectIdStr != null)
+			projectId = Long.parseLong(projectIdStr);
+		mmap.put("projectId", projectId);
+		mmap.put("sonType", sonType);
+		return "deal/officeFlowList";
+	}
+	
+	@PostMapping("/data/{projectType}/{sonType}")
+	@ResponseBody
+	public TableDataInfo list(@PathVariable("projectType") Integer projectType,@PathVariable("sonType") Integer sonType,ProjectOrder projectOrder) {
+		startPage();
+		if(projectOrder.getProjectId() != null && projectOrder.getProjectId() == 0l)
+			projectOrder.setProjectId(null);
+		projectOrder.setProjectType(projectType);
+		projectOrder.setSonType(sonType);
+		List<ProjectOrder> list = projectOrderService.selectOfficeFlow(projectOrder);
+		list.forEach(o ->{
+			o.setDfNum(projectOrderTrackService.selectProjectOrderTrackCount(o.getOrderNo(), "1"));
+			o.setRgNum(projectOrderTrackService.selectProjectOrderTrackCount(o.getOrderNo(), "2"));
+			o.setQyNum(projectOrderTrackService.selectProjectOrderTrackCount(o.getOrderNo(), "3"));
+			o.setZzNum(projectOrderTrackService.selectProjectOrderTrackCount(o.getOrderNo(), "4"));
+		});
+		return getDataTable(list);
+	}
 }

up-bmls/up-bmls-admin/src/main/java/com/up/mls/mapper/deal/ProjectOrderMapper.java

@@ -28,31 +28,21 @@ public interface ProjectOrderMapper {
 	ProjectOrder selectByPrimaryKey(String orderNo);
 	
 	/**
-	 * 
+	 * 商铺流程查询
 	 * @param projectOrder
 	 * @return
 	 */
-	int update(ProjectOrder projectOrder);
-
-	
+	List<ProjectOrder> selectShopFlow(ProjectOrder projectOrder);
 	
-	
-	
-	
-	/**
-	 * 
-	 * @param id
-	 * @return
-	 */
-	int deleteByPrimaryKey(String id);
-
 	/**
 	 * 
 	 * @param projectOrder
 	 * @return
 	 */
-	int insert(ProjectOrder projectOrder);
+	int update(ProjectOrder projectOrder);
+
 	
 	
+
     
 }

up-bmls/up-bmls-admin/src/main/java/com/up/mls/service/deal/ProjectOrderService.java

@@ -37,15 +37,6 @@ public interface ProjectOrderService {
 	
 	
 	/**
-	 * 新增品牌区域关系
-	 * 
-	 * @param company
-	 * @return
-	 */
-	int insert(ProjectOrder projectOrder);
-	
-	
-	/**
 	 * 查询项目交易订单list
 	 * 根据交易低订单项目的类别（销售交易、招商交易），查询各自对应的历史
 	 * 条件查询
@@ -62,6 +53,12 @@ public interface ProjectOrderService {
 	 * @param projectOrder
 	 * @return
 	 */
-	List<ProjectOrder> selectProjectFlow(ProjectOrder projectOrder);
+	List<ProjectOrder> selectOfficeFlow(ProjectOrder projectOrder);
+	/**
+	 * 商铺流程
+	 * @param projectOrder
+	 * @return
+	 */
+	List<ProjectOrder> selectShopFlow(ProjectOrder projectOrder);
 
 }

up-bmls/up-bmls-admin/src/main/java/com/up/mls/service/deal/impl/ProjectOrderServiceImpl.java

@@ -52,11 +52,6 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
 	
 	
 	
-	@Override
-	public int insert(ProjectOrder projectOrder) {
-		// TODO Auto-generated method stub
-		return projectOrderMapper.insert(projectOrder);
-	}
 
 	
 	@Override
@@ -72,11 +67,16 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
 	}
 
 	@Override
-	public List<ProjectOrder> selectProjectFlow(ProjectOrder projectOrder) {
+	public List<ProjectOrder> selectOfficeFlow(ProjectOrder projectOrder) {
 		// TODO Auto-generated method stub
 		return officeOrderMapper.selectOfficeFlow(projectOrder);
 	}
 	
-	
+	@Override
+	public List<ProjectOrder> selectShopFlow(ProjectOrder projectOrder) {
+		// TODO Auto-generated method stub
+		return projectOrderMapper.selectShopFlow(projectOrder);
+	}
+
 	
 }

up-bmls/up-bmls-admin/src/main/java/com/up/mls/service/office/impl/OfficeServiceImpl.java

@@ -74,7 +74,7 @@ public class OfficeServiceImpl implements OfficeService{
 		  String sssId = it.next();
 		  OfficeDic odic = new OfficeDic();
 		  odic.setObjectId(office.getId());
-		  odic.setDKey(sssId);
+		  odic.setDValue(sssId);
 		  odic.setType("2");
 		  odic.setDicType("520");
 		  officeDicMapper.insertOfficeDic(odic);
@@ -86,7 +86,7 @@ public class OfficeServiceImpl implements OfficeService{
 		  String tagId = tagIt.next();
 		  OfficeDic odic = new OfficeDic();
 		  odic.setObjectId(office.getId());
-		  odic.setDKey(tagId);
+		  odic.setDValue(tagId);
 		  odic.setType("2");
 		  odic.setDicType("410");
 		  officeDicMapper.insertOfficeDic(odic);
@@ -102,7 +102,7 @@ public class OfficeServiceImpl implements OfficeService{
 		Set<OfficeDic> odic = officeDicMapper.selectDicByOffice(id.toString(), "2", "520");
 		Set<String> supportSet = new HashSet<String>();
 		odic.forEach(s -> {
-			String supportId = s.getDKey();
+			String supportId = s.getDValue();
 			supportSet.add(supportId);
 		});
 		office.setShopSupportingsId(supportSet);
@@ -110,7 +110,7 @@ public class OfficeServiceImpl implements OfficeService{
 		Set<OfficeDic> tagOdic = officeDicMapper.selectDicByOffice(id.toString(), "2", "410");
 		Set<String> tagSet = new HashSet<String>();
 		tagOdic.forEach(s -> {
-			String tagId = s.getDKey();
+			String tagId = s.getDValue();
 			tagSet.add(tagId);
 		});
 		office.setShopTagId(tagSet);
@@ -131,7 +131,7 @@ public class OfficeServiceImpl implements OfficeService{
 			  String sssId = it.next();
 			  OfficeDic odic = new OfficeDic();
 			  odic.setObjectId(office.getId());
-			  odic.setDKey(sssId);
+			  odic.setDValue(sssId);
 			  odic.setType("2");
 			  odic.setDicType("520");
 			  officeDicMapper.insertOfficeDic(odic);
@@ -146,7 +146,7 @@ public class OfficeServiceImpl implements OfficeService{
 			  String tagId = tagIt.next();
 			  OfficeDic odic = new OfficeDic();
 			  odic.setObjectId(office.getId());
-			  odic.setDKey(tagId);
+			  odic.setDValue(tagId);
 			  odic.setType("2");
 			  odic.setDicType("420");
 			  officeDicMapper.insertOfficeDic(odic);
@@ -162,7 +162,7 @@ public class OfficeServiceImpl implements OfficeService{
 		Set<OfficeDic> odic = officeDicMapper.selectDicByOffice(id.toString(), "2", "520");
 		Set<String> supportSet = new HashSet<String>();
 		odic.forEach(s -> {
-			String supportId = s.getDKey();
+			String supportId = s.getDValue();
 			supportSet.add(supportId);
 		});
 		office.setShopSupportingsId(supportSet);
@@ -170,7 +170,7 @@ public class OfficeServiceImpl implements OfficeService{
 		Set<OfficeDic> tagOdic = officeDicMapper.selectDicByOffice(id.toString(), "2", "410");
 		Set<String> tagSet = new HashSet<String>();
 		tagOdic.forEach(s -> {
-			String tagId = s.getDKey();
+			String tagId = s.getDValue();
 			tagSet.add(tagId);
 		});
 		office.setShopTagId(tagSet);

up-bmls/up-bmls-admin/src/main/java/com/up/mls/service/shop/impl/ShopServiceImpl.java

@@ -105,12 +105,12 @@ public class ShopServiceImpl implements ShopService{
 //		shop.setCreateType("7");		//后台录入
 //		shop.setShopFlow("2");
 		HttpSession session = ServletUtils.getSession();
-		shop.setProvinceId(session.getAttribute("currUserProvinceId").toString());
+//		shop.setProvinceId(session.getAttribute("currUserProvinceId").toString());
 //		shop.setCityId(session.getAttribute("currUserCityId").toString());
 		shop.setOnlineStatus("0");
 		shop.setShopNumber(findNextShopNumber());
 		shop.setCreateTime(new Date());
-		shop.setAgentId(SpringSecurityUtils.getUserId());
+//		shop.setAgentId(SpringSecurityUtils.getUserId());
 		//组装自定义名称 TODO
 		StringBuffer name = new StringBuffer();
 		Long areaId = shop.getAreaId();
@@ -144,7 +144,7 @@ public class ShopServiceImpl implements ShopService{
 			  String sssId = it.next();
 			  OfficeDic odic = new OfficeDic();
 			  odic.setObjectId(shop.getId());
-			  odic.setDKey(sssId);
+			  odic.setDValue(sssId);
 			  odic.setType("1");
 			  odic.setDicType("135");
 			  officeDicMapper.insertOfficeDic(odic);
@@ -156,22 +156,24 @@ public class ShopServiceImpl implements ShopService{
 		  String tagId = tagIt.next();
 		  OfficeDic odic = new OfficeDic();
 		  odic.setObjectId(shop.getId());
-		  odic.setDKey(tagId);
+		  odic.setDValue(tagId);
 		  odic.setType("1");
 		  odic.setDicType("136");
 		  officeDicMapper.insertOfficeDic(odic);
 		}
 		//已有证件
 		Set<String> paperSet = shop.getShopPaperId();
-		Iterator<String> paperIt = paperSet.iterator();  
-		while (paperIt.hasNext()) {  
-		  String paperId = paperIt.next();
-		  OfficeDic odic = new OfficeDic();
-		  odic.setObjectId(shop.getId());
-		  odic.setDKey(paperId);
-		  odic.setType("1");
-		  odic.setDicType("137");
-		  officeDicMapper.insertOfficeDic(odic);
+		if(paperSet !=null && paperSet.size()>0) {
+			Iterator<String> paperIt = paperSet.iterator();  
+			while (paperIt.hasNext()) {  
+			  String paperId = paperIt.next();
+			  OfficeDic odic = new OfficeDic();
+			  odic.setObjectId(shop.getId());
+			  odic.setDValue(paperId);
+			  odic.setType("1");
+			  odic.setDicType("137");
+			  officeDicMapper.insertOfficeDic(odic);
+			}
 		}
 //		//本地优势
 //		Set<String> advantSet = shop.getShopAdvantageId();
@@ -213,7 +215,7 @@ public class ShopServiceImpl implements ShopService{
 		Set<OfficeDic> odic = officeDicMapper.selectDicByOffice(id.toString(), "1", "135");
 		Set<String> supportSet = new HashSet<String>();
 		odic.forEach(s -> {
-			String supportId = s.getDKey();
+			String supportId = s.getDValue();
 			supportSet.add(supportId);
 		});
 		shop.setShopSupportingsId(supportSet);
@@ -221,7 +223,7 @@ public class ShopServiceImpl implements ShopService{
 		Set<OfficeDic> tagOdic = officeDicMapper.selectDicByOffice(id.toString(), "1", "136");
 		Set<String> tagSet = new HashSet<String>();
 		tagOdic.forEach(s -> {
-			String tagId = s.getDKey();
+			String tagId = s.getDValue();
 			tagSet.add(tagId);
 		});
 		shop.setShopTagId(tagSet);
@@ -229,7 +231,7 @@ public class ShopServiceImpl implements ShopService{
 		Set<OfficeDic> paperOdic = officeDicMapper.selectDicByOffice(id.toString(), "1", "136");
 		Set<String> paperSet = new HashSet<String>();
 		paperOdic.forEach(s -> {
-			String paperId = s.getDKey();
+			String paperId = s.getDValue();
 			paperSet.add(paperId);
 		});
 		shop.setShopPaperId(paperSet);
@@ -273,7 +275,7 @@ public class ShopServiceImpl implements ShopService{
 			  String sssId = it.next();
 			  OfficeDic odic = new OfficeDic();
 			  odic.setObjectId(shop.getId());
-			  odic.setDKey(sssId);
+			  odic.setDValue(sssId);
 			  odic.setType("1");
 			  odic.setDicType("135");
 			  officeDicMapper.insertOfficeDic(odic);
@@ -288,7 +290,7 @@ public class ShopServiceImpl implements ShopService{
 			  String tagId = tagIt.next();
 			  OfficeDic odic = new OfficeDic();
 			  odic.setObjectId(shop.getId());
-			  odic.setDKey(tagId);
+			  odic.setDValue(tagId);
 			  odic.setType("1");
 			  odic.setDicType("136");
 			  officeDicMapper.insertOfficeDic(odic);
@@ -303,7 +305,7 @@ public class ShopServiceImpl implements ShopService{
 			  String paperId = paperIt.next();
 			  OfficeDic odic = new OfficeDic();
 			  odic.setObjectId(shop.getId());
-			  odic.setDKey(paperId);
+			  odic.setDValue(paperId);
 			  odic.setType("1");
 			  odic.setDicType("137");
 			  officeDicMapper.insertOfficeDic(odic);
@@ -361,7 +363,7 @@ public class ShopServiceImpl implements ShopService{
 		Set<OfficeDic> odic = officeDicMapper.selectDicByOffice(id.toString(), "1", "135");
 		Set<String> supportSet = new HashSet<String>();
 		odic.forEach(s -> {
-			String supportId = s.getDKey();
+			String supportId = s.getDValue();
 			supportSet.add(supportId);
 		});
 		shop.setShopSupportingsId(supportSet);
@@ -369,7 +371,7 @@ public class ShopServiceImpl implements ShopService{
 		Set<OfficeDic> tagOdic = officeDicMapper.selectDicByOffice(id.toString(), "1", "136");
 		Set<String> tagSet = new HashSet<String>();
 		tagOdic.forEach(s -> {
-			String tagId = s.getDKey();
+			String tagId = s.getDValue();
 			tagSet.add(tagId);
 		});
 		shop.setShopTagId(tagSet);
@@ -377,7 +379,7 @@ public class ShopServiceImpl implements ShopService{
 		Set<OfficeDic> paperOdic = officeDicMapper.selectDicByOffice(id.toString(), "1", "136");
 		Set<String> paperSet = new HashSet<String>();
 		paperOdic.forEach(s -> {
-			String paperId = s.getDKey();
+			String paperId = s.getDValue();
 			paperSet.add(paperId);
 		});
 		shop.setShopPaperId(paperSet);

up-bmls/up-bmls-admin/src/main/java/com/up/mls/vo/assess/LookOffice.java

@@ -29,7 +29,6 @@ public class LookOffice extends BaseDomain{
 	
 	private String regionsId;
 	
-	private String types;
 	
 	private String unitMin;
 	
@@ -44,8 +43,14 @@ public class LookOffice extends BaseDomain{
 	private String telephone;
 	
 	private String remark;
-	
+	/**
+	 * 委托类型：1-找铺 2-找客
+	 */
 	private String helpType;
+	/**
+	 * 委托类型: 1-写字楼求购 2-写字楼求租 3-写字楼新盘求购 4-写字楼新盘求租 5-写字楼出租 6-写字楼出售
+	 */
+	private String types;
 	
 	/**
 	 * 分配状态 0:未分配 1:已分配

up-bmls/up-bmls-admin/src/main/java/com/up/mls/vo/office/Office.java

@@ -13,6 +13,7 @@ import com.up.mls.vo.BaseDomain;
 import com.up.mls.vo.shop.BusinessArea;
 import com.up.mls.vo.system.Areas;
 import com.up.mls.vo.system.Road;
+import com.up.mls.vo.user.AppUser;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -83,6 +84,7 @@ public class Office extends BaseDomain {
 	 * 日租金（2位小数,元/天/㎡）（出租）
 	 */
 	private BigDecimal dailyRent;
+	
 	/**
 	 * 建筑面积
 	 */
@@ -104,6 +106,10 @@ public class Office extends BaseDomain {
 	 */
 	private int station2;
 	/**
+	 * 层高
+	 */
+	private BigDecimal floorHeight;
+	/**
 	 * 开发商
 	 */
 	private String developer;
@@ -174,6 +180,7 @@ public class Office extends BaseDomain {
 	 * 经济人
 	 */
 	private Long agentId;
+	private AppUser agent;
 	/**
 	 * 分配经济人时间
 	 */
@@ -200,7 +207,7 @@ public class Office extends BaseDomain {
 	/**
 	 * 支付方式
 	 */
-//	private String payMethod;
+	private String payMethod;
 	
 	/**
 	 * 商铺租售状态（0：租赁中，1：已成交，2：已租出一部分，3：停转/租-违建拆除，4：停转/租-房东收回，5：停转/租-被查封，6：停转/租-继续经营）

up-bmls/up-bmls-admin/src/main/java/com/up/mls/vo/office/OfficeDic.java

@@ -11,7 +11,7 @@ public class OfficeDic {
 	
 	private Long objectId;
 	
-	private String dKey;
+	private String dValue;
 	
 	private String type;
 	

up-bmls/up-bmls-admin/src/main/java/com/up/mls/vo/shop/Shop.java

@@ -323,8 +323,8 @@ public class Shop extends BaseDomain {
 	/**
 	 * 开发商(销售类)
 	 */
-	private String developer;
-	private Date   proTime;
+	private String openWorker;
+	private Date   openTime;
 	
 	private Long sonShopBisTypeId;
 	//城市
@@ -456,11 +456,16 @@ public class Shop extends BaseDomain {
 	//推荐首页
 	private String ifIndex;
 	//物业费
-	private String properFee;
+	private Double properFee;
 	//电费
 	private Double electricityFee;
 	//水费
-	private Double water_fee;
+	private Double waterFee;
+	
+	//商铺简介
+	private String shopProfile;
+	//周边配套
+	private String supportProfile;
 	
 	/**
 	 * 合作佣金

up-bmls/up-bmls-admin/src/main/resources/configs/mybatis/xml/deal/OfficeOrderMapper.xml

@@ -152,7 +152,7 @@
 	<select id="selectOfficeFlow" parameterType="ProjectOrder" resultMap="BaseResultMap">
 		<include refid="Base_Column_List"/>
 		<where>
-			project_type = #{projectType} and son_type = #{sonType} and order_status <![CDATA[ <> ]]> 7
+			project_type = #{projectType} and o1.rent_type = #{sonType} and order_status <![CDATA[ <> ]]> 7
 		</where>
 	</select>
 	

up-bmls/up-bmls-admin/src/main/resources/configs/mybatis/xml/deal/ProjectOrderMapper.xml

@@ -101,15 +101,6 @@
 			<if test="projectName != null and projectName != ''">
 				AND po1.project_name like concat('%', #{projectName}, '%')
 			</if>
-			<!-- <if test="member != null and member.mobile !=null and member.mobile != ''">
-				AND m1.mobile = #{member.mobile}
-			</if> -->
-			<!-- <if test="project != null and project.cityId != null and project.cityId != ''">
-				AND p1.city_id = #{project.cityId}
-			</if> -->
-			<!-- <if test="memberCustomer != null and memberCustomer.mobile !=null and memberCustomer.mobile !=''">
-				AND mc1.mobile = #{memberCustomer.mobile}
-			</if> -->
 			<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
 				AND date_format(po1.create_time,'%y%m%d') &gt;=
 				date_format(#{params.beginTime},'%y%m%d')
@@ -118,40 +109,17 @@
 				AND date_format(po1.create_time,'%y%m%d') &lt;=
 				date_format(#{params.endTime},'%y%m%d')
 			</if>
-				<!-- AND EXISTS (
-					SELECT DISTINCT sc.city_id FROM 
-					sys_user su
-					INNER JOIN sys_company sc ON su.company_id=sc.id OR su.company_id=sc.parent_id
-					INNER JOIN project p1 ON p1.city_id=sc.city_id 
-					WHERE su.user_id=${userId} AND p1.id=po1.project_id
-					) -->
 		</where>
 		ORDER BY po1.create_time DESC
 	</select>
 	
-	<insert id="update" parameterType="com.up.mls.vo.deal.ProjectOrder">
-		update project_order 
-		<set>
-			<if test="orderStatus != null">
-				order_status = #{orderStatus},
-				project_amount = #{projectAmount},
-				referrer_amount = #{referrerAmount},
-				team_amount = #{teamAmount}
-			</if>
-		</set>
-		where order_no = #{orderNo}
-	</insert>
-	
-	
-	
-	
-	<insert id="insert" parameterType="com.up.mls.vo.deal.ProjectOrder">
-		
-	</insert>
-	
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-		delete from brand_expand_area
-		where id = #{id}
-	</delete>
+	<!-- 商铺流程查看 -->
+	<select id="selectShopFlow" parameterType="ProjectOrder" resultMap="BaseResultMap">
+		<include refid="Base_Column_List"/>
+		<where>
+			project_type = #{projectType} and s1.rent_type = #{sonType} and order_status <![CDATA[ <> ]]> 7
+		</where>
+	</select>
 	
+
 </mapper>

up-bmls/up-bmls-admin/src/main/resources/configs/mybatis/xml/office/OfficeDicMapper.xml

@@ -5,18 +5,18 @@
 	<resultMap id="BaseResultMap" type="com.up.mls.vo.office.OfficeDic">
 		<result column="id"  property="id" />
 		<result column="object_id"  property="objectId" />
-		<result column="d_key"  property="dKey" />
+		<result column="d_value"  property="dValue" />
 		<result column="type"  property="type" />
 		<result column="dic_type"  property="dicType" />
 	</resultMap>
 	
 	<sql id="Base_Column_List">
-		 id, object_id, d_key, type, dic_type
+		 id, object_id, d_value, type, dic_type
 	</sql>
 	
 	<insert id="insertOfficeDic" parameterType="OfficeDic">
-		insert into office_dic ( id, object_id, d_key, type, dic_type )
-		values ( #{id}, #{objectId}, #{dKey}, #{type}, #{dicType})
+		insert into office_dic ( id, object_id, d_value, type, dic_type )
+		values ( #{id}, #{objectId}, #{dValue}, #{type}, #{dicType})
 	</insert>
 	
 	<select id="selectDicByOffice" parameterType="String" resultMap="BaseResultMap">

up-bmls/up-bmls-admin/src/main/resources/configs/mybatis/xml/office/OfficeMapper.xml

@@ -11,6 +11,7 @@
 		
 		<result column="unit_price" property="unitPrice" />
 		<result column="daily_rent"  property="dailyRent" />
+		<result column="pay_method"  property="payMethod" />
 		<result column="build_area"  property="buildArea" />
 		<result column="floor_total"  property="floorTotal" />
 		<result column="floor_current"  property="floorCurrent" />
@@ -49,8 +50,8 @@
 			resultMap="businessAreaResult" />
 		<association property="road" column="road_area_id" javaType="Road"
 			resultMap="roadResult" />
-		<association property="agentId" column="agent_id" javaType="User"
-			resultMap="userResult" />
+		<association property="agent" column="agent_id" javaType="AppUser"
+			resultMap="appUserResult" />
 	</resultMap>
 	
 	<resultMap id="areaResult" type="Areas">
@@ -69,15 +70,15 @@
 		<result property="name" column="r_name"   />
 	</resultMap>	
 	
-	<resultMap id="userResult" type="User">
-		<id     property="userId"   column="user_id"     />
-		<result property="userName" column="user_name"   />
+	<resultMap id="appUserResult" type="AppUser">
+		<id     property="id"   column="id"     />
+		<result property="account" column="account"   />
 	</resultMap>
 	
 	<sql id="Base_Column_List">
 		DISTINCT s1.id,
 		s1.city_id,s1.area_id,s1.business_area_id,s1.road_area_id,s1.real_address,s1.open_time,
-		s1.name,s1.rent_type,s1.unit_price,s1.daily_rent,s1.build_area,s1.floor_total,s1.floor_current,s1.station1,s1.station2,s1.developer,
+		s1.name,s1.rent_type,s1.unit_price,s1.daily_rent,s1.pay_method,s1.build_area,s1.floor_total,s1.floor_current,s1.station1,s1.station2,s1.developer,
 		s1.fee_property,s1.decorate,s1.register,s1.separate,s1.profile,s1.img_paper,
 		s1.imgs,s1.plane_imgs,s1.entrust_paper,s1.commission,
 		s1.expired,s1.linkman,s1.phone,s1.fee_service,s1.office_number,
@@ -104,11 +105,12 @@
 	<!-- 写字楼列表 -->
 	<select id="selectOfficeList" parameterType="Office" resultMap="BaseResultMap" >
 		select
-		<include refid="Base_Column_List"/>,a1.area_name,a1.sort,ba1.name as ba_name,r1.name as r_name
+		<include refid="Base_Column_List"/>,a1.area_name,a1.sort,ba1.name as ba_name,r1.name as r_name,ua1.account
 		from office s1
 		left join areas a1 on a1.id = s1.area_id
 		left join business_area ba1 on ba1.id = s1.business_area_id
 		left join road r1 on r1.id = s1.road_area_id
+		left join user_app ua1 on ua1.id = s1.agent_id
 		where 1 = 1
 		<if test="linkman != null and linkman != ''">
 			AND linkman like concat('%', ${linkman}, '%')
@@ -169,7 +171,7 @@
 	<insert id="insertOffice" parameterType="Office" useGeneratedKeys="true" keyProperty="id">
  		insert into office (
  			area_id,business_area_id,road_area_id,real_address,rent_type,type,open_time,
-			name,unit_price,ave_price,daily_rent,build_area,floor_total,floor_current,station1,station2,developer,
+			name,unit_price,ave_price,pay_method,daily_rent,build_area,floor_total,floor_current,station1,station2,developer,
 			fee_property,decorate,register,separate,profile,img_paper,
 			entrust_paper,commission,expired,
 			linkman,phone,fee_service,office_number,
@@ -178,7 +180,7 @@
 			create_time,update_time
 			)values(
 			#{areaId},#{businessAreaId},#{roadId},#{realAddress},#{rentType},#{type},#{openTime},
-			#{name},#{unitPrice},#{avePrice},#{dailyRent},#{buildArea},#{floorTotal},#{floorCurrent},#{station1},#{station2},#{developer},
+			#{name},#{unitPrice},#{avePrice},#{payMethod},#{dailyRent},#{buildArea},#{floorTotal},#{floorCurrent},#{station1},#{station2},#{developer},
 			#{feeProperty},#{decorate},#{register},#{separate},#{profile},#{imgPaper},
 			#{entrustPaper},#{commission},#{expired},
 			#{linkman},#{phone},#{feeService},#{officeNumber},
@@ -195,6 +197,7 @@
 			<if test="phone != null and phone != ''">phone = #{phone},</if>
 			<if test="unitPrice != null">unit_price = #{unitPrice},</if>
 			<if test="rentType != null ">rent_type = #{rentType},</if>
+			<if test="payMethod != null ">pay_method = #{payMethod},</if>
 			<if test="floorTotal != null ">floor_total = #{floorTotal},</if>
 			<if test="floorCurrent != null ">floor_current = #{floorCurrent},</if>
 			<if test="station1 != null ">station1 = #{station1},</if>

up-bmls/up-bmls-admin/src/main/resources/configs/mybatis/xml/shop/ShopMapper.xml

@@ -73,6 +73,7 @@
 		<result column="other_property"  property="otherProperty" />
 		<result column="brand_status"  property="brandStatus" />
 		
+		<result column="openWorker"  property="open_worker" />
 		<result column="commission"  property="commission" />
 		<result column="expired"  property="expired" />
 		<result column="fee_service"  property="feeService" />
@@ -140,7 +141,7 @@
 		s1.parent_manage_type_id, s1.son_manage_type_id, s1.license,s1.manage_status,s1.shop_name,
 		s1.city_id,s1.area_id,s1.business_area_id,s1.road_area_id,s1.real_address,s1.positionx,s1.positiony,s1.loop_line,
 		s1.imgs,s1.cover,s1.video,entrust_paper,
-		s1.commission,s1.expired,fee_service,
+		s1.commission,s1.expired,fee_service,open_worker,
 		s1.contact_way,s1.signage_plane,s1.signage_facade,s1.floor_height,s1.face_width,s1.depth,s1.orientation,s1.property,s1.other_property,s1.brand_status,
 		s1.submit_status,s1.invalid_count,s1.claim_time,s1.name,verify_time,
 		s1.online_status,
@@ -314,7 +315,7 @@
 			shop_number,
 			shop_flow,online_status,create_type,province_id,city_id,
 			entrust_paper,agent_id,commission,expired,fee_service,
-			pro_name,developer,pro_time,
+			pro_name,open_worker,open_time,
 			create_time,update_time
 			)values(
 			#{shopAttr},
@@ -333,7 +334,7 @@
 			#{shopNumber},
 			#{shopFlow},#{onlineStatus},#{createType},#{provinceId},#{cityId},
 			#{entrustPaper},#{agentId},#{commission},#{expired},#{feeService},
-			#{proName},#{developer},#{proTime},
+			#{proName},#{openWorker},#{openTime},
 			#{createTime},#{updateTime}
 			)
 	</insert>
@@ -417,8 +418,8 @@
 			brand_status = #{brandStatus},
 			
 			pro_name = #{proName},
-			developer = #{developer},
-			pro_time = #{proTime},
+			open_worker = #{openWorker},
+			open_time = #{openTime},
 			commission = #{commission},
 			expired = #{expired},
 			fee_service = #{feeService},

up-bmls/up-bmls-admin/src/main/resources/templates/office/detail.html

@@ -78,7 +78,7 @@
 							<label>元/天/㎡</label>
 						</div>
 					</div>
-					<div class="form-group">
+					<div class="form-group" th:if="${office.rentType} eq '0' or ${office.rentType} eq '2'">
 						<label class="col-sm-3 control-label" style="padding-bottom: 8px;"><span class="required" style='color: red;'>* </span>工位数：</label>
 						<div class="col-sm-4">
 							<input class="form-control" type="text" name="station1" id="station1" th:field="*{station1}"/>
@@ -171,7 +171,7 @@
 					<div class="col-sm-8">
 						<div class="ulBox" th:with="d=${@dict.getParentKey('530')}">
 							<li th:each="dict : ${d}" class="checkbox-inline ">
-								<input th:id="${dict['dKey']}" type="radio" name="decorate" th:value="${dict['dValue']}">
+								<input th:id="${dict['dKey']}" type="radio" name="decorate" th:value="${dict['dValue']}" th:field="*{decorate}">
 								<label th:for="${dict['dKey']}" th:text="${dict['dName']}"></label>
 							</li>
 						</div>

up-bmls/up-bmls-admin/src/main/resources/templates/office/edit.html

@@ -99,7 +99,7 @@
 							<label>元/㎡</label>
 						</div>
 					</div>
-					<div class="form-group">
+					<div class="form-group" th:if="${office.rentType} eq '0' or ${office.rentType} eq '2'">
 					<label class="col-sm-3 control-label" style="padding-bottom: 8px;"><span class="required" style='color: red;'>* </span>工位数：</label>
 					<div class="col-sm-4">
 						<input class="form-control" type="text" name="station1" id="station1" th:field="*{station1}"/>

up-bmls/up-bmls-admin/src/main/resources/templates/office/list.html

@@ -215,7 +215,7 @@
 		            title: '合作佣金',
 		        },
 		        {
-		        		field: 'agent.userName',
+		        		field: 'agent.account',
 		        		title: '录入人'
 		        },
 		        {
@@ -223,7 +223,7 @@
 		        		title: '审核人'
 	       		 },
 		        {
-		            field: 'verifyTime',
+		            field: 'createTime',
 		            title: '上架时间'
 		        },
 		        {
@@ -289,9 +289,9 @@
 	<script>
 		var rentType = [[${rentType}]];
 		$(function(){
-			if(rentType == 0 || rentType == 2){
+			if(rentType == 1 || rentType == 3){
 				$('#bootstrap-table').bootstrapTable('hideColumn', 'unitPrice');
-			}else if(rentType == 1 || rentType == 3){
+			}else if(rentType == 2 || rentType == 4){
 				$('#bootstrap-table').bootstrapTable('hideColumn', 'dailyRent');
 			}
 			

up-bmls/up-bmls-admin/src/main/resources/templates/shop/add.html

@@ -78,7 +78,7 @@
 			
 			<div class="x_content" style='border: 1px dashed #ccc; margin-bottom: 6px;' id="money">
 				<h2 style="text-align: center">-[2-费用信息]-</h2>
-				<div th:if="${rentType} eq '0' or ${rentType} eq '2'"><div class="form-group">
+				<div th:if="${rentType} eq '1' or ${rentType} eq '3'"><div class="form-group">
 					<label class="col-sm-3 control-label" style="padding-bottom: 8px;"><span class="required" style='color: red;'>* </span>月租金：</label>
 					<label class="col-md-1" style="width: 80px; margin-top: 8px;">
 						<input type="checkbox" name="monthlyRentCheck" id="monthlyRentCheck" value="-2" />
@@ -170,7 +170,7 @@
 					</div>
 				</div>
 				</div>
-				<div th:if="${rentType} eq '1' or ${rentType} eq '3'"><!-- ‘出售’字段 -->
+				<div th:if="${rentType} eq '2' or ${rentType} eq '4'"><!-- ‘出售’字段 -->
 					<div class="form-group">
 						<label class="col-sm-3 control-label" style="padding-bottom: 8px;">单价：</label>
 						<div class="col-sm-8">

up-bmls/up-bmls-admin/src/main/resources/templates/shop/detail.html

@@ -78,7 +78,7 @@
 			
 			<div class="x_content" style='border: 1px dashed #ccc; margin-bottom: 6px;' id="money">
 				<h2 style="text-align: center">-[2-费用信息]-</h2>
-				<div th:if="${shop.rentType} eq '0' or ${shop.rentType} eq '2'"><div class="form-group">
+				<div th:if="${shop.rentType} eq '1' or ${shop.rentType} eq '3'"><div class="form-group">
 					<label class="col-sm-3 control-label" style="padding-bottom: 8px;">月租金：</label>
 					<label class="col-md-1" style="width: 80px; margin-top: 8px;">
 						<input type="checkbox" name="monthlyRentCheck" id="monthlyRentCheck" value="-2" />
@@ -170,7 +170,7 @@
 					</div>
 				</div>
 			</div>
-			<div th:if="${shop.rentType} eq '1' or ${shop.rentType} eq '3'"><!-- ‘出售’字段 -->
+			<div th:if="${shop.rentType} eq '2' or ${shop.rentType} eq '4'"><!-- ‘出售’字段 -->
 				<div class="form-group">
 					<label class="col-sm-3 control-label" style="padding-bottom: 8px;">单价：</label>
 					<div class="col-sm-8">
@@ -689,13 +689,13 @@
 					<div class="form-group">
 						<label class="col-sm-3 control-label" style="padding-bottom: 8px;"><span class="required" style='color: red;'>* </span>开发商：</label>
 						<div class="col-sm-8">
-							<input class="form-control" type="text" name="developer" id="developer" th:field="*{developer}"/>
+							<input class="form-control" type="text" name="openWorker" id="openWorker" th:field="*{openWorker}"/>
 						</div>
 					</div>
 					<div class="form-group">
 						<label class="col-sm-3 control-label" style="padding-bottom: 8px;"><span class="required" style='color: red;'>* </span>开盘时间：</label>
 						<div class="col-sm-8">
-							<input class="form-control" type="text" name="proTime" id="proTime" th:field="*{proTime}"/>
+							<input class="form-control" type="text" name="openTime" id="openTime" th:field="*{openTime}"/>
 						</div>
 					</div>
 				</div>

up-bmls/up-bmls-admin/src/test/.gitignore

@@ -0,0 +1 @@
+/java/