From 9af841b8c97185b10bf955cee90484d77d2ccf7f Mon Sep 17 00:00:00 2001 From: zhangqihang Date: Fri, 8 Mar 2024 18:01:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=9F=B9=E5=8E=BB=E9=99=A4=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BC=81=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlatformVideoCoursewareController.java | 4 ++-- .../controller/eduStudy/ClassController.java | 12 ++++++------ .../eduArchives/ArchivesReviewUserMapper.xml | 4 +++- .../mybatis/dsno3/eduStudy/ClassMapper.xml | 8 +------- .../mybatis/dsno3/eduStudy/StudentMapper.xml | 17 +++++++++-------- 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/zcloud/controller/eduPlatformStudyResource/PlatformVideoCoursewareController.java b/src/main/java/com/zcloud/controller/eduPlatformStudyResource/PlatformVideoCoursewareController.java index f36d774..5ebd28a 100644 --- a/src/main/java/com/zcloud/controller/eduPlatformStudyResource/PlatformVideoCoursewareController.java +++ b/src/main/java/com/zcloud/controller/eduPlatformStudyResource/PlatformVideoCoursewareController.java @@ -51,7 +51,7 @@ public class PlatformVideoCoursewareController extends BaseController { * @throws Exception */ @RequestMapping(value = "/list") - @RequiresPermissions("courseware:list") +// @RequiresPermissions("courseware:list") @ResponseBody public Object list(Page page) throws Exception { Map map = new HashMap(); @@ -60,7 +60,7 @@ public class PlatformVideoCoursewareController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); +// pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //pd.put("TRAINTYPE", Jurisdiction.getCORPTRAINTYPE()); page.setPd(pd); List varList = platformVideoCoursewareService.listByCorpinfo(page); //列出VideocoursewareCorpInfoRecord列表 diff --git a/src/main/java/com/zcloud/controller/eduStudy/ClassController.java b/src/main/java/com/zcloud/controller/eduStudy/ClassController.java index af1936d..6528ef0 100644 --- a/src/main/java/com/zcloud/controller/eduStudy/ClassController.java +++ b/src/main/java/com/zcloud/controller/eduStudy/ClassController.java @@ -105,12 +105,12 @@ public class ClassController extends BaseController { int classNum = 0; PageData data = new PageData(); //注意数据权限。企业看企业数据，机构看机构数据 - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - if ("0".equals(Jurisdiction.getIS_MAIN())){ - pd.put("USER_ID", Jurisdiction.getUSER_ID()); - data.put("USER_ID", Jurisdiction.getUSER_ID()); - } +// pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); +// data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); +// if ("0".equals(Jurisdiction.getIS_MAIN())){ +// pd.put("USER_ID", Jurisdiction.getUSER_ID()); +// data.put("USER_ID", Jurisdiction.getUSER_ID()); +// } classNum = classService.getClassNum(data); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 diff --git a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewUserMapper.xml b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewUserMapper.xml index a510fe7..1b73b57 100644 --- a/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewUserMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewUserMapper.xml @@ -111,7 +111,9 @@ f where f.ISDELETE = '0' - and f.CORPINFO_ID = #{pd.CORPINFO_ID} + + and f.CORPINFO_ID = #{pd.CORPINFO_ID} + and NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') diff --git a/src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml index 8a2a0fb..9a3af68 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml @@ -369,7 +369,6 @@ p.NAME POSTTYPE_NAME, t.NAME TRAININGTYPE_NAME, tlt.NAME TRAINLEVEL_NAME, - e.NAME ENTERPRISENAME, sd1.NAME as PROVINCE_NAME, sd2.NAME as CITY_NAME, sd3.NAME as COUNTY_NAME, @@ -382,7 +381,6 @@ FROM f - LEFT JOIN BUS_ENTERPRISE e ON e.ENTERPRISE_ID = f.ENTERPRISE_ID LEFT JOIN BUS_POST_TYPE p ON p.POSTTYPE_ID = f.POSTTYPE LEFT JOIN BUS_TRAINING_TYPE t ON t.TRAININGTYPE_ID = f.TRAINTYPE LEFT JOIN sys_dictionaries sd1 ON sd1.BIANMA = f.PROVINCE @@ -471,9 +469,6 @@ AND f.CORPINFO_ID = #{pd.CORPINFO_ID} - - AND e.CREATOR = #{pd.USER_ID} - ORDER BY f.CREATTIME DESC @@ -895,7 +890,7 @@ diff --git a/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml index 9f8aa2a..603fcf7 100644 --- a/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml +++ b/src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml @@ -424,12 +424,6 @@ and f.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') - - and f.ENTERPRISE_ID = #{pd.ENTERPRISE_ID} - - - and f.CORPINFO_ID = #{pd.CORPINFO_ID} - and f.DEPARTMENT_ID = #{pd.DEPARTMENT_ID} @@ -452,6 +446,12 @@ and f.CLASS_ID = #{pd.CLASS_ID} + + and f.PERSONNEL_TYPE IN + + #{item} + + group by f.STUDENT_ID order by f.OPERATTIME desc @@ -483,7 +483,6 @@ IFNULL( max( CAST(ex.EXAMSCORE AS DECIMAL ( 10, 1 )) ), '无记录' ) EXAMSCORE, GROUP_CONCAT(DISTINCT cn.CURRICULUMNAME) CURRICULUMNAME FROM bus_student f - left join bus_enterprise e on f.ENTERPRISE_ID = e.ENTERPRISE_ID LEFT JOIN SYS_DICTIONARIES doe on doe.DICTIONARIES_ID = f.DEGREE_OF_EDUCATION LEFT JOIN BUS_STAGESTUDENTRELATION ssr on ssr.STUDENT_ID = f.STUDENT_ID LEFT JOIN BUS_CLASS c on c.CLASS_ID = f.CLASS_ID @@ -556,7 +555,9 @@ AND e.CREATOR = #{USER_ID} - and f.CORPINFO_ID = #{CORPINFO_ID} + + and f.CORPINFO_ID = #{CORPINFO_ID} +