Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentDetail.java

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -93,10 +94,12 @@ public class EquipmentDetail extends BaseEntity {
 	private String contractCode;
 
 	@TableField("production_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
 	@ApiModelProperty(value = "生产日期")
 	private Date productionDate;
 
 	@TableField("delivery_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
 	@ApiModelProperty(value = "投运日期")
 	private Date deliveryDate;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailDownloadTemplateDto.java

 package com.yeejoin.equipmanage.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yeejoin.equipmanage.utils.ExplicitConstraint;
+import com.yeejoin.equipmanage.utils.RoleNameExplicitConstraint;
 import lombok.Data;
+import org.bouncycastle.cert.dane.DANECertificateFetcher;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author ZeHua Li
@@ -48,4 +54,24 @@ public class EquipmentDetailDownloadTemplateDto implements Serializable {
 
     @Excel(name = "所属单位",width = 30,orderNum = "12")
     private String companyName;
+
+    @Excel(name = "生产日期",width = 30, orderNum = "13")
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private Date productionDate;
+
+    @Excel(name = "报废年限",width = 30, orderNum = "14")
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private String expiryDate;
+
+    @Excel(name = "维保周期",width = 30, orderNum = "15")
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private BigDecimal maintenanceCycle ;
+
+    @Excel(name = "投运时间",width = 30, orderNum = "16")
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private Date deliveryDate;
+    
+    @Excel(name = "所属系统",width = 30, orderNum = "17")
+    //@Excel(name = "所属单位",width = 30,orderNum = "12")
+    private String systemName;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailExcelSingleTemplateDto.java

@@ -4,6 +4,9 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.equipmanage.utils.ExplicitConstraint;
 import com.yeejoin.equipmanage.utils.RoleNameExplicitConstraint;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * @author litw
  * @date 2021-10-08.
@@ -60,4 +63,26 @@ public class EquipmentDetailExcelSingleTemplateDto {
     @ExcelProperty(value = "所属单位", index = 11)
     //@Excel(name = "所属单位",width = 30,orderNum = "12")
     private String companyName;
+
+    @ExcelProperty(value = "生产日期", index = 12)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private Date productionDate;
+
+    @ExcelProperty(value = "报废年限", index = 13)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private String expiryDate;
+
+    @ExcelProperty(value = "维保周期", index = 14)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private BigDecimal maintenanceCycle ;
+
+    @ExcelProperty(value = "投运时间", index = 15)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private Date deliveryDate;
+
+    //动态下拉内容
+    @ExplicitConstraint(indexNum = 16, sourceClass = RoleNameExplicitConstraint.class,method="getFireSystemList") //动态下拉内容
+    @ExcelProperty(value = "所属系统", index = 16)
+    //@Excel(name = "所属单位",width = 30,orderNum = "12")
+    private String systemName;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailExcelTemplateDto.java

@@ -5,6 +5,8 @@ import com.yeejoin.equipmanage.utils.ExplicitConstraint;
 import com.yeejoin.equipmanage.utils.RoleNameExplicitConstraint;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author litw
@@ -62,4 +64,26 @@ public class EquipmentDetailExcelTemplateDto implements Serializable {
     @ExcelProperty(value = "所属单位", index = 11)
     //@Excel(name = "所属单位",width = 30,orderNum = "12")
     private String companyName;
+
+    @ExcelProperty(value = "生产日期", index = 12)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private Date productionDate;
+
+    @ExcelProperty(value = "报废年限", index = 13)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private String expiryDate;
+
+    @ExcelProperty(value = "维保周期", index = 14)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private BigDecimal maintenanceCycle ;
+
+    @ExcelProperty(value = "投运时间", index = 15)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private Date deliveryDate;
+
+    //动态下拉内容
+    @ExplicitConstraint(indexNum = 16, sourceClass = RoleNameExplicitConstraint.class,method="getFireSystemList") //动态下拉内容
+    @ExcelProperty(value = "所属系统", index = 16)
+    //@Excel(name = "所属单位",width = 30,orderNum = "12")
+    private String systemName;
 }

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

@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.yeejoin.equipmanage.common.utils.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -51,10 +52,6 @@ import com.yeejoin.equipmanage.common.enums.EquipStatusEnum;
 import com.yeejoin.equipmanage.common.enums.JournalTypeEnum;
 import com.yeejoin.equipmanage.common.enums.NoticeEnum;
 import com.yeejoin.equipmanage.common.enums.StockBillTypeEnum;
-import com.yeejoin.equipmanage.common.utils.ExcelUtils;
-import com.yeejoin.equipmanage.common.utils.QRCodeUtil;
-import com.yeejoin.equipmanage.common.utils.SpringUtils;
-import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.StockDataVO;
 import com.yeejoin.equipmanage.dto.EquipmentDetailDownloadTemplateDto;
 import com.yeejoin.equipmanage.mapper.EquipmentDetailMapper;
@@ -113,7 +110,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     private ProductionQRCode equipmentProductionQRCode;
     @Autowired
     private IEquipmentSpecificIndexSerivce iEquipmentSpecificIndexSerivce;
-    
+
     @Autowired
     IManufacturerInfoService manufacturerInfoService;
 
@@ -308,7 +305,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Override
 //    @Transactional(rollbackFor = Exception.class)
     public Object uploadListByTemplate(List<EquipmentDetailDownloadTemplateDto> equipmentDetailDownloadVOS, ReginParams reginParams, AgencyUserModel agencyUserModel) {
-    	
+
     	StringBuffer fireFightSysIdsBuffer = new StringBuffer();
 
         StringBuffer errBufferName= new StringBuffer();
@@ -626,6 +623,10 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                  equipmentDetail.setEquipmentName(equipment.getName());
                  equipmentDetail.setName(equipmentDetailDownloadVOS.getName());
                  equipmentDetail.setArea(equipmentDetailDownloadVOS.getDescription());
+                 equipmentDetail.setProductionDate(equipmentDetailDownloadVOS.getProductionDate());
+                 equipmentDetail.setExpiryDate(equipmentDetailDownloadVOS.getExpiryDate());
+                 equipmentDetail.setDeliveryDate(equipmentDetailDownloadVOS.getDeliveryDate());
+                 equipmentDetail.setMaintenanceCycle(equipmentDetailDownloadVOS.getMaintenanceCycle());
 
                  // 导入新增所属单位
 
@@ -668,6 +669,10 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 
 
                  }
+                 if (StringUtils.isNotBlank(equipmentDetailDownloadVOS.getSystemName())) {
+                     String[] SystemName = equipmentDetailDownloadVOS.getSystemName().split("@");
+                     equipmentSpecific.setSystemId(SystemName[1]);
+                 }
                  equipmentSpecificMapper.insert(equipmentSpecific);
                  StockServiceImpl controllerProxy = SpringUtils.getBean(StockServiceImpl.class);
                  //添加对于装备类型统计数据的刷新

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

@@ -161,4 +161,16 @@
             UPDATE `wl_form_group_column` SET `field_name` = 'code', `field_label` = '储罐编号', `data_type` = 'String', `group_id` = 132828674824, `query_strategy` = 'like', `not_null` = b'0', `group_code` = 'r_tank', `creator_id` = 2581805, `create_date` = '2022-08-04 03:04:01' WHERE `id` = 133000000335;
         </sql>
     </changeSet>
+
+    <changeSet author="ls" id="202208091354-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_detail" columnName="delivery_date"/>
+            </not>
+        </preConditions>
+        <comment>新增字段 delivery_date</comment>
+        <sql>
+            alter table `wl_equipment_detail` add column `delivery_date` datetime DEFAULT NULL COMMENT '投运日期';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -2424,7 +2424,15 @@
         )))
         LEFT JOIN `wl_manufacturer_info` `mim` ON ((
         `mim`.`id` = `fs`.`construction_unit`
-        )))) `nz` where `nz`.code = #{systemCode} and `nz`.biz_org_code = #{bizOrgCode}
+        )))) `nz`
+        <where>
+            <if test="systemCode!=null and systemCode!=''">
+               and `nz`.code = #{systemCode}
+            </if>
+            <if test="bizOrgCode!=null and bizOrgCode!=''">
+               and `nz`.biz_org_code = #{bizOrgCode}
+            </if>
+        </where>
     </select>
 
     <select id="equipAlarmTOP"  resultType="java.util.Map">