教学实验成绩报告数量修改

hehai
jiakun.lin 4 years ago
parent 88a5f68d65
commit da395c66d7
  1. 4
      src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
  2. 57
      src/main/resources/mapper/tms/AchievementManagementDao.xml

@ -110,6 +110,10 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
@Override @Override
public List<ResultsEntity> newList(ResultsVo vo, Integer page, Integer size) { public List<ResultsEntity> newList(ResultsVo vo, Integer page, Integer size) {
List<ResultsEntity> newList = achievementManagementDao.newList(vo); List<ResultsEntity> newList = achievementManagementDao.newList(vo);
for (ResultsEntity entity : newList) {
Integer number = achievementManagementDao.getTeachAchievement(entity.getId()).size();
entity.setNumber(number);
}
return newList; return newList;
} }

@ -432,6 +432,37 @@
ORDER BY hpm.creationTime DESC ORDER BY hpm.creationTime DESC
</select> </select>
<!-- <select id="newList" resultType="com.msdw.tms.entity.ResultsEntity">-->
<!-- SELECT-->
<!-- et.id,-->
<!-- et.experimental_class_name AS experimentalClassName,-->
<!-- et.experimental_name AS experimentalName,-->
<!-- et.project_id AS projectId,-->
<!-- pm.projectName,-->
<!-- pm.projectPermissions,-->
<!-- et.creation_time AS creationTime,-->
<!-- ( SELECT count( * ) FROM tms_experimental_report her WHERE et.id = her.projectId AND her.isdel = 0 ) AS number,-->
<!-- et.is_del-->
<!-- FROM-->
<!-- tms_experimental_teaching et,-->
<!-- hr_project_management pm-->
<!-- WHERE-->
<!-- user_id = #{userId}-->
<!-- AND et.project_id = pm.projectId-->
<!-- AND pm.isdel = 0-->
<!-- <if test="searchContant!=null and searchContant!=''">and et.experimental_class_name like-->
<!-- concat('%',#{searchContant},'%') or et.experimental_name like concat('%',#{searchContant},'%') or-->
<!-- pm.projectName like concat('%',#{searchContant},'%')-->
<!-- </if>-->
<!-- <if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''">and et.creation_time between-->
<!-- #{endTime} and #{startTime}-->
<!-- </if>-->
<!-- <if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;=-->
<!-- date(et.creation_time)-->
<!-- </if>-->
<!-- ORDER BY et.creation_time DESC-->
<!-- </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,
@ -441,7 +472,6 @@
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,
et.is_del et.is_del
FROM FROM
tms_experimental_teaching et, tms_experimental_teaching et,
@ -462,7 +492,6 @@
</if> </if>
ORDER BY et.creation_time DESC ORDER BY et.creation_time DESC
</select> </select>
<select id="reportList" resultType="com.msdw.tms.entity.ReportEntity"> <select id="reportList" resultType="com.msdw.tms.entity.ReportEntity">
SELECT hui.userId,her.reportId,hui.userName as SELECT hui.userId,her.reportId,hui.userName as
studentName,s.schoolName,stu.workNumber,her.score,her.creationTime studentName,s.schoolName,stu.workNumber,her.score,her.creationTime
@ -550,6 +579,29 @@
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 schoolName,-->
<!-- experimental_class_name,-->
<!-- userName,-->
<!-- workNumber,-->
<!-- r.score,-->
<!-- r.recordId,-->
<!-- report.reportId,-->
<!-- r.submitTime,-->
<!-- stu.studentId,-->
<!-- t.id as projectId-->
<!-- FROM tms_experimental_teaching t-->
<!-- INNER JOIN tms_experimental_report report ON report.projectId = t.id-->
<!-- INNER JOIN tms_project_record r ON r.recordId = report.eventId-->
<!-- INNER JOIN hr_user_info u ON u.userId = r.userId-->
<!-- INNER JOIN school s ON s.schoolId = u.schoolId-->
<!-- INNER JOIN student stu ON stu.userId = u.userId-->
<!-- WHERE t.id = #{id}-->
<!-- AND t.is_del = 0-->
<!-- AND report.isdel = 0-->
<!-- </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,
experimental_class_name, experimental_class_name,
@ -568,7 +620,6 @@
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 report.isdel = 0 AND report.isdel = 0
</select> </select>

Loading…
Cancel
Save