submit

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class UserStudyConditionBo implements Serializable {
@@ -22,6 +23,8 @@ public class UserStudyConditionBo implements Serializable {
 
     private String userCard;
 
+    private List<String> userCardList;
+
     private String userName;
 
     private String sevenYear;

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

@@ -65,4 +65,13 @@ public class UserStudyConditionVo implements Serializable {
 
     @ApiModelProperty("是否已申请学时")
     private String periodPlush;
+
+    @ApiModelProperty("审核状态")
+    private String periodStatus;
+
+    @ApiModelProperty("学习情况")
+    private String finishStatus;
+
+    @ApiModelProperty("机构名称")
+    private String tenantName;
 }

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

@@ -1193,6 +1193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         g.seven_year AS sevenYear,
         CONCAT(cet.education_name,cb.business_name,cpt.project_name) AS businessName,
         m.category_name AS majorName,
+        st.tenant_name AS tenantName,
         cg.class_name AS className,
         CASE
         WHEN cg.class_status = 1 THEN '已开班'
@@ -1205,6 +1206,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN cgu.period_plush = 1 THEN '是'
         ELSE '否' END AS periodPlush,
         FROM_UNIXTIME( cg.class_end_time, '%Y-%m-%d %H:%i:%s' ) AS classEndTime,
+        CASE
+        WHEN cgu.period_status = 1 THEN '已通过'
+        WHEN cgu.period_status = 2 THEN '待审核'
+        WHEN cgu.period_status = 3 THEN '审核中'
+        WHEN cgu.period_status = -1 THEN '无'
+        WHEN cgu.period_status = 0 THEN '未通过'
+        ELSE '无' END AS '审核状态',
+        CASE
+        WHEN cgu.finish_status = 1 THEN '已学完'
+        ELSE '未学完' END AS '学习情况',
         CONCAT((
         ((SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id,ubr.exam_id) FROM user_bank_record ubr  where ubr.`status`=1 and ubr.report_status=1 and ubr.grade_id = og.grade_id and ubr.order_goods_id = og.order_goods_id and ubr.user_id = cgu.user_id and ubr.current_status = 1) +
         (
@@ -1232,6 +1243,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN `user` u ON o.user_id = u.user_id
         LEFT JOIN class_grade_user cgu ON og.order_goods_id = cgu.order_goods_id
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
+        LEFT JOIN sys_tenant st ON o.tenant_id = st.tenant_id
         WHERE
         1=1
         AND og.pay_status != 1
@@ -1245,6 +1257,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userCard != null and userCard != ''">
             AND UPPER(AES_DECRYPT(UNHEX(id_card),'base20230213zzkj')) = UPPER(#{userCard})
         </if>
+        <if test="userCardList != null and userCardList.size()!=0">
+            AND AES_DECRYPT(UNHEX(u.id_card),'base20230213zzkj') in
+            <foreach collection="userCardList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="userName != null and userName != ''">
             AND u.realname = #{userName}
         </if>