版本对比修改

shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java

@@ -0,0 +1,91 @@
+package com.kms.yg.df.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.kms.yg.df.domain.BsSgcDfGcgl;
+import com.kms.yg.df.domain.BsSgcDfJbxx;
+import com.kms.yg.df.service.BsSgcDfGcglService;
+import com.kms.yg.df.service.BsSgcDfJbxxService;
+import com.kms.yg.sz.controller.SzContrastController;
+import com.kms.yg.sz.domain.BsSgcSzGcda;
+import com.kms.yg.sz.domain.BsSgcSzGcgl;
+import com.shuili.common.core.domain.AjaxResult;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/df/contrast")
+public class DfContrastController {
+
+    @Autowired
+    private BsSgcDfGcglService bsSgcDfGcglService;
+
+    @Autowired
+    private BsSgcDfJbxxService bsSgcDfJbxxService;
+
+
+    @GetMapping("/{embankmentCode}")
+    public AjaxResult contrast(@PathVariable String embankmentCode) {
+        ContrastResult contrastResult = new ContrastResult();
+
+        //基本信息
+        //查询当前使用的版本
+        QueryWrapper<BsSgcDfJbxx> queryWrapper = Wrappers.query();
+        queryWrapper.isNull("record_lose_efficacy_time");
+        queryWrapper.eq("embankment_code", embankmentCode);
+
+        BsSgcDfJbxx one = bsSgcDfJbxxService.getOne(queryWrapper);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcDfJbxx> query = Wrappers.query();
+        query.eq("embankment_code", embankmentCode).isNotNull("record_lose_efficacy_time")
+                .orderByDesc("record_lose_efficacy_time")
+                .last("limit 10");
+
+        List<BsSgcDfJbxx> list = bsSgcDfJbxxService.list(query);
+        if (one != null) {
+            list.add(one);
+
+        }
+
+        contrastResult.setJbxx(list);
+
+        //工程管理
+        //查询当前版本
+        QueryWrapper<BsSgcDfGcgl> wrapper = new QueryWrapper<>();
+        wrapper.isNull("record_lose_efficacy_time");
+        wrapper.eq("embankment_code", embankmentCode);
+
+        BsSgcDfGcgl one1 = bsSgcDfGcglService.getOne(wrapper);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcDfGcgl> query1 = Wrappers.query();
+        query1.eq("embankment_code", embankmentCode).isNotNull("record_lose_efficacy_time")
+                .orderByDesc("record_lose_efficacy_time")
+                .last("limit 10");
+
+        List<BsSgcDfGcgl> list1 = bsSgcDfGcglService.list(query1);
+
+        if (one1 != null){
+            list1.add(one1);
+        }
+        contrastResult.setGcgl(list1);
+        return AjaxResult.success(contrastResult);
+    }
+
+
+    @Data
+    public class ContrastResult {
+        private List<BsSgcDfJbxx> jbxx;
+
+        private List<BsSgcDfGcgl> gcgl;
+
+    }
+
+}

shuili-system/src/main/java/com/kms/yg/sz/controller/ContrastController.java → shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java

@@ -1,6 +1,5 @@
 package com.kms.yg.sz.controller;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kms.yg.sz.domain.BsSgcSzGcda;
@@ -19,7 +18,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/sz/contrast")
-public class ContrastController {
+public class SzContrastController {
 
     @Autowired
     private BsSgcSzGcdaService bsSgcSzGcdaService;