提交

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

@@ -77,7 +77,7 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
             "and tpio.level_name = #{levelName} " +
             "AND tpio.room_no_name = #{roomNoName} " +
             "AND tpio.owner_tel = #{ownerTel}")
-    TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") Integer buildingName, @Param("unitName") Integer unitName, @Param("levelName") Integer levelName, @Param("roomNoName") Integer roomNoName, @Param("ownerTel") String ownerTel);
+    TpBuildingOwnerInfo selectCommunityIdAndAddressName(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") Integer buildingName, @Param("unitName") Integer unitName, @Param("levelName") Integer levelName, @Param("roomNoName") Integer roomNoName, @Param("ownerTel") String ownerTel);
 
 
 }

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

@@ -183,7 +183,8 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
                 billStatement.setBillInvoiceId(billInvoice.getId());
                 billStatement.setTaUserId(billInvoice.getTaUserId());
                 billStatement.setPayPrice(billInvoice.getPayPrice());
-                billStatement.setPayName(buildingOwnerInfo.getOwnerName());
+                // TODO 缴费人，因为有一个情况就是没有业主
+//                 billStatement.setPayName(buildingOwnerInfo.getOwnerName());
                 billStatement.setPayRemark(billInvoice.getBillInvoiceExplain());
                 billStatement.setPayType("1");
                 billStatement.setCreateTime(new Date());
@@ -217,8 +218,11 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
                 messageQueryWrapper.eq("source", "2");
 
                 Message one = iMessageService.getOne(messageQueryWrapper);
-                one.setStatus("0");
-                iMessageService.updateById(one);
+                if (null != one) {
+                    one.setStatus("0");
+                    iMessageService.updateById(one);
+                }
+
 
             }
         });

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

@@ -565,14 +565,16 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             queryWrapper.eq("message_type", "7");
             queryWrapper.eq("model_type", "2");
             queryWrapper.eq("source", "2");
-            queryWrapper.eq("status", "1");
-            Message message = messageMapper.selectOne(queryWrapper);
-            if (null != message) {
+            queryWrapper.eq("source", "2");
+            queryWrapper.eq("uuid_type", "1");
+
+            List<Message> messages = messageMapper.selectList(queryWrapper);
+            messages.forEach(message-> {
                 message.setStatus("0");
                 message.setUpdateDate(LocalDateTime.now());
                 message.setUpdateUser(userElement.getId());
                 messageMapper.updateById(message);
-            }
+            });
 
         });
 

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

