缓存

CODE/smart-community/community-common/src/main/java/com/community/commom/utils/PayPriceUtils.java

@@ -14,4 +14,14 @@ public class PayPriceUtils {
          return  price * 100;
     }
 
+    /**
+     * 元转换为分
+     * @param price
+     * @return
+     */
+    public static Integer yuanConversionPoints(Double price) {
+        Double d = price * 100;
+        return  Integer.parseInt(d + "");
+    }
+
 }

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

@@ -12,14 +12,11 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpSession;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -40,7 +37,7 @@ public class BillController extends BaseController {
     private IBillService iBillService;
     
     
-    @ApiOperation(value = "根据搜索条件获取二手租赁列表", notes = "根据搜索条件获取二手租赁列表")
+    @ApiOperation(value = "根据搜索条件获取缴费项列表", notes = "根据搜索条件获取缴费项列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "billId", value = "收费组编号"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "billName", value = "收费组名（模糊查询）"),
@@ -76,4 +73,26 @@ public class BillController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "上传缴费项接口, 预览", notes = "上传缴费项接口, 预览")
+    @PostMapping(value = "/bill/uploadExcel/get", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean getUploadExcel(@RequestParam("file") MultipartFile file, @RequestParam("billExplain") String billExplain) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iBillService.getExcelData(file, billExplain);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "上传缴费项接口, 保存", notes = "上传缴费项接口, 保存")
+    @PostMapping(value = "/bill/uploadExcel/add", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean addUploadExcel(HttpSession session, @RequestParam("file") MultipartFile file,
+                                       @RequestParam("billExplain") String billExplain,
+                                       @RequestParam("billName") String billName,
+                                       @RequestParam("endDate") Date endDate,
+                                       @RequestParam("billStatus") String billStatus) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillService.getExcelData(file, billExplain, billName, endDate, billStatus, userElement);
+        return responseBean;
+    }
+
+
 }

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

@@ -80,7 +80,7 @@ public class Bill implements Serializable {
     /**
      * 创建时间
      */
-    private LocalDateTime createDate;
+    private Date createDate;
 
     /**
      * 更新人
@@ -90,7 +90,7 @@ public class Bill implements Serializable {
     /**
      * 更新时间
      */
-    private LocalDateTime updateDate;
+    private Date updateDate;
 
 
 }

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

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.model.Bill;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -39,4 +42,22 @@ public interface IBillService extends IService<Bill> {
 	 * @return
 	 */
 	ResponseBean getBillList(Bill bill, Integer pageNum, Integer pageSize);
+
+	/**
+	 * 上传excel, 解析, 但不入库
+	 * @param file
+	 * @return
+	 */
+    ResponseBean getExcelData(MultipartFile file, String billExplain);
+
+	/**
+	 * 上传excel, 解析 入库
+	 * @param file
+	 * @param billExplain
+	 * @param billName
+	 * @param endDate
+	 * @param billStatus
+	 * @return
+	 */
+	ResponseBean getExcelData(MultipartFile file, String billExplain, String billName, Date endDate, String billStatus, UserElement userElement);
 }

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

@@ -1,24 +1,39 @@
 package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
-import com.community.huiju.dao.BillInvoiceMapper;
-import com.community.huiju.dao.BillStatementMapper;
-import com.community.huiju.model.Bill;
-import com.community.huiju.dao.BillMapper;
-import com.community.huiju.model.TpTransaction;
+import com.community.commom.utils.PayPriceUtils;
+import com.community.huiju.dao.*;
+import com.community.huiju.exception.WisdomException;
+import com.community.huiju.model.*;
+import com.community.huiju.service.IBillInvoiceService;
 import com.community.huiju.service.IBillService;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -29,6 +44,7 @@ import java.util.Map;
  * @since 2019-02-13
  */
 @Service
