wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev-new' of http://47.92.113.182:3000/wangpeng/integrated_traffic into dev

dev
zhangyanli 2024-03-11 09:03:29 +08:00
parent 55617c2e0f 9af841b8c9
commit 91146e106c
5 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zcloud/controller/eduPlatformStudyResource/PlatformVideoCoursewareController.java
View File

@ -51,7 +51,7 @@ public class PlatformVideoCoursewareController extends BaseController {
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/list") @RequestMapping(value = "/list")
@RequiresPermissions("courseware:list") // @RequiresPermissions("courseware:list")
@ResponseBody @ResponseBody
public Object list(Page page) throws Exception { public Object list(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
@ -60,7 +60,7 @@ public class PlatformVideoCoursewareController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); 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()); //pd.put("TRAINTYPE", Jurisdiction.getCORPTRAINTYPE());
page.setPd(pd); page.setPd(pd);
List<PageData> varList = platformVideoCoursewareService.listByCorpinfo(page); //列出VideocoursewareCorpInfoRecord列表 List<PageData> varList = platformVideoCoursewareService.listByCorpinfo(page); //列出VideocoursewareCorpInfoRecord列表

12
src/main/java/com/zcloud/controller/eduStudy/ClassController.java
View File

@ -105,12 +105,12 @@ public class ClassController extends BaseController {
int classNum = 0; int classNum = 0;
PageData data = new PageData(); PageData data = new PageData();
//注意数据权限。企业看企业数据，机构看机构数据 //注意数据权限。企业看企业数据，机构看机构数据
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
if ("0".equals(Jurisdiction.getIS_MAIN())){ // if ("0".equals(Jurisdiction.getIS_MAIN())){
pd.put("USER_ID", Jurisdiction.getUSER_ID()); // pd.put("USER_ID", Jurisdiction.getUSER_ID());
data.put("USER_ID", Jurisdiction.getUSER_ID()); // data.put("USER_ID", Jurisdiction.getUSER_ID());
} // }
classNum = classService.getClassNum(data); classNum = classService.getClassNum(data);
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件

2
src/main/resources/mybatis/dsno3/eduArchives/ArchivesReviewUserMapper.xml
View File

@ -111,7 +111,9 @@
<include refid="tableName"></include> <include refid="tableName"></include>
f f
where f.ISDELETE = '0' where f.ISDELETE = '0'
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 --> <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') and NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
</if> </if>

8
src/main/resources/mybatis/dsno3/eduStudy/ClassMapper.xml
View File

@ -369,7 +369,6 @@
p.NAME POSTTYPE_NAME, p.NAME POSTTYPE_NAME,
t.NAME TRAININGTYPE_NAME, t.NAME TRAININGTYPE_NAME,
tlt.NAME TRAINLEVEL_NAME, tlt.NAME TRAINLEVEL_NAME,
e.NAME ENTERPRISENAME,
sd1.NAME as PROVINCE_NAME, sd1.NAME as PROVINCE_NAME,
sd2.NAME as CITY_NAME, sd2.NAME as CITY_NAME,
sd3.NAME as COUNTY_NAME, sd3.NAME as COUNTY_NAME,
@ -382,7 +381,6 @@
FROM FROM
<include refid="tableName"></include> <include refid="tableName"></include>
f 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_POST_TYPE p ON p.POSTTYPE_ID = f.POSTTYPE
LEFT JOIN BUS_TRAINING_TYPE t ON t.TRAININGTYPE_ID = f.TRAINTYPE LEFT JOIN BUS_TRAINING_TYPE t ON t.TRAININGTYPE_ID = f.TRAINTYPE
LEFT JOIN sys_dictionaries sd1 ON sd1.BIANMA = f.PROVINCE LEFT JOIN sys_dictionaries sd1 ON sd1.BIANMA = f.PROVINCE
@ -471,9 +469,6 @@
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 培训行业类型 --> <if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 培训行业类型 -->
AND f.CORPINFO_ID = #{pd.CORPINFO_ID} AND f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if> </if>
<if test="pd.USER_ID != null and pd.USER_ID != ''"><!-- 培训类型 -->
AND e.CREATOR = #{pd.USER_ID}
</if>
ORDER BY ORDER BY
f.CREATTIME DESC f.CREATTIME DESC
</select> </select>
@ -895,7 +890,7 @@
</select> </select>
<!--效果评估表--> <!--效果评估表-->
<select id="getEvaluation" resultType="com.zcloud.entity.PageData"> <select id="getEvaluation" resultType="com.zcloud.entity.PageData">
select e.NAME as ENTERPRISE_NAME, select
f.NAME as CLASS_NAME, f.NAME as CLASS_NAME,
f.START_TIME, f.START_TIME,
f.END_TIME, f.END_TIME,
@ -924,7 +919,6 @@
and CLASS_ID = f.CLASS_ID and CLASS_ID = f.CLASS_ID
and ISDELETE = 0) as STR_PASS_COUNT and ISDELETE = 0) as STR_PASS_COUNT
from bus_class f from bus_class f
left join bus_enterprise e on f.ENTERPRISE_ID = e.ENTERPRISE_ID
where f.CLASS_ID = #{CLASS_ID} where f.CLASS_ID = #{CLASS_ID}
</select> </select>

15
src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml
View File

@ -424,12 +424,6 @@
<if test="pd.KEYWORDS!= null and pd.KEYWORDS != ''"><!-- 关键词检索 --> <if test="pd.KEYWORDS!= null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and f.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') and f.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
</if> </if>
<if test="pd.ENTERPRISE_ID != null and pd.ENTERPRISE_ID != ''"><!-- 关键词检索 -->
and f.ENTERPRISE_ID = #{pd.ENTERPRISE_ID}
</if>
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.DEPARTMENT_ID!= null and pd.DEPARTMENT_ID != ''"><!-- 关键词检索 --> <if test="pd.DEPARTMENT_ID!= null and pd.DEPARTMENT_ID != ''"><!-- 关键词检索 -->
and f.DEPARTMENT_ID = #{pd.DEPARTMENT_ID} and f.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
</if> </if>
@ -452,6 +446,12 @@
<if test="pd.CLASS_ID!= null and pd.CLASS_ID != ''"><!-- 关键词检索 --> <if test="pd.CLASS_ID!= null and pd.CLASS_ID != ''"><!-- 关键词检索 -->
and f.CLASS_ID = #{pd.CLASS_ID} and f.CLASS_ID = #{pd.CLASS_ID}
</if> </if>
<if test="pd.PERSONNEL_TYPES!= null and pd.PERSONNEL_TYPES != ''"><!-- 关键词检索 -->
and f.PERSONNEL_TYPE IN
<foreach item="item" index="index" collection="pd.PERSONNEL_TYPES" open="(" separator="," close=")">
#{item}
</foreach>
</if>
group by f.STUDENT_ID group by f.STUDENT_ID
order by f.OPERATTIME desc order by f.OPERATTIME desc
</select> </select>
@ -483,7 +483,6 @@
IFNULL( max( CAST(ex.EXAMSCORE AS DECIMAL ( 10, 1 )) ), '无记录' ) EXAMSCORE, IFNULL( max( CAST(ex.EXAMSCORE AS DECIMAL ( 10, 1 )) ), '无记录' ) EXAMSCORE,
GROUP_CONCAT(DISTINCT cn.CURRICULUMNAME) CURRICULUMNAME GROUP_CONCAT(DISTINCT cn.CURRICULUMNAME) CURRICULUMNAME
FROM bus_student f 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 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_STAGESTUDENTRELATION ssr on ssr.STUDENT_ID = f.STUDENT_ID
LEFT JOIN BUS_CLASS c on c.CLASS_ID = f.CLASS_ID LEFT JOIN BUS_CLASS c on c.CLASS_ID = f.CLASS_ID
@ -556,7 +555,9 @@
<if test="USER_ID != null and USER_ID != ''"><!-- 培训类型 --> <if test="USER_ID != null and USER_ID != ''"><!-- 培训类型 -->
AND e.CREATOR = #{USER_ID} AND e.CREATOR = #{USER_ID}
</if> </if>
<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 培训类型 -->
and f.CORPINFO_ID = #{CORPINFO_ID} and f.CORPINFO_ID = #{CORPINFO_ID}
</if>
</select> </select>
<!-- 获取企业下所有学员数量 --> <!-- 获取企业下所有学员数量 -->