处理2022-10-18之前靶向作业分析数据

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paper/PaperController.java

@@ -308,13 +308,28 @@ public class PaperController {
         return new ResultVo(0, "获取批阅班级列表成功", list);
     }
 
-    //该方法用于重新生成之前的作业报告
+    /*
+    * @Description 该方法用于重新生成之前的作业报告
+    * @Author WN
+    * @Date 2022/10/18 15:34:21
+    */
     @GetMapping("/hpa")
     public ResultVo handlePaperAnalyze(Integer paperid) {
         paperService.listPapersForAnalyze(paperid);
         return new ResultVo(0, "成功处理作业分析");
     }
 
+    /*
+    * @Description 处理第一次（上方法）未处理靶向作业
+    * @Author WN
+    * @Date 2023/5/31 15:15:03
+    */
+    @GetMapping("/hpa2")
+    public ResultVo handlePaperAnalyze2(Integer paperid) {
+        paperService.listPapersForAnalyze2(paperid);
+        return new ResultVo(0, "成功处理作业分析");
+    }
+
     //获取作业中听力文件
     @PostMapping("/hfile")
     public ResultVo getPaperHearfile(@RequestBody TPaper paper) {

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paper/PaperMapper.java

@@ -152,6 +152,8 @@ public interface PaperMapper extends TkMapper<TPaper> {
 
     //获取所有试卷用于重新生成分析
     List<TPaper> listPapersForAnalyze(@Param("paperid") Integer paperid);
+    //获取未生成知识点靶向试卷用于重新生成分析
+    List<TPaper> listPapersForAnalyze2(@Param("paperid") Integer paperid);
 
     //获取作业听力文件
     String getHearfileByPaperid(@Param("paperid") Integer paperid);

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperService.java

@@ -1202,7 +1202,7 @@ public class PaperService {
     public void listPapersForAnalyze(Integer paperid){
         List<TPaper> papers = paperMapper.listPapersForAnalyze(paperid);
         for(TPaper p : papers){
-            if(p.getPapertype() == 1){
+            if(p.getPapertype() == 1 || p.getPapertype() == 3){
                 //题库
                 this.generatePaperAnalyze(p);
             }else{
@@ -1216,6 +1216,13 @@ public class PaperService {
             }
         }
     }
+    public void listPapersForAnalyze2(Integer paperid){
+        List<TPaper> papers = paperMapper.listPapersForAnalyze2(paperid);
+        for(TPaper p : papers){
+            //题库
+            this.generatePaperAnalyze(p);
+        }
+    }
 
     //获取作业听力文件地址
     public String getHearfileByPaperid(Integer paperid){

sstudy/src/main/resources/mapper/paper/PaperMapper.xml

@@ -399,6 +399,15 @@
         </if>
         order by paperid
     </select>
+    <!--获获取未生成知识点靶向试卷用于重新生成分析-->
+    <select id="listPapersForAnalyze2" resultType="com.xhkjedu.sstudy.model.paper.TPaper">
+        select p.* from t_paper_analyze a left join t_paper p on a.paperid=p.paperid
+        where p.papertype=3 and (pointjson is null or pointjson='')
+        <if test="paperid!=null and paperid!=''">
+            and p.paperid=#{paperid}
+        </if>
+        order by p.paperid
+    </select>
 
     <!--获取作业听力文件-->
     <select id="getHearfileByPaperid" resultType="java.lang.String">