浏览代码

管线状态,修复bug

xuzhancheng 2 周之前
父节点
当前提交
df15be4eb0

+ 3 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equippipescheduling/vo/EquipPipePlanSchedulingVO.java

@@ -86,4 +86,7 @@ public class EquipPipePlanSchedulingVO {
 
     @Schema(description = "年度安全状况等级")
     private String yearSafetyStatusLevel;
+
+    @Schema(description = "管道状态")
+    private String useStatus;
 }

+ 0 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/taskordernontaxapply/TaskOrderNonTaxApplyService.java

@@ -1,7 +1,6 @@
 package cn.start.tz.module.pressure2.service.taskordernontaxapply;
 
 import cn.start.tz.framework.common.pojo.PageResult;
-import cn.start.tz.module.pressure.dal.dataobject.taskorder.TaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.taskordernontaxapply.TaskOrderNonTaxApplyDO;
 import cn.start.tz.module.pressure2.service.taskordernontaxapply.vo.TaskOrderNonTaxApplyCreateVO;
 import com.baomidou.mybatisplus.extension.service.IService;

+ 1 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/equippipescheduling/EquipPipeSchedulingMapper.xml

@@ -509,6 +509,7 @@
         ped.NEXT_LEGAL_CHECK_DATE as NEXT_LEGAL_CHECK_DATE_DETAIL,
         ped.NEXT_YEAR_CHECK_DATE as NEXT_YEAR_CHECK_DATE_DETAIL,
         pe.UNIT_ID,ped.PIPE_LEVEL,ped.PIPE_TYPE,ped.PIPE_MATERIAL,ped.MATERIAL_STANDARD,ped.LEGAL_SAFETY_STATUS_LEVEL,ped.YEAR_SAFETY_STATUS_LEVEL
+        ,ped.USE_STATUS
         ,(select a.PLAN_DATE from PRESSURE2_EQUIP_PIPE_SCHEDULING a
         left join PRESSURE2_EQUIP_PIPE_SCHEDULING_ITEM_DETAIL b on a.ID = b.SCHEDULING_ID
         where b.equip_detail_id = ped.id and a.DELETED = 0 and b.DELETED = 0 and a.type = 100  limit 1) plan_legal_check_date