feats

src/main/java/com/huiju/estateagents/EstateagentsApplication.java

@@ -1,6 +1,5 @@
 package com.huiju.estateagents;
 
-import com.huiju.estateagents.websocket.ChatServer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -15,7 +14,6 @@ public class EstateagentsApplication {
 	public static void main(String[] args) {
 		SpringApplication springApplication = new SpringApplication(EstateagentsApplication.class);
 		ConfigurableApplicationContext configurableApplicationContext = springApplication.run(args);
-//		ChatServer.setApplicationContext(configurableApplicationContext);
 	}
 
 }

src/main/java/com/huiju/estateagents/common/DateUtils.java

@@ -6,6 +6,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import java.util.Locale;
 
 public class DateUtils {
     public static LocalDateTime date2LocalDateTime(Date date) {
@@ -123,4 +124,13 @@ public class DateUtils {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         return LocalDateTime.parse(target, df);
     }
+
+    public static LocalDateTime parse(String str, String format) {
+        if (null == str || "".equals(str) || "null".equals(str) || "undefined".equals(str)) {
+            return null;
+        }
+
+        DateTimeFormatter df = DateTimeFormatter.ofPattern(format, Locale.CHINA);
+        return LocalDateTime.parse(str, df);
+    }
 }

src/main/java/com/huiju/estateagents/property/controller/BillController.java

@@ -4,7 +4,8 @@ package com.huiju.estateagents.property.controller;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.property.model.Bill;
 import com.huiju.estateagents.property.service.IBillService;
 import io.swagger.annotations.Api;
@@ -20,9 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.OutputStream;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -52,17 +51,23 @@ public class BillController extends BaseController {
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
     })
     @RequestMapping(value = "/admin/bills",method = RequestMethod.GET)
