修改

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

@@ -41,6 +41,9 @@ public class ZEngineeringPipeJacking extends BaseEntity {
      * 工程编码
      */
     private String enginCode;
+
+    @TableField(exist = false)
+    private String type;
     /**
      * 施工单位
      */

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

@@ -41,7 +41,7 @@ public class ZEngineeringPipeJackingBo extends BaseEntity {
     /**
      * type
      */
-    private Integer type;
+    private String type;
 
     /**
      * 工程地址

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZComprehensiveVo.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import lombok.Data;
 import java.util.Date;
 
@@ -97,6 +98,6 @@ public class ZComprehensiveVo extends BaseEntity implements Serializable {
     /**
      * 出参
      */
-    private List<Map<String,Object>> mapList;
+    private List<ZEngiineeringPhotoVo> mapList;
 
 }

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

@@ -57,12 +57,10 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
     @Override
     public ZComprehensiveVo queryById(String id){
         ZComprehensiveVo vo = baseMapper.selectVoById(id);
-//        List<Map<String,Object>> list = new ArrayList<>();
-//        Map<String,Object> map = new HashMap<>();
-//        map.put("url","http://localhost/static/img/profile.f470f2a8.jpg");
-//        map.put("id","111");
-//        list.add(map);
-        vo.setMapList(photoMapper.getlist(id));
+        ZEngiineeringPhotoBo bo = new ZEngiineeringPhotoBo();
+        bo.setParentId(id);
+        bo.setCreateTime(vo.getCreateTime());
+        vo.setMapList(photoService.queryList(bo));
         return vo;
     }
 
@@ -71,9 +69,6 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
      */
     @Override
     public TableDataInfo<ZComprehensiveVo> queryPageList(ZComprehensiveBo bo, PageQuery pageQuery) {
-//        LambdaQueryWrapper<ZComprehensive> lqw = buildQueryWrapper(bo);
-//        Page<ZComprehensiveVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-//        return TableDataInfo.build(result);
         Page<ZComprehensiveVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
         Page<ZComprehensiveVo> list = baseMapper.getPageList(bo,page);
         return PageUtils.buildDataInfo(list);
@@ -128,10 +123,12 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
         return flag;
     }
 
+
     /**
      * 修改开栓|安检|维修
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(ZComprehensiveBo bo) {
         ZComprehensive update = BeanUtil.toBean(bo, ZComprehensive.class);
         validEntityBeforeSave(update);
@@ -139,10 +136,13 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
             bo.setId(bo.getId());
             List<ZEngiineeringPhoto> list = new ArrayList<>();
             if (!bo.getPicIds().isEmpty()) {
-                List<String> collect = photoMapper.getlist(bo.getId()).stream().map(ele -> String.valueOf(ele.get("url"))).collect(Collectors.toList());
-                if (!collect.isEmpty()) {
-                    bo.setPicIds(bo.getPicIds().stream().filter(pic -> !collect.contains(pic)).collect(Collectors.toList()));
-                }
+                ZEngiineeringPhotoBo bo1 = new ZEngiineeringPhotoBo();
+                bo1.setParentId(update.getId());
+                bo1.setCreateTime(update.getCreateTime());
+//                List<String> collect = photoService.queryList(bo1).stream().map(ele -> ele.getPicUrl()).collect(Collectors.toList());
+//                if (!collect.isEmpty()) {
+//                    bo.setPicIds(bo.getPicIds().stream().filter(pic -> !collect.contains(pic)).collect(Collectors.toList()));
+//                }
                 bo.getPicIds().stream().forEach(o -> {
                     ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
                     pic.setParentId(bo.getId());
@@ -152,7 +152,7 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
                     list.add(pic);
                 });
                 if (!list.isEmpty()) {
-                    photoMapper.insertBatch(list);
+                    photoService.updateBatch(list);
                 }
             }
         }

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

@@ -99,17 +99,17 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         ZEngineeringPipeJacking add = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(add);
         //民用
-        if (bo.getType()==1){
+        if ("1".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(bo.getType()==2){
+        else if("2".equals(bo.getType())){
         }
         // 危险
-        else if(bo.getType()==3){
+        else if("4".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getDangerous(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginName((String) civil.get(0).get("name"));
@@ -117,7 +117,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             }
         }
         //基建
-        else if(bo.getType()==4){
+        else if("5".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getInfrastructure(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginName((String) civil.get(0).get("name"));
@@ -143,17 +143,17 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         ZEngineeringPipeJacking update = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(update);
         //民用
-        if (bo.getType()==1){
+        if ("1".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(bo.getType()==2){
+        else if("2".equals(bo.getType())){
         }
         // 危险
-        else if(bo.getType()==3){
+        else if("4".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getDangerous(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginName((String) civil.get(0).get("name"));
@@ -161,7 +161,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             }
         }
         //基建
-        else if(bo.getType()==4){
+        else if("5".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getInfrastructure(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginName((String) civil.get(0).get("name"));