fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/DangAnController.java

@@ -8,11 +8,14 @@ import com.zhongzheng.modules.grade.vo.ClassPeriodStudentVo;
 import com.zhongzheng.modules.order.bo.OrderQueryBo;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderListVo;
+import com.zhongzheng.modules.user.bo.UserCertificateQueryBo;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
 import com.zhongzheng.modules.user.bo.UserVisitLogQueryBo;
+import com.zhongzheng.modules.user.service.IUserCertificateService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.service.IUserVisitLogService;
 import com.zhongzheng.modules.user.vo.ExamStudyRecordVo;
+import com.zhongzheng.modules.user.vo.UserCertificateVo;
 import com.zhongzheng.modules.user.vo.UserVisitLogVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,6 +46,8 @@ public class DangAnController extends BaseController {
 
     private final IUserStudyRecordService iUserStudyRecordService;
 
+    private final IUserCertificateService iUserCertificateService;
+
     @ApiOperation("查询档案网课列表")
     @PreAuthorize("@ss.hasPermi('grade:user:list')")
     @GetMapping("/listVideoUserPeriod")
@@ -108,4 +113,13 @@ public class DangAnController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("查询档案证书列表")
+    @PreAuthorize("@ss.hasPermi('grade:student:list')")
+    @GetMapping("/listUserCertificate")
+    public TableDataInfo<UserCertificateVo> listUserCertificate(UserCertificateQueryBo bo) {
+        startPage();
+        List<UserCertificateVo> list = iUserCertificateService.selectList(bo);
+        return getDataTable(list);
+    }
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserCertificateQueryBo.java

@@ -93,4 +93,10 @@ public class UserCertificateQueryBo extends BaseEntity {
 	/** 证书发布年份 */
 	@ApiModelProperty("证书发布年份")
 	private String pushDate;
+
+	@ApiModelProperty("开始时间")
+	private Long searchStartTime;
+	/** 培训结束时间 */
+	@ApiModelProperty("结束时间")
+	private Long searchEndTime;
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserCertificateMapper.xml

@@ -109,6 +109,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userId != null and majorId != ''">
             AND uc.user_id = #{userId}
         </if>
+        <if test="searchStartTime != null and searchStartTime != ''">
+            AND uc.create_time > #{searchStartTime}
+        </if>
+        <if test="searchEndTime != null and searchEndTime != ''">
+            AND #{searchEndTime} > uc.create_time
+        </if>
         order by uc.update_time desc
     </select>