合并

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

@@ -342,10 +342,10 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransaction.setUuid(userElement.getUserVerifyId());
         tpTransaction.setUuidType("app");
         tpTransaction.setUuidName(userElement.getUserName());
-        tpTransaction.setCreateUser(userElement.getId());
+        tpTransaction.setCreateUser(userElement.getUserVerifyId());
         tpTransaction.setStatus("1");
         tpTransaction.setCreateDate(new Date());
-        tpTransaction.setUpdateUser(userElement.getId());
+        tpTransaction.setUpdateUser(userElement.getUserVerifyId());
         tpTransaction.setUpdateDate(new Date());
         TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
         tpTransaction.setRoomNoName(taUserVerify.getRoomNoName());

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

@@ -566,13 +566,16 @@
       and community_id = #{communityId}
       and rh.house_status = 1
     </where>
-    order by rh.sort desc, update_date desc
+    <if test="priceFluctuate == 3">
+      order by rh.sort desc, update_date desc
+    </if>
+
     <if test="priceFluctuate == 1" >
-        , (rh.rental_price+0)  asc
+      order by (rh.rental_price+0)  asc, rh.sort desc, update_date desc
     </if>
 
     <if test="priceFluctuate == 2" >
-        , (rh.rental_price+0)  desc
+      order by (rh.rental_price+0)  desc, rh.sort desc, update_date desc
     </if>
   </select>
 </mapper>

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

