合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -72,7 +72,7 @@ public class UserController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId=userElement.getId();
-        ResponseBean response=iTaUserService.upDateloginName(userId,paramets);
+        ResponseBean response=iTaUserService.upDateloginName(userId,paramets,userElement.getCommunityId());
         return response;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java

@@ -25,4 +25,9 @@ public interface TpBuildingOwnerInfoMapper {
     @ResultMap("BaseResultMap")
     @Select("select * from tp_building_owner_info where community_id=#{communityId} and owner_tel=#{ownerTel}")
     List<TpBuildingOwnerInfo> getByCommunityIdAndOwnerTel(@Param("communityId") Integer communityId, @Param("ownerTel") String ownerTel);
+
+    TpBuildingOwnerInfo updatOwnerTel(Integer communityId,String OwnerTel);
+
+    //根据手机号查询当前信息
+    TpBuildingOwnerInfo selectOwnerTel(@Param("ownerTel")String ownerTel);
 }

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

@@ -39,7 +39,7 @@ public interface ITaUserService {
      * @param id
      * @return
      */
-    ResponseBean upDateloginName(Integer id, String paramets);
+    ResponseBean upDateloginName(Integer id, String paramets,Integer communityId);
 
     /**
      * 获取房屋成员列表

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

@@ -35,6 +35,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.logging.SimpleFormatter;
 
+import static com.community.commom.constant.Constant.OWNER;
+
 /**
  * 用户业务 实现
  * @author weiximei
@@ -239,7 +241,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseBean upDateloginName(Integer id, String paramets) {
+    public ResponseBean upDateloginName(Integer id, String paramets,Integer communityId) {
         ResponseBean response = new ResponseBean();
 
         JSONObject jsonObject = JSONObject.parseObject(paramets);
@@ -288,11 +290,11 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("验证码错误!");
             return response;
         }
-
-
             TaUser taUser=new TaUser();
             taUser.setLoginName(phone);
             taUser.setId(userId);
+            taUser.setUpdateDate(new Date());
+            taUser.setUpdateUser(id);
             taUserMapper.updateLongName(taUser);
             response.addSuccess("修改成功");
             AppkeyCache.setCache(user.getLoginName(),"null");
@@ -303,10 +305,10 @@ public class TaUserServiceImpl implements ITaUserService {
              */
 
             // 修改楼栋信息资料库的手机号
-            Map<String, Object> map = Maps.newHashMap();
-            map.put("communityId", user.getCommunityId());
-            map.put("userId", userId);
-            TaSysUserRole taSysUserRole = taSysUserRoleMapper.selectByCommunityIdAndUserId(map);
+            Map<String, Object> roleMap = Maps.newHashMap();
+            roleMap.put("communityId", user.getCommunityId());
+            roleMap.put("userId", userId);
+            TaSysUserRole taSysUserRole = taSysUserRoleMapper.selectByCommunityIdAndUserId(roleMap);
             // 1 业主 2 租客 3 家属
             // 只允许业主修改
             if (taSysUserRole.getRoleId().intValue() == 1) {
@@ -350,10 +352,24 @@ public class TaUserServiceImpl implements ITaUserService {
         ResponseBean response = new ResponseBean();
 
         TaUser taUser = taUserMapper.selectByPrimaryKey(user.getId());
+        HashMap map= new HashMap<>();
+                map.put("communityId",taUser.getCommunityId());
+                map.put("userId",taUser.getId());
+        TaSysUserRole TaSysUserRole= taSysUserRoleMapper.selectByCommunityIdAndUserId(map);
         BeanTools.copyProperties(user, taUser);
-
-        int result = taUserMapper.updateByPrimaryKeySelective(taUser);
-
+            int result = taUserMapper.updateByPrimaryKeySelective(taUser);
+            int VerifyStatus= Integer.parseInt(taUser.getVerifyStatus());
+            int Role= TaSysUserRole.getRoleId();
+            if (1==VerifyStatus &&1==Role) {
+            TpBuildingOwnerInfo TpBuildingOwnerInfo = new TpBuildingOwnerInfo();
+            TpBuildingOwnerInfo.setOwnerName(user.getUserName());
+            TpBuildingOwnerInfo.setGender(user.getGender());
+            TpBuildingOwnerInfo.setOwnerTel(user.getLoginName());
+            TpBuildingOwnerInfo.setUpdateDate(new Date());
+            TpBuildingOwnerInfo.setUpdateUser(taUser.getId());
+            TpBuildingOwnerInfo.setId(taUser.getBuildingOwnerInfoId());
+            tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(TpBuildingOwnerInfo);
+        }
         if (result > 0){
             response.addSuccess("修改成功!");
         }else {

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

@@ -231,4 +231,67 @@
       update_date = #{updateDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <update id="updatOwnerTel" parameterType="com.community.huiju.model.TpBuildingOwnerInfo" >
+    update tp_building_owner_info
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="idCard != null" >
+        id_card = #{idCard,jdbcType=VARCHAR},
+      </if>
+      <if test="phase != null">
+        phase = #{phase,jdbcType=VARCHAR},
+      </if>
+      <if test="building != null" >
+        building = #{building,jdbcType=VARCHAR},
+      </if>
+      <if test="unit != null" >
+        unit = #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="level != null" >
+        level = #{level,jdbcType=VARCHAR},
+      </if>
+      <if test="roomNo != null" >
+        room_no = #{roomNo,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerName != null" >
+        owner_name = #{ownerName,jdbcType=VARCHAR},
+      </if>
+      <if test="ownerTel != null" >
+        owner_tel = #{ownerTel,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null" >
+        gender = #{gender,jdbcType=CHAR},
+      </if>
+      <if test="pairStatus != null" >
+        pair_status = #{pairStatus,jdbcType=CHAR},
+      </if>
+      <if test="verifyStatus != null" >
+        verify_status = #{verifyStatus,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where community_id = #{communityId,jdbcType=INTEGER} and wnerTel =  owner_tel = #{ownerTel,jdbcType=VARCHAR}
+  </update>
+
+  <select id="selectOwnerTel" resultType="com.community.huiju.model.TpBuildingOwnerInfo" parameterType="string">
+    select
+    id
+    from
+    tp_building_owner_info
+    where  owner_tel = #{ownerTel,jdbcType=VARCHAR}
+  </select>
+
 </mapper>

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

@@ -16,6 +16,6 @@ import org.apache.ibatis.annotations.Param;
  */
 @Mapper
 public interface UserMapper extends BaseMapper<User> {
-    String selectByIdCreateUserName(@Param("id") Integer id);
+    String selectByIdUserName(@Param("id") Integer id);
 
 }

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

@@ -74,9 +74,9 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             AnnouncementTable announcementTable = new AnnouncementTable();
             BeanUtils.copyProperties(e, announcementTable);
             //创建人
-            String createUserName = userMapper.selectByIdCreateUserName(e.getUpdateUser());
+            String createUserName = userMapper.selectByIdUserName(e.getUpdateUser());
             //修改人
-            String updateDateName = userMapper.selectByIdCreateUserName(e.getCreateUser());
+            String updateDateName = userMapper.selectByIdUserName(e.getCreateUser());
             announcementTable.setCreateUserName(createUserName);
             announcementTable.setUpdateDateName(updateDateName);
             return announcementTable;

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

@@ -21,7 +21,7 @@
           AND announcement_title like concat('%',#{record.announcementTitle,jdbcType=VARCHAR},'%')
         </if>
           AND community_id = #{record.communityId,jdbcType=INTEGER}
-          order by create_date desc
+          ORDER BY sort DESC,create_date desc
       </where>
   </select>
   <select id="getById" resultType="com.community.huiju.model.TpAnnouncement">

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

@@ -32,6 +32,7 @@
                 and	(verify_status = 1 or verify_status = 2)
             </if>
             and community_id=#{CommunityId,jdbcType=INTEGER}
+            order by create_date desc
         </where>
     </select>
 

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

@@ -1,7 +1,7 @@
 <?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.UserMapper">
-    <select id="selectByIdCreateUserName" parameterType="int" resultType="string">
+    <select id="selectByIdUserName" parameterType="int" resultType="string">
         SELECT
          user_name
         FROM

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

@@ -145,14 +145,14 @@ export const constantRouterMap = [
         meta: { title: '活动详情', icon: 'table' }
       },
       {
-        path: '/announcement',
+        path: '/announcement/add',
         component: () => import('@/views/social/announcement/add'),
         name: 'announcement-add',
         hidden: true,
         meta: { title: '添加公告', icon: 'table' }
       },
       {
-        path: '/announcement',
+        path: '/announcement/edit',
         component: () => import('@/views/social/announcement/edit'),
         name: 'announcement-edit',
         hidden: true,
@@ -166,11 +166,11 @@ export const constantRouterMap = [
         meta: { title: '活动报名人', icon: 'table' }
       },
       {
-        path: '/announcement',
+        path: '/announcement/details',
         component: () => import('@/views/social/announcement/details'),
         name: 'contentParticulars-details',
         hidden: true,
-        meta: { title: '编辑公告', icon: 'table' }
+        meta: { title: '公告详情', icon: 'table' }
       }
     ]
   },

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

@@ -112,6 +112,8 @@ export default {
           return false
         }
       })
+       // 关闭加载框
+      loading.close()
     },
     resetForm(formName,status) {
       console.log(status)

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

@@ -24,7 +24,7 @@
     </div> -->
     <!-- <span>报名截止时间：{{ formatDate(ruleForm.registrationEndTime) }}</span> -->
     <div class="bom-button">
-      <el-button type="primary" style="width: 150px;" @click="ediActivity">修改</el-button>
+      <el-button type="primary" style="width: 150px;" @click="edi">修改</el-button>
     </div>
   </div>
 </template>
@@ -64,14 +64,10 @@ export default {
       this.ruleForm.announcementCarouselImg=resData.tpAnnouncement.announcementCarouselImg // 轮播图
       this.sort=resData.tpAnnouncement.sort// 权重
         //多张图片进行遍历
-        for (let i = 0; i <=resData.studentList.length; i++) {
-        //  this.ruleForm.contentImg.push({ url: resData.studentList[i].imageUrl })
-        
-        console.log("sssss:",resData.studentList.imageUrl[i])
+        for (let i = 0; i <resData.studentList.length; i++) {
+          this.ruleForm.contentImg.push({ url: resData.studentList[i].imageUrl })
         }
       })
-
-      console.log(this.ruleForm.contentImg)
     },
     formatDate(val) {
       var value = new Date(val)
@@ -84,8 +80,11 @@ export default {
       // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
       return year + '-' + month + '-' + day
     },
-    ediActivity() { // 修改活动
-      this.$router.push({ name: 'activity-edi', params: { id: this.ruleForm.id }})
+    edi() { // 修改活动
+        this.$router.push({ name: 'announcement-edit' , params: { id: this.ruleForm.id }})
+        console.log("123")
+        //   this.$router.push({ name: 'announcement-edit', params: { id: this.ruleForm.id }})
+      
     }
   }
 }