用户新增发证时间字段，考试合格生成保安证，记录时间

Administrator

2021-08-24 299ffdb4cda87b3f4ad94723586d757c1e06725c

用户新增发证时间字段，考试合格生成保安证，记录时间

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

@@ -100,8 +100,14 @@
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入exam")
    public R save(@RequestBody ExamPaper exam) {
        return R.status(examPaperService.save(exam));
    public R save(@RequestBody ExamPaper examPaper) {
        boolean save = examPaperService.save(examPaper);
        String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
        String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time) " +
            "values(" + "'" + examPaper.getId() + "'" + "," + "'" + examPaper.getExamName() + "'" + "," + "'" + examPaper.getExamType() +
            "'" + ","  +"'" + format + "'" + ")";
        FtpUtil.sqlFileUpload(s);
        return R.status(save);
    }

    /**
@@ -142,7 +148,6 @@
    @ApiOperationSupport(order = 8)
    @ApiOperation(value = "考试题目绑定", notes = "传入exam")
    public R setPagerSubject(@ApiParam(value = "主键集合") ExamPaper exam) {

        return R.status(true);
    }


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

@@ -29,10 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
import java.util.*;

/**
 * @author zhongrj
@@ -141,6 +138,8 @@
                        result = pre + (decimalFormat.format(count++));
                    }
                    user.setSecuritynumber(result);
                    //发证日期
                    user.setPaperTime(new Date());
                    //修改为持证保安
                    user.setHold("1");
                    //分配保安角色
@@ -155,6 +154,7 @@
                        "update blade_user set role_id = " + "'" +  user.getRoleId() + "'" +
                            ",hold = " + "'" + user.getHold() + "'" +
                            ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
                            ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
                            " " +"where id = " + "'" + user.getId() + "'";
                    FtpUtil.sqlFileUpload(s1);
                }

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

@@ -34,6 +34,7 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -262,6 +263,8 @@
                                    result = pre + (decimalFormat.format(count++));
                                }
                                user.setSecuritynumber(result);
                                //发证日期
                                user.setPaperTime(new Date());
                                //修改为持证保安
                                user.setHold("1");
                                //分配保安角色
@@ -276,6 +279,7 @@
                                    "update blade_user set role_id = " + "'" +  user.getRoleId() + "'" +
                                        ",hold = " + "'" + user.getHold() + "'" +
                                        ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
                                        ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
                                        " " +"where id = " + "'" + user.getId() + "'";
                                FtpUtil.sqlFileUpload(s1);
                            }

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

@@ -101,7 +101,7 @@
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "查看详情", notes = "传入id")
    @GetMapping("/detail")
    @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
//    @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
    public R<UserVO> detail(User user) {
        User detail = userService.getOne(Condition.getQueryWrapper(user));
        return R.data(UserWrapper.build().entityVO(detail));

 src/main/java/org/springblade/modules/system/entity/User.java

@@ -222,4 +222,12 @@
    private  String healstats;
    private  String soil;

    /**
     * 发证日期（保安证）
     */
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @TableField("paper_time")
    private Date paperTime;

}

 src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java

@@ -169,12 +169,15 @@
                //修改保安报名状态
                user.setIsTrain(2);
                userService.updateById(user);

                //数据同步
                cancelTrainingRegistrationSync(trainingRegistration,user);

                if (status){
                    return R.data(200,"取消报名成功");
                }

                //数据同步
                cancelTrainingRegistrationSync(trainingRegistration,user);


            }else {
                return R.data(201,"尚未报名");