修改 学生同步 、评价统计

src/main/java/com/xjrsoft/module/hikvision/util/DataUtil.java

@@ -357,7 +357,8 @@ public class DataUtil {
                     Entity entity = Entity.create(tableName);
                     entity.set("table_name", tableName);
                     entity.set("create_date", sdf.format(new Date()));
-                    entity.set("source_id", clientMap.get(paramJson.get("clientId").getAsInt()));
+//                    entity.set("source_id", clientMap.get(paramJson.get("clientId").getAsInt()));
+                    entity.set("source_id", paramJson.get("personId").getAsString());
                     entity.set("hikvision_id", paramJson.get("personId").getAsString());
                     entity.set("send_data", paramJson.toString());
                     insertList.add(entity);
@@ -373,11 +374,12 @@ public class DataUtil {
             }
         }
 
+        tableName = "hikvision_data";
+
         if (!insertList.isEmpty()) {
             SqlRunnerAdapter.db().dynamicInsertBatch(tableName, insertList);
         }
 
-        tableName = "hikvision_data";
         apiPath = "/api/resource/v1/person/single/update";
         for (JsonObject paramJson : updateList) {
             Thread.sleep(500);

src/main/resources/mapper/assessment/AssessmentPlanAnswerResultMapper.xml

@@ -28,8 +28,14 @@
     </select>
 
     <select id="getQuestionResult" resultType="com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerDetailVo">
-        SELECT question_id,answer_id,COUNT(*) AS choose_count FROM assessment_plan_answer_result WHERE delete_mark = 0 AND assessment_template_plan_id = #{id}
-        GROUP BY question_id,answer_id
+        SELECT  t1.question_id, t1.answer_id,COUNT(*) AS choose_count
+        FROM assessment_plan_answer_result t1
+        INNER JOIN base_student_school_roll t2 ON t1.student_user_id = t2.user_id
+        INNER JOIN assessment_template_plan t3 ON t1.assessment_template_plan_id = t3.id
+        WHERE t1.delete_mark = 0 AND t1.assessment_template_plan_id = #{id}
+        AND t3.stduy_status like concat('%', t2.stduy_status,'%')
+        AND t2.archives_status = 'FB2901'
+        GROUP BY  t1.question_id, t1.answer_id
     </select>
     <select id="getTextQuestionResult" resultType="com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerDetailVo">
         SELECT t1.* FROM assessment_plan_answer_result t1