Merge remote-tracking branch 'origin/master'

qhse-common/src/main/java/com/rongwei/bscommon/system/service/impl/StudyFileServiceImpl.java

@@ -109,13 +109,18 @@ public class StudyFileServiceImpl implements StudyFileService {
      * @return 结果
      */
     @Override
+    @Transactional
     public R cancelProcess(String id) {
-        // 获取最新的学习文件信息
+        // 获取当前的学习文件信息
         StudyFileDo currentFile = studyFileDao.selectById(id);
         // 获取最新历史文件
         StudyFileRecordDo historyFile = studyFileRecordService.selectLatestRecordByMainId(id);
+        // 如果没有历史文件则为新增流程，需要清空当前流程信息，将其变成“暂存状态”
         if (historyFile == null) {
             logger.info("文件：{}，没有找到对应的历史文件", id);
+            currentFile.setProcessInstId("");
+            currentFile.setProcessInstStatus("");
+            studyFileDao.updateById(currentFile);
             return R.ok("没有找到对应的历史文件");
         }
         // 恢复文件历史数据

qhse-common/src/main/resources/mybatis/system/StudyFileRecordDao.xml

@@ -2,6 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.system.dao.StudyFileRecordDao">
     <select id="selectLatestRecordByMainId" resultType="com.rongwei.bsentity.domain.StudyFileRecordDo">
-        SELECT * FROM qhse_study_file_record WHERE MAINID= #{ mainId } ORDER BY CREATEDATE DESC LIMIT 1
+        SELECT
+        *
+        FROM
+        qhse_study_file_record
+        WHERE
+        MAINID = #{ mainId }
+        AND PROCESSINSTSTATUS = '20'
+        ORDER BY
+        CREATEDATE DESC
+        LIMIT 1
     </select>
 </mapper>