Commit 1e00898c authored by chenzhao's avatar chenzhao

修改代码

parent ff8ccb14
...@@ -24,7 +24,7 @@ public class EquipmentExportVO { ...@@ -24,7 +24,7 @@ public class EquipmentExportVO {
private String validityPeriod = ""; private String validityPeriod = "";
@ExcelProperty(value = "维保周期", index = 5) @ExcelProperty(value = "维保周期", index = 5)
private String maintenanceCycle = ""; private String maintenanceCycle = "";
@ExcelProperty(value = "投运时间", index = 6) @ExcelProperty(value = "投运日期", index = 6)
private String operationTime = ""; private String operationTime = "";
@ExcelProperty(value = "生产厂商", index = 7) @ExcelProperty(value = "生产厂商", index = 7)
private String manufacturer = ""; private String manufacturer = "";
......
...@@ -67,7 +67,7 @@ public class EquipmentDetailDownloadTemplateDto implements Serializable { ...@@ -67,7 +67,7 @@ public class EquipmentDetailDownloadTemplateDto implements Serializable {
//@Excel(name = "品牌", width = 30, orderNum = "4") //@Excel(name = "品牌", width = 30, orderNum = "4")
private BigDecimal maintenanceCycle ; private BigDecimal maintenanceCycle ;
@Excel(name = "投运时间",width = 30, orderNum = "16") @Excel(name = "投运日期",width = 30, orderNum = "16")
//@Excel(name = "品牌", width = 30, orderNum = "4") //@Excel(name = "品牌", width = 30, orderNum = "4")
private Date deliveryDate; private Date deliveryDate;
......
...@@ -76,7 +76,7 @@ public class EquipmentDetailExcelSingleTemplateDto { ...@@ -76,7 +76,7 @@ public class EquipmentDetailExcelSingleTemplateDto {
//@Excel(name = "品牌", width = 30, orderNum = "4") //@Excel(name = "品牌", width = 30, orderNum = "4")
private BigDecimal maintenanceCycle ; private BigDecimal maintenanceCycle ;
@ExcelProperty(value = "投运时间", index = 15) @ExcelProperty(value = "投运日期", index = 15)
//@Excel(name = "品牌", width = 30, orderNum = "4") //@Excel(name = "品牌", width = 30, orderNum = "4")
private Date deliveryDate; private Date deliveryDate;
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
AND biz_org_code like CONCAT(#{bizOrgCode},'%') AND biz_org_code like CONCAT(#{bizOrgCode},'%')
</if> </if>
<if test="companyCode != null and companyCode != ''"> <if test="companyCode != null and companyCode != ''">
AND biz_org_code ={companyCode} AND biz_org_code = #{companyCode}
</if> </if>
<if test="formGroupId != null and formGroupId != '' and formGroupId != '-1'"> <if test="formGroupId != null and formGroupId != '' and formGroupId != '-1'">
AND form_group_id = #{formGroupId} AND form_group_id = #{formGroupId}
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
AND biz_org_code like CONCAT(#{bizOrgCode},'%') AND biz_org_code like CONCAT(#{bizOrgCode},'%')
</if> </if>
<if test="companyCode != null and companyCode != ''"> <if test="companyCode != null and companyCode != ''">
AND biz_org_code ={companyCode} AND biz_org_code = #{companyCode}
</if> </if>
<if test="formGroupId != null and formGroupId != '' and formGroupId != '-1'"> <if test="formGroupId != null and formGroupId != '' and formGroupId != '-1'">
AND form_group_id = #{formGroupId} AND form_group_id = #{formGroupId}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment