修改机器列表，添加模糊查询

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<!-- iamberry 父配置 -->
@@ -46,16 +46,16 @@
 	</pluginRepositories>
 
 	<dependencyManagement>
-	     <dependencies>
-	        <dependency>
-	            <!-- Import dependency management from Spring Boot -->
-	            <groupId>org.springframework.boot</groupId>
-	            <artifactId>spring-boot-dependencies</artifactId>
-	            <version>1.4.1.RELEASE</version>
-	            <type>pom</type>
-	            <scope>import</scope>
-	        </dependency>
-	    </dependencies>
+		<dependencies>
+			<dependency>
+				<!-- Import dependency management from Spring Boot -->
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>1.4.1.RELEASE</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
 	</dependencyManagement>
 
 	<distributionManagement>
@@ -99,7 +99,7 @@
 			<groupId>jaxen</groupId>
 			<artifactId>jaxen</artifactId>
 		</dependency>
-		
+
 		<!-- 单元测试 -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -127,7 +127,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context-support</artifactId>
-			 <version>4.3.2.RELEASE</version>
+			<version>4.3.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -337,9 +337,9 @@
 			<version>1.2.6</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.apache.commons</groupId>
-		    <artifactId>commons-lang3</artifactId>
-		    <version>3.4</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.4</version>
 		</dependency>
 		<dependency>
 			<groupId>com.nimbusds</groupId>
@@ -358,62 +358,62 @@
 			<exclusions>
 				<exclusion>
 					<groupId>javax.servlet</groupId>
-	  				<artifactId>servlet-api</artifactId>
+					<artifactId>servlet-api</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
-		
+
 		<!-- .servlet-api -->
 		<dependency>
-		    <groupId>javax.servlet</groupId>
-		    <artifactId>javax.servlet-api</artifactId>
-		    <version>3.1.0</version>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
 		</dependency>
-				
-		
+
+
 		<dependency>
-		    <groupId>org.apache.poi</groupId>
-		    <artifactId>poi</artifactId>
-		    <version>3.14</version>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>3.14</version>
 		</dependency>
 
 		<dependency>
-		    <groupId>com.mortennobel</groupId>
-		    <artifactId>java-image-scaling</artifactId>
-		    <version>0.8.5</version>
+			<groupId>com.mortennobel</groupId>
+			<artifactId>java-image-scaling</artifactId>
+			<version>0.8.5</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>QRCode</groupId>
 			<artifactId>QRCode</artifactId>
 			<version>3.0</version>
 		</dependency>
-		
+
 		<dependency>
-		    <groupId>com.github.sogyf</groupId>
-		    <artifactId>goja-qrcode</artifactId>
-		    <version>0.1.2</version>
+			<groupId>com.github.sogyf</groupId>
+			<artifactId>goja-qrcode</artifactId>
+			<version>0.1.2</version>
 		</dependency>
-			
-		
+
+
 		<dependency>
-		    <groupId>jdom</groupId>
-		    <artifactId>jdom</artifactId>
-		    <version>1.0</version>
+			<groupId>jdom</groupId>
+			<artifactId>jdom</artifactId>
+			<version>1.0</version>
 		</dependency>
-				
+
 		<dependency>
-		    <groupId>jexcelapi</groupId>
-		    <artifactId>jxl</artifactId>
-		    <version>2.4.2</version>
+			<groupId>jexcelapi</groupId>
+			<artifactId>jxl</artifactId>
+			<version>2.4.2</version>
 		</dependency>
-				
+
 		<!-- 依赖 -->
-		 <dependency>
+		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>jstl</artifactId>
 			<version>1.2</version>
-	  	</dependency>
+		</dependency>
 
 		<!-- owasp -->
 		<dependency>
@@ -472,32 +472,32 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		
+
 		<!-- 校验框架 -->
 		<dependency>
-		    <groupId>org.hibernate</groupId>
-		    <artifactId>hibernate-validator</artifactId>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
 		</dependency>
-		
+
 		<!-- 依赖 -->
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpmime</artifactId>
 			<version>4.3.6</version>
 		</dependency>
-		
+
 		<dependency>
-		    <groupId>org.json</groupId>
-		    <artifactId>json</artifactId>
-		    <version>20160212</version>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20160212</version>
 		</dependency>
-		
+
 		<dependency>
-		    <groupId>cn.jpush.api</groupId>
-		    <artifactId>jpush-client</artifactId>
-		    <version>3.2.8</version>
+			<groupId>cn.jpush.api</groupId>
+			<artifactId>jpush-client</artifactId>
+			<version>3.2.8</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-websocket</artifactId>
@@ -530,12 +530,14 @@
 		<module>iamberry-app-api</module>
 		<module>iamberry-app-service</module>
 		<module>iamberry-app-interface</module>-->
-		<module>iamberry-common-core</module>
+
+		<!--<module>iamberry-common-core</module>
 		<module>iamberry-common-tool</module>
 		<module>iamberry-common-web</module>
 		<module>iamberry-wechat-interface</module>
 		<module>iamberry-wechat-service</module>
-		<module>iamberry-wechat-web</module>
+		<module>iamberry-wechat-web</module>-->
+
 		<module>watero-common-core</module>
 		<module>watero-common-tool</module>
 		<module>watero-common-web</module>
@@ -545,7 +547,7 @@
 		<module>watero-wechat-service</module>
 		<module>watero-wechat-web</module>
 		<module>watero-rent-web</module>
-        <module>watero-rst-web</module>
+		<module>watero-rst-web</module>
 		<module>watero-rst-core</module>
 		<module>watero-rst-interface</module>
 		<module>watero-rst-service</module>
@@ -553,24 +555,24 @@
 		<module>wateroPF-common-tool</module>
 		<module>wateroPF-common-web</module>
 		<module>wateroPF-wechat-interface</module>
