Merge remote-tracking branch 'origin/master'

tangzy

2021-11-25 a9ec32e3db22fa4f5f44fa2b68e92862c1f58a5d

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/FTP/monitor.java

@@ -19,7 +19,7 @@
    //private static String fileName = "nsql.json";


//    @Scheduled(cron = "*/30 * * * * ?")
    @Scheduled(cron = "*/30 * * * * ?")
    public static boolean isFTPFileExist() {

        FTPClient ftp = new FTPClient();

 src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml

@@ -6,7 +6,7 @@
    <select id="selectApplyPage" resultType="org.springblade.modules.apply.vo.ApplyVO">
        SELECT
        sa.id,sa.apply_status applyStatus,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
        sa.examination_type examinationType,sa.examination_mx examinationMx,sa.audit_status auditStatus,
        sa.examination_type examinationType,sa.examination_mx examinationMx,ke.audit_status auditStatus,
        ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
        bu.real_name realName,bu.is_apply isApply,
        bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard

 src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java

@@ -59,8 +59,10 @@
                            replyRealNameInfo = replyRealNameInfo.append(user.getRealName()).append(",");
                        }
                    }
                    //截取
                    noticeVO.setReceivedName(replyRealNameInfo.substring(0, replyRealNameInfo.length() - 1));
                    if (replyRealNameInfo.toString().length()>0) {
                        //截取
                        noticeVO.setReceivedName(replyRealNameInfo.substring(0, replyRealNameInfo.length() - 1));
                    }
                }
            });
        }

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

@@ -167,18 +167,18 @@
    public R submit(@Valid @RequestBody User user) {
        CacheUtil.clear(USER_CACHE);
        //资格审查
        String body = InvestigateUtil.httpGetOne(user.getCardid());
        JSONObject jsonObject = new JSONObject(body);
        String data = jsonObject.get("data").toString();
        JSONObject jsonData = new JSONObject(data);
        JSONArray res = jsonData.getJSONArray("res");
        if (res.length()==0){
            //没有数据正常
            user.setExaminationType("0");
        }else {
            user.setExaminationType("1");
            user.setExaminationMx(res.getJSONObject(0).get("zdrylbjh").toString());
        }
//        String body = InvestigateUtil.httpGetOne(user.getCardid());
//        JSONObject jsonObject = new JSONObject(body);
//        String data = jsonObject.get("data").toString();
//        JSONObject jsonData = new JSONObject(data);
//        JSONArray res = jsonData.getJSONArray("res");
//        if (res.length()==0){
//            //没有数据正常
//            user.setExaminationType("0");
//        }else {
//            user.setExaminationType("1");
//            user.setExaminationMx(res.getJSONObject(0).get("zdrylbjh").toString());
//        }
        return R.status(userService.submit(user));
    }