智慧保安后台管理-外网项目备份
Administrator
2021-08-12 d4e35652a8a879c9e53016eeb1e3e9018c716502
用户新增字段是否培训报名,培训公司查询接口修改
4 files modified
30 ■■■■ changed files
src/main/java/org/springblade/modules/information/controller/InformationController.java 12 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml 9 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/entity/User.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -107,6 +107,18 @@
        return R.data(pages);
    }
    /**
     * 培训公司信息查询
     */
    @GetMapping("/security-page")
    public R<IPage<InformationVO>> securityPage(InformationVO information, Query query) {
        IPage<InformationVO> pages = informationService.securityPage(Condition.getPage(query), information);
        return R.data(pages);
    }
    /**
     * 新增
     */
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -175,20 +175,13 @@
            blade_dept bd
        on
            si.departmentid = bd.id
        left join
            sys_train_exam ste
        on
            ste.dept_id = bd.id
        where 1=1
        and ste.audit_status = 1
        and bd.dept_category = 3
        <if test="information.deptName!=null and information.deptName!=''">
            and bd.dept_name like concat(concat('%', #{information.deptName}),'%')
        </if>
        <if test="information.representative!=null and information.representative!=''">
            and representative like concat(concat('%', #{information.representative}),'%')
        </if>
        <if test="information.stats!=null and information.stats!=''">
            and stats=#{stats}
        </if>
        <if test="information.jurisdiction!=null and information.jurisdiction!=''">
            and si.jurisdiction=#{jurisdiction}
src/main/java/org/springblade/modules/system/entity/User.java
@@ -211,4 +211,10 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date birthtime;
    /**
     * 是否报名培训  1:是   2:否
     */
    @TableField("is_train")
    private Integer isTrain;
}
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -42,7 +42,8 @@
        <result column="dispatch" property="dispatch"/>
        <result column="my_picture" property="myPicture"/>
        <result column="is_apply" property="isApply"/>
        <result column="deptname" property="deptname"/>
        <result column="is_apply" property="isApply"/>
        <result column="is_train" property="isTrain"/>
        <result column="birthtime" property="birthtime"/>
    </resultMap>