ソースを参照

就餐明细查询bug修复。

zhengqiang 4 年 前
コミット
92bf56665d

+ 2 - 2
common/src/main/resources/mapper/base/CanteenDiningRecord.xml

@@ -186,12 +186,12 @@
 			</if>
 			<if test="searchParams.beginTime != null">
 				<![CDATA[
-                  and a.create_time >= #{searchParams.beginTime}
+                  and a.record_time >= #{searchParams.beginTime}
                 ]]>
 			</if>
 			<if test="searchParams.endTime != null">
 				<![CDATA[
-                  and a.create_time <= #{searchParams.endTime}
+                  and a.record_time <= #{searchParams.endTime}
                 ]]>
 			</if>
 		</where>

+ 4 - 1
web/src/main/java/com/jpsoft/shinestar/modules/base/controller/CanteenDiningRecordController.java

@@ -349,7 +349,10 @@ public class CanteenDiningRecordController {
                     }
                 }
 
-                map.put("createTime",sdf.format(canteenDiningRecord.getCreateTime()));
+                if(canteenDiningRecord.getRecordTime()!=null) {
+                    map.put("recordTime", sdf.format(canteenDiningRecord.getRecordTime()));
+                }
+
                 map.put("categoryAmount",canteenDiningRecord.getCategoryAmount());
                 map.put("address",canteenDiningRecord.getAddress());
                 map.put("personName",personName);