Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

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

             tpTransactionReply.setReplyUuid(tpTransactionReplyBack.getUuid());
             tpTransactionReply.setReplyUuidType(tpTransactionReplyBack.getUuidType());
             tpTransactionReply.setReplyUuidName(tpTransactionReplyBack.getUuidName());
-            tpTransactionReply.setReplyUuidRole(tpTransactionReplyBack.getReplyUuidRole());
+            tpTransactionReply.setReplyUuidRole(tpTransactionReplyBack.getUuidRole());
             tpTransactionReply.setPublishType("0");
         }
         tpTransactionReply.setReleaseIdentity("0");
         if (tpTransaction.getUuidType().equals("app")) {
             TaUser taUser = taUserMapper.selectByPrimaryKey(taUserVerifyMapper.selectByPrimaryKey(tpTransaction.getUuid()).getUserId());
             tpTransaction.setTelephone(taUser.getLoginName());
+            TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerifyMapper.selectByPrimaryKey(tpTransaction.getUuid()).getRoleId());
+            tpTransaction.setRoleId(taSysRole.getId());
+            tpTransaction.setRoleName(taSysRole.getRoleName());
         }
         if (tpTransaction.getUuidType().equals("prop")) {
            TpUser tpUser = tpUserMapper.selectByPrimaryKey(tpTransaction.getUuid());
             tpTransaction.setTelephone(tpUser.getLoginName());
+            tpTransaction.setRoleName("物业");
         }
         
         Map<String, Object> map = Maps.newHashMap();

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

     @Override
     public ResponseBean exportExcel(UserElement userElement, Integer billId) {
         ResponseBean responseBean = new ResponseBean();
-        String [] title = new String[] { "收费单号","房屋信息","业主姓名","收费单说明","金额(元)","流水","缴费状态","缴费人","缴费时间","新建时间","新建人","修改人","修改时间" };
+        String [] title = new String[] { "收费单号","房屋信息","收费单说明","金额(元)","流水","缴费状态","缴费人","缴费时间","新建时间","新建人","修改人","修改时间" };
 
         HSSFWorkbook excel = excel(title, userElement, billId,null);
         responseBean.addSuccess(excel);
                 cell.setCellValue(records.get(t).getPhase() + records.get(t).getBuilding() + records.get(t).getUnit() + records.get(t).getRoomNo());
                 cell.setCellStyle(style);
                 // 业主姓名
-                cell = row.createCell(2);
-                cell.setCellValue(records.get(t).getOwnerName());
-                cell.setCellStyle(style);
+//                cell = row.createCell(2);
+//                cell.setCellValue(records.get(t).getOwnerName());
+//                cell.setCellStyle(style);
                 // 收费单说明
-                cell = row.createCell(3);
+                cell = row.createCell(2);
                 cell.setCellValue(records.get(t).getBillInvoiceExplain());
                 cell.setCellStyle(style);
                 // 金额(元)
-                cell = row.createCell(4);
+                cell = row.createCell(3);
                 double price = Double.valueOf(records.get(t).getPayPrice()) / 100.00;
                 cell.setCellValue(price);
                 cell.setCellStyle(style);
                 if (null != records.get(t).getBillStatementId()) {
                     // 流水
-                    cell = row.createCell(5);
+                    cell = row.createCell(4);
                     cell.setCellValue(records.get(t).getBillStatementId());
                     cell.setCellStyle(style);
                 }
                 // 缴费状态
-                cell = row.createCell(6);
+                cell = row.createCell(5);
                 cell.setCellValue("0".equals(records.get(t).getBillStatus()) ? "未交费" : "1".equals(records.get(t).getBillStatus()) ? "已线上缴费" : "已线下缴费");
                 cell.setCellStyle(style);
                 // 缴费人
-                cell = row.createCell(7);
+                cell = row.createCell(6);
                 cell.setCellValue(records.get(t).getPayName());
                 cell.setCellStyle(style);
                 if (null != records.get(t).getPayDate()) {
                     // 缴费时间
-                    cell = row.createCell(8);
+                    cell = row.createCell(7);
                     cell.setCellValue(dateFormat.format(records.get(t).getPayDate()));
                     cell.setCellStyle(style);
                 }
                 // 新建时间
-                cell = row.createCell(9);
+                cell = row.createCell(8);
                 cell.setCellValue(dateFormat.format(records.get(t).getCreateDate()));
                 cell.setCellStyle(style);
                 // 新建人
-                cell = row.createCell(10);
+                cell = row.createCell(9);
                 cell.setCellValue(records.get(t).getCreateUserName());
                 cell.setCellStyle(style);
                 // 修改人
-                cell = row.createCell(11);
+                cell = row.createCell(10);
                 cell.setCellValue(records.get(t).getUpdateUserName());
                 cell.setCellStyle(style);
                 if (null != records.get(t).getUpdateDate()) {
                     // 修改时间
-                    cell = row.createCell(12);
+                    cell = row.createCell(11);
                     cell.setCellValue(dateFormat.format(records.get(t).getUpdateDate()));
                     cell.setCellStyle(style);
                 }

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

           </el-select>
         </el-form-item>
         <br>
-        <el-form-item>
+        <!-- <el-form-item>
           <span class="title-info">户主姓名</span>
           <el-input v-model="formInline.ownerName" style="padding-left:25%;transform:translateY(-90%);"/>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <span class="title-info">缴费状态</span>
           <el-select v-model="formInline.billStatus" placeholder="请选择" style="padding-left:25%;transform:translateY(-90%);">
           {{ scope.row.phase + scope.row.building + scope.row.unit + scope.row.roomNo }}
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="ownerName"
         label="户主姓名"
         align="center"
-        show-overflow-tooltip/>
+        show-overflow-tooltip/> -->
       <el-table-column
         prop="billInvoiceExplain"
         label="收费单说明"