-        <module>wateroPF-wechat-service</module>
-        <module>wateroPF-wechat-web</module>
+		<module>wateroPF-wechat-service</module>
+		<module>wateroPF-wechat-web</module>
 	</modules>
 
-    <!-- 配置 -->
-    <profiles>
-        <profile>
-            <id>jdk-1.8</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <jdk>1.8</jdk>
-            </activation>
-            <properties>
-                <maven.compiler.source>1.8</maven.compiler.source>
-                <maven.compiler.target>1.8</maven.compiler.target>
-                <maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
-            </properties>
-        </profile>
+	<!-- 配置 -->
+	<profiles>
+		<profile>
+			<id>jdk-1.8</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+				<jdk>1.8</jdk>
+			</activation>
+			<properties>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
+				<maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
+			</properties>
+		</profile>
 		<profile>
 			<id>sonar</id>
 			<activation>
@@ -582,5 +584,5 @@
 				<sonar.password>iamberry123</sonar.password>
 			</properties>
 		</profile>
-    </profiles>
+	</profiles>
 </project>

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineService.java

@@ -27,7 +27,7 @@ public interface MachineService {
     Integer updateMachineSalesInfo(PtsMachine ptsMachine);
 
     //查询机器列表
-    PagedResult<PtsMachine> listMachine(PageRequest<PtsMachine> pageRequest);
+    PagedResult<PtsMachine> listMachinePge(PageRequest<PtsMachine> pageRequest);
 
 
     //查询最新机器

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineServiceImpl.java

@@ -41,9 +41,9 @@ public class MachineServiceImpl implements MachineService {
     }
 
     @Override
-    public PagedResult<PtsMachine> listMachine(PageRequest<PtsMachine> pageRequest) {
+    public PagedResult<PtsMachine> listMachinePge(PageRequest<PtsMachine> pageRequest) {
         PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
-        List<PtsMachine> list = machineMapper.listMachine(pageRequest.getData());
+        List<PtsMachine> list = machineMapper.listMachinePge(pageRequest.getData());
         return PageUtil.getPage(list);
     }
 

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/MachineMapper.java

@@ -26,6 +26,9 @@ public interface MachineMapper {
     //查询机器列表
     List<PtsMachine> listMachine(PtsMachine ptsMachine);
 
+    //查询机器列表
+    List<PtsMachine> listMachinePge(PtsMachine ptsMachine);
+
     //查询电动牙刷列表
     List<PtsMachine> listMachineTooth(PtsMachine ptsMachine);
 

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml

@@ -126,6 +126,58 @@
         </where>
         order by machine_id desc
     </select>
+
+    <select id="listMachinePge" parameterType="PtsMachine" resultType="PtsMachine">
+        SELECT
+        t.machine_id machineId,
+        t.machine_qrcode machineQrcode,
+        t.machine_barcode machineBarcode,
+        t.machine_sales_date machineSalesDate,
+        t.machine_sales_state machineSalesState,
+        t.machine_status machineStatus,
+        t.machine_produced_time machineProducedTime,
+        t.machine_sub_time machineSubTime,
+        t.machine_is_print machineIsPrint,
+        t.machine_compound_img machineCompoundImg,
+        t.machine_process_state machineProcessState,
+        t.machine_software_version machineSoftwareVersion,
+        t.machine_hardware_version machineHardwareVersion,
+        t.machine_create_time machineCreateTime,
+        t.machine_update_time machineUpdateTime,
+        t.machine_produce_type machineProduceType,
+        t.machine_produce_id machineProduceId,
+        t.machine_is_retreading machineIsRetreading,
+        trpb.bom_version AS machineHardwareVersionName,
+        trpmv.machine_version_no AS machineSoftwareVersionName,
+        pi.produce_name AS produceName,
+        pi.produce_pattern AS producePattern,
+        pi.produce_model AS produceModel
+        FROM  tb_rst_pts_machine t
+        LEFT JOIN tb_rst_pts_bom trpb ON t.machine_bom_id = trpb.bom_id
+        LEFT JOIN tb_rst_pts_machine_version trpmv ON t.machine_software_version = trpmv.machine_version_id
+        LEFT JOIN tb_rst_pts_produce pi ON t.machine_produce_id = pi.produce_id
+        <where>
+            <if test="machineBarcode != null and machineBarcode != ''">
+                t.machine_barcode like CONCAT('%',#{machineBarcode},'%')
+            </if>
+            <if test="machineIsPrint != null and machineIsPrint != ''">
+                AND t.machine_is_print = #{machineIsPrint}
+            </if>
+            <if test="machineProcessState != null and machineProcessState != ''">
+                AND t.machine_process_state = #{machineProcessState}
+            </if>
+            <if test="machineProduceType != null and machineProduceType != 0">
+                AND t.machine_produce_type = #{machineProduceType}
+            </if>
+            <if test="machineProduceType != null and machineProduceType == 0">
+                AND t.machine_produce_type in(1,2)
+            </if>
+            AND  t.machine_status = 1
+        </where>
+        order by machine_id desc
+    </select>
+
+
     <!--查询电动牙刷信息-->
     <select id="listMachineTooth" parameterType="PtsMachine" resultType="PtsMachine">
         SELECT

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -101,7 +101,7 @@ public class AdminMachineController {
         }
 
         PageRequest<PtsMachine> pageRequest = new PageRequest<PtsMachine>(ptsMachine, pageNO, pageSize, pageTotal == null);
-        PagedResult<PtsMachine> pagedResult = machineService.listMachine(pageRequest);
+        PagedResult<PtsMachine> pagedResult = machineService.listMachinePge(pageRequest);
 
         long total = 0;
         if (pageTotal == null) {