LPJ 2 дней назад
Родитель
Сommit
ee7e17677f
26 измененных файлов с 148 добавлено и 16 удалено
  1. 6 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/controller/BisEutrEqController.java
  2. 4 2
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrCourCate.java
  3. 4 2
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrEq.java
  4. 11 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrEqWithAnsw.java
  5. 4 2
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrExam.java
  6. 4 2
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrExamStra.java
  7. 4 2
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrOfflRec.java
  8. 4 2
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrPlan.java
  9. 4 2
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/ObjEutrCour.java
  10. 1 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/mapper/BisEutrEqAnswMapper.java
  11. 1 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/IBisEutrEqAnswService.java
  12. 2 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/IBisEutrEqService.java
  13. 7 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrCourCateServiceImpl.java
  14. 5 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrEqAnswServiceImpl.java
  15. 35 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrEqServiceImpl.java
  16. 5 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrExamServiceImpl.java
  17. 7 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrExamStraServiceImpl.java
  18. 6 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrOfflRecServiceImpl.java
  19. 6 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrPlanServiceImpl.java
  20. 1 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrRecServiceImpl.java
  21. 6 0
      gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/ObjEutrCourServiceImpl.java
  22. 4 0
      gw-slaj/src/main/java/com/goldenwater/slaj/speq/controller/BisSpeqQusaiOperItemController.java
  23. 4 2
      gw-slaj/src/main/java/com/goldenwater/slaj/speq/domain/BisSpeqSpeOperPers.java
  24. 9 0
      gw-slaj/src/main/java/com/goldenwater/slaj/speq/service/impl/BisSpeqSpeOperPersServiceImpl.java
  25. 3 0
      gw-slaj/src/main/resources/mapper/slaj/eutr/BisEutrEqAnswMapper.xml
  26. 1 0
      gw-slaj/src/main/resources/mapper/slaj/speq/BisSpeqQusaiOperItemMapper.xml

+ 6 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/controller/BisEutrEqController.java

@@ -12,6 +12,7 @@ import com.goldenwater.common.core.page.TableDataInfo;
 import com.goldenwater.common.enums.BusinessType;
 import com.goldenwater.common.utils.poi.ExcelUtil;
 import com.goldenwater.slaj.eutr.domain.BisEutrEq;
+import com.goldenwater.slaj.eutr.domain.BisEutrEqWithAnsw;
 import com.goldenwater.slaj.eutr.service.IBisEutrEqService;
 
 @RestController
@@ -37,6 +38,11 @@ public class BisEutrEqController extends BaseController {
         return toAjax(bisEutrEqService.insertBisEutrEq(bisEutrEq));
     }
 
