Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/ActivityController.java

@@ -74,7 +74,7 @@ public class ActivityController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
             @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id活动编号;activityTitle活动标题;" +
                     "activityCarouselImg轮播图;activityContent活动详情;contentImg活动内容配图;signUpMax活动人数上限;" +
-                    "registrationEndTime报名活动结束时间;sort权重;status状态 0 是已作废 1 是已发布   2 是草稿")
+                    "registrationEndTime报名活动结束时间;sort权重;status状态 0 是已作废 1 是已发布   2 是草稿，radio:1是需要二维码，2是不需要")
     })
     @RequestMapping(value = "/activity/update", method = RequestMethod.PUT)
     public ResponseBean updateActivity(@RequestBody String parameter, HttpSession session) {

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.java

@@ -40,29 +40,15 @@ public class TransactionController extends BaseController {
 	
 	@ApiOperation(value = "根据搜索条件获取二手租赁列表", notes = "根据搜索条件获取二手租赁列表")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "transactionId", value = "帖子编号"),
-			@ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "帖子标题（模糊查询）"),
-			@ApiImplicitParam(paramType = "query", dataType = "String", name = "status", value = "发布状态"),
-			@ApiImplicitParam(paramType = "query", dataType = "String", name = "isReported", value = "是否被举报"),
-			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
-			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:话题编号，transactionTitle：标题" +
+					"userName：发布人，status：状态，pageNum：总数，pageSize当前页"
+					)
 	})
-	@RequestMapping(value = "/transactions",method = RequestMethod.GET)
-	public ResponseBean getList(@RequestParam(value = "transactionId", required = false) Integer transactionId,
-	                            @RequestParam(value = "transactionTitle", required = false) String transactionTitle,
-	                            @RequestParam(value = "status", required = false) String status,
-	                            @RequestParam(value = "isReported", required = false) String isReported,
-	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-	                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
-		ResponseBean responseBean = new ResponseBean();
+	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+	@RequestMapping(value = "/transactions",method = RequestMethod.POST)
+	public ResponseBean getList(@RequestBody String parameter, HttpSession session){
 		UserElement userElement = getUserElement(session);
-		TpTransaction tpTransaction = new TpTransaction();
-		tpTransaction.setId(transactionId);
-		tpTransaction.setTransactionTitle(transactionTitle);
-		tpTransaction.setStatus(status);
-		tpTransaction.setIsReported(isReported);
-		tpTransaction.setCommunityId(userElement.getCommunityId());
-		responseBean = transactionService.getTransactionList(tpTransaction,pageNum,pageSize);
+		ResponseBean responseBean = transactionService.getTransactionList(parameter,userElement.getCommunityId() );
 		return responseBean;
 	}
 	
@@ -93,4 +79,16 @@ public class TransactionController extends BaseController {
 		responseBean = transactionService.updateTransactionById(id,userElement.getId());
 		return responseBean;
 	}
+
+	@ApiOperation(value = "添加二手租赁",nickname ="添加二手租赁")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="transactionTitle:话题标题，" +
+					"type:0 代表 二手（卖二手物品）  1 是代表 求购 （买二手物品） 2 是代表 租赁（租二手物品）3其他话题，contentImg：图片，sort:权重值,status:'0 是已作废 1 是已发布  2 是草稿 ")})
+	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+	@RequestMapping(value="/transactions/add",method = RequestMethod.POST)
+	public ResponseBean transactionsAdd(@RequestBody String paramets, HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  addAnnouncement= transactionService.transactionsAdd(paramets,userElement.getCommunityId(),userElement.getId());
+		return addAnnouncement;
+	}
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java

