合并

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

@@ -33,7 +33,7 @@ public interface TpEquipmentMapper {
             "(select configuration_value FROM tp_configuration WHERE id = tm.url_id) as monitoringUrl, " +
             "(select configuration_value FROM tp_configuration WHERE id = tm.security_guard_tel_id) as securityGuardTel, " +
             "(select configuration_value FROM tp_configuration WHERE id = tm.security_room_tel_id) as securityRoomTel, " +
-            "(select configuration_value FROM tp_configuration WHERE id = tm.address_id) as monitoringAddressId " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.address_id) as monitoringAddress " +
             "FROM " +
             "tp_equipment tm " +
             "where tm.community_id = #{communityId} and tm.equipment_type = 1")

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

@@ -990,6 +990,7 @@ public class TaUserServiceImpl implements ITaUserService {
     private ResponseBean checkHouse(ResponseBean responseBean, TaUserVO taUserVO, TaUserVerify userVerify) {
         // 设置 这个审核id （这个要返给前端）
         taUserVO.setUserVerifyId(userVerify.getId());
+        taUserVO.setVerifyStatus(userVerify.getVerifyStatus());
 
         // 认证状态  0 是未审核   1是审核通过   2是审核不通过
         String verifyStatus = userVerify.getVerifyStatus();

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

@@ -113,13 +113,28 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         // 通过 角色名称 查询出角色的id
         String roleName = jsonObject.getString("roleName");
         TaSysRole sysRole = taSysRoleMapper.selectByRoleName(roleName);
+        if (null == sysRole) {
+            responseBean.addError("非法角色!");
+            return responseBean;
+        }
+
+        // 如果申请的是户主
+        if (sysRole.getId().intValue() == 1) {
+            // 校验是否有审核通过的业主
+            TaUserVerify hasUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(taUserVerify.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
+            if (null != hasUserVerify) {
+                responseBean.addError("此房产已存在户主!");
+                return responseBean;
+            }
+        }
+
 
         // 校验该用户是否已经提交了一个当前房产的审核, 包含 待审核和已审核通过
-        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(userElement.getId(), userElement.getCommunityId(),
-                userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
-                userElement.getLevelId(), userElement.getRoomNoId());
+        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(userElement.getId(), taUserVerify.getCommunityId(),
+                taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(),
+                taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
         if (null != userVerifyList && userVerifyList.size() > 0) {
-            responseBean.addError("您已提交了这个房产的审核！请等待业主或者物业审核后，在进行下一步操作！");
+            responseBean.addError("您已提交了这个房产的审核！请等待户主或者物业审核后，在进行下一步操作！");
             return responseBean;
         }
 

CODE/smart-community/community-common/target/maven-archiver/pom.properties

@@ -1,4 +0,0 @@
-#Created by Apache Maven 3.3.9
-version=0.0.1
-groupId=com.community
-artifactId=community-common

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,32 +0,0 @@
-com\community\commom\redis\RedisTemplate.class
-com\community\commom\redis\RedisConfiguration.class
-com\community\commom\utils\OssUtil.class
-com\community\commom\redis\SingleRedisTemplate.class
-com\community\commom\utils\EnumUtils.class
-com\community\commom\hk\HttpClientSSLUtils$2.class
-com\community\commom\redis\RedisJsonSerializer.class
-com\community\commom\uuid\IdGen.class
-com\community\commom\utils\BeanTools.class
-com\community\commom\hk\HttpClientSSLUtils.class
-com\community\commom\session\UserElement.class
-com\community\commom\utils\CommonUtils.class
-com\community\commom\redis\RedisSerializer.class
-com\community\commom\utils\StringConverter.class
-com\community\commom\mode\ResponseBean.class
-com\community\commom\utils\DESUtils.class
-com\community\commom\redis\FastJsonSerializer.class
-com\community\commom\utils\DateUtils.class
-com\community\commom\utils\HttpClientUtils.class
-com\community\commom\constant\Constant.class
-com\community\commom\utils\CookieUtil.class
-com\community\commom\mode\HkResponseBean.class
-com\community\commom\ailiyun\AESDecode.class
-com\community\commom\uuid\IdGen$IdGenHolder.class
-com\community\commom\utils\PayPriceUtils.class
-com\community\commom\hk\HttpClientSSLUtils$1.class
-com\community\commom\utils\MD5Utils.class
-com\community\commom\redis\RedisObjectSerializer.class
-com\community\commom\utils\QRCodeGeneratorUtils.class
-com\community\commom\redis\SerializationFailedException.class
-com\community\commom\hk\Digests.class
-com\community\commom\utils\AccountValidatorUtil.class

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,29 +0,0 @@
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisJsonSerializer.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\ailiyun\AESDecode.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\HttpClientSSLUtils.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\PayPriceUtils.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DateUtils.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\HttpClientUtils.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DESUtils.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisSerializer.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\BeanTools.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\OssUtil.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisObjectSerializer.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\EnumUtils.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisTemplate.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\HkResponseBean.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SerializationFailedException.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CommonUtils.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\MD5Utils.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\session\UserElement.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SingleRedisTemplate.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\Digests.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\QRCodeGeneratorUtils.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisConfiguration.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\AccountValidatorUtil.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\uuid\IdGen.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\ResponseBean.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\StringConverter.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\FastJsonSerializer.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\constant\Constant.java
-E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CookieUtil.java

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/UserVerifyController.java

@@ -63,14 +63,16 @@ public class UserVerifyController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
             @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "userVerifyId", value = "审核id"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Boolean.class, name = "verifyStatus", value = "true通过；false不通过"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "remark", value = "审核不通过的原因"),
     })
     public ResponseBean getAll(@PathVariable("userVerifyId") Integer userVerifyId,
                                @RequestParam("verifyStatus") Boolean verifyStatus,
+                               @RequestParam(value = "remark", required = false) String remark,
                                HttpSession session) {
 
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        responseBean = iTaUserVerifyService.auditUser(userElement, userVerifyId, verifyStatus);
+        responseBean = iTaUserVerifyService.auditUser(userElement, userVerifyId, verifyStatus, remark);
         return responseBean;
     }
 
@@ -159,14 +161,16 @@ public class UserVerifyController extends BaseController {
             @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "userVerifyId", value = "审核id"),
             @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "roleState", value = "1:业主，2:租客，3:家属"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "verifyStatus", value = "0 是未审核1是审核通过2是审核不通过"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "remark", value = "审核不通过的原因"),
     })
     public ResponseBean verifyinfoAdd(@PathVariable("userVerifyId") Integer userVerifyId,
                                @RequestParam("verifyStatus") String verifyStatus,
                                @RequestParam("roleState") String roleState,
+                               @RequestParam(value = "remark", required = false) String remark,
                                HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        responseBean = iTaUserVerifyService.verifyinfoAdd(userElement, userVerifyId, verifyStatus, roleState);
+        responseBean = iTaUserVerifyService.verifyinfoAdd(userElement, userVerifyId, verifyStatus, roleState,remark);
         return responseBean;
     }
 

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

