src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -334,4 +334,14 @@ cjhz.put("sccj",sccj); return R.data(cjhz); } /** * 自定义分页 * * @param query page,size */ @GetMapping("/score-page") public R<IPage<ExamScoreVO>> scorePage(Query query, String deptid, String jurisdiction) { IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),deptid,jurisdiction); return R.data(pages); } } src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.java
@@ -56,5 +56,13 @@ * @param examScore * @return */ int updateByIdAndQualifiee(@Param("examScore") ExamScore examScore); /** * 自定义分页 * * @param page 分页 * @return */ List<ExamScoreVO> scorePage(IPage page,String deptid,String jurisdiction); } src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -236,4 +236,22 @@ <update id="updateByIdAndQualifiee"> update exam_score set qualified = #{examScore.qualified} where id = #{examScore.id} </update> <select id="scorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO"> SELECT exam.*, user.jurisdiction, user.dept_id FROM exam_score exam LEFT JOIN blade_user user ON exam.user_id = user.id WHERE 1 = 1 <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'"> AND user.jurisdiction = #{jurisdiction} </if> <if test="deptid!=null and deptid!=''"> AND user.dept_id = #{deptid} </if> </select> </mapper> src/main/java/org/springblade/modules/exam/service/ExamScoreService.java
@@ -53,4 +53,11 @@ * @return */ boolean updateByIdAndQualifiee(ExamScore examScore); /** * 自定义分页 * * @param page 分页 * @return */ IPage<ExamScoreVO> scorePage(IPage page,String deptid,String jurisdiction); } src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
@@ -333,4 +333,9 @@ } return false; } @Override public IPage<ExamScoreVO> scorePage(IPage page, String deptid, String jurisdiction) { return page.setRecords(baseMapper.scorePage(page,deptid,jurisdiction)); } } src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -329,9 +329,9 @@ Integer a = Integer.valueOf(numj); String numz = lists.get(i).get("numz").toString(); Integer b = Integer.valueOf(numz); Integer c = b - a; //Integer c = b - a; map.put("numj", a); map.put("nmuwj", c); map.put("nmuwj", b); list.add(map); } return R.data(list); src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -150,9 +150,12 @@ FROM ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 0 and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 0 and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id ) A ON H.departmentid = A.dept_id LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE (u.examination_type = 1 or u.examination_type is null ) and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE (u.examination_type = 1 or u.examination_type is null ) and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id ) B ON H.departmentid = B.dept_id where 1=1 <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'"> and H.jurisdiction = #{jurisdiction} @@ -193,7 +196,7 @@ FROM blade_user WHERE role_id = '1412226235153731586' role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 AND hold = 2 @@ -251,7 +254,7 @@ AND dispatch = 1 GROUP BY dept_id ) B ON H.departmentid = B.dept_id where 1=1 ) B ON H.departmentid = B.dept_id where 1=1 <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'"> and H.jurisdiction = #{jurisdiction} </if> @@ -262,13 +265,14 @@ <select id="selectSoil" resultType="java.util.HashMap"> SELECT IFNULL(A.numj, 0) as numj, IFNULL(B.numz, 0) as numz IFNULL(B.numwj, 0) as numz FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H LEFT JOIN (SELECT COUNT(*) AS numj, dept_id FROM blade_user WHERE soil = 0 AND `status` = 1 AND is_deleted = 0 WHERE soil = 0 AND `status` = 1 AND is_deleted = 0 AND role_id = '1412226235153731586' GROUP BY dept_id) A ON A.dept_id = H.departmentid LEFT JOIN (SELECT COUNT(*) AS numz, dept_id FROM blade_user WHERE `status` = 1 AND is_deleted = 0 GROUP BY LEFT JOIN (SELECT COUNT(*) AS numwj, dept_id FROM blade_user WHERE soil = 1 and `status` = 1 AND is_deleted = 0 AND role_id = '1412226235153731586' GROUP BY dept_id) B ON H.departmentid = B.dept_id where 1=1 <if test="deptid!=null and deptid!=''">