1

src/main/java/com/fdkankan/fusion/entity/CaseInquestCriminal.java

@@ -252,4 +252,6 @@ public class CaseInquestCriminal implements Serializable {
     @TableField("num")
     private String num;
 
+    @TableField(exist = false)
+    private Integer caseId;
 }

src/main/java/com/fdkankan/fusion/service/ICaseFilesService.java

@@ -2,6 +2,7 @@ package com.fdkankan.fusion.service;
 
 import com.fdkankan.fusion.entity.CaseFiles;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.fusion.entity.CaseInquestCriminal;
 
 import java.util.List;
 
@@ -20,4 +21,6 @@ public interface ICaseFilesService extends IService<CaseFiles> {
     List<CaseFiles> getByCaseId(Integer caseId);
 
     void deleteByCaseId(Integer caseId);
+
+    CaseFiles addByInquest(CaseInquestCriminal caseInquestCriminal);
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseFilesServiceImpl.java

@@ -3,6 +3,7 @@ package com.fdkankan.fusion.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.util.UploadToOssUtil;
+import com.fdkankan.fusion.entity.CaseInquestCriminal;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.entity.CaseFiles;
@@ -67,4 +68,14 @@ public class CaseFilesServiceImpl extends ServiceImpl<ICaseFilesMapper, CaseFile
             this.removeById(files.getFilesId());
         }
     }
+
+    @Override
+    public CaseFiles addByInquest(CaseInquestCriminal caseInquestCriminal) {
+        CaseFiles caseFiles = new CaseFiles();
+        caseFiles.setCaseId(caseInquestCriminal.getCaseId());
+        caseFiles.setFilesTypeId(40);
+        caseFiles.setFilesTitle("现场勘验笔录");
+        this.save(caseFiles);
+        return caseFiles;
+    }
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseInquestCriminalServiceImpl.java

@@ -57,6 +57,8 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
     ICaseNumService caseNumService;
     @Autowired
     IScenePlusService scenePlusService;
+    @Autowired
+    ICaseFilesService caseFilesService;
 
     @Override
     public CaseInquestCriminal getByInquestFileId(Integer caseId) {
@@ -64,36 +66,6 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
         LambdaQueryWrapper<CaseInquestCriminal> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CaseInquestCriminal::getInquestFileId,caseId);
         CaseInquestCriminal caseInquestCriminal = this.getOne(wrapper);
-        /**
-         * 1.标题                     //案件名称
-         * 2.笔录人  绘图人  照相人   //登录人
-         * 3.制作时间                //当前时间
-         * 4.现场勘验单位  指派/报告单位 //部门名称
-         * 5.勘验时间       //第一个场景的拍摄时间
-         * 6.现场地点       //案件地理位置
-         * 7.现场勘验情况   //讯飞ai图片说明
-         * 8.单位             //部门名称
-         */
-        if(caseInquestCriminal == null){
-            if(StpUtil.isLogin()){
-                TmUser tmUser = tmUserService.getById(StpUtil.getLoginId().toString());
-                CaseEntity caseEntity = caseService.getById(caseId);
-                TmDepartment tmDepartment = tmDepartmentService.getById(caseEntity.getDeptId());
-
-                caseInquestCriminal = new CaseInquestCriminal();
-                caseInquestCriminal.setInquestFileId(caseId);
-                caseInquestCriminal.setDeptName(tmDepartment.getName());
-                caseInquestCriminal.setTitle(caseEntity.getCaseTitle());
-                caseInquestCriminal.setSendDept(tmDepartment.getName());
-                caseInquestCriminal.setRecorder(tmUser.getNickName());
-                caseInquestCriminal.setPainter(tmUser.getNickName());
-                caseInquestCriminal.setPhotographer(tmUser.getNickName());
-                caseInquestCriminal.setMakeTime(new Date());
-                caseInquestCriminal.setReportDept(tmDepartment.getName());
-                caseInquestCriminal.setAddress(caseEntity.getMapUrl());
-                this.save(caseInquestCriminal);
-            }
-        }
         return caseInquestCriminal;
     }
 
@@ -101,11 +73,11 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
     @Override
     public void saveByParam(CaseInquestCriminal caseInquestCriminal) {
         if(caseInquestCriminal.getInquestFileId() == null){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
-        }
-        CaseInquestCriminal dbCaseInquest = this.getById(caseInquestCriminal.getInquestFileId());
-        if(dbCaseInquest != null){
-            caseInquestCriminal.setId(dbCaseInquest.getId());
+            CaseFiles caseFiles = caseFilesService.addByInquest(caseInquestCriminal);
+            caseInquestCriminal.setInquestFileId(caseFiles.getFilesId());
+        }else {
+            CaseInquestCriminal byInquestFileId = getByInquestFileId(caseInquestCriminal.getInquestFileId());
+            caseInquestCriminal.setId(byInquestFileId.getId());
         }
         this.saveOrUpdate(caseInquestCriminal);