@@ -2,6 +2,8 @@ package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTransaction;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,6 +18,6 @@ import java.util.List;
  * @since 2018-12-29
  */
 public interface TpTransactionMapper extends BaseMapper<TpTransaction> {
-	
-	List<TpTransaction> selectListByParams(IPage page,@Param("tpTransaction") TpTransaction tpTransaction);
+
+	List<TpTransaction> selectListByParams(Page page, @Param("transactionTitle") String transactionTitle,@Param("userName") String userName, @Param("id")Integer id, @Param("status")Integer status,@Param("communityId") Integer communityId);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TransactionLikeMapper.java

@@ -0,0 +1,18 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TransactionLike;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 二手租赁喜好表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-08
+ */
+@Mapper
+public interface TransactionLikeMapper extends BaseMapper<TransactionLike> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TransactionReportMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TransactionReport;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 二手交易举报表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-08
+ */
+public interface TransactionReportMapper extends BaseMapper<TransactionReport> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpTransaction.java

@@ -93,5 +93,27 @@ public class TpTransaction implements Serializable {
     @TableField(exist = false)
     private String userName;
 
+    /**
+     * 喜欢的总数
+     */
+    @TableField(exist = false)
+   private Integer transactionLikeSum;
+
+    /**
+     * 不喜欢的总数
+     */
+    @TableField(exist = false)
+    private Integer transactionNoLikeSum;
 
+    /**
+     *帖子回复总数
+     */
+    @TableField(exist = false)
+    private Integer replySum;
+
+    /**
+     *帖子举报总数
+     */
+    @TableField(exist = false)
+    private Integer reportSum;
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TransactionLike.java

@@ -0,0 +1,57 @@
+package com.community.huiju.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-04-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_transaction_like")
+public class TransactionLike implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 住户端App用户ID
+     */
+    private Integer taUserId;
+
+    /**
+     * 交易帖子ID
+     */
+    private Integer transactionId;
+
+    /**
+     * 1是喜欢 2是不喜欢
+     */
+    private String likeStatus;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TransactionReport.java

@@ -0,0 +1,46 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 二手交易举报表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_transaction_report")
+public class TransactionReport implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 二手交易id
+     */
+    private Integer transactionId;
+
+    /**
+     * 举报原因id 对应 sys_report_reason 表
+     */
+    private String reportReasonId;
+
+    /**
+     * app用户端的举报者
+     */
+    private Integer reporterId;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/User.java

@@ -90,4 +90,9 @@ public class User implements Serializable {
      */
     private LocalDateTime updateDate;
 
+    /**
+     * 在物业端app人员信息
+     */
+    private Integer taUserId;
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITransactionService.java

@@ -15,7 +15,7 @@ import com.community.huiju.model.TpTransaction;
  */
 public interface ITransactionService extends IService<TpTransaction> {
 	
-	ResponseBean getTransactionList(TpTransaction tpTransaction, Integer pageNum, Integer pageSize);
+	ResponseBean getTransactionList(String parameter,Integer communityId);
 	
 	/**
 	 * 获取交易信息详情
@@ -30,4 +30,13 @@ public interface ITransactionService extends IService<TpTransaction> {
 	 * @return
 	 */
 	ResponseBean updateTransactionById(Integer id,Integer userId);
+
+	/**
+	 * 添加二手话题
+	 * @param paramets
+	 * @param communityId
+	 * @param id
+	 * @return
+	 */
+    ResponseBean transactionsAdd(String paramets, Integer communityId, Integer id);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingTreeServiceImpl.java

@@ -7,18 +7,10 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
-import com.community.huiju.dao.TpBuildingMapper;
-import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
-import com.community.huiju.dao.TpLevelMapper;
-import com.community.huiju.dao.TpPhaseMapper;
-import com.community.huiju.dao.TpUnitMapper;
-import com.community.huiju.model.TaUser;
-import com.community.huiju.model.TpBuilding;
-import com.community.huiju.model.TpBuildingOwnerInfo;
-import com.community.huiju.model.TpLevel;
-import com.community.huiju.model.TpPhase;
-import com.community.huiju.model.TpUnit;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.BuildingTreeServiceI;
+import jdk.nashorn.internal.ir.IfNode;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
@@ -60,6 +52,8 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 	
 	@Autowired
 	private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+	@Autowired
+	private TaUserVerifyMapper taUserVerifyMapper;
 	
 	/**
 	 * 获取整个小区的基础数据
@@ -357,12 +351,13 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
 		}
 		responseBean.addSuccess("成功");
-		return null;
+		return responseBean;
 	}
 
 	@Override
 	public ResponseBean deleteNode(String parameter, Integer communityId) {
 		ResponseBean responseBean= new ResponseBean();
+		//注意刪除当前节点，根据type判断当前节点的位置，删除时先删除当前节点的最小节点。
 		JSONObject  object= JSONObject.parseObject(parameter);
 		//当前节点id
 		Integer id= object.getInteger("id");
@@ -370,13 +365,12 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		String type= object.getString("type");
 		//当前输入的节点内容
 		String nodeNumber= object.getString("nodeNumber");
-		if(type.equals("end")){
+
+		//审核是否通过
+		InfoPass(type,id);
+		if (type.equals("end")) {
 			tpBuildingOwnerInfoMapper.deleteById(id);
 		}
-
-
-
-
 		//删除楼层
 		if(type.equals("roomNo")){
 			TpLevel tpLevel= tpLevelMapper.selectById(id);
@@ -388,7 +382,6 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			Info.eq("level_id", tpLevel.getId());
 			tpBuildingOwnerInfoMapper.delete(Info);
 			tpLevelMapper.deleteById(id);
-			//删除楼层下面所有的房间
 		}
 
 		//删除单元
@@ -400,15 +393,20 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			tpLevel.eq("community_id", tpUnit.getCommunityId());
 			tpLevel.eq("building_id", tpUnit.getBuildingId());
 			tpLevel.eq("unit_id", tpUnit.getId());
-			tpLevel.eq("name", nodeNumber);
 			//删除单元-楼层-下的房间
-			//查询房间号
+			//查询楼层ID
+			Integer tpLevelID=null;
+
+			TpLevel levelevel = tpLevelMapper.selectOne(tpLevel);
 			QueryWrapper<TpBuildingOwnerInfo> Info = new QueryWrapper<>();
 			Info.eq("community_id", tpUnit.getCommunityId());
 			Info.eq("phase_id", tpUnit.getPhaseId());
 			Info.eq("building_id",tpUnit.getBuildingId());
 			Info.eq("unit_id", tpUnit.getId());
-//			Info.eq("level_id", tpLevelToo.getId());
+			if (null!=levelevel) {
+				Info.eq("level_id", levelevel.getId());
+			}
+
 			//先删除所有房间
 			tpBuildingOwnerInfoMapper.delete(Info);
 			//再删除所有楼层
@@ -418,59 +416,94 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 
 		}
 		//删除楼栋
-		if (type.equals("building")){
+		if (type.equals("unit")){
 			TpBuilding tpBuilding= tpBuildingMapper.selectById(id);
 			//删除单元-楼层-房间
 			QueryWrapper<TpUnit> tpUnit = new QueryWrapper<>();
 			tpUnit.eq("community_id", tpBuilding.getCommunityId());
 			tpUnit.eq("phase_id", tpBuilding.getPhaseId());
-			tpUnit.eq("building_id",tpBuilding.getId());
-			tpUnit.eq("unit_id", tpBuilding.getId());
-			tpUnit.eq("level_id", tpBuilding.getId());
-			//根据楼层
-			TpUnit unit= tpUnitMapper.selectById(id);
-			QueryWrapper<TpLevel> tpLevel = new QueryWrapper<>();
-			tpLevel.eq("phase_id", unit.getPhaseId());
-			tpLevel.eq("community_id", unit.getCommunityId());
-			tpLevel.eq("building_id", unit.getBuildingId());
-			tpLevel.eq("unit_id", unit.getId());
-			tpLevel.eq("name", nodeNumber);
+			tpUnit.eq("building_id", tpBuilding.getId());
 
-			//删除单元-楼层-下的房间
-			TpLevel tpLevelToo= tpLevelMapper.selectById(id);
-			QueryWrapper<TpBuildingOwnerInfo> Info = new QueryWrapper<>();
-			Info.eq("community_id", tpLevelToo.getCommunityId());
-			Info.eq("phase_id", tpLevelToo.getPhaseId());
-			Info.eq("building_id",tpLevelToo.getBuildingId());
-			Info.eq("unit_id", tpLevelToo.getUnitId());
-			Info.eq("level_id", tpLevelToo.getId());
-			//先删除所有房间
-			tpBuildingOwnerInfoMapper.delete(Info);
+			//先查询楼层
+			TpUnit unit= tpUnitMapper.selectOne(tpUnit);
+			QueryWrapper<TpLevel> tpLevel = new QueryWrapper<>();
+			if (null!=unit) {
+				tpLevel.eq("phase_id", unit.getPhaseId());
+				tpLevel.eq("community_id", unit.getCommunityId());
+				tpLevel.eq("building_id", unit.getBuildingId());
+				tpLevel.eq("unit_id", unit.getId());
+			}
+			//查询房间
+			List<TpLevel> levelList= tpLevelMapper.selectList(tpLevel);
+			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
+			if (null!=levelList) {
+				for (TpLevel level:levelList) {
+					tpBuildingOwnerInfo.eq("phase_id", level.getPhaseId());
+					tpBuildingOwnerInfo.eq("community_id", level.getCommunityId());
+					tpBuildingOwnerInfo.eq("building_id", level.getBuildingId());
+					tpBuildingOwnerInfo.eq("unit_id", level.getUnitId());
+					tpBuildingOwnerInfo.eq("level_id", level.getId());
+					//先删除所有房间
+					tpBuildingOwnerInfoMapper.delete(tpBuildingOwnerInfo);
+				}
+			}
 			//再删除所有楼层
 			tpLevelMapper.delete(tpLevel);
 			//删除此单元
-			tpUnitMapper.deleteById(id);
-
-
-
+			tpUnitMapper.delete(tpUnit);
+			//判断是否为单
+			tpBuildingMapper.deleteById(id);
+		}
 
+		if (type.equals("building")){
+			TpPhase phase= tpPhaseMapper.selectById(id);
 
+			TpBuilding tpBuilding= tpBuildingMapper.selectById(phase.getId());
+			//删除单元-楼层-房间
+			QueryWrapper<TpUnit> tpUnit = new QueryWrapper<>();
+			if (null!=tpBuilding) {
+				tpUnit.eq("community_id", tpBuilding.getCommunityId());
+				tpUnit.eq("phase_id", tpBuilding.getPhaseId());
+				tpUnit.eq("building_id", tpBuilding.getId());
+			}
+			//先查询楼层
+			List<TpUnit> unitList= tpUnitMapper.selectList(tpUnit);
+			QueryWrapper<TpLevel> tpLevel = new QueryWrapper<>();
+			if (null!=unitList) {
+				for (TpUnit unit:unitList) {
+					tpLevel.eq("phase_id", unit.getPhaseId());
+					tpLevel.eq("community_id", unit.getCommunityId());
+					tpLevel.eq("building_id", unit.getBuildingId());
+					tpLevel.eq("unit_id", unit.getId());
 
-			//判断是否为单
+					//查询房间
+					TpLevel level= tpLevelMapper.selectOne(tpLevel);
+					if (null!=level) {
+						QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
+						tpBuildingOwnerInfo.eq("phase_id", level.getPhaseId());
+						tpBuildingOwnerInfo.eq("community_id", level.getCommunityId());
+						tpBuildingOwnerInfo.eq("building_id", level.getBuildingId());
+						tpBuildingOwnerInfo.eq("unit_id", level.getUnitId());
+						tpBuildingOwnerInfo.eq("level_id", level.getId());
+						//先删除所有房间
+						tpBuildingOwnerInfoMapper.delete(tpBuildingOwnerInfo);
+				}
+					//再删除所有楼层
+					tpLevelMapper.delete(tpLevel);
+			 }
+			}
+			//删除此单元
 			tpUnitMapper.delete(tpUnit);
+			//删除栋
+			QueryWrapper<TpBuilding> building= new QueryWrapper<>();
+			tpLevel.eq("phase_id", phase.getId());
+			tpLevel.eq("community_id", phase.getCommunityId());
+			tpBuildingMapper.delete(building);
+			//删除整个期
+			tpPhaseMapper.deleteById(id);
 		}
-
-//		if(type.equals("building")){
-//
-//			QueryWrapper<TpBuilding> tpBuilding = new QueryWrapper<>();
-//			tpBuilding.eq("phase_id", tpPhase.getId());
-//			tpBuilding.eq("community_id", tpPhase.getCommunityId());
-//			tpBuilding.eq("phase_id", tpPhase.getId());
-//			tpBuilding.eq("name", nodeNumber);
-//			tpBuildingMapper.delete(tpBuilding);
-//		}
-
-		return null;
+		responseBean.addSuccess("成功");
+		return responseBean;
 	}
 
 	private void saveBuildingTreeData(Integer communityId, List<TpBuildingOwnerInfo> list) {
@@ -562,4 +595,82 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			}
 		}
 	}
+	//删除当前节点判断是否有审核通过的
+	private ResponseBean InfoPass(String type,Integer id ) {
+		ResponseBean responseBean = new ResponseBean();
+		if (type.equals("end")) {
+			//判断书否有已审核人员
+			TpBuildingOwnerInfo info = tpBuildingOwnerInfoMapper.selectById(id);
+			QueryWrapper<TaUserVerify> taUserVerify = new QueryWrapper<>();
+			taUserVerify.eq("community_id", info.getCommunityId())
+					.eq("phase_id", info.getPhaseId())
+					.eq("building_id", info.getBuildingId())
+					.eq("unit_id", info.getUnitId())
+					.eq("level_id", info.getLevelId())
+					.eq("room_no_id", id)
+					.eq("verify_status", 1);
+			List<TaUserVerify> taUserVerifyList = taUserVerifyMapper.selectList(taUserVerify);
+			if (null != taUserVerifyList) {
+				responseBean.addError("不可删除审核已通过人员");
+				return responseBean;
+			}
+		}
+		if (type.equals("roomNo")) {
+			TpLevel tpLevel = tpLevelMapper.selectById(id);
+			QueryWrapper<TaUserVerify> taUserVerify = new QueryWrapper<>();
+			taUserVerify.eq("community_id", tpLevel.getCommunityId())
+					.eq("phase_id", tpLevel.getPhaseId())
+					.eq("building_id", tpLevel.getBuildingId())
+					.eq("unit_id", tpLevel.getUnitId())
+					.eq("level_id", tpLevel.getId())
+					.eq("verify_status", 1);
+			List<TaUserVerify> taUserVerifyList = taUserVerifyMapper.selectList(taUserVerify);
+			if (null != taUserVerifyList) {
+				responseBean.addError("不可删除审核已通过人员");
+				return responseBean;
+			}
+		}
+		if (type.equals("level")) {
+			TpUnit tpUnit = tpUnitMapper.selectById(id);
+			QueryWrapper<TaUserVerify> taUserVerify = new QueryWrapper<>();
+			taUserVerify.eq("community_id", tpUnit.getCommunityId())
+					.eq("phase_id", tpUnit.getPhaseId())
+					.eq("building_id", tpUnit.getBuildingId())
+					.eq("verify_status", 1);
+			List<TaUserVerify> taUserVerifyList = taUserVerifyMapper.selectList(taUserVerify);
+			if (null != taUserVerifyList) {
+				responseBean.addError("不可删除审核已通过人员");
+				return responseBean;
+			}
+		}
+		if (type.equals("unit")) {
+			//判断书否有已审核人员
+			TpBuilding tpBuilding = tpBuildingMapper.selectById(id);
+			QueryWrapper<TaUserVerify> taUserVerify = new QueryWrapper<>();
+			taUserVerify.eq("community_id", tpBuilding.getCommunityId())
+					.eq("phase_id", tpBuilding.getPhaseId())
+					.eq("building_id", tpBuilding.getId())
+					.eq("verify_status", 1);
+			List<TaUserVerify> taUserVerifyList = taUserVerifyMapper.selectList(taUserVerify);
+			if (null != taUserVerifyList) {
+				responseBean.addError("不可删除审核已通过人员");
+
+				return responseBean;
+			}
+		}
+		if (type.equals("building")) {
+			TpPhase phase = tpPhaseMapper.selectById(id);
+			QueryWrapper<TaUserVerify> taUserVerify = new QueryWrapper<>();
+			taUserVerify.eq("community_id", phase.getCommunityId())
+					.eq("phase_id", phase.getId())
+					.eq("verify_status", 1);
+			List<TaUserVerify> taUserVerifyList = taUserVerifyMapper.selectList(taUserVerify);
+			if (null != taUserVerifyList) {
+				responseBean.addError("不可删除审核已通过人员");
+				return responseBean;
+			}
+		}
+		responseBean.addError("成功");
+		return responseBean;
+	}
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -285,6 +285,8 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
         // 活动配图
         JSONArray jsonArray = jsonObject.getJSONArray("contentImg");
         String [] contentImgArray = jsonArray.toArray(new String[]{});
+        //是否需要签到二维码1:需要2不需要
+        int radio= jsonObject.getIntValue("radio");
 
         TpActivity selectTpActivity = tpActivityMapper.selectById(tpActivity.getId());
         if (null == selectTpActivity) {
@@ -334,6 +336,25 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
          queryWrapper.eq("type", "activity");
          tdImagesMapper.delete(queryWrapper);
 
+        if (radio==1){
+            try {
+                InputStream inputStream= QRCode.encode(tpActivity.getId()+"");
+                String codeUrl= imageServiceI.getImageUrl(inputStream);
+                TdImages tdImages= new TdImages();
+                tdImages.setImageUrl(codeUrl);
+                tdImages.setUuid(tpActivity.getId());
+                tdImages.setType(Constant.ACTIVITY);
+                tdImages.setCreateUser(userElement.getId());
+                tdImages.setCreateTime(LocalDateTime.now());
+                tdImagesMapper.insert(tdImages);
+            } catch (WriterException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        }
+
 
         // 插入图片
         insertImg(contentImgArray, userElement, tpActivity);

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java

@@ -1,5 +1,6 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,9 +10,9 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.TdImagesMapper;
 import com.community.huiju.dao.TpTransactionMapper;
-import com.community.huiju.model.TdImages;
-import com.community.huiju.model.TpBuildingOwnerInfo;
-import com.community.huiju.model.TpTransaction;
+import com.community.huiju.dao.TransactionLikeMapper;
+import com.community.huiju.dao.TransactionReportMapper;
+import com.community.huiju.model.*;
 import com.community.huiju.service.ITransactionService;
 import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,16 +41,51 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	
 	@Autowired
 	private TdImagesMapper tdImagesMapper;
-	
+
+	@Autowired
+	private TransactionLikeMapper transactionLikeMapper;
+
+	@Autowired
+	private TransactionReportMapper transactionReportMapper;
+
+
 	@Override
-	public ResponseBean getTransactionList(TpTransaction tpTransaction, Integer pageNum, Integer pageSize) {
+	public ResponseBean getTransactionList(String parameter,Integer communityId) {
 		ResponseBean responseBean = new ResponseBean();
-		Page page = new Page(pageNum,pageSize);
+		JSONObject object= JSONObject.parseObject(parameter);
+		String transactionTitle = object.getString("transactionTitle");
+		String userName = object.getString("userName");
+		Integer id = object.getInteger("id");
+		Integer status = object.getInteger("status");
+		Integer pageNum = object.getInteger("pageNum");
+		Integer pageSize = object.getInteger("pageSize");
+		Page<TpTicket> page = new Page<>();
+		page.setSize(pageSize == null ? 10 : pageSize);
+		page.setCurrent(pageNum == null ? 1 : pageNum);
 		// 分页查询
-		List<TpTransaction> list = tpTransactionMapper.selectListByParams(page,tpTransaction);
+		List<TpTransaction> list = tpTransactionMapper.selectListByParams(page,transactionTitle,userName,id,status,communityId);
+
+		list = list.stream().map( e-> {
+
+			QueryWrapper<TransactionLike> transactionLike= new QueryWrapper<>();
+			transactionLike.eq("transaction_id",e.getId());
+			transactionLike.eq("like_status",2);
+			//不喜欢的总数
+			 Integer transactionLikeCount= transactionLikeMapper.selectCount(transactionLike);
+			e.setTransactionNoLikeSum(transactionLikeCount);
+
+			QueryWrapper<TransactionReport> TransactionReport= new QueryWrapper<>();
+			TransactionReport.eq("transaction_id",e.getId());
+			Integer TransactionReportCount= transactionReportMapper.selectCount(TransactionReport);
+			e.setReportSum(TransactionReportCount);
+
+			return e;
+		}).collect(Collectors.toList());
 		Map<String, Object> map = Maps.newHashMap();
 		map.put("list",list);
 		map.put("total",page.getTotal());
+		map.put("pageNum", page.getCurrent());
+		map.put("pageSize", page.getSize());
 		responseBean.addSuccess(map);
 		return responseBean;
 	}
@@ -68,7 +104,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		queryWrapper.eq("uuid", id);
 		queryWrapper.eq("type", "transaction");
 		List<TdImages> imagesList = tdImagesMapper.selectList(queryWrapper);
-		// 转换, 只保留 imageUrl 字段
+		// 转换, 只保留 imageUrl 字段·
 		List<String> stringList = imagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
 		Map<String,Object> map = Maps.newHashMap();
 		map.put("tpTransaction",tpTransaction);
@@ -99,4 +135,37 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		responseBean.addError("作废出错");
 		return responseBean;
 	}
+
+	@Override
+	public ResponseBean transactionsAdd(String paramets, Integer communityId, Integer id) {
+		ResponseBean response = new ResponseBean();
+		JSONObject jsonobject = JSONObject.parseObject(paramets);
+		TpTransaction tpTransaction = JSONObject.parseObject(paramets, TpTransaction.class);
+		tpTransaction.setCommunityId(communityId);
+		tpTransaction.setTaUserId(null);
+		tpTransaction.setCreateDate(LocalDateTime.now());
+		tpTransaction.setCreateUser(id);
+		tpTransaction.setViewCount(0);
+		JSONArray contentImg = jsonobject.getJSONArray("contentImg");
+		String[] contentImgArray = contentImg.toArray(new String[]{});
+		if (tpTransaction.getTransactionTitle() == null) {
+			response.addError("标题不能为空");
+			return response;
+		}
+		if (null == tpTransaction.getTransactionContent() && null == contentImg) {
+			response.addError("内容和图片必须填一个");
+			return response;
+		}
+		for (String img : contentImgArray) {
+			TdImages tdImages = new TdImages();
+			tdImages.setImageUrl(img);
+			tdImages.setType("transaction");
+			tdImages.setUuid(tpTransaction.getId());
+			tdImages.setCreateTime(LocalDateTime.now());
+			tdImages.setCreateUser(id);
+			tdImagesMapper.insert(tdImages);
+		}
+		return response;
+
+	}
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/UserServiceImpl.java

@@ -59,6 +59,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Autowired
     private  SysUserRoleMapper sysUserRoleMapper;
 
+    @Autowired
+    private  TaUserMapper taUserMapper;
+
 
     @Override
     public ResponseBean login(String phone, Integer communityId, String code) {
@@ -245,11 +248,20 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         JSONArray List = object.getJSONArray("menuArray");
         Integer[] roleIdArray = List.toArray(new Integer[]{});
         String remark = object.getString("remark");
-
+       //时维护ta_user（发帖需要）
+        TaUser  taUser= new TaUser();
+        taUser.setLoginName(loginName)
+                .setCreateUser(userID)
+                .setCreateDate(LocalDateTime.now())
+                .setUserName(userName)
+                .setStatus("1");
+        taUserMapper.insert(taUser);
+        user.setTaUserId(taUser.getId());
         user.setUserName(userName);
         user.setLoginName(loginName);
         user.setRemark(remark);
-        user.setStatus("1");;
+        user.setStatus("1");
+
         user.setCreateUser(userID);
         user.setCreateDate(LocalDateTime.now());
         user.setCommunityId(communityId);

CODE/smart-community/property-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -3,34 +3,42 @@
 <mapper namespace="com.community.huiju.dao.TpTransactionMapper">
     <select id="selectListByParams" resultType="com.community.huiju.model.TpTransaction">
         SELECT
-            t.id,
-            t.community_id AS communityId,
-            t.transaction_title AS transactionTitle,
-            t.view_count AS viewCount,
-            t.`status`,
-            t.type,
-            t.is_reported AS isReported,
-            t.create_date AS createDate,
-            u.user_name AS userName
+        t.id,
+        t.community_id AS communityId,
+        t.transaction_title AS transactionTitle,
+        t.view_count AS viewCount,
+        t.`status`,
+        t.type,
+        t.create_user,
+        t.is_reported AS isReported,
+        t.create_date AS createDate,
+        ta.user_name AS userName,
+        COUNT(li.transaction_id) AS  transactionLikeSum,
+        COUNT(re.transaction_id) AS replySum
         FROM
-            tp_transaction t
-            LEFT JOIN ta_user u ON t.ta_user_id = u.id
-            AND u.community_id = #{tpTransaction.communityId}
-        WHERE
-            1 = 1
-            AND t.community_id = #{tpTransaction.communityId}
-        <if test="tpTransaction.id != null and tpTransaction.id != '' or tpTransaction.id ==0">
-            and t.id like concat('%',#{tpTransaction.id},'%')
+        tp_transaction t
+        LEFT JOIN ta_user ta ON  t.create_user = ta.id
+        LEFT JOIN ta_visitor v ON ta.id = v.ta_user_id
+        LEFT JOIN tp_transaction_like li ON t.id = li.transaction_id AND li.like_status=1
+        LEFT JOIN tp_transaction_reply re ON t.id = re.transaction_id
+        WHERE t.community_id =#{communityId}
+        <if test="id != null and id != '' or id ==0">
+            and t.id like concat('%',#{id},'%')
         </if>
-        <if test="tpTransaction.transactionTitle != null and tpTransaction.transactionTitle != ''">
-            and t.transaction_title like concat('%',#{tpTransaction.transactionTitle,jdbcType=VARCHAR},'%')
+        <if test="transactionTitle != null and transactionTitle != ''">
+            and t.transaction_title like concat('%',#{transactionTitle,jdbcType=VARCHAR},'%')
         </if>
-        <if test="tpTransaction.status != null and tpTransaction.status != ''">
-            and t.status = #{tpTransaction.status}
+        <if test="status != null and status != '' and status != '-1' ">
+            and t.status = #{status}
         </if>
-        <if test="tpTransaction.isReported != null and tpTransaction.isReported != ''">
-            and t.is_reported = #{tpTransaction.isReported}
+        <if test="status != null and status != '' and status = '-1' ">
+            and  t.type in(0,1,2)
         </if>
+        <if test="userName != null and userName != ''">
+            and ta.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')
+        </if>
+        GROUP BY
+        t.id
         ORDER BY t.create_date desc
     </select>
 </mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TransactionLikeMapper.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.community.huiju.dao.TransactionLikeMapper">
+
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TransactionReportMapper.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.community.huiju.dao.mapper.TransactionReportMapper">
+
+</mapper>

VUECODE/smart-property-manage/src/api/activity.js

@@ -39,6 +39,7 @@ export function updateActivity(data) {
     url: '/activity/update',
     method: 'put',
     data: {
+      radio: data.radio,
       id: data.id,
       activityTitle: data.activityTitle,
       activityCarouselImg: data.activityCarouselImg, // 轮播图

VUECODE/smart-property-manage/src/api/transaction.js

@@ -23,3 +23,33 @@ export function updateTransactionById(id) {
     method: 'post'
   })
 }
+
+export function transactionsList(data) {
+  return request({
+    url: '/transactions',
+    method: 'post',
+    data: {
+      transactionTitle: data.transactionTitle,
+      id: data.id,
+      userName: data.userName,
+      status: data.status,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
+    }
+  })
+}
+
+export function transactionsAdd(data) {
+  return request({
+    url: '/transactions/add',
+    method: 'post',
+    data: {
+      transactionTitle: data.transactionTitle,
+      id: data.id,
+      userName: data.userName,
+      status: data.status,
+      contentImg: data.contentImg,
+      announcementContent: data.announcementContent
+    }
+  })
+}

VUECODE/smart-property-manage/src/router/index.js

@@ -117,6 +117,13 @@ export const constantRouterMap = [
         name: 'transaction-import',
         meta: { title: '二手等管理', icon: 'table' }
       },
+      {
+        path: '/transaction/transaction',
+        component: () => import('@/views/social/transaction/transactionAdd'),
+        name: 'transaction-add',
+        hidden: true,
+        meta: { title: '添加二手求购', icon: 'table' }
+      },
       {
         path: '/transaction/info',
         component: () => import('@/views/social/transaction/info/transactionInfo'),

VUECODE/smart-property-manage/src/store/modules/transaction.js

@@ -1,4 +1,4 @@
-import { fetchList, transactionById, updateTransactionById } from '@/api/transaction'
+import { fetchList, transactionById, updateTransactionById, transactionsList, transactionsAdd} from '@/api/transaction'
 
 const transaction = {
   namespaced: true,
@@ -47,6 +47,24 @@ const transaction = {
           reject(error)
         })
       })
+    },
+    TransactionsList({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        transactionsList(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    TransactionsAdd({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        transactionsAdd(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/social/transaction/index.vue

@@ -1,261 +1,284 @@
+
 <template>
-  <div class="app-container">
-    <div class="filter-container">
-      <el-input v-model="listQuery.transactionId" placeholder="帖子编号" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
-      <el-input v-model="listQuery.transactionTitle" placeholder="帖子标题" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
-      <el-select v-model="listQuery.status" placeholder="发布状态" style="width: 130px" class="filter-item">
-        <el-option label="已发布" value="1"/>
-        <el-option label="已作废" value="0"/>
-      </el-select>
-      <el-select v-model="listQuery.isReported" placeholder="是否被举报" class="filter-item" style="width: 130px">
-        <el-option label="无举报" value="0"/>
-        <el-option label="被举报" value="1"/>
-      </el-select>
-      <el-button v-waves class="filter-item" type="info" @click="clearListQuery">清空</el-button>
-      <el-button v-waves class="filter-item" type="primary" @click="handleFilter">查询</el-button>
+  <div class="root">
+    <el-form :inline="true" :model="listQuery" class="form-listQuery">
+      <el-form-item class="filter-item" label="话题编号">
+        <el-input v-model.trim="listQuery.id" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="话题编号" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="话题标题" >
+        <el-input v-model.trim="listQuery.transactionTitle" placeholder="话题标题" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="话题发布人" >
+        <el-input v-model.trim="listQuery.userName" placeholder="话题发布人" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="话题类型" >
+        <el-select v-model="listQuery.status" placeholder="请选择">
+         <el-option label="选择状态" value="" />
+         <el-option label="议事大厅" value="0"/>
+         <el-option label="友令互助" value="1"/>
+         <!-- -1包括，二手，租赁，求购 -->
+         <el-option label="二手租赁" value="-1"/>
+         <el-option label="其他" value="3"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" class="filter-item" @click="handleFilter">清空</el-button>
+        <el-button type="primary" @click="search">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="button">
+      <el-button type="primary" @click="add">添加</el-button>
+      <el-button type="warning" @click="edit">修改</el-button>
+      <el-button type="danger" @click="deleteAnnouncement">作废</el-button>
     </div>
-
     <el-table
       v-loading="listLoading"
-      :key="tableKey"
-      :data="transactionList"
+      ref="multipleTable"
+      :data="transactionsList"
       border
-      fit
-      highlight-current-row
+      tooltip-effect="dark"
       style="width: 100%; margin-top: 20px;"
-      @sort-change="sortChange">
-      <el-table-column label="编号" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.id }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="类型" align="center">
-        <template slot-scope="scope">
-          <span v-if="scope.row.type === '0'">二手</span>
-          <span v-if="scope.row.type === '1'">求购</span>
-          <span v-if="scope.row.type === '2'">租赁</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="标题" align="center">
-        <template slot-scope="scope">
-          <span @click="handleLook(scope.row.id)" style="color: #409EFF;cursor: pointer">{{ scope.row.transactionTitle }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="查看人数" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.viewCount }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="发布人" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.userName }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="发布时间" align="center">
-        <template slot-scope="scope">
-          <span>{{ formatDate(scope.row.createDate) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="发布状态" align="center">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status === '0'">已作废</span>
-          <span v-if="scope.row.status === '1'">已发布</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="举报状态" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.isReported === '1' ? "被举报" : "无举报" }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- <pagination v-show="total>0" :total="total" :current-page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 20, 30]" @pagination="getList" /> -->
-    <el-pagination
-      :total="total"
-      :current-page="listQuery.pageNum"
-      :page-sizes="[5, 10, 20, 30]"
-      :page-size="listQuery.pageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"/>
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        width="55"/>
+      <el-table-column prop="id" label="话题编号" align="center"/>
+       <el-table-column prop="type" label="话题类型" align="center"/>
+      <el-table-column prop="transactionTitle" label="话题标题" align="center"/>
+      <el-table-column prop="userName" label="发布人" align="center"/>
+      <el-table-column prop="createDate" label="发布时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
 
+      <el-table-column prop="viewCount" label="查看人数" align="center"/>
+      <el-table-column prop="transactionLikeSum" label="点赞数" align="center"/>
+      <el-table-column prop="transactionNoLikeSum" label="点衰数" align="center"/>
+      <el-table-column prop="replySum" label="回复数" align="center"/>
+      <el-table-column prop="reportSum" label="举报数量" align="center"/>
+    </el-table>
+    <div class="block">
+      <el-pagination
+        :current-page.sync="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size.sync="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
   </div>
 </template>
 
 <script>
-import { mapState, mapActions, mapMutations } from 'vuex'
-import waves from '@/directive/waves' // Waves directive
-import { parseTime } from '@/utils'
+import { mapActions } from 'vuex'
 
 export default {
-  computed: {
-    ...mapState('transaction', {
-      transactionList: s => s.transactionList,
-      total: s => s.total
-    })
-  },
-  directives: { waves },
   data() {
-    var _self = this
     return {
-      events: {
-        click: (e) => {
-          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
-          _self.detail.longitude = e.lnglat.lng
-          _self.detail.latitude = e.lnglat.lat
-        }
-      },
-      markers: [],
-      searchOption: {
-        city: '南京',
-        citylimit: false
-      },
-      listLoading: true,
       listQuery: {
+        communityId: '',
+				createDate:'',
+				createUser:'',
+				id:'',
+				isReported:'',
+				status:'',
+				taUserId:'',
+				transactionContent:'',
+				transactionTitle:'',
+				type:'',
+				updateDate:'',
+				updateUser:'',
+				userName:'',
+        viewCount:'',
         pageNum: 1,
-        pageSize: 20,
-        transactionId: undefined,
-        transactionTitle: undefined,
-        status: undefined,
-        isReported: undefined
+        pageSize: 10
       },
-      tableKey: 0,
-      downloadLoading: false
+      total: 0, // 数据总数
+      transactionsList: [],
+      deleteIds: [], // 选择的id集合
+      listLoading: true // 加载圈
     }
   },
-  created() {
-    this.getList()
+  mounted() {
+    // 获取数据
+    this.dataQuery()
   },
   methods: {
-    ...mapMutations('transaction', {
-    }),
-    ...mapActions('transaction', [
-      'FetchTransactionList'
+    ...mapActions('listAnnouncement', [
+      'BserPassCertification'
     ]),
-    setCurrent(item) {
-      this.setDetail({ ...item })
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val
+      this.dataQuery()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.dataQuery()
+    },
+    padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
     },
-    getList() {
+    getStatus(row) { // 获取状态
+      let statusName = ''
+
+      // 判断状态
+      switch (row.status) {
+        case '0':
+          statusName = '已作废'
+          break
+        case '1':
+          statusName = '已发布'
+          break
+        case '2':
+          statusName = '草稿'
+          break
+      }
+
+      // 如果修改时间和创建时间不一致, 就显示已修改
+      if (row.status === '1' && (row.updateDate > row.createDate)) {
+        statusName = '已修改'
+      }
+
+      return statusName
+    },
+    dataQuery() { // 查询数据
+    
+    console.log('this.listQuery.transactionTitle',this.listQuery.transactionTitle)
       this.listLoading = true
-      this.FetchTransactionList(this.listQuery).then(() => {
+      this.$store.dispatch('transaction/TransactionsList', this.listQuery).then((res) => {
+        const resData = res.data
+        this.transactionsList = resData.list
+        this.listQuery.pageNum = resData.pageNum
+        this.listQuery.pageSize = resData.pageSize
+        this.total = resData.total
         this.listLoading = false
       }).catch(() => {
-        this.loading = false
-        console.log('get list error')
+        this.listLoading = false
+        console.log('error TransactionsList')
       })
     },
-    clearListQuery() {
+    handleSelectionChange(data) {
+      // 设置为 空
+      this.deleteIds = []
+      for (let i = 0; i < data.length; i++) {
+        this.deleteIds.push(data[i].id)
+      }
+    },
+	  search() {
       this.listQuery.pageNum = 1
-      this.listQuery.pageSize = 20
-      this.listQuery.transactionId = undefined
-      this.listQuery.transactionTitle = undefined
-      this.listQuery.status = undefined
-      this.listQuery.isReported = undefined
-      this.getList()
+      this.dataQuery()
     },
     handleFilter() {
       this.listQuery.pageNum = 1
-      this.getList()
+      this.listQuery.pageSize = 10
+      this.listQuery.ownerName =''
+      this.listQuery.id=''
+      this.listQuery.status=''
+      this.listQuery.userName=''
+      this.dataQuery()
     },
-    handleModifyStatus(row, status) {
-      this.$message({
-        message: '操作成功',
-        type: 'success'
-      })
-      row.status = status
+    // 添加公告
+    add() {
+      this.$router.push({ name: 'transaction-add' })
     },
-    sortChange(data) {
-      const { prop, order } = data
-      if (prop === 'id') {
-        this.sortByID(order)
+    edit(){// 编辑公告
+      const ids = this.deleteIds
+      if (ids.length > 1) {
+        this.$message.error('只能选择一行数据进行修改!')
+        return
       }
-    },
-    handleSizeChange(val) {
-      // console.log(`每页 ${val} 条`);
-      this.listQuery.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      // console.log(`当前页: ${val}`);
-      this.listQuery.pageNum = val
-      this.getList()
-    },
-    sortByID(order) {
-      if (order === 'ascending') {
-        this.listQuery.sort = '+id'
-      } else {
-        this.listQuery.sort = '-id'
+      if (ids < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
       }
-      this.handleFilter()
-    },
-    handleUpdate(row) {
-      this.setCurrent(row)
-      this.dialogStatus = 'update'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-      this.getEditCityList()
-      this.getEditDistrictList()
-    },
-    handleLook(id) {
-      this.$router.push({ name: 'transaction-info', params: { id: id }})
-    },
-    handleCreate() {
-      this.resetDetail()
-      this.dialogStatus = 'create'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    handleDelete(row) {
-      this.$notify({
-        title: '成功',
-        message: '删除成功',
-        type: 'success',
-        duration: 2000
-      })
-      const index = this.list.indexOf(row)
-      this.list.splice(index, 1)
+       let ide= this.deleteIds[0]
+       this.listQuery.id = ide
+      this.$store.dispatch('AnnouncementById', this.listQuery).then((res) => {
+        const resData = res.data
+        const announcement = resData.tpAnnouncement
+        const imgList = resData.studentList
+        this.listQuery = announcement
+        this.listQuery.announcementTitle = ''
+        console.log("1",this.listQuery.status)
+        if(this.listQuery.status == 0){
+          this.$message.error('已作废不可以修改')
+          return
+        }
+       this.$router.push({ name: 'announcement-edit', params: { id: ids[0] }})
+      }) 
+      },
+    deleteAnnouncement(){
+       let ide= this.deleteIds[0]
+       this.listQuery.id = ide 
+      this.$store.dispatch('AnnouncementById', this.listQuery).then((res) => {
+        const resData = res.data
+        const announcement = resData.tpAnnouncement
+        const imgList = resData.studentList
+        this.listQuery.status= announcement.status
+        console.log("1",this.listQuery.status)
+        if(this.listQuery.status == 0){
+          this.$message.error('已作废不可以作废')
+          return
+        }
+        this.deleteId()     
+      })    
     },
-    handleDownload() {
-      this.downloadLoading = true
-      import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
-        const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
-        const data = this.formatJson(filterVal, this.list)
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: 'table-list'
-        })
-        this.downloadLoading = false
+
+    deleteId(){
+       const ids = this.deleteIds
+      this.listLoading = true
+      console.log(ids)
+      this.$store.dispatch('DeleteAnnouncement', ids).then((res) => {
+        this.listLoading = false
+        this.listQuery.announcementTitle = ''
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error DeleteAnnouncement')
       })
     },
-    padDate(value) {
-      value = value < 10 ? '0' + value : value
-      return value
+
+
+    clickTitle(id) {
+      this.$router.push({ name: 'contentParticulars-details', query: { id: id }})
     },
     formatDate(val) {
+      if (val === null) {
+        return ''
+      }
       var value = new Date(val)
       var year = value.getFullYear()
-      var month = this.padDate(value.getMonth() + 1)
-      var day = this.padDate(value.getDate())
-      var hour = this.padDate(value.getHours())
-      var minutes = this.padDate(value.getMinutes())
-      var seconds = this.padDate(value.getSeconds())
-      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'timestamp') {
-          return parseTime(v[j])
-        } else {
-          return v[j]
-        }
-      }))
-    },
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      return year + '-' + month + '-' + day
+    }
   }
 }
 </script>
+
+<style scoped>
+.root{
+  display: flex;
+  flex-flow: column;
+}
+.form-listQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+.operation{
+  display: flex;
+  justify-content: space-between;
+  margin-left: 20px;
+  margin-right: 20px;
+}
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+.button {
+  margin-left: 20px;
+}
+</style>
+

VUECODE/smart-property-manage/src/views/social/transaction/transactionAdd.vue

@@ -0,0 +1,191 @@
+<template>
+  <div id="root">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
+
+    <el-form-item class="filter-item" label="话题类型" >
+        <el-select v-model="ruleForm.status" placeholder="请选择">
+         <el-option label="选择状态" value="" />
+         <el-option label="议事大厅" value="0"/>
+         <el-option label="友令互助" value="1"/>
+         <!-- -1包括，二手，租赁，求购 -->
+         <el-option label="二手租赁" value="-1"/>
+         <el-option label="其他" value="3"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="话题标题" prop="transactionTitle">
+        <el-input v-model="ruleForm.transactionTitle" placeholder="20字以内"/>
+      </el-form-item>
+      <el-form-item label="话题详细描述">
+        <el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="内容，规则，时间等"/>
+      </el-form-item>
+      <el-form-item label="话题配图">
+        <el-upload
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessContentImg"
+          name="uploadFiles"
+          action="http://106.14.20.193:8086/property-api/uploadimage"
+          list-type="picture-card">
+          <i class="el-icon-plus"/>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img :src="dialogImageUrl" width="100%" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="权重值" prop="sort">
+        <el-input-number v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="resetForm('ruleForm','2')">存为草稿</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index',
+  data() {
+    return {
+      ruleForm: {
+        sort: '',
+        communityId: '',
+        createDate:'',
+        createUser:'',
+        id:'',
+        isReported:'',
+        status:'',
+        taUserId:'',
+        transactionContent:'',
+        transactionTitle:'',
+        type:'',
+        updateDate:'',
+        updateUser:'',
+        userName:'',
+        viewCount:'',
+        announcementCarouselImg: '', // 轮播图
+        announcementContent: '', // 内容详细
+        contentImg: [], // 内容配图
+        sort: 1, // 权重
+        status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+      },
+      imageUrl: '', // 轮播图预览
+      dialogVisible: false, // 活动配图, 默认不显示 (以单张为单位)
+      dialogImageUrl: '', // 活动配图, 图片链接 (以单张为单位)
+      rules: {
+        announcementTitle: [
+          { required: true, message: '请输入公告名称', trigger: 'blur' },
+          { min: 1, max: 20, message: '长度在 15 个字符以内', trigger: 'blur' }
+        ],
+        announcementContent: [
+          { required: true, message: '公告详细描述', trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: '请输入权重值', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  methods: {
+    submitForm(formName, status) {
+      console.log(status)
+      // 加载框
+    //   const loading = this.$loading({
+    //     lock: true,
+    //     text: 'Loading',
+    //     spinner: 'el-icon-loading',
+    //     background: 'rgba(0, 0, 0, 0.7)'
+    //   })
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
+            this.$message.error('公告内容描述 和 公告配图至少要存在一个!')
+            return
+          }
+          this.ruleForm.status = status // 发布状态
+          this.$store.dispatch('transaction/TransactionsAdd', this.ruleForm).then((res) => {
+            if (res.code === '0') {
+              this.$message({
+                message: res.message,
+                type: 'success'
+              })
+              this.$router.push({ name: 'announcement-index' })
+              loading.close()
+              return
+            }
+            this.$message.error(res.message)
+            loading.close()
+          }).catch(() => {
+            console.log('error AddActivity')
+          })
+        } else {
+          console.log('error submit!!')
+          loading.close()
+          return false
+        }
+      })
+      // 关闭加载框
+      loading.close()
+    },
+    resetForm(formName, status) {
+      console.log(status)
+      this.submitForm(formName, status)
+    },
+    handleRemove(file, fileList) { // 活动配图移除时
+      this.ruleForm.contentImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.ruleForm.contentImg.push(fileList[i].response.data[0])
+      }
+      console.log(file, fileList)
+    },
+    handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
+      const resImg = response.data[0]
+      this.ruleForm.contentImg.push(resImg)
+    },
+    sortHandleChange(value) { // 权重值
+      this.ruleForm.sort = value
+      console.log(value)
+    }
+  }
+}
+</script>
+
+<style scoped>
+#root {
+  display: flex;
+}
+.ruleForm {
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>