wangtong 1 anno fa
parent
commit
aec1660be9

+ 9 - 0
ruoyi-admin/src/main/resources/application-dev.yml

@@ -189,6 +189,15 @@ huawei:
     access:
       endPoint: https://zdszcs.obs.cn-south-1.myhuaweicloud.com
     bucketName: zdszcs
+#huawei:
+#  obs:
+#    ak: KZVKAAUQENCKITHZ3EWO
+#    sk: B7tLa82CJ5EdNOh5a2G9i77sPYh8skcydTk3C8sb
+#    upload:
+#      endPoint: obs.cn-north-4.myhuaweicloud.com
+#    access:
+#      endPoint: https://szrqgz1.obs.cn-north-4.myhuaweicloud.com
+#    bucketName: szrqgz1
 tableNames:
   #动态表名月分(该处为需要动态表的表名,号分割)
   Month: z_engineering_review,z_engiineering_photo,z_engineering_info,z_engineering_material,z_engineering_node

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

@@ -68,6 +68,8 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
         });
         return list;
     }
+    @Override
+    @DynamicName(spel = "#bo.createTime")
     public List<String> queryTypeList(ZEngineeringInfoBo bo,String Type) {
         List<String> list = new ArrayList<>();
         LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();

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

@@ -174,6 +174,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         List<ZEngineeringNodeBo> zEngineeringNodeBoList = new ArrayList<>();
         zEngineeringNodeList.stream().forEach(item -> {
             ZEngineeringNodeBo zEngineeringNodeBo = BeanUtil.copyProperties(item, ZEngineeringNodeBo.class);
+            zEngineeringNodeBo.setzEngineeringInfoBoList(izEngineeringInfoService.query(zEngineeringNodeBo));
             ZEngineeringReviewBo zEngineeringReviewBo = izEngineeringReviewService.query(zEngineeringNodeBo);
             if (!ObjectUtils.isEmpty(zEngineeringReviewBo)) {
                 zEngineeringNodeBo.setReviewStatus(zEngineeringReviewBo.getReviewStatus());