优化支付班结数据

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java

@@ -175,6 +175,7 @@ public class StationClassStructureController extends BaseController
             for(PayOrder payOrder:list){
                 StationClassStructure stationclass =new StationClassStructure();
                 stationclass.setStationId(payOrder.getStationId());
+                stationclass.setStationName(payOrder.getStationName());
                 stationclass.setClassStartDate(dfe.parse(beginTime));
                 stationclass.setClassStructureMan(username);
                 stationclass.setClassStructureNo(no);
@@ -203,6 +204,7 @@ public class StationClassStructureController extends BaseController
             for(PayOrder payOrder:list){
                 StationClassStructure stationclass =new StationClassStructure();
                 stationclass.setStationId(payOrder.getStationId());
+                stationclass.setStationName(payOrder.getStationName());
                 stationclass.setClassStructureMan(username);
                 stationclass.setClassStructureDate(date);
                 stationclass.setClassStructureNo(no);

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

@@ -130,7 +130,7 @@ public class PayOrder extends BaseEntity
     private Date payDate;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     //@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createdDate;
 
@@ -162,6 +162,16 @@ public class PayOrder extends BaseEntity
     private String likeCarNo;
     //ke
     private String likeCustomerPhone;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date likePayDate;
+
+    public Date getLikePayDate() {
+        return likePayDate;
+    }
+
+    public void setLikePayDate(Date likePayDate) {
+        this.likePayDate = likePayDate;
+    }
 
     public String getLikeCustomerPhone() {
         return likeCustomerPhone;

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

@@ -95,6 +95,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="likeConsumer != null  and likeConsumer != ''"> and customer  like concat('%',#{likeConsumer}, '%')</if>
             <if test="likeCarNo != null  and likeCarNo != ''"> and car_no  like concat('%',#{likeCarNo}, '%') </if>
             <if test="likeCustomerPhone != null  and likeCustomerPhone != ''"> and customer_phone  like concat('%',#{likeCustomerPhone}, '%') </if>
+            <if test="likeCustomerPhone != null  and likeCustomerPhone != ''"> and customer_phone  like concat('%',#{likeCustomerPhone}, '%') </if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+            </if>
         </where>
         order by order_id desc
     </select>

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

@@ -225,7 +225,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="memberAmt != null "> and member_amt = #{memberAmt}</if>
             <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
             <if test="customerPhone != null  and customerPhone != ''"> and customer_phone = #{customerPhone}</if>
-            <if test="customerGrade != null  and customerGrade != ''"> and customer_grade = #{customerGrade}</if>
+            <if test="likePayDate != null  and likePayDate != ''">
+              and date_format(pay_date,'%Y-%m-%d') = date_format(#{likePayDate},'%Y-%m-%d')
+            </if>
         </where>
         order by  id desc
     </select>