@@ -156,7 +156,9 @@ public class TpBuildingOwnerInfo implements Serializable {
     private String updateName;
 
     /**
-     * 审核id
+     * 审核id,（这个字段是临时的）
+     *
+     * 上面还有个 taUserVerifyId 字段，是楼栋资料库映射的, 和楼栋资料库是 一一对应的
      */
     @TableField(exist = false)
     private Integer userVerifyId;

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

@@ -26,17 +26,19 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
      * @param userElement
      * @param userVerifyId
      * @param verifyStatus
+     * @param remark
      * @return
      */
-    ResponseBean auditUser(UserElement userElement, Integer userVerifyId, Boolean verifyStatus);
+    ResponseBean auditUser(UserElement userElement, Integer userVerifyId, Boolean verifyStatus, String remark);
 
     /**
      * 楼栋详情页面审核审核
      * @param userElement
      * @param userVerifyId
      * @param verifyStatus
+     * @param remark
      * @return
      */
-    ResponseBean verifyinfoAdd(UserElement userElement, Integer userVerifyId, String verifyStatus ,String roleState);
+    ResponseBean verifyinfoAdd(UserElement userElement, Integer userVerifyId, String verifyStatus ,String roleState, String remark);
 
 }

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

@@ -797,7 +797,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         ids.stream().forEach(e->{
             TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
             if (null != tpBuildingOwnerInfo) {
-                taUserVerifyMapper.deleteById(tpBuildingOwnerInfo.getUserVerifyId());
+                taUserVerifyMapper.deleteById(tpBuildingOwnerInfo.getTaUserVerifyId());
             }
             tpBuildingOwnerInfoMapper.deleteById(e);
         });

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

@@ -77,7 +77,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     }
 
     @Override
