Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringInfrastructureController.java

@@ -1,13 +1,17 @@
 package com.ruoyi.web.controller.zdsz;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
 import com.ruoyi.zdsz.service.IZEngineeringInfrastructureService;
+import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import lombok.RequiredArgsConstructor;
+
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -94,6 +98,18 @@ public class ZEngineeringInfrastructureController extends BaseController {
     }
 
     /**
+     * 基建工程审核
+     */
+    @SaCheckPermission("zdsz:engineeringInfrastructure:review")
+    @Log(title = "基建工程", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/review")
+    public R<Void> review(@Validated(AddGroup.class) @RequestBody ZEngineeringReviewBo bo) {
+        bo.setCreateTime(new Date());
+        return toAjax(iZEngineeringInfrastructureService.review(bo));
+    }
+
+    /**
      * 修改基建工程
      */
     @SaCheckPermission("zdsz:engineeringInfrastructure:edit")

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringReviewBo.java

@@ -62,7 +62,7 @@ public class ZEngineeringReviewBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringInfrastructureService.java

@@ -3,6 +3,7 @@ package com.ruoyi.zdsz.service;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
 
 import java.util.Collection;
@@ -42,6 +43,11 @@ public interface IZEngineeringInfrastructureService {
     Boolean insertByBo(ZEngineeringInfrastructureBo bo);
 
     /**
+     * 新增基建工程审核
+     */
+    Boolean review(ZEngineeringReviewBo bo);
+
+    /**
      * 修改基建工程
      */
     Boolean updateByBo(ZEngineeringInfrastructureBo bo);

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringInfrastructureServiceImpl.java

@@ -10,11 +10,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.zdsz.domain.ZEngineeringInfrastructure;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
 import com.ruoyi.zdsz.mapper.ZEngineeringInfrastructureMapper;
 import com.ruoyi.zdsz.service.IZEngineeringInfrastructureService;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
+import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,6 +42,9 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
     @Resource
     private final IZEngineeringNodeService izEngineeringNodeService;
 
+    @Resource
+    private final IZEngineeringReviewService izEngineeringReviewService;
+
     /**
      * 查询基建工程
      */
@@ -119,6 +124,23 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
     }
 
     /**
+     * 新增基建工程审核
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean review(ZEngineeringReviewBo bo) {
+        ZEngineeringReviewBo zEngineeringReviewBo = new ZEngineeringReviewBo();
+        zEngineeringReviewBo.setEngInfoId(bo.getEngInfoId());
+        List<ZEngineeringReviewVo> voList = izEngineeringReviewService.queryList(zEngineeringReviewBo);
+        if(voList.size() == 0){
+            return izEngineeringReviewService.insert(bo);
+        }else {
+            bo.setId(voList.get(0).getId());
+            return izEngineeringReviewService.updateByBo(bo);
+        }
+    }
+
+    /**
      * 修改基建工程
      */
     @Override