优化 巡检 清空统计页面

java110-bean/src/main/java/com/java110/dto/equipmentAccount/EquipmentAccountDto.java

@@ -21,6 +21,7 @@ public class EquipmentAccountDto extends PageDto implements Serializable {
     private String purchasePrice;
     private String chargeOrgName;
     private String machineName;
+    private String machineNameLike;
     private String chargeOrgId;
     private String locationDetail;
     private String firstEnableTime;
@@ -360,4 +361,12 @@ public class EquipmentAccountDto extends PageDto implements Serializable {
     public void setUrl(String url) {
         this.url = url;
     }
+
+    public String getMachineNameLike() {
+        return machineNameLike;
+    }
+
+    public void setMachineNameLike(String machineNameLike) {
+        this.machineNameLike = machineNameLike;
+    }
 }

java110-db/src/main/resources/mapper/common/EquipmentAccountV1ServiceDaoImplMapper.xml

@@ -252,6 +252,9 @@
         <if test="machineName !=null and machineName != ''">
             and t.machine_name= #{machineName}
         </if>
+        <if test="machineNameLike !=null and machineNameLike != ''">
+            and t.machine_name like concat('%',#{machineNameLike},'%')
+        </if>
         <if test="chargeOrgId !=null and chargeOrgId != ''">
             and t.charge_org_id= #{chargeOrgId}
         </if>

service-acct/pom-cloud.xml

@@ -29,21 +29,21 @@
       <groupId>com.alipay.sdk</groupId>
       <artifactId>alipay-sdk-java</artifactId>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>com.icbc</groupId>-->
-      <!--<artifactId>icbc-api-sdk-cop</artifactId>-->
-      <!--<version>v1.0</version>-->
-    <!--</dependency>-->
-    <!--<dependency>-->
-      <!--<groupId>com.icbc</groupId>-->
-      <!--<artifactId>icbc-api-sdk-cop-io</artifactId>-->
-      <!--<version>v1.0</version>-->
-    <!--</dependency>-->
-    <!--<dependency>-->
-      <!--<groupId>com.icbc</groupId>-->
-      <!--<artifactId>icbc-ca</artifactId>-->
-      <!--<version>v1.0</version>-->
-    <!--</dependency>-->
+    <dependency>
+      <groupId>com.icbc</groupId>
+      <artifactId>icbc-api-sdk-cop</artifactId>
+      <version>v1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.icbc</groupId>
+      <artifactId>icbc-api-sdk-cop-io</artifactId>
+      <version>v1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.icbc</groupId>
+      <artifactId>icbc-ca</artifactId>
+      <version>v1.0</version>
+    </dependency>
 
   </dependencies>