申报单搜索调整

sp-admin/sa-view/tb-declare/tb-declare-list.html

@@ -20,7 +20,12 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="代理人电话" v-model="p.agentPhone"></sa-item>
+					<sa-item type="text" name="中国车车牌" v-model="p.chinaCarNo"></sa-item>
+					<sa-item type="text" name="越南车车牌" v-model="p.carNo"></sa-item>
+					<sa-item type="text" name="申报单位" v-model="p.customerName"></sa-item>
+					<sa-item type="text" name="货主单位" v-model="p.sendUnit"></sa-item>
+					<sa-item type="text" name="收货单位" v-model="p.receiveUnit"></sa-item>
+<!--					<sa-item type="text" name="代理人电话" v-model="p.agentPhone"></sa-item>-->
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<br />
 					</sa-item>
@@ -43,6 +48,7 @@
 <!--					<sa-td name="生产方式" prop="productionMode" ></sa-td>-->
 <!--					<sa-td name="原产国" prop="origin" ></sa-td>-->
 <!--					<sa-td name="进口冷链食品生产商注册号" prop="producerCode" ></sa-td>-->
+					<sa-td name="申报单位" prop="customerName" ></sa-td>
 					<sa-td name="货主单位" prop="sendUnit" ></sa-td>
 					<sa-td name="收货单位" prop="receiveUnit" ></sa-td>
 					<sa-td name="货物流向" prop="route" ></sa-td>
@@ -81,6 +87,7 @@
 				data: {
 					p: { // 查询参数
 						id: '',		// 主键
+						customerName: '',   //申报单位
 						businessId: '',		// 业务id
 						goodsName: '',		// 产品学名
 						grossWeight: '',		// 毛重

sp-admin/sa-view/tb-disinfect/tb-disinfect-list.html

@@ -20,7 +20,12 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="申请人联系号码" v-model="p.applyPhone"></sa-item>
+					<sa-item type="text" name="中国车车牌" v-model="p.chinaCarNo"></sa-item>
+					<sa-item type="text" name="越南车车牌" v-model="p.carNo"></sa-item>
+					<sa-item type="text" name="申报单位" v-model="p.applyUnit"></sa-item>
+					<sa-item type="text" name="发货人" v-model="p.sendPeople"></sa-item>
+					<sa-item type="text" name="收货人" v-model="p.receivePeople"></sa-item>
+<!--					<sa-item type="text" name="申请人联系号码" v-model="p.applyPhone"></sa-item>-->
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<br />
 				</el-form>

sp-server/src/main/java/com/pj/project/tb_declare/TbDeclareMapper.xml

@@ -105,6 +105,7 @@
         <where>
             <if test=' this.has("id") '>and id = #{id}</if>
             <if test=' this.has("customerId") '>and customer_id = #{customerId}</if>
+            <if test=' this.has("customerName") '>and customer_name like concat('%',#{customerName},'%')</if>
             <if test=' this.has("declarePeople") '>and declare_people like concat('%',#{declarePeople},'%')</if>
             <if test=' this.has("goodsName") '>and goods_name = #{goodsName}</if>
             <if test=' this.has("grossWeight") '>and gross_weight = #{grossWeight}</if>
@@ -115,15 +116,15 @@
             <if test=' this.has("productionMode") '>and production_mode = #{productionMode}</if>
             <if test=' this.has("origin") '>and origin = #{origin}</if>
             <if test=' this.has("producerCode") '>and producer_code = #{producerCode}</if>
-            <if test=' this.has("sendUnit") '>and send_unit = #{sendUnit}</if>
-            <if test=' this.has("receiveUnit") '>and receive_unit = #{receiveUnit}</if>
+            <if test=' this.has("sendUnit") '>and send_unit like concat('%',#{sendUnit},'%')</if>
+            <if test=' this.has("receiveUnit") '>and receive_unit like concat('%',#{receiveUnit},'%')</if>
             <if test=' this.has("route") '>and route = #{route}</if>
             <if test=' this.has("driverName") '>and driver_name = #{driverName}</if>
             <if test=' this.has("driverPhone") '>and driver_phone = #{driverPhone}</if>
             <if test=' this.has("agent") '>and agent = #{agent}</if>
             <if test=' this.has("agentPhone") '>and agent_phone = #{agentPhone}</if>
-            <if test=' this.has("chinaCarNo") '>and china_car_no = #{chinaCarNo}</if>
-            <if test=' this.has("carNo") '>and car_no = #{carNo}</if>
+            <if test=' this.has("chinaCarNo") '>and china_car_no like concat('%',#{chinaCarNo},'%')</if>
+            <if test=' this.has("carNo") '>and car_no like concat('%',#{carNo},'%')</if>
             <if test=' this.has("customProof") '>and custom_proof = #{customProof}</if>
             <if test=' this.has("quarantineProof") '>and quarantine_proof = #{quarantineProof}</if>
             <if test=' this.has("shop") '>and shop = #{shop}</if>

sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfectMapper.xml

@@ -48,8 +48,8 @@
 		<where>
 			<if test=' this.has("id") '> and id = #{id} </if>
             <if test=' this.has("customerId") '>and customer_id = #{customerId}</if>
-			<if test=' this.has("sendPeople") '> and send_people = #{sendPeople} </if>
-			<if test=' this.has("receivePeople") '> and receive_people = #{receivePeople} </if>
+			<if test=' this.has("sendPeople") '> and send_people like concat('%',#{sendPeople},'%') </if>
+			<if test=' this.has("receivePeople") '> and receive_people like concat('%',#{receivePeople},'%') </if>
 			<if test=' this.has("goodsName") '> and goods_name = #{goodsName} </if>
 			<if test=' this.has("origin") '> and origin = #{origin} </if>
 			<if test=' this.has("num") '> and num = #{num} </if>
@@ -61,11 +61,11 @@
 			<if test=' this.has("sourceAddress") '> and source_address = #{sourceAddress} </if>
 			<if test=' this.has("arrivePart") '> and arrive_part = #{arrivePart} </if>
 			<if test=' this.has("carName") '> and car_name = #{carName} </if>
-			<if test=' this.has("carNo") '> and car_no = #{carNo} </if>
+			<if test=' this.has("carNo") '> and car_no like concat('%',#{carNo},'%') </if>
 			<if test=' this.has("chinaCarName") '> and china_car_name = #{chinaCarName} </if>
-			<if test=' this.has("chinaCarNo") '> and china_car_no = #{chinaCarNo} </if>
+			<if test=' this.has("chinaCarNo") '> and china_car_no like concat('%',#{chinaCarNo},'%') </if>
 			<if test=' this.has("remark") '> and remark = #{remark} </if>
-			<if test=' this.has("applyUnit") '> and apply_unit = #{applyUnit} </if>
+			<if test=' this.has("applyUnit") '> and apply_unit like concat('%',#{applyUnit},'%') </if>
 			<if test=' this.has("declarePeople") '> and declare_people = #{declarePeople} </if>
 			<if test=' this.has("declarePhone") '> and declare_phone = #{declarePhone} </if>
 			<if test=' this.has("applyTime") '> and apply_time = #{applyTime} </if>