-    public ResponseBean getList(@RequestParam(value = "billId", required = false) Integer billId,
+    public ResponseBean getList(@RequestParam("communityId") Integer communityId,
+                                @RequestParam(value = "billId", required = false) Integer billId,
                                 @RequestParam(value = "billName", required = false) String billName,
-                                @RequestParam(value = "billExplain", required = false) String billExplain,
+                                @RequestParam(value = "startDate", required = false) String startDate,
+                                @RequestParam(value = "endDate", required = false) String endDate,
+                                @RequestParam(value = "isTicket", required = false) Boolean isTicket,
                                 @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
         Bill bill = new Bill();
         bill.setId(billId);
+        bill.setCommunityId(communityId);
         bill.setBillName(billName);
-        bill.setBillExplain(billExplain);
+        bill.setIsTicket(isTicket);
+        bill.setStartDate(!StringUtils.isEmpty(startDate) ? DateUtils.parse(startDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss") : null);
+        bill.setEndDate(!StringUtils.isEmpty(startDate) ? DateUtils.parse(endDate + " 23:59:59", "yyyy-MM-dd HH:mm:ss") : null);
         bill.setOrgId(userElement.getOrgId());
         responseBean = iBillService.getBillList(bill,pageNum,pageSize);
         return responseBean;
@@ -91,23 +96,21 @@ public class BillController extends BaseController {
     // @ApiOperation(value = "上传缴费项接口, 保存/修改", notes = "上传缴费项接口, 保存/修改")
     @PostMapping(value = "/admin/bill/uploadExcel/add", consumes = "multipart/*", headers = "content-type=multipart/form-data")
     public ResponseBean addUploadExcel(HttpServletRequest request,
+                                       @RequestParam("communityId") Integer communityId,
                                        @RequestParam(value = "billId", required = false) Integer billId,
                                        @RequestParam(value = "file", required = false) MultipartFile file,
-                                       @RequestParam("billExplain") String billExplain,
+//                                       @RequestParam("billExplain") String billExplain,
                                        @RequestParam("billName") String billName,
-                                       @RequestParam("endDate") Date endDate,
+                                       @RequestParam("startDate") String startDate,
+                                       @RequestParam("endDate") String endDate,
                                        @RequestParam("billStatus") String billStatus) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        Date date = null;
-//        try {
-//            String d = simpleDateFormat.format(new Long(endDate));
-//            date = simpleDateFormat.parse(d);
-//        } catch (ParseException e) {
-//            e.printStackTrace();
-//        }
-        responseBean = iBillService.getExcelData(billId, file, billExplain, billName, endDate, billStatus, userElement);
+
+        LocalDateTime stDate = DateUtils.parse(startDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        LocalDateTime edDate = DateUtils.parse(endDate + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+
+        responseBean = iBillService.saveExcelData(billId, file, communityId, billName, stDate, edDate, billStatus, userElement);
         return responseBean;
     }
 
@@ -149,7 +152,7 @@ public class BillController extends BaseController {
 
     })
     @RequestMapping(value = "/admin/bill/downloadExcel", method = RequestMethod.GET)
-    public void exportExcel(@RequestParam(value = "phaseId") Integer communityId,
+    public void exportExcel(@RequestParam(value = "communityId") Integer communityId,
                             @RequestParam(value = "phaseId",required = false) String phaseId,
                             @RequestParam(value = "buildingId",required = false) String buildingId,
                             HttpServletResponse response, HttpServletRequest request) {

src/main/java/com/huiju/estateagents/property/controller/BillInvoiceController.java

@@ -6,6 +6,7 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.model.Bill;
 import com.huiju.estateagents.property.model.BillInvoice;
 import com.huiju.estateagents.property.service.IBillInvoiceService;
 import com.huiju.estateagents.property.service.IBillService;
@@ -64,11 +65,11 @@ public class BillInvoiceController extends BaseController {
 
     })
     @RequestMapping(value = "/admin/bill/invoice/updateBill", method = RequestMethod.PUT)
-    public ResponseBean updateBill(HttpServletRequest request, @RequestBody String parameter) {
+    public ResponseBean updateBill(HttpServletRequest request, @RequestBody Bill bill) {
         ResponseBean responseBean = new ResponseBean();
 
         TaUser userElement = getTaUser(request);
-        responseBean = iBillService.updateBillNameAndBillExplainAndEndDate(userElement, parameter);
+        responseBean = iBillService.updateBillNameAndBillExplainAndEndDate(userElement, bill);
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/property/entity/TpBillType.java

@@ -0,0 +1,47 @@
+package com.huiju.estateagents.property.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TpBillType 对象", description="")
+public class TpBillType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "所属机构")
+    private Integer orgId;
+
+
+}

src/main/java/com/huiju/estateagents/property/mapper/TpBillTypeMapper.java

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.property.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.entity.TpBillType;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Mapper
+public interface TpBillTypeMapper extends BaseMapper<TpBillType> {
+}

src/main/java/com/huiju/estateagents/property/model/Bill.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -32,6 +33,8 @@ public class Bill implements Serializable {
     /**
      * 小区id
      */
+    private Integer communityId;
+
     private Integer orgId;
 
     /**
@@ -66,10 +69,12 @@ public class Bill implements Serializable {
      */
     private String billStatus;
 
+    private LocalDateTime startDate;
+
     /**
      * 截止时间
      */
-    private Date endDate;
+    private LocalDateTime endDate;
 
     /**
      * 创建人
@@ -91,5 +96,13 @@ public class Bill implements Serializable {
      */
     private Date updateDate;
 
+    /**
+     * 收费类型
+     */
+    private Integer typeId;
 
+    /**
+     * 是否工单费用
+     */
+    private Boolean isTicket;
 }

src/main/java/com/huiju/estateagents/property/model/BillInvoice.java

@@ -30,9 +30,6 @@ public class BillInvoice implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    /**
-     * 小区id
-     */
     private Integer orgId;
 
     /**
@@ -129,6 +126,12 @@ public class BillInvoice implements Serializable {
     @TableField(exist = false)
     private String ownerName;
 
+    /**
+     * 小区
+     */
+    @TableField(exist = false)
+    private Integer communityId;
+
     /**
      * 期
      */

src/main/java/com/huiju/estateagents/property/service/IBillService.java

@@ -3,11 +3,10 @@ package com.huiju.estateagents.property.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.Bill;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -28,7 +27,7 @@ public interface IBillService extends IService<Bill> {
      * @param userElement
      * @return
      */
-    ResponseBean updateBillNameAndBillExplainAndEndDate(TaUser userElement, String parameter);
+    ResponseBean updateBillNameAndBillExplainAndEndDate(TaUser userElement, Bill bill);
 
     /**
      * 根据ID查询 缴费项
@@ -48,6 +47,7 @@ public interface IBillService extends IService<Bill> {
 
 	/**
 	 * 上传excel, 解析, 但不入库
+	 *
 	 * @param file
 	 * @return
 	 */
@@ -57,13 +57,12 @@ public interface IBillService extends IService<Bill> {
 	 * 上传excel, 解析 入库
 	 * @param billId
 	 * @param file
-	 * @param billExplain
 	 * @param billName
 	 * @param endDate
 	 * @param billStatus
 	 * @return
 	 */
-	ResponseBean getExcelData(Integer billId, MultipartFile file, String billExplain, String billName, Date endDate, String billStatus, TaUser userElement);
+	ResponseBean saveExcelData(Integer billId, MultipartFile file, Integer communityId, String billName, LocalDateTime startDate, LocalDateTime endDate, String billStatus, TaUser userElement);
 
 	/**
 	 * 修改 缴费项状态

src/main/java/com/huiju/estateagents/property/service/impl/BillInvoiceServiceImpl.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.exception.WisdomException;
@@ -120,7 +122,10 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         respMap.put("list", invoiceIPage.getRecords());
         respMap.put("billName", bill.getBillName());
         respMap.put("billExplain", bill.getBillExplain());
+        respMap.put("startDate", bill.getStartDate());
         respMap.put("endDate", bill.getEndDate());
+        respMap.put("communityId", bill.getCommunityId());
+
 
         responseBean.addSuccess(respMap);
 
@@ -262,6 +267,13 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         // 收费项ID
         Integer billId = jsonObject.getInteger("billId");
+        //
+        Integer communityId = jsonObject.getInteger("communityId");
+
+        if (null == billId || null == communityId) {
+            return ResponseBean.error("收费ID或者小区不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
         // 区/期
         Integer phase = jsonObject.getInteger("phaseId");
         // 栋
@@ -290,6 +302,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         // 校验 期/区/栋/单元/楼层/户号
         QueryWrapper<TpRoomNo> roomNoQueryWrapper = new QueryWrapper<>();
         roomNoQueryWrapper.eq("org_id", userElement.getOrgId());
+        roomNoQueryWrapper.eq("community_id", communityId);
         roomNoQueryWrapper.eq("phase_id", phase);
         roomNoQueryWrapper.eq("building_id", building);
         roomNoQueryWrapper.eq("unit_id", unit);
@@ -386,7 +399,10 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         map.put("billId", billId);
         map.put("orgId", userElement.getOrgId());
 
+        Bill bill = billMapper.selectById(billId);
+
         List<BillInvoice> billInvoices = billInvoiceMapper.selectBillInvoiceTemp(map);
+        billInvoices.stream().forEach(e -> e.setCommunityId(bill.getCommunityId()));
 
         responseBean.addSuccess(billInvoices);
         return responseBean;
@@ -439,7 +455,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
     @Override
     public ResponseBean exportExcel(TaUser 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);
@@ -488,70 +504,109 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         IPage<BillInvoice> billInvoiceIPage = billInvoiceMapper.selectBillInvoiceEffective(page, map);
         List<BillInvoice> records = billInvoiceIPage.getRecords();
 
+        Bill bill = billMapper.selectById(billId);
+        if (null == bill) {
+            return workbook;
+        }
 
         // 写入内容
+        int line = 0;
         for (int i = 1; i<= billInvoiceIPage.getPages(); i++) {
             for (int t = 0; t<records.size(); t++) {
+                line ++;
+                BillInvoice billInvoice = records.get(t);
                 row = sheet.createRow(++rowNum);
-                // 收费单号
+
+                // 序号
                 cell = row.createCell(0);
-                cell.setCellValue(records.get(t).getId());
+                cell.setCellValue(line);
                 cell.setCellStyle(style);
-                // 房屋信息
+
+                // 收费名称
                 cell = row.createCell(1);
-                cell.setCellValue(records.get(t).getPhase() + records.get(t).getBuilding() + records.get(t).getUnit() + records.get(t).getRoomNo());
+                cell.setCellValue(StringUtils.ifNull(billInvoice.getBillInvoiceExplain(), bill.getBillName()));
                 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).getBillInvoiceExplain());
+                cell.setCellValue(DateUtils.format(bill.getStartDate(), "yyyy-MM-dd"));
                 cell.setCellStyle(style);
-                // 金额(元)
+
+                // 结束时间
                 cell = row.createCell(3);
-                double price = Double.valueOf(records.get(t).getPayPrice()) / 100.00;
-                cell.setCellValue(price);
+                cell.setCellValue(DateUtils.format(bill.getEndDate(), "yyyy-MM-dd"));
                 cell.setCellStyle(style);
-                if (null != records.get(t).getBillStatementId()) {
-                    // 流水
-                    cell = row.createCell(4);
-                    cell.setCellValue(records.get(t).getBillStatementId());
-                    cell.setCellStyle(style);
-                }
-                // 缴费状态
+
+                // 类别
+                cell = row.createCell(4);
+                cell.setCellValue(bill.getIsTicket() ? "维修" : "物业");
+                cell.setCellStyle(style);
+
+                // 收费单号
                 cell = row.createCell(5);
-                cell.setCellValue("0".equals(records.get(t).getBillStatus()) ? "未交费" : "1".equals(records.get(t).getBillStatus()) ? "已线上缴费" : "已线下缴费");
+                cell.setCellValue(billInvoice.getId());
                 cell.setCellStyle(style);
-                // 缴费人
+
+                // 房屋信息
                 cell = row.createCell(6);
-                cell.setCellValue(records.get(t).getPayName());
+                cell.setCellValue(billInvoice.getPhase());
                 cell.setCellStyle(style);
-                if (null != records.get(t).getPayDate()) {
-                    // 缴费时间
-                    cell = row.createCell(7);
-                    cell.setCellValue(dateFormat.format(records.get(t).getPayDate()));
-                    cell.setCellStyle(style);
-                }
-                // 新建时间
+
+                cell = row.createCell(7);
+                cell.setCellValue(billInvoice.getBuilding());
+                cell.setCellStyle(style);
+
                 cell = row.createCell(8);
-                cell.setCellValue(dateFormat.format(records.get(t).getCreateDate()));
+                cell.setCellValue(billInvoice.getUnit());
                 cell.setCellStyle(style);
-                // 新建人
+
                 cell = row.createCell(9);
-                cell.setCellValue(records.get(t).getCreateUserName());
+                cell.setCellValue(billInvoice.getRoomNo());
                 cell.setCellStyle(style);
-                // 修改人
+
+                // 金额(元)
                 cell = row.createCell(10);
-                cell.setCellValue(records.get(t).getUpdateUserName());
+                double price = Double.valueOf(billInvoice.getPayPrice()) / 100.00;
+                cell.setCellValue(price);
                 cell.setCellStyle(style);
-                if (null != records.get(t).getUpdateDate()) {
-                    // 修改时间
+                if (null != billInvoice.getBillStatementId()) {
+                    // 流水
                     cell = row.createCell(11);
-                    cell.setCellValue(dateFormat.format(records.get(t).getUpdateDate()));
+                    cell.setCellValue(billInvoice.getBillStatementId());
+                    cell.setCellStyle(style);
+                }
+                // 缴费状态
+                cell = row.createCell(12);
+                cell.setCellValue("0".equals(billInvoice.getBillStatus()) ? "未交费" : "1".equals(billInvoice.getBillStatus()) ? "已线上缴费" : "已线下缴费");
+                cell.setCellStyle(style);
+                // 缴费人
+                cell = row.createCell(13);
+                cell.setCellValue(billInvoice.getPayName());
+                cell.setCellStyle(style);
+                if (null != billInvoice.getPayDate()) {
+                    // 缴费时间
+                    cell = row.createCell(14);
+                    cell.setCellValue(dateFormat.format(billInvoice.getPayDate()));
                     cell.setCellStyle(style);
                 }
+//                // 新建时间
+//                cell = row.createCell(8);
+//                cell.setCellValue(dateFormat.format(billInvoice.getCreateDate()));
+//                cell.setCellStyle(style);
+//                // 新建人
+//                cell = row.createCell(9);
+//                cell.setCellValue(billInvoice.getCreateUserName());
+//                cell.setCellStyle(style);
+//                // 修改人
+//                cell = row.createCell(10);
+//                cell.setCellValue(billInvoice.getUpdateUserName());
+//                cell.setCellStyle(style);
+//                if (null != billInvoice.getUpdateDate()) {
+//                    // 修改时间
+//                    cell = row.createCell(11);
+//                    cell.setCellValue(dateFormat.format(billInvoice.getUpdateDate()));
+//                    cell.setCellStyle(style);
+//                }
             }
             page.setCurrent(i);
             page.setSize(500);

src/main/java/com/huiju/estateagents/property/service/impl/BillServiceImpl.java

@@ -1,6 +1,5 @@
 package com.huiju.estateagents.property.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -38,7 +37,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -106,15 +104,20 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateBillNameAndBillExplainAndEndDate(TaUser userElement, String parameter) {
+    public ResponseBean updateBillNameAndBillExplainAndEndDate(TaUser userElement, Bill bill) {
         ResponseBean responseBean = new ResponseBean();
-        Bill bill = JSONObject.parseObject(parameter, Bill.class);
+//        Bill bill = JSONObject.parseObject(parameter, Bill.class);
         if (StringUtils.isEmpty(bill.getBillName())) {
             responseBean.addError("收费项名称不能为空");
             return responseBean;
         }
-        if (StringUtils.isEmpty(bill.getBillExplain())) {
-            responseBean.addError("缴费项说明");
+//        if (StringUtils.isEmpty(bill.getBillExplain())) {
+//            responseBean.addError("缴费项说明");
+//            return responseBean;
+//        }
+
+        if (bill.getStartDate() == null) {
+            responseBean.addError("截止时间不能为空");
             return responseBean;
         }
         if (bill.getEndDate() == null) {
@@ -187,26 +190,9 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean getExcelData(Integer billId, MultipartFile file, String billExplain, String billName, Date endDate, String billStatus, TaUser userElement) {
+    public ResponseBean saveExcelData(Integer billId, MultipartFile file, Integer communityId, String billName, LocalDateTime startDate, LocalDateTime endDate, String billStatus, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
-        // 获取本地时间
-        Date date = new Date();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String formatDate = simpleDateFormat.format(date);
-        Date parse = null;
-        try {
-            parse = simpleDateFormat.parse(formatDate);
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-
-        if (endDate.getTime() < parse.getTime()) {
-            responseBean.addError("不能小于当前时间!");
-            return responseBean;
-        }
-
-
         List<BillInvoice> records = null;
         if (billId != null) {
             // 查询出这个收费单, 存在的缴费单数据
@@ -240,8 +226,10 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
         // 存入缴费项表
         Bill bill = new Bill();
+        bill.setCommunityId(communityId);
         bill.setBillName(billName);
-        bill.setBillExplain(billExplain);
+//        bill.setBillExplain(billExplain);
+        bill.setStartDate(startDate);
         bill.setEndDate(endDate);
         if (StringUtils.isNotBlank(strSumDouble)) {
             strSumDouble = strSumDouble.substring(0, strSumDouble.lastIndexOf("."));
@@ -354,7 +342,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                     throw new WisdomException("房产：" + e.getPhase() + e.getBuilding() + e.getUnit() + e.getLevel() + e.getRoomNo() + " 不存在！请核对！");
                 }
                 billInvoice.setRoomNoId(tpRoomNo.getId());
-                billInvoice.setBillInvoiceExplain(e.getBillExplain());
+                billInvoice.setBillInvoiceExplain(billName);
                 billInvoice.setPayPrice(e.getPayPrice());
                 billInvoice.setBillStatus("0");
                 billInvoice.setCreateUser(userElement.getUserId());
@@ -472,17 +460,17 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             String roomNo = cell.getStringCellValue().trim();
 
 
-            // 收费说明可以为空
-            cell = getCell(row.getCell(6));
-            String billExplain = null;
-            if (null != cell) {
-                billExplain = cell.getStringCellValue().trim();
-                if (billExplain.length() > 100) {
-                    throw new WisdomException("第" + currentRow + "行 收费说明超出100字，请精简到100字以内");
-                }
-            }
+//            // 收费说明可以为空
+//            cell = getCell(row.getCell(6));
+//            String billExplain = null;
+//            if (null != cell) {
+//                billExplain = cell.getStringCellValue().trim();
+//                if (billExplain.length() > 100) {
+//                    throw new WisdomException("第" + currentRow + "行 收费说明超出100字，请精简到100字以内");
+//                }
+//            }
 
-            cell = getCell(row.getCell(7));
+            cell = getCell(row.getCell(6));
             if (null == cell) {
                 throw new WisdomException("第" + currentRow + "行 金额 不能为空");
             }
@@ -496,7 +484,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             temp.setUnit(unit);
             temp.setRoomNo(roomNo);
             // temp.setOwnerName(ownerName);
-            temp.setBillExplain(billExplain);
+//            temp.setBillExplain(billExplain);
 
 
             if (StringUtils.isNotBlank(money)) {
@@ -662,7 +650,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 if (index == records.size()) {
                     index = 0;
                     pageNum ++;
-                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(), communityId, pageNum * pageSize, pageSize);
+                    records = tpRoomNoMapper.selectComunityList(userElement.getOrgId(), communityId, phaseId,buildingId, pageNum * pageSize, pageSize);
                 }
                 if (records.isEmpty()) {
                     break;

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -55,6 +55,7 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 
 /**
@@ -1225,7 +1226,8 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         Bill bill = new Bill();
         bill.setBillName(tpTicket.getTicketTitle());
         bill.setBillExplain(ticket.getPriceExplain());
-        bill.setEndDate(Date.from(LocalDateTime.now().plusMonths(1).atZone( ZoneId.systemDefault()).toInstant()));
+        // 当前时间的下个月初 - 1秒 = 本月月末的最后时间
+        bill.setEndDate(LocalDateTime.now().plusMonths(1).with(TemporalAdjusters.firstDayOfMonth()).minusSeconds(1));
         bill.setPayPrice(ticket.getPrice().toString());
 
         bill.setPayedNum(0);

src/main/resources/mapper/property/BillMapper.xml

@@ -3,32 +3,29 @@
 <mapper namespace="com.huiju.estateagents.property.dao.BillMapper">
     <select id="selectListByParams" resultType="com.huiju.estateagents.property.model.Bill">
         SELECT
-            t.id,
-            t.org_id,
-            t.bill_name,
-            t.bill_explain,
-            t.pay_total_num,
-            t.payed_num,
-            t.unpayed_num,
-            t.bill_status,
-            t.end_date,
-            t.create_user,
-            t.create_date,
-            t.update_user,
-            t.update_date
+            t.*
         FROM
             tp_bill t
         WHERE
-        1 = 1
-        AND t.org_id = #{bill.orgId}
-        <if test="bill.id != null and bill.id != '' or bill.id ==0">
-            and t.id like concat('%',#{bill.id},'%')
+            t.org_id = #{bill.orgId}
+            and t.community_id = #{bill.communityId}
+        <if test="bill.id != null">
+            and t.id = #{bill.id}
         </if>
         <if test="bill.billName != null and bill.billName != ''">
             and t.bill_name like concat('%',#{bill.billName,jdbcType=VARCHAR},'%')
         </if>
-        <if test="bill.billExplain != null and bill.billExplain != ''">
-            and t.bill_explain like concat('%',#{bill.billExplain,jdbcType=VARCHAR},'%')
+        <if test="bill.startDate != null">
+            and t.start_date &gt;= #{bill.startDate}
+        </if>
+        <if test="bill.endDate != null">
+            and t.end_date &lt;= #{bill.endDate}
+        </if>
+        <if test="bill.isTicket">
+            and t.is_ticket = 1
+        </if>
+        <if test="!bill.isTicket">
+            and t.is_ticket = 0
         </if>
         order by t.id DESC
     </select>

src/main/resources/mapper/property/TpBillTypeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.property.mapper.TpBillTypeMapper">
+
+</mapper>