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

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTransactionReply.java

@@ -42,6 +42,11 @@ public class TpTransactionReply {
      */
     private String replyContent;
     
+    /**
+     * 发布类型1 是评论 0 是回复评论
+     */
+    private String publishType;
+    
     /**
      * 被回复的评论内容的用户ID根据uuidtype区分
      */
@@ -267,6 +272,14 @@ public class TpTransactionReply {
         this.replyId = replyId;
     }
     
+    public String getPublishType() {
+        return publishType;
+    }
+    
+    public void setPublishType(String publishType) {
+        this.publishType = publishType;
+    }
+    
     public void setCreateUserName(String createUserName) {
         this.createUserName = createUserName;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import javax.swing.plaf.TabbedPaneUI;
 import java.io.IOException;
@@ -576,14 +577,30 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransactionReply.setUuidName(userElement.getUserName());
         tpTransactionReply.setUuidRole(taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId()).getDescription());
 
-            // 由于评论帖子和评论对话是同一个接口，当tpTransactionReply.getReplyTaUserId()为空时查询Ta_user里面的名字
-        TpTransactionReply tpTransactionReplyBack = tpTransactionReplyMapper.selectByPrimaryKey(tpTransactionReply.getReplyId());
-        
-        //  评论帖子取 TpTransaction 的创建人，回复对话取传过来的值
-        tpTransactionReply.setReplyUuid(tpTransactionReplyBack.getUuid());
-        tpTransactionReply.setReplyUuidType(tpTransactionReplyBack.getUuidType());
-        tpTransactionReply.setReplyUuidName(tpTransactionReplyBack.getUuidName());
-        tpTransactionReply.setReplyUuidRole(tpTransactionReplyBack.getReplyUuidRole());
+        //replyId为空的情况下被回复人就是帖子的创建人
+        if (StringUtils.isEmpty(tpTransactionReply.getReplyId())) {
+            TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(tpTransactionReply.getTransactionId(),tpTransactionReply.getCommunityId());
+            //塞入被回复人信息
+            tpTransactionReply.setReplyUuid(tpTransaction.getUuid());
+            tpTransactionReply.setReplyUuidType(tpTransaction.getUuidType());
+            tpTransactionReply.setReplyUuidName(tpTransaction.getUuidName());
+            String replyRole = "物业";
+            if (tpTransaction.getUuidType().equals("app")){
+                TaUserVerify replyTaUserVerify= taUserVerifyMapper.selectByPrimaryKey(tpTransaction.getUuid());
+                replyRole = taSysRoleMapper.selectByPrimaryKey(replyTaUserVerify.getRoleId()).getDescription();
+            }
+            tpTransactionReply.setReplyUuidRole(replyRole);
+            tpTransactionReply.setPublishType("1");
+        }else{
+            TpTransactionReply tpTransactionReplyBack = tpTransactionReplyMapper.selectByPrimaryKey(tpTransactionReply.getReplyId());
+    
+            //塞入被回复人信息
+            tpTransactionReply.setReplyUuid(tpTransactionReplyBack.getUuid());
+            tpTransactionReply.setReplyUuidType(tpTransactionReplyBack.getUuidType());
+            tpTransactionReply.setReplyUuidName(tpTransactionReplyBack.getUuidName());
+            tpTransactionReply.setReplyUuidRole(tpTransactionReplyBack.getReplyUuidRole());
+            tpTransactionReply.setPublishType("0");
+        }
         tpTransactionReply.setReleaseIdentity("0");
         
         tpTransactionReply.setCreateDate(new Date());

CODE/smart-community/app-api/src/main/resources/mapper/TpRentalHouseMapper.xml

@@ -566,12 +566,13 @@
       and community_id = #{communityId}
       and rh.house_status = 1
     </where>
+    order by rh.sort desc, update_date desc
     <if test="priceFluctuate == 1" >
-        order by rh.sort desc, (rh.rental_price+0)  asc
+        , (rh.rental_price+0)  asc
     </if>
 
     <if test="priceFluctuate == 2" >
-        order by rh.sort desc, (rh.rental_price+0)  desc
+        , (rh.rental_price+0)  desc
     </if>
   </select>
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionReplyMapper.xml

@@ -14,6 +14,7 @@
     <result column="reply_uuid_role" property="replyUuidRole" jdbcType="VARCHAR" />
     <result column="transaction_id" property="transactionId" jdbcType="INTEGER" />
     <result column="reply_content" property="replyContent" jdbcType="VARCHAR" />
+    <result column="publish_type" property="publishType" jdbcType="VARCHAR" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="release_identity" property="releaseIdentity" jdbcType="VARCHAR" />
     <result column="room_no_name" property="roomNoName" jdbcType="INTEGER" />
@@ -21,7 +22,7 @@
   <sql id="Base_Column_List" >
     id, community_id, transaction_id,uuid,uuid_type,uuid_role,reply_uuid_role,
       uuid_name, reply_content,
-      reply_uuid, reply_uuid_type,reply_uuid_name, create_date,release_identity
+      reply_uuid, reply_uuid_type,reply_uuid_name, create_date,release_identity,publish_type
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -36,11 +37,11 @@
   <insert id="insert" parameterType="com.community.huiju.model.TpTransactionReply" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
     insert into tp_transaction_reply (id, community_id, transaction_id,uuid,uuid_type,uuid_role,reply_uuid_role,
       uuid_name, reply_content,
-      reply_uuid, reply_uuid_type,reply_uuid_name, create_date,release_identity
+      reply_uuid, reply_uuid_type,reply_uuid_name, create_date,release_identity,publish_type
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER},#{uuid},#{uuidType},#{uuidRole},#{replyUuidRole},
       #{uuidName,jdbcType=VARCHAR}, #{replyContent,jdbcType=VARCHAR}, #{replyUuid,jdbcType=INTEGER},
-      #{replyUuidType,jdbcType=VARCHAR}, #{replyUuidName,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},#{releaseIdentity,jdbcType=VARCHAR}
+      #{replyUuidType,jdbcType=VARCHAR}, #{replyUuidName,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},#{releaseIdentity,jdbcType=VARCHAR},#{publishType,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpTransactionReply" >

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

@@ -90,6 +90,11 @@ public class TransactionReply implements Serializable {
      */
     private String releaseIdentity;
     
+    /**
+     * 发布类型1 是评论 0 是回复评论
+     */
+    private String publishType;
+    
     /**
      * 创建时间
      */

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

@@ -165,7 +165,7 @@ public class IndexCountServiceImpl implements IndexCountServiceI {
 		List<TpTicket> ticketList = indexCountMapper.getTicketList(communityId);
 		//已解决：状态为待评价+已评价+拒绝受理+被终止的工单总和
 		List<TpTicket> solvedTicketList = new ArrayList<>();
-		//未解决：等待分配+正在处理
+		//未解决：等待分配 + 待处理 +正在处理
 		List<TpTicket> unsolvedTicketList = new ArrayList<>();
 		//今日新增报修单
 		List<TpTicket> todayRepairTicketList = new ArrayList<>();
@@ -184,8 +184,8 @@ public class IndexCountServiceImpl implements IndexCountServiceI {
 					|| ticket.getStatus().equals("1") || ticket.getStatus().equals("6")){
 				solvedTicketList.add(ticket);
 			}
-			//未解决：等待分配+正在处理
-			if (ticket.getStatus().equals("0") || ticket.getStatus().equals("2")){
+			//未解决：等待分配 + 待处理 +正在处理
+			if (ticket.getStatus().equals("0") || ticket.getStatus().equals("2") || ticket.getStatus().equals("3")){
 				unsolvedTicketList.add(ticket);
 			}
 			//获取当天时间的数据

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

@@ -360,6 +360,8 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 					.setReplyUuidType(tpTransaction.getUuidType())
 					.setReplyUuidName(tpTransaction.getUuidName())
 					.setReplyUuidRole(replyRole)
+					.setPublishType("1")
+					.setReleaseIdentity("1")
 					.setCreateDate(LocalDateTime.now());
 		}
 		if (Type!=1) {
@@ -376,6 +378,8 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 					.setReplyUuidType("prop")
 					.setReplyUuidName(Reply.getUuidName())
 					.setReplyUuidRole("物业")
+					.setPublishType("0")
+					.setReleaseIdentity("1")
 					.setCreateDate(LocalDateTime.now());
 		}
 		transactionReplyMapper.insert(transactionReply);