Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

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

@@ -51,7 +51,7 @@ public class ZUnitController extends BaseController {
      * @return
      */
     @GetMapping("/getUnitList")
-    public R getUnitList(@RequestParam("buildingId") String buildingId) {
+    public R getUnitList(String buildingId) {
         return R.ok(iZUnitService.getUnitList(buildingId));
     }
 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -55,6 +55,12 @@ public class BaseEntity implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
+    /**
+     *
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    //@TableField(exist = false)
+    private Date updateInfoTime;
 
     /**
      * 请求参数

ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java

@@ -31,6 +31,7 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
                     ? baseEntity.getCreateTime() : new Date();
                 baseEntity.setCreateTime(current);
                 //baseEntity.setUpdateTime(current);
+                baseEntity.setUpdateInfoTime(current);
                 String username = StringUtils.isNotBlank(baseEntity.getCreateBy())
                     ? baseEntity.getCreateBy() : getLoginUsername();
                 // 当前已登录 且 创建人为空 则填充
@@ -50,7 +51,8 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
                 BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
                 Date current = new Date();
                 // 更新时间填充(不管为不为空)
-                baseEntity.setUpdateTime(current);
+               // baseEntity.setUpdateTime(current);
+                baseEntity.setUpdateInfoTime(current);
                 String username = getLoginUsername();
                 // 当前已登录 更新人填充(不管为不为空)
                 if (StringUtils.isNotBlank(username)) {

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

@@ -166,6 +166,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
                     ZEngiineeringPhoto zEngiineeringPhoto1=new ZEngiineeringPhoto();
                     zEngiineeringPhoto1.setParentId(zEngiineeringPhoto.getParentId());
                      zEngiineeringPhoto1.setPicUrl(item);
+                zEngiineeringPhoto1.setUpdateTime(new Date());
                 zEngiineeringPhoto1.setCreateTime(zEngiineeringPhoto.getCreateTime());
                     photoList.add(zEngiineeringPhoto1);
             });

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

@@ -228,7 +228,8 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             if (!ObjectUtils.isEmpty(zEngineeringNodeBo)) {
                 zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
                 zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
-                zEngineeringNodeService.update(zEngineeringNodeBo);
+                if(!ObjectUtils.isEmpty(zEngineeringNodeBo.getzEngineeringInfoBoList()))
+                zEngineeringNodeService.updateMuch(zEngineeringNodeBo);
             }
         }
         return flag;

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

@@ -206,14 +206,14 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             zEngiineeringPhoto.setParentId(update.getId());
             zEngiineeringPhoto.setPicUrl(item);
             zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
-            zEngiineeringPhoto.setUpdateTime(new Date());
+           // zEngiineeringPhoto.setUpdateTime(new Date());
             photoList.add(zEngiineeringPhoto);
         });
         if (photoList.size() > 0 ) {
             izEngiineeringPhotoService.updateBatch(photoList);
         }
         izEngineeringMaterialService.updateList(bo);
-        update.setUpdateTime(new Date());
+       // update.setUpdateTime(new Date());
         return baseMapper.updateById(update) > 0;
     }