1. 修复bug

src/main/java/com/supervision/constant/ScoreEnum.java

@@ -2,10 +2,10 @@ package com.supervision.constant;
 
 import java.util.Objects;
 
-public enum  ScoreEnum {
+public enum ScoreEnum {
-    EVIDENCE_FULL("1","证据充分", "司法机关对案件形成一致认定意见的概率比较大"),
+    EVIDENCE_NOT_FULL("1","证据不足", "司法机关对案件形成一致认定意见的概率比较大"),
-    EVIDENCE_LACK("2","证据不足", "司法籍贯认定意见不一致的概率比较大"),
+    EVIDENCE_LACK("2","事实不清", "司法籍贯认定意见不一致的概率比较大"),
-    EVIDENCE_NOT_FULL("3","证据不充分", "司法籍贯会作出绝对不起诉或存疑不起诉的决定");
+    EVIDENCE_FULL("3","证据充分", "司法籍贯会作出绝对不起诉或存疑不起诉的决定");
 
     private final String code;
     private final String name;

src/main/java/com/supervision/police/controller/ModelCaseController.java

@@ -46,7 +46,7 @@ public class ModelCaseController {
      */
     @GetMapping("/checkCaseNo")
     public R<?> checkCaseNo(@RequestParam @Parameter(name = "caseNo",description = "案件编号") String caseNo,
-                            @RequestParam @Parameter(name = "caseId",description = "案件id") String caseId) {
+                            @RequestParam(required = false) @Parameter(name = "caseId",description = "案件id") String caseId) {
         return modelCaseService.checkCaseNo(caseNo,caseId);
     }
 

src/main/java/com/supervision/police/controller/RecordController.java

@@ -6,6 +6,7 @@ import com.supervision.police.domain.NotePrompt;
 import com.supervision.police.domain.NoteRecord;
 import com.supervision.police.domain.TripleInfo;
 import com.supervision.police.dto.ListDTO;
+import com.supervision.police.dto.NoteRecordReqVo;
 import com.supervision.police.dto.TypeDTO;
 import com.supervision.police.service.ModelRecordTypeService;
 import com.supervision.police.service.NoteRecordSplitService;
@@ -106,7 +107,7 @@ public class RecordController {
      * @return
      */
     @PostMapping("/addOrUpdRecords")
-    public R<String> uploadRecords(NoteRecord records,
+    public R<String> uploadRecords(NoteRecordReqVo records,
                                    @RequestPart("file") List<MultipartFile> fileList) throws IOException {
         return R.ok(noteRecordSplitService.uploadRecords(records, fileList));
     }

src/main/java/com/supervision/police/domain/NoteRecord.java

@@ -7,9 +7,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -84,7 +88,7 @@ public class NoteRecord implements Serializable {
     private String dataStatus;
 
     @TableField(exist = false)
-    private List<NoteRecord> children;
+    private List<NoteRecord> children = new ArrayList<>();
 
     /**
      * 创建人ID
@@ -96,6 +100,7 @@ public class NoteRecord implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**
@@ -109,6 +114,7 @@ public class NoteRecord implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
     @TableField(exist = false)

src/main/java/com/supervision/police/dto/NoteRecordReqVo.java

@@ -0,0 +1,72 @@
+package com.supervision.police.dto;
+
+import com.supervision.police.domain.NoteRecord;
+import lombok.Data;
+
+@Data
+public class NoteRecordReqVo {
+
+    private String id;
+
+    /**
+     * 案件id
+     */
+    private String caseId;
+
+    /**
+     * 笔录名称
+     */
+    private String recordName;
+
+    /**
+     * 笔录文件id
+     */
+    private String fileIds;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 角色
+     */
+    private String role;
+
+    /**
+     * 供述材料
+     */
+    private Integer confessionMaterial;
+
+    /**
+     * 询问人
+     */
+    private String lawAsker;
+
+    /**
+     * 供述开始时间
+     */
+    private String confessionStartTime;
+
+    /**
+     * 供述结束时间
+     */
+    private String confessionEndTime;
+
+    public NoteRecord toNoteRecord(){
+        NoteRecord noteRecord = new NoteRecord();
+        noteRecord.setId(id);
+        noteRecord.setCaseId(caseId);
+        noteRecord.setRecordName(recordName);
+        noteRecord.setFileIds(fileIds);
+        noteRecord.setName(name);
+        noteRecord.setRole(role);
+        noteRecord.setConfessionMaterial(confessionMaterial);
+        noteRecord.setLawAsker(lawAsker);
+        noteRecord.setConfessionStartTime(confessionStartTime);
+        noteRecord.setConfessionEndTime(confessionEndTime);
+        return noteRecord;
+    }
+
+
+}

src/main/java/com/supervision/police/service/NoteRecordSplitService.java

@@ -3,6 +3,7 @@ package com.supervision.police.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.supervision.police.domain.NoteRecord;
 import com.supervision.police.domain.NoteRecordSplit;
+import com.supervision.police.dto.NoteRecordReqVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -11,7 +12,7 @@ import java.util.Map;
 
 public interface NoteRecordSplitService extends IService<NoteRecordSplit> {
 
-    String uploadRecords(NoteRecord records, List<MultipartFile> fileList) throws IOException;
+    String uploadRecords(NoteRecordReqVo records, List<MultipartFile> fileList) throws IOException;
 
     Map<String, Object> queryRecords(NoteRecord noteRecord, Integer page, Integer size);
 

src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java

@@ -86,6 +86,9 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
             for (String type : caseTypes) {
                 caseType.add(comDictionaryService.getName(dicts, "case_type", type));
             }
+            if (StrUtil.isEmpty(modelCaseDTO.getCaseStatus())){
+                modelCaseDTO.setCaseStatus("1");
+            }
             modelCaseDTO.setCaseTypeName(StringUtils.join(caseType, ","));
             modelCaseDTO.setCaseStatusName(comDictionaryService.getName(dicts, "case_status", modelCaseDTO.getCaseStatus()));
             modelCaseDTO.setCrimeModeName(comDictionaryService.getName(dicts, "crime_mode", modelCaseDTO.getCrimeMode()));
@@ -94,7 +97,10 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
             if (CollUtil.isNotEmpty(casePersonMap)){
                 modelCaseDTO.setLawActor(CollUtil.getFirst(casePersonMap.get("1")));
                 modelCaseDTO.floatLawActorInfo();
-                modelCaseDTO.setLawPartyList(casePersonMap.get("2"));
+                modelCaseDTO.setLawPartyList(casePersonMap.getOrDefault("2",new ArrayList<>()));
+            }
+            if (Objects.isNull(modelCaseDTO.getLawPartyList())){
+                modelCaseDTO.setLawPartyList(new ArrayList<>());
             }
             return modelCaseDTO;
         });

src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java

@@ -1,7 +1,5 @@
 package com.supervision.police.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +13,7 @@ import com.supervision.police.domain.ModelCase;
 import com.supervision.police.domain.ModelRecordType;
 import com.supervision.police.domain.NoteRecordSplit;
 import com.supervision.police.domain.NoteRecord;
+import com.supervision.police.dto.NoteRecordReqVo;
 import com.supervision.police.mapper.ModelCaseMapper;
 import com.supervision.police.mapper.NoteRecordSplitMapper;
 import com.supervision.police.mapper.NoteRecordMapper;
@@ -61,7 +60,7 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
 
     @Override
     @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
-    public String uploadRecords(NoteRecord records, List<MultipartFile> fileList) throws IOException {
+    public String uploadRecords(NoteRecordReqVo records, List<MultipartFile> fileList) throws IOException {
         //上传文件，获取文件ids
         List<String> fileIds = new ArrayList<>();
         for (MultipartFile file : fileList) {
@@ -94,9 +93,9 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
         }
         int i = 0;
         if (StringUtils.isEmpty(records.getId())) {
-            i = noteRecordMapper.insert(records);
+            i = noteRecordMapper.insert(records.toNoteRecord());
         } else {
-            i = noteRecordMapper.updateById(records);
+            i = noteRecordMapper.updateById(records.toNoteRecord());
         }
         //所有对话类型
         List<ModelRecordType> allTypeList = modelRecordTypeService.lambdaQuery().list();

src/main/resources/mapper/ModelCaseMapper.xml

@@ -63,5 +63,6 @@
                  left join model_index_result mir on ( mi.id = mir.index_id and  mir.case_id = #{caseId} )
         WHERE mi.data_status = '1'
           and mi.index_type = #{indexType}
+        order by mir.index_result desc
     </select>
 </mapper>