fix 搜索

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserAddBo.java

@@ -63,4 +63,8 @@ public class ClassGradeUserAddBo {
     /** 是否已换班 0没有 1已换去新班 */
     @ApiModelProperty("是否已换班 0没有 1已换去新班")
     private Integer changeGrade;
+
+    /** 学时变为审核中时间 */
+    @ApiModelProperty("学时变为审核中时间")
+    private Long periodIngTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserEditBo.java

@@ -69,4 +69,8 @@ public class ClassGradeUserEditBo {
     /** 是否已换班 0没有 1已换去新班 */
     @ApiModelProperty("是否已换班 0没有 1已换去新班")
     private Integer changeGrade;
+
+    /** 学时变为审核中时间 */
+    @ApiModelProperty("学时变为审核中时间")
+    private Long periodIngTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGradeUser.java

@@ -72,5 +72,7 @@ private static final long serialVersionUID=1L;
     private Integer periodPlush;
     /** 官方学时推送次数 */
     private Long periodStatusNum;
+    /** 学时变为审核中时间 */
+    private Long periodIngTime;
 }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -382,8 +382,13 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         ClassGradeUser classGradeUser1 = new ClassGradeUser();
         classGradeUser1.setPeriodStatus(gradePeriodStatus);
         if(gradePeriodStatus==2){
+            //待审核
             classGradeUser1.setPeriodWaitTime(DateUtils.getNowTime());
         }
+        if(gradePeriodStatus==3){
+            //审核中
+            classGradeUser1.setPeriodIngTime(DateUtils.getNowTime());
+        }
         if(gradePeriodStatus==1){
             classGradeUser1.setPeriodTime(DateUtils.getNowTime());
             //判断结业

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeUserVo.java

@@ -121,4 +121,8 @@ public class ClassGradeUserVo {
 	@Excel(name = "官方学时推送次数")
 	@ApiModelProperty("官方学时推送次数")
 	private Long periodStatusNum;
+	/** 学时变为审核中时间 */
+	@Excel(name = "学时变为审核中时间")
+	@ApiModelProperty("学时变为审核中时间")
+	private Long periodIngTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceQueryBo.java

@@ -91,5 +91,6 @@ public class OrderInvoiceQueryBo extends BaseEntity {
 	/** 审核原因 */
 	@ApiModelProperty("审核原因")
 	private String periodReason;
-
+	@ApiModelProperty("搜索kEY")
+	private String searchKey;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderInvoiceVo.java

@@ -100,4 +100,9 @@ public class OrderInvoiceVo {
 	@Excel(name = "订单列表")
 	@ApiModelProperty("订单列表")
 	private List<OrderGoodsVo> orderList;
+	@ApiModelProperty("申请开始时间")
+	private Long applyStartTime;
+	@ApiModelProperty("申请结束时间")
+	private Long applyEndTime;
+
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -28,6 +28,7 @@
         <result property="periodPlushTime" column="period_plush_time"/>
         <result property="officialStatusNum" column="official_status_num"/>
         <result property="periodStatusNum" column="period_status_num"/>
+        <result property="periodIngTime" column="period_ing_time"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeUserVo" id="ClassGradeUserVoResult">
@@ -52,6 +53,7 @@
         <result property="periodWaitTime" column="period_wait_time"/>
         <result property="periodStatus" column="period_status"/>
         <result property="periodStatusNum" column="period_status_num"/>
+        <result property="periodIngTime" column="period_ing_time"/>
     </resultMap>
 
 

zhongzheng-system/src/main/resources/mapper/modules/order/OrderInvoiceMapper.xml

@@ -70,10 +70,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderInvoiceQueryBo" resultMap="OrderInvoiceVoResult">
         SELECT
-            *
+        oi.*,u.id_card,u.realname
         FROM
-            order_invoice
+        order_invoice oi LEFT JOIN `user` u on oi.user_id = u.user_id
         where 1=1
+        <if test="type != null and type != ''">
+            AND oi.type = #{type}
+        </if>
+        <if test="periodStatus != null and periodStatus != ''">
+            AND oi.period_status = #{periodStatus}
+        </if>
+        <if test="invoiceStatus != null and invoiceStatus != ''">
+            AND oi.invoice_status = #{invoiceStatus}
+        </if>
+        <if test="subject != null and subject != ''">
+            AND oi.subject = #{subject}
+        </if>
+        <if test="applyStartTime != null and applyStartTime != ''">
+            AND oi.apply_time >= #{applyStartTime}
+        </if>
+        <if test="applyEndTime != null and applyEndTime != ''">
+            AND #{applyStartTime} >= oi.apply_time
+        </if>
+        <if test="searchKey != null and searchKey != ''">
+            and (u.realname like concat('%', #{searchKey}, '%') or u.id_card like concat('%', #{searchKey}, '%'))
+        </if>
     </select>
 
 </mapper>