修改代码 开发需求

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/dto/MaintenanceResourceDataDto.java

@@ -125,5 +125,13 @@ public class MaintenanceResourceDataDto {
      * 位置
      */
     private String location;
+    /**
+    * 图片
+    * */
+    private String img;
+    /**
+     * 消防装备编码
+     * */
+    private String code;
 
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferMapper.xml

@@ -3,9 +3,13 @@
 <mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper">
     <select id="getPowerTransferList"
             resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto">
-        select sequence_nbr, company_name, type, resources_num
+        select sequence_nbr, company_name, type, resources_num,`status`
         from (
-                 select ptcr.sequence_nbr, ptc.company_name, ptcr.type, ptcr.resources_num, ptcr.rec_date
+                 select ptcr.sequence_nbr, ptc.company_name, ptcr.type, ptcr.resources_num, ptcr.rec_date,
+                  case   ptcr.status
+                 when 'executing' THEN '未完成'
+                 when  'finished' THEN '已完成'
+                 END AS status
                  from jc_power_transfer_company ptc
                           left join jc_power_transfer pt on ptc.power_transfer_id = pt.sequence_nbr
                           right join jc_power_transfer_company_resources ptcr
@@ -13,7 +17,7 @@
                  where pt.alert_called_id = #{alertCalledId}
                    and ptc.is_distribution_agencies = 0
                  union all
-                 select ptc.sequence_nbr, ptc.company_name, "" type, "" resources_num, ptc.rec_date
+                 select ptc.sequence_nbr, ptc.company_name, "" type, "" resources_num, ptc.rec_date,'' `status`
                  from jc_power_transfer_company ptc
                           left join jc_power_transfer pt on ptc.power_transfer_id = pt.sequence_nbr
                  where pt.alert_called_id = #{alertCalledId}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/RouteController.java

@@ -181,7 +181,7 @@ public class RouteController extends AbstractBaseController {
             //2.查询
             List<Route> routeList;
             if (null != orgCode && 0 == orgCode) {
-                routeList = routeService.queryRouteList(ownerId, null);
+                routeList = routeService.queryRouteList(ownerId, org);
             } else {
                 routeList = routeService.queryRouteList(ownerId, org);
             }

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

@@ -237,20 +237,25 @@
     </select>
     <select id="getClassifyPage" resultType="com.yeejoin.equipmanage.common.dto.MaintenanceResourceDataDto">
         SELECT
-            m.maintenance_company_id,
-            m.maintenance_company_name,
-            m.owner_unit_id,
-            m.owner_unit_name,
-            m.fire_fight_sys_id,
-            m.fire_fight_sys_name,
-            m.classify_id,
-            m.classify_name,
-            m.classify_type,
-            m.classify_code,
-            COUNT( 1 ) AS amount,
-            SUM(IF(m.maintenance_expiration_time &lt;= CURRENT_DATE,1,0)) AS expirationAmount
+        m.maintenance_company_id,
+        m.maintenance_company_name,
+        m.owner_unit_id,
+        m.owner_unit_name,
+        m.fire_fight_sys_id,
+        m.fire_fight_sys_name,
+        m.classify_id,
+        m.classify_name,
+        m.classify_type,
+        m.classify_code,
+        COUNT( 1 ) AS amount,
+        SUM(IF(m.maintenance_expiration_time &lt;= CURRENT_DATE,1,0)) AS expirationAmount,
+        we.img,
+        wes.code
         FROM
-            `mt_maintenance_resource_data` m
+        `mt_maintenance_resource_data` m
+        LEFT JOIN  wl_equipment_specific wes on m.fire_facility_id = wes.id
+        LEFT JOIN  wl_equipment_detail wed on wes.equipment_detail_id = wed.id
+        LEFT JOIN  wl_equipment we on we.id = wed.equipment_id
         <where>
             <if test="maintenanceCompanyId != null">
                 m.maintenance_company_id = #{maintenanceCompanyId}
@@ -267,27 +272,32 @@
     </select>
     <select id="getFireFacilityPage" resultType="com.yeejoin.equipmanage.common.dto.MaintenanceResourceDataDto">
         SELECT
-            m.maintenance_company_id,
-            m.maintenance_company_name,
-            m.owner_unit_id,
-            m.owner_unit_name,
-            m.fire_fight_sys_id,
-            m.fire_fight_sys_name,
-            m.classify_id,
-            m.classify_name,
-            m.classify_type,
-            m.classify_code,
-            m.fire_facility_id,
-            m.fire_facility_code,
-            m.fire_facility_name,
-            m.fire_facility_type,
-            m.maintenance_time,
-            m.maintenance_cycle,
-            m.`status`,
-            IF(m.maintenance_expiration_time IS NOT NULL , IF(m.maintenance_expiration_time &lt;= CURRENT_DATE,'已到期','正常'), '') AS `statusText`,
-            m.location
+        m.maintenance_company_id,
+        m.maintenance_company_name,
+        m.owner_unit_id,
+        m.owner_unit_name,
+        m.fire_fight_sys_id,
+        m.fire_fight_sys_name,
+        m.classify_id,
+        m.classify_name,
+        m.classify_type,
+        m.classify_code,
+        m.fire_facility_id,
+        m.fire_facility_code,
+        m.fire_facility_name,
+        m.fire_facility_type,
+        m.maintenance_time,
+        m.maintenance_cycle,
+        m.`status`,
+        we.img,
+        wes.code,
+        IF(m.maintenance_expiration_time IS NOT NULL , IF(m.maintenance_expiration_time &lt;= CURRENT_DATE,'已到期','正常'), '') AS `statusText`,
+        m.location
         FROM
-            `mt_maintenance_resource_data` m
+        `mt_maintenance_resource_data` m
+        LEFT JOIN  wl_equipment_specific wes on m.fire_facility_id = wes.id
+        LEFT JOIN  wl_equipment_detail wed on wes.equipment_detail_id = wed.id
+        LEFT JOIN  wl_equipment we on we.id = wed.equipment_id
         <where>
             <if test="maintenanceCompanyId != null">
                 m.maintenance_company_id = #{maintenanceCompanyId}

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -2935,26 +2935,32 @@
 
     <changeSet author="cz" id="2022-06-13-1">
         <preConditions onFail="MARK_RAN">
-            <not>
-                <columnExists tableName="jc_powerr_transfer_log" columnName="receive_name"/>
-            </not>
+                <tableExists tableName="jc_powerr_transfer_log"/>
         </preConditions>
         <comment>修改字段长度</comment>
         <sql>
-            ALTER TABLE jc_powerr_transfer_log MODIFY receive_name varchar(5000) NULL COMMENT '接收人' ;
+            ALTER TABLE jc_powerr_transfer_log MODIFY  COLUMN receive_name varchar(5000) DEFAULT NULL COMMENT '接收人' ;
         </sql>
     </changeSet>
 
     <changeSet author="cz" id="2022-06-13-2">
         <preConditions onFail="MARK_RAN">
-            <not>
-                <columnExists tableName="jc_alert_submitted" columnName="submission_content"/>
-            </not>
+                <tableExists tableName="jc_alert_submitted"/>
         </preConditions>
         <comment>修改字段长度</comment>
         <sql>
-            ALTER TABLE jc_alert_submitted MODIFY submission_content varchar(5000) NULL COMMENT '报送内容';
+            ALTER TABLE jc_alert_submitted MODIFY COLUMN submission_content varchar(5000) DEFAULT NULL COMMENT '报送内容';
         </sql>
     </changeSet>
+
+    <changeSet author="chenzhao" id="2022-06-15-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_data_dictionary" />
+        </preConditions>
+        <comment>update data cb_data_dictionary</comment>
+        <sql>
+            REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1165, '1165', '集结待命', 'XYJBR', NULL, NULL, NULL, NULL, NULL, b'0', 1);
+         </sql>
+    </changeSet>
 </databaseChangeLog>