修复bug

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

@@ -3,6 +3,7 @@ package com.ruoyi.zdsz.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSON;
 import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.ruoyi.common.annotation.DynamicName;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -64,6 +65,8 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     @Resource
     private ZMaterialStatisticsMapper zMaterialStatisticsMapper;
     @Resource
+    private ZEngineeringInfoMapper zEngineeringInfoMapper;
+    @Resource
     private ZEngineeringNodeMapper zEngineeringNodeMapper;
     @Resource
     private IZEngineeringReviewService izEngineeringReviewService;
@@ -655,7 +658,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
         ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoOne(lqw);
         if ("indoor_engin".equals(bo.getEnginClassification()) || "courtyard".equals(bo.getEnginClassification()) || "overhead".equals(bo.getEnginClassification())) {
-            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo()) || !ObjectUtils.isEmpty(bo.getzEngineeringNodeBoList()) || bo.getzEngineeringNodeBoList().size() > 0)
+           if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo()) || !ObjectUtils.isEmpty(bo.getzEngineeringNodeBoList()) || bo.getzEngineeringNodeBoList().size() > 0)
                 izMaterialStatisticsService.insert(bo);
         }
         if (ObjectUtils.isEmpty(zEngineeringCivilVo)) {
@@ -972,7 +975,12 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         });
         infoIdList.getInfoIdList().stream().forEach(item -> {
             item.setState(zEngineeringReviewBo.getReviewStatus());
-            izEngineeringInfoService.update(item);
+            SimpleDateFormat format=new SimpleDateFormat("yyyy_MM");
+            UpdateWrapper<ZEngineeringInfo> lqw = new UpdateWrapper();
+            lqw.eq("id",item.getId()).set("state",zEngineeringReviewBo.getReviewStatus());
+            MonthTableNameHandler.setData(format.format(item.getCreateTime()));
+            zEngineeringInfoMapper.update(lqw);
+            MonthTableNameHandler.removeData();
         });
         ZEngineeringCivil zEngineeringCivil = baseMapper.selectById(zEngineeringNode.getCivliId());
         ZEngineeringCivilBo zEngineeringCivilBo = BeanUtil.copyProperties(zEngineeringCivil, ZEngineeringCivilBo.class);

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

@@ -694,8 +694,8 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             lqwstatis.eq(StringUtils.isNotBlank(zEngineeringCivil.getBuildingId()), ZMaterialStatistics::getBuildingId, zEngineeringCivil.getBuildingId());
             lqwstatis.eq(StringUtils.isNotBlank(zEngineeringCivil.getUnitId()), ZMaterialStatistics::getUnitId, zEngineeringCivil.getUnitId());
             lqwstatis.eq(StringUtils.isNotBlank(zEngineeringCivil.getHouseId()), ZMaterialStatistics::getHouseId, zEngineeringCivil.getHouseId());
-            lqwstatis.eq(StringUtils.isNotBlank(item.getMaterialQuality()), ZMaterialStatistics::getRealityQuality, item.getMaterialQuality());
-            lqwstatis.eq(StringUtils.isNotBlank(item.getSpecifications()), ZMaterialStatistics::getRealitySpecifications, item.getSpecifications());
+            lqwstatis.eq( ZMaterialStatistics::getRealityQuality, item.getMaterialQuality());
+            lqwstatis.eq( ZMaterialStatistics::getRealitySpecifications, item.getSpecifications());
             lqwstatis.eq(StringUtils.isNotBlank(zEngineeringCivil.getEnginCycle()), ZMaterialStatistics::getEnginCycle, zEngineeringCivil.getEnginCycle());
             lqwstatis.eq(StringUtils.isNotBlank(zEngineeringCivil.getEnginClassification()), ZMaterialStatistics::getEnginClassification, zEngineeringCivil.getEnginClassification());
             lqwstatis.eq(StringUtils.isNotBlank(zEngineeringCivil.getEnginType()), ZMaterialStatistics::getEnginType, zEngineeringCivil.getEnginType());