合并

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

@@ -43,7 +43,7 @@ public class CodeController {
 
         log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
         if (!AccountValidatorUtil.isPhone(phone)){
-            response.addError("请输入正取的手机号!");
+            response.addError("请输入正确的手机号!");
             return response;
         }
 

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
@@ -73,7 +75,7 @@ public class TaUserServiceImpl implements ITaUserService {
         ResponseBean response = new ResponseBean();
         log.info("{} 手机号校验结果: {}",user.getLoginName(),AccountValidatorUtil.isPhone(user.getLoginName()));
         if (!AccountValidatorUtil.isPhone(user.getLoginName())){
-            response.addError("请输入正取的手机号!");
+            response.addError("请输入正确的手机号!");
             return response;
         }
         Map<String,Object> map = Maps.newHashMap();
@@ -112,7 +114,7 @@ public class TaUserServiceImpl implements ITaUserService {
         AppkeyCache.setCache(loginName,"null");
         log.info("{} 手机号校验结果: {}",loginName,AccountValidatorUtil.isPhone(loginName));
         if (!AccountValidatorUtil.isPhone(loginName)){
-            response.addError("请输入正取的手机号!");
+            response.addError("请输入正确的手机号!");
             return response;
         }
         if (StringUtils.isBlank(communityId)) {
@@ -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,26 @@ 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 tpBuildingOwnerInfoId=tpBuildingOwnerInfoMapper.selectOwnerTel(taUser.getLoginName());          //
+            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(tpBuildingOwnerInfoId.getId());
+            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/controller/CodeController.java

@@ -41,7 +41,7 @@ public class CodeController {
 
         log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
         if (!AccountValidatorUtil.isPhone(phone)){
-            response.addError("请输入正取的手机号!");
+            response.addError("请输入正确的手机号!");
             return response;
         }
 

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/BuildingOwnerInfoServiceImpl.java

@@ -140,7 +140,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
         if (!AccountValidatorUtil.isPhone(tpBuildingOwnerInfo.getOwnerTel())){
-            responseBean.addError("请输入正取的手机号!");
+            responseBean.addError("请输入正确的手机号!");
             return responseBean;
         }
 
@@ -254,7 +254,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         // 物业端的用户,也就是正在操作的物业人员
         User user = userMapper.selectById(userElement.getId());
         if (!AccountValidatorUtil.isPhone(tpBuildingOwnerInfo.getOwnerTel())){
-            responseBean.addError("请输入正取的手机号!");
+            responseBean.addError("请输入正确的手机号!");
             return responseBean;
         }
 
@@ -270,7 +270,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         // 校验楼栋信息表
         selectBuild = getBuildingInfo(tpBuildingOwnerInfo, userElement.getCommunityId());
         if (null != selectBuild) {
-            responseBean.addError("该楼层的户号,已存在!");
+            responseBean.addError("该楼层的户号已存在!");
             return responseBean;
         }
 

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/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/views/owner/index.vue

@@ -34,14 +34,14 @@
         <template slot-scope="scope">
           <span v-if="scope.row.gender==1">{{ '男' }}</span>
           <span v-if="scope.row.gender==2">{{ '女' }}</span>
-        </template>      
+        </template>
       </el-table-column>
       <el-table-column prop="idCard" label="身份证号" align="center" />
       <!-- <el-table-column prop="name" label="所在户" width="180" /> -->
       <el-table-column label="所在户" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.building!==null&&scope.row.unit!==null&&scope.row.level!==null&&scope.row.roomNo!==null&&scope.row.phase!==null">
-          {{ scope.row.building + scope.row.unit + scope.row.level + scope.row.roomNo+scope.row.phase }}
+          {{ scope.row.phase+scope.row.building + scope.row.unit + scope.row.level + scope.row.roomNo }}
           </span>
           </template>
       </el-table-column>

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

@@ -113,10 +113,8 @@ export default {
       })
     },
     resetForm(formName) {
-      console.log("2")
       // this.$refs[formName].resetFields()
       this.$refs[formName].validate((valid) => {
-        console.log("1")
         if (valid) {
           this.addActivity(2)
         } else {

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

@@ -12,7 +12,7 @@
       <div class="text-progress">
         <span class="people-number">已报名人数 {{ ruleForm.signUpCount }}</span>
         <div class="outer-layer"/>
-        <div class="inner-layer"/>
+        <div ref="innerDiv" :style="{ backgroundColor: 'aquamarine', height: '6px', width: innerW + 'px', position: 'relative', marginTop: '-4px' }"/> <!-- class="inner-layer" -->
       </div>
       <div class="circular"/>
       <div class="people-limit">限制{{ ruleForm.signUpMax }}人</div>
@@ -26,6 +26,7 @@
 </template>
 
 <script>
+
 export default {
   name: 'Index',
   data() {
@@ -42,7 +43,8 @@ export default {
         registrationEndTime: '', // 报名活动结束时间
         sort: 1, // 权重
         status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
-      }
+      },
+      innerW: 0 // 进度条
     }
   },
   mounted() {
@@ -54,6 +56,12 @@ export default {
         const resData = res.data
         this.ruleForm = resData.info
         this.ruleForm.contentImg = resData.contentImg
+        if (this.ruleForm.signUpMax !== 0) {
+          const tempNum = 450 / this.ruleForm.signUpMax
+          this.innerW = this.ruleForm.signUpCount * tempNum
+          console.log(this.$refs.innerDiv.style.width)
+          console.log(this.innerW)
+        }
       })
     },
     formatDate(val) {
@@ -115,13 +123,12 @@ export default {
   background-color: gainsboro;
   height: 3px;
   width: 450px;
-  margin-top: -10px;
   position: relative;
 }
 .inner-layer {
   background-color: aquamarine;
   height: 6px;
-  width: 100px;
+  width: 20px;
   position: relative;
   margin-top: -4px;
 }
@@ -133,16 +140,16 @@ export default {
   height: 20px;
   position: relative;
   margin-left: 452px;
-  margin-top: 11px;
+  margin-top: 21px;
   float: left;
 }
 .people-limit {
-  margin-top: 13px;
+  margin-top: 23px;
 }
 .bom-button{
   display: flex;
   justify-content: center;
-  margin-top: 20px;
+  margin-top: 30px;
   margin-bottom: 100px;
 }
 </style>

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

@@ -57,7 +57,14 @@
         prop="remark"
         label="报名备注"
         align="center">
-        <template slot-scope="scope"><el-input :value="scope.row.remark" readonly @click="showDialog(scope.row.remark)" /></template>
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <p>{{ scope.row.remark }}</p>
+            <div slot="reference" class="text-remark">
+              {{ scope.row.remark }}
+            </div>
+          </el-popover>
+        </template>
       </el-table-column>
       <el-table-column
         prop="phone"
@@ -244,4 +251,10 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+.text-remark{
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap !important;
+  outline: 0 !important
+}
 </style>