From e799030b95e9efb08e21197d08c2ea7eebe1909c Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 11 九月 2023 10:22:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 6
phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java | 6
phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java | 14 +
phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java | 526 +++++++++++++++++++++-------------------------------
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java | 7
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 7
7 files changed, 252 insertions(+), 318 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
index c1cf034..34912e0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
@@ -21,7 +21,8 @@
private String startTime;
/**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,骞存湀鏃ユ椂鍒嗙,涓嶅～榛樿涓�涓湀*/
private String endTime;
-
- /**鍙戦�佺殑鐢ㄦ埛-蹇呭～*/
- private List<CouponSendUserDto> sendUserList;
+ /**鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉�*/
+ private String costDeptName;
+ /**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */
+ private String ascrCostDeptName;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java
new file mode 100644
index 0000000..d6c6ca6
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.employee;
+
+import lombok.Data;
+
+/**
+ * @author fwq
+ * */
+@Data
+public class EmpAuthDto{
+ /**鏉冮檺*/
+ private String tagName;
+ /**鐧诲綍鍛樺伐*/
+ private String empRoleId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
index e324612..d5ee25f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
@@ -4,6 +4,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* 鍒掓墸
@@ -34,7 +35,10 @@
private String userShopId;
/**閿�鍞钩鍙�*/
private String sourceName;
-
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
+ /**涓氱哗绫诲瀷*/
+ private List<Integer> sourceTypeList;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
private String operatorId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
index bb999f1..f223034 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
@@ -3,6 +3,8 @@
import lombok.Data;
+import java.util.List;
+
/**
* 璇婃墍鐜伴噾涓氱哗VO
* @USER: fhx
@@ -29,4 +31,8 @@
private String operatorId;
/** 鎿嶄綔浜� */
private String operatorName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
+ /**涓氱哗绫诲瀷*/
+ private List<Integer> sourceTypeList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 3768939..64e4d71 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -1,7 +1,5 @@
package com.hz.his.dto.user;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
@@ -35,6 +33,8 @@
private Integer isSelectShop = 0;
/**鏄惁鏌ヨ鎺ㄨ崘浜轰俊鎭�:0鍚�1鏄�*/
private Integer isSelectInvitee = 0;
+ /**鏄惁鏌ヨ璧勯噾淇℃伅:0鍚�1鏄�*/
+ private Integer isSelectMoney = 0;
/**鏄惁鏈夐棬搴�*/
private Integer isHaveShop;
/**鏄惁鏈夐【闂�*/
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 4e4d24a..5393a67 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
+import com.hz.his.dto.employee.EmpAuthDto;
import com.hz.his.dto.employee.EmpDocDto;
import com.hz.his.dto.TimeDto;
import com.hz.his.dto.employee.EmployeeDto;
@@ -74,4 +75,10 @@
@PostMapping(value = "/emp/detail/name")
Result getDetailsByName(@RequestBody(required = false) EmpDocDto employeeDto);
+ @PostMapping(value = "/emp/role/get/one")
+ Result getEmployeeByRoleId(@RequestBody(required = false) EmpAuthDto empAuthDto);
+
+ @PostMapping(value = "/emp/auth/check")
+ Result empAuthCheck(@RequestBody(required = false) EmpAuthDto empAuthDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
index 9840bb7..3d638b7 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
@@ -1,14 +1,10 @@
package com.hz.his.vo.bi.revenue;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Index;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
*鏀跺叆纭琛ㄦ煡璇�
@@ -16,7 +12,10 @@
*/
@Data
public class RevenueQuery{
-
+ /**椤垫暟*/
+ private Integer pageNum;
+ /**鏉℃暟*/
+ private Integer pageSize;
/**鍏朵粬鏌ヨ*/
private String KeyWord;
/**鐢ㄦ埛CIQ*/
@@ -39,520 +38,423 @@
private Date startCreateTime;
/**鍒涘缓鏃ユ湡*/
private Date endCreateTime;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
+ /**涓氱哗绫诲瀷*/
+ private List<Integer> sourceTypeList;
/**璇锋眰鎿嶄綔浜�*/
private String operatorId;
/**璇锋眰鎿嶄綔浜�*/
private String operatorName;
- @Column(comment = "鏉ユ簮绫诲瀷", length = 2, type = MySqlTypeConstant.INT, isNull = false)
+
+
+
+
+ /**鏉ユ簮绫诲瀷*/
private Integer sourceType;
- @Column(comment = "鏉ユ簮绫诲瀷鍚嶇О", type = MySqlTypeConstant.VARCHAR, length = 10)
+ /**鏉ユ簮绫诲瀷鍚嶇О*/
private String sourceTypeName;
- @Index
- @Column(comment = "鏉ユ簮鏍囪瘑(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍鏍囪瘑)", type = MySqlTypeConstant.VARCHAR, length = 32, isNull = false)
+ /**鏉ユ簮鏍囪瘑*/
private String sourceId;
- @Column(comment = "鏉ユ簮缂栧彿(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍缂栧彿(渚�:鍗曞彿銆佸垝鎵ｅ彿)", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**鏉ユ簮缂栧彿(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍缂栧彿(渚�:鍗曞彿銆佸垝鎵ｅ彿)*/
private String sourceNo;
- @Index
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Column(comment = "鏉ユ簮涓氱哗鏃堕棿", type = MySqlTypeConstant.DATETIME, isNull = false)
+ /**鏉ユ簮涓氱哗鏃堕棿*/
private Date sourceTime;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Column(comment = "鏉ユ簮鍒涘缓鏃堕棿", type = MySqlTypeConstant.DATETIME, isNull = false)
+ /**鏉ユ簮鍒涘缓鏃堕棿*/
private Date sourceCreateTime;
-
- @Column(comment = "鏉ユ簮鎬绘爣璇�(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍鏍囪瘑)", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**鏉ユ簮鎬绘爣璇�*/
private String sourceGeneralId;
- @Column(comment = "鏉ユ簮鎬荤紪鍙�(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍缂栧彿(渚�:鍗曞彿銆佸垝鎵ｅ彿)", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**鏉ユ簮鎬荤紪鍙�(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍缂栧彿(渚�:鍗曞彿銆佸垝鎵ｅ彿)*/
private String sourceGeneralNo;
-
- @Column(comment = "钀ラ攢鍒嗙被(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR, isNull = false)
+ /**钀ラ攢鍒嗙被*/
private String marketingType;
- @Column(comment = "钀ラ攢鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**钀ラ攢鍒嗙被鍚嶇О*/
private String marketingTypeName;
-
- @Column(comment = "钀ラ攢鍚嶇О", type = MySqlTypeConstant.VARCHAR,length = 128)
+ /**钀ラ攢鍚嶇О*/
private String marketingName;
-
- @Column(comment = "鍩虹鍒嗙被(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR, isNull = false)
+ /**鍩虹鍒嗙被*/
private String basicType;
- @Column(comment = "鍩虹鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鍩虹鍒嗙被鍚嶇О*/
private String basicTypeName;
-
- @Column(comment = "涓�绾у垎绫�(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**涓�绾у垎绫�*/
private String firstLevelType;
- @Column(comment = "涓�绾у垎绫诲悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**涓�绾у垎绫诲悕绉�*/
private String firstLevelTypeName;
- @Column(comment = "浜岀骇鍒嗙被(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**浜岀骇鍒嗙被*/
private String secondLevelType;
- @Column(comment = "浜岀骇鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**浜岀骇鍒嗙被鍚嶇О*/
private String secondLevelTypeName;
- @Column(comment = "鍒嗙被鐖剁被鍖呮嫭鑷繁JSON锛屾牸寮�:[{\"id\":\"娓犻亾鏍囪瘑\",\"name\":\"娓犻亾鍚嶇О\",\"parentId\":\"鐖剁被鏍囪瘑\"}]", type = MySqlTypeConstant.TEXT,isNull = false)
+ /**鍒嗙被鐖剁被鍖呮嫭鑷繁JSON*/
private String classifyJson = "[]";
-
- @Index
- @Column(comment = "椤圭洰id/鍟嗗搧id锛堝叕鐢ㄦ爣璇嗭級", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**椤圭洰id*/
private String commonId;
- @Column(comment = "椤圭洰缂栧彿/鍟嗗搧缂栫爜", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**椤圭洰缂栧彿/鍟嗗搧缂栫爜*/
private String commonNo;
- @Column(comment = "椤圭洰鍚嶇О/鍟嗗搧鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**椤圭洰鍚嶇О/鍟嗗搧鍚嶇О*/
private String commonName;
-
- @Column(comment = "瑙勬牸", length = 128, type = MySqlTypeConstant.VARCHAR)
+ /**瑙勬牸*/
private String specification;
- @Column(comment = "璧勮川", length = 128, type = MySqlTypeConstant.VARCHAR)
+ /**璧勮川*/
private String qualification;
- @Column(comment = "椤圭洰鍗曚綅", length = 128, type = MySqlTypeConstant.VARCHAR)
+ /**椤圭洰鍗曚綅*/
private String unit;
-
- @Column(comment = "绉戝缂栧彿", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**绉戝缂栧彿*/
private String departmentCode;
- @Column(comment = "绉戝鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**绉戝鍚嶇О*/
private String departmentName;
-
- @Column(comment = "浠锋牸鏍囩", length = 128, type = MySqlTypeConstant.VARCHAR)
+ /**浠锋牸鏍囩*/
private String priceTag;
-
- @Index
- @Column(comment = "鏀惰垂璁㈠崟id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀惰垂璁㈠崟id*/
private String payOrderId;
- @Column(comment = "鏀惰垂鍗曞彿", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀惰垂鍗曞彿*/
private String payOrderNo;
-
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
- @Column(comment="缁撶畻鏃堕棿(鏀惰垂鏃ユ湡)",type = MySqlTypeConstant.DATETIME)
+ /**缁撶畻鏃堕棿(鏀惰垂鏃ユ湡)*/
private Date orderTime;
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
- @Column(comment="鎵ц鏃ユ湡",type = MySqlTypeConstant.DATETIME)
+ /**鎵ц鏃ユ湡*/
private Date deductionTime;
-
- @Column(comment = "涓氬姟绫诲瀷(PerformanceInfoEnum)", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**涓氬姟绫诲瀷*/
private String businessType;
- @Column(comment = "涓氬姟绫诲瀷鍚嶇О", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**涓氬姟绫诲瀷鍚嶇О*/
private String businessTypeName;
-
- @Index
- @Column(comment = "鐢ㄦ埛id", length = 64, type = MySqlTypeConstant.VARCHAR, isNull = false)
+ /**鐢ㄦ埛id*/
private String userId;
- @Column(comment = "浼氬憳鍙�(鐢ㄦ埛缂栧彿)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**浼氬憳鍙�(鐢ㄦ埛缂栧彿)*/
private String memberNO;
- @Column(comment = "CIQ", length = 64, type = MySqlTypeConstant.VARCHAR)
private String memberCIQ;
- @Column(comment = "鐥呬緥鍙�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐥呬緥鍙�*/
private String memberCaseNo;
- @Column(comment = "瀹㈡埛绫诲埆", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛绫诲埆*/
private String userClass;
- @Column(comment="鏄惁棣栨鎵ц", length = 1, type = MySqlTypeConstant.INT)
+ /**鏄惁棣栨鎵ц*/
private Integer isFirstDeduction;
- @Column(comment="浼氬憳绛夌骇", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**浼氬憳绛夌骇*/
private String userLevel;
- @Column(comment="鐢ㄦ埛鍚嶇О", type = MySqlTypeConstant.VARCHAR)
+ /**鐢ㄦ埛鍚嶇О*/
private String userName;
- @Column(comment="鍏变韩瀹㈡埛", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**鍏变韩瀹㈡埛*/
private Integer shareCustomer;
- @Column(comment = "瀹㈡埛绫诲瀷", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛绫诲瀷*/
private String userType;
-
- @Column(comment = "鐧昏浜虹被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**鐧昏浜虹被鍨�*/
private Integer registrantType;
- @Index
- @Column(comment = "鐧昏浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐧昏浜篒d*/
private String registrantId;
- @Column(comment = "鐧昏浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐧昏浜哄悕绉�*/
private String registrantName;
-
- @Index
- @Column(comment = "鎵ц鍖荤敓Id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎵ц鍖荤敓Id*/
private String deductionDoctorId;
- @Column(comment = "鎵ц鍖荤敓鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎵ц鍖荤敓鍚嶇О*/
private String deductionDoctorName;
-
- @Index
- @Column(comment = "鍔╃悊鍖荤敓Id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鍔╃悊鍖荤敓Id*/
private String assistantDoctorId;
- @Column(comment = "鍔╃悊鍖荤敓鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鍔╃悊鍖荤敓鍚嶇О*/
private String assistantDoctorName;
-
- @Index
- @Column(comment = "缇庡甯圛d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**缇庡甯圛d*/
private String beauticianId;
- @Column(comment = "缇庡甯堝悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**缇庡甯堝悕绉�*/
private String beauticianName;
-
- @Index
- @Column(comment = "璁㈠崟id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟id*/
private String orderId;
- @Column(comment = "璁㈠崟缂栧彿", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟缂栧彿*/
private String orderNo;
-
- @Index
- @Column(comment = "璁㈠崟鏉＄爜id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鏉＄爜id*/
private String orderItemId;
- @Column(comment = "璁㈠崟鏉＄爜缂栧彿", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鏉＄爜缂栧彿*/
private String orderItemNo;
-
- @Column(comment = "寮�鍗曚汉绫诲瀷", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**寮�鍗曚汉绫诲瀷*/
private Integer orderOpType;
- @Index
- @Column(comment = "寮�鍗曚汉Id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**寮�鍗曚汉Id*/
private String orderOpId;
- @Column(comment = "寮�鍗曚汉鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**寮�鍗曚汉鍚嶇О*/
private String orderOpName;
-
-
- @Column(comment = "寮�鍙戜汉绫诲瀷", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**寮�鍙戜汉绫诲瀷*/
private Integer developOpType;
- @Column(comment = "寮�鍙戜汉Id", type = MySqlTypeConstant.VARCHAR)
+ /**寮�鍙戜汉Id*/
private String developOpId;
- @Column(comment = "寮�鍙戜汉鍚嶇О", type = MySqlTypeConstant.VARCHAR)
+ /**寮�鍙戜汉鍚嶇О*/
private String developOpName;
-
- @Column(comment = "寮�鍙戜汉闂ㄥ簵鏍囪瘑", type = MySqlTypeConstant.VARCHAR,length = 64)
+ /**寮�鍙戜汉闂ㄥ簵鏍囪瘑*/
private String developShopId;
- @Column(comment = "寮�鍙戜汉闂ㄥ簵鍚嶇О", type = MySqlTypeConstant.VARCHAR,length = 64)
+ /**寮�鍙戜汉闂ㄥ簵鍚嶇О*/
private String developShopName;
-
- @Column(comment = "鎵�灞炲挩璇㈠笀绫诲瀷", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**鎵�灞炲挩璇㈠笀绫诲瀷*/
private Integer belongConsultantType;
- @Index
- @Column(comment = "鐢ㄦ埛鎵�灞炲挩璇㈠笀id(Employee id) 鐢ㄦ埛鍒掓墸鏃剁殑鎵�灞炲挩璇㈠笀", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐢ㄦ埛鎵�灞炲挩璇㈠笀id(Employee id) 鐢ㄦ埛鍒掓墸鏃剁殑鎵�灞炲挩璇㈠笀*/
private String belongConsultantId;
- @Column(comment = "鐢ㄦ埛鎵�灞炲挩璇㈠笀鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐢ㄦ埛鎵�灞炲挩璇㈠笀鍚嶇О*/
private String belongConsultantName;
-
- @Column(comment = "鐢ㄦ埛鎵�灞炲挩璇㈠笀鎵�灞為棬搴椾俊鎭�", type = MySqlTypeConstant.LONGTEXT)
+ /**鐢ㄦ埛鎵�灞炲挩璇㈠笀鎵�灞為棬搴椾俊鎭�*/
private String belongConsultantShopInfo;
-
- @Column(comment = "寮�鍗曞挩璇㈠笀绫诲瀷", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**寮�鍗曞挩璇㈠笀绫诲瀷*/
private Integer orderConsultantType;
- @Index
- @Column(comment = "寮�鍗曞挩璇㈠笀id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**寮�鍗曞挩璇㈠笀id*/
private String orderConsultantId;
- @Column(comment = "寮�鍗曞挩璇㈠笀鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**寮�鍗曞挩璇㈠笀鍚嶇О*/
private String orderConsultantName;
-
- @Column(comment = "鏀堕摱鍜ㄨ甯堢被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**鏀堕摱鍜ㄨ甯堢被鍨�*/
private Integer cashierConsultantType;
- @Index
- @Column(comment = "鏀堕摱鍜ㄨ甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀堕摱鍜ㄨ甯坕d*/
private String cashierConsultantId;
- @Column(comment = "鏀堕摱鍜ㄨ甯堝悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀堕摱鍜ㄨ甯堝悕绉�*/
private String cashierConsultantName;
-
- @Column(comment = "鎺ヨ瘖鍜ㄨ甯堝悕绉扮被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**鎺ヨ瘖鍜ㄨ甯堝悕绉扮被鍨�*/
private Integer receptionConsultantType;
- @Index
- @Column(comment = "鎺ヨ瘖鍜ㄨ甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎺ヨ瘖鍜ㄨ甯坕d*/
private String receptionConsultantId;
- @Column(comment = "鎺ヨ瘖鍜ㄨ甯堝悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎺ヨ瘖鍜ㄨ甯堝悕绉�*/
private String receptionConsultantName;
-
- @Column(comment = "鎵ц鍜ㄨ甯堢被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**鎵ц鍜ㄨ甯堢被鍨�*/
private Integer deductionConsultantType;
- @Index
- @Column(comment = "鎵ц鍜ㄨ甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎵ц鍜ㄨ甯坕d*/
private String deductionConsultantId;
- @Column(comment = "鎵ц鍜ㄨ甯堝悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎵ц鍜ㄨ甯堝悕绉�*/
private String deductionConsultantName;
-
- @Column(comment = "鏀跺叆璁″叆", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀跺叆璁″叆*/
private String revenueRecordedType;
- @Column(comment = "鏀跺叆璁″叆鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀跺叆璁″叆鍚嶇О*/
private String revenueRecordedName;
-
- @Column(comment = "鏀跺叆涓讳綋", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀跺叆涓讳綋*/
private String revenueSubjectType;
- @Column(comment = "鏀跺叆涓讳綋鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀跺叆涓讳綋鍚嶇О*/
private String revenueSubjectName;
-
- @Column(comment = "鍘熷崟浠�", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鍘熷崟浠�*/
private BigDecimal originalPrice = BigDecimal.ZERO;
- @Column(comment = "鏁伴噺", type = MySqlTypeConstant.INT,length = 11)
+ /**鏁伴噺*/
private Integer quantity;
- @Column(comment = "鏈墽琛屾鏁�", type = MySqlTypeConstant.INT)
+ /**鏈墽琛屾鏁�*/
private Integer notUsedNum;
-
- @Column(comment = "鎶樻墸", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鎶樻墸*/
private BigDecimal discount = BigDecimal.ZERO;
- @Column(comment = "鎶樺悗閲戦", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鎶樺悗閲戦*/
private BigDecimal discountAmount = BigDecimal.ZERO;
- @Column(comment = "鏀堕摱閲戦", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鏀堕摱閲戦*/
private BigDecimal cashierAmount = BigDecimal.ZERO;
-
- @Column(comment="鏄惁娆犺垂", length = 1, type = MySqlTypeConstant.INT)
+ /**鏄惁娆犺垂*/
private Integer isArrears;
- @Column(comment = "棰勫畾閲�", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**棰勫畾閲�*/
private BigDecimal deposit = BigDecimal.ZERO;
- @Column(comment = "鍌ㄥ�奸噾", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鍌ㄥ�奸噾*/
private BigDecimal storedValueFund = BigDecimal.ZERO;
- @Column(comment = "澧炲�奸噾", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**澧炲�奸噾*/
private BigDecimal valueAddedFund = BigDecimal.ZERO;
- @Column(comment = "绉垎", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**绉垎*/
private BigDecimal integral = BigDecimal.ZERO;
- @Column(comment = "绉垎閲戦", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**绉垎閲戦*/
private BigDecimal integralAmount = BigDecimal.ZERO;
- @Column(comment = "铏氭嫙閲戦", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**铏氭嫙閲戦*/
private BigDecimal virtualAmount = BigDecimal.ZERO;
-
- @Column(comment = "涓氱哗鎬婚", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**涓氱哗鎬婚*/
private BigDecimal performanceTotal = BigDecimal.ZERO;
- @Column(comment = "涓氱哗涓嶅惈绋�", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**涓氱哗涓嶅惈绋�*/
private BigDecimal performanceNotHasTax;
- @Column(comment = "绋庨", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**绋庨*/
private BigDecimal taxAmount;
-
- @Column(comment = "鏍囧噯鑰楁潗鎴愭湰", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鏍囧噯鑰楁潗鎴愭湰*/
private BigDecimal standardConsumablesCost = BigDecimal.ZERO;
- @Column(comment = "瀹為檯鑰楁潗鎴愭湰", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**瀹為檯鑰楁潗鎴愭湰*/
private BigDecimal actualConsumablesCost = BigDecimal.ZERO;
-
- @Column(comment = "娓犻亾鍒嗙被鏍囪瘑(ChannelsType)(蹇呭～锛屼唬鐮佸垽鏂�)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鍒嗙被鏍囪瘑*/
private String channelsTypeId;
- @Column(comment = "娓犻亾鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鍒嗙被鍚嶇О*/
private String channelsTypeName;
- @Column(comment = "娓犻亾鏍囪瘑", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鏍囪瘑*/
private String channelId;
- @Column(comment = "娓犻亾鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鍚嶇О*/
private String channelName;
-
- @Column(comment = "娓犻亾鑱旂郴浜虹被鍨�", length = 4, type = MySqlTypeConstant.TINYINT)
+ /**娓犻亾鑱旂郴浜虹被鍨�*/
private Integer channelContactType;
- @Index
- @Column(comment = "娓犻亾鑱旂郴浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鑱旂郴浜篒d*/
private String channelContactId;
- @Column(comment = "娓犻亾鑱旂郴浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鑱旂郴浜哄悕绉�*/
private String channelContactName;
-
- @Column(comment = "娓犻亾鍚堜綔浜虹被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**娓犻亾鍚堜綔浜虹被鍨�*/
private Integer channelPartnerType;
- @Index
- @Column(comment = "娓犻亾鍚堜綔浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鍚堜綔浜篒d*/
private String channelPartnerId;
- @Column(comment = "娓犻亾鍚堜綔浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鍚堜綔浜哄悕绉�*/
private String channelPartnerName;
-
- @Column(comment = "璇婃墍鍐呴儴鑱旂粶浜虹被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**璇婃墍鍐呴儴鑱旂粶浜虹被鍨�*/
private Integer internalContactType;
- @Index
- @Column(comment = "璇婃墍鍐呴儴鑱旂粶浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璇婃墍鍐呴儴鑱旂粶浜篒d*/
private String internalContactId;
- @Column(comment = "璇婃墍鍐呴儴鑱旂粶浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璇婃墍鍐呴儴鑱旂粶浜哄悕绉�*/
private String internalContactName;
-
- @Column(comment = "鐢电綉鍜ㄨ甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐢电綉鍜ㄨ甯坕d*/
private String tmkServiceId;
- @Column(comment = "鐢电綉鍜ㄨ甯堝悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐢电綉鍜ㄨ甯堝悕绉�*/
private String tmkServiceName;
-
- @Column(comment = "瀹㈡湇id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡湇id*/
private String chatCorpUserId;
- @Column(comment = "瀹㈡湇鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡湇鍚嶇О*/
private String chatCorpUserName;
-
- @Column(comment = "鎶ゅ＋id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎶ゅ＋id*/
private String nurseCorpUserId;
- @Column(comment = "鎶ゅ＋鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎶ゅ＋鍚嶇О*/
private String nurseCorpUserName;
-
- @Column(comment = "娲楁墜鎶ゅ＋id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娲楁墜鎶ゅ＋id*/
private String handWashNurseId;
- @Column(comment = "娲楁墜鎶ゅ＋鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娲楁墜鎶ゅ＋鍚嶇О*/
private String handWashNurseName;
-
- @Column(comment = "宸″洖鎶ゅ＋id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**宸″洖鎶ゅ＋id*/
private String circuitingNurseId;
- @Column(comment = "宸″洖鎶ゅ＋鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**宸″洖鎶ゅ＋鍚嶇О*/
private String circuitingNurseName;
-
- @Column(comment = "閰嶅彴鎶ゅ＋id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**閰嶅彴鎶ゅ＋id*/
private String tableNurseId;
- @Column(comment = "閰嶅彴鎶ゅ＋鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**閰嶅彴鎶ゅ＋鍚嶇О*/
private String tableNurseName;
-
- @Column(comment = "楹婚唹甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**楹婚唹甯坕d*/
private String anesthesiologistId;
- @Column(comment = "楹婚唹甯堝悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**楹婚唹甯堝悕绉�*/
private String anesthesiologistName;
-
- @Column(comment = "鐤楃▼鎬婚", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鐤楃▼鎬婚*/
private BigDecimal treatmentTotal;
-
- @Column(comment = "TMK鐧昏浜篿d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**TMK鐧昏浜篿d*/
private String tmkRegistrantId;
- @Column(comment = "TMK鐧昏浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**TMK鐧昏浜哄悕绉�*/
private String tmkRegistrantName;
-
- @Column(comment = "鏀惰垂鍛榠d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀惰垂鍛榠d*/
private String chargeId;
- @Column(comment = "鏀惰垂鍛樺悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀惰垂鍛樺悕绉�*/
private String chargeName;
-
- @Column(comment = "鏈嶅姟闂ㄥ簵id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏈嶅姟闂ㄥ簵id*/
private String serviceShopId;
- @Column(comment = "鏈嶅姟闂ㄥ簵鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏈嶅姟闂ㄥ簵鍚嶇О*/
private String serviceShopName;
-
- @Column(comment = "鐢ㄦ埛鎵�灞為棬搴梚d", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐢ㄦ埛鎵�灞為棬搴梚d*/
private String belongShopId;
- @Column(comment = "鐢ㄦ埛鎵�灞為棬搴楀悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐢ㄦ埛鎵�灞為棬搴楀悕绉�*/
private String belongShopName;
-
- @Column(comment = "涓嬪崟闂ㄥ簵id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**涓嬪崟闂ㄥ簵id*/
private String orderShopId;
- @Column(comment = "涓嬪崟闂ㄥ簵鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**涓嬪崟闂ㄥ簵鍚嶇О*/
private String orderShopName;
-
- @Column(comment = "鏀堕摱闂ㄥ簵id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀堕摱闂ㄥ簵id*/
private String cashierShopId;
- @Column(comment = "鏀堕摱闂ㄥ簵鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀堕摱闂ㄥ簵鍚嶇О*/
private String cashierShopName;
-
- @Column(comment = "鏀惰垂澶囨敞", type = MySqlTypeConstant.TEXT)
+ /**鏀惰垂澶囨敞*/
private String chargeRemark;
-
- @Column(comment = "钀ラ攢鏍囩", type = MySqlTypeConstant.TEXT)
+ /**钀ラ攢鏍囩*/
private String marketingTag;
-
- @Column(comment="鏄惁杞瘖杞枟", length = 1, type = MySqlTypeConstant.INT)
+ /**鏄惁杞瘖杞枟*/
private Integer isTurn;
- @Column(comment="鏄惁鍙墽琛岄」鐩�", length = 1, type = MySqlTypeConstant.INT)
+ /**鏄惁鍙墽琛岄」鐩�*/
private Integer isDeductionProject;
- @Column(comment="鏄惁鐤楃▼椤圭洰", length = 1, type = MySqlTypeConstant.INT)
+ /**鏄惁鐤楃▼椤圭洰*/
private Integer isTreatmentProject;
-
- @Column(comment = "璐拱鏁伴噺", type = MySqlTypeConstant.INT,length = 11)
+ /**璐拱鏁伴噺*/
private Integer buyNum;
- @Column(comment = "鐤楃▼娆℃暟", type = MySqlTypeConstant.INT,length = 11)
+ /**鐤楃▼娆℃暟*/
private Integer treatmentNum;
- @Column(comment = "鐤楃▼鎬绘暟", type = MySqlTypeConstant.INT,length = 11)
+ /**鐤楃▼鎬绘暟*/
private Integer treatmentTotality;
- @Column(comment = "鐤楃▼搴忓彿", type = MySqlTypeConstant.INT,length = 11)
+ /**鐤楃▼搴忓彿*/
private Integer treatmentNo;
-
- @Column(comment = "鍒掓墸澶囨敞", type = MySqlTypeConstant.TEXT)
+ /**鍒掓墸澶囨敞*/
private String deductionRemark;
- @Column(comment = "鍏嶅崟鍘熷洜", type = MySqlTypeConstant.TEXT)
+ /**鍏嶅崟鍘熷洜*/
private String freeReason;
-
- @Column(comment = "涓氱哗绫诲埆(PerformanceInfoEnum)", type = MySqlTypeConstant.VARCHAR, isNull = false)
+ /**涓氱哗绫诲埆*/
private String performanceCategory;
- @Column(comment = "涓氱哗绫诲埆鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**涓氱哗绫诲埆鍚嶇О*/
private String performanceCategoryName;
-
- @Column(comment = "璁㈠崟绫诲瀷(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟绫诲瀷*/
private String orderType;
- @Column(comment = "璁㈠崟绫诲瀷鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟绫诲瀷鍚嶇О*/
private String orderTypeName;
-
- @Column(comment = "璁㈠崟鍒嗙被(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鍒嗙被*/
private int orderClassify;
- @Column(comment = "璁㈠崟绫诲瀷鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟绫诲瀷鍚嶇О*/
private String orderClassifyName;
-
- @Column(comment = "瀹㈡埛鎴愪氦鏍囩", type = MySqlTypeConstant.TEXT)
+ /**瀹㈡埛鎴愪氦鏍囩*/
private String customerTransactionTag;
-
- @Column(comment = "璁㈠崟娓犻亾鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟娓犻亾鍒嗙被鍚嶇О*/
private String orderChannelsTypeName;
-
- @Column(comment = "璁㈠崟涓�绾у垎绫�(OrderItemConstants) 娓犻亾涓轰竴绾ф笭閬搃d 浼氬憳濉啓绌�", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**璁㈠崟涓�绾у垎绫�*/
private String orderFirstLevelType;
- @Column(comment = "璁㈠崟涓�绾у垎绫诲悕绉�", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**璁㈠崟涓�绾у垎绫诲悕绉�*/
private String orderFirstLevelTypeName;
- @Column(comment = "璁㈠崟娓犻亾鐨刯son锛屾墍鏈夌埗绫诲寘鎷嚜宸�:[{\"id\":\"娓犻亾鏍囪瘑\",\"parentId\":\"鐖剁被娓犻亾鏍囪瘑\",\"name\":\"娓犻亾鍚嶇О\"}]", type = MySqlTypeConstant.TEXT)
+ /**璁㈠崟娓犻亾鐨刯son*/
private String orderChannelJson = "[]";
- @Column(comment = "璁㈠崟娓犻亾涓�绾х紪鍙�", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾涓�绾х紪鍙�*/
private String orderChannel1No;
- @Column(comment = "璁㈠崟娓犻亾涓�绾х殑鍒嗙被鏍囪瘑", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾涓�绾х殑鍒嗙被鏍囪瘑*/
private String orderChannel1TypeId;
- @Column(comment = "璁㈠崟娓犻亾涓�绾х殑鍒嗙被缂栧彿", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾涓�绾х殑鍒嗙被缂栧彿*/
private String orderChannel1TypeNo;
- @Column(comment = "璁㈠崟娓犻亾涓�绾х殑鍒嗙被鍚嶇О", type = MySqlTypeConstant.VARCHAR, length = 50)
+ /**璁㈠崟娓犻亾涓�绾х殑鍒嗙被鍚嶇О*/
private String orderChannel1TypeName;
-
- @Column(comment = "璁㈠崟浜岀骇鍒嗙被(OrderItemConstants) 娓犻亾涓轰簩绾ф笭閬搃d", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**璁㈠崟浜岀骇鍒嗙被*/
private String orderSecondLevelType;
- @Column(comment = "璁㈠崟浜岀骇鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟浜岀骇鍒嗙被鍚嶇О*/
private String orderSecondLevelTypeName;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇缂栧彿", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾浜岀骇缂栧彿*/
private String orderChannel2No;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勮仈绯讳汉鍚嶇О", length = 50, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟娓犻亾浜岀骇鐨勮仈绯讳汉鍚嶇О*/
private String orderChannel2Contacts;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勯儴闂ㄦ爣璇�", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾浜岀骇鐨勯儴闂ㄦ爣璇�*/
private String orderChannel2Depart;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勯儴闂ㄥ悕绉�", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾浜岀骇鐨勯儴闂ㄥ悕绉�*/
private String orderChannel2DepartName;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勫垎绫绘爣璇�", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾浜岀骇鐨勫垎绫绘爣璇�*/
private String orderChannel2TypeId;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勫垎绫荤紪鍙�", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾浜岀骇鐨勫垎绫荤紪鍙�*/
private String orderChannel2TypeNo;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勫垎绫诲悕绉�", type = MySqlTypeConstant.VARCHAR, length = 50)
+ /**璁㈠崟娓犻亾浜岀骇鐨勫垎绫诲悕绉�*/
private String orderChannel2TypeName;
- @Column(comment = "璁㈠崟娓犻亾鍚堜綔浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟娓犻亾鍚堜綔浜篒d*/
private String orderChannelPartnerId;
- @Column(comment = "璁㈠崟娓犻亾鍚堜綔浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟娓犻亾鍚堜綔浜哄悕绉�*/
private String orderChannelPartnerName;
-
- @Column(comment = "瀹㈡埛鎺ㄨ崘浜哄垎绫绘爣璇�",length = 32, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛鎺ㄨ崘浜哄垎绫绘爣璇�*/
private String inviteeTypeId;
- @Column(comment = "瀹㈡埛鎺ㄨ崘浜哄垎绫诲悕绉�",length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛鎺ㄨ崘浜哄垎绫诲悕绉�*/
private String inviteeTypeName;
- @Column(comment = "瀹㈡埛鎺ㄨ崘浜烘爣璇�",length = 32, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛鎺ㄨ崘浜烘爣璇�*/
private String inviteeId;
- @Column(comment = "瀹㈡埛鎺ㄨ崘浜虹紪鍙�",length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛鎺ㄨ崘浜虹紪鍙�*/
private String inviteeNo;
- @Column(comment = "閭�璇蜂汉缂栧彿", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**閭�璇蜂汉缂栧彿*/
private String inviteeCIQ;
- @Column(comment = "瀹㈡埛鎺ㄨ崘浜哄悕绉�",length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛鎺ㄨ崘浜哄悕绉�*/
private String inviteeName;
-
- @Column(comment = "璁㈠崟鎺ㄨ崘浜虹被鍨�", length = 32, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鎺ㄨ崘浜虹被鍨�*/
private String orderInviteeType;
- @Column(comment = "璁㈠崟鎺ㄨ崘浜哄悕绉�",length = 32, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鎺ㄨ崘浜哄悕绉�*/
private String orderInviteeTypeName;
- @Column(comment = "璁㈠崟鎺ㄨ崘浜烘爣璇�",length = 32, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鎺ㄨ崘浜烘爣璇�*/
private String orderInviteeId;
- @Column(comment = "瀹㈡埛鎺ㄨ崘浜虹紪鍙�",length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛鎺ㄨ崘浜虹紪鍙�*/
private String orderInviteeNo;
- @Column(comment = "閭�璇蜂汉缂栧彿", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**閭�璇蜂汉缂栧彿*/
private String orderInviteeCIQ;
- @Column(comment = "璁㈠崟鎺ㄨ崘浜哄悕绉�",length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鎺ㄨ崘浜哄悕绉�*/
private String orderInviteeName;
- @Column(comment = "璁㈠崟鎺ㄨ崘浜鸿鑹蹭俊鎭�",length = 128, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鎺ㄨ崘浜鸿鑹蹭俊鎭�*/
private String orderInviteeRoleInfo;
-
- @Index
- @Column(comment = "浼氬憳涓昏瘖鍖荤敓Id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**浼氬憳涓昏瘖鍖荤敓Id*/
private String attendingDoctorId;
- @Column(comment = "浼氬憳涓昏瘖鍖荤敓鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**浼氬憳涓昏瘖鍖荤敓鍚嶇О*/
private String attendingDoctorName;
-
- @Column(comment = "娌荤枟鍗曠被鍨嬶紙OrderTotalConstants锛�", length = 2, type = MySqlTypeConstant.INT, isNull = false, defaultValue = "0")
+ /**娌荤枟鍗曠被鍨�*/
private Integer treatOrderClassify;
- @Column(comment = "娌荤枟鍗曠被鍨嬶紙OrderTotalConstants锛�", length = 32, type = MySqlTypeConstant.VARCHAR)
+ /**娌荤枟鍗曠被鍨�*/
private String treatOrderClassifyName;
-
- @Column(comment = "浼樻儬鍒稿彂鏀句汉" ,type = MySqlTypeConstant.LONGTEXT)
+ /**浼樻儬鍒稿彂鏀句汉*/
private String couponIssuer;
- @Column(comment = "浼樻儬鍒稿彂鏀句汉瑙掕壊" ,type = MySqlTypeConstant.LONGTEXT)
+ /**浼樻儬鍒稿彂鏀句汉瑙掕壊*/
private String couponIssuerRole;
- @Column(comment = "浼樻儬鍒稿悕绉�" ,type = MySqlTypeConstant.LONGTEXT)
+ /**浼樻儬鍒稿悕绉�*/
private String couponName;
-
- @Column(comment = "涓绘笭閬�" ,type = MySqlTypeConstant.LONGTEXT)
+ /**涓绘笭閬�*/
private String mainChannelName;
- @Column(comment = "鎵ц閮ㄤ綅" ,type = MySqlTypeConstant.LONGTEXT)
+ /**鎵ц閮ㄤ綅*/
private String deductionBodyPartInfo;
- /**椤垫暟*/
- private Integer pageNum;
- /**鏉℃暟*/
- private Integer pageSize;
+
public Integer getPageNum() {
if(pageNum == null){
--
Gitblit v1.8.0