Merge branch 'zdsz3.0' of http://192.168.10.18:3000/sunwei/zdsz_java into zdsz3.0

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

@@ -42,10 +42,10 @@ public class ZMaterialStatisticsController extends BaseController {
     /**
      * 查询用料统计列表
      */
-    @SaCheckPermission("zdsz:materialStatistics:list")
+    //@SaCheckPermission("zdsz:materialStatistics:list")
     @GetMapping("/list")
-    public TableDataInfo<ZMaterialStatisticsVo> list(ZMaterialStatisticsBo bo, PageQuery pageQuery) {
-        return iZMaterialStatisticsService.queryPageList(bo, pageQuery);
+    public R list(ZMaterialStatisticsBo bo) {
+        return R.ok(iZMaterialStatisticsService.queryList(bo));
     }
 
     /**

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringCivil.java

@@ -67,7 +67,7 @@ public class ZEngineeringCivil extends BaseEntity {
      * 乐观锁
      */
     @Version
-    private String version;
+    private  Long version;
     /**
      * 默认图片地址
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringDangerous.java

@@ -165,7 +165,7 @@ public class ZEngineeringDangerous extends BaseEntity {
      * 乐观锁
      */
     @Version
-    private String version;
+    private  Long version;
     /**
      * 备注
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringIndustry.java

@@ -87,7 +87,7 @@ public class ZEngineeringIndustry extends BaseEntity {
      * 乐观锁
      */
     @Version
-    private String version;
+    private  Long version;
     /**
      * 备注
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringInfo.java

@@ -25,7 +25,7 @@ public class ZEngineeringInfo extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private String id;
@@ -74,7 +74,7 @@ public class ZEngineeringInfo extends BaseEntity {
      * 乐观锁
      */
     @Version
-    private String version;
+    private  Long version;
     /**
      * 备注
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringInfrastructure.java

@@ -61,7 +61,7 @@ public class ZEngineeringInfrastructure extends BaseEntity {
      * 乐观锁
      */
     @Version
-    private String version;
+    private  Long version;
     /**
      * 备注
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringMaterial.java

@@ -64,7 +64,7 @@ public class ZEngineeringMaterial extends BaseEntity {
      * 乐观锁
      */
     @Version
-    private String version;
+    private  Long version;
     /**
      * 备注
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringNode.java

@@ -23,7 +23,7 @@ public class ZEngineeringNode extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private String id;
@@ -39,7 +39,7 @@ public class ZEngineeringNode extends BaseEntity {
      * 乐观锁
      */
     @Version
-    private String version;
+    private  Long version;
     /**
      * 备注
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringPipeJacking.java

@@ -64,7 +64,7 @@ public class ZEngineeringPipeJacking extends BaseEntity {
      * 乐观锁
      */
     @Version
-    private String version;
+    private  Long version;
     /**
      * 备注
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringReview.java

@@ -53,7 +53,7 @@ public class ZEngineeringReview extends BaseEntity {
      * 乐观锁
      */
     @Version
-    private String version;
+    private  Long version;
     /**
      * 备注
      */

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

@@ -94,7 +94,6 @@ public class ZEngineeringIndustryBo extends BaseEntity {
     /**
      * 工程分类
      */
-    @NotBlank(message = "工程分类不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginClassification;
 
 

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

@@ -46,37 +46,37 @@ public class ZEngineeringPipeJackingBo extends BaseEntity {
     /**
      * 工程地址
      */
-//    @NotBlank(message = "工程地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "工程地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginAddre;
 
     /**
      * 工程编码
      */
-//    @NotBlank(message = "工程编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "工程编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginCode;
 
     /**
      * 施工单位
      */
-//    @NotBlank(message = "施工单位不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "施工单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructUnit;
 
     /**
      * 工程规模
      */
-//    @NotBlank(message = "工程规模不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "工程规模不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginScale;
 
     /**
      * 施工质量
      */
-//    @NotBlank(message = "施工质量不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "施工质量不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructQuality;
 
     /**
      * 施工进度
      */
-//    @NotBlank(message = "施工进度不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "施工进度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructSchedule;
 
     /**

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringPipeJackingMapper.java

@@ -18,4 +18,6 @@ public interface ZEngineeringPipeJackingMapper extends BaseMapperPlus<ZEngineeri
     List<Map<String,Object>> getIndustry(String enginId);
     List<Map<String,Object>> getDangerous(String enginId);
     List<Map<String,Object>> getInfrastructure(String enginId);
+
+    List<Map<String, Object>> getSg(String enginId,String type);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZMaterialStatisticsMapper.java

@@ -1,8 +1,12 @@
 package com.ruoyi.zdsz.mapper;
 
 import com.ruoyi.zdsz.domain.ZMaterialStatistics;
+import com.ruoyi.zdsz.domain.bo.ZMaterialStatisticsBo;
 import com.ruoyi.zdsz.domain.vo.ZMaterialStatisticsVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 用料统计Mapper接口
@@ -12,4 +16,8 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  */
 public interface ZMaterialStatisticsMapper extends BaseMapperPlus<ZMaterialStatisticsMapper, ZMaterialStatistics, ZMaterialStatisticsVo> {
 
+
+
+    List<ZMaterialStatisticsVo>  getZMaterialStatisticsList(@Param("p")ZMaterialStatisticsBo zMaterialStatistics);
+
 }

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

@@ -27,7 +27,7 @@ public interface IZEngineeringDangerousService {
      */
     TableDataInfo<ZEngineeringDangerousVo> queryPageList(ZEngineeringDangerousBo bo, PageQuery pageQuery);
 
-     ZEngineeringDangerousBo query(String id);
+     ZEngineeringDangerousBo query(String id) ;
 
     /**
      * 查询危险工程列表

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

@@ -28,7 +28,7 @@ public interface IZEngineeringNodeService {
      * @param createTime
      * @return
      */
-    ZEngineeringNodeBo query(ZEngineeringNodeBo bo);
+    ZEngineeringNodeBo query(ZEngineeringNodeBo bo) ;
     /**
      * 获取工程节点列表
      * @param id

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

@@ -51,7 +51,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
 
     @Override
     @DynamicName(spel = "#bo.createTime")
-
+//    @Async("threadPoolTaskExecutor")
     public List<String> queryList(ZEngineeringInfoBo bo) {
         List<String> list =new ArrayList<>();
         LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
@@ -131,6 +131,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     @Override
     @DynamicName(spel = "#bo[0].createTime")
     @Transactional(rollbackFor = Exception.class)
+    @Async("threadPoolTaskExecutor")
     public Boolean updateBatch(List<ZEngiineeringPhoto> bo) {
         ZEngiineeringPhoto zEngiineeringPhoto = bo.get(0);
         LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();

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

@@ -65,7 +65,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
      * 查询危险工程详情
      */
     @Override
-    public ZEngineeringDangerousBo query(String id) {
+    public ZEngineeringDangerousBo query(String id)  {
         ZEngineeringDangerousVo zEngineeringDangerousVo = baseMapper.selectVoById(id);
         ZEngineeringDangerousBo zEngineeringDangerousBo = BeanUtil.toBean(zEngineeringDangerousVo, ZEngineeringDangerousBo.class);
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();

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

@@ -89,9 +89,9 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringIndustry> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
-        lqw.eq(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringIndustry::getEnginName, bo.getEnginName());
+        lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringIndustry::getEnginName, bo.getEnginName());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
-        lqw.like(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringIndustry::getConstructUnit, bo.getConstructUnit());
+        lqw.eq(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringIndustry::getConstructUnit, bo.getConstructUnit());
         lqw.eq(StringUtils.isNotBlank(bo.getProjectHead()), ZEngineeringIndustry::getProjectHead, bo.getProjectHead());
         lqw.eq(StringUtils.isNotBlank(bo.getSceneHead()), ZEngineeringIndustry::getSceneHead, bo.getSceneHead());
         lqw.eq(StringUtils.isNotBlank(bo.getDesignUnit()), ZEngineeringIndustry::getDesignUnit, bo.getDesignUnit());
@@ -157,7 +157,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
             zEngineeringNodeBo.setCivliId(vo.getId());
             List<ZEngineeringNodeBo> zEngineeringNodeBos = nodeService.queryListDetails(zEngineeringNodeBo);
-            zEngineeringNodeBos.stream().forEach(ite ->
+            zEngineeringNodeBos.forEach(ite ->
                 nodeService.delete(ite)
             );
         });

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

@@ -63,7 +63,6 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
 
     @Override
     @DynamicName(spel = "#bo.createTime")
-
     public List<ZEngineeringInfoBo> query(ZEngineeringNodeBo bo) {
         LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
         List<ZEngineeringInfo> zEngineeringInfoVoList= baseMapper.selectList(lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getEngInfoId, bo.getId()));
@@ -143,6 +142,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     @Override
     @DynamicName(spel = "#bo.createTime")
     @Transactional(rollbackFor=Exception.class)
+
     public ZEngineeringInfo insert(ZEngineeringInfoBo bo) {
         ZEngineeringInfo add = BeanUtil.toBean(bo, ZEngineeringInfo.class);
         validEntityBeforeSave(add);
@@ -157,6 +157,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         bo.getzEngineeringMaterialBo().stream().forEach(item->{
             item.setDetailsId(add.getId());
             item.setCreateTime(bo.getCreateTime());
+            item.setUpdateTime(bo.getUpdateTime());
             izEngineeringMaterialService.insert(item);
         });
         }
@@ -166,6 +167,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             zEngiineeringPhoto.setParentId(add.getId());
             zEngiineeringPhoto.setPicUrl(item);
             zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+            zEngiineeringPhoto.setUpdateTime(bo.getUpdateTime());
                 photoList.add(zEngiineeringPhoto);
         });
         izEngiineeringPhotoService.insertBatch(photoList);
@@ -196,10 +198,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             photoList.add(zEngiineeringPhoto);
         });
         izEngiineeringPhotoService.updateBatch(photoList);
-
-            izEngineeringMaterialService.updateList(bo);
-
-
+        izEngineeringMaterialService.updateList(bo);
         return baseMapper.updateById(update) > 0;
     }
 

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

@@ -47,7 +47,7 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
 
     @Override
     @DynamicName(spel = "#bo.createTime")
-
+//    @Async("threadPoolTaskExecutor")
     public List<ZEngineeringMaterialBo> query(ZEngineeringInfoBo bo) {
         LambdaQueryWrapper<ZEngineeringMaterial> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringMaterial::getDetailsId, bo.getId());
@@ -109,6 +109,7 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
     @Override
     @DynamicName(spel = "#bo.createTime")
     @Transactional(rollbackFor=Exception.class)
+    @Async("threadPoolTaskExecutor")
     public ZEngineeringMaterial insert(ZEngineeringMaterialBo bo) {
         ZEngineeringMaterial add = BeanUtil.toBean(bo, ZEngineeringMaterial.class);
         validEntityBeforeSave(add);
@@ -140,6 +141,7 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
     @Override
     @DynamicName(spel = "#Infobo.createTime")
     @Transactional(rollbackFor = Exception.class)
+    @Async("threadPoolTaskExecutor")
     public Boolean updateList(ZEngineeringInfoBo Infobo) {
         List<ZEngineeringMaterialBo> bo=Infobo.getzEngineeringMaterialBo();
         LambdaQueryWrapper<ZEngineeringMaterial> lqw = Wrappers.lambdaQuery();

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

@@ -21,6 +21,7 @@ import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -61,7 +62,8 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
 
     @Override
     @DynamicName(spel = "#bo.createTime")
-    public ZEngineeringNodeBo query(ZEngineeringNodeBo bo) {
+//    @Async("threadPoolTaskExecutor")
+    public ZEngineeringNodeBo query(ZEngineeringNodeBo bo){
         LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getCivliId()), ZEngineeringNode::getCivliId, bo.getCivliId());
         lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringNode::getType, bo.getType());
@@ -216,8 +218,10 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 bo.setId(add.getId());
             }
         }
