导出增加误报词

ruoyi-admin/src/main/resources/application.yml

@@ -107,7 +107,7 @@ shiro:
     # 首页地址
     indexUrl: /index
     # 验证码开关
-    captchaEnabled: false
+    captchaEnabled: true
     # 验证码类型 math 数字计算 char 字符验证
     captchaType: math
   cookie:

ruoyi-admin/src/main/resources/mapper/project/TrsResultsLogMapper.xml

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectTrsResultsLogExportList" parameterType="TrsResultsLog" resultType="com.ruoyi.project.domain.TrsResultsLogAdmin">
-        select t.title,t.content,t.errortype,t.status,w.content as scontent,w.wrong_word,w.error_type,w.error_grade,w.correct_word,w.source
+        select t.id,t.title,t.content,t.errortype,t.status,w.content as scontent,w.wrong_word,w.error_type,w.error_grade,w.correct_word,w.source
         from trs_results_log t
         left join trs_word_results w on t.id=w.log_id
         <if test="params.dataScope != null and params.dataScope != ''">

ruoyi-project/src/main/java/com/ruoyi/project/controller/TrsResultsLogController.java

@@ -1,12 +1,15 @@
 package com.ruoyi.project.controller;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import com.ruoyi.project.domain.TrsFileInfo;
-import com.ruoyi.project.domain.TrsResultsLogAdmin;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.project.domain.*;
+import com.ruoyi.project.service.ITrsWordResultsService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.project.domain.TrsResultsLog;
 import com.ruoyi.project.service.ITrsResultsLogService;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -38,6 +40,9 @@ public class TrsResultsLogController extends BaseController
     @Autowired
     private ITrsResultsLogService trsResultsLogService;
 
+    @Autowired
+    private ITrsWordResultsService trsWordResultsService;
+
     @RequiresPermissions("project:resultlog:view")
     @GetMapping()
     public String resultlog()
@@ -68,8 +73,28 @@ public class TrsResultsLogController extends BaseController
     public AjaxResult export(TrsResultsLog trsResultsLog)
     {
         List<TrsResultsLog> list = trsResultsLogService.selectTrsResultsLogList(trsResultsLog);
-        ExcelUtil<TrsResultsLog> util = new ExcelUtil<TrsResultsLog>(TrsResultsLog.class);
-        return util.exportExcel(list, "审校日志数据");
+        //增加列
+        List<TrsResultsLogResVo> list2 = new ArrayList<>();
+        for (TrsResultsLog trsResultsLog1 : list) {
+            TrsResultsLogResVo trsResultsLogResVo = new TrsResultsLogResVo();
+            BeanUtils.copyBeanProp(trsResultsLogResVo, trsResultsLog1);
+
+            TrsWordResults trsWordResults = new TrsWordResults();
+            trsWordResults.setLogId(trsResultsLog1.getId());
+            List<TrsWordResults> resultsList = trsWordResultsService.selectTrsWordResultsList(trsWordResults);
+
+            TrsWordResults trsWordResults2 = new TrsWordResults();
+            trsWordResults2.setLogId(trsResultsLog1.getId());
+            trsWordResults2.setRes(1);
+            List<TrsWordResults> resultsListWb = trsWordResultsService.selectTrsWordResultsList(trsWordResults2);
+
+
+            trsResultsLogResVo.setErrnum(resultsList.size()+"");
+            trsResultsLogResVo.setWbnum(resultsListWb.size()+"");
+            list2.add(trsResultsLogResVo);
+        }
+        ExcelUtil<TrsResultsLogResVo> util = new ExcelUtil<TrsResultsLogResVo>(TrsResultsLogResVo.class);
+        return util.exportExcel(list2, "审校日志数据");
     }
 
     /**
@@ -82,8 +107,24 @@ public class TrsResultsLogController extends BaseController
     public AjaxResult exportadmin(TrsResultsLog trsResultsLog)
     {
         List<TrsResultsLogAdmin> list = trsResultsLogService.selectTrsResultsLogExportList(trsResultsLog);
+        List list2 = new ArrayList();
+        for (TrsResultsLogAdmin trsResultsLog1 : list) {
+            TrsWordResults trsWordResults = new TrsWordResults();
+            trsWordResults.setLogId(trsResultsLog1.getId());
+            List<TrsWordResults> resultsList = trsWordResultsService.selectTrsWordResultsList(trsWordResults);
+
+            TrsWordResults trsWordResults2 = new TrsWordResults();
+            trsWordResults2.setLogId(trsResultsLog1.getId());
+            trsWordResults2.setRes(1);
+            List<TrsWordResults> resultsListWb = trsWordResultsService.selectTrsWordResultsList(trsWordResults2);
+
+            trsResultsLog1.setErrnum(resultsList.size()+"");
+            trsResultsLog1.setWbnum(resultsListWb.size()+"");
+            list2.add(trsResultsLog1);
+        }
+
         ExcelUtil<TrsResultsLogAdmin> util = new ExcelUtil<TrsResultsLogAdmin>(TrsResultsLogAdmin.class);
-        return util.exportExcel(list, "审校日志数据");
+        return util.exportExcel(list2, "审校日志数据");
     }
 
     /**

ruoyi-project/src/main/java/com/ruoyi/project/domain/TrsResultsLogAdmin.java

@@ -42,6 +42,16 @@ public class TrsResultsLogAdmin extends BaseEntity
     private String correct_word;
     @Excel(name = "来源")
     private String source;
+    @Excel(name = "时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date time;
+
+
+
+    @Excel(name = "错词数量")
+    private String errnum;
+
+    @Excel(name = "误报词数量")
+    private String wbnum;
 
 
 }

ruoyi-project/src/main/java/com/ruoyi/project/domain/TrsResultsLogResVo.java

@@ -0,0 +1,178 @@
+package com.ruoyi.project.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 审校日志对象 trs_results_log
+ * 
+ * @author ruoyi
+ * @date 2025-03-28
+ */
+public class TrsResultsLogResVo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String title;
+
+    /** 内容 */
+    private String content;
+
+    /** 审校状态 */
+    @Excel(name = "审校状态")
+    private String status;
+
+    /** 错误类型 */
+    @Excel(name = "错误类型")
+    private String errortype;
+
+    @Excel(name = "操作者")
+    private String operuser;
+
+    public String getErrnum() {
+        return errnum;
+    }
+
+    public void setErrnum(String errnum) {
+        this.errnum = errnum;
+    }
+
+    public String getWbnum() {
+        return wbnum;
+    }
+
+    public void setWbnum(String wbnum) {
+        this.wbnum = wbnum;
+    }
+
+    @Excel(name = "错词数量")
+    private String errnum;
+
+    @Excel(name = "误报词数量")
+    private String wbnum;
+
+
+    public String getOperuser() {
+        return operuser;
+    }
+
+    public void setOperuser(String operuser) {
+        this.operuser = operuser;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    @Excel(name = "ip地址")
+    private String ip;
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+    private Long deptId;
+    private Long userId;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date time;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    public void setErrortype(String errortype) 
+    {
+        this.errortype = errortype;
+    }
+
+    public String getErrortype() 
+    {
+        return errortype;
+    }
+
+    public void setTime(Date time) 
+    {
+        this.time = time;
+    }
+
+    public Date getTime() 
+    {
+        return time;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("title", getTitle())
+            .append("content", getContent())
+            .append("status", getStatus())
+            .append("errortype", getErrortype())
+            .append("time", getTime())
+            .toString();
+    }
+}