报关月份改为日期

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/TqContractLift.java

@@ -200,8 +200,8 @@ public class TqContractLift extends BaseEntity
     private Date invoiceDate;
 
     /** 报关月份 */
-    @Excel(name = "报关月份",i18nCode = "lift.customsDeclarationMonth", sort= 46)
-    private String customsDeclarationMonth;
+    @Excel(name = "报关月份", width = 30, dateFormat = "yyyy-MM",i18nCode = "lift.customsDeclarationMonth", sort= 46)
+    private Date customsDeclarationMonth;
 
     /** 后续收取运费 */
     @Excel(name = "后续收取运费",i18nCode = "lift.subsequentCollectionOfShippingFees", sort= 47)

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/TqContractLiftHistory.java

@@ -237,8 +237,8 @@ public class TqContractLiftHistory extends BaseEntity
     private Date invoiceDate;
 
     /** 报关月份 */
-    @Excel(name = "报关月份")
-    private String customsDeclarationMonth;
+    @Excel(name = "报关月份", width = 30, dateFormat = "yyyy-MM",i18nCode = "lift.customsDeclarationMonth", sort= 57)
+    private Date customsDeclarationMonth;
 
     /** 后续收取运费 */
     @Excel(name = "后续收取运费")

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/bo/contract/TqContractLift4OrderNoBo.java

@@ -241,8 +241,8 @@ public class TqContractLift4OrderNoBo extends BaseEntity
     private Date invoiceDate;
 
     /** 报关月份 */
-    @Excel(name = "报关月份")
-    private String customsDeclarationMonth;
+    @Excel(name = "报关月份", width = 30, dateFormat = "yyyy-MM",i18nCode = "lift.customsDeclarationMonth")
+    private Date customsDeclarationMonth;
 
     /** 后续收取运费 */
     @Excel(name = "后续收取运费")

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/bo/contract/TqContractLiftBo.java

@@ -237,8 +237,8 @@ public class TqContractLiftBo extends BaseEntity
     private Date[] invoiceDate;
 
     /** 报关月份 */
-    @Excel(name = "报关月份")
-    private String customsDeclarationMonth;
+    @Excel(name = "报关月份", width = 30, dateFormat = "yyyy-MM",i18nCode = "lift.customsDeclarationMonth")
+    private Date customsDeclarationMonth;
 
     /** 后续收取运费 */
     @Excel(name = "后续收取运费")

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/vo/contract/TqContractLiftExportVo.java

@@ -309,8 +309,8 @@ public class TqContractLiftExportVo
     private String port;
 
     /** 报关月份 57*/
-    @Excel(name = "报关月份",i18nCode = "lift.customsDeclarationMonth", sort= 57)
-    private String customsDeclarationMonth;
+    @Excel(name = "报关月份", width = 30, dateFormat = "yyyy-MM",i18nCode = "lift.customsDeclarationMonth", sort= 57)
+    private Date customsDeclarationMonth;
 
     /** 合同更改日期 59*/
     @JsonFormat(pattern = "yyyy-MM-dd")

RuoYi-Vue-fast-master/src/main/resources/mybatis/business/contract/TqContractLiftHistoryMapper.xml

@@ -136,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="actualInlandFreightCost != null "> and actual_inland_freight_cost = #{actualInlandFreightCost}</if>
             <if test="actualOceanFreight != null "> and actual_ocean_freight = #{actualOceanFreight}</if>
             <if test="invoiceDate != null "> and invoice_date = #{invoiceDate}</if>
-            <if test="customsDeclarationMonth != null  and customsDeclarationMonth != ''"> and customs_declaration_month = #{customsDeclarationMonth}</if>
+            <if test="customsDeclarationMonth != null "> and customs_declaration_month = #{customsDeclarationMonth}</if>
             <if test="subsequentCollectionOfShippingFees != null "> and subsequent_collection_of_shipping_fees = #{subsequentCollectionOfShippingFees}</if>
             <if test="collectionDate != null "> and collection_date = #{collectionDate}</if>
             <if test="planInlandFreightCost != null "> and plan_inland_freight_cost = #{planInlandFreightCost}</if>

RuoYi-Vue-fast-master/src/main/resources/mybatis/business/contract/TqContractLiftMapper.xml

@@ -273,7 +273,7 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="customsDeclarationMonth != null  and customsDeclarationMonth != ''"> and l.customs_declaration_month = #{customsDeclarationMonth}</if>
+            <if test="customsDeclarationMonth != null "> and l.customs_declaration_month = #{customsDeclarationMonth}</if>
             <if test="subsequentCollectionOfShippingFees != null "> and l.subsequent_collection_of_shipping_fees = #{subsequentCollectionOfShippingFees}</if>
             <if test="collectionDate != null and collectionDate.length == 2"> and l.collection_date
                 <foreach collection="collectionDate" item="item" open="between " separator=" and " >

ruoyi-ui-vue2/src/views/contract/lift/index.vue

@@ -235,7 +235,7 @@
         <!--港口56-->
         <Column :label="$t('lift.port')" :searchParams="queryParams" :showSearch="true" prop="port"  v-if="checkPermi(['user:contract:lift:port'])"/>
         <!--报关月份57-->
-        <Column :label="$t('lift.customsDeclarationMonth')" :searchParams="queryParams" :showSearch="true" prop="customsDeclarationMonth" v-if="checkPermi(['user:contract:lift:customsDeclarationMonth'])" sortable="custom" />
+        <Column :label="$t('lift.customsDeclarationMonth')" :searchParams="queryParams" :showSearch="true" search-type="dateRange" prop="customsDeclarationMonth" v-if="checkPermi(['user:contract:lift:customsDeclarationMonth'])" sortable="custom" />
         <!--备注58-->
         <Column :label="$t('common.remark')" :searchParams="queryParams" :showSearch="true" prop="remark"  v-if="checkPermi(['user:contract:lift:remark'])"/>
         <!--合同更改日期59-->
@@ -480,7 +480,7 @@
           <InputColumn  :label="$t('lift.port')"  prop="port"  v-if="checkPermi(['user:contract:lift:portEdit'])"/>
 
           <!--报关月份57 可修改-->
-          <DictSelectColumn  :label="$t('lift.customsDeclarationMonth')"  prop="customsDeclarationMonth" :search-dict="months" v-if="checkPermi(['user:contract:lift:customsDeclarationMonthEdit'])"></DictSelectColumn>
+          <DatePickSelectColumn  :label="$t('lift.customsDeclarationMonth')"  prop="customsDeclarationMonth" :search-dict="months" v-if="checkPermi(['user:contract:lift:customsDeclarationMonthEdit'])"></DatePickSelectColumn>
 
           <!--备注58  可修改-->
           <Column  :label="$t('common.remark')" prop="remark"  v-if="checkPermi(['user:contract:lift:remarkEdit'])">