huoran
/
msdw_tms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

成绩管理添加增加考核名称字段

Browse Source
hehai
rong.liu 4 years ago
parent 798802ccd8
commit fef86bbf6c
2 changed files with 56 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java
  2. 105
      src/main/resources/mapper/tms/AchievementManagementDao.xml

3
src/main/java/com/msdw/tms/entity/vo/AchievementManagementVO.java
Unescape View File

@ -20,6 +20,9 @@ public class AchievementManagementVO extends ExperimentalReportEntity {
//实验班级 //实验班级
private String experimentalClassName; private String experimentalClassName;
//实验名称
private String experimentalName;
//学生姓名 //学生姓名
private String userName; private String userName;

105
src/main/resources/mapper/tms/AchievementManagementDao.xml
Unescape View File

@ -432,36 +432,36 @@
ORDER BY hpm.creationTime DESC ORDER BY hpm.creationTime DESC
</select> </select>
<!-- <select id="newList" resultType="com.msdw.tms.entity.ResultsEntity">--> <!-- <select id="newList" resultType="com.msdw.tms.entity.ResultsEntity">-->
<!-- SELECT--> <!-- SELECT-->
<!-- et.id,--> <!-- et.id,-->
<!-- et.experimental_class_name AS experimentalClassName,--> <!-- et.experimental_class_name AS experimentalClassName,-->
<!-- et.experimental_name AS experimentalName,--> <!-- et.experimental_name AS experimentalName,-->
<!-- et.project_id AS projectId,--> <!-- et.project_id AS projectId,-->
<!-- pm.projectName,--> <!-- pm.projectName,-->
<!-- pm.projectPermissions,--> <!-- pm.projectPermissions,-->
<!-- et.creation_time AS creationTime,--> <!-- et.creation_time AS creationTime,-->
<!-- ( SELECT count( * ) FROM tms_experimental_report her WHERE et.id = her.projectId AND her.isdel = 0 ) AS number,--> <!-- ( SELECT count( * ) FROM tms_experimental_report her WHERE et.id = her.projectId AND her.isdel = 0 ) AS number,-->
<!-- et.is_del--> <!-- et.is_del-->
<!-- FROM--> <!-- FROM-->
<!-- tms_experimental_teaching et,--> <!-- tms_experimental_teaching et,-->
<!-- hr_project_management pm--> <!-- hr_project_management pm-->
<!-- WHERE--> <!-- WHERE-->
<!-- user_id = #{userId}--> <!-- user_id = #{userId}-->
<!-- AND et.project_id = pm.projectId--> <!-- AND et.project_id = pm.projectId-->
<!-- AND pm.isdel = 0--> <!-- AND pm.isdel = 0-->
<!-- <if test="searchContant!=null and searchContant!=''">and et.experimental_class_name like--> <!-- <if test="searchContant!=null and searchContant!=''">and et.experimental_class_name like-->
<!-- concat('%',#{searchContant},'%') or et.experimental_name like concat('%',#{searchContant},'%') or--> <!-- concat('%',#{searchContant},'%') or et.experimental_name like concat('%',#{searchContant},'%') or-->
<!-- pm.projectName like concat('%',#{searchContant},'%')--> <!-- pm.projectName like concat('%',#{searchContant},'%')-->
<!-- </if>--> <!-- </if>-->
<!-- <if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''">and et.creation_time between--> <!-- <if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''">and et.creation_time between-->
<!-- #{endTime} and #{startTime}--> <!-- #{endTime} and #{startTime}-->
<!-- </if>--> <!-- </if>-->
<!-- <if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;=--> <!-- <if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;=-->
<!-- date(et.creation_time)--> <!-- date(et.creation_time)-->
<!-- </if>--> <!-- </if>-->
<!-- ORDER BY et.creation_time DESC--> <!-- ORDER BY et.creation_time DESC-->
<!-- </select>--> <!-- </select>-->
<select id="newList" resultType="com.msdw.tms.entity.ResultsEntity"> <select id="newList" resultType="com.msdw.tms.entity.ResultsEntity">
SELECT SELECT
@ -579,28 +579,28 @@
AND sch.isdel = 0 AND sch.isdel = 0
AND ter.isdel = 0 AND ter.isdel = 0
AND tet.is_del = 0--> AND tet.is_del = 0-->
<!-- <select id="getTeachAchievement" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">--> <!-- <select id="getTeachAchievement" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">-->
<!-- SELECT schoolName,--> <!-- SELECT schoolName,-->
<!-- experimental_class_name,--> <!-- experimental_class_name,-->
<!-- userName,--> <!-- userName,-->
<!-- workNumber,--> <!-- workNumber,-->
<!-- r.score,--> <!-- r.score,-->
<!-- r.recordId,--> <!-- r.recordId,-->
<!-- report.reportId,--> <!-- report.reportId,-->
<!-- r.submitTime,--> <!-- r.submitTime,-->
<!-- stu.studentId,--> <!-- stu.studentId,-->
<!-- t.id as projectId--> <!-- t.id as projectId-->
<!-- FROM tms_experimental_teaching t--> <!-- FROM tms_experimental_teaching t-->
<!-- INNER JOIN tms_experimental_report report ON report.projectId = t.id--> <!-- INNER JOIN tms_experimental_report report ON report.projectId = t.id-->
<!-- INNER JOIN tms_project_record r ON r.recordId = report.eventId--> <!-- INNER JOIN tms_project_record r ON r.recordId = report.eventId-->
<!-- INNER JOIN hr_user_info u ON u.userId = r.userId--> <!-- INNER JOIN hr_user_info u ON u.userId = r.userId-->
<!-- INNER JOIN school s ON s.schoolId = u.schoolId--> <!-- INNER JOIN school s ON s.schoolId = u.schoolId-->
<!-- INNER JOIN student stu ON stu.userId = u.userId--> <!-- INNER JOIN student stu ON stu.userId = u.userId-->
<!-- WHERE t.id = #{id}--> <!-- WHERE t.id = #{id}-->
<!-- AND t.is_del = 0--> <!-- AND t.is_del = 0-->
<!-- AND report.isdel = 0--> <!-- AND report.isdel = 0-->
<!-- </select>--> <!-- </select>-->
<select id="getTeachAchievement" resultType="com.msdw.tms.entity.vo.AchievementManagementVO"> <select id="getTeachAchievement" resultType="com.msdw.tms.entity.vo.AchievementManagementVO">
SELECT schoolName, SELECT schoolName,
@ -612,7 +612,8 @@
report.reportId, report.reportId,
r.submitTime, r.submitTime,
stu.studentId, stu.studentId,
t.id as projectId t.id as projectId,
experimental_name as experimentalName
FROM tms_experimental_teaching t FROM tms_experimental_teaching t
INNER JOIN tms_experimental_report report ON report.projectId = t.id INNER JOIN tms_experimental_report report ON report.projectId = t.id
INNER JOIN tms_project_record r ON r.recordId = report.eventId INNER JOIN tms_project_record r ON r.recordId = report.eventId

Write Preview
Loading…
Cancel
Save