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/dao/TpTransactionMapper.java

@@ -4,6 +4,7 @@ import com.community.huiju.model.TpTransaction;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -31,7 +32,7 @@ public interface TpTransactionMapper {
 	
 	List<Map<String, Object>> getReportReasons();
     
-    int saveReportReason(@Param("userId") Integer userId,@Param("communityId") Integer communityId,@Param("transactionId") Integer transactionId,@Param("reportReasonId") String reportReasonId);
+    int saveReportReason(@Param("userId") Integer userId, @Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId, @Param("reportReasonId") String reportReasonId, @Param("createDate") Date createDate);
 
     /**
      * 查询的当前用户自己的所有帖子

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

@@ -1,5 +1,8 @@
 package com.community.huiju.model;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
+
 public class TpTransactionReport {
     private Integer id;
 
@@ -11,6 +14,16 @@ public class TpTransactionReport {
 
     private Integer reporterId;
 
+    private Date createDate;
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
     public Integer getId() {
         return id;
     }

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

@@ -506,7 +506,7 @@ public class SocialServiceImpl implements SocialServiceI {
             return responseBean;
         }
         //插入举报表
-        tpTransactionMapper.saveReportReason(userId, communityId, transactionId, reportReasonId);
+        tpTransactionMapper.saveReportReason(userId, communityId, transactionId, reportReasonId,new Date());
         //更新交易表的举报状态为被举报
         TpTransaction record = new TpTransaction();
         record.setId(transactionId);

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

@@ -306,9 +306,9 @@
 
     <insert id="saveReportReason">
     insert into tp_transaction_report (community_id, transaction_id,
-      report_reason_id, reporter_id)
+      report_reason_id, reporter_id,create_date)
     values (#{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER},
-      #{reportReasonId,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER})
+      #{reportReasonId,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER},#{createDate,jdbcType=TIMESTAMP})
   </insert>
     <select id="getUserTransactionList" resultMap="BaseResultMap">
 

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/CommunityServiceImpl.java

@@ -41,7 +41,9 @@ public class CommunityServiceImpl implements CommunityServiceI {
 
 	@Autowired
 	private TpEquipmentTreeMapper tpEquipmentTreeMapper;
-	
+
+	@Autowired
+	private TaUserMapper taUserMapper;
 	/**
 	 * 分页获取小区列表
 	 * @param toCommunities
@@ -68,7 +70,18 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		if (size < 1){
 			return 0;
 		}
-	 
+
+
+		//时维护ta_user（发帖需要）
+		TaUser taUser= new TaUser();
+		taUser.setLoginName(toCommunities.getLoginName());
+		taUser.setCreateDate(new Date());
+		taUser.setUserName(toCommunities.getUserName());
+		taUser.setStatus("1");
+		taUserMapper.insert(taUser);
+
+
+
 		//构建用户信息
 		TpUser tpUser = new TpUser();
 		tpUser.setUserName(toCommunities.getUserName());
@@ -77,6 +90,7 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		tpUser.setCreateUser(1);
 		tpUser.setCommunityId(toCommunities.getId());
 		tpUser.setStatus(Constant.EFFECTIVE);
+		tpUser.setTaUserId(taUser.getId());
 		//插入用户信息
 		tpUserMapper.insertSelective(tpUser);
 		//维护此用户的角色

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -180,7 +180,7 @@ public class ToUserServerImpl implements IToUserService {
     @Override
     public ResponseBean addUser(String parameter,Integer userID,Integer communityId) {
         ResponseBean response= new ResponseBean<>();
-        JSONObject object= JSONObject.parseObject(parameter);
+         JSONObject object= JSONObject.parseObject(parameter);
         ToUser toUser= new ToUser();
 
         String loginName= object.getString("loginName");
@@ -214,27 +214,6 @@ public class ToUserServerImpl implements IToUserService {
             toSysUserRole.setRoleId(roleID);
             toSysUserRoleMapper.insert(toSysUserRole);
         }
-
-        //时维护ta_user（发帖需要）
-        TaUser taUser= new TaUser();
-        taUser.setLoginName(loginName);
-        taUser.setCreateUser(userID);
-        taUser.setCreateDate(new Date());
-        taUser .setUserName(userName);
-        taUser .setStatus("1");
-
-        taUserMapper.insert(taUser);
-        TpUser tpUser= new TpUser();
-        tpUser.setTaUserId(taUser.getId());
-        tpUser.setUserName(userName);
-        tpUser.setLoginName(loginName);
-        tpUser.setRemark(remark);
-        tpUser.setStatus("1");
-
-        tpUser.setCreateUser(userID);
-        tpUser.setCreateDate(new Date());
-        tpUser.setCommunityId(communityId);
-        tpUserMapper.insertSelective(tpUser);
          response.addSuccess("成功");
         return response;
     }

CODE/smart-community/operate-api/src/main/resources/mapper/TaUserMapper.xml

@@ -44,7 +44,7 @@
     delete from ta_user
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
+  <insert id="insert" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
     insert into ta_user (id, community_id, building_owner_info_id,
       head_portrait, user_name, login_name,
       login_password, email, gender,
@@ -60,7 +60,7 @@
       #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
       #{hkPersonNo,jdbcType=BIGINT}, #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR},
-      #{idCard,jdbcType=VARCHAR}, #{openid,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR},
+      #{idCard,jdbcType=VARCHAR}, #{openid,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
@@ -142,9 +142,6 @@
       <if test="nickname != null" >
         nickname,
       </if>
-      <if test="taUserId != null" >
-        ta_user_id,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >

CODE/smart-community/operate-api/src/main/resources/mapper/TpUserMapper.xml

@@ -15,6 +15,7 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="ta_user_id" property="taUserId" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, user_name, login_name, login_password, status, remark, email, head_portrait, 
@@ -84,6 +85,9 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="taUserId != null" >
+        ta_user_id
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -125,6 +129,9 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER}
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpUser" >

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

@@ -241,7 +241,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 //                        String codeUrl= imageServiceI.getImageUrl(inputStream);
 
                         TdImages tdImages= new TdImages();
-                        tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId());
+                        tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId()+"&codeState=1");
                         tdImages.setUuid(tpActivity.getId());
                         tdImages.setType("activityCode");
                         tdImages.setCreateUser(userElement.getId());

CODE/smart-community/property-api/src/main/resources/application.yml

@@ -14,4 +14,4 @@ mybatis-plus:
 
 # 二维码生成地址
 qr-code:
-  url: https://www.baidu.com/?id=
+  url: http://ycapi.jcjyhn.com/#/forum/sign?id=

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

@@ -24,6 +24,7 @@
             AND u.user_name like concat('%',#{reportUserNmae},'%')
         </if>
         </where>
+        GROUP BY tr.id
         order by tr.create_date desc
 </select>
 </mapper>

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

@@ -102,7 +102,8 @@ export function userVerifyAudit(data) {
     method: 'put',
     params: {
       verifyStatus: data.verifyStatus,
-      roleState: data.type
+      roleState: data.type,
+      remark: data.remark
     }
   })
 }

VUECODE/smart-property-manage/src/views/building/audit/index.vue

@@ -1,6 +1,18 @@
 <template>
   <div id="root">
     <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-dialog
+        title="提示"
+        :visible.sync="dialogVisible"
+        width="30%">
+        <span><el-radio v-model="formInline.remark" label="不认识的人的手机号">不认识的人的手机号</el-radio>
+              <el-radio v-model="formInline.remark" label="其他原因需要沟通">其他原因需要沟通</el-radio>
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="submitAudit()">确 定</el-button>
+        </span>
+      </el-dialog>
       <el-form-item label="手机号">
         <el-input v-model="formInline.phone" placeholder="手机号"/>
       </el-form-item>
@@ -67,8 +79,8 @@
         align="center"
         label="操作">
         <template slot-scope="scope">
-          <el-button type="primary" @click="userVerifyAudit(scope.row.id,true)">通过</el-button>
-          <el-button type="danger" @click="userVerifyAudit(scope.row.id,false)">不通过</el-button>
+          <el-button type="primary" @click="userVerifyAudit(scope.row.id,true,1)">通过</el-button>
+          <el-button type="danger" @click="passTheAudit(scope.row.id,false)">不通过</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -93,6 +105,7 @@ export default {
   data() {
     return {
       formInline: {
+        remark: '',
         phone: '',
         userVerifyId: '',
         verifyStatus: true,
@@ -102,7 +115,8 @@ export default {
         pageSize: 10
       },
       total: 0, // 总数
-      tableData: [] // 数据体
+      tableData: [], // 数据体
+      dialogVisible: false
     }
   },
   mounted() {
@@ -145,9 +159,22 @@ export default {
         console.log('UserVerifyAll error')
       })
     },
-    userVerifyAudit(verifyId, vstatus) {
+    // 展示弹框
+    passTheAudit(verifyId, vstatus){
       this.formInline.userVerifyId = verifyId
       this.formInline.verifyStatus = vstatus
+      this.dialogVisible = true
+    },
+    // 提交
+    submitAudit(){    
+      this.userVerifyAudit()
+    },
+
+    userVerifyAudit(verifyId, vstatus,isA) {
+      if(isA=='1'){
+      this.formInline.userVerifyId = verifyId
+      this.formInline.verifyStatus = vstatus
+      }
       this.$store.dispatch('UserVerifyAudit', this.formInline).then((res) => {
         const resCode = res.code
         if (resCode === '0') {
@@ -155,6 +182,7 @@ export default {
             message: res.message,
             type: 'success'
           })
+          this.dialogVisible = false
           this.getData()
           return
         }

VUECODE/smart-property-manage/src/views/building/info/index.vue

@@ -54,16 +54,18 @@
                   <el-option label="家属" value="3"/>
                 </el-select>
               </td>
-              <td>审核状态</td>                  
-              <td v-if="listQuery.verifyStatus=='1'">{{ '审核通过' }}<td>
-              <td v-if="listQuery.verifyStatus=='2' && listQuery.off=='1' "><font color="red">{{ '审核未通过' }}</font><td>
-              <td v-if="listQuery.verifyStatus=='0' && listQuery.off=='1' "><font color="red">{{ '未审核' }}</font><td>    
-              <td v-if="listQuery.off=='2' && listQuery.verifyStatus !='1'">
+              <td>审核状态
+              <span>&nbsp;&nbsp;&nbsp;&nbsp;</span>                   
+              <span v-if="listQuery.verifyStatus=='1'">{{ '审核通过' }}</span>
+              <span v-if="listQuery.verifyStatus=='2' && listQuery.off=='1' "><font color="red">{{ '审核未通过' }}</font></span>
+              <span v-if="listQuery.verifyStatus=='0' && listQuery.off=='1' "><font color="red">{{ '未审核' }}</font></span>    
+              <span v-if="listQuery.off=='2' && listQuery.verifyStatus !='1'">
                 <el-select v-model="listQuery.status" placeholder="请选择">
                   <el-option label="未审核" value="0"/>
                   <el-option label="通过" value="1"/>
                   <el-option label="不通过" value="2"/>
                 </el-select>
+              </span>
               </td>
               <td>资料手机</td>
               <td style="color:#888888">{{ listQuery.loginName }}</td>

VUECODE/smart-property-manage/src/views/social/announcement/add.vue

@@ -7,7 +7,7 @@
       </el-form-item>
       <el-form-item  prop="announcementCarouselImg" >
         <div >
-          <div style="transform:translateY(250%);">公告配图</div>
+          <div style="transform:translateY(250%);">公告轮播图</div>
         <div  style="width: 500px;padding-left:20%;">
         <el-upload 
           :show-file-list="false"
@@ -28,7 +28,7 @@
       </el-form-item>
       <el-form-item>
          <div >
-          <div style="transform:translateY(250%);">公告轮播图</div>
+          <div style="transform:translateY(250%);">公告配图</div>
         <div  style="width: 500px;padding-left:13%;">
         <el-upload
           :on-preview="handlePictureCardPreview"

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

@@ -41,7 +41,7 @@
         label="角色"
         show-overflow-tooltip
         align="center">
-        <!--<template slot-scope="scope">{{ getRoleName(scope.row.roleName) }}</template>-->
+        <template slot-scope="scope">{{ getRoleName(scope.row.roleName) }}</template>
       </el-table-column>
       <el-table-column
         prop="address"

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

@@ -291,7 +291,7 @@ export default {
         width: 100%;
         overflow: auto;
         word-break: break-all; 
-        margin-left: -14.5%;
+        margin-left: -11.5%;
     }
 </style>