ソースを参照

feature: 药房客户端下载列表展示

wuyongyi 2 年 前
コミット
d8cac21601

+ 4 - 4
src/main/java/com/ywt/mg/services/OfflineNewService.java

@@ -160,7 +160,7 @@ public class OfflineNewService {
             String formatDate = "yyyy-MM-dd";
 
             SimpleDateFormat format = new SimpleDateFormat(formatDate);
-            String payTimeEnd = request.getPayTimeEnd();
+            String payTimeEnd = Checker.getStringValue(request.getPayTimeEnd());
             if (!Checker.isNull(payTimeEnd)) {
                 whereSql += " and ( pay_time < ?)";
                 Date date = format.parse(payTimeEnd);
@@ -173,7 +173,7 @@ public class OfflineNewService {
                 date = calendar.getTime();
                 paramList.add(date);
             }
-            String payTimeStart = request.getPayTimeStart();
+            String payTimeStart = Checker.getStringValue(request.getPayTimeStart());
             if (!Checker.isNull(payTimeStart)) {
                 whereSql += " and ( pay_time >= ?)";
                 Date date = format.parse(payTimeStart);
@@ -194,7 +194,7 @@ public class OfflineNewService {
             }
 
             String createTimeEnd = Checker.getStringValue(request.getCreateEndTime());
-            if (!Checker.isNull(payTimeEnd)) {
+            if (!Checker.isNull(createTimeEnd)) {
                 whereSql += " and ( pay_time < ?)";
                 Date date = format.parse(createTimeEnd);
 
@@ -206,7 +206,7 @@ public class OfflineNewService {
                 date = calendar.getTime();
                 paramList.add(date);
             }
-            String createTimeStart = request.getCreateStartTime();
+            String createTimeStart = Checker.getStringValue(request.getCreateStartTime());
             if (!Checker.isNull(createTimeStart)) {
                 whereSql += " and ( pay_time >= ?)";
                 Date date = format.parse(createTimeStart);

+ 8 - 8
src/main/java/com/ywt/mg/services/PrescriptionServices.java

@@ -217,14 +217,14 @@ public class PrescriptionServices {
         String Format_Date = "yyyy-MM-dd";
         SimpleDateFormat format = new SimpleDateFormat(Format_Date);
 
-        String createTimeEnd = request.getCreateTimeEnd();
-        String createTimeStart = request.getCreateTimeStart();
-        String payTimeEnd = request.getPayTimeEnd();
-        String payTimeStart = request.getPayTimeStart();
-        String refundTimeEnd = request.getRefundTimeEnd();
-        String refundTimeStart = request.getRefundTimeStart();
-        String billEndTime = request.getBillEndTime();
-        String billStartTime = request.getBillStartTime();
+        String createTimeEnd = Checker.getStringValue(request.getCreateTimeEnd());
+        String createTimeStart = Checker.getStringValue(request.getCreateTimeStart());
+        String payTimeEnd = Checker.getStringValue(request.getPayTimeEnd());
+        String payTimeStart = Checker.getStringValue(request.getPayTimeStart());
+        String refundTimeEnd = Checker.getStringValue(request.getRefundTimeEnd());
+        String refundTimeStart = Checker.getStringValue(request.getRefundTimeStart());
+        String billEndTime = Checker.getStringValue(request.getBillEndTime());
+        String billStartTime = Checker.getStringValue(request.getBillStartTime());
         try {
             // 创建时间
             if (!Checker.isNull(createTimeEnd)) {