计划执法时间添加

ZQN

2024-06-19 8ff8b4652c49fafbc31025cfe16e3c81bab37f9d

计划执法时间添加

 project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java

@@ -59,14 +59,6 @@
    public AjaxResult updateProfile(@RequestBody SysUser user)
    {
        LoginUser loginUser = getLoginUser();
        user.setUserName(user.getUserName());
        SysUser byId = userService.getById(user.getUserId());
        byId.setNickName(user.getNickName());
        byId.setPhonenumber(user.getPhonenumber());
        byId.setEmail(user.getEmail());
        byId.setSex(user.getSex());
        byId.setAvatar(user.getAvatar());
        byId.setDeptId(user.getDeptId());
        if (StringUtils.isNotEmpty(user.getPhonenumber())
                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
        {
@@ -77,11 +69,11 @@
        {
            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
        }
        int upd = userService.updateUser(byId);
        int upd = userService.updateUser(user);
        if (upd > 0)
        {
            // 更新缓存用户信息
            loginUser.setUser(byId);
            loginUser.setUser(user);
            tokenService.setLoginUser(loginUser);
            return success();
        }

 project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java

@@ -97,6 +97,9 @@
    @ApiModelProperty("申请时间")
    private Date applyTime;

    @ApiModelProperty("计划执法时间")
    private Date planTime;


    @ApiModelProperty("执法队员人数")
    private Integer userNum;

 project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java

@@ -91,6 +91,10 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date applyTime;

    @ApiModelProperty("计划执法时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date planTime;

    /** 执法队员人数 */
    @ApiModelProperty("执法队员人数")
    private Integer userNum;

 project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java

@@ -88,6 +88,11 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("申请时间")
    private Date applyTime;

    @ApiModelProperty("计划执法时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date planTime;

    /** 执法队员人数 */
    @ApiModelProperty("执法队员人数")
    private Integer userNum;

 project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java

@@ -77,6 +77,13 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("申请时间")
    private Date applyTime;


    @Excel(name = "计划执法时间" , width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty("计划执法时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date planTime;

    @Excel(name = "执法队员人数")
    @ApiModelProperty("执法队员人数")
    private Integer userNum;

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java

@@ -161,6 +161,7 @@
        qw.eq(bo.getApplyDeptId() != null, "apply_dept_id", bo.getApplyDeptId());
        qw.like(StringUtils.isNotEmpty(bo.getApplyDeptName()), "apply_dept_name", bo.getApplyDeptName());
        qw.eq(bo.getApplyTime() != null, "apply_time", bo.getApplyTime());
        qw.eq(bo.getPlanTime() != null, "plan_time", bo.getPlanTime());
        qw.eq(bo.getUserNum() != null, "user_num", bo.getUserNum());
        qw.eq(bo.getWarnStatus() != null, "warn_status", bo.getWarnStatus());
        qw.eq(StringUtils.isNotEmpty(bo.getWarnReason()), "warn_reason", bo.getWarnReason());

 project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml

@@ -23,6 +23,7 @@
        <result property="applyDeptId"    column="apply_dept_id"    />
        <result property="applyDeptName"    column="apply_dept_name"    />
        <result property="applyTime"    column="apply_time"    />
        <result property="planTime"    column="plan_time"    />
        <result property="userNum"    column="user_num"    />
        <result property="warnStatus"    column="warn_status"    />
        <result property="warnReason"    column="warn_reason"    />