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/service/impl/SocialServiceImpl.java

@@ -206,8 +206,11 @@ public class SocialServiceImpl implements SocialServiceI {
             activity.setViewCount(allViewNum);
             tpActivityMapper.updateByPrimaryKeySelective(activity);
         }
-
-        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
+        TpActivity  tpActivity=new TpActivity();
+         tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
+        if(null == tpActivity){
+            tpActivity = tpActivityMapper.selectActivity(activityId);
+        }
         TpUser tpUser = tpUserMapper.selectByPrimaryKey(tpActivity.getCreateUser());
         if (null != tpUser) {
             tpActivity.setUserName(tpUser.getUserName());
@@ -623,7 +626,7 @@ public class SocialServiceImpl implements SocialServiceI {
         ResponseBean responseBean = new ResponseBean();
         Map<String, Object> parameter = Maps.newHashMap();
         Page<TpActivity> pageList = PageHelper.startPage(pageNum, paeSize);
-        List<TpActivity> tpActivity = tpActivityMapper.selecttpActivity(userElement.getId(), userElement.getCommunityId());
+        List<TpActivity> tpActivity = tpActivityMapper.selecttpActivity(userElement.getUserVerifyId(), userElement.getCommunityId());
         parameter.put("list", tpActivity);
         parameter.put("total", pageList.getTotal());
         responseBean.addSuccess(parameter);
@@ -864,15 +867,6 @@ public class SocialServiceImpl implements SocialServiceI {
         }
 
         TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(activityId, communityId);
-        if (tpTransaction.getUuidType().equals("app")) {
-            TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerifyMapper.selectByPrimaryKey(tpTransaction.getUuid()).getRoleId());
-            tpTransaction.setRoleId(taSysRole.getId());
-            tpTransaction.setRoleName(taSysRole.getRoleName());
-        }
-        if (tpTransaction.getUuidType().equals("prop")) {
-            tpTransaction.setRoleName("物业");
-        }
-        tpTransaction.setCreateUserName(tpTransaction.getUuidName());
 
         Map<String, Object> map = Maps.newHashMap();
         map.put("uuid", tpTransaction.getId());
@@ -948,14 +942,6 @@ public class SocialServiceImpl implements SocialServiceI {
         TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
         List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId, userElement.getUserVerifyId(), tpTransaction.getUuid(),tpTransaction.getUuidType(),type);
         for (TpTransactionReply tpTransactionReply : replies) {
-            if (tpTransactionReply.getUuidType().equals("app")) {
-                TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerifyMapper.selectByPrimaryKey(tpTransactionReply.getUuid()).getRoleId());
-                tpTransactionReply.setRoleName(taSysRole.getDescription());
-            }
-            if (tpTransactionReply.getUuidType().equals("prop")) {
-                tpTransactionReply.setRoleName("物业");
-            }
-            tpTransactionReply.setCreateUserName(tpTransactionReply.getUuidName());
             List<TdImages> tdImagesList = tdImagesMapper.selectImages(tpTransactionReply.getId(), "reply");
             List<String> list = new ArrayList<>();
             for (TdImages imageUrl : tdImagesList) {

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

@@ -292,12 +292,28 @@
   </insert>
     <select id="getUserTransactionList" resultMap="BaseResultMap">
         SELECT
-        <include refid="Base_Column_List"/>
+          <include refid="Base_Column_List"/>
         FROM
-        tp_transaction t
+          tp_transaction t
         WHERE
-        t.community_id=#{communityId,jdbcType=INTEGER}
+          t.community_id=#{communityId,jdbcType=INTEGER}
         AND t.uuid = #{id} and t.uuid_type = 'app'
-        order by create_date DESC
+        UNION
+        SELECT
+          <include refid="Base_Column_List"/>
+        FROM
+          tp_transaction
+        WHERE
+        id IN (
+        SELECT DISTINCT
+          t.transaction_id
+        FROM
+          tp_transaction_reply t
+        WHERE
+          t.community_id=#{communityId,jdbcType=INTEGER}
+        AND t.uuid = #{id} and t.uuid_type = 'app'
+        )
+        ORDER BY
+        create_date DESC
     </select>
 </mapper>

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

@@ -7,9 +7,11 @@
     <result column="uuid" property="uuid" jdbcType="INTEGER" />
     <result column="uuid_type" property="uuidType" jdbcType="VARCHAR" />
     <result column="uuid_name" property="uuidName" jdbcType="VARCHAR" />
+    <result column="uuid_role" property="uuidRole" jdbcType="VARCHAR" />
     <result column="reply_uuid" property="replyUuid" jdbcType="INTEGER" />
     <result column="reply_uuid_type" property="replyUuidType" jdbcType="VARCHAR" />
     <result column="reply_uuid_name" property="replyUuidName" jdbcType="VARCHAR" />
+    <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="create_date" property="createDate" jdbcType="TIMESTAMP" />
@@ -17,7 +19,7 @@
     <result column="room_no_name" property="roomNoName" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, transaction_id,uuid,uuid_type,
+    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
   </sql>
@@ -32,11 +34,11 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <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,
+    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
       )
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER},#{uuid},#{uuidType},
+    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}
       )

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

@@ -54,6 +54,12 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 
 	@Autowired
 	private TaUserMapper taUserMapper;
+	
+	@Autowired
+	private TaUserVerifyMapper taUserVerifyMapper;
+	
+	@Autowired
+	private TaSysRoleMapper taSysRoleMapper;
 
 
 	@Override
@@ -334,10 +340,15 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		TpTransaction tpTransaction= tpTransactionMapper.selectById(id);
 		
 		TransactionReply transactionReply= new TransactionReply();
-		// 查询回复的ta_userID
-		 User user= userMapper.selectById(userElement.getId());
+		
 		int Type=replyType.intValue();
 		if (Type==1) {
+			// 查询回复的角色信息
+			String replyRole = "物业";
+			if (tpTransaction.getUuidType().equals("app")){
+				TaUserVerify taUserVerify= taUserVerifyMapper.selectById(tpTransaction.getUuid());
+				replyRole = taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId()).getDescription();
+			}
 			transactionReply.setCommunityId(userElement.getCommunityId())
 					.setTransactionId(id)
 					.setUuid(userElement.getId())
@@ -348,6 +359,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 					.setReplyUuid(tpTransaction.getUuid())
 					.setReplyUuidType(tpTransaction.getUuidType())
 					.setReplyUuidName(tpTransaction.getUuidName())
+					.setReplyUuidRole(replyRole)
 					.setCreateDate(LocalDateTime.now());
 		}
 		if (Type!=1) {
@@ -363,7 +375,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 					.setReplyUuid(Reply.getUuid())
 					.setReplyUuidType("prop")
 					.setReplyUuidName(Reply.getUuidName())
-					.setUuidRole("物业")
+					.setReplyUuidRole("物业")
 					.setCreateDate(LocalDateTime.now());
 		}
 		transactionReplyMapper.insert(transactionReply);