修改

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

@@ -3,6 +3,7 @@ package com.kms.yg.df.controller;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 import com.kms.yg.df.domain.BsSgcDfGcgl;
 import com.kms.yg.df.service.BsSgcDfGcglService;
@@ -106,19 +107,15 @@ public class BsSgcDfGcglController extends BaseController
         String id = bsSgcDfGcgl.getId();
         BsSgcDfGcgl byId = bsSgcDfGcglService.getById(id);
         byId.setRecordLoseEfficacyTime(new Date());
-        bsSgcDfGcglService.updateById(byId);
+        byId.setId(UUID.randomUUID().toString());
+        bsSgcDfGcglService.save(byId);
 
         bsSgcDfGcgl.setRecordTakeEffectTime(new Date());
         bsSgcDfGcgl.setRecordLoseEfficacyTime(null);
-        bsSgcDfGcgl.setId("");
 
-        BsSgcDfGcgl gcgl = new BsSgcDfGcgl();
 
-        BeanUtils.copyProperties(bsSgcDfGcgl,gcgl);
-        BaseEntityUtils.preInsert(gcgl);
 
-
-        return toAjax(bsSgcDfGcglService.save(gcgl));
+        return toAjax(bsSgcDfGcglService.save(bsSgcDfGcgl));
     }
 
     /**

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

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kms.common.utils.UserUtils;
@@ -206,20 +207,17 @@ public class BsSgcDfJbxxController extends BaseController
         String id = bsSgcDfJbxx.getId();
         BsSgcDfJbxx byId = bsSgcDfJbxxService.getById(id);
         byId.setRecordLoseEfficacyTime(new Date());
-        bsSgcDfJbxxService.updateById(byId);
+        byId.setId(UUID.randomUUID().toString());
+        bsSgcDfJbxxService.save(byId);
 
 
         bsSgcDfJbxx.setRecordTakeEffectTime(new Date());
         bsSgcDfJbxx.setRecordLoseEfficacyTime(null);
-        bsSgcDfJbxx.setId("");
 
-        BsSgcDfJbxx jbxx = new BsSgcDfJbxx();
 
-        BeanUtils.copyProperties(bsSgcDfJbxx, jbxx);
-        BaseEntityUtils.preInsert(jbxx);
 
 
-        return toAjax(bsSgcDfJbxxService.save(jbxx));
+        return toAjax(bsSgcDfJbxxService.updateById(bsSgcDfJbxx));
     }
 
     /**

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kms.common.utils.UserUtils;
@@ -200,20 +201,17 @@ public class BsSgcSzGcdaController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BsSgcSzGcda bsSgcSzGcda)
     {
+
         String id = bsSgcSzGcda.getId();
         BsSgcSzGcda byId = bsSgcSzGcdaService.getById(id);
         byId.setRecordLoseEfficacyTime(new Date());
-        bsSgcSzGcdaService.updateById(byId);
+        byId.setId(UUID.randomUUID().toString());
+        bsSgcSzGcdaService.save(byId);
 
         bsSgcSzGcda.setRecordTakeEffectTime(new Date());
         bsSgcSzGcda.setRecordLoseEfficacyTime(null);
-        bsSgcSzGcda.setId("");
-
-        BsSgcSzGcda gcda = new BsSgcSzGcda();
-        BeanUtils.copyProperties(bsSgcSzGcda,gcda);
 
-        BaseEntityUtils.preInsert(gcda);
-        return toAjax(bsSgcSzGcdaService.save(gcda));
+        return toAjax(bsSgcSzGcdaService.updateById(bsSgcSzGcda));
     }
 
     /**

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcglController.java

@@ -3,6 +3,7 @@ package com.kms.yg.sz.controller;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 import com.kms.yg.sz.domain.BsSgcSzGcgl;
 import com.kms.yg.sz.service.BsSgcSzGcglService;
@@ -106,18 +107,13 @@ public class BsSgcSzGcglController extends BaseController
         String id = bsSgcSzGcgl.getId();
         BsSgcSzGcgl byId = bsSgcSzGcglService.getById(id);
         byId.setRecordLoseEfficacyTime(new Date());
-        bsSgcSzGcglService.updateById(byId);
+        byId.setId(UUID.randomUUID().toString());
+        bsSgcSzGcglService.save(byId);
 
         bsSgcSzGcgl.setRecordTakeEffectTime(new Date());
         bsSgcSzGcgl.setRecordLoseEfficacyTime(null);
-        bsSgcSzGcgl.setId("");
 
-        BsSgcSzGcgl gcgl = new BsSgcSzGcgl();
-
-        BeanUtils.copyProperties(bsSgcSzGcgl,gcgl);
-        BaseEntityUtils.preInsert(gcgl);
-
-        return toAjax(bsSgcSzGcglService.save(gcgl));
+        return toAjax(bsSgcSzGcglService.updateById(bsSgcSzGcgl));
     }
 
     /**

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

@@ -0,0 +1,83 @@
+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;
+import com.kms.yg.sz.domain.BsSgcSzGcgl;
+import com.kms.yg.sz.service.BsSgcSzGcdaService;
+import com.kms.yg.sz.service.BsSgcSzGcglService;
+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("/sz/contrast")
+public class ContrastController {
+
+    @Autowired
+    private BsSgcSzGcdaService bsSgcSzGcdaService;
+
+    @Autowired
+    private BsSgcSzGcglService bsSgcSzGcglService;
+
+
+    @GetMapping("/{sluiceCode}")
+    public AjaxResult contrast(@PathVariable String sluiceCode) {
+
+        ContrastResult contrastResult = new ContrastResult();
+
+        //基本信息
+        //查询当前使用的版本
+        QueryWrapper<BsSgcSzGcda> queryWrapper = Wrappers.query();
+        queryWrapper.isNull("record_lose_efficacy_time");
+        queryWrapper.eq("sluice_code", sluiceCode);
+
+        BsSgcSzGcda one = bsSgcSzGcdaService.getOne(queryWrapper);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcSzGcda> query = Wrappers.query();
+        query.eq("sluice_code", sluiceCode).isNotNull("record_lose_efficacy_time")
+                .orderByDesc("record_lose_efficacy_time")
+                .last("limit 10");
+
+        List<BsSgcSzGcda> list = bsSgcSzGcdaService.list(query);
+
+        list.add(one);
+        contrastResult.setJbxx(list);
+
+        //工程管理
+        //查询当前版本
+        QueryWrapper<BsSgcSzGcgl> wrapper = new QueryWrapper<>();
+        wrapper.isNull("record_lose_efficacy_time");
+        wrapper.eq("sluice_code", sluiceCode);
+
+        BsSgcSzGcgl one1 = bsSgcSzGcglService.getOne(wrapper);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcSzGcgl> query1 = Wrappers.query();
+        query1.eq("sluice_code", sluiceCode).isNotNull("record_lose_efficacy_time")
+                .orderByDesc("record_lose_efficacy_time")
+                .last("limit 10");
+
+        List<BsSgcSzGcgl> list1 = bsSgcSzGcglService.list(query1);
+        list1.add(one1);
+        contrastResult.setGcgl(list1);
+        return AjaxResult.success(contrastResult);
+
+    }
+
+    @Data
+    public class ContrastResult {
+        private List<BsSgcSzGcda> jbxx;
+
+        private List<BsSgcSzGcgl> gcgl;
+
+    }
+}