修改预警详情装备信息bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -593,11 +593,21 @@ public class SupervisionConfigureController extends AbstractBaseController {
             ReginParams reginParams = getSelectedOrgInfo();
             ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
             if (!ValidationUtil.isEmpty(personIdentity)) {
-                bizOrgCode = personIdentity.getBizOrgCode();
+                if (personIdentity.getCompanyBizOrgCode() == null) {
+                    bizOrgCode = personIdentity.getBizOrgCode();
+                } else {
+                    bizOrgCode = personIdentity.getCompanyBizOrgCode();
+                }
                 if (bizOrgCode == null) {
                     return CommonResponseUtil.success(null);
                 }
             }
+//            if (!ValidationUtil.isEmpty(personIdentity)) {
+//                bizOrgCode = personIdentity.getBizOrgCode();
+//                if (bizOrgCode == null) {
+//                    return CommonResponseUtil.success(null);
+//                }
+//            }
         }
         List<Map<String, Object>> list = supervisionVideoService.selectAllPressureName(bizOrgCode);
         return CommonResponseUtil.success(list);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -389,7 +389,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
                     log.error("时间格式异常：", e);
                 }
             }
-            // 剩余服役天数 = 报废日期 - 当前日期
+            // 剩余服役天数 = 计划报废日期 - 当前日期
             Date scrapDate = equipmentDetail.getScrapDate();
             if (Objects.nonNull(scrapDate)) {
                 Date nowDate = DateUtils.getDateNow();

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -1190,4 +1190,31 @@
                                                        esi.alarm_rule = ( SELECT alarm_rule FROM wl_equipment_index wei WHERE esi.equipment_index_id = wei.id );
         </sql>
     </changeSet>
+
+    <changeSet author="lixm" id="202403120101">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_water_resource_pool" columnName="output_flow_rate"/>
+            </not>
+        </preConditions>
+        <comment>cb_water_resource_pool add column</comment>
+        <sql>
+            ALTER TABLE `cb_water_resource_pool`
+                ADD COLUMN `output_flow_rate` float(10, 2) NULL COMMENT '出口流量（L/s）' AFTER `level_device_name`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="zs" id="20240401-zs-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_water_resource_pool" columnName="pump_device_id"/>
+            </not>
+        </preConditions>
+        <comment>modify table cb_water_resource_pool add columns</comment>
+        <sql>
+            ALTER TABLE `cb_water_resource_pool`
+                ADD pump_device_id varchar(1000) DEFAULT NULL COMMENT '消防泵装置ids',
+            ADD pump_device_name varchar(1500) DEFAULT NULL COMMENT '消防泵装置名称s';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/EquipmentDetailMapper.xml

@@ -173,7 +173,7 @@
 
 	<select id="selectEquipScrapDate" resultType="java.util.Map">
 		SELECT
-			DATE_ADD(DATE_FORMAT(ed.production_date, '%Y-%m-%d'), INTERVAL e.expiry_date YEAR) AS planScrapDate,
+			DATE_ADD(DATE_FORMAT(ed.production_date, '%Y-%m-%d'), INTERVAL ed.expiry_date YEAR) AS planScrapDate,
 			spd.create_date AS scrapDate
 		FROM
 			wl_equipment_specific es