修改班结报表详细信息展示

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/PayOrder.java

@@ -150,13 +150,13 @@ public class PayOrder extends BaseEntity
     private String oilPersonnel;
 
     /** 支付时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date payDate;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createdDate;
 
     /** 订单类型（1.柴油，2.汽油，积分：3.现金+积分4.现金，5.积分） */

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationClassStructureMapper.xml

@@ -175,7 +175,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT *  from
         station_class_structure
         where id =(SELECT max(id) from station_class_structure
-            where class_structure_man =#{classStructureMan})
+            <where>
+                <if test="classStructureMan != null and classStructureMan != ''"> and class_structure_man = #{classStructureMan}</if>
+                <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+            </where>
+        )
     </select>
     <insert id="insertStationClassStructure" parameterType="StationClassStructure" useGeneratedKeys="true" keyProperty="id">
         insert into station_class_structure