1、record_ocr_time表新增sub_date_dir 保存二级目录，并且取消表的date_dir主键；

README.md

@@ -30,4 +30,11 @@ http://doc.ruoyi.vip
 
 3. 修改配置文件logback.xml
 
-* log.path
+* log.path
+
+## 数据库操作记录
+record_ocr_time新增字段，并取消主键
+ALTER TABLE record_ocr_time ADD COLUMN sub_date_dir VARCHAR(16) COMMENT 'Secondary directories';
+SHOW KEYS FROM record_ocr_time WHERE Key_name = 'PRIMARY';
+ALTER TABLE record_ocr_time DROP PRIMARY KEY;
+

src/main/java/com/pavis/ctr/audit/project/controller/InitAuditTripController.java

@@ -45,12 +45,10 @@ public class InitAuditTripController {
             //自动审核小票
             Integer integer = auditTripMainService.autoAuditTripResultVo(ocrTrips);
             ajaxResult.put("auto_audit_msg","自动审核信息:"+integer+"条,本次未审核的小票数："+(auditTripSize-integer));
-
         } else {
             ajaxResult.put("audit_msg","没有待审核的小票");
         }
         return ajaxResult;
-
     }
 
     @ApiOperation("根据datedir初始化审核小票数据")

src/main/java/com/pavis/ctr/audit/project/domain/OcrTrip.java

@@ -246,7 +246,6 @@ public class OcrTrip {
             }
         }
 
-
         if (StringUtils.isBlank(this.purchaseDate) && StringUtils.isBlank(this.totalSpend)) {
             // 购买日期和总金额都为空
             return Constants.LACK_ALL;

src/main/java/com/pavis/ctr/audit/project/domain/RecordOcrTime.java

@@ -6,6 +6,7 @@ package com.pavis.ctr.audit.project.domain;
 
 public class RecordOcrTime {
     private String dateDir;
+    private String subDateDir;
     private String beginTime;
     private String endTime;
     private Integer workStatus;
@@ -18,6 +19,14 @@ public class RecordOcrTime {
         this.dateDir = dateDir;
     }
 
+    public String getSubDateDir() {
+        return subDateDir;
+    }
+
+    public void setSubDateDir(String subDateDir) {
+        this.subDateDir = subDateDir;
+    }
+
     public String getBeginTime() {
         return beginTime;
     }
@@ -46,6 +55,7 @@ public class RecordOcrTime {
     public String toString() {
         return "RecordOcrTime{" +
                 "dateDir='" + dateDir + '\'' +
+                "subDateDir='" + subDateDir + '\'' +
                 ", beginTime='" + beginTime + '\'' +
                 ", endTime='" + endTime + '\'' +
                 ", workStatus=" + workStatus +

src/main/java/com/pavis/ctr/audit/project/service/impl/AuditTripMainServiceImpl.java

@@ -268,13 +268,13 @@ public class AuditTripMainServiceImpl extends ServiceImpl<AuditTripMainMapper, A
                 if(imgs.size() == 1){
                     String[] imgArr = new String[imgs.size()];
                     mergeImgUrl = imgs.get(0);
-                    String dstHtml = tripResult.getUploadId() + ".html";
+                    String dstHtml = tripResult.getUploadId() + "_test.html";
                     mergeHtmlUrl = ImageUtils.joinImageListHtml(imgs.toArray(imgArr), dstHtml, ossClient);
                 }else if (imgs.size() > 0) {
                     String[] imgArr = new String[imgs.size()];
-                    String dstPic = basePath + tripResult.getUploadId() + ".jpg";
+                    String dstPic = basePath + tripResult.getUploadId() + "_test.jpg";
                     mergeImgUrl = ImageUtils.joinImagesVertical(imgs.toArray(imgArr), "jpg", dstPic, client);
-                    String dstHtml = tripResult.getUploadId() + ".html";
+                    String dstHtml = tripResult.getUploadId() + "_test.html";
                     mergeHtmlUrl = ImageUtils.joinImageListHtml(imgs.toArray(imgArr), dstHtml, ossClient);
                 }
                 if (StringUtils.isNotBlank(mergeImgUrl) && StringUtils.isNotBlank(mergeHtmlUrl)) {

src/main/resources/mybatis/mapper/RecordOcrTimeMapper.xml

@@ -3,18 +3,17 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pavis.ctr.audit.project.mapper.RecordOcrTimeMapper">
     <resultMap id="RecordOcrTime" type="RecordOcrTime">
-        <id property="dateDir" column="date_dir"/>
+        <id property="subDateDir" column="sub_date_dir"/>
+        <result property="dateDir" column="date_dir"/>
         <result property="beginTime" column="begin_time"/>
         <result property="endTime" column="end_time"/>
         <result property="workStatus" column="work_status"/>
     </resultMap>
     <insert id="insertOcrTimeAndStatus" parameterType="RecordOcrTime">
-    insert into record_ocr_time(date_dir,begin_time,end_time,work_status)
-    values (#{dateDir},#{beginTime},#{endTime},#{workStatus})
+    insert into record_ocr_time(date_dir,sub_date_dir,begin_time,end_time,work_status)
+    values (#{dateDir},#{subDateDir},#{beginTime},#{endTime},#{workStatus})
     </insert>
     <!-- -->
 
 
-
-
 </mapper>