派遣时间格式修改

Administrator

2021-08-24 031d8b7e3e033ea2da7ae10c56cb0ac354c1d651

派遣时间格式修改

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

@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.dispatcher.service.IDispatcherUnitService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
@@ -38,6 +39,7 @@
import org.springblade.modules.dispatcher.service.IDispatcherService;
import org.springblade.core.boot.ctrl.BladeController;

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

@@ -103,7 +105,6 @@
            //计算派遣人数
//            dispatcher.setNum(Arrays.asList(dispatcher.getUserIds().split(",")).size());
            //查询派遣单位的信息,设置行政区
            dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
        }
        return R.status(dispatcherService.save(dispatcher));
    }
@@ -125,25 +126,20 @@
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入dispatcher")
    public R submit(@Valid @RequestBody Dispatcher dispatcher) {
        //List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
        //计算派遣人数
        //dispatcher.setNum(list.size());
        if (dispatcher.getId()==null){
            if (null!=dispatcher.getUserIds() && dispatcher.getUserIds()!=""){
//                List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
//                //计算派遣人数
//                dispatcher.setNum(list.size());
                //修改保安人员的派遣状态
                User user = new User();
                user.setId(Long.parseLong(dispatcher.getUserIds()));
                user.setDispatch("0");
                userService.updateById(user);
                //查询派遣单位的信息,设置行政区
                dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
            }
            User user = new User();
            user.setId(Long.parseLong(dispatcher.getUserIds()));
            user.setDispatch("0");
            userService.updateById(user);
            String s1 =
                "update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
                    " " +"where id = " + "'" + user.getId() + "'";
            FtpUtil.sqlFileUpload(s1);
        }
        else {
            if (null != dispatcher.getUserIds() && dispatcher.getUserIds() != "") {
//                List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
                //计算派遣人数
//                dispatcher.setNum(list.size());
                //查询当前派遣记录
                Dispatcher dispatcher1 = dispatcherService.getById(dispatcher.getId());
                if (!dispatcher1.getUserIds().equals(dispatcher.getUserIds())){
@@ -158,10 +154,14 @@
                    user1.setId(Long.parseLong(dispatcher.getUserIds()));
                    user1.setDispatch("0");
                    userService.updateById(user1);

                    String s1 =
                        "update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
                            " " +"where id = " + "'" + user.getId() + "';"+
                        "update blade_user set dispatch = " + "'" + user1.getDispatch() + "'" +
                            " " +"where id = " + "'" + user1.getId() + "'";
                    FtpUtil.sqlFileUpload(s1);
                }
                //查询派遣单位的信息,设置行政区
                dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
            }
        }
        return R.status(dispatcherService.saveOrUpdate(dispatcher));
    }
@@ -175,7 +175,12 @@
    @ApiOperation(value = "删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        //内网删除
        //arg.sendPostRemoveByIds(arg.url+"/dispatcher/remove",ids);
        List<Long> list = Func.toLongList(ids);
        list.forEach(id ->{
            //内网同步
            String s1 = "delete from sys_dispatcher where id = " + "'" + id + "'";
            FtpUtil.sqlFileUpload(s1);
        });
        return R.status(dispatcherService.removeByIds(Func.toLongList(ids)));
    }


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

@@ -66,8 +66,8 @@
    */
        @ApiModelProperty(value = "派遣开始时间")
        @TableField("dispatcherTime")
        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
        @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
        @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
        @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date dispatchertime;
    /**
    * 派遣地址
@@ -94,8 +94,8 @@
     * 派遣结束时间
     */
    @TableField("end_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date endTime;



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

@@ -117,6 +117,11 @@
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入exam")
    public R update(@RequestBody ExamPaper exam) {
        String s1 =
            "update ksxt_exam set exam_name = " + "'" + exam.getExamName() + "'" +
                ",start_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(exam.getStartTime()) + "'" +
                " " +"where id = " + "'" + exam.getId() + "'";
        FtpUtil.sqlFileUpload(s1);
        return R.status(examPaperService.updateById(exam));
    }

@@ -137,6 +142,13 @@
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "逻辑删除", notes = "传入exam")
    public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
        //内网删除
        List<Long> list = Func.toLongList(ids);
        list.forEach(id ->{
            //内网同步
            String s1 = "delete from ksxt_exam where id = " + "'" + id + "'";
            FtpUtil.sqlFileUpload(s1);
        });
        boolean temp = examPaperService.removeByIds(Func.toLongList(ids));
        return R.status(temp);
    }