From 0b87957ee3e835c843408fc19bec659ca161fad8 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 25 十一月 2024 18:41:50 +0800
Subject: [PATCH] 客户资料 巡检任务业务
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java | 77 ++++++-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRevenueCloudController.java | 30 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRevenueService.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java | 43 ++-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java | 12
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java | 372 ++++++++++++++++++++++++++++++------
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/EditRecordDataVO.java | 28 ++
8 files changed, 455 insertions(+), 115 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 5e2a5af..336d44e 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -1252,7 +1252,8 @@
FN_DEVICE_RECORD_FILE(6, "闃滃畞鏈嶅姟骞冲彴杩愮淮璁板綍鍥剧墖 ", "闃滃畞鏈嶅姟骞冲彴杩愮淮璁板綍鍥剧墖 "),
FN_PATROL_POINT_FILE(7, "宸℃鐐归檮浠� ", "宸℃鐐归檮浠� "),
FN_CONTRACT_BILL_FILE(8, "鍚堝悓璐﹀崟闄勪欢 ", "鍚堝悓璐﹀崟闄勪欢 "),
- YW_CONTRACT_FILE(9, "鍚堝悓闄勪欢 ", "鍚堝悓闄勪欢 ")
+ YW_CONTRACT_FILE(9, "鍚堝悓闄勪欢 ", "鍚堝悓闄勪欢 "),
+ FN_CONTRACT_REVENUE_FILE(10, "鏀舵敮娴佹按闄勪欢 ", "鍚堝悓璐﹀崟闄勪欢 "),
;
// 鎴愬憳鍙橀噺
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRevenueCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRevenueCloudController.java
index f67ad1d..c0e32e3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRevenueCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRevenueCloudController.java
@@ -43,7 +43,7 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:ywcontractrevenue:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
+ public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
ywContractRevenueService.deleteById(id);
return ApiResponse.success(null);
}
@@ -51,7 +51,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:ywcontractrevenue:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray) {
@@ -64,29 +64,45 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("business:ywcontractrevenue:update")
- public ApiResponse updateById(@RequestBody YwContractRevenue ywContractRevenue) {
+ public ApiResponse updateById(@RequestBody YwContractRevenue ywContractRevenue,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
ywContractRevenueService.updateById(ywContractRevenue);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鍏抽棴娴佹按")
+ @GetMapping("/close")
+ @CloudRequiredPermission("business:ywcontractrevenue:update")
+ public ApiResponse close(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywContractRevenueService.closeRevenue(id,getLoginUser(token));
return ApiResponse.success(null);
}
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@CloudRequiredPermission("business:ywcontractrevenue:query")
- public ApiResponse<PageData<YwContractRevenue>> findPage (@RequestBody PageWrap<YwContractRevenue> pageWrap) {
+ public ApiResponse<PageData<YwContractRevenue>> findPage (@RequestBody PageWrap<YwContractRevenue> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(ywContractRevenueService.findPage(pageWrap));
+ }
+
+
+ @ApiOperation("鏀舵敮鍒楄〃")
+ @PostMapping("/list")
+ @CloudRequiredPermission("business:ywcontractrevenue:query")
+ public ApiResponse<List<YwContractRevenue>> list (@RequestBody YwContractRevenue ywContractRevenue,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(ywContractRevenueService.findList(ywContractRevenue));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:ywcontractrevenue:exportExcel")
- public void exportExcel (@RequestBody PageWrap<YwContractRevenue> pageWrap, HttpServletResponse response) {
+ public void exportExcel (@RequestBody PageWrap<YwContractRevenue> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
ExcelExporter.build(YwContractRevenue.class).export(ywContractRevenueService.findPage(pageWrap).getRecords(), "杩愮淮鍚堝悓鏀舵敮娴佹按", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@CloudRequiredPermission("business:ywcontractrevenue:query")
- public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(ywContractRevenueService.findById(id));
+ public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(ywContractRevenueService.getDetail(id));
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
index 60a0cec..0dcd404 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
@@ -90,8 +90,8 @@
@ExcelColumn(name="搴旀敹閲戦",index = 5,width = 6)
private BigDecimal receivableFee;
- @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬 ;7=淇濊瘉閲�", example = "1")
- @ExcelColumn(name="璐圭敤绫诲瀷",index = 8,width = 6,valueMapping = "0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�")
+ @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬; 7=淇濊瘉閲�", example = "1")
+ @ExcelColumn(name="璐圭敤绫诲瀷",index = 8,width = 6,valueMapping = "0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾;4=姘寸數璐�;5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�;")
private Integer costType;
@ApiModelProperty(value = "璐﹀崟绫诲瀷锛�0=鏀舵锛�1=浠樻", example = "1")
@@ -107,6 +107,7 @@
@ApiModelProperty(value = "浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�")
@ExcelColumn(name="缁撴竻鐘舵��",index = 3,width = 6,valueMapping = "0=寰呮敹娆�;1=宸茬粨娓�;2=閮ㄥ垎缁撴竻;3=寰呬粯娆�;4=寰呴��娆�;5=宸插叧闂�;")
private Integer payStatus;
+
@ApiModelProperty(value = "閫�绉熺被鍨� 0鍒版湡閫�绉� 1鎹㈡埧閫�绉� 2杩濈害閫�绉� 3鍗忓晢閫�绉�", example = "1")
@ExcelColumn(name="閫�绉熺被鍨� 0鍒版湡閫�绉� 1鎹㈡埧閫�绉� 2杩濈害閫�绉� 3鍗忓晢閫�绉�")
private Integer btType;
@@ -162,11 +163,6 @@
@TableField(exist = false)
private String roomPathName;
- @ApiModelProperty(value = "鎴块棿鏁版嵁", example = "1")
- @TableField(exist = false)
- private List<YwRoom> ywRoomList ;
-
-
@ApiModelProperty(value = "璁″垝浠樻鏃� - 寮�濮�")
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -191,7 +187,7 @@
@ApiModelProperty(value = "鏄惁閫炬湡锛�0=鍚︼紱1=鏄�")
@TableField(exist = false)
@ExcelColumn(name="鏄惁閫炬湡",index = 9,width = 6,valueMapping = "0=鏈�炬湡锛�1=宸查�炬湡")
- private BigDecimal isOverdue;
+ private Integer isOverdue;
@ApiModelProperty(value = "闄勪欢淇℃伅", example = "1")
@TableField(exist = false)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java
index c0bad0d..8c374fa 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.constants.OperaType;
import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.business.vo.EditRecordDataVO;
+import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,8 +13,11 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.validation.constraints.NotBlank;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 杩愮淮鍚堝悓鏀舵敮娴佹按
@@ -25,77 +31,114 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃ユ湡",index = 8,width = 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鐘舵�� 0=寮�鍚紱1=鍏抽棴", example = "1")
- @ExcelColumn(name="鐘舵�� 0=寮�鍚紱1=鍏抽棴")
+ @ExcelColumn(name="鐘舵��",index = 10,width = 10,valueMapping = "0=寮�鍚�;1=鍏抽棴")
private Integer status;
- @ApiModelProperty(value = "瀹炴敹閲戦", example = "1")
- @ExcelColumn(name="瀹炴敹閲戦")
+ @ApiModelProperty(value = "鍙戠敓閲戦", example = "1")
+ @ExcelColumn(name="鍙戠敓閲戦",index = 5,width = 10)
private BigDecimal actReceivableFee;
@ApiModelProperty(value = "瀹為檯浠樻鏃�")
- @ExcelColumn(name="瀹為檯浠樻鏃�")
+ @ExcelColumn(name="鍏ヨ处鏃ユ湡",index = 7,width = 10,dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date actPayDate;
@ApiModelProperty(value = "浠樻绫诲瀷锛�0=鐜伴噾锛�1=缃戦摱杞处锛�2=POS鏈猴紱3=鏀粯瀹濓紱4=寰俊锛�5=杞处鏀エ锛�6=鍏朵粬", example = "1")
- @ExcelColumn(name="浠樻绫诲瀷锛�0=鐜伴噾锛�1=缃戦摱杞处锛�2=POS鏈猴紱3=鏀粯瀹濓紱4=寰俊锛�5=杞处鏀エ锛�6=鍏朵粬")
+ @ExcelColumn(name="鏀舵鏂瑰紡",index = 6,width = 10,valueMapping = "0=鐜伴噾;1=缃戦摱杞处;2=POS鏈�;3=鏀粯瀹�;4=寰俊;5=杞处鏀エ;6=鍏朵粬;")
private Integer payType;
@ApiModelProperty(value = "鎵�灞炲叕鍙革紙鍏宠仈 company锛�", example = "1")
- @ExcelColumn(name="鎵�灞炲叕鍙革紙鍏宠仈 company锛�")
private Integer companyId;
@ApiModelProperty(value = "鏀舵敮璐︽埛锛堝叧鑱攜w_account)", example = "1")
- @ExcelColumn(name="鏀舵敮璐︽埛锛堝叧鑱攜w_account)")
private Integer accountId;
@ApiModelProperty(value = "鍚堝悓涓婚敭锛堝叧鑱攜w_contract锛�", example = "1")
- @ExcelColumn(name="鍚堝悓涓婚敭锛堝叧鑱攜w_contract锛�")
private Integer contractId;
@ApiModelProperty(value = "璐﹀崟涓婚敭锛堝叧鑱攜w_contract_bill锛�", example = "1")
- @ExcelColumn(name="璐﹀崟涓婚敭锛堝叧鑱攜w_contract_bill锛�")
private Integer billId;
@ApiModelProperty(value = "鏀舵敮绫诲瀷锛�0=鏀跺叆锛�1=鏀嚭", example = "1")
- @ExcelColumn(name="鏀舵敮绫诲瀷锛�0=鏀跺叆锛�1=鏀嚭")
+ @ExcelColumn(name="鏀舵敮绫诲瀷",index = 4,width = 10,valueMapping = "0=鏀跺叆;1=鏀嚭")
private Integer revenueType;
+
+
+ @ApiModelProperty(value = "鍚堝悓缂栧彿", example = "1")
+ @ExcelColumn(name="鍚堝悓缂栧彿",index = 1,width = 10)
+ @TableField(exist = false)
+ private String contractCode;
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
@TableField(exist = false)
private String customerNme;
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О锛堜粯娆炬柟锛�", example = "1")
+ @ExcelColumn(name="瀹㈡埛鍚嶇О",index = 0,width = 10)
+ @TableField(exist = false)
+ private String customerName;
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ @ExcelColumn(name="鍒涘缓浜�",index = 9,width = 10)
+ private String realname;
+
+ @ApiModelProperty(value = "鍏宠仈鎴块棿鏁版嵁", example = "1")
+ @TableField(exist = false)
+ private List<YwContractRoom> ywContractRoomList;
+
+
+ @ApiModelProperty(value = "闄勪欢淇℃伅", example = "1")
+ @TableField(exist = false)
+ private List<Multifile> multifileList;
+
+ @ApiModelProperty(value = "鍏ヨ处鏃ユ湡 - 寮�濮�")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date payDateStart;
+
+ @ApiModelProperty(value = "鍏ヨ处鏃ユ湡 - 缁撴潫")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date payDateEnd;
+
+ @ApiModelProperty(value = "妤煎畤鎴块棿", example = "1")
+ @ExcelColumn(name="鎴垮彿",index = 2,width = 10)
+ @TableField(exist = false)
+ private String roomPathName;
+
+ @ApiModelProperty(value = "璐﹀崟缂栧彿", example = "1")
+ @ExcelColumn(name="璐﹀崟缂栧彿",index = 3,width = 16)
+ @TableField(exist = false)
+ private String billCode;
+
+ @ApiModelProperty(value = "鎿嶄綔璁板綍", example = "1")
+ @TableField(exist = false)
+ private List<EditRecordDataVO> editRecordDataVOList;
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/EditRecordDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/EditRecordDataVO.java
new file mode 100644
index 0000000..8221220
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/EditRecordDataVO.java
@@ -0,0 +1,28 @@
+package com.doumee.dao.business.vo;
+
+import com.doumee.dao.business.model.Approve;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/5/23 14:56
+ */
+@Data
+public class EditRecordDataVO {
+
+ @ApiModelProperty(value = "鎿嶄綔鏃堕棿")
+ private Date editTime;
+
+ @ApiModelProperty(value = "鎿嶄綔浜�")
+ private String editUserName;
+
+ @ApiModelProperty(value = "鎿嶄綔澶囨敞")
+ private String editRemark;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRevenueService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRevenueService.java
index 5945c12..410ce06 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRevenueService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRevenueService.java
@@ -1,5 +1,6 @@
package com.doumee.service.business;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwContractRevenue;
@@ -63,6 +64,10 @@
*/
YwContractRevenue findById(Integer id);
+ YwContractRevenue getDetail(Integer id);
+
+ void closeRevenue(Integer id, LoginUserInfo loginUserInfo);
+
/**
* 鏉′欢鏌ヨ鍗曟潯璁板綍
*
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
index 7d4dc16..cd31b01 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
@@ -8,10 +8,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.YwContractBillMapper;
-import com.doumee.dao.business.YwContractRevenueMapper;
-import com.doumee.dao.business.YwContractRoomMapper;
-import com.doumee.dao.business.YwRoomMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.model.Multifile;
@@ -53,6 +50,9 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private YwContractMapper ywContractMapper;
+
@Override
@@ -71,6 +71,14 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ YwContract ywContract = ywContractMapper.selectById(ywContractBill.getContractId());
+ if(Objects.isNull(ywContract)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(Constants.equalsInteger(ywContract.getStatus(),Constants.THREE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝悓鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
+ }
+
LoginUserInfo loginUserInfo = ywContractBill.getLoginUserInfo();
ywContractBill.setReceivableFee(ywContractBill.getTotleFee());
ywContractBill.setCreateDate(new Date());
@@ -170,6 +178,7 @@
if(Objects.isNull(ywContractBill)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
+
//鎴挎簮鏁版嵁
ywContractBill.setYwContractRoomList(ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()
.selectAll(YwContractRoom.class)
@@ -183,16 +192,7 @@
.eq(YwContractRoom::getContractId,id)
.eq(YwContractRoom::getType,Constants.ONE)
));
- //鏀舵敮鏄庣粏
- ywContractBill.setYwContractRevenueList(
- ywContractRevenueMapper.selectJoinList(YwContractRevenue.class,new MPJLambdaWrapper<YwContractRevenue>()
- .selectAll(YwContractRevenue.class)
- .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerNme)
- .leftJoin(YwContract.class,YwContract::getId,YwContractRevenue::getContractId)
- .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
- .eq(YwContractRevenue::getBillId,id)
- )
- );
+
//闄勪欢鏁版嵁
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getObjId,id)
@@ -246,8 +246,8 @@
YwContractBill::getType,model.getType())
.eq(Objects.nonNull(model)&&Objects.nonNull(model.getContractId()),
YwContractBill::getContractId,model.getContractId())
- .ge(YwContractBill::getPlanPayDate, Utils.Date.getStart(model.getPlanPayDateStart()))
- .le(YwContractBill::getPlanPayDate, Utils.Date.getEnd(model.getPlanPayDateEnd())) )
+ .ge(Objects.nonNull(model)&&Objects.nonNull(model.getPlanPayDateStart()),YwContractBill::getPlanPayDate, Utils.Date.getStart(model.getPlanPayDateStart()))
+ .le(Objects.nonNull(model)&&Objects.nonNull(model.getPlanPayDateEnd()),YwContractBill::getPlanPayDate, Utils.Date.getEnd(model.getPlanPayDateEnd())) )
;
this.dealRoomDetail(iPage.getRecords());
for (YwContractBill ywContractBill:iPage.getRecords()) {
@@ -255,6 +255,16 @@
ywContractBill.setNeedReceivableFee(
ywContractBill.getReceivableFee().subtract(ywContractBill.getActReceivableFee())
);
+ //鏄惁閫炬湡
+ if(Constants.equalsInteger(ywContractBill.getStatus(),Constants.ZERO) && (Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.ZERO)
+ || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.TWO)
+ || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.THREE)
+ || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.FOUR))
+ && ywContractBill.getEndDate().getTime() < System.currentTimeMillis()){
+ ywContractBill.setIsOverdue(Constants.ONE);
+ }else{
+ ywContractBill.setIsOverdue(Constants.ZERO);
+ }
//妤煎畤鍚嶇О
List<YwContractRoom> ywContractRoomList = ywContractBill.getYwContractRoomList();
StringBuilder roomPathName = new StringBuilder();
@@ -276,7 +286,6 @@
}
}
ywContractBill.setRoomPathName(roomPathName.toString());
-
}
return PageData.from(iPage);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java
index 7a0754c..d637c75 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java
@@ -7,26 +7,32 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.YwAccountMapper;
-import com.doumee.dao.business.YwContractBillMapper;
-import com.doumee.dao.business.YwContractRevenueMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.YwAccount;
-import com.doumee.dao.business.model.YwContractBill;
-import com.doumee.dao.business.model.YwContractRevenue;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.vo.EditRecordDataVO;
+import com.doumee.dao.system.MultifileMapper;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.Multifile;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.YwContractRevenueService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 杩愮淮鍚堝悓鏀舵敮娴佹按Service瀹炵幇
@@ -43,12 +49,26 @@
private YwContractBillMapper ywContractBillMapper;
@Autowired
+ private YwContractMapper ywContractMapper;
+
+ @Autowired
private CompanyMapper companyMapper;
@Autowired
private YwAccountMapper ywAccountMapper;
+ @Autowired
+ private MultifileMapper multifileMapper;
+
+ @Autowired
+ private YwContractRoomMapper ywContractRoomMapper;
+
+ @Autowired
+ private SystemUserMapper systemUserMapper;
+
+
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(YwContractRevenue ywContractRevenue) {
if(Objects.isNull(ywContractRevenue)
|| Objects.isNull(ywContractRevenue.getActReceivableFee())
@@ -57,12 +77,23 @@
|| Objects.isNull(ywContractRevenue.getCompanyId())
|| Objects.isNull(ywContractRevenue.getAccountId())
|| Objects.isNull(ywContractRevenue.getBillId())
+ || ywContractRevenue.getActReceivableFee().compareTo(BigDecimal.ZERO) <= Constants.ZERO
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
YwContractBill ywContractBill = ywContractBillMapper.selectById(ywContractRevenue.getBillId());
if(Objects.isNull(ywContractBill)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌璐﹀崟淇℃伅");
+ }
+ if(!Constants.equalsInteger(ywContractBill.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璐﹀崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(!(Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.ZERO)
+ || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.TWO)
+ || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.THREE)
+ || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.FOUR)
+ )){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璐﹀崟缁撴竻鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
}
Company company =companyMapper.selectById(ywContractRevenue.getCompanyId());
if(Objects.isNull(company)){
@@ -78,15 +109,75 @@
ywContractRevenue.setIsdeleted(Constants.ZERO);
ywContractRevenue.setStatus(Constants.ZERO);
ywContractRevenue.setContractId(ywContractBill.getContractId());
- ywContractRevenue.setRevenueType(ywContractBill.getBillType());
- ywContractRevenueMapper.insert(ywContractRevenue);
//鏍规嵁鏀舵敮鎯呭喌 鏇存柊璐﹀崟鏁版嵁
-
-
-
-
-
-
+ //鏌ヨ褰撳墠璐﹀崟涓� 宸叉敮浠樼殑璐圭敤
+ List<YwContractRevenue> ywContractRevenueList = ywContractRevenueMapper.selectList(new QueryWrapper<YwContractRevenue>().lambda().eq(YwContractRevenue::getIsdeleted,Constants.ZERO)
+ .eq(YwContractRevenue::getStatus,Constants.ZERO)
+ );
+ //宸叉敮浠橀噾棰�
+ BigDecimal payTotal = BigDecimal.ZERO;
+ //寰呮敮浠橀噾棰�
+ BigDecimal waitPayTotal = BigDecimal.ZERO;
+ //鏃犱粯娆捐褰� 鍒欎负鍒濇鏀粯 鏍规嵁璐﹀崟绫诲瀷 鍒ゆ柇鏄敮鍑� / 鏀跺叆
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(ywContractRevenueList)){
+ ywContractRevenue.setRevenueType(ywContractBill.getType());
+ if(ywContractRevenue.getActReceivableFee().compareTo(ywContractBill.getReceivableFee())>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇疯緭鍏ユ纭殑閲戦锛�");
+ }else if(ywContractRevenue.getActReceivableFee().compareTo(ywContractBill.getReceivableFee())==Constants.ZERO){
+ ywContractBill.setPayStatus(Constants.ONE);
+ }else{
+ ywContractBill.setPayStatus(Constants.TWO);
+ }
+ }else{
+ //鑾峰彇宸叉敮浠樼殑鎬婚噾棰� 锛堝彲鑳芥湁鏀跺叆 鏈夋敮鍑猴級
+ payTotal = ywContractRevenueList.stream().map(i->i.getActReceivableFee().multiply(
+ BigDecimal.valueOf(Constants.equalsInteger(ywContractRevenue.getRevenueType(),Constants.ZERO)?Constants.ONE:-Constants.ONE))
+ ).reduce(BigDecimal.ZERO,BigDecimal::add);
+ //鑾峰彇寰呮敮浠樻閲戦 濡傛灉璐﹀崟绫诲瀷涓烘敮鍑� 鎴� 锛堣处鍗曠被鍨嬩负鏀跺叆 涓� 寰呮敮浠橀噾棰� 灏忎簬 0锛� 鍒欎负鏀粯
+ waitPayTotal = ywContractBill.getReceivableFee().subtract(payTotal);
+ //濡傛灉寰呮敮浠橀噾棰� 澶т簬 0 鍒欐槸 鏀跺叆 鍚﹀垯鏄敮鍑� 鍏朵粬鐘舵�� 涓哄紓甯革紒
+ if(waitPayTotal.compareTo(BigDecimal.ZERO)>Constants.ZERO){
+ ywContractRevenue.setRevenueType(Constants.ZERO);
+ }else if(waitPayTotal.compareTo(BigDecimal.ZERO)<Constants.ZERO){
+ ywContractRevenue.setRevenueType(Constants.ONE);
+ }else{
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏀舵敮閲戦寮傚父!璇疯仈绯荤鐞嗗憳");
+ }
+ //寰呮敮浠樼殑娴佹按 濡傛灉涓烘敹鍏� 鍒欐瘮瀵� 閲戦鍊� 濡傛灉鏄敮鍑� 鍒欒幏鍙栫粷瀵瑰�� 杩涜瀵规瘮
+ if(Constants.equalsInteger(ywContractRevenue.getRevenueType(),Constants.ZERO)){
+ //濡傛灉鏀粯閲戦 澶т簬 寰呮敮浠橀噾棰� 鍒欐彁绀哄紓甯� 濡傛灉鏀粯閲戦灏忎簬 寰呮敮浠橀噾棰� 鍒欑姸鎬佷笉鍙樺寲 鍏朵粬鐘舵�� 寮傚父
+ if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇疯緭鍏ユ纭殑閲戦锛�");
+ }else if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())==Constants.ZERO){
+ ywContractBill.setPayStatus(Constants.ONE);
+ }
+ }else{
+ waitPayTotal = waitPayTotal.abs();
+ if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇疯緭鍏ユ纭殑閲戦锛�");
+ }else if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())==Constants.ZERO){
+ ywContractBill.setPayStatus(Constants.ONE);
+ }
+ }
+ }
+ ywContractRevenueMapper.insert(ywContractRevenue);
+ ywContractBillMapper.updateById(ywContractBill);
+ //瀛樺偍闄勪欢淇℃伅
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRevenue.getMultifileList())){
+ for (Multifile multifile:ywContractRevenue.getMultifileList()) {
+ if(Objects.isNull(multifile)
+ || StringUtils.isBlank(multifile.getFileurl())
+ || StringUtils.isBlank(multifile.getName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"闄勪欢淇℃伅閿欒");
+ }
+ multifile.setCreator(loginUserInfo.getId());
+ multifile.setCreateDate(new Date());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjType(Constants.MultiFile.FN_CONTRACT_REVENUE_FILE.getKey());
+ multifile.setObjId(ywContractRevenue.getId());
+ }
+ multifileMapper.insert(ywContractRevenue.getMultifileList());
+ }
return ywContractRevenue.getId();
}
@@ -130,6 +221,120 @@
}
@Override
+ public YwContractRevenue getDetail(Integer id) {
+ YwContractRevenue ywContractRevenue = ywContractRevenueMapper.selectJoinOne(
+ YwContractRevenue.class,
+ new MPJLambdaWrapper<YwContractRevenue>().selectAll(YwContractRevenue.class)
+ .selectAs(YwContractBill::getCode,YwContractRevenue::getBillCode)
+ .selectAs(YwContract::getCode,YwContractRevenue::getContractCode)
+ .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerName)
+ .selectAs(SystemUser::getRealname,YwContractRevenue::getRealname)
+ .leftJoin(YwContractBill.class,YwContractBill::getId,YwContractRevenue::getBillId)
+ .leftJoin(YwContract.class,YwContract::getId,YwContractBill::getContractId)
+ .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
+ .leftJoin(SystemUser.class,SystemUser::getId,YwContractRevenue::getCreator)
+ .eq(YwContractRevenue::getId,id)
+ );
+
+ this.getRecordData(ywContractRevenue);
+
+ return ywContractRevenue;
+ }
+
+ /**
+ * 鎿嶄綔璁板綍
+ * @param ywContractRevenue
+ */
+ public void getRecordData(YwContractRevenue ywContractRevenue){
+ List<EditRecordDataVO> editRecordDataVOList = new ArrayList();
+ //妯℃嫙娴佹按璁板綍
+ if(Objects.nonNull(ywContractRevenue.getCreateDate())){
+ EditRecordDataVO editRecordDataVO = new EditRecordDataVO();
+ editRecordDataVO.setEditRemark("鍒涘缓娴佹按");
+ editRecordDataVO.setEditTime(ywContractRevenue.getCreateDate());
+ SystemUser createUser = systemUserMapper.selectById(ywContractRevenue.getCreator());
+ if(Objects.nonNull(createUser)){
+ editRecordDataVO.setEditUserName(createUser.getRealname());
+ }
+ editRecordDataVOList.add(editRecordDataVO);
+ }
+ if(Objects.nonNull(ywContractRevenue.getEditor())){
+ EditRecordDataVO editRecordDataVO = new EditRecordDataVO();
+ editRecordDataVO.setEditRemark("鍏抽棴娴佹按");
+ editRecordDataVO.setEditTime(ywContractRevenue.getEditDate());
+ SystemUser closeUser = systemUserMapper.selectById(ywContractRevenue.getEditor());
+ if(Objects.nonNull(closeUser)){
+ editRecordDataVO.setEditUserName(closeUser.getRealname());
+ }
+ editRecordDataVOList.add(editRecordDataVO);
+ }
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(editRecordDataVOList)){
+ ywContractRevenue.setEditRecordDataVOList(editRecordDataVOList);
+ }
+ }
+
+
+ @Override
+ public void closeRevenue(Integer id,LoginUserInfo loginUserInfo) {
+ YwContractRevenue ywContractRevenue = ywContractRevenueMapper.selectById(id);
+ if(Objects.isNull(ywContractRevenue)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ YwContractBill ywContractBill = ywContractBillMapper.selectById(ywContractRevenue.getBillId());
+ if(Objects.isNull(ywContractBill)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ YwContract ywContract = ywContractMapper.selectById(ywContractBill.getContractId());
+ if(Objects.isNull(ywContract)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(Constants.equalsInteger(ywContract.getStatus(),Constants.THREE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝悓鐘舵�佸凡娴佽浆,鏃犳硶鎿嶄綔");
+ }
+ if(Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.ONE)
+ || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.TWO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璐﹀崟鐘舵�佸凡娴佽浆,鏃犳硶鎿嶄綔");
+ }
+ //鏌ヨ璐﹀崟涓� 鎵�鏈夌殑璐﹀崟
+ List<YwContractRevenue> ywContractRevenueList = ywContractRevenueMapper.selectList(new QueryWrapper<YwContractRevenue>().lambda().eq(YwContractRevenue::getStatus,Constants.ZERO)
+ .eq(YwContractRevenue::getIsdeleted,Constants.ZERO)
+ .eq(YwContractRevenue::getBillId,ywContractRevenue.getBillId())
+ .ne(YwContractRevenue::getId,id)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(ywContractRevenueList)){
+ //鏃犲叾浠栨祦姘磋褰� 鏍规嵁璐﹀崟鍒涘缓绫诲瀷 鍙樻洿鐘舵��
+ //鑷缓璐﹀崟 鏍规嵁璐﹀崟鏀舵敮绫诲瀷杩涜 鍙樻洿鐘舵��
+ if(Constants.equalsInteger(ywContractBill.getType(),Constants.ONE)){
+ if(Constants.equalsInteger(ywContractBill.getBillType(),Constants.ZERO)){
+ ywContractBill.setPayStatus(Constants.ZERO);
+ }else{
+ ywContractBill.setPayStatus(Constants.THREE);
+ }
+ }else{
+ //鍚堝悓璐﹀崟 鍙樹负 寰呮敹娆�
+ ywContractBill.setPayStatus(Constants.ZERO);
+ }
+ }else{
+ //瀛樺湪鍏朵粬娴佹按 鍒欑粺涓�鍙樻洿涓� 閮ㄥ垎缁撶畻
+ ywContractBill.setPayStatus(Constants.TWO);
+ }
+
+ ywContractBillMapper.update(null,new UpdateWrapper<YwContractBill>().lambda()
+ .set(YwContractBill::getPayStatus,ywContractBill.getPayStatus())
+ .set(YwContractBill::getEditor,loginUserInfo.getId())
+ .set(YwContractBill::getEditDate," now() ")
+ .eq(YwContractBill::getId,ywContractBill.getId())
+ );
+
+ ywContractRevenueMapper.update(null,new UpdateWrapper<YwContractRevenue>().lambda()
+ .set(YwContractRevenue::getStatus,Constants.ONE)
+ .set(YwContractRevenue::getEditor,loginUserInfo.getId())
+ .set(YwContractRevenue::getEditDate," now() ")
+ .eq(YwContractRevenue::getId,id));
+ }
+
+
+ @Override
public YwContractRevenue findOne(YwContractRevenue ywContractRevenue) {
QueryWrapper<YwContractRevenue> wrapper = new QueryWrapper<>(ywContractRevenue);
return ywContractRevenueMapper.selectOne(wrapper);
@@ -137,67 +342,104 @@
@Override
public List<YwContractRevenue> findList(YwContractRevenue ywContractRevenue) {
- QueryWrapper<YwContractRevenue> wrapper = new QueryWrapper<>(ywContractRevenue);
- return ywContractRevenueMapper.selectList(wrapper);
+ List<YwContractRevenue> ywContractRevenueList = ywContractRevenueMapper.selectJoinList(YwContractRevenue.class,new MPJLambdaWrapper<YwContractRevenue>()
+ .selectAll(YwContractRevenue.class)
+ .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerNme)
+ .leftJoin(YwContract.class,YwContract::getId,YwContractRevenue::getContractId)
+ .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
+ .eq(YwContractRevenue::getStatus,Constants.ZERO)
+ .eq(Objects.nonNull(ywContractRevenue) && Objects.nonNull(ywContractRevenue.getBillId()),YwContractRevenue::getBillId,ywContractRevenue.getBillId())
+ );
+ return ywContractRevenueList;
}
@Override
public PageData<YwContractRevenue> findPage(PageWrap<YwContractRevenue> pageWrap) {
IPage<YwContractRevenue> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<YwContractRevenue> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<YwContractRevenue> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(YwContractRevenue::getId, pageWrap.getModel().getId());
+ YwContractRevenue model = pageWrap.getModel();
+ IPage<YwContractRevenue> iPage = ywContractRevenueMapper.selectJoinPage(page,YwContractRevenue.class,
+ queryWrapper.selectAll(YwContractRevenue.class)
+ .selectAs(YwContractBill::getCode,YwContractRevenue::getBillCode)
+ .selectAs(YwContract::getCode,YwContractRevenue::getContractCode)
+ .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerName)
+ .selectAs(SystemUser::getRealname,YwContractRevenue::getRealname)
+ .leftJoin(YwContractBill.class,YwContractBill::getId,YwContractRevenue::getBillId)
+ .leftJoin(YwContract.class,YwContract::getId,YwContractBill::getContractId)
+ .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
+ .leftJoin(SystemUser.class,SystemUser::getId,YwContractRevenue::getCreator)
+ .eq(YwContractRevenue::getIsdeleted,Constants.ZERO)
+ .like(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getCustomerNme()),
+ YwCustomer::getName,model.getCustomerNme())
+ .eq(Objects.nonNull(model)&&Objects.nonNull(model.getPayType()),
+ YwContractRevenue::getPayType,model.getPayType())
+ .eq(Objects.nonNull(model)&&Objects.nonNull(model.getRevenueType()),
+ YwContractRevenue::getRevenueType,model.getRevenueType())
+ .ge(Objects.nonNull(model)&&Objects.nonNull(model.getPayDateStart()),YwContractRevenue::getActPayDate, Utils.Date.getStart(model.getPayDateStart()))
+ .le(Objects.nonNull(model)&&Objects.nonNull(model.getPayDateEnd()),YwContractRevenue::getActPayDate, Utils.Date.getEnd(model.getPayDateEnd())) )
+ ;
+
+ this.dealRoomDetail(iPage.getRecords());
+
+ for (YwContractRevenue ywContractRevenue:iPage.getRecords()) {
+ //妤煎畤鍚嶇О
+ List<YwContractRoom> ywContractRoomList = ywContractRevenue.getYwContractRoomList();
+ StringBuilder roomPathName = new StringBuilder();
+ for (YwContractRoom ywContractRoom:ywContractRoomList) {
+ if(StringUtils.isNotBlank(ywContractRoom.getProjectName())){
+ roomPathName.append(ywContractRoom.getProjectName()+"/");
+ }
+ if(StringUtils.isNotBlank(ywContractRoom.getBuildingName())){
+ roomPathName.append(ywContractRoom.getBuildingName()+"/");
+ }
+ if(StringUtils.isNotBlank(ywContractRoom.getFloorName())){
+ roomPathName.append(ywContractRoom.getFloorName()+"/");
+ }
+ if(StringUtils.isNotBlank(ywContractRoom.getRoomName())){
+ roomPathName.append(ywContractRoom.getRoomName());
+ }
+ if(StringUtils.isNotBlank(roomPathName)){
+ roomPathName.append(";");
+ }
+ }
+ ywContractRevenue.setRoomPathName(roomPathName.toString());
}
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(YwContractRevenue::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(YwContractRevenue::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(YwContractRevenue::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(YwContractRevenue::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(YwContractRevenue::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(YwContractRevenue::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(YwContractRevenue::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(YwContractRevenue::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(YwContractRevenue::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getActReceivableFee() != null) {
- queryWrapper.lambda().eq(YwContractRevenue::getActReceivableFee, pageWrap.getModel().getActReceivableFee());
- }
- if (pageWrap.getModel().getActPayDate() != null) {
- queryWrapper.lambda().ge(YwContractRevenue::getActPayDate, Utils.Date.getStart(pageWrap.getModel().getActPayDate()));
- queryWrapper.lambda().le(YwContractRevenue::getActPayDate, Utils.Date.getEnd(pageWrap.getModel().getActPayDate()));
- }
- if (pageWrap.getModel().getPayType() != null) {
- queryWrapper.lambda().eq(YwContractRevenue::getPayType, pageWrap.getModel().getPayType());
- }
- if (pageWrap.getModel().getCompanyId() != null) {
- queryWrapper.lambda().eq(YwContractRevenue::getCompanyId, pageWrap.getModel().getCompanyId());
- }
- if (pageWrap.getModel().getAccountId() != null) {
- queryWrapper.lambda().eq(YwContractRevenue::getAccountId, pageWrap.getModel().getAccountId());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ return PageData.from(iPage);
+ }
+
+
+ public void dealRoomDetail(List<YwContractRevenue> ywContractRevenueList){
+ //鏌ヨ璐﹀崟涓嬬殑妤煎畤鏁版嵁
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRevenueList)){
+ //鑾峰彇鎵�鏈夋暟鎹�
+ List<Integer> billIdList = ywContractRevenueList.stream().map(i->i.getBillId()).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(billIdList)){
+ List<YwContractRoom> ywContractRoomList = ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()
+ .selectAll(YwContractRoom.class)
+ .selectAs(YwProject::getName,YwRoom::getProjectName)
+ .selectAs(YwFloor::getName,YwRoom::getFloorName)
+ .selectAs(YwBuilding::getName,YwRoom::getBuildingName)
+ .selectAs(YwRoom::getName,YwContractRoom::getRoomName)
+ .leftJoin(YwRoom.class,YwRoom::getId,YwContractRoom::getRoomId)
+ .leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor)
+ .leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId)
+ .leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
+ .in(YwContractRoom::getContractId,billIdList)
+ .eq(YwContractRoom::getType,Constants.ONE)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRoomList)){
+ for (YwContractRevenue ywContractRevenue:ywContractRevenueList) {
+ ywContractRevenue.setYwContractRoomList(
+ ywContractRoomList.stream().filter(i->Constants.equalsInteger(i.getContractId(),ywContractRevenue.getBillId())).collect(Collectors.toList())
+ );
+ }
+ }
}
}
- return PageData.from(ywContractRevenueMapper.selectPage(page, queryWrapper));
}
+
@Override
public long count(YwContractRevenue ywContractRevenue) {
QueryWrapper<YwContractRevenue> wrapper = new QueryWrapper<>(ywContractRevenue);
--
Gitblit v1.9.3