From f5a9ea1e36db1cccdf744177f4af959159b2addf Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期四, 01 五月 2025 19:45:19 +0800
Subject: [PATCH] feat: 新增内部接口调用
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TbOrders.java | 285 ++++++++++-----------------------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 75 +++++++++-
ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java | 32 ++--
ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java | 11 +
ruoyi-admin/src/main/resources/application.yml | 2
6 files changed, 172 insertions(+), 237 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java
index 5b3308c..9f41c76 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java
@@ -1,9 +1,13 @@
package com.ruoyi.web.controller.system;
import java.util.List;
+import java.util.Objects;
+import java.text.SimpleDateFormat;
+import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.annotation.DataSource;
import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.domain.entity.ServiceOrderAppVo;
import com.ruoyi.common.enums.DataSourceType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -30,7 +34,7 @@
/**
* 鏈嶅姟璁㈠崟 淇℃伅鎿嶄綔澶勭悊
- *
+ *
* @author ruoyi
*/
@RestController
@@ -77,8 +81,9 @@
return success(serviceOrderService.selectServiceOrderById(serviceOrdId));
}
- /**
- * 鏂板鏈嶅姟璁㈠崟
+
+ /*
+ 鏂板璁㈠崟
*/
@PreAuthorize("@ss.hasPermi('system:order:add')")
@Log(title = "鏈嶅姟璁㈠崟", businessType = BusinessType.INSERT)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
index 7d4a966..192cb71 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
@@ -1,9 +1,18 @@
package com.ruoyi.web.controller.system;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.core.domain.entity.ServiceOrderAppResultVo;
+import com.ruoyi.common.core.domain.entity.ServiceOrderAppVo;
+import com.ruoyi.common.utils.civilAviation.ServiceOrderUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -70,14 +79,66 @@
}
/**
- * 鏂板orders
+ * 鎻愪緵澶栭儴鎺ュ彛鍙互璋冪敤
+ * @param tbOrders
+ * @return
*/
- @PreAuthorize("@ss.hasPermi('system:orders:add')")
- @Log(title = "orders", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody TbOrders tbOrders)
- {
- return toAjax(tbOrdersService.insertTbOrders(tbOrders));
+// @Anonymous(needSign = true)
+ @Anonymous
+// @Log(title = "orders", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody TbOrders tbOrders) {
+ try {
+ if (tbOrders == null || tbOrders.getOrderID() == null) {
+ return AjaxResult.error("浼犺緭鏁版嵁涓虹┖锛�");
+ }
+
+ tbOrders.setCreateTime(new Date());
+
+ int insertNum = tbOrdersService.insertTbOrders(tbOrders);
+ if(insertNum<1)
+ {
+ return AjaxResult.error("涓婁紶澶辫触锛�");
+ }
+
+ ServiceOrderAppVo model = new ServiceOrderAppVo();
+ model.setMethod("ServiceOrder_APP"); // 璁剧疆鎺ュ彛鍚嶇О
+ model.setAppId("GDS-000001"); // 璁剧疆鍟嗘埛 APPID
+ model.setOrdType(tbOrders.getTypeCode().intValue());
+ model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
+ model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
+// model.setCoTies("瀹跺睘"); // 闅忔満璁剧疆瀹㈡埛鑱旂郴浜轰笌鎮ｈ�呭叧绯�
+ // 璁剧疆棰勭害鏃堕棿涓轰竴澶╁悗
+ Calendar calendar = Calendar.getInstance();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd%20HH:mm");
+ model.setApptDate(sdf.format(tbOrders.getBookingDate())); // 鏍煎紡鍖栭绾﹁繍閫佹椂闂�
+
+ model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
+ model.setPtAge(tbOrders.getAge()); // 闅忔満鐢熸垚鎮ｈ�呭勾榫�
+ model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�"); // 闅忔満鐢熸垚鎮ｈ�呮�у埆
+// model.setPtNat("涓浗"); // 璁剧疆鎮ｈ�呭浗绫�
+ model.setOutHosp(tbOrders.getLocalAddress()); // 璁剧疆杞嚭鍖婚櫌
+ model.setInHosp(tbOrders.getSendAddress()); // 璁剧疆杞叆鍖婚櫌
+// model.setPtServices("绉戝" + (int) (Math.random() * 10)); // 闅忔満璁剧疆鎮ｈ�呮墍鍦ㄧ瀹�
+ model.setPtDiagnosis(tbOrders.getComplaint()); // 璁剧疆璇婃柇淇℃伅
+ model.setCondition(tbOrders.getRemark()); // 璁剧疆澶囨敞淇℃伅
+// model.setDoctor("鍖荤敓" + (int) (Math.random() * 10)); // 闅忔満璁剧疆鎮ｈ�呭尰鐢�
+// model.setDoctorPhone("13" + (int) (Math.random() * 900000000 + 100000000)); // 闅忔満鐢熸垚鎮ｈ�呭尰鐢熺數璇�
+ model.setOfferPrice(tbOrders.getBookingPrice().doubleValue()); // 闅忔満鐢熸垚鎶ヤ环
+// model.setReferrals("鎺ㄤ粙浜�" + (int) (Math.random() * 10)); // 闅忔満璁剧疆鎺ㄤ粙浜轰俊鎭�
+// model.setUnitRemarks("鍟嗘埛闅忔満澶囨敞淇℃伅"); // 闅忔満璁剧疆鍟嗘埛澶囨敞
+// model.setPayQRcodeURL("https://example.com/qrcode/" + (int) (Math.random() * 100)); // 闅忔満鐢熸垚澶栭儴鏀粯浜岀淮鐮侀摼鎺�
+
+ ServiceOrderAppResultVo result = ServiceOrderUtil.CreateServiceOrder(model);
+
+ if (result.getResult() == 1) {
+ return AjaxResult.success(result);
+ } else {
+ return AjaxResult.error("鎻愪氦澶辫触");
+ }
+ } catch (Exception e) {
+ return AjaxResult.error("鎻愪氦澶辫触");
+ }
}
/**
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index db0b9f1..43751f6 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -74,7 +74,7 @@
# 鍦板潃
host: localhost
# 绔彛锛岄粯璁や负6379
- port: 6379
+ port: 16379
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java
index ee1b6c0..e0bafdf 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java
@@ -31,7 +31,7 @@
*/
public static ServiceOrderAppResultVo CreateServiceOrder(ServiceOrderAppVo model) {
if (AddServiceOrederAPI.isEmpty()) {
- log.info("AddServiceOrederAPI 鏈缃紝璇峰厛璁剧疆鎺ュ彛鍦板潃銆�");
+ // log.info("AddServiceOrederAPI 鏈缃紝璇峰厛璁剧疆鎺ュ彛鍦板潃銆�");
return null;
}
@@ -50,7 +50,7 @@
params.put(field.getName(), value.toString());
}
} catch (IllegalAccessException e) {
- log.error("鑾峰彇瀵硅薄灞炴�у�兼椂鍑洪敊", e);
+ // log.error("鑾峰彇瀵硅薄灞炴�у�兼椂鍑洪敊", e);
}
}
@@ -76,7 +76,7 @@
.append(value.toString());
}
} catch (Exception e) {
- log.error("鎷兼帴琛ㄥ崟鏁版嵁鏃跺嚭閿�", e);
+ // log.error("鎷兼帴琛ㄥ崟鏁版嵁鏃跺嚭閿�", e);
}
}
@@ -84,15 +84,15 @@
if (responseData != null && !responseData.isEmpty()) {
- log.info("鎺ュ彛鍝嶅簲: " + responseData);
+ // log.info("鎺ュ彛鍝嶅簲: " + responseData);
try {
// 浣跨敤 FastJSON 灏嗗搷搴旀暟鎹浆鎹负 ServiceOrderAppResultVo 瀵硅薄
return JSON.parseObject(responseData, ServiceOrderAppResultVo.class);
} catch (Exception e) {
- log.info("瑙ｆ瀽鎺ュ彛鍝嶅簲鏁版嵁澶辫触: " + e.getMessage());
+ // log.info("瑙ｆ瀽鎺ュ彛鍝嶅簲鏁版嵁澶辫触: " + e.getMessage());
}
} else {
- log.info("鎺ュ彛璋冪敤澶辫触锛屾湭鑾峰彇鍒版湁鏁堝搷搴旀暟鎹�");
+ // log.info("鎺ュ彛璋冪敤澶辫触锛屾湭鑾峰彇鍒版湁鏁堝搷搴旀暟鎹�");
}
return null;
@@ -107,7 +107,7 @@
*/
public static ServiceOrderAppResultVo CancelServiceOrder(ServiceOrderDelVo model) {
if (AddServiceOrederAPI.isEmpty()) {
- log.info("AddServiceOrederAPI 鏈缃紝璇峰厛璁剧疆鎺ュ彛鍦板潃銆�");
+ // log.info("AddServiceOrederAPI 鏈缃紝璇峰厛璁剧疆鎺ュ彛鍦板潃銆�");
return null;
}
@@ -126,7 +126,7 @@
params.put(field.getName(), value.toString());
}
} catch (IllegalAccessException e) {
- log.error("鑾峰彇瀵硅薄灞炴�у�兼椂鍑洪敊", e);
+ // log.error("鑾峰彇瀵硅薄灞炴�у�兼椂鍑洪敊", e);
}
}
@@ -150,21 +150,21 @@
.append(value.toString());
}
} catch (Exception e) {
- log.error("鎷兼帴琛ㄥ崟鏁版嵁鏃跺嚭閿�", e);
+ // log.error("鎷兼帴琛ㄥ崟鏁版嵁鏃跺嚭閿�", e);
}
}
String responseData = HttpUtils.sendPost(AddServiceOrederAPI, formData.toString(), "application/x-www-form-urlencoded");
if (responseData != null && !responseData.isEmpty()) {
- log.info("鎺ュ彛鍝嶅簲: " + responseData);
+ // log.info("鎺ュ彛鍝嶅簲: " + responseData);
try {
return JSON.parseObject(responseData, ServiceOrderAppResultVo.class);
} catch (Exception e) {
- log.info("瑙ｆ瀽鎺ュ彛鍝嶅簲鏁版嵁澶辫触: " + e.getMessage());
+ // log.info("瑙ｆ瀽鎺ュ彛鍝嶅簲鏁版嵁澶辫触: " + e.getMessage());
}
} else {
- log.info("鎺ュ彛璋冪敤澶辫触锛屾湭鑾峰彇鍒版湁鏁堝搷搴旀暟鎹�");
+ // log.info("鎺ュ彛璋冪敤澶辫触锛屾湭鑾峰彇鍒版湁鏁堝搷搴旀暟鎹�");
}
return null;
@@ -173,9 +173,9 @@
public static void main(String[] args) {
// 鍒涘缓鏈嶅姟鍗曞簲鐢ㄥ�煎璞″苟璁剧疆鐩稿叧妯℃嫙灞炴��
-// test();
+ test();
- testCancelServiceOrder();
+// testCancelServiceOrder();
}
//娴嬭瘯鍙栨秷鏈嶅姟鍗�
@@ -211,8 +211,8 @@
model.setPtAge((int) (Math.random() * 100) + "宀�"); // 闅忔満鐢熸垚鎮ｈ�呭勾榫�
model.setPtSex(Math.random() > 0.5 ? "鐢�" : "濂�"); // 闅忔満鐢熸垚鎮ｈ�呮�у埆
model.setPtNat("涓浗"); // 闅忔満璁剧疆鎮ｈ�呭浗绫�
- model.setOutHosp("闅忔満杞嚭鍖婚櫌" + (int) (Math.random() * 10)); // 闅忔満璁剧疆杞嚭鍖婚櫌
- model.setInHosp("闅忔満杞叆鍖婚櫌" + (int) (Math.random() * 10)); // 闅忔満璁剧疆杞叆鍖婚櫌
+ model.setOutHosp("骞垮窞澶╂渤"); // 闅忔満璁剧疆杞嚭鍖婚櫌
+ model.setInHosp("骞垮窞娴风彔"); // 闅忔満璁剧疆杞叆鍖婚櫌
model.setPtServices("绉戝" + (int) (Math.random() * 10)); // 闅忔満璁剧疆鎮ｈ�呮墍鍦ㄧ瀹�
model.setPtDiagnosis("闅忔満璇婃柇淇℃伅"); // 闅忔満璁剧疆璇婃柇淇℃伅
model.setCondition("闅忔満澶囨敞淇℃伅"); // 闅忔満璁剧疆澶囨敞淇℃伅
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbOrders.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbOrders.java
index c62e8f8..de81e9e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbOrders.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbOrders.java
@@ -3,6 +3,8 @@
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -14,149 +16,190 @@
* @author wzp
* @date 2025-05-01
*/
+@Getter
public class TbOrders extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 骞夸氦鐨勮鍗� ID锛岀郴缁熷敮涓�鍒涘缓璁㈠崟 */
+ @JsonProperty("OrderID")
private Long OrderID;
/** 鑱旂郴浜� */
@Excel(name = "鑱旂郴浜�")
+ @JsonProperty("LinkPerson")
private String LinkPerson;
/** 鑱旂郴鐢佃瘽 */
@Excel(name = "鑱旂郴鐢佃瘽")
+ @JsonProperty("LinkTel")
private String LinkTel;
/** 鍙楃悊鐢佃瘽,鏉ョ數鐢佃瘽 */
@Excel(name = "鍙楃悊鐢佃瘽,鏉ョ數鐢佃瘽")
+ @JsonProperty("AlarmTel")
private String AlarmTel;
/** 鎮ｈ�呭鍚� */
@Excel(name = "鎮ｈ�呭鍚�")
+ @JsonProperty("PatientName")
private String PatientName;
/** 鎮ｈ�呮�у埆 */
@Excel(name = "鎮ｈ�呮�у埆")
+ @JsonProperty("Sex")
private Integer Sex;
/** 鎮ｈ�呭勾榫� */
@Excel(name = "鎮ｈ�呭勾榫�")
+ @JsonProperty("Age")
private String Age;
/** 鎮ｈ�呬綋閲� */
@Excel(name = "鎮ｈ�呬綋閲�")
+ @JsonProperty("Kg")
private String Kg;
/** 鎮ｈ�呮湁鏃犳剰璇� */
@Excel(name = "鎮ｈ�呮湁鏃犳剰璇�")
+ @JsonProperty("Sense")
private String Sense;
/** 鐜板満鍦板潃 */
@Excel(name = "鐜板満鍦板潃")
+ @JsonProperty("LocalAddress")
private String LocalAddress;
/** 鐜板満鍦板潃缁忓害锛堢洰鍓嶆槸 gcj02 鍧愭爣绯伙級 */
@Excel(name = "鐜板満鍦板潃缁忓害", readConverterExp = "鐩�=鍓嶆槸,g=cj02,鍧�=鏍囩郴")
+ @JsonProperty("LocalLongitude")
private Long LocalLongitude;
/** 鐜板満鍦板潃绾害 */
@Excel(name = "鐜板満鍦板潃绾害")
+ @JsonProperty("LocalLatitude")
private Long LocalLatitude;
/** 鐜板満鎵�鍦ㄧ渷 */
@Excel(name = "鐜板満鎵�鍦ㄧ渷")
+ @JsonProperty("LocalProvince")
private String LocalProvince;
/** 鐜板満鎵�鍦ㄥ煄甯� */
@Excel(name = "鐜板満鎵�鍦ㄥ煄甯�")
+ @JsonProperty("LocalCity")
private String LocalCity;
/** 鐜板満鎵�鍦ㄥ尯 */
@Excel(name = "鐜板満鎵�鍦ㄥ尯")
+ @JsonProperty("LocalDistrict")
private String LocalDistrict;
/** 閫佸線鍦板潃 */
@Excel(name = "閫佸線鍦板潃")
+ @JsonProperty("SendAddress")
private String SendAddress;
/** 閫佸線缁忓害 */
@Excel(name = "閫佸線缁忓害")
+ @JsonProperty("SendLongitude")
private Long SendLongitude;
/** 閫佸線绾害 */
@Excel(name = "閫佸線绾害")
+ @JsonProperty("SendLatitude")
private Long SendLatitude;
/** 閫佸線鎵�鍦ㄧ渷 */
@Excel(name = "閫佸線鎵�鍦ㄧ渷")
+ @JsonProperty("SendProvince")
private String SendProvince;
/** 閫佸線鎵�鍦ㄥ煄甯� */
@Excel(name = "閫佸線鎵�鍦ㄥ煄甯�")
+ @JsonProperty("SendCity")
private String SendCity;
/** 閫佸線鎵�鍦ㄥ尯 */
@Excel(name = "閫佸線鎵�鍦ㄥ尯")
+ @JsonProperty("SendDistrict")
private String SendDistrict;
/** 棰勪及閲戦 */
@Excel(name = "棰勪及閲戦")
+ @JsonProperty("BookingPrice")
private BigDecimal BookingPrice;
/** 棰勭害鏃堕棿锛堟椂闂寸被鍨嬶紝绮剧‘鍒板皬鏃讹級 */
@Excel(name = "棰勭害鏃堕棿", readConverterExp = "鏃�=闂寸被鍨嬶紝绮剧‘鍒板皬鏃�")
+ @JsonProperty("BookingDate")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date BookingDate;
/** 鐥呬汉鎯呭喌 */
@Excel(name = "鐥呬汉鎯呭喌")
+ @JsonProperty("Complaint")
private String Complaint;
/** 浜烘暟 */
@Excel(name = "浜烘暟")
+ @JsonProperty("PatientCount")
private Long PatientCount;
/** 棰勪及棰勭害鍏噷 */
@Excel(name = "棰勪及棰勭害鍏噷")
+ @JsonProperty("BookingKM")
private Long BookingKM;
/** 鏅�氭姢閫侊紝鐩戞姢鎶ら�侊紙鍙寜鐓х涓夋柟鐨勫瓧鍏告柊澧炴垨璧嬪�硷級 */
@Excel(name = "鏅�氭姢閫侊紝鐩戞姢鎶ら��", readConverterExp = "鍙�=鎸夌収绗笁鏂圭殑瀛楀吀鏂板鎴栬祴鍊�")
+ @JsonProperty("EscortCode")
private Long EscortCode;
/** 姝ユ鎴栫數姊� */
@Excel(name = "姝ユ鎴栫數姊�")
+ @JsonProperty("LiftingCode")
private Long LiftingCode;
/** 妤煎眰 */
@Excel(name = "妤煎眰")
+ @JsonProperty("LiftingFloor")
private Long LiftingFloor;
/** 鐩戞姢锛岄噸鐥�(鍙寜鐓х涓夋柟鐨勫瓧鍏告柊澧炴垨璧嬪��) */
@Excel(name = "鐩戞姢锛岄噸鐥�(鍙寜鐓х涓夋柟鐨勫瓧鍏告柊澧炴垨璧嬪��)")
+ @JsonProperty("RequirementCode")
private Long RequirementCode;
/** 杞繍绫诲瀷锛堝競鍐咃紝甯傚锛岀渷澶栫瓑锛屽彲鎸夌収绗笁鏂圭殑瀛楀吀鏂板鎴栬祴鍊硷級 */
@Excel(name = "杞繍绫诲瀷", readConverterExp = "甯�=鍐咃紝甯傚锛岀渷澶栫瓑锛屽彲鎸夌収绗笁鏂圭殑瀛楀吀鏂板鎴栬祴鍊�")
+ @JsonProperty("TypeCode")
private Long TypeCode;
/** 绗笁鏂硅皟鐢ㄦ帴鍙ｈ繑鍥炵粨鏋�,1-鎴愬姛锛�2-澶辫触 */
@Excel(name = "绗笁鏂硅皟鐢ㄦ帴鍙ｈ繑鍥炵粨鏋�,1-鎴愬姛锛�2-澶辫触")
+ @JsonProperty("ThirdPartyResult")
private Integer ThirdPartyResult;
/** 绗笁鏂规湇鍔D */
@Excel(name = "绗笁鏂规湇鍔D")
+ @JsonProperty("ServiceOrdID")
private String ServiceOrdID;
/** 绗笁鏂规湇鍔″崟鍙� */
@Excel(name = "绗笁鏂规湇鍔″崟鍙�")
+ @JsonProperty("ServiceOrdNo")
private String ServiceOrdNo;
+ @JsonProperty("Remark")
private String Remark;
+ @JsonProperty("CreateTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date CreateTime;
+ @JsonProperty("UpdateTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date UpdateTime;
public void setOrderID(Long OrderID)
@@ -164,350 +207,174 @@
this.OrderID = OrderID;
}
- public Long getOrderID()
- {
- return OrderID;
- }
-
- public void setLinkPerson(String LinkPerson)
+ public void setLinkPerson(String LinkPerson)
{
this.LinkPerson = LinkPerson;
}
- public String getLinkPerson()
- {
- return LinkPerson;
- }
-
- public void setLinkTel(String LinkTel)
+ public void setLinkTel(String LinkTel)
{
this.LinkTel = LinkTel;
}
- public String getLinkTel()
- {
- return LinkTel;
- }
-
- public void setAlarmTel(String AlarmTel)
+ public void setAlarmTel(String AlarmTel)
{
this.AlarmTel = AlarmTel;
}
- public String getAlarmTel()
- {
- return AlarmTel;
- }
-
- public void setPatientName(String PatientName)
+ public void setPatientName(String PatientName)
{
this.PatientName = PatientName;
}
- public String getPatientName()
- {
- return PatientName;
- }
-
- public void setSex(Integer Sex)
+ public void setSex(Integer Sex)
{
this.Sex = Sex;
}
- public Integer getSex()
- {
- return Sex;
- }
-
- public void setAge(String Age)
+ public void setAge(String Age)
{
this.Age = Age;
}
- public String getAge()
- {
- return Age;
- }
-
- public void setKg(String Kg)
+ public void setKg(String Kg)
{
this.Kg = Kg;
}
- public String getKg()
- {
- return Kg;
- }
-
- public void setSense(String Sense)
+ public void setSense(String Sense)
{
this.Sense = Sense;
}
- public String getSense()
- {
- return Sense;
- }
-
- public void setLocalAddress(String LocalAddress)
+ public void setLocalAddress(String LocalAddress)
{
this.LocalAddress = LocalAddress;
}
- public String getLocalAddress()
- {
- return LocalAddress;
- }
-
- public void setLocalLongitude(Long LocalLongitude)
+ public void setLocalLongitude(Long LocalLongitude)
{
this.LocalLongitude = LocalLongitude;
}
- public Long getLocalLongitude()
- {
- return LocalLongitude;
- }
-
- public void setLocalLatitude(Long LocalLatitude)
+ public void setLocalLatitude(Long LocalLatitude)
{
this.LocalLatitude = LocalLatitude;
}
- public Long getLocalLatitude()
- {
- return LocalLatitude;
- }
-
- public void setLocalProvince(String LocalProvince)
+ public void setLocalProvince(String LocalProvince)
{
this.LocalProvince = LocalProvince;
}
- public String getLocalProvince()
- {
- return LocalProvince;
- }
-
- public void setLocalCity(String LocalCity)
+ public void setLocalCity(String LocalCity)
{
this.LocalCity = LocalCity;
}
- public String getLocalCity()
- {
- return LocalCity;
- }
-
- public void setLocalDistrict(String LocalDistrict)
+ public void setLocalDistrict(String LocalDistrict)
{
this.LocalDistrict = LocalDistrict;
}
- public String getLocalDistrict()
- {
- return LocalDistrict;
- }
-
- public void setSendAddress(String SendAddress)
+ public void setSendAddress(String SendAddress)
{
this.SendAddress = SendAddress;
}
- public String getSendAddress()
- {
- return SendAddress;
- }
-
- public void setSendLongitude(Long SendLongitude)
+ public void setSendLongitude(Long SendLongitude)
{
this.SendLongitude = SendLongitude;
}
- public Long getSendLongitude()
- {
- return SendLongitude;
- }
-
- public void setSendLatitude(Long SendLatitude)
+ public void setSendLatitude(Long SendLatitude)
{
this.SendLatitude = SendLatitude;
}
- public Long getSendLatitude()
- {
- return SendLatitude;
- }
-
- public void setSendProvince(String SendProvince)
+ public void setSendProvince(String SendProvince)
{
this.SendProvince = SendProvince;
}
- public String getSendProvince()
- {
- return SendProvince;
- }
-
- public void setSendCity(String SendCity)
+ public void setSendCity(String SendCity)
{
this.SendCity = SendCity;
}
- public String getSendCity()
- {
- return SendCity;
- }
-
- public void setSendDistrict(String SendDistrict)
+ public void setSendDistrict(String SendDistrict)
{
this.SendDistrict = SendDistrict;
}
- public String getSendDistrict()
- {
- return SendDistrict;
- }
-
- public void setBookingPrice(BigDecimal BookingPrice)
+ public void setBookingPrice(BigDecimal BookingPrice)
{
this.BookingPrice = BookingPrice;
}
- public BigDecimal getBookingPrice()
- {
- return BookingPrice;
- }
-
- public void setBookingDate(Date BookingDate)
+ public void setBookingDate(Date BookingDate)
{
this.BookingDate = BookingDate;
}
- public Date getBookingDate()
- {
- return BookingDate;
- }
-
- public void setComplaint(String Complaint)
+ public void setComplaint(String Complaint)
{
this.Complaint = Complaint;
}
- public String getComplaint()
- {
- return Complaint;
- }
-
- public void setPatientCount(Long PatientCount)
+ public void setPatientCount(Long PatientCount)
{
this.PatientCount = PatientCount;
}
- public Long getPatientCount()
- {
- return PatientCount;
- }
-
- public void setBookingKM(Long BookingKM)
+ public void setBookingKM(Long BookingKM)
{
this.BookingKM = BookingKM;
}
- public Long getBookingKM()
- {
- return BookingKM;
- }
-
- public void setEscortCode(Long EscortCode)
+ public void setEscortCode(Long EscortCode)
{
this.EscortCode = EscortCode;
}
- public Long getEscortCode()
- {
- return EscortCode;
- }
-
- public void setLiftingCode(Long LiftingCode)
+ public void setLiftingCode(Long LiftingCode)
{
this.LiftingCode = LiftingCode;
}
- public Long getLiftingCode()
- {
- return LiftingCode;
- }
-
- public void setLiftingFloor(Long LiftingFloor)
+ public void setLiftingFloor(Long LiftingFloor)
{
this.LiftingFloor = LiftingFloor;
}
- public Long getLiftingFloor()
- {
- return LiftingFloor;
- }
-
- public void setRequirementCode(Long RequirementCode)
+ public void setRequirementCode(Long RequirementCode)
{
this.RequirementCode = RequirementCode;
}
- public Long getRequirementCode()
- {
- return RequirementCode;
- }
-
- public void setTypeCode(Long TypeCode)
+ public void setTypeCode(Long TypeCode)
{
this.TypeCode = TypeCode;
}
- public Long getTypeCode()
- {
- return TypeCode;
- }
-
- public void setThirdPartyResult(Integer ThirdPartyResult)
+ public void setThirdPartyResult(Integer ThirdPartyResult)
{
this.ThirdPartyResult = ThirdPartyResult;
}
- public Integer getThirdPartyResult()
- {
- return ThirdPartyResult;
- }
-
- public void setServiceOrdID(String ServiceOrdID)
+ public void setServiceOrdID(String ServiceOrdID)
{
this.ServiceOrdID = ServiceOrdID;
}
- public String getServiceOrdID()
- {
- return ServiceOrdID;
- }
-
- public void setServiceOrdNo(String ServiceOrdNo)
+ public void setServiceOrdNo(String ServiceOrdNo)
{
this.ServiceOrdNo = ServiceOrdNo;
}
- public String getServiceOrdNo()
- {
- return ServiceOrdNo;
- }
-
- public String getRemark(){return Remark;}
-
public void setRemark(String Remark){this.Remark =Remark;}
- public Date getCreateTime(){return CreateTime;}
-
public void setCreateTime(Date CreateTime){this.CreateTime =CreateTime;}
-
- public Date getUpdateTime(){return UpdateTime;}
public void setUpdateTime(Date UpdateTime){this.UpdateTime =UpdateTime;}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml
index 7404a74..e11e5b3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml
@@ -95,9 +95,10 @@
where OrderID = #{OrderID}
</select>
- <insert id="insertTbOrders" parameterType="TbOrders" useGeneratedKeys="true" keyProperty="OrderID">
+ <insert id="insertTbOrders" parameterType="TbOrders">
insert into tb_orders
<trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="OrderID != null">OrderID,</if>
<if test="LinkPerson != null">LinkPerson,</if>
<if test="LinkTel != null">LinkTel,</if>
<if test="AlarmTel != null">AlarmTel,</if>
@@ -136,6 +137,7 @@
<if test="UpdateTime != null">UpdateTime,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="OrderID != null">#{OrderID},</if>
<if test="LinkPerson != null">#{LinkPerson},</if>
<if test="LinkTel != null">#{LinkTel},</if>
<if test="AlarmTel != null">#{AlarmTel},</if>
--
Gitblit v1.9.1