+        bo.setUpdateTime(new Date());
         bo.getzEngineeringInfoBo().setEngInfoId(add.getId());
         bo.getzEngineeringInfoBo().setCreateTime(bo.getCreateTime());
+        bo.getzEngineeringInfoBo().setUpdateTime(bo.getUpdateTime());
         izEngineeringInfoService.insert(bo.getzEngineeringInfoBo());
         return add;
     }

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

@@ -114,20 +114,28 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         ZEngineeringPipeJacking add = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(add);
         //民用
-        if ("0".equals(bo.getType())){
+        if ("民用工程".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getCivil(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginAddre((String) civil.get(0).get("name"));
             }
         }
         //市政
-        else if("1".equals(bo.getType())){
+        else if("市政工程".equals(bo.getType())){
+            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId(),"2");
+            if (!civil.isEmpty()){
+                add.setEnginAddre((String) civil.get(0).get("name"));
+            }
         }
         //工业
-        else if("2".equals(bo.getType())){
+        else if("工业工程".equals(bo.getType())){
+            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId(),"1");
+            if (!civil.isEmpty()){
+                add.setEnginAddre((String) civil.get(0).get("name"));
+            }
         }
         // 危险
-        else if("4".equals(bo.getType())){
+        else if("危险作业工程".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getDangerous(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginName((String) civil.get(0).get("name"));
@@ -135,7 +143,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             }
         }
         //基建
-        else if("5".equals(bo.getType())){
+        else if("基建作业工程".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getInfrastructure(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginName((String) civil.get(0).get("name"));
@@ -181,20 +189,28 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         ZEngineeringPipeJacking update = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(update);
         //民用
-        if ("0".equals(bo.getType())){
+        if ("民用工程".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getCivil(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginAddre((String) civil.get(0).get("name"));
             }
         }
         //市政
-        else if("1".equals(bo.getType())){
+        else if("市政工程".equals(bo.getType())){
+            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId(),"2");
+            if (!civil.isEmpty()){
+                update.setEnginAddre((String) civil.get(0).get("name"));
+            }
         }
         //工业
-        else if("2".equals(bo.getType())){
+        else if("工业工程".equals(bo.getType())){
+            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId(),"1");
+            if (!civil.isEmpty()){
+                update.setEnginAddre((String) civil.get(0).get("name"));
+            }
         }
         // 危险
-        else if("4".equals(bo.getType())){
+        else if("危险作业工程".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getDangerous(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginName((String) civil.get(0).get("name"));
@@ -202,7 +218,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             }
         }
         //基建
-        else if("5".equals(bo.getType())){
+        else if("基建作业工程".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getInfrastructure(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginName((String) civil.get(0).get("name"));

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

@@ -66,7 +66,8 @@ public class ZMaterialStatisticsServiceImpl implements IZMaterialStatisticsServi
     @Override
     public List<ZMaterialStatisticsVo> queryList(ZMaterialStatisticsBo bo) {
         LambdaQueryWrapper<ZMaterialStatistics> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+
+        return baseMapper.getZMaterialStatisticsList(bo);
     }
 
     private LambdaQueryWrapper<ZMaterialStatistics> buildQueryWrapper(ZMaterialStatisticsBo bo) {
@@ -111,17 +112,17 @@ public class ZMaterialStatisticsServiceImpl implements IZMaterialStatisticsServi
                 lqw.eq(StringUtils.isNotBlank(bo.getHouseId()), ZMaterialStatistics::getHouseId, bo.getHouseId());
                 lqw.eq(StringUtils.isNotBlank(item.getMaterialQuality()), ZMaterialStatistics::getRealityQuality, item.getMaterialQuality());
                 lqw.eq(StringUtils.isNotBlank(item.getSpecifications()), ZMaterialStatistics::getRealitySpecifications, item.getSpecifications());
+                lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZMaterialStatistics::getEnginCycle, bo.getEnginCycle());
                 ZMaterialStatistics zMaterialStatistics= baseMapper.selectOne(lqw);
-
                 if (zMaterialStatistics!=null)
                 {
-                    zMaterialStatistics.setRealityQuality(String.valueOf(Math.toIntExact(zMaterialStatistics.getRealitySize())+item.getNumber()));
+                    zMaterialStatistics.setRealitySize(Math.toIntExact(zMaterialStatistics.getRealitySize())+item.getNumber());
                     baseMapper.updateById(zMaterialStatistics);
                 }else {
                     ZMaterialStatistics zMaterialStatistics1=new ZMaterialStatistics();
-                    BeanUtils.copyProperties(item,zMaterialStatistics1);
+                    BeanUtils.copyProperties(bo,zMaterialStatistics1);
                     zMaterialStatistics1.setRealityQuality(item.getMaterialQuality());
-                    zMaterialStatistics1.setRealitySpecifications(item.getMaterialQuality());
+                    zMaterialStatistics1.setRealitySpecifications(item.getSpecifications());
                     zMaterialStatistics1.setRealitySize(item.getNumber());
                     zMaterialStatistics1.setEnginCycle(bo.getEnginCycle());
                     baseMapper.insert(zMaterialStatistics1);

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringPipeJackingMapper.xml

@@ -67,5 +67,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             m.del_flag = '0'  and m.id = #{enginId}
     </select>
+    <select id="getSg" resultType="java.util.Map">
+        SELECT
+            m.id,m.engin_name as name
+        FROM
+            z_engineering_industry as m
+        WHERE
+            m.del_flag = '0'  and m.id = #{enginId} and m.type = #{type}
+    </select>
 
 </mapper>

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZMaterialStatisticsMapper.xml

@@ -21,6 +21,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
-
+<select id="getZMaterialStatisticsList" resultType="com.ruoyi.zdsz.domain.vo.ZMaterialStatisticsVo" >
+    SELECT
+        *
+    FROM
+        z_material_statistics
+    WHERE
+        del_flag = '0'
+        <if test="p.unitId != null  and p.unitId != ''">
+            and unit_id LIKE CONCAT('%',#{p.unitId},'%')
+        </if>
+        <if test="p.areaId != null  and p.areaId != ''">
+            and area_id = #{p.areaId}
+        </if>
+        <if test="p.realityQuality != null  and p.realityQuality != ''">
+            and reality_quality = #{p.realityQuality}
+        </if>
+        <if test="p.realitySpecifications != null  and p.realitySpecifications != ''">
+            and reality_specifications = #{p.realitySpecifications}
+        </if>
+    GROUP BY
+    unit_id,
+    area_id,
+    reality_quality,
+    reality_specifications
+</select>
 
 </mapper>