考试成绩导入，派遣记录查询，用户新增接口修改

Administrator

2021-08-30 aed241a8552e6567bab1a055b6c25f7709530b3a

考试成绩导入，派遣记录查询，用户新增接口修改

 src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java

@@ -41,6 +41,7 @@

import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

/**
@@ -119,6 +120,32 @@
        return R.status(dispatcherService.updateById(dispatcher));
    }


    /**
     * 结束派遣
     * @param dispatcher
     */
    @PostMapping("/over-dispatcher")
    public R overDispatcher(@Valid @RequestBody Dispatcher dispatcher) {
        dispatcher.setStatus(1);
        Boolean status = dispatcherService.updateById(dispatcher);

        //用户状态改变
        User user = new User();
        user.setId(Long.parseLong(dispatcher.getUserIds()));
        user.setDispatch("1");

        //内网同步
        String s1 =
            "update sys_dispatcher set status = " + "'" + dispatcher.getStatus() + "'" +
                ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" +
                " " +"where id = " + "'" + dispatcher.getId() + "';"+
                "update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
                " " +"where id = " + "'" + user.getId() + "'";
        FtpUtil.sqlFileUpload(s1);
        return R.status(status);
    }

    /**
     * 新增或修改
     */
@@ -129,8 +156,12 @@
        //List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
        //计算派遣人数
        //dispatcher.setNum(list.size());

        boolean status = false;
        if (dispatcher.getId()==null){
            dispatcher.setCreateTime(new Date());
            dispatcher.setStatus(0);

            User user = new User();
            user.setId(Long.parseLong(dispatcher.getUserIds()));
            user.setDispatch("0");
@@ -141,18 +172,22 @@

            //数据同步
            String s1 =
                "insert into sys_dispatcher(id,dispatcherTime,dispatcher_unit_id,user_ids,end_time,dept_id,jurisdiction) " +
                "insert into sys_dispatcher(id,dispatcherTime,dispatcher_unit_id,user_ids,end_time,dept_id,jurisdiction,create_time,status) " +
                "values(" + "'" + dispatcher.getId() + "'" + "," +
                    "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getDispatchertime()) + "'" + "," +
                    "'" + dispatcher.getDispatcherUnitId() + "'" + "," +
                    "'" + dispatcher.getUserIds() + "'" + "," +
                    "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getEndTime()) + "'" + "," +
                    "'" + dispatcher.getDeptId() + "'" + "," +
                    "'" +dispatcher.getJurisdiction() + "'" + ");" +
                    "'" + dispatcher.getJurisdiction() + "'" + "," +
                    "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher.getCreateTime()) + "'" + "," +
                    "'" +dispatcher.getStatus() + "'" + ");" +
                "update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
                    " " +"where id = " + "'" + user.getId() + "'";
            FtpUtil.sqlFileUpload(s1);
        }else {
                dispatcher.setUpdateTime(new Date());

                //查询当前派遣记录
                Dispatcher dispatcher1 = dispatcherService.getById(dispatcher.getId());
                if (!dispatcher1.getUserIds().equals(dispatcher.getUserIds())){
@@ -179,6 +214,7 @@
                            ",dispatcher_unit_id = " + "'" + dispatcher.getDispatcherUnitId() + "'" +
                            ",user_ids = " + "'" + dispatcher.getUserIds() + "'" +
                            ",end_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getEndTime()) + "'" +
                            ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher.getUpdateTime()) + "'" +
                            ",dept_id = " + "'" + dispatcher.getDeptId() + "'" +
                            ",jurisdiction = " + "'" + dispatcher.getJurisdiction() + "'" +
                            " " +"where id = " + "'" + user.getId() + "';"+

 src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java

@@ -116,4 +116,28 @@
     */
    private Integer num;

    /**
     * 创建时间
     */
    @TableField("create_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;



    /**
     * 更新时间
     */
    @TableField("update_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;


    /**
     * 派遣状态  0：已派遣  1：派遣结束
     */
    private Integer status;

}

 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml

@@ -33,6 +33,10 @@
        <if test="dispatcher.deptId!=null">
            and sd.dept_id = #{dispatcher.deptId}
        </if>
        <if test="dispatcher.dispatch!=null and dispatcher.dispatch!=''">
            and bu.dispatch = #{dispatcher.dispatch}
            and sd.status = #{dispatcher.dispatch}
        </if>
        <if test="dispatcher.userIds!=null and  dispatcher.userIds!=''">
            and sd.user_ids like concat('%', #{dispatcher.userIds},'%')
        </if>

 src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java

@@ -64,4 +64,9 @@
     */
    private String idCardNo;

    /**
     * 派遣状态  0：已派遣，  1：未派遣或派遣结束
     */
    private String dispatch;

}

 src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java

@@ -150,16 +150,15 @@
                    //修改为持证保安
                    user.setHold("1");
                    //分配保安角色
                    Role role = new Role();
                    role.setRoleAlias("保安");
                    Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
                    user.setRoleId(oneRole.getId().toString());
//                    Role role = new Role();
//                    role.setRoleAlias("保安");
//                    Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
//                    user.setRoleId(oneRole.getId().toString());
                    //更新保安数据
                    userService.updateById(user);

                    String s1 =
                        "update blade_user set role_id = " + "'" + user.getRoleId() + "'" +
                            ",hold = " + "'" + user.getHold() + "'" +
                        "update blade_user set hold = " + "'" + user.getHold() + "'" +
                            ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
                            ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
                            " " + "where id = " + "'" + user.getId() + "'";

 src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java

@@ -268,16 +268,15 @@
                                //修改为持证保安
                                user.setHold("1");
                                //分配保安角色
                                Role role = new Role();
                                role.setRoleAlias("保安");
                                Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
                                user.setRoleId(oneRole.getId().toString());
//                                Role role = new Role();
//                                role.setRoleAlias("保安");
//                                Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
//                                user.setRoleId(oneRole.getId().toString());
                                //更新保安数据
                                userService.updateById(user);

                                String s1 =
                                    "update blade_user set role_id = " + "'" +  user.getRoleId() + "'" +
                                        ",hold = " + "'" + user.getHold() + "'" +
                                    "update blade_user set hold = " + "'" +  user.getHold() + "'" +
                                        ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
                                        ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
                                        " " +"where id = " + "'" + user.getId() + "'";

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -180,17 +180,17 @@
    public R submit(@Valid @RequestBody User user) throws Exception {
        CacheUtil.clear(USER_CACHE);
        //查询角色
        if (null!=user.getRoleId()){
            Role role = new Role();
            role.setId(Long.parseLong(user.getRoleId()));
            Role one = roleService.getOne(Condition.getQueryWrapper(role));
            if (one.getRoleAlias().equals("保安")){
                user.setHold("1");
            }
            if (one.getRoleAlias().equals("未持证保安")){
                user.setHold("2");
            }
        }
//        if (null!=user.getRoleId()){
//            Role role = new Role();
//            role.setId(Long.parseLong(user.getRoleId()));
//            Role one = roleService.getOne(Condition.getQueryWrapper(role));
//            if (one.getRoleAlias().equals("保安")){
//                user.setHold("1");
//            }
//            if (one.getRoleAlias().equals("未持证保安")){
//                user.setHold("2");
//            }
//        }

        //根据 deptId 查询dept信息,公安管理员
        Dept dept = iDeptService.getById(user.getDeptId());
@@ -569,24 +569,24 @@
        //获取user
        User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")),User.class);
        //判断是否为空
        if (null!=user.getHold()){
//        if (null!=user.getHold()){
            //持证
            if (user.getHold().equals("1")){
//            if (user.getHold().equals("1")){
                //分配保安角色
                Role role = new Role();
                role.setRoleAlias("保安");
                Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
                user.setRoleId(oneRole.getId().toString());
            }
//            }
            //未持证
            if (user.getHold().equals("2")){
                //分配未持证保安角色
                Role role = new Role();
                role.setRoleAlias("未持证保安");
                Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
                user.setRoleId(oneRole.getId().toString());
            }
        }
//            if (user.getHold().equals("2")){
//                //分配未持证保安角色
//                Role role = new Role();
//                role.setRoleAlias("未持证保安");
//                Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
//                user.setRoleId(oneRole.getId().toString());
//            }
//        }
        //密码加密
        if (Func.isNotEmpty(user.getPassword())) {
            user.setPassword(DigestUtil.encrypt(user.getPassword()));

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -232,6 +232,14 @@
        <if test="user.sex!=null and user.sex != ''">
            and bu.sex = #{user.sex}
        </if>
        <if test="user.dispatch!=null and user.dispatch != ''">
            <if test="user.dispatch==1">
                and (bu.dispatch = #{user.dispatch} or bu.dispatch is null)
            </if>
            <if test="user.dispatch==0">
                and bu.dispatch = #{user.dispatch}
            </if>
        </if>
        <if test="user.status!=null and user.status != ''">
            and bu.status = #{user.status}
        </if>