审核bug修复

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

@@ -15,6 +15,7 @@ import com.ruoyi.zdsz.domain.ZEngineeringCivil;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
+import com.ruoyi.zdsz.domain.bo.switchBo;
 import com.ruoyi.zdsz.domain.vo.BulidingStatusVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.vo.areaStatusVo;
@@ -224,6 +225,4 @@ public class ZEngineeringCivilController extends BaseController {
     public R batchNode( @RequestBody  ZEngineeringCivilBo bo) {
         return R.ok(iZEngineeringCivilService.batchNode(bo));
     }
-
-
 }

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

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.zdsz.domain.bo.switchBo;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
@@ -106,4 +107,11 @@ public class ZEngineeringNodeController extends BaseController {
                           @RequestBody ZEngineeringNodeBo bo) {
         return toAjax(iZEngineeringNodeService.delete(bo));
     }
+    @Log(title = "节点开关", businessType = BusinessType.DELETE)
+    @PostMapping("/batchNodes")
+    public R batchNodes(
+        @RequestBody switchBo bo) {
+        return R.ok(iZEngineeringNodeService.batchNodes(bo));
+    }
+
 }

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

@@ -0,0 +1,19 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class switchBo {
+    private String reviewContent;
+    private String reviewStatus;
+    private String activeNames;
+    private Date createTime;
+    private String areaId;
+    private String buildingId;
+    private String unitId;
+    private String houseId;
+    private String enginClassification;
+    private String enginType;
+    private String enginCycle;
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.zdsz.domain.ZEngineeringCivil;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
+import com.ruoyi.zdsz.domain.bo.switchBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -81,4 +82,5 @@ public interface IZEngineeringCivilService {
      */
     List<ZEngineeringNodeBo> getRivewStatus(String Id);
     Boolean  batchNode(ZEngineeringCivilBo bo);
+
 }

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

@@ -9,6 +9,7 @@ import com.ruoyi.zdsz.domain.ZHouse;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
+import com.ruoyi.zdsz.domain.bo.switchBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
 
@@ -107,6 +108,6 @@ public interface IZEngineeringNodeService {
     int Civilinsert(List<ZEngineeringCivil> zEngineeringCivilList,ZEngineeringNodeBo bo,String UserId);
 
     Integer  batchNode(List<ZHouse> zHouseList,ZEngineeringCivilBo zEngineeringCivilBo,String userId);
-
+    Integer  batchNodes(switchBo bo);
 
 }

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

@@ -16,10 +16,7 @@ import com.ruoyi.zdsz.domain.ZEngineeringCivil;
 import com.ruoyi.zdsz.domain.ZEngineeringNode;
 import com.ruoyi.zdsz.domain.ZEngineeringReview;
 import com.ruoyi.zdsz.domain.ZHouse;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
+import com.ruoyi.zdsz.domain.bo.*;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
 import com.ruoyi.zdsz.domain.vo.areaMessageVo;
@@ -393,6 +390,72 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         return 0;
     }
 
+    @Override
+    public Integer batchNodes(switchBo bo) {
+        LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
+        lqw.eq(ZEngineeringCivil::getBuildingId, bo.getBuildingId());
+//        .isNull(!StringUtils.isNotBlank(item.getBuildingId()),ZEngineeringCivil::getBuildingId);
+        lqw.eq(ZEngineeringCivil::getUnitId, bo.getUnitId());
+//            .isNull(!StringUtils.isNotBlank(item.getUnitId()),ZEngineeringCivil::getUnitId);
+        lqw.eq( ZEngineeringCivil::getHouseId, bo.getHouseId());
+//            .isNull(!StringUtils.isNotBlank(item.getId()),ZEngineeringCivil::getHouseId);
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
+        ZEngineeringCivilVo zEngineeringCivilVo = zEngineeringCivilMapper.selectVoOne(lqw);
+        if (!ObjectUtils.isEmpty(zEngineeringCivilVo)) {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy_MM");
+            MonthTableNameHandler.setData(simpleDateFormat.format(zEngineeringCivilVo.getCreateTime()));
+            LambdaQueryWrapper<ZEngineeringNode> lqw2 = Wrappers.lambdaQuery();
+            lqw2.eq(StringUtils.isNotBlank(zEngineeringCivilVo.getId()), ZEngineeringNode::getCivliId, zEngineeringCivilVo.getId());
+            lqw2.eq(StringUtils.isNotBlank(bo.getActiveNames()), ZEngineeringNode::getType, bo.getActiveNames());
+            ZEngineeringNode zEngineeringNode = baseMapper.selectOne(lqw2);
+            if (!ObjectUtils.isEmpty(zEngineeringNode)) {
+                ZEngineeringReview zEngineeringReview = new ZEngineeringReview();
+                zEngineeringReview.setReviewTime(new Date());
+                zEngineeringReview.setReviewStatus(bo.getReviewStatus());
+                zEngineeringReview.setReviewUser(LoginHelper.getLoginUser().getUserId().toString());
+                zEngineeringReview.setEngInfoId(zEngineeringNode.getId());
+                zEngineeringReviewMapper.insert(zEngineeringReview);
+            } else
+            {
+                ZEngineeringNode zEngineeringNode1=new ZEngineeringNode();
+                zEngineeringNode1.setCivliId(zEngineeringCivilVo.getId());
+                zEngineeringNode1.setType(bo.getActiveNames());
+                baseMapper.insert(zEngineeringNode1);
+                ZEngineeringReview zEngineeringReview=new ZEngineeringReview();
+                zEngineeringReview.setReviewTime(new Date());
+                zEngineeringReview.setReviewStatus(bo.getReviewStatus());
+                zEngineeringReview.setReviewUser(LoginHelper.getLoginUser().getUserId().toString());
+                zEngineeringReview.setEngInfoId(zEngineeringNode1.getId());
+                zEngineeringReviewMapper.insert(zEngineeringReview);
+            }
+            MonthTableNameHandler.removeData();
+        }else
+        {
+            ZEngineeringCivil zEngineeringCivil=new ZEngineeringCivil();
+            BeanUtils.copyProperties(bo,zEngineeringCivil);
+            BeanUtils.copyProperties(bo,zEngineeringCivil);
+            zEngineeringCivil.setId(null);
+            zEngineeringCivil.setCompletionStatus("施工中");
+            zEngineeringCivil.setHouseId(bo.getHouseId());
+            zEngineeringCivilMapper.insert(zEngineeringCivil);
+            ZEngineeringNode zEngineeringNode1=new ZEngineeringNode();
+            zEngineeringNode1.setCivliId(zEngineeringCivil.getId());
+            zEngineeringNode1.setType(bo.getActiveNames());
+            baseMapper.insert(zEngineeringNode1);
+            ZEngineeringReview zEngineeringReview=new ZEngineeringReview();
+            zEngineeringReview.setReviewTime(new Date());
+            zEngineeringReview.setReviewStatus(bo.getReviewStatus());
+            zEngineeringReview.setReviewUser(LoginHelper.getLoginUser().getUserId().toString());
+            zEngineeringReview.setEngInfoId(zEngineeringNode1.getId());
+            zEngineeringReviewMapper.insert(zEngineeringReview);
+        }
+
+        return null;
+    }
+
     public List getZEngineeringNodeList(String date, String UserId, ZEngineeringNodeBo bo) {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
         List<ZEngineeringNodeVo> list = new ArrayList<>();