From 00b29076f9775ab69b02a6fe8290cdbdff932b59 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 25 十一月 2024 14:10:59 +0800
Subject: [PATCH] 开发更新
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 68 +++++++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java | 8 +
server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java | 1
server/system_service/src/main/java/com/doumee/cloud/SystemCloudController.java | 2
server/system_service/src/main/java/com/doumee/cloud/SystemMenuCloudController.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwFloorCloudController.java | 8 +
server/system_service/src/main/java/com/doumee/cloud/SystemDataPermissionCloudController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorderLog.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java | 2
server/system_service/src/main/java/com/doumee/cloud/SystemDictDataCloudController.java | 2
server/system_service/src/main/java/com/doumee/cloud/SystemLoginLogCloudController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwRoomServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwFloorServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java | 10 +
server/system_service/src/main/java/com/doumee/cloud/SystemDictCloudController.java | 2
server/system_service/src/main/java/com/doumee/cloud/SystemPositionCloudController.java | 2
server/system_service/src/main/java/com/doumee/cloud/SystemTraceLogCloudController.java | 2
server/system_service/src/main/java/com/doumee/cloud/NoticesCloudController.java | 2
server/system_service/src/main/java/com/doumee/cloud/SystemDepartmentCloudController.java | 2
server/system_service/src/main/java/com/doumee/cloud/SystemUserCloudController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java | 13 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 88 ++++++++++++
server/system_service/src/main/java/com/doumee/cloud/SystemRoleCloudController.java | 2
server/system_service/src/main/java/com/doumee/cloud/SystemPermissionCloudController.java | 2
server/system_service/src/main/java/com/doumee/cloud/SystemMonitorCloudController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java | 129 ++++++++++--------
27 files changed, 287 insertions(+), 77 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/NoticesCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/NoticesCloudController.java
similarity index 98%
rename from server/system_service/src/main/java/com/doumee/api/cloud/NoticesCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/NoticesCloudController.java
index 26880b7..300bccb 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/NoticesCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/NoticesCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemCloudController.java
similarity index 97%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemCloudController.java
index ef10c47..21ebe0b 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemUserBiz;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemDataPermissionCloudController.java
similarity index 99%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemDataPermissionCloudController.java
index 6166fcb..7be2b30 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemDataPermissionCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDataPermissionBiz;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemDepartmentCloudController.java
similarity index 99%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemDepartmentCloudController.java
index 5f9f971..2e6d218 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemDepartmentCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDepartmentBiz;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemDictCloudController.java
similarity index 98%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemDictCloudController.java
index 7d0dcbc..ee91d10 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemDictCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictBiz;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemDictDataCloudController.java
similarity index 99%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemDictDataCloudController.java
index 38ce34c..74b0efe 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemDictDataCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemLoginLogCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemLoginLogCloudController.java
similarity index 98%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemLoginLogCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemLoginLogCloudController.java
index 6a2a031..8ab92d9 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemLoginLogCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemLoginLogCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemMenuCloudController.java
similarity index 99%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemMenuCloudController.java
index d274b92..3ffadd8 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemMenuCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemMenuBiz;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemMonitorCloudController.java
similarity index 97%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemMonitorCloudController.java
index 303ada4..ae2916d 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemMonitorCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemPermissionCloudController.java
similarity index 98%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemPermissionCloudController.java
index c99d039..a6c70aa 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemPermissionCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemPermissionBiz;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemPositionCloudController.java
similarity index 99%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemPositionCloudController.java
index a60d8ba..dd2ba2b 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemPositionCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemPositionBiz;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemRoleCloudController.java
similarity index 99%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemRoleCloudController.java
index f5d0896..4b47963 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemRoleCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemRoleBiz;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemTraceLogCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemTraceLogCloudController.java
similarity index 98%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemTraceLogCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemTraceLogCloudController.java
index 2f4ce98..488e089 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemTraceLogCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemTraceLogCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemUserCloudController.java
similarity index 99%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemUserCloudController.java
index 882d368..8167d7d 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemUserCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemUserBiz;
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 3236783..7ab9436 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
@@ -1293,6 +1293,74 @@
return noteinfo;
}
+ }
+
+ /**
+ * 杩愮淮鍚堝悓銆佸伐鍗曚俊鎭褰曠被鍨�
+ * 鎿嶄綔绫诲瀷 0宸ュ崟鍒涘缓 1鎸囨淳 2澶勭悊 3鍚堝悓鍒涘缓 4鍚堝悓鍙樻洿 5鍚堝悓閫�绉�
+ */
+ public enum YwLogType{
+ WORKORDER_CREATE(0, "宸ュ崟鍒涘缓", "宸ュ崟鍒涘缓"),
+ WORKORDER_DISPATCH(1, "宸ュ崟鎸囨淳", "宸ュ崟鎸囨淳"),
+ WORKORDER_DEAL(2, "宸ュ崟澶勭悊 ", "宸ュ崟澶勭悊 "),
+ CONTRACT_CREATE(3, "鍚堝悓鍒涘缓 ", "鍚堝悓鍒涘缓 "),
+ CONTRACT_UPDATE(4, "鍚堝悓鍙樻洿 ", "鍚堝悓鍙樻洿 "),
+ CONTRACT_BACK(5, "鍚堝悓閫�绉� ", "鍚堝悓閫�绉� "),
+
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private int key;
+ private String noteinfo;// 鎻忚堪
+
+ // 鏋勯�犳柟娉�
+ YwLogType(int key, String name, String noteinfo) {
+ this.name = name;
+ this.key = key;
+ this.noteinfo = noteinfo;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (MultiFile c : MultiFile.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getInfo(int index) {
+ for (YwLogType c : YwLogType.values()) {
+ if (c.getKey() == index) {
+ return c.noteinfo;
+ }
+ }
+ return null;
+ }
+
+ // get set 鏂规硶
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public String getNoteinfo() {
+ return noteinfo;
+ }
+
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java
index f387de4..73abf9f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java
@@ -40,6 +40,14 @@
ywContract.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(ywContractService.create(ywContract));
}
+ @PreventRepeat
+ @ApiOperation("閫�绉�")
+ @PostMapping("/backRent")
+ @CloudRequiredPermission("business:ywcontract:update")
+ public ApiResponse backRent(@RequestBody YwContract ywContract,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywContract.setLoginUserInfo(this.getLoginUser(token));
+ return ApiResponse.success(ywContractService.backRent(ywContract));
+ }
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwFloorCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwFloorCloudController.java
index e503f64..c541f6f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwFloorCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwFloorCloudController.java
@@ -79,6 +79,14 @@
return ApiResponse.success(ywFloorService.findPage(pageWrap));
}
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/list")
+ @CloudRequiredPermission("business:ywfloor:query")
+ public ApiResponse<List<YwFloor>> findList (@RequestBody YwFloor pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap. setLoginUserInfo(this.getLoginUser(token));
+ return ApiResponse.success(ywFloorService.findList(pageWrap));
+ }
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:ywfloor:exportExcel")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
index eff6a72..0448627 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -53,6 +53,7 @@
.host(host)
.select()
.apis( basePackage("com.doumee.cloud"))
+// .apis( basePackage("com.doumee.api.cloud"))
// .apis( basePackage("com.doumee.api.common"))
// .apis( basePackage("com.doumee.cloud.openapi;com.doumee.api.common"))
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
index 0a46fbe..d94a198 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
@@ -32,7 +32,7 @@
@Autowired
private InterfaceLogService interfaceLogService;
- @PostConstruct
+// @PostConstruct
public int initHkConfig(){
//鑾峰彇鏍圭粍缁囩紪鐮�
initHkParamConfig();
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
index 91f5379..7520192 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
@@ -179,6 +179,12 @@
@ApiModelProperty(value = "鐗╀笟鏉℃闆嗗悎")
@TableField(exist = false)
private List<YwContractDetail> wyDetailList;
+ @ApiModelProperty(value = "鎿嶄綔鏃ュ織闆嗗悎")
+ @TableField(exist = false)
+ private List<YwWorkorderLog> logList;
+ @ApiModelProperty(value = "璐﹀崟闆嗗悎")
+ @TableField(exist = false)
+ private List<YwContractBill> billList;
@ApiModelProperty(value = "閲嶆柊寮�濮嬫椂闂�")
@TableField(exist = false)
private Date queryStartTime;
@@ -186,4 +192,8 @@
@ApiModelProperty(value = "鏌ヨ缁撴潫鏃堕棿")
@TableField(exist = false)
private Date queryEndTime;
+
+ @ApiModelProperty(value = "閫�娆炬椂鏂板鐨勬敹浠樻璐﹀崟")
+ @TableField(exist = false)
+ private List<YwContractBill> addBillList;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java
index ae8df3c..10e5f3f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java
@@ -158,6 +158,9 @@
@ApiModelProperty(value = "鎴挎簮鍚嶇О")
@TableField(exist = false)
private String roomName;
+ @ApiModelProperty(value = "妤煎眰鍚嶇О")
+ @TableField(exist = false)
+ private String floorName;
@ApiModelProperty(value = "鎴垮彿")
@TableField(exist = false)
private String roomNum;
@@ -167,6 +170,9 @@
@ApiModelProperty(value = "澶勭悊浜哄鍚�")
@TableField(exist = false)
private String dealUserName;
+ @ApiModelProperty(value = "绫诲埆鍚嶇О")
+ @TableField(exist = false)
+ private String categoryName;
@ApiModelProperty(value = "鍒嗛厤浜哄鍚�")
@TableField(exist = false)
private String dispatchUserName;
@@ -185,4 +191,11 @@
@ApiModelProperty(value = "鎿嶄綔璁板綍鍒楄〃")
@TableField(exist = false)
private List<YwWorkorderLog> logList;
+ @ApiModelProperty(value = "閲嶆柊寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date queryStartTime;
+
+ @ApiModelProperty(value = "鏌ヨ缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date queryEndTime;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorderLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorderLog.java
index ea181cb..e769039 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorderLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorderLog.java
@@ -65,8 +65,8 @@
@ExcelColumn(name="绠�浠�")
private String content;
- @ApiModelProperty(value = "鎿嶄綔绫诲瀷 0宸ュ崟鍒涘缓 1鎸囨淳 2澶勭悊", example = "1")
- @ExcelColumn(name="鎿嶄綔绫诲瀷 0宸ュ崟鍒涘缓 1鎸囨淳 2澶勭悊")
+ @ApiModelProperty(value = "鎿嶄綔绫诲瀷 0宸ュ崟鍒涘缓 1鎸囨淳 2澶勭悊 3鍚堝悓鍒涘缓 4鍚堝悓鍙樻洿 5鍚堝悓閫�绉� ", example = "1")
+ @ExcelColumn(name="鎿嶄綔绫诲瀷 0宸ュ崟鍒涘缓 1鎸囨淳 2澶勭悊 3鍚堝悓鍒涘缓 4鍚堝悓鍙樻洿 5鍚堝悓閫�绉�")
private Integer objType;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractService.java
index 4730f58..58af13f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractService.java
@@ -95,4 +95,6 @@
* @return long
*/
long count(YwContract ywContract);
+
+ Integer backRent(YwContract ywContract);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
index 52dfa4f..bf37d57 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -51,6 +51,8 @@
@Autowired
private MultifileMapper multifileMapper;
@Autowired
+ private YwWorkorderLogMapper ywWorkorderLogMapper;
+ @Autowired
private CompanyMapper companyMapper;
@Autowired
private YwProjectMapper projectMapper;
@@ -80,6 +82,30 @@
ywContractMapper.insert(model);
dealDetailListBiz(model);//澶勭悊鏉℃淇℃伅
dealMultifileBiz(model);//澶勭悊闄勪欢淇℃伅
+ dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,null,null);//璁板綍鏂板缓鏃ュ織
+ return model.getId();
+ }
+ /**
+ * 閫�绉熸彁浜�
+ * @param model
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public Integer backRent(YwContract model){
+ isParamValidCreated(model);
+
+ model.setCreator(model.getLoginUserInfo().getId());
+ model.setIsdeleted(Constants.ZERO);
+ model.setCreateDate(new Date());
+ model.setStatus(Constants.ZERO);
+ model.setEditDate(model.getCreateDate());
+ model.setEditor(model.getCreator());
+ model.setStatus(Constants.ZERO);//寰呮墽琛�
+ ywContractMapper.insert(model);
+ dealDetailListBiz(model);//澶勭悊鏉℃淇℃伅
+ dealMultifileBiz(model);//澶勭悊闄勪欢淇℃伅
+ dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,null,null);//璁板綍鏂板缓鏃ュ織
return model.getId();
}
@@ -618,7 +644,19 @@
this.updateById(ywContract);
}
}
-
+ private void dealLogBiz(YwContract model,Constants.YwLogType type,String param1,String param2) {
+ YwWorkorderLog log = new YwWorkorderLog();
+ log.setCreateDate(model.getEditDate());
+ log.setCreator(model.getCreator());
+ log.setJobId(model.getId());
+ log.setIsdeleted(Constants.ZERO);
+ log.setObjId(model.getId()+"");
+ log.setObjType(type.getKey());
+ log.setParam1(param1);
+ log.setParam2(param2);
+ log.setTitle(type.getNoteinfo());
+ ywWorkorderLogMapper.insert(log);
+ }
@Override
public YwContract findById(Integer id) {
MPJLambdaWrapper<YwContract> queryWrapper = new MPJLambdaWrapper<>();
@@ -635,7 +673,55 @@
.leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId);
YwContract model = ywContractMapper.selectJoinOne(YwContract.class,queryWrapper);
if(model != null){
+ //鍚堝悓闄勪欢
initFiles(model);
+ //鏌ヨ鎴挎簮淇℃伅鏁版嵁
+ MPJLambdaWrapper<YwRoom> rw = new MPJLambdaWrapper<>();
+ rw.selectAll(YwRoom.class )
+ .selectAs(YwProject::getName,YwRoom::getProjectName)
+ .selectAs(YwFloor::getName,YwRoom::getFloorName)
+ .selectAs(YwBuilding::getName,YwRoom::getBuildingName)
+ .leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId)
+ .leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
+ .leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor)
+ .eq(YwRoom::getIsdeleted,Constants.ZERO)
+ .exists("(select a.id from yw_contract_room a where a.isdeleted=1 and a.room_id=t.id and a.contract_id="+model.getId()+")");
+ model.setRoomList(roomMapper.selectJoinList(YwRoom.class,rw));
+
+ //鏌ヨ绉熻硟鏉℃淇℃伅
+ MPJLambdaWrapper<YwContractDetail> dw = new MPJLambdaWrapper<>();
+ dw.selectAll(YwContractDetail.class )
+ .eq(YwContractDetail::getIsdeleted,Constants.ZERO)
+ .eq(YwContractDetail::getContractId,model.getId())
+ .in(YwContractDetail::getType,Constants.ZERO,Constants.TWO)
+ .orderByAsc(YwContractDetail::getSortnum);
+ model.setZlDetailList(ywContractDetailMapper.selectJoinList(YwContractDetail.class,dw));
+ //鏌ヨ鐗╂キ鏉℃淇℃伅
+ dw = new MPJLambdaWrapper<>();
+ dw.selectAll(YwContractDetail.class )
+ .eq(YwContractDetail::getIsdeleted,Constants.ZERO)
+ .eq(YwContractDetail::getContractId,model.getId())
+ .in(YwContractDetail::getType,Constants.ONE,Constants.THREE)
+ .orderByAsc(YwContractDetail::getSortnum);
+ model.setWyDetailList(ywContractDetailMapper.selectJoinList(YwContractDetail.class,dw));
+
+ //鏌ヨ鎿嶄綔鏃ュ織璁板綍
+ YwWorkorderLog log = new YwWorkorderLog();
+ log.setJobId(model.getId());
+ log.setIsdeleted(Constants.ZERO);
+ model.setLogList(ywWorkorderLogMapper.selectList(new QueryWrapper<YwWorkorderLog>(log)
+ .lambda()
+ .in(YwWorkorderLog::getObjType,Constants.YwLogType.CONTRACT_BACK.getKey()
+ ,Constants.YwLogType.CONTRACT_CREATE.getKey()
+ ,Constants.YwLogType.CONTRACT_UPDATE.getKey())
+ .orderByAsc(YwWorkorderLog::getCreateDate)));
+
+ //鏌ヨ璐﹀崟闆嗗悎
+ model.setBillList(ywContractBillMapper.selectJoinList(YwContractBill.class,new MPJLambdaWrapper<YwContractBill>()
+ .selectAll(YwContractBill.class )
+ .eq( YwContractBill::getContractId,model.getId())
+ .eq(YwContractBill::getIsdeleted,Constants.ZERO)
+ .orderByAsc(YwContractBill::getSortnum,YwContractBill::getCreateDate)));
}
return model;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwFloorServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwFloorServiceImpl.java
index 38f62cf..b3b74de 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwFloorServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwFloorServiceImpl.java
@@ -121,6 +121,7 @@
@Override
public List<YwFloor> findList(YwFloor ywFloor) {
+ ywFloor.setIsdeleted(Constants.ZERO);
QueryWrapper<YwFloor> wrapper = new QueryWrapper<>(ywFloor);
return ywFloorMapper.selectList(wrapper);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwRoomServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwRoomServiceImpl.java
index 06b8618..b41d0ca 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwRoomServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwRoomServiceImpl.java
@@ -132,7 +132,7 @@
public PageData<YwRoom> findPage(PageWrap<YwRoom> pageWrap) {
IPage<YwRoom> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<YwRoom> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper.selectAll(YwBuilding.class )
+ queryWrapper.selectAll(YwRoom.class )
.selectAs(YwProject::getName,YwRoom::getProjectName)
.selectAs(YwFloor::getName,YwRoom::getFloorName)
.selectAs(YwBuilding::getName,YwRoom::getBuildingName)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
index eb8da05..8ec7dc7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
@@ -28,10 +28,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* 杩愮淮宸ュ崟淇℃伅琛⊿ervice瀹炵幇
@@ -94,27 +91,21 @@
if(fileList.size()>0){
multifileMapper.insert(fileList);
}
- dealLogBiz(model,Constants.ZERO,model.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
+ dealLogBiz(model,Constants.YwLogType.WORKORDER_CREATE,model.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
return model.getId();
}
- private void dealLogBiz(YwWorkorder model, int type,String param1,String param2) {
+ private void dealLogBiz(YwWorkorder model,Constants.YwLogType type,String param1,String param2) {
YwWorkorderLog log = new YwWorkorderLog();
log.setCreateDate(model.getEditDate());
log.setCreator(model.getCreator());
log.setJobId(model.getId());
log.setIsdeleted(Constants.ZERO);
log.setObjId(model.getId()+"");
- log.setObjType(type);
+ log.setObjType(type.getKey());
log.setParam1(param1);
log.setParam2(param2);
- if(type ==0){
- log.setTitle("鍒涘缓宸ュ崟");
- }else if(type ==1){
- log.setTitle("鍒嗘淳宸ュ崟");
- }else if(type ==2){
- log.setTitle("澶勭悊宸ュ崟");
- }
+ log.setTitle(type.getNoteinfo());
ywWorkorderLogMapper.insert(log);
}
@@ -194,7 +185,7 @@
update.setDispatchDate(update.getEditDate());
update.setDispatchInfo(ywWorkorder.getDispatchInfo());
ywWorkorderMapper.updateById(update);
- dealLogBiz(model,Constants.ONE,model.getLoginUserInfo().getRealname(),user.getRealname());//璁板綍鏂板缓鏃ュ織
+ dealLogBiz(model,Constants.YwLogType.WORKORDER_DISPATCH,model.getLoginUserInfo().getRealname(),user.getRealname());//璁板綍鏂板缓鏃ュ織
}
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -220,7 +211,7 @@
update.setDealDate(update.getEditDate());
update.setDealInfo(ywWorkorder.getDispatchInfo());
ywWorkorderMapper.updateById(update);
- dealLogBiz(model,Constants.TWO,model.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
+ dealLogBiz(model,Constants.YwLogType.WORKORDER_DEAL,model.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
}
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -304,22 +295,27 @@
public YwWorkorder findById(Integer id) {
MPJLambdaWrapper<YwWorkorder> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(YwWorkorder.class )
- .select("t4.realname",YwWorkorder::getDealUserName)
- .select("t3.realname",YwWorkorder::getDispatchUserName)
- .selectAs(SystemUser::getRealname,YwWorkorder::getCreatorName)
+ .selectAs(SystemUser::getRealname,YwWorkorder::getDispatchUserName)
+ .select("t2.realname",YwWorkorder::getDealUserName)
+ .select("t3.realname",YwWorkorder::getCreatorName)
.selectAs(SystemUser::getMobile,YwWorkorder::getCreatorPhone)
.selectAs(Company::getCompanyNamePath,YwWorkorder::getCreatorCompany)
- .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getCreator)
- .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
.leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getDispatchUserId)
.leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getDealUserId)
+ .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getCreator)
+ .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
.eq(YwWorkorder::getId,id);
YwWorkorder model = ywWorkorderMapper.selectJoinOne(YwWorkorder.class,wrapper);
initFiles(model);//璇诲彇闄勪欢淇℃伅
YwWorkorderLog log = new YwWorkorderLog();
log.setJobId(model.getId());
log.setIsdeleted(Constants.ZERO);
- model.setLogList(ywWorkorderLogMapper.selectList(new QueryWrapper<YwWorkorderLog>(log).lambda().orderByAsc(YwWorkorderLog::getCreateDate)));
+ model.setLogList(ywWorkorderLogMapper.selectList(new QueryWrapper<YwWorkorderLog>(log)
+ .lambda()
+ .in(YwWorkorderLog::getObjType,Constants.YwLogType.WORKORDER_DEAL.getKey()
+ ,Constants.YwLogType.WORKORDER_CREATE.getKey()
+ ,Constants.YwLogType.WORKORDER_DISPATCH.getKey())
+ .orderByAsc(YwWorkorderLog::getCreateDate)));
return model;
}
@@ -339,101 +335,115 @@
@Override
public PageData<YwWorkorder> findPage(PageWrap<YwWorkorder> pageWrap) {
IPage<YwWorkorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<YwWorkorder> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<YwWorkorder> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(YwWorkorder.class )
+ .selectAs(SystemUser::getRealname,YwWorkorder::getDealUserName)
+ .select("t3.realname",YwWorkorder::getCreatorName)
+ .selectAs(Category::getName,YwWorkorder::getCategoryName)
+ .selectAs(YwRoom::getName,YwWorkorder::getRoomName)
+ .selectAs(YwRoom::getRoomNum,YwWorkorder::getRoomNum)
+ .selectAs(YwFloor::getName,YwWorkorder::getFloorName)
+ .selectAs(YwBuilding::getName,YwWorkorder::getBuildingName)
+ .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getDealUserId)
+ .leftJoin(Category.class,Category::getId,YwWorkorder::getCateId)
+ .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getCreator)
+ .leftJoin(YwRoom.class,YwRoom::getId,YwWorkorder::getRoomId)
+ .leftJoin(YwFloor.class,YwFloor::getId,YwWorkorder::getFloorId)
+ .leftJoin(YwBuilding.class,YwBuilding::getId,YwWorkorder::getBuildingId);
pageWrap.getModel().setIsdeleted(Constants.ZERO);
Utils.MP.blankToNull(pageWrap.getModel());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(YwWorkorder::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(YwWorkorder::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(YwWorkorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(YwWorkorder::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(YwWorkorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(YwWorkorder::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(YwWorkorder::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(YwWorkorder::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(YwWorkorder::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(YwWorkorder::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(YwWorkorder::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(YwWorkorder::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getTitle, pageWrap.getModel().getTitle());
+ queryWrapper.eq(YwWorkorder::getTitle, pageWrap.getModel().getTitle());
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(YwWorkorder::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(YwWorkorder::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getSortnum, pageWrap.getModel().getSortnum());
+ queryWrapper.eq(YwWorkorder::getSortnum, pageWrap.getModel().getSortnum());
}
if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getContent, pageWrap.getModel().getContent());
+ queryWrapper.eq(YwWorkorder::getContent, pageWrap.getModel().getContent());
}
if (pageWrap.getModel().getGetDate() != null) {
- queryWrapper.lambda().ge(YwWorkorder::getGetDate, Utils.Date.getStart(pageWrap.getModel().getGetDate()));
- queryWrapper.lambda().le(YwWorkorder::getGetDate, Utils.Date.getEnd(pageWrap.getModel().getGetDate()));
+ queryWrapper.ge(YwWorkorder::getGetDate, Utils.Date.getStart(pageWrap.getModel().getGetDate()));
+ queryWrapper.le(YwWorkorder::getGetDate, Utils.Date.getEnd(pageWrap.getModel().getGetDate()));
}
if (pageWrap.getModel().getProjectId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getProjectId, pageWrap.getModel().getProjectId());
+ queryWrapper.eq(YwWorkorder::getProjectId, pageWrap.getModel().getProjectId());
}
if (pageWrap.getModel().getBuildingId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getBuildingId, pageWrap.getModel().getBuildingId());
+ queryWrapper.eq(YwWorkorder::getBuildingId, pageWrap.getModel().getBuildingId());
}
if (pageWrap.getModel().getRoomId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getRoomId, pageWrap.getModel().getRoomId());
+ queryWrapper.eq(YwWorkorder::getRoomId, pageWrap.getModel().getRoomId());
}
if (pageWrap.getModel().getUserId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getUserId, pageWrap.getModel().getUserId());
+ queryWrapper.eq(YwWorkorder::getUserId, pageWrap.getModel().getUserId());
}
if (pageWrap.getModel().getPhone() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getPhone, pageWrap.getModel().getPhone());
+ queryWrapper.eq(YwWorkorder::getPhone, pageWrap.getModel().getPhone());
}
if (pageWrap.getModel().getSubmitDate() != null) {
- queryWrapper.lambda().ge(YwWorkorder::getSubmitDate, Utils.Date.getStart(pageWrap.getModel().getSubmitDate()));
- queryWrapper.lambda().le(YwWorkorder::getSubmitDate, Utils.Date.getEnd(pageWrap.getModel().getSubmitDate()));
+ queryWrapper.ge(YwWorkorder::getSubmitDate, Utils.Date.getStart(pageWrap.getModel().getSubmitDate()));
+ queryWrapper.le(YwWorkorder::getSubmitDate, Utils.Date.getEnd(pageWrap.getModel().getSubmitDate()));
}
if (pageWrap.getModel().getCateId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getCateId, pageWrap.getModel().getCateId());
+ queryWrapper.eq(YwWorkorder::getCateId, pageWrap.getModel().getCateId());
}
if (pageWrap.getModel().getAreaType() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getAreaType, pageWrap.getModel().getAreaType());
+ queryWrapper.eq(YwWorkorder::getAreaType, pageWrap.getModel().getAreaType());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getCode, pageWrap.getModel().getCode());
+ queryWrapper.eq(YwWorkorder::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getDealStatus() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getDealStatus, pageWrap.getModel().getDealStatus());
+ queryWrapper.eq(YwWorkorder::getDealStatus, pageWrap.getModel().getDealStatus());
}
if (pageWrap.getModel().getDispatchUserId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getDispatchUserId, pageWrap.getModel().getDispatchUserId());
+ queryWrapper.eq(YwWorkorder::getDispatchUserId, pageWrap.getModel().getDispatchUserId());
}
if (pageWrap.getModel().getDispatchDate() != null) {
- queryWrapper.lambda().ge(YwWorkorder::getDispatchDate, Utils.Date.getStart(pageWrap.getModel().getDispatchDate()));
- queryWrapper.lambda().le(YwWorkorder::getDispatchDate, Utils.Date.getEnd(pageWrap.getModel().getDispatchDate()));
+ queryWrapper.ge(YwWorkorder::getDispatchDate, Utils.Date.getStart(pageWrap.getModel().getDispatchDate()));
+ queryWrapper.le(YwWorkorder::getDispatchDate, Utils.Date.getEnd(pageWrap.getModel().getDispatchDate()));
}
if (pageWrap.getModel().getDispatchInfo() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getDispatchInfo, pageWrap.getModel().getDispatchInfo());
+ queryWrapper.eq(YwWorkorder::getDispatchInfo, pageWrap.getModel().getDispatchInfo());
}
if (pageWrap.getModel().getDealUserId() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getDealUserId, pageWrap.getModel().getDealUserId());
+ queryWrapper.eq(YwWorkorder::getDealUserId, pageWrap.getModel().getDealUserId());
}
if (pageWrap.getModel().getDealDate() != null) {
- queryWrapper.lambda().ge(YwWorkorder::getDealDate, Utils.Date.getStart(pageWrap.getModel().getDealDate()));
- queryWrapper.lambda().le(YwWorkorder::getDealDate, Utils.Date.getEnd(pageWrap.getModel().getDealDate()));
+ queryWrapper.ge(YwWorkorder::getDealDate, Utils.Date.getStart(pageWrap.getModel().getDealDate()));
+ queryWrapper.le(YwWorkorder::getDealDate, Utils.Date.getEnd(pageWrap.getModel().getDealDate()));
}
if (pageWrap.getModel().getDealInfo() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getDealInfo, pageWrap.getModel().getDealInfo());
+ queryWrapper.eq(YwWorkorder::getDealInfo, pageWrap.getModel().getDealInfo());
}
if (pageWrap.getModel().getDealType() != null) {
- queryWrapper.lambda().eq(YwWorkorder::getDealType, pageWrap.getModel().getDealType());
+ queryWrapper.eq(YwWorkorder::getDealType, pageWrap.getModel().getDealType());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -442,6 +452,9 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
+ queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), YwWorkorder::getCreateDate, pageWrap.getModel().getQueryStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()), YwWorkorder::getCreateDate, pageWrap.getModel().getQueryEndTime());
+ queryWrapper.orderByDesc(YwContract::getCreateDate );
return PageData.from(ywWorkorderMapper.selectPage(page, queryWrapper));
}
--
Gitblit v1.9.3