Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -398,7 +398,7 @@ public class WaterResourceDto extends BaseDto {
 	@ExplicitConstraint(indexNum = 45, sourceClass = CommonExplicitConstraint.class, method = "getListByEquipmentCode")
 	private String levelDeviceName;
 
-	@ExcelProperty(value = "出口流量（L/s）", index = 44)
+	@ExcelIgnore
 	@ApiModelProperty(value = "出口流量（L/s）")
 	private Float outputFlowRate;
 }

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

@@ -2851,6 +2851,7 @@
             AND 30 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
             AND DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) >= 0
         </if>
+        ORDER BY dayNum DESC
     </select>
 
     <select id="selectZJEquipmentSpecificWWXByIds" resultType="java.util.Map">

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

@@ -140,7 +140,8 @@
                 biz_org_name,
                 design_org,
                 design_org_telephone,
-                lead_designer
+                lead_designer,
+                 system_describe
                 )
                 VALUES(
                 #{id},
@@ -171,7 +172,8 @@
                 #{bizOrgName},
                 #{designOrg},
                 #{designOrgTelephone},
-                #{leadDesigner}
+                #{leadDesigner},
+                #{systemDescribe}
                 )
     </insert>
     <insert id="insertFile">
@@ -221,7 +223,8 @@
               biz_org_name=#{bizOrgName},
               design_org = #{designOrg},
               lead_designer = #{leadDesigner},
-              design_org_telephone = #{designOrgTelephone}
+              design_org_telephone = #{designOrgTelephone},
+              system_describe = #{systemDescribe}
               where id = #{id}
     </update>
     <delete id="deleteFilre">