派遣，考试，工作汇报修改

Administrator

2021-12-04 f7115db7eb622bcd2dd4ec62ce6f2b380a46bc08

派遣，考试，工作汇报修改

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

@@ -199,7 +199,7 @@
    <!--获取准考证信息(正式考试)-->
    <select id="getApplyInfo" resultType="org.springblade.modules.apply.vo.ApplyPaPerVO">
        SELECT
            sa.id,sa.candidate_no candidateNo,
            sa.id,sa.candidate_no candidateNo,sa.apply_code applyCode,
            ke.exam_type examType,ke.start_time startTime,ke.end_time endTime,ke.exam_name examName,
            bu.real_name realName,bu.cardid idCardNo,ifnull(bu.sex,0) sex,bu.avatar myPicture,
            bd.dept_name deptName,"保安证" applyCard,

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

@@ -254,8 +254,10 @@
                        "update blade_user set dispatch = " + "'" + user1.getDispatch() + "'" +
                            " " +"where id = " + "'" + user1.getId() + "'";
                    FtpUtil.sqlFileUpload(s1);
                }else {
                    //修改
                    status = dispatcherService.updateById(dispatcher);
                }

        }
        return R.status(status);
    }

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

@@ -336,6 +336,19 @@
    }

    /**
     * 考试合格人数对比统计
     */
    @GetMapping("score-stat")
    @ApiOperation(value = "分数统计")
    public R scoreStat(HttpServletResponse response, String deptid, String jurisdiction) {
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials", "true");
        List<Object> mapList = examScoreService.scoreStat(deptid, jurisdiction);
        return R.data(mapList);
    }

    /**
     * 自定义分页
     *
     * @param query     page,size

 src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml

@@ -235,10 +235,17 @@

    <!--查询当前考试的报名人员数量-->
    <select id="getApplyNumber" resultType="java.lang.Integer">
        select count(*) from sys_apply
        where
        exam_id = #{examPaper.id}
        and apply_status = 2
        select sum(a) from(
            select count(*) a from sys_apply
            where
            exam_id = #{examPaper.id}
            union all
            (
            select count(*) a from sys_training_registration
            where
            train_exam_id = #{examPaper.id}
            )
        ) c
    </select>

    <!--查询当前考试的报名人员数量，模拟考试-->

 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.java

@@ -65,4 +65,12 @@
     * @return
     */
    int updateByIdAndQualifiee(@Param("examScore") ExamScore examScore);

    /**
     * 考试合格人数对比
     * @param deptid
     * @param jurisdiction
     * @return
     */
    List<Object> scoreStat(String deptid, String jurisdiction);
}

 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml

@@ -30,7 +30,7 @@
        sa.id = es.apply_id
        where
        1=1
        and (sa.is_exam = 2 or sa.is_exam = 3)
        and ke.exam_type = 1
        <if test="examScore.examName!=null and  examScore.examName!=''">
            and ke.exam_name like concat('%', #{examScore.examName},'%')
        </if>
@@ -272,4 +272,14 @@
    <update id="updateByIdAndQualifiee">
        update exam_score set qualified = #{examScore.qualified} where id = #{examScore.id}
    </update>


    <!--考试合格人数对比-->
    <select id="scoreStat" resultType="java.lang.Object">
        select count(*) from exam_score where 1=1
        union all
        (select count(*) from exam_score where qualified =0)
        union all
        (select count(*) from exam_score where qualified !=0)
    </select>
</mapper>

 src/main/java/org/springblade/modules/exam/service/ExamScoreService.java

@@ -60,4 +60,12 @@
     * @return
     */
    boolean updateByIdAndQualifiee(ExamScore examScore);

    /**
     * 考试合格人数对比
     * @param deptid
     * @param jurisdiction
     * @return
     */
    List<Object> scoreStat(String deptid, String jurisdiction);
}

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

@@ -343,4 +343,15 @@
        }
        return false;
    }

    /**
     * 考试合格人数对比
     * @param deptid
     * @param jurisdiction
     * @return
     */
    @Override
    public List<Object> scoreStat(String deptid, String jurisdiction) {
        return baseMapper.scoreStat(deptid,jurisdiction);
    }
}

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

@@ -151,7 +151,9 @@
     */
    List<Map<String, Object>> getWorkReportInfo(@Param("type")String type,
                                                @Param("deptid")String deptid,
                                                @Param("jurisdiction")String jurisdiction);    /**
                                                @Param("jurisdiction")String jurisdiction);

    /**
     * 工作汇报人员(向民警)
     * @param deptid
     * @param jurisdiction

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

@@ -80,9 +80,6 @@
        br.id = bu.role_id
        where
        bu.is_deleted = 0
        and bd.parent_id!=1425365577303621633
        and bd.id != 1425365577303621633
        and bd.id != 1432625856013971457
        <if test="user.account!=null and user.account != ''">
            and bu.account like concat('%', #{user.account},'%')
        </if>
@@ -450,6 +447,7 @@
        sys_dispatcher_unit sdu
        on
        sdu.id = sd.dispatcher_unit_id
        left join
        where
        bu.dispatch =0
        and bu.status = 1

 src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java

@@ -98,7 +98,7 @@
    public R submit(@RequestBody WorkReport workReport){
        boolean status = false;
        if (null==workReport.getId()){
            workReport.setReportTime(new Date());
//            workReport.setReportTime(new Date());
            workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
            //新增
            status = workReportService.save(workReport);
@@ -120,26 +120,26 @@
        }else {
            workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
            if (null==workReport.getReplyTime()){
                workReport.setReplyTime(new Date());
//                workReport.setReplyTime(new Date());
            }

            //修改
            status = workReportService.updateById(workReport);

            //内网同步
            String s1 =
                "update sys_work_report set type = " + "'" + workReport.getType() + "'" +
                    ",content = " + "'" + workReport.getContent() + "'" +
                    ",work_desc = " + "'" + workReport.getWorkDesc() + "'" +
                    ",received_ids = " + "'" + workReport.getReceivedIds() + "'" +
                    ",reply_content = " + "'" + workReport.getReplyContent() + "'" +
                    ",reply_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(workReport.getReplyTime()) + "'" +
                    ",dept_id = " + "'" + workReport.getDeptId() + "'" +
                    ",reply_dept_ids = " + "'" + workReport.getReplyDeptIds() + "'" +
                    ",category = " + "'" + workReport.getCategory() + "'" +
                    ",user_id = " + "'" + workReport.getUserId() + "'" +
                    " " +"where id = " + "'" + workReport.getId() + "'";
            FtpUtil.sqlFileUpload(s1);
//            String s1 =
//                "update sys_work_report set type = " + "'" + workReport.getType() + "'" +
//                    ",content = " + "'" + workReport.getContent() + "'" +
//                    ",work_desc = " + "'" + workReport.getWorkDesc() + "'" +
//                    ",received_ids = " + "'" + workReport.getReceivedIds() + "'" +
//                    ",reply_content = " + "'" + workReport.getReplyContent() + "'" +
//                    ",reply_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(workReport.getReplyTime()) + "'" +
//                    ",dept_id = " + "'" + workReport.getDeptId() + "'" +
//                    ",reply_dept_ids = " + "'" + workReport.getReplyDeptIds() + "'" +
//                    ",category = " + "'" + workReport.getCategory() + "'" +
//                    ",user_id = " + "'" + workReport.getUserId() + "'" +
//                    " " +"where id = " + "'" + workReport.getId() + "'";
//            FtpUtil.sqlFileUpload(s1);
        }
        return R.status(status);
    }