合并

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

@@ -695,12 +695,14 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		if (type.equals("roomNo")) {
 			TpLevel tpLevel = tpLevelMapper.selectById(id);
 			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
-			 tpBuildingOwnerInfo.eq("community_id", tpLevel.getCommunityId())
-								.eq("phase_id", tpLevel.getPhaseId())
-								.eq("building_id", tpLevel.getBuildingId())
-								.eq("unit_id", tpLevel.getUnitId())
-								.eq("level_id", tpLevel.getId())
-								.eq("verify_status", 1);
+			if (null!=tpLevel) {
+				tpBuildingOwnerInfo.eq("community_id", tpLevel.getCommunityId())
+						.eq("phase_id", tpLevel.getPhaseId())
+						.eq("building_id", tpLevel.getBuildingId())
+						.eq("unit_id", tpLevel.getUnitId())
+						.eq("level_id", tpLevel.getId())
+						.eq("verify_status", 1);
+			    }
 			List<TpBuildingOwnerInfo> ifoBuid = tpBuildingOwnerInfoMapper .selectList(tpBuildingOwnerInfo);
 			if (null != ifoBuid && ifoBuid.size()>0) {
 				return false;
@@ -709,10 +711,12 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		if (type.equals("level")) {
 			TpUnit tpUnit = tpUnitMapper.selectById(id);
 			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
-			 tpBuildingOwnerInfo.eq("community_id", tpUnit.getCommunityId())
-								.eq("phase_id", tpUnit.getPhaseId())
-								.eq("building_id", tpUnit.getBuildingId())
-								.eq("verify_status", 1);
+			if (null!=tpUnit) {
+				tpBuildingOwnerInfo.eq("community_id", tpUnit.getCommunityId())
+						.eq("phase_id", tpUnit.getPhaseId())
+						.eq("building_id", tpUnit.getBuildingId())
+						.eq("verify_status", 1);
+				}
 			List<TpBuildingOwnerInfo> ifoBuid = tpBuildingOwnerInfoMapper.selectList(tpBuildingOwnerInfo);
 			if (null != ifoBuid && ifoBuid.size()>0) {
 				return false;
@@ -722,10 +726,12 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			//判断书否有已审核人员
 			TpBuilding tpBuilding = tpBuildingMapper.selectById(id);
 			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
-			 tpBuildingOwnerInfo.eq("community_id", tpBuilding.getCommunityId())
-								.eq("phase_id", tpBuilding.getPhaseId())
-								.eq("building_id", tpBuilding.getId())
-								.eq("verify_status", 1);
+			if (null!=tpBuilding) {
+				tpBuildingOwnerInfo.eq("community_id", tpBuilding.getCommunityId())
+						.eq("phase_id", tpBuilding.getPhaseId())
+						.eq("building_id", tpBuilding.getId())
+						.eq("verify_status", 1);
+			    }
 			List<TpBuildingOwnerInfo> ifoBuid = tpBuildingOwnerInfoMapper.selectList(tpBuildingOwnerInfo);
 			if (null != ifoBuid && ifoBuid.size()>0) {
 				return false;
@@ -733,10 +739,12 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		}
 		if (type.equals("building")) {
 			TpPhase phase = tpPhaseMapper.selectById(id);
-			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
-			 tpBuildingOwnerInfo.eq("community_id", phase.getCommunityId())
-								.eq("phase_id", phase.getId())
-								.eq("verify_status", 1);
+				QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
+			if (null!=phase) {
+				tpBuildingOwnerInfo.eq("community_id", phase.getCommunityId())
+						.eq("phase_id", phase.getId())
+						.eq("verify_status", 1);
+				}
 			List<TpBuildingOwnerInfo> ifoBuid = tpBuildingOwnerInfoMapper.selectList(tpBuildingOwnerInfo);
 			if (null != ifoBuid && ifoBuid.size()>0) {
 				return false;

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("" + tpActivity.getId());
+                        tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId());
                         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: http://jhhhhh?activeId=
+  url: https://www.baidu.com/

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

@@ -247,7 +247,9 @@ export function verifyinfoAdd(data) {
     method: 'put',
     params: {
       verifyStatus: data.status,
-      roleState: data.roleId
+      roleState: data.roleId,
+      remark: data.remark
+
     }
   })
 }

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

@@ -110,25 +110,11 @@ export default {
         console.log('error addNode')
       })
       },
-      // suo(){
-      //   this.liste=[177,26,25]
-      //    console.log('1111'); 
-      // },
       //删除当前节点
       remove(data){
       this.treeQuery.id = data.id
       this.treeQuery.name = data.name
       this.treeQuery.type = data.type
-      console.log('当前节点',data.id)
-      console.log('当前名称',data.name)
-      console.log('当前类型',data.type)
-      // if(data.type=='phase'){
-      //   his.$message({
-      //       type: 'info',
-      //       message: '不可删除根节点'
-      //     }); 
-      //     return
-      // }
       this.$store.dispatch('DeleteNode', this.treeQuery).then((res) => {
         if(res.code=='1'){
           this.$message({
@@ -155,7 +141,6 @@ export default {
           this.BuildingTreeList(this.treeQuery).then(response => {
             console.log(response.data)
               if (response.code === "0") {
-                // data = response.data
                 resolve(response.data);
               }
           }).catch(() => {

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

@@ -2,6 +2,18 @@
   <div id="root">
     <div class="form-div">
       <el-form ref="form" label-width="150px" label-position="left">
+        <el-dialog
+        title="提示"
+        :visible.sync="dialogVisible"
+        width="30%">
+        <span><el-radio v-model="listQuery.remark" label="不认识的人的手机号">不认识的人的手机号</el-radio>
+              <el-radio v-model="listQuery.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-form-item>
           <table>
@@ -43,7 +55,7 @@
                 </el-select>
               </td>
               <td>审核状态</td>                  
-              <td v-if="listQuery.verifyStatus=='1'">{{ '审核通过' }}   <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'">
@@ -111,9 +123,11 @@ export default {
         off: '1', // 控制按钮的展示
         type: '', 
         roleId:'',
-        status: '' // select值
+        status: '', // select值
+        remark: ''
       },
       total: 0, // 数据总数
+      dialogVisible: false
       
     }
   },
@@ -151,6 +165,20 @@ export default {
    console.log('this.listQuery.off',this.listQuery.off)
   },
   userVerifyAudit(){
+    // 审核不通过的情况下弹框选择提示原因
+    if(this.listQuery.status=='2'){
+      this.dialogVisible = true
+      return
+     }
+     this.submit()
+    },
+
+    submitAudit(){
+      this.dialogVisible = true
+      this.submit()
+    },
+    // 审核结果提交
+    submit(){
       this.$store.dispatch('VerifyinfoAdd', this.listQuery).then((res) => {
         const resCode = res.code
         if (resCode === '0') {
@@ -169,7 +197,7 @@ export default {
       }).catch(() => {
         console.log('UserVerifyAudit error')
       })
-    },
+    }
   }
 
 }