Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -143,9 +143,6 @@
             <if test="payableId != null and payableId != ''">
                 AND t.payable_id = #{payableId}
             </if>
-            <if test="flgValid != null">
-                AND t.flg_valid = #{flgValid}
-            </if>
             <if test="cpId != null">
                 AND t.cp_id = #{cpId}
             </if>
@@ -175,6 +172,9 @@
                 AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
                 AND t.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
             </if>
+            <if test="flgValidList != null and flgValidList.size()>0">
+                AND t.flg_valid =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
+            </if>
         </where>
     </sql>
 
@@ -223,8 +223,8 @@
                t.make_time,
                t.receivable_id,
                t.payable_id,
-               t.flg_valid,
-               t.cp_id
+               t.cp_id,
+               t.flg_valid
         FROM t_psi_outbound as t
                  left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
                  left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -201,9 +201,6 @@
             <if test="makeTime != null">
                 AND t.make_time = #{makeTime}
             </if>
-            <if test="flgValid != null">
-                AND t.flg_valid = #{flgValid}
-            </if>
             <if test="cpId != null">
                 AND t.cp_id = #{cpId}
             </if>
@@ -230,6 +227,9 @@
                 AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
                 AND t.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
             </if>
+            <if test="flgValidList != null and flgValidList.size()>0">
+                AND t.flg_valid =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
+            </if>
         </where>
     </sql>
 
@@ -288,7 +288,8 @@
                t.annex_paths,
                makestaff.staff_name                              as "makeStaffName",
                t.make_time,
-               t.cp_id
+               t.cp_id,
+               t.flg_valid
         FROM dkic_b.t_psi_order as t
                  left join dkic_b.t_mst_sale_channel tmsc on t.sales_channel = tmsc.channel_id
                  left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id

src/main/java/com/dk/mdm/mapper/sale/OutReturnMapper.xml

@@ -198,9 +198,6 @@
             <if test="makeStaff != null and makeStaff != ''">
                 AND t.make_staff = #{makeStaff}
             </if>
-            <if test="flgValid != null">
-                AND t.flg_valid = #{flgValid}
-            </if>
             <if test="cpId != null">
                 AND t.cp_id = #{cpId}
             </if>
@@ -224,6 +221,9 @@
                 AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
                 AND t.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
             </if>
+            <if test="flgValidList != null and flgValidList.size()>0">
+                AND t.flg_valid =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
+            </if>
         </where>
     </sql>
 
@@ -282,8 +282,8 @@
                t.make_staff,
                makestaff.staff_name                              as "makeStaffName",
                t.make_time,
-               t.flg_valid,
-               t.cp_id
+               t.cp_id,
+               t.flg_valid
         FROM t_psi_out_return as t
                  left join dkic_b.t_mst_sale_channel tmsc on t.sales_channel = tmsc.channel_id
                  left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id

src/main/java/com/dk/mdm/model/query/ivt/OutboundQuery.java

@@ -352,6 +352,10 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate outDateEnd;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private List<Boolean> flgValidList;
+
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/query/sale/OrderQuery.java

@@ -438,7 +438,9 @@ public class OrderQuery extends PageInfo<OrderQuery> implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate deliveryDateEnd;
 
-
+    @TableField(exist = false)
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private List<Boolean> flgValidList;
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/query/sale/OutReturnQuery.java

@@ -434,6 +434,10 @@ public class OutReturnQuery extends PageInfo<OutReturnQuery> implements Serializ
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate pickupDateEnd;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private List<Boolean> flgValidList;
+
     /*
      * 相关属性
      * @TableField(exist = false)