+    @PostMapping("/withAnsw")
+    public AjaxResult addWithAnsw(@RequestBody BisEutrEqWithAnsw eqWithAnsw) {
+        return toAjax(bisEutrEqService.insertBisEutrEqWithAnsw(eqWithAnsw));
+    }
+
     @PutMapping
     public AjaxResult edit(@RequestBody BisEutrEq bisEutrEq) {
         return toAjax(bisEutrEqService.updateBisEutrEq(bisEutrEq));

+ 4 - 2
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrCourCate.java

@@ -3,6 +3,8 @@ package com.goldenwater.slaj.eutr.domain;
 import com.goldenwater.common.annotation.Excel;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /** 教育培训课程分类表 bis_eutr_cour_cate */
 @Data
 public class BisEutrCourCate {
@@ -21,10 +23,10 @@ public class BisEutrCourCate {
     private String note;
 
     /** 采集时间 */
-    private String collTime;
+    private LocalDateTime collTime;
 
     /** 更新时间 */
-    private String updTime;
+    private LocalDateTime updTime;
 
     /** 记录人 */
     private String recPers;

+ 4 - 2
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrEq.java

@@ -3,6 +3,8 @@ package com.goldenwater.slaj.eutr.domain;
 import com.goldenwater.common.annotation.Excel;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /** 教育培训题库表 bis_eutr_eq */
 @Data
 public class BisEutrEq {
@@ -44,10 +46,10 @@ public class BisEutrEq {
     private String note;
 
     /** 采集时间 */
-    private String collTime;
+    private LocalDateTime collTime;
 
     /** 更新时间 */
-    private String updTime;
+    private LocalDateTime updTime;
 
     /** 记录人 */
     private String recPers;

+ 11 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrEqWithAnsw.java

@@ -0,0 +1,11 @@
+package com.goldenwater.slaj.eutr.domain;
+
+import lombok.Data;
+
+@Data
+public class BisEutrEqWithAnsw {
+
+    private BisEutrEq eq;
+
+    private BisEutrEqAnsw answ;
+}

+ 4 - 2
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrExam.java

@@ -3,6 +3,8 @@ package com.goldenwater.slaj.eutr.domain;
 import com.goldenwater.common.annotation.Excel;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /** 教育培训考试表 bis_eutr_exam */
 @Data
 public class BisEutrExam {
@@ -43,10 +45,10 @@ public class BisEutrExam {
     private String note;
 
     /** 采集时间 */
-    private String collTime;
+    private LocalDateTime collTime;
 
     /** 更新时间 */
-    private String updTime;
+    private LocalDateTime updTime;
 
     /** 记录人 */
     private String recPers;

+ 4 - 2
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrExamStra.java

@@ -3,6 +3,8 @@ package com.goldenwater.slaj.eutr.domain;
 import com.goldenwater.common.annotation.Excel;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /** 教育培训考试策略表 bis_eutr_exam_stra */
 @Data
 public class BisEutrExamStra {
@@ -33,10 +35,10 @@ public class BisEutrExamStra {
     private String note;
 
     /** 采集时间 */
-    private String collTime;
+    private LocalDateTime collTime;
 
     /** 更新时间 */
-    private String updTime;
+    private LocalDateTime updTime;
 
     /** 记录人 */
     private String recPers;

+ 4 - 2
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrOfflRec.java

@@ -3,6 +3,8 @@ package com.goldenwater.slaj.eutr.domain;
 import com.goldenwater.common.annotation.Excel;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /** 教育培训线下记录表 bis_eutr_offl_rec */
 @Data
 public class BisEutrOfflRec {
@@ -48,10 +50,10 @@ public class BisEutrOfflRec {
     private String note;
 
     /** 采集时间 */
-    private String collTime;
+    private  LocalDateTime collTime;
 
     /** 更新时间 */
-    private String updTime;
+    private LocalDateTime updTime;
 
     /** 记录人 */
     private String recPers;

+ 4 - 2
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/BisEutrPlan.java

@@ -3,6 +3,8 @@ package com.goldenwater.slaj.eutr.domain;
 import com.goldenwater.common.annotation.Excel;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /** 教育培训计划表 bis_eutr_plan */
 @Data
 public class BisEutrPlan {
@@ -45,10 +47,10 @@ public class BisEutrPlan {
     private String note;
 
     /** 采集时间 */
-    private String collTime;
+    private LocalDateTime collTime;
 
     /** 更新时间 */
-    private String updTime;
+    private LocalDateTime updTime;
 
     /** 记录人 */
     private String recPers;

+ 4 - 2
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/domain/ObjEutrCour.java

@@ -3,6 +3,8 @@ package com.goldenwater.slaj.eutr.domain;
 import com.goldenwater.common.annotation.Excel;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /** 教育培训课程表 obj_eutr_cour */
 @Data
 public class ObjEutrCour {
@@ -54,10 +56,10 @@ public class ObjEutrCour {
     private String note;
 
     /** 采集时间 */
-    private String collTime;
+    private LocalDateTime collTime;
 
     /** 更新时间 */
-    private String updTime;
+    private LocalDateTime updTime;
 
     /** 记录人 */
     private String recPers;

+ 1 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/mapper/BisEutrEqAnswMapper.java

@@ -12,4 +12,5 @@ public interface BisEutrEqAnswMapper {
     int updateBisEutrEqAnsw(BisEutrEqAnsw bisEutrEqAnsw);
     int deleteBisEutrEqAnswByGuid(String guid);
     int deleteBisEutrEqAnswByGuids(String[] guids);
+    int deleteBisEutrEqAnswByEqGuid(String eqGuid);
 }

+ 1 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/IBisEutrEqAnswService.java

@@ -10,4 +10,5 @@ public interface IBisEutrEqAnswService {
     int updateBisEutrEqAnsw(BisEutrEqAnsw bisEutrEqAnsw);
     int deleteBisEutrEqAnswByGuid(String guid);
     int deleteBisEutrEqAnswByGuids(String[] guids);
+    int deleteBisEutrEqAnswByEqGuid(String eqGuid);
 }

+ 2 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/IBisEutrEqService.java

@@ -2,6 +2,7 @@ package com.goldenwater.slaj.eutr.service;
 
 import java.util.List;
 import com.goldenwater.slaj.eutr.domain.BisEutrEq;
+import com.goldenwater.slaj.eutr.domain.BisEutrEqWithAnsw;
 
 public interface IBisEutrEqService {
     BisEutrEq selectBisEutrEqByGuid(String guid);
@@ -10,4 +11,5 @@ public interface IBisEutrEqService {
     int updateBisEutrEq(BisEutrEq bisEutrEq);
     int deleteBisEutrEqByGuid(String guid);
     int deleteBisEutrEqByGuids(String[] guids);
+    int insertBisEutrEqWithAnsw(BisEutrEqWithAnsw eqWithAnsw);
 }

+ 7 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrCourCateServiceImpl.java

@@ -1,6 +1,8 @@
 package com.goldenwater.slaj.eutr.service.impl;
 
+import java.util.Date;
 import java.util.List;
+import java.time.LocalDateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goldenwater.slaj.eutr.mapper.BisEutrCourCateMapper;
@@ -24,11 +26,16 @@ public class BisEutrCourCateServiceImpl implements IBisEutrCourCateService {
 
     @Override
     public int insertBisEutrCourCate(BisEutrCourCate bisEutrCourCate) {
+        if (bisEutrCourCate.getGuid() == null || bisEutrCourCate.getGuid().isEmpty()) {
+            bisEutrCourCate.setGuid(java.util.UUID.randomUUID().toString().replace("-", ""));
+        }
+        bisEutrCourCate.setCollTime(LocalDateTime.now());
         return bisEutrCourCateMapper.insertBisEutrCourCate(bisEutrCourCate);
     }
 
     @Override
     public int updateBisEutrCourCate(BisEutrCourCate bisEutrCourCate) {
+        bisEutrCourCate.setUpdTime(LocalDateTime.now());
         return bisEutrCourCateMapper.updateBisEutrCourCate(bisEutrCourCate);
     }
 

+ 5 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrEqAnswServiceImpl.java

@@ -41,4 +41,9 @@ public class BisEutrEqAnswServiceImpl implements IBisEutrEqAnswService {
     public int deleteBisEutrEqAnswByGuids(String[] guids) {
         return bisEutrEqAnswMapper.deleteBisEutrEqAnswByGuids(guids);
     }
+
+    @Override
+    public int deleteBisEutrEqAnswByEqGuid(String eqGuid) {
+        return bisEutrEqAnswMapper.deleteBisEutrEqAnswByEqGuid(eqGuid);
+    }
 }

+ 35 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrEqServiceImpl.java

@@ -1,10 +1,16 @@
 package com.goldenwater.slaj.eutr.service.impl;
 
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.UUID;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import com.goldenwater.slaj.eutr.mapper.BisEutrEqMapper;
 import com.goldenwater.slaj.eutr.domain.BisEutrEq;
+import com.goldenwater.slaj.eutr.domain.BisEutrEqAnsw;
+import com.goldenwater.slaj.eutr.domain.BisEutrEqWithAnsw;
+import com.goldenwater.slaj.eutr.mapper.BisEutrEqAnswMapper;
 import com.goldenwater.slaj.eutr.service.IBisEutrEqService;
 
 @Service
@@ -12,6 +18,9 @@ public class BisEutrEqServiceImpl implements IBisEutrEqService {
     @Autowired
     private BisEutrEqMapper bisEutrEqMapper;
 
+    @Autowired
+    private BisEutrEqAnswMapper bisEutrEqAnswMapper;
+
     @Override
     public BisEutrEq selectBisEutrEqByGuid(String guid) {
         return bisEutrEqMapper.selectBisEutrEqByGuid(guid);
@@ -24,6 +33,10 @@ public class BisEutrEqServiceImpl implements IBisEutrEqService {
 
     @Override
     public int insertBisEutrEq(BisEutrEq bisEutrEq) {
+        if (bisEutrEq.getGuid() == null || bisEutrEq.getGuid().isEmpty()) {
+            bisEutrEq.setGuid(java.util.UUID.randomUUID().toString().replace("-", ""));
+        }
+        bisEutrEq.setCollTime(LocalDateTime.now());
         return bisEutrEqMapper.insertBisEutrEq(bisEutrEq);
     }
 
@@ -41,4 +54,26 @@ public class BisEutrEqServiceImpl implements IBisEutrEqService {
     public int deleteBisEutrEqByGuids(String[] guids) {
         return bisEutrEqMapper.deleteBisEutrEqByGuids(guids);
     }
+
+    @Override
+    @Transactional
+    public int insertBisEutrEqWithAnsw(BisEutrEqWithAnsw eqWithAnsw) {
+        BisEutrEq eq = eqWithAnsw.getEq();
+        if (eq.getGuid() == null || eq.getGuid().isEmpty()) {
+            eq.setGuid(UUID.randomUUID().toString().replace("-", ""));
+        }
+        eq.setCollTime( LocalDateTime.now());
+        int rows = bisEutrEqMapper.insertBisEutrEq(eq);
+
+        BisEutrEqAnsw answ = eqWithAnsw.getAnsw();
+        if (answ != null) {
+            if (answ.getGuid() == null || answ.getGuid().isEmpty()) {
+                answ.setGuid(UUID.randomUUID().toString().replace("-", ""));
+            }
+            answ.setEqGuid(eq.getGuid());
+            answ.setCollTime(String.valueOf(LocalDateTime.now()));
+            bisEutrEqAnswMapper.insertBisEutrEqAnsw(answ);
+        }
+        return rows;
+    }
 }

+ 5 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrExamServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goldenwater.slaj.eutr.service.impl;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,6 +25,10 @@ public class BisEutrExamServiceImpl implements IBisEutrExamService {
 
     @Override
     public int insertBisEutrExam(BisEutrExam bisEutrExam) {
+        if (bisEutrExam.getGuid() == null || bisEutrExam.getGuid().isEmpty()) {
+            bisEutrExam.setGuid(java.util.UUID.randomUUID().toString().replace("-", ""));
+        }
+        bisEutrExam.setCollTime(LocalDateTime.now());
         return bisEutrExamMapper.insertBisEutrExam(bisEutrExam);
     }
 

+ 7 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrExamStraServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goldenwater.slaj.eutr.service.impl;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,16 +20,22 @@ public class BisEutrExamStraServiceImpl implements IBisEutrExamStraService {
 
     @Override
     public List<BisEutrExamStra> selectBisEutrExamStraList(BisEutrExamStra bisEutrExamStra) {
+
         return bisEutrExamStraMapper.selectBisEutrExamStraList(bisEutrExamStra);
     }
 
     @Override
     public int insertBisEutrExamStra(BisEutrExamStra bisEutrExamStra) {
+        if (bisEutrExamStra.getGuid() == null || bisEutrExamStra.getGuid().isEmpty()) {
+            bisEutrExamStra.setGuid(java.util.UUID.randomUUID().toString().replace("-", ""));
+        }
+        bisEutrExamStra.setCollTime(LocalDateTime.now());
         return bisEutrExamStraMapper.insertBisEutrExamStra(bisEutrExamStra);
     }
 
     @Override
     public int updateBisEutrExamStra(BisEutrExamStra bisEutrExamStra) {
+        bisEutrExamStra.setUpdTime(LocalDateTime.now());
         return bisEutrExamStraMapper.updateBisEutrExamStra(bisEutrExamStra);
     }
 

+ 6 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrOfflRecServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goldenwater.slaj.eutr.service.impl;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,11 +25,16 @@ public class BisEutrOfflRecServiceImpl implements IBisEutrOfflRecService {
 
     @Override
     public int insertBisEutrOfflRec(BisEutrOfflRec bisEutrOfflRec) {
+        if (bisEutrOfflRec.getGuid() == null || bisEutrOfflRec.getGuid().isEmpty()) {
+            bisEutrOfflRec.setGuid(java.util.UUID.randomUUID().toString().replace("-", ""));
+        }
+        bisEutrOfflRec.setCollTime(LocalDateTime.now());
         return bisEutrOfflRecMapper.insertBisEutrOfflRec(bisEutrOfflRec);
     }
 
     @Override
     public int updateBisEutrOfflRec(BisEutrOfflRec bisEutrOfflRec) {
+        bisEutrOfflRec.setUpdTime(LocalDateTime.now());
         return bisEutrOfflRecMapper.updateBisEutrOfflRec(bisEutrOfflRec);
     }
 

+ 6 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrPlanServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goldenwater.slaj.eutr.service.impl;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,11 +25,16 @@ public class BisEutrPlanServiceImpl implements IBisEutrPlanService {
 
     @Override
     public int insertBisEutrPlan(BisEutrPlan bisEutrPlan) {
+        if (bisEutrPlan.getGuid() == null || bisEutrPlan.getGuid().isEmpty()) {
+            bisEutrPlan.setGuid(java.util.UUID.randomUUID().toString().replace("-", ""));
+        }
+        bisEutrPlan.setCollTime(LocalDateTime.now());
         return bisEutrPlanMapper.insertBisEutrPlan(bisEutrPlan);
     }
 
     @Override
     public int updateBisEutrPlan(BisEutrPlan bisEutrPlan) {
+        bisEutrPlan.setUpdTime(LocalDateTime.now());
         return bisEutrPlanMapper.updateBisEutrPlan(bisEutrPlan);
     }
 

+ 1 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/BisEutrRecServiceImpl.java

@@ -24,6 +24,7 @@ public class BisEutrRecServiceImpl implements IBisEutrRecService {
 
     @Override
     public int insertBisEutrRec(BisEutrRec bisEutrRec) {
+
         return bisEutrRecMapper.insertBisEutrRec(bisEutrRec);
     }
 

+ 6 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/eutr/service/impl/ObjEutrCourServiceImpl.java

@@ -1,6 +1,8 @@
 package com.goldenwater.slaj.eutr.service.impl;
 
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.UUID;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goldenwater.slaj.eutr.mapper.ObjEutrCourMapper;
@@ -24,6 +26,10 @@ public class ObjEutrCourServiceImpl implements IObjEutrCourService {
 
     @Override
     public int insertObjEutrCour(ObjEutrCour objEutrCour) {
+        if (objEutrCour.getGuid() == null || objEutrCour.getGuid().isEmpty()) {
+            objEutrCour.setGuid(UUID.randomUUID().toString().replace("-", ""));
+        }
+        objEutrCour.setCollTime(LocalDateTime.now());
         return objEutrCourMapper.insertObjEutrCour(objEutrCour);
     }
 

+ 4 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/speq/controller/BisSpeqQusaiOperItemController.java

@@ -1,6 +1,7 @@
 package com.goldenwater.slaj.speq.controller;
 
 import java.util.List;
+import java.util.UUID;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,6 +36,9 @@ public class BisSpeqQusaiOperItemController extends BaseController {
 
     @PostMapping
     public AjaxResult add(@RequestBody BisSpeqQusaiOperItem bisSpeqQusaiOperItem) {
+        if (bisSpeqQusaiOperItem.getGuid() == null || bisSpeqQusaiOperItem.getGuid().isEmpty()) {
+            bisSpeqQusaiOperItem.setGuid(UUID.randomUUID().toString().replace("-", ""));
+        }
         return toAjax(bisSpeqQusaiOperItemService.insertBisSpeqQusaiOperItem(bisSpeqQusaiOperItem));
     }
 

+ 4 - 2
gw-slaj/src/main/java/com/goldenwater/slaj/speq/domain/BisSpeqSpeOperPers.java

@@ -3,6 +3,8 @@ package com.goldenwater.slaj.speq.domain;
 import com.goldenwater.common.annotation.Excel;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /** 特种作业人员表 bis_speq_spe_oper_pers */
 @Data
 public class BisSpeqSpeOperPers {
@@ -31,9 +33,9 @@ public class BisSpeqSpeOperPers {
     /** 备注 */
     private String note;
     /** 采集时间 */
-    private String collTime;
+    private LocalDateTime collTime;
     /** 更新时间 */
-    private String updTime;
+    private LocalDateTime updTime;
     /** 记录人员 */
     private String recPers;
 }

+ 9 - 0
gw-slaj/src/main/java/com/goldenwater/slaj/speq/service/impl/BisSpeqSpeOperPersServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goldenwater.slaj.speq.service.impl;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,11 +26,19 @@ public class BisSpeqSpeOperPersServiceImpl implements IBisSpeqSpeOperPersService
 
     @Override
     public int insertBisSpeqSpeOperPers(BisSpeqSpeOperPers bisSpeqSpeOperPers) {
+
+        if (bisSpeqSpeOperPers.getGuid() == null || bisSpeqSpeOperPers.getGuid().isEmpty()) {
+            bisSpeqSpeOperPers.setGuid(java.util.UUID.randomUUID().toString().replace("-", ""));
+        }
+
+        bisSpeqSpeOperPers.setCollTime(LocalDateTime.now());
+
         return bisSpeqSpeOperPersMapper.insertBisSpeqSpeOperPers(bisSpeqSpeOperPers);
     }
 
     @Override
     public int updateBisSpeqSpeOperPers(BisSpeqSpeOperPers bisSpeqSpeOperPers) {
+        bisSpeqSpeOperPers.setUpdTime(LocalDateTime.now());
         return bisSpeqSpeOperPersMapper.updateBisSpeqSpeOperPers(bisSpeqSpeOperPers);
     }
 

+ 3 - 0
gw-slaj/src/main/resources/mapper/slaj/eutr/BisEutrEqAnswMapper.xml

@@ -60,4 +60,7 @@
             #{guid}
         </foreach>
     </delete>
+    <delete id="deleteBisEutrEqAnswByEqGuid" parameterType="String">
+        delete from bis_eutr_eq_answ where eq_guid = #{eqGuid}
+    </delete>
 </mapper>

+ 1 - 0
gw-slaj/src/main/resources/mapper/slaj/speq/BisSpeqQusaiOperItemMapper.xml

@@ -25,6 +25,7 @@
     <select id="selectBisSpeqQusaiOperItemList" parameterType="com.goldenwater.slaj.speq.domain.BisSpeqQusaiOperItem" resultMap="BisSpeqQusaiOperItemResult">
         <include refid="selectBisSpeqQusaiOperItemVo"/>
         <where>
+            <if test="speqSpeOperCertGuid != null and speqSpeOperCertGuid != ''">AND speq_spe_oper_cert_guid = #{speqSpeOperCertGuid}</if>
             <if test="citNum != null and citNum != ''">AND cit_num like '%' || #{citNum} || '%'</if>
         </where>
     </select>