Ocr部分bug 和工作组部分bug修复

adc-da-sys/src/main/java/com/adc/da/ocr/controller/OCRRestfulController.java

@@ -13,6 +13,7 @@ import com.adc.da.ocr.service.OCRRestfulService;
 import com.adc.da.ocr.service.OcrRecordEOService;
 import com.adc.da.ocr.util.MD5Util;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
@@ -107,11 +108,13 @@ public class OCRRestfulController extends BaseController<OcrRecordEO> {
             page.setOrder("desc");
         }
         List<OcrRecordEO> rows = ocrRecordEOService.queryByPage(page);
+        Integer integer = ocrRecordEOService.queryByPageCount(page);
         DecimalFormat df = new DecimalFormat("0.00");//设置保留位数
         for (OcrRecordEO ocrRecordEO : rows){
             ocrRecordEO.setDocRealFile(ocrDownPath+ocrRecordEO.getDocRealName());
             ocrRecordEO.setJsonRealFile(ocrDownPath+ocrRecordEO.getJsonRealName());
         }
+        page.getPager().setRowCount(integer);
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 

adc-da-sys/src/main/java/com/adc/da/ocr/dao/OcrRecordEODao.java

@@ -23,6 +23,7 @@ public interface OcrRecordEODao extends BaseMapper<OcrRecordEO> {
 //    int deleteByIds(@Param("idList") List<String> idList);
 
     List<OcrRecordEO> queryByPage(BasePage var1);
+    Integer queryByPageCount(BasePage var1);
 
     int insertSelective(OcrRecordEO ocrRecordEO);
 

adc-da-sys/src/main/java/com/adc/da/ocr/service/OcrRecordEOService.java

@@ -8,6 +8,8 @@ public interface OcrRecordEOService {
 
     List<OcrRecordEO> queryByPage(OcrRecordEOPage page);
 
+    Integer queryByPageCount(OcrRecordEOPage page);
+
     int updateByPrimaryKeySelective(OcrRecordEO ocrRecordEO);
 
     int deleteByIds(List<String> idList);

adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OcrRecordEOServiceImpl.java

@@ -26,6 +26,11 @@ public class OcrRecordEOServiceImpl implements OcrRecordEOService {
         return ocrRecordEODao.queryByPage(page);
     }
 
+    @Override
+    public Integer queryByPageCount(OcrRecordEOPage page) {
+        return ocrRecordEODao.queryByPageCount(page);
+    }
+
     @Override
     public int updateByPrimaryKeySelective(OcrRecordEO ocrRecordEO) {
         return ocrRecordEODao.updateByPrimaryKeySelective(ocrRecordEO);

adc-da-sys/src/main/resources/mybatis/mapper/ocr/OcrRecordEOMapper.xml

@@ -221,6 +221,20 @@
 			) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
   </select>
 
+    <select id="queryByPageCount" parameterType="com.adc.da.base.page.BasePage" resultType="java.lang.Integer">
+	select count(id) from
+		(select tmp_tb.* from
+			(select <include refid="Base_Column_List" />,(UNIX_TIMESTAMP(modify_time)-UNIX_TIMESTAMP(creation_time)) as spendTime from OCR_RECORD
+			 <include refid="Base_Where_Clause"/>
+			 <if test="pager.orderCondition != null and pager.orderCondition != ''" >
+			 	${pager.orderCondition}
+			 </if>
+              <if test="sql != null">
+                  ORDER BY ${sql}
+              </if>
+			) tmp_tb ) a
+  </select>
+
   <select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
     select <include refid="Base_Column_List"/> from OCR_RECORD
     <include refid="Base_Where_Clause"/>