+@Slf4j
 public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IBillService {
 
     /** 缴费项表 **/
@@ -39,10 +55,19 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     @Autowired
     private BillInvoiceMapper billInvoiceMapper;
 
+    private IBillInvoiceService iBillInvoiceService;
+
     /** 账单流水表 **/
     @Autowired
     private BillStatementMapper billStatementMapper;
 
+    @Autowired
+    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean updateBillNameAndBillExplainAndEndDate(UserElement userElement, String parameter) {
@@ -100,4 +125,217 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         responseBean.addSuccess(map);
         return responseBean;
     }
+
+
+    @Override
+    public ResponseBean getExcelData(MultipartFile file, String billExplain) {
+        ResponseBean responseBean = new ResponseBean();
+        if (file == null) {
+            responseBean.addError("对象不能为空");
+            return responseBean;
+        }
+
+        responseBean = getExcelData(file, responseBean);
+        List<TempBill> tempBills = (List<TempBill>) responseBean.getData();
+        tempBills.forEach(e -> {
+            e.setBillExplain(billExplain);
+        });
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("list", tempBills);
+        map.put("total", tempBills.size());
+        responseBean.addSuccess(map);
+
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getExcelData(MultipartFile file, String billExplain, String billName, Date endDate, String billStatus, UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = getExcelData(file, responseBean);
+        List<TempBill> tempBills = (List<TempBill>) responseBean.getData();
+
+        Double sumDouble = tempBills.stream().mapToDouble(TempBill::getMoney).sum();
+
+        // 存入缴费项表
+        Bill bill = new Bill();
+        bill.setBillName(billName);
+        bill.setBillExplain(billExplain);
+        bill.setEndDate(endDate);
+        bill.setPayedNum(PayPriceUtils.yuanConversionPoints(Double.valueOf(sumDouble)));
+        bill.setPayTotalNum(tempBills.size());
+        bill.setPayedNum(0);
+        bill.setUnpayedNum(tempBills.size());
+        bill.setBillStatus(billStatus);
+        bill.setCreateUser(userElement.getId());
+        bill.setCreateDate(new Date());
+
+        int rows = billMapper.insert(bill);
+        if (rows > 0) {
+            List<BillInvoice> billInvoices = tempBills.stream().map(e -> {
+                BillInvoice billInvoice = new BillInvoice();
+                billInvoice.setCommunityId(userElement.getCommunityId());
+                billInvoice.setBillId(bill.getId());
+
+                // 楼栋资料库
+                QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("phase", e.getPhase());
+                queryWrapper.eq("building", e.getBuilding());
+                queryWrapper.eq("unit", e.getUnit());
+                queryWrapper.eq("room_no", e.getRoomNo());
+                queryWrapper.eq("community_id", userElement.getCommunityId());
+                TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
+
+                // 查询app用户id
+                QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
+                userQueryWrapper.eq("community_id", userElement.getCommunityId());
+                userQueryWrapper.eq("login_name", buildingOwnerInfo.getOwnerTel());
+                TaUser taUser = taUserMapper.selectOne(userQueryWrapper);
+
+                billInvoice.setBuildingOwnerInfoId(buildingOwnerInfo.getId());
+                billInvoice.setTaUserId(taUser.getId());
+                billInvoice.setBillInvoiceExplain(bill.getBillExplain());
+                billInvoice.setPayPrice(e.getMoney());
+                billInvoice.setBillStatus("0");
+                billInvoice.setCreateUser(userElement.getId());
+                billInvoice.setCreateDate(new Date());
+                billInvoice.setStatus(1);
+                return billInvoice;
+            }).collect(Collectors.toList());
+
+            iBillInvoiceService.saveBatch(billInvoices);
+            responseBean.addSuccess("操作成功!");
+        } else {
+            responseBean.addError("操作失败!");
+        }
+
+
+        return responseBean;
+    }
+
+    private ResponseBean getExcelData(MultipartFile file, ResponseBean responseBean) {
+        ResponseBean responseBean1 = new ResponseBean();
+        //获取文件的名字
+        String originalFilename = file.getOriginalFilename();
+        Workbook workbook = null;
+        try {
+            if (originalFilename.endsWith(Constant.SUFFIX_2003)) {
+                workbook = new HSSFWorkbook(file.getInputStream());
+            } else if (originalFilename.endsWith(Constant.SUFFIX_2007)) {
+                workbook = new XSSFWorkbook(file.getInputStream());
+            }
+        } catch (Exception e) {
+            log.info(originalFilename);
+            e.printStackTrace();
+            responseBean.addError("格式错误");
+            return responseBean;
+        }
+
+        // 获取 Sheet 第一页
+        Sheet sheetAt = workbook.getSheetAt(0);
+        int lastRowNum = sheetAt.getLastRowNum();
+
+        // 数据
+        List<TempBill> tempBills = Lists.newArrayList();
+
+        // 从第7行开始读取
+        for (int i= 6; i<= lastRowNum; i++) {
+            Row row = sheetAt.getRow(i);
+            Cell cell = getCell(row.getCell(0));
+            if (null == cell) {
+                throw new WisdomException("第" + i + "行 期/区 不能为空");
+            }
+            String phase = cell.getStringCellValue().trim();
+            cell = getCell(row.getCell(1));
+            if (null == cell) {
+                throw new WisdomException("第" + i + "行 楼栋 不能为空");
+            }
+            String building = cell.getStringCellValue().trim();
+            cell = getCell(row.getCell(2));
+            if (null == cell) {
+                throw new WisdomException("第" + i + "行 单元 不能为空");
+            }
+            String unit = cell.getStringCellValue().trim();
+            cell = getCell(row.getCell(3));
+            if (null == cell) {
+                throw new WisdomException("第" + i + "行 楼层 不能为空");
+            }
+            String level = cell.getStringCellValue().trim();
+            cell = getCell(row.getCell(4));
+            if (null == cell) {
+                throw new WisdomException("第" + i + "行 房号 不能为空");
+            }
+            String roomNo = cell.getStringCellValue().trim();
+            cell = getCell(row.getCell(5));
+            if (null == cell) {
+                throw new WisdomException("第" + i + "行 业主姓名 不能为空");
+            }
+            String ownerName = cell.getStringCellValue().trim();
+            cell = getCell(row.getCell(6));
+            if (null == cell) {
+                throw new WisdomException("第" + i + "行 金额 不能为空");
+            }
+            String money = cell.getStringCellValue().trim();
+
+
+            TempBill temp = new TempBill();
+            temp.setPhase(phase);
+            temp.setBuilding(building);
+            temp.setLevel(level);
+            temp.setUnit(unit);
+            temp.setRoomNo(roomNo);
+            temp.setOwnerName(ownerName);
+
+            if (StringUtils.isNotBlank(money)) {
+                String[] split = money.split(".");
+                // 判断是否包含 . ,包含表示 0.00 的格式, 并且最后一位不等于 "."
+                if (money.endsWith(".") && !split[1].equals(".")) {
+                    temp.setMoney(PayPriceUtils.yuanConversionPoints(Double.valueOf(money)));
+                }else if (!money.endsWith(".")){
+                    temp.setMoney(PayPriceUtils.yuanConversionPoints(Integer.valueOf(money)));
+                } else {
+                    throw new WisdomException("第" + i + "行 金额 格式不合法");
+                }
+            }
+
+            tempBills.add(temp);
+        }
+
+        responseBean.addSuccess(tempBills);
+        return responseBean;
+    }
+
+    private Cell getCell(Cell ce){
+        Cell cell = ce;
+        if (null == cell) {
+            return null;
+        }
+        //把数字当成String来读，避免出现1读成1.0的情况
+        if(cell.getCellType() == Cell.CELL_TYPE_NUMERIC){
+            cell.setCellType(Cell.CELL_TYPE_STRING);
+        }
+
+        return cell;
+    }
+
+    @Data
+    private class TempBill {
+        // 期 / 区
+        private String phase;
+        // 栋
+        private String building;
+        // 单元
+        private String unit;
+        // 楼层
+        private String level;
+        // 户号
+        private String roomNo;
+        // 业主姓名
+        private String ownerName;
+        // 金额
+        private Integer money;
+
+        // 收费说明
+        private String billExplain;
+    }
 }

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

@@ -7,3 +7,19 @@ export function fetchBillList(query) {
     params: query
   })
 }
