add

src/main/java/cn/cslg/wdc/dto/SelectCaseInfoDTO.java

@@ -17,7 +17,7 @@ public class SelectCaseInfoDTO {
 
     private String auditor;
 
-    private Date completionDate;
+    private String completionDate;
 
     private Double firstBegin;
 

src/main/java/cn/cslg/wdc/service/DiscrepancyService.java

@@ -3,9 +3,11 @@ package cn.cslg.wdc.service;
 import cn.cslg.wdc.common.core.auth.Response;
 import cn.cslg.wdc.dto.DiscrepancyIdDTO;
 import cn.cslg.wdc.entity.AssoCaseFile;
+import cn.cslg.wdc.entity.CaseFile;
 import cn.cslg.wdc.entity.Discrepancy;
 import cn.cslg.wdc.entity.DiscrepancyDetail;
 import cn.cslg.wdc.mapper.AssoCaseFileMapper;
+import cn.cslg.wdc.mapper.CaseFileMapper;
 import cn.cslg.wdc.mapper.DiscrepancyDetailMapper;
 import cn.cslg.wdc.mapper.DiscrepancyMapper;
 import cn.cslg.wdc.vo.SelectDiscrepanyInfoVO;
@@ -26,17 +28,31 @@ import java.util.List;
 public class DiscrepancyService extends ServiceImpl<DiscrepancyMapper, Discrepancy> {
 
     @Autowired
+    private CaseFileMapper caseFileMapper;
+
+    @Autowired
     private AssoCaseFileMapper assoCaseFileMapper;
 
     @Autowired
     private DiscrepancyDetailMapper discrepancyDetailMapper;
 
     public String selectDiscrepancy(DiscrepancyIdDTO vo) {
+        if (vo.getDiscrepancyId() == null) {
+            return Response.success();
+        }
         Discrepancy discrepancy = this.getById(vo.getDiscrepancyId());
         SelectDiscrepanyInfoVO infoVO = new SelectDiscrepanyInfoVO();
+        Integer caseId = discrepancy.getCaseId();
+        CaseFile caseFile = caseFileMapper.selectById(caseId);
         infoVO.setDiscrepancyId(discrepancy.getId());
+        infoVO.setCaseId(caseId);
+        infoVO.setCaseNo(caseFile.getCaseNo());
+        infoVO.setTitle(caseFile.getTitle());
+        infoVO.setCustomer(caseFile.getCustomer());
+        infoVO.setWriter(caseFile.getWriter());
+        infoVO.setAuditor(caseFile.getAuditor());
+        infoVO.setCompletionDate(caseFile.getCompletionDate());
         infoVO.setDiscrepancyType(discrepancy.getDiscrepancyType());
-        infoVO.setCaseId(discrepancy.getCaseId());
         infoVO.setCaseFileId1(discrepancy.getCaseFileId1());
         AssoCaseFile caseFile1 = assoCaseFileMapper.selectById(discrepancy.getCaseFileId1());
         infoVO.setCaseFileName1(caseFile1.getFileName());

src/main/java/cn/cslg/wdc/vo/SelectDiscrepanyInfoVO.java

@@ -1,8 +1,11 @@
 package cn.cslg.wdc.vo;
 
 import cn.cslg.wdc.entity.DiscrepancyDetail;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -12,6 +15,20 @@ public class SelectDiscrepanyInfoVO {
 
     private Integer caseId;
 
+    private String caseNo;
+
+    private String title;
+
+    private String customer;
+
+    private String writer;
+
+    private String auditor;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date completionDate;
+
     private Integer discrepancyType;
 
     private Integer caseFileId1;