lyhzzz 8 月之前
父节点
当前提交
70dfc09292

+ 1 - 2
src/main/java/com/fdkankan/fusion/controller/CaseInquestCriminalController.java

@@ -41,8 +41,7 @@ public class CaseInquestCriminalController {
 
     @PostMapping("/saveOrUpdate")
     public ResultData saveOrUpdate(@RequestBody CaseInquestCriminal caseInquestCriminal){
-        caseInquestCriminalService.saveByParam(caseInquestCriminal);
-        return ResultData.ok();
+        return ResultData.ok(caseInquestCriminalService.saveByParam(caseInquestCriminal));
     }
 
     @GetMapping("/downDocx")

+ 3 - 0
src/main/java/com/fdkankan/fusion/entity/CaseFiles.java

@@ -76,6 +76,9 @@ public class CaseFiles implements Serializable {
     @TableField("img_type")
     private Integer imgType;
 
+    @TableField("create_type")
+    private String createType;
+
     /**
      * 现场图或方位图json
      */

+ 8 - 2
src/main/java/com/fdkankan/fusion/entity/CaseInquestCriminal.java

@@ -40,6 +40,9 @@ public class CaseInquestCriminal implements Serializable {
     @TableField("inquest_file_id")
     private Integer inquestFileId;
 
+    @TableField("case_id")
+    private Integer caseId;
+
     /**
      * 现场勘验号
      */
@@ -132,6 +135,11 @@ public class CaseInquestCriminal implements Serializable {
      */
     @TableField("address")
     private String address;
+    /**
+     * inquest
+     */
+    @TableField("inquest_resource")
+    private String inquestResource;
 
     /**
      * 现场保护情况
@@ -252,6 +260,4 @@ public class CaseInquestCriminal implements Serializable {
     @TableField("num")
     private String num;
 
-    @TableField(exist = false)
-    private Integer caseId;
 }

+ 13 - 0
src/main/java/com/fdkankan/fusion/response/CaseTagPointVo.java

@@ -26,4 +26,17 @@ public class CaseTagPointVo extends CaseTag {
 
     private Integer fusionNumId;
 
+    private String bindHide;
+
+    private Integer globalVisibility;
+
+    private String type;
+
+    private String mat;
+
+    private Integer fontSize;
+
+    private Integer lineHeight;
+
+    private Integer visibilityRange;
 }

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/ICaseInquestCriminalService.java

@@ -17,7 +17,7 @@ public interface ICaseInquestCriminalService extends IService<CaseInquestCrimina
 
     CaseInquestCriminal getByInquestFileId(Integer caseId);
 
-    void saveByParam(CaseInquestCriminal caseInquestCriminal);
+    CaseInquestCriminal saveByParam(CaseInquestCriminal caseInquestCriminal);
 
     XWPFTemplate getWordByTemplate(CaseInquestCriminal caseInquestCriminal);
 

+ 2 - 0
src/main/java/com/fdkankan/fusion/service/impl/CaseFilesServiceImpl.java

@@ -75,6 +75,8 @@ public class CaseFilesServiceImpl extends ServiceImpl<ICaseFilesMapper, CaseFile
         caseFiles.setCaseId(caseInquestCriminal.getCaseId());
         caseFiles.setFilesTypeId(40);
         caseFiles.setFilesTitle("现场勘验笔录");
+        caseFiles.setCreateType("online");
+        caseFiles.setCaseId(caseInquestCriminal.getCaseId());
         this.save(caseFiles);
         return caseFiles;
     }

+ 5 - 2
src/main/java/com/fdkankan/fusion/service/impl/CaseInquestCriminalServiceImpl.java

@@ -75,12 +75,15 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
     @Value("${upload.query-path}")
     private String queryPath;
     @Override
-    public void saveByParam(CaseInquestCriminal caseInquestCriminal) {
+    public CaseInquestCriminal saveByParam(CaseInquestCriminal caseInquestCriminal) {
         if(caseInquestCriminal.getInquestFileId() == null){
             CaseFiles caseFiles = caseFilesService.addByInquest(caseInquestCriminal);
             caseInquestCriminal.setInquestFileId(caseFiles.getFilesId());
         }else {
             CaseInquestCriminal byInquestFileId = getByInquestFileId(caseInquestCriminal.getInquestFileId());
+            if(byInquestFileId == null){
+                throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+            }
             caseInquestCriminal.setId(byInquestFileId.getId());
         }
         this.saveOrUpdate(caseInquestCriminal);
@@ -97,7 +100,7 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
         }catch (Exception e){
             log.info("caseInquestCriminal-保存生成doc文档出错:error",e);
         }
-
+    return caseInquestCriminal;
 
     }
 

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/impl/CaseTagPointServiceImpl.java

@@ -77,8 +77,8 @@ public class CaseTagPointServiceImpl extends ServiceImpl<ICaseTagPointMapper, Ca
         List<CaseTagPointVo> caseTagPointVoList = new ArrayList<>();
         for (CaseTagPoint caseTagPoint : list) {
             CaseTagPointVo caseTagPointVo = new CaseTagPointVo();
-            BeanUtils.copyProperties(caseTagPoint,caseTagPointVo);
             BeanUtils.copyProperties(caseTag,caseTagPointVo);
+            BeanUtils.copyProperties(caseTagPoint,caseTagPointVo);
             caseTagPointVoList.add(caseTagPointVo);
         }
         return caseTagPointVoList;

二进制
src/main/resources/template/inquest_criminal-template.docx