+
+// 保存草稿 或者 发布账单
+export function billUploadExcelAdd(data) {
+  return request({
+    url: '/bill/uploadExcel/add',
+    method: 'post',
+    data: {
+      file: data.files,
+      billName: data.billName,
+      billExplain: data.billExplain,
+      endDate: data.endDate,
+      billStatus: data.billStatus
+    }
+  })
+}
+

VUECODE/smart-property-manage/src/store/modules/bill.js

@@ -1,4 +1,4 @@
-import { fetchBillList } from '@/api/bill'
+import { fetchBillList, billUploadExcelAdd } from '@/api/bill'
 
 const transaction = {
   namespaced: true,
@@ -29,6 +29,15 @@ const transaction = {
           reject(error)
         })
       })
+    },
+    BillUploadExcelAdd({ commit }, data) { // 上传缴费项接口, 保存
+      return new Promise((resolve, reject) => {
+        billUploadExcelAdd(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

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

@@ -9,23 +9,70 @@
       </el-form-item>
       <el-form-item label="截止时间" prop="endDate">
         <el-date-picker
-            v-model="ruleForm.endDate"
-            value-format="timestamp"
-            type="date"
-            placeholder="选择日期"/>
+          v-model="ruleForm.endDate"
+          value-format="timestamp"
+          type="date"
+          placeholder="选择日期"/>
       </el-form-item>
       <div>
         <span>
-          <el-upload :on-preview="handlePreview" :on-change="handleChange" :before-upload="beforeUpload" :limit="1" :on-exceed="handleExceed" class="upload-demo" action="" multiple>
+          <el-upload
+            :on-success="successUpload"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :before-upload="beforeUpload"
+            :data="ruleForm"
+            name="file"
+            class="upload-demo"
+            action="http://localhost:8086/property-api/bill/uploadExcel/get"
+            multiple>
             <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           </el-upload>
           如果还未制作账单，请先下载账单模板，按规则填写费用后再上传
           <el-button type="primary" size="small" icon="el-icon-download" @click="submitForm('ruleForm')">下载模板</el-button>
-          </span>
+        </span>
       </div>
-      <el-form-item>
-        <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
-        <el-button @click="resetForm('ruleForm')">重置</el-button>
+      <el-table
+        :data="list"
+        border
+        style="width: 100%; margin-top: 20px;">
+        <el-table-column
+          prop="id"
+          type="index"
+          label="选择"
+          align="center"/>
+        <el-table-column
+          prop="name"
+          label="房屋信息"
+          align="center"
+          width="180">
+          <template slot-scope="scope">{{ scope.row.phase + scope.row.building + scope.row.unit + scope.row.level + scope.row.roomNo }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="ownerName"
+          label="业主姓名"/>
+        <el-table-column
+          prop="billExplain"
+          align="center"
+          label="收费说明"/>
+        <el-table-column
+          prop="money"
+          align="center"
+          label="收费金额(元)">
+          <template slot-scope="scope">{{ showPayPrice(scope.row.money) }}</template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="listQuery.pageNum"
+        :page-sizes="[10, 20, 40, 100]"
+        :page-size="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+      <el-form-item style="margin-top: 20px;">
+        <el-button @click="submitForm('ruleForm', 2)">保存草稿</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm', 0)">发送账单</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -47,7 +94,8 @@ export default {
       ruleForm: {
         billName: '',
         billExplain: '',
-        endDate: ''
+        endDate: '',
+        billStatus: '' // 缴费状态  0：未缴费  1：已线上缴费 2：已线下缴费
       },
       rules: {
         billName: [
@@ -63,7 +111,15 @@ export default {
       defaultProps: {
         children: 'children',
         label: 'menuName'
-      }
+      },
+      listQuery: { // 查询
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0,
+      list: [], // 数据
+      tempList: [], // 临时数据
+      files: '' // 文件
     }
   },
   created() {
@@ -76,22 +132,89 @@ export default {
       'FetchMenuList',
       'AddRoleInfo'
     ]),
-    submitForm(formName) { // 提交
-      // 获取选中的树形节点 key
-      this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
-      if (this.ruleForm.menuArray.length < 1) {
-        this.$message.error('请至少选择一个菜单权限')
+    getList() { // 计算分页数据
+      const tempList = this.tempList
+      const list = []
+      let counNum = 0
+      for (let t = (this.listQuery.pageNum - 1) * this.listQuery.pageSize; t < tempList.length; t++) {
+        if (counNum === this.listQuery.pageSize) {
+          break
+        }
+        list.push(tempList[t])
+        counNum++
+      }
+
+      // for (const i in tempList) {
+      //   list.push(tempList[i])
+      // }
+      return list
+    },
+    beforeUpload(file) {
+      const extension = file.name.split('.')[1] === 'xls'
+      const extension2 = file.name.split('.')[1] === 'xlsx'
+      if (!extension && !extension2) {
+        this.$message.warning('上传文件只能是 xls、xlsx格式!')
         return
       }
+      this.files = file
+      return true // 返回false不会自动上传
+    },
+    successUpload(response, file, fileList) { // 上传成功时
+      const resCode = response.code
+      if (resCode === '1') {
+        this.$message.error(response.message)
+        return
+      }
+      this.tempList = response.data.list
+      this.total = response.data.total
+      this.list = this.getList()
+      console.log(response)
+    },
+    handleExceed(files, fileList) {
+      console.log('只能选择一个文件')
+    },
+    submitForm(formName, status) { // 提交
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.addRole()
+          this.ruleForm.billStatus = status
+          const data = this.ruleForm
+          data.files = this.files
+          console.log('data: ', data)
+          this.$store.dispatch('BillUploadExcelAdd', data).then(res => {
+            const resCode = res.code
+            if (resCode === '1') {
+              this.$message.error(res.message)
+              return
+            }
+            this.$message.success(res.message)
+          }).catch(() => {
+            console.log('BillUploadExcelAdd error')
+          })
         } else {
           console.log('error submit!!')
           return false
         }
       })
     },
+    addInvoice(status) { // 保存
+      this.ruleForm.status = status
+      const data = this.ruleForm
+      data.files = this.files
+      this.$store.dispatch('BillUploadExcelAdd', data).then(res => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
+        }
+        this.$message.success(res.message)
+      }).catch(() => {
+        console.log('BillUploadExcelAdd error')
+      })
+    },
+    showPayPrice(payPrice) { //  转换金额
+      const price = payPrice / 100
+      return price
+    },
     getMenuList() {
       this.FetchMenuList().then(() => {
       }).catch(() => {
@@ -128,6 +251,16 @@ export default {
         loading.close()
         console.log('error addRole')
       })
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val
+      this.list = this.getList()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.list = this.getList()
     }
   }
 }

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

@@ -52,7 +52,7 @@ export default {
       list: [],
       files: null,
       currentPage4: 4
-    };
+    }
   },
   computed: {
     ...mapState("batchImport", {