fix 证书搜索

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

@@ -62,4 +62,10 @@ public class UserCertificateAddBo {
     /** 项目ID */
     @ApiModelProperty("项目ID")
     private Long projectId;
+    /** 所属院校 */
+    @ApiModelProperty("所属院校")
+    private Long schoolId;
+    /** 所属专业 */
+    @ApiModelProperty("所属专业")
+    private Long majorId;
 }

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

@@ -71,4 +71,10 @@ public class UserCertificateEditBo {
     /** 项目ID */
     @ApiModelProperty("项目ID")
     private Long projectId;
+    /** 所属院校 */
+    @ApiModelProperty("所属院校")
+    private Long schoolId;
+    /** 所属专业 */
+    @ApiModelProperty("所属专业")
+    private Long majorId;
 }

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

@@ -80,4 +80,10 @@ public class UserCertificateQueryBo extends BaseEntity {
 
 	@ApiModelProperty("证书类型ID")
 	private Long typeId;
+	/** 所属院校 */
+	@ApiModelProperty("所属院校")
+	private Long schoolId;
+	/** 所属专业 */
+	@ApiModelProperty("所属专业")
+	private Long majorId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserCertificate.java

@@ -56,4 +56,8 @@ private static final long serialVersionUID=1L;
     private Long businessId;
     /** 项目ID */
     private Long projectId;
+    /** 所属院校 */
+    private Long schoolId;
+    /** 所属专业 */
+    private Long majorId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserCertificateVo.java

@@ -87,4 +87,12 @@ public class UserCertificateVo {
 	private String projectName;
 	@ApiModelProperty("业务名称")
 	private String businessName;
+	/** 所属院校 */
+	@Excel(name = "所属院校")
+	@ApiModelProperty("所属院校")
+	private Long schoolId;
+	/** 所属专业 */
+	@Excel(name = "所属专业")
+	@ApiModelProperty("所属专业")
+	private Long majorId;
 }

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

@@ -20,6 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="educationTypeId" column="education_type_id"/>
         <result property="businessId" column="business_id"/>
         <result property="projectId" column="project_id"/>
+        <result property="schoolId" column="school_id"/>
+        <result property="majorId" column="major_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserCertificateVo" id="UserCertificateVoResult">
@@ -81,5 +83,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="trainEndTime != null and trainEndTime != ''">
             AND #{trainEndTime} > uc.train_end_time
         </if>
+        <if test="businessId != null and businessId != ''">
+            AND uc.business_id = #{businessId}
+        </if>
+        <if test="schoolId != null and schoolId != ''">
+            AND uc.school_id = #{schoolId}
+        </if>
+        <if test="majorId != null and majorId != ''">
+            AND uc.major_id = #{majorId}
+        </if>
     </select>
 </mapper>