@@ -584,11 +584,21 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             //从第一行开始第一行一般是标题
             for (int j = 3; j <= lastRowNum; j++) {
                 Row row = sheet.getRow(j);
-                String buildingInfo = row.getCell(0).getStringCellValue().trim();
-                String roomNoId = row.getCell(1).getStringCellValue().trim();
-                String ownerName = row.getCell(2).getStringCellValue().trim();
-                String ownerTel = row.getCell(3).getStringCellValue().trim();
-                String ownerRole = row.getCell(4).getStringCellValue().trim();
+                Cell cell = row.getCell(0);
+                cell.setCellType(Cell.CELL_TYPE_STRING);
+                String buildingInfo = cell.getStringCellValue().trim();
+                cell = row.getCell(1);
+                cell.setCellType(Cell.CELL_TYPE_STRING);
+                String roomNoId = cell.getStringCellValue().trim();
+                cell = row.getCell(2);
+                cell.setCellType(Cell.CELL_TYPE_STRING);
+                String ownerName = cell.getStringCellValue().trim();
+                cell = row.getCell(3);
+                cell.setCellType(Cell.CELL_TYPE_STRING);
+                String ownerTel = cell.getStringCellValue().trim();
+                cell = row.getCell(4);
+                cell.setCellType(Cell.CELL_TYPE_STRING);
+                String ownerRole = cell.getStringCellValue().trim();
                 int currentRow = j+1;
                 if (StringUtils.isEmpty(buildingInfo)){
                     responseBean.addError("第" + currentRow + "行" + "房产信息不能为空!");
@@ -908,16 +918,21 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                         buildingOwnerInfo.getRoomNoName();
 
                 cell = row.createCell(0);
+                cell.setCellType(Cell.CELL_TYPE_STRING);
                 cell.setCellValue(address);
                 cell.setCellStyle(cellStyle);
                 cell = row.createCell(1);
+                cell.setCellType(Cell.CELL_TYPE_STRING);
                 cell.setCellValue(buildingOwnerInfo.getId());
                 cell.setCellStyle(cellStyle);
                 cell = row.createCell(2);
+                cell.setCellType(Cell.CELL_TYPE_STRING);
                 cell.setCellStyle(cellStyle);
                 cell = row.createCell(3);
+                cell.setCellType(Cell.CELL_TYPE_STRING);
                 cell.setCellStyle(cellStyle);
                 cell = row.createCell(4);
+                cell.setCellType(Cell.CELL_TYPE_STRING);
                 cell.setCellStyle(cellStyle);
 
                 currentRow ++;

VUECODE/smart-operate-manage/src/views/banner/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <label>标题</label>
+      <label style="font-size: 14px; color: #606266;">标题</label>
       <el-input v-model="listQuery.title" placeholder="请输入标题" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
       <!-- <label>跳转概述</label>
       <el-input v-model="listQuery.bannerDescription" placeholder="请输入跳转概述" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/> -->
-      <label>适用社区</label>
+      <label style="font-size: 14px; color: #606266;">适用社区</label>
       <el-select v-model="listQuery.communityId" placeholder="适用社区" clearable style="width: 200px" class="filter-item">
         <el-option v-for="item in communityList" :key="item.id" :value="item.id" :label="item.communityName"/>
       </el-select>
-      <label>banner位置</label>
+      <label style="font-size: 14px; color: #606266;">banner位置</label>
       <el-select v-model="listQuery.bannerPosition" placeholder="banner位置" clearable class="filter-item" style="width: 200px">
         <el-option v-for="item in bannerPositionArr" :key="item.id" :value="item.id" :label="item.value"/>
       </el-select>

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

@@ -7,7 +7,7 @@
       <el-button type="info" @click="updateBill">修改</el-button>
     </div>
     <div class="bill-info-search">
-      <span style="font-weight: bold;">收费情况</span>
+      <span style="font-size: 14px; color: #606266;">收费情况</span>
       <el-form :model="formInline" inline="true" class="form-inline">
         <el-form-item label="选择房子">
           <el-select v-model="formInline.phaseId" placeholder="请选择期" @change="buildSelectChange(0)">
@@ -52,7 +52,7 @@
           <el-input v-model="formInline.ownerName"/>
         </el-form-item>
         <el-form-item label="缴费状态">
-          <el-select v-model="formInline.billStatus" placeholder="活动区域">
+          <el-select v-model="formInline.billStatus" placeholder="请选择">
             <el-option label="未缴费" value="0"/>
             <el-option label="已线上缴费" value="1"/>
             <el-option label="已线下缴费" value="2"/>
@@ -550,8 +550,11 @@ export default {
   margin-top: 20px;
 }
 .title-info {
+  font-weight: bold;
   height: 40px;
   line-height: 40px;
+  font-size: 14px;
+  color: #606266;
 }
 .bill-info-search {
   margin-left: 20px;

VUECODE/smart-property-manage/src/views/building/batch/batchImport.vue

@@ -3,13 +3,15 @@
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item>
-        <el-upload :on-change="handleChange" :before-upload="beforeUpload" :limit="1" class="upload-demo" action="" multiple>
-          <!-- <a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1548327771"></a> -->
+        <div style="display: flex;">
           <el-button style="margin-left: 10px;" size="large" type="primary" @click="exportExcel">下载模板-小区</el-button>
-          <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
+          <el-upload :on-change="handleChange" :before-upload="beforeUpload" :limit="1" class="upload-demo" action="" multiple>
+            <!-- <a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1548327771"></a> -->
+            <el-button slot="trigger" size="large" type="primary" style="margin-left: 10px;">选取文件并预览</el-button>
+          </el-upload>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="submitUpload">提交</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="dialogBuildingIndex">取消</el-button>
-        </el-upload>
+        </div>
       </el-form-item>
     </el-form>
     <el-table ref="multipleTable" :data="list" border tooltip-effect="dark" style="width: 100%; margin-top: 20px;">
@@ -26,7 +28,7 @@
         <template slot-scope="scope">{{ scope.row.levelName }}</template>
       </el-table-column>
       <el-table-column label="户号" align="center">
-        <template slot-scope="scope">{{ scope.row.name }}</template>
+        <template slot-scope="scope">{{ scope.row.roomNoName }}</template>
       </el-table-column>
       <el-table-column label="业主姓名" align="center">
         <template slot-scope="scope">{{ scope.row.ownerName }}</template>