Merge branch 'master' of https://git.czcyedu.com/huoran/msdw_tms

src/main/java/com/msdw/tms/entity/vo/StudentVo.java

@@ -40,6 +40,8 @@ public class StudentVo extends StudentEntity {
     private String schoolAppellationName;
     //绑定所属院校id
     private Integer schoolAppellationId;
+    //学生学号
+    private String workNumber;
     //token
     private String token;
 }

src/main/resources/mapper/tms/ExperimentalTeachingDao.xml

@@ -55,7 +55,19 @@
         experimental_name,
         project_id,
         project_name,
-        ( SELECT count( * ) FROM tms_project_record WHERE projectId = project_id AND tms_project_record.isdel = 0 ) AS experimental_number,
+        (
+        SELECT
+        count( * )
+        FROM
+        tms_project_record tpr,
+        tms_experimental_report ter
+        WHERE
+        tpr.projectId = t.project_id
+        AND ter.eventId = tpr.recordId
+        AND ter.projectId = t.id
+        AND tpr.isdel = 0
+        AND ter.isdel = 0
+        ) AS experimental_number,
         experiment_duration,
         type,
         start_time,

src/main/resources/mapper/tms/ProjectRecordDao.xml

@@ -107,8 +107,9 @@
         FROM tms_project_record tpr
                  LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
                  LEFT JOIN tms_experimental_teaching tet ON tpr.projectId = tet.project_id
+                 LEFT JOIN tms_experimental_report ter ON ter.projectId = tet.id
         WHERE tpr.userId = #{userid}
-          AND tpr.isdel = #{isdel}
+          AND ter.eventId = tpr.recordId
           AND tpr.projectId = tet.project_id
           AND tp.projectPermissions != 0
         ORDER BY
@@ -185,8 +186,10 @@
                recordState
         FROM tms_project_record tpr
                  LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
+                 LEFT JOIN tms_experimental_report re ON re.eventId = tpr.recordId
         WHERE tpr.userId = #{userid}
-          AND tpr.isdel = #{isdel}
+--         注释掉报错，>=表示是否删除都导出
+          AND tpr.isdel >= #{isdel}
           AND tp.projectPermissions = 0
     </select>
     <select id="queryReport" resultType="com.msdw.tms.entity.ProjectRecordEntity">

src/main/resources/mapper/tms/StudentDao.xml

@@ -29,7 +29,7 @@
 		u.disableAccount,
 		u.lastLoginTime,
 		s.roleId,
-		s.workNumber,
+		s.workNumber as workNumber,
 		s.isdel,
 		s.studentId
 		FROM
@@ -43,7 +43,7 @@
 		AND u.isdel = 0
 		AND l.isdel = 0
 		AND s.isdel = 0
-		<if test="searchContent!=null">AND (u.account LIKE CONCAT('%',#{searchContent},'%') OR u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%'))</if>
+		<if test="searchContent!=null">AND (l.schoolName LIKE CONCAT('%',#{searchContent},'%') OR u.userName LIKE CONCAT('%',#{searchContent},'%'))</if>
 		ORDER BY studentId DESC
 	</select>