fix:体系文件保存报错问题解决

fix：日常维护记录添加站点编号筛选条件
fix：隐患排查计划详情查询负责人名称添加
fix：巡检路径新增提出无法使用的巡检模板选择
fix：设备定义保存报错问题解决

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/entity/EmDefinitionEntity.java

@@ -34,9 +34,6 @@ public class EmDefinitionEntity extends TenantEntity {
     @ApiModelProperty(value = "模型名称")
     private String modelName;
 
-    @ApiModelProperty(value = "创建用户")
-    private Long createUser;
-
     @ApiModelProperty(value = "创建用户名称")
     @TableField(exist = false)
     private String createUserName;

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenancePlanEntity.java

@@ -29,6 +29,7 @@ public class OperMaintenancePlanEntity extends TenantEntity {
 	private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty(value = "站点编号")
+	@QueryField(condition = SqlCondition.EQUAL)
 	private String stationCode;
 
 	@ApiModelProperty(value = "站点名称")

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java

@@ -50,7 +50,4 @@ public class SystemFileEntity extends TenantEntity {
 	@ApiModelProperty(value = "工作流ID")
 	private String flowId;
 
-	@ApiModelProperty("创建人")
-	private Long createUser;
-
 }

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmDefinitionController.java

@@ -92,7 +92,7 @@ public class EmDefinitionController extends BladeController {
     @ApiOperation(value = "新增", notes = "传入EmDefinitionDTO")
     public R save(@Valid @RequestBody EmDefinitionDTO emDefinitionDTO) {
         EmDefinitionEntity definition = BeanUtil.copy(emDefinitionDTO, EmDefinitionEntity.class);
-        definition.setCreateUser(AuthUtil.getUserId());
+        // definition.setCreateUser(AuthUtil.getUserId());
         return R.data(emDefinitionService.save(definition));
     }
 

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/mapper/ObjectTemplateMapper.xml

@@ -6,7 +6,11 @@
        SELECT t.id,o.code,o.name,o.SUPPORT_AUTO_VIDEO,t.template_id,t.object_id
        from hz_st_re_object_template t
        left JOIN hz_st_re_template o  on (t.template_id=o.id)
+       left join hz_st_re_template_project p on o.id = p.template_id
+       left join hz_st_re_project_content c on p.project_id = c.project_id
        where t.object_id=#{objectId} AND t.is_deleted=0
+        and o.is_deleted = 0 and p.is_deleted = 0 and c.is_deleted = 0
+        and p.id is not null and c.id is not null
         <if test="type != null and type !='' ">
             and o.support_auto_video = #{type}
         </if>
@@ -17,7 +21,7 @@
         SELECT o.*, t.id as OBJ_TEMP_ID
         from hz_st_re_object_template t
         left JOIN hz_st_re_template o  on (t.template_id=o.id)
-        where t.object_id=#{objectId} AND t.is_deleted=0
+        where t.object_id=#{objectId} AND t.is_deleted=0 and o.is_deleted = 0
         order by t.UPDATE_TIME desc
     </select>
 </mapper>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java

@@ -165,6 +165,7 @@ public class OperMaintenanceTaskServiceImpl extends ServiceImpl<OperMaintenanceT
             if(ObjectUtil.isNotEmpty(req.getPlanId())){
                 eq(OperMaintenanceTaskEntity::getPlanId,req.getPlanId());
             }
+            eq(StringUtil.isNotBlank(req.getStationCode()),OperMaintenanceTaskEntity::getStationCode,req.getStationCode());
         }};
         return queryWrapper;
     }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerPlanServiceImpl.java

@@ -9,15 +9,19 @@ import com.hnac.hzims.safeproduct.hiddenDanger.mapper.HiddenDangerPlanMapper;
 import com.hnac.hzims.safeproduct.hiddenDanger.service.IHiddenDangerPlanService;
 import com.hnac.hzims.safeproduct.hiddenDanger.service.IPlanCheckItemService;
 import com.hnac.hzims.safeproduct.hiddenDanger.vo.HDPlanVO;
+import com.hnac.hzims.safeproduct.hiddenDanger.wrapper.HDPlanWrapper;
 import com.hnac.hzims.safeproduct.hiddenDanger.wrapper.PlanCheckItemWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.CollectionUtil;
+import org.springblade.system.user.cache.UserCache;
+import org.springblade.system.user.entity.User;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -65,7 +69,7 @@ public class HiddenDangerPlanServiceImpl extends ServiceImpl<HiddenDangerPlanMap
     @Override
     public HDPlanVO detail(Long id) {
         HDPlanEntity plan = this.getById(id);
-        HDPlanVO planVO = BeanUtil.copy(plan, HDPlanVO.class);
+        HDPlanVO planVO = HDPlanWrapper.build().entityVO(plan);
         List<PlanCheckItemEntity> checkItemList = planCheckItemService.list(Wrappers.<PlanCheckItemEntity>lambdaQuery().eq(PlanCheckItemEntity::getPlanId, id));
         planVO.setCheckItemVOS(PlanCheckItemWrapper.build().listVO(checkItemList));
         return planVO;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/vo/SystemFileVO.java

@@ -15,6 +15,9 @@ public class SystemFileVO extends SystemFileEntity {
 
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty("创建人ID")
+	private Long createUserId;
+
 	@ApiModelProperty("创建人名称")
 	private String createUserName;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/SystemFileWrapper.java

@@ -24,6 +24,7 @@ public class SystemFileWrapper extends BaseEntityWrapper<SystemFileEntity, Syste
 		SystemFileVO vo = BeanUtil.copy(entity, SystemFileVO.class);
 		User createUser = UserCache.getUser(entity.getCreateUser());
 		User updateUser = UserCache.getUser(entity.getUpdateUser());
+		vo.setCreateUserId(entity.getCreateUser());
 		vo.setCreateUserName(Optional.ofNullable(createUser).map(User::getName).orElse(null));
 		vo.setUpdateUserName(Optional.ofNullable(updateUser).map(User::getName).orElse(null));
 		return vo;