-    public ResponseBean auditUser(UserElement userElement, Integer userVerifyId, Boolean verifyStatus) {
+    public ResponseBean auditUser(UserElement userElement, Integer userVerifyId, Boolean verifyStatus, String remark) {
         ResponseBean responseBean = new ResponseBean();
 
         TaUserVerify userVerify = taUserVerifyMapper.selectById(userVerifyId);
@@ -107,6 +107,10 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         if (verifyStatus && null == tpBuildingOwnerInfo) {
             insertBuildingOwnerInfo(userVerify, user);
         }
+        // 只有审核不通过的时候，写入不通过原因
+        if (Constant.REJECTED.equals(status)) {
+            userVerify.setRemark(remark);
+        }
         userVerify.setVerifyStatus(status);
         userVerify.setVerifyName(user.getUserName());
         taUserVerifyMapper.updateById(userVerify);
@@ -144,7 +148,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     private void hasUserVerify(UserElement userElement, TaUserVerify userVerify, boolean hasOwner){
         TaUserVerify hasUserVerify = null;
         // 校验这个房产有没有业主，只能存在一个业主
-        if (hasOwner) {
+        if (hasOwner && userVerify.getRoleId().intValue() == 1) {
             hasUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getCommunityId(), userVerify.getPhaseId(),
                     userVerify.getBuildingId(), userVerify.getUnitId(),
                     userVerify.getLevelId(), userVerify.getRoomNoId());
@@ -196,6 +200,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         tpBuildingOwnerInfo.setVerifyStatus("1");
         tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
         tpBuildingOwnerInfo.setCreateUser(user.getId());
+        tpBuildingOwnerInfo.setTaUserVerifyId(userVerify.getId());
 
         tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
         return tpBuildingOwnerInfo;
@@ -203,7 +208,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean verifyinfoAdd(UserElement userElement, Integer userVerifyId, String verifyStatus, String roleState) {
+    public ResponseBean verifyinfoAdd(UserElement userElement, Integer userVerifyId, String verifyStatus, String roleState, String remark) {
         ResponseBean responseBean = new ResponseBean();
 
         TaUserVerify userVerify = taUserVerifyMapper.selectById(userVerifyId);
@@ -211,6 +216,9 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             responseBean.addError("审核数据不存在！");
             return responseBean;
         }
+        // 不通过的原因
+        userVerify.setRemark(remark);
+        userVerify.setRoleId(Integer.valueOf(roleState));
         //判断审核数据是否冲突
         hasUserVerify(userElement,  userVerify,  true);
 
@@ -224,9 +232,11 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
                 taUser.getLoginName());
 
         userVerify.setVerifyStatus(verifyStatus);
-        userVerify.setRoleId(Integer.valueOf(roleState));
+
         // 审核通过的情况
         if ("1".equals(verifyStatus) && StringUtils.isNotBlank(roleState)) {
+            // 审核通过就把 不通过的原因拿掉
+            userVerify.setRemark("");
             userVerify.setRoleId(Integer.valueOf(roleState));
             // 只有这个人在当前房产没有楼栋资料的时候才添加
             if (null == tpBuildingOwnerInfo) {

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

@@ -70,12 +70,12 @@
             r.description as roleName,
             u.verify_status as verifyStatus,
             m.user_name AS updateName,
-            t.update_date as updateDate
+            t.create_date as createDate
         FROM
             tp_building_owner_info t
             INNER JOIN ta_user_verify u ON t.ta_user_verify_id = u.id
             LEFT JOIN ta_sys_role r ON u.role_id = r.id
-            LEFT JOIN tp_user m ON t.update_user = m.id
+            LEFT JOIN tp_user m ON t.create_user = m.id
         WHERE
 
         t.community_id=#{tpBuildingOwnerInfo.communityId,jdbcType=INTEGER}

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

@@ -92,8 +92,8 @@
         </template>
       </el-table-column>
       <el-table-column prop="updateName" label="编辑人" align="center" />
-      <el-table-column prop="updateDate" label="编辑时间" align="center" >
-        <template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template>
+      <el-table-column prop="createDate" label="编辑时间" align="center" >
+        <template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template>
       </el-table-column>
     </el-table>
     <div class="block">

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

@@ -189,10 +189,7 @@ export default {
           this.$router.push({ name: 'building-index' })
         }
         if (resCode === '1') {
-          this.$message({
-            message: res.message,
-            type: 'success'
-          })
+          this.$message.error(res.message)
         }
       }).catch(() => {
         console.log('UserVerifyAudit error')