@@ -80,9 +80,10 @@ public class BillController extends BaseController {
 
     @ApiOperation(value = "上传缴费项接口, 预览", notes = "上传缴费项接口, 预览")
     @PostMapping(value = "/bill/uploadExcel/get", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-    public ResponseBean getUploadExcel(@RequestParam("file") MultipartFile file) {
+    public ResponseBean getUploadExcel(@RequestParam("file") MultipartFile file, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBillService.getExcelData(file);
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillService.getExcelData(file, userElement);
         return responseBean;
     }
 

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

@@ -49,7 +49,7 @@ public interface IBillService extends IService<Bill> {
 	 * @param file
 	 * @return
 	 */
-    ResponseBean getExcelData(MultipartFile file);
+    ResponseBean getExcelData(MultipartFile file,  UserElement userElement);
 
 	/**
 	 * 上传excel, 解析 入库

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

@@ -158,14 +158,14 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean getExcelData(MultipartFile file) {
+    public ResponseBean getExcelData(MultipartFile file, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
         if (file == null) {
             responseBean.addError("对象不能为空");
             return responseBean;
         }
 
-        responseBean = getExcelData(file, responseBean);
+        responseBean = getExcelData(file, responseBean, userElement.getCommunityId());
         List<TempBill> tempBills = (List<TempBill>) responseBean.getData();
 
         Map<String, Object> map = Maps.newHashMap();
@@ -213,7 +213,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             return responseBean;
         }
 
-        responseBean = getExcelData(file, responseBean);
+        responseBean = getExcelData(file, responseBean, userElement.getCommunityId());
         List<TempBill> tempBills = (List<TempBill>) responseBean.getData();
 
         Double sumDouble = 0.0;
@@ -273,9 +273,18 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         // int rows = billMapper.insert(bill);
         boolean b = this.saveOrUpdate(bill);
         if (b) {
+            QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("community_id", userElement.getCommunityId());
+            queryWrapper.eq("message_type", "7");
+            queryWrapper.eq("model_type", "2");
+            queryWrapper.eq("source", "2");
+            queryWrapper.eq("status", "1");
+            queryWrapper.eq("advice_type","4");
+            queryWrapper.eq("bill_id", billId);
+            Message message = messageMapper.selectOne(queryWrapper);
             // 草稿时插入消息
-            if ("2".equals(bill.getBillStatus())) {
-                Message message = new Message();
+            if ("2".equals(bill.getBillStatus()) && null == message) {
+                message = new Message();
                 message.setCommunityId(userElement.getCommunityId());
                 message.setMessageType("7");
                 message.setAdviceType("4");
@@ -295,14 +304,6 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             }
             // 发布时消息为无效
             if ("0".equals(bill.getBillStatus())) {
-                QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("community_id", userElement.getCommunityId());
-                queryWrapper.eq("message_type", "7");
-                queryWrapper.eq("model_type", "2");
-                queryWrapper.eq("source", "2");
-                queryWrapper.eq("status", "1");
-                queryWrapper.eq("advice_type","4");
-                Message message = messageMapper.selectOne(queryWrapper);
                 if (null != message) {
                     message.setStatus("0");
                     message.setUpdateDate(LocalDateTime.now());
@@ -310,7 +311,6 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                     messageMapper.updateById(message);
                 }
 
-
                 // 插入消息表, 消息类型为 消息
                 Message messageModel = new Message();
                 messageModel.setCommunityId(userElement.getCommunityId());
@@ -390,7 +390,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         return responseBean;
     }
 
-    private ResponseBean getExcelData(MultipartFile file, ResponseBean responseBean) {
+    private ResponseBean getExcelData(MultipartFile file, ResponseBean responseBean, Integer communityId) {
 
         // 数据
         List<TempBill> tempBills = Lists.newArrayList();
@@ -424,26 +424,39 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             int currentRow = i + 1;
             Row row = sheetAt.getRow(i);
             Cell cell = getCell(row.getCell(0));
+            if (null == cell) {
+                throw new WisdomException("第" + currentRow + "行 编号 不能为空");
+            }
+            // 获取编号
+            String roomId = cell.getStringCellValue().trim();
+            QueryWrapper<TpRoomNo> roomNoQueryWrapper = new QueryWrapper<>();
+            roomNoQueryWrapper.eq("community_id", communityId);
+            roomNoQueryWrapper.eq("id", roomId);
+            TpRoomNo tpRoomNo = tpRoomNoMapper.selectOne(roomNoQueryWrapper);
+            if (null == tpRoomNo) {
+                throw new WisdomException("编号: " + roomId + " 不是本小区的房产");
+            }
+            cell = getCell(row.getCell(1));
             if (null == cell) {
                 throw new WisdomException("第" + currentRow + "行 期/区 不能为空");
             }
             String phase = cell.getStringCellValue().trim();
-            cell = getCell(row.getCell(1));
+            cell = getCell(row.getCell(2));
             if (null == cell) {
                 throw new WisdomException("第" + currentRow + "行 楼栋 不能为空");
             }
             String building = cell.getStringCellValue().trim();
-            cell = getCell(row.getCell(2));
+            cell = getCell(row.getCell(3));
             if (null == cell) {
                 throw new WisdomException("第" + currentRow + "行 单元 不能为空");
             }
             String unit = cell.getStringCellValue().trim();
-            cell = getCell(row.getCell(3));
+            cell = getCell(row.getCell(4));
             if (null == cell) {
                 throw new WisdomException("第" + currentRow + "行 楼层 不能为空");
             }
             String level = cell.getStringCellValue().trim();
-            cell = getCell(row.getCell(4));
+            cell = getCell(row.getCell(5));
             if (null == cell) {
                 throw new WisdomException("第" + currentRow + "行 房号 不能为空");
             }
@@ -451,7 +464,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
 
             // 收费说明可以为空
-            cell = getCell(row.getCell(5));
+            cell = getCell(row.getCell(6));
             String billExplain = null;
             if (null != cell) {
                 billExplain = cell.getStringCellValue().trim();
@@ -460,7 +473,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 }
             }
 
-            cell = getCell(row.getCell(6));
+            cell = getCell(row.getCell(7));
             if (null == cell) {
                 throw new WisdomException("第" + currentRow + "行 金额 不能为空");
             }
@@ -624,14 +637,16 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 TpRoomNo tpRoomNo = records.get(index);
                 row = sheet.createRow(currentRow);
                 cell = row.createCell(0);
-                cell.setCellValue(tpRoomNo.getPhaseName());
+                cell.setCellValue(tpRoomNo.getId() + "");
                 cell = row.createCell(1);
-                cell.setCellValue(tpRoomNo.getBuildingName());
+                cell.setCellValue(tpRoomNo.getPhaseName());
                 cell = row.createCell(2);
-                cell.setCellValue(tpRoomNo.getUnitName());
+                cell.setCellValue(tpRoomNo.getBuildingName());
                 cell = row.createCell(3);
-                cell.setCellValue(tpRoomNo.getLevelName());
+                cell.setCellValue(tpRoomNo.getUnitName());
                 cell = row.createCell(4);
+                cell.setCellValue(tpRoomNo.getLevelName());
+                cell = row.createCell(5);
                 cell.setCellValue(tpRoomNo.getName());
                 currentRow ++;
                 index ++;

VUECODE/smart-property-manage/config/dev.env.js

@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://106.14.20.193:8086/property-api"',
+  BASE_API: '"http://localhost:8086/property-api"',
 })

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

@@ -129,28 +129,28 @@ export const constantRouterMap = [
         component: () => import('@/views/social/transaction/transactionAdd'),
         name: 'transaction-add',
         hidden: true,
-        meta: { title: '添加二手求购', icon: 'table' }
+        meta: { title: '添加话题', icon: 'table' }
       },
       {
         path: '/transaction/transaction',
         component: () => import('@/views/social/transaction/transactionEdit'),
         name: 'transaction-edit',
         hidden: true,
-        meta: { title: '修改二手求购', icon: 'table' }
+        meta: { title: '修改话题', icon: 'table' }
       },
       {
         path: '/transaction/info',
         component: () => import('@/views/social/transaction/transactionDetails'),
         name: 'transaction-info',
         hidden: true,
-        meta: { title: '二手求购租赁详情', icon: 'table' }
+        meta: { title: '话题详情', icon: 'table' }
       },
       {
         path: '/transaction/reply',
         component: () => import('@/views/social/transaction/reply/transactionreply'),
         name: 'transactionreply-index',
         hidden: true,
-        meta: { title: '二手帖子回复列表', icon: 'table' }
+        meta: { title: '话题回复列表', icon: 'table' }
       },
       {
         path: '/transaction/transactionReport',

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

@@ -27,11 +27,12 @@
             :before-upload="beforeUpload"
             :data="ruleForm"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             name="file"
             class="upload-demo"
             multiple>
             <el-button slot="trigger" size="small" type="primary">选取账单文件并预览</el-button>
-        </el-upload>
+          </el-upload>
         </el-col>
       </el-row>
       <span style="color: #99a9bf; font-size: 13px;">如果想修改下表的内容，请重新下载excel模板填写金额后上传，系统会直接删除下表所有旧数据，以新的excel内容为准</span>
@@ -52,8 +53,8 @@
           <template slot-scope="scope">{{ showAddress(scope.row) }}</template>
         </el-table-column>
         <!--<el-table-column-->
-          <!--prop="ownerName"-->
-          <!--label="户主姓名"/>-->
+        <!--prop="ownerName"-->
+        <!--label="户主姓名"/>-->
         <el-table-column
           prop="billExplain"
           align="center"
@@ -85,7 +86,7 @@
 import { mapState, mapActions, mapMutations } from 'vuex'
 import waves from '@/directive/waves' // Waves directive
 import { parseTime } from '@/utils'
-
+import { getToken } from '@/utils/auth'
 export default {
   computed: {
     ...mapState('role', {
@@ -123,7 +124,10 @@ export default {
       total: 0,
       list: [], // 数据
       tempList: [], // 临时数据
-      files: '' // 文件
+      files: '', // 文件
+      uploadHeaders: { // 上传文件的请求头
+        'X-Auth-Token': getToken()
+      }
     }
   },
   created() {
@@ -169,6 +173,8 @@ export default {
         this.$message.error(response.message)
         return
       }
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
       this.tempList = response.data.list
       this.total = response.data.total
       this.list = this.getList()
@@ -312,6 +318,11 @@ export default {
         console.log('error BillDownloadExcel')
       })
     }
+    // uploadHeaders() { // 设置文件上传的请求头
+    //   const uploadHeaders = { 'X-Auth-Token': this.token }
+    //   console.log('上传缴费单Token: ', uploadHeaders)
+    //   return uploadHeaders
+    // }
   }
 }
 </script>

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

@@ -210,8 +210,19 @@ export default {
         this.$message.error('请选择一行数据进行修改!')
         return
       }
-       let id= this.deleteIds[0]
-       this.$router.push({ name: 'transaction-edit', query: { id: id }})
+      let id= this.deleteIds[0]
+      this.$store.dispatch('transaction/TransactionById', id).then((res) => {
+        const tpTransactionData = res.data.tpTransaction
+        if(tpTransactionData.uuidType === 'prop' && this.$store.getters.userData.id === tpTransactionData.uuid){
+          this.$router.push({ name: 'transaction-edit', query: { id: id }})
+        }else{
+          this.$message.error('您不是话题发布人，无法修改')
+          return
+        }
+        }).catch(() => {
+          this.$message.error('您不是话题发布人，无法修改')
+          return
+        })
       },
     deleteTransaction(){
       const ids = this.deleteIds
@@ -268,7 +279,12 @@ export default {
       var year = value.getFullYear()
       var month = value.getMonth() + 1
       var day = value.getDate()
-      return year + '-' + month + '-' + day
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      // return year + '-' + month + '-' + day
+      // return year + '-' + month + '-' + day
     },
     // 举报数量
     report(sum,id){

VUECODE/smart-property-manage/src/views/social/transaction/reply/transactionreply.vue

@@ -230,7 +230,10 @@ export default {
       var year = value.getFullYear()
       var month = value.getMonth() + 1
       var day = value.getDate()
-      return year + '-' + month + '-' + day
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
     },
     // 弹出层
     TransactionReplyOpen(id){

VUECODE/smart-property-manage/src/views/social/transaction/transactionDetails.vue

@@ -144,7 +144,19 @@ export default {
       return year + '-' + month + '-' + day
     },
     edi() { 
-      this.$router.push({ name: 'transaction-edit', query: { id: this.ruleForm.id }})
+      this.$store.dispatch('transaction/TransactionById', this.ruleForm.id).then((res) => {
+        const tpTransactionData = res.data.tpTransaction
+        if(tpTransactionData.uuidType === 'prop' && this.$store.getters.userData.id === tpTransactionData.uuid){
+          this.$router.push({ name: 'transaction-edit', query: { id: this.ruleForm.id }})
+        }else{
+          this.$message.error('您不是话题发布人，无法修改')
+          return
+        }
+        }).catch(() => {
+          this.$message.error('您不是话题发布人，无法修改')
+          return
+        })
+      
     },
     // 查看此帖子的所有回复
     replyList(){

VUECODE/smart-property-manage/src/views/social/transaction/transactionReport/report.vue

@@ -127,7 +127,10 @@ export default {
       var year = value.getFullYear()
       var month = value.getMonth() + 1
       var day = value.getDate()
-      return year + '-' + month + '-' + day
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
     }
   }
 }