pc页面调整

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementMapper.xml

@@ -7,23 +7,23 @@
 
 	<!-- ================================== 查询相关 ================================== -->
 	<!-- select plat_seq_no, declare_id, declare_type, declare_name, idno, shop_no, shop_name, org_putrec_no, org_name, org_scc, ve_no, btrnb_biz_modecd, g_flow, i_e_flag, field_code, field_name, customs_code, car_pool, sum_amt, sum_gross_wt, sum_net_wt, traf_mode, curr_code, pack_no, decl_time, bill_no, voyage_no, goods_names, borders_list, border_buy_goods_list, sell_goods_list, id from ht_trade_settlement  -->
-	
+
 	<!-- 通用映射：自动模式 -->
 	<resultMap id="model" autoMapping="true" type="com.pj.ht_trade_settlement.HtTradeSettlement"></resultMap>
-	
+
 	<!-- 公共查询sql片段 -->
 	<sql id="select_sql">
-		select * 
-		from ht_trade_settlement 
+		select *
+		from ht_trade_settlement
 	</sql>
 
-	
+
 	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
 	<select id="getList" resultMap="model">
 		<include refid="select_sql"></include>
 		<where>
-			<if test=' this.has("platSeqNo") '> and plat_seq_no = #{platSeqNo} </if>
-			<if test=' this.has("declareId") '> and declare_id = #{declareId} </if>
+			<if test=' this.has("platSeqNo") '> and plat_seq_no like concat('%',#{platSeqNo},'%') </if>
+			<if test=' this.has("declareId") '> and declare_id like concat('%',#{declareId},'%') </if>
 			<if test=' this.has("declareType") '> and declare_type = #{declareType} </if>
 			<if test=' this.has("declareName") '> and declare_name = #{declareName} </if>
 			<if test=' this.has("idno") '> and idno = #{idno} </if>
@@ -49,7 +49,7 @@
 			<if test=' this.has("declTime") '> and decl_time = #{declTime} </if>
 			<if test=' this.has("billNo") '> and bill_no = #{billNo} </if>
 			<if test=' this.has("voyageNo") '> and voyage_no = #{voyageNo} </if>
-			<if test=' this.has("goodsNames") '> and goods_names = #{goodsNames} </if>
+			<if test=' this.has("goodsNames") '> and goods_names like concat('%',#{goodsNames},'%') </if>
 			<if test=' this.has("bordersList") '> and borders_list = #{bordersList} </if>
 			<if test=' this.has("borderBuyGoodsList") '> and border_buy_goods_list = #{borderBuyGoodsList} </if>
 			<if test=' this.has("sellGoodsList") '> and sell_goods_list = #{sellGoodsList} </if>
@@ -92,14 +92,14 @@
 			<otherwise> plat_seq_no desc </otherwise>
 		</choose>
 	</select>
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
+
+
 
 </mapper>

sp-service/level-one-server/src/main/java/com/pj/tb_goods/TbGoodsMapper.xml

@@ -38,7 +38,7 @@
 			<if test=' this.has("unit") '> and unit = #{unit} </if>
 			<if test=' this.has("singlePrice") '> and single_price = #{singlePrice} </if>
 			<if test=' this.has("taxNo") '> and tax_no = #{taxNo} </if>
-
+			<if test=' this.has("thrItemName") '> and thr_item_name like concat('%', #{thrItemName}, '%')</if>
 			<if test=' this.has("tradeAreaId") '> and ta.area_id = #{tradeAreaId} </if>
 		</where>
 		order by

sp-service/level-one-server/src/main/java/com/pj/tb_goods_type/TbGoodsTypeMapper.xml

@@ -7,14 +7,14 @@
 
 	<!-- ================================== 查询相关 ================================== -->
 	<!-- select id, name, sort, no, create_time, create_by, create_name, update_time, update_by, update_name, delete_status, parent_id from tb_goods_type  -->
-	
+
 	<!-- 通用映射：自动模式 -->
 	<resultMap id="model" autoMapping="true" type="com.pj.tb_goods_type.TbGoodsType"></resultMap>
-	
+
 	<!-- 公共查询sql片段 -->
 	<sql id="select_sql">
-		select * 
-		from tb_goods_type 
+		select *
+		from tb_goods_type
 	</sql>
 
 	<insert id="addGoodsToGoodsType">
@@ -36,45 +36,39 @@
 	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
 	<select id="getList" resultMap="model">
 		<include refid="select_sql"></include>
-<!--		<where>-->
-<!--			<if test=' this.has("id") '> and id = #{id} </if>-->
-<!--			<if test=' this.has("name") '> and name = #{name} </if>-->
-<!--			<if test=' this.has("sort") '> and sort = #{sort} </if>-->
-<!--			<if test=' this.has("no") '> and no = #{no} </if>-->
-<!--			<if test=' this.has("createTime") '> and create_time = #{createTime} </if>-->
-<!--			<if test=' this.has("createBy") '> and create_by = #{createBy} </if>-->
-<!--			<if test=' this.has("createName") '> and create_name = #{createName} </if>-->
-<!--			<if test=' this.has("updateTime") '> and update_time = #{updateTime} </if>-->
-<!--			<if test=' this.has("updateBy") '> and update_by = #{updateBy} </if>-->
-<!--			<if test=' this.has("updateName") '> and update_name = #{updateName} </if>-->
-<!--			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>-->
-<!--			<if test=' this.has("parentId") '> and parent_id = #{parentId} </if>-->
-<!--		</where>-->
-<!--		order by-->
-<!--		<choose>-->
-<!--			<when test='sortType == 1'> id desc </when>-->
-<!--			<when test='sortType == 2'> name desc </when>-->
-<!--			<when test='sortType == 3'> sort desc </when>-->
-<!--			<when test='sortType == 4'> no desc </when>-->
-<!--			<when test='sortType == 5'> create_time desc </when>-->
-<!--			<when test='sortType == 6'> create_by desc </when>-->
-<!--			<when test='sortType == 7'> create_name desc </when>-->
-<!--			<when test='sortType == 8'> update_time desc </when>-->
-<!--			<when test='sortType == 9'> update_by desc </when>-->
-<!--			<when test='sortType == 10'> update_name desc </when>-->
-<!--			<when test='sortType == 11'> delete_status desc </when>-->
-<!--			<when test='sortType == 12'> parent_id desc </when>-->
-<!--			<otherwise> id asc </otherwise>-->
-<!--		</choose>-->
+		<where>
+			<if test=' this.has("id") '> and id = #{id} </if>
+			<if test=' this.has("name") '> and name = #{name} </if>
+			<if test=' this.has("sort") '> and sort = #{sort} </if>
+			<if test=' this.has("no") '> and no = #{no} </if>
+			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>
+			<if test=' this.has("parentId") '> and parent_id = #{parentId} </if>
+		</where>
+		order by
+		<choose>
+			<when test='sortType == 1'> id desc </when>
+			<when test='sortType == 2'> name desc </when>
+			<when test='sortType == 3'> sort desc </when>
+			<when test='sortType == 4'> no desc </when>
+			<when test='sortType == 5'> create_time desc </when>
+			<when test='sortType == 6'> create_by desc </when>
+			<when test='sortType == 7'> create_name desc </when>
+			<when test='sortType == 8'> update_time desc </when>
+			<when test='sortType == 9'> update_by desc </when>
+			<when test='sortType == 10'> update_name desc </when>
+			<when test='sortType == 11'> delete_status desc </when>
+			<when test='sortType == 12'> parent_id desc </when>
+			<otherwise> id asc </otherwise>
+		</choose>
 	</select>
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
+
+
 
 </mapper>

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrder.java

@@ -52,6 +52,12 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 
 	private Integer cooperEntrustStatus;
 	private Date cooperEntrustTime;
+
+	/**
+	 * 预申报编号
+	 */
+	private String platSeqNo;
+
 	/**
 	 *
 	 */
@@ -78,7 +84,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	private Long groupId;
 
 	/**
-	 *  过审商品id[goodstransitid]
+	 *  商品id
 	 */
 	private Long goodsId;
 
@@ -121,8 +127,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	 */
 	private String preNo;
 	/**
-	 *进出口预申报
-	 * 单
+	 *进出口预申报单
 	 */
 	private String preIeportNo;
 

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderMapper.xml

@@ -28,6 +28,7 @@
 		<include refid="select_sql"></include>
 		<where>
 			<if test=' this.has("id") '> and id = #{id} </if>
+			<if test=' this.has("platSeqNo") '> and plat_seq_no = #{platSeqNo} </if>
 			<if test=' this.has("tradeAreaId") '> and trade_area_id = #{tradeAreaId} </if>
 			<if test=' this.has("callCarStatus") '> and call_car_status = #{callCarStatus} </if>
 			<if test=' this.has("finishStatus") '> and finish_status = #{finishStatus} </if>
@@ -36,12 +37,12 @@
 			<if test=' this.has("tradeAreaName") '> and trade_area_name = #{tradeAreaName} </if>
 			<if test=' this.has("addressIds") '> and address_ids = #{addressIds} </if>
 			<if test=' this.has("saleMainId") '> and sale_main_id = #{saleMainId} </if>
-			<if test=' this.has("tradeNo") '> and trade_no = #{tradeNo} </if>
+			<if test=' this.has("tradeNo") '> and trade_no like concat('%',#{tradeNo},'%') </if>
 			<if test=' this.has("buyUserId") '> and buy_user_id = #{buyUserId} </if>
-			<if test=' this.has("buyUserName") '> and buy_user_name = #{buyUserName} </if>
+			<if test=' this.has("buyUserName") '> and buy_user_name like concat('%',#{buyUserName},'%') </if>
 			<if test=' this.has("buyUserType") '> and buy_user_type = #{buyUserType} </if>
 			<if test=' this.has("enterpriseId") '> and enterprise_id = #{enterpriseId} </if>
-			<if test=' this.has("enterpriseName") '> and enterprise_name = #{enterpriseName} </if>
+			<if test=' this.has("enterpriseName") '> and enterprise_name like concat('%',#{enterpriseName},'%') </if>
 			<if test=' this.has("totalWeight") '> and total_weight = #{totalWeight} </if>
 			<if test=' this.has("totalPrice") '> and total_price = #{totalPrice} </if>
 			<if test=' this.has("tradeStatus") '> and trade_status = #{tradeStatus} </if>

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersMapper.xml

@@ -24,10 +24,10 @@
 		<where>
 			<if test=' this.has("id") '> and id = #{id} </if>
 			<if test=' this.has("levelOneOrderId") '> and level_one_order_id = #{levelOneOrderId} </if>
-			<if test=' this.has("orderNo") '> and order_no = #{orderNo} </if>
+			<if test=' this.has("orderNo") '> and order_no like concat('%',#{orderNo},'%') </if>
 			<if test=' this.has("goodsId") '> and goods_id = #{goodsId} </if>
 			<if test=' this.has("purchaserId") '> and purchaser_id = #{purchaserId} </if>
-			<if test=' this.has("goodsName") '> and goods_name = #{goodsName} </if>
+			<if test=' this.has("goodsName") '> and goods_name like concat('%',#{goodsName},'%') </if>
 			<if test=' this.has("goodsFrom") '> and goods_from = #{goodsFrom} </if>
 			<if test=' this.has("shipperPhone") '> and shipper_phone = #{shipperPhone} </if>
 			<if test=' this.has("shipperName") '> and shipper_name = #{shipperName} </if>