Merge branch 'master' of http://git.iamsee.com/dunbai/railway

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcab.java

@@ -8,6 +8,7 @@ import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 检查表
@@ -52,6 +53,7 @@ public class BusJcab extends BaseEntity {
   private String sbzt;
 
   @ApiModelProperty(value = "检查日期")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
   @JsonFormat(pattern = "yyyy-MM-dd")
   private LocalDate checkDate;
 

railway-business/src/main/java/com/railway/business/catenary/domain/BusJceb.java

@@ -8,6 +8,7 @@ import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 检测表-关节式分相 
@@ -50,11 +51,11 @@ public class BusJceb extends BaseEntity{
     private String xingbieText;
 
     @ApiModelProperty(value = "检查日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern="yyyy-MM-dd")
     private LocalDate operationDate;
 
     @ApiModelProperty(value = "检测人")
-    @Length(min = 1, max = 255, message = "【检测人】长度必须介于 {min} 和 {max} 之间")
     private String operator;
 
     @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")

railway-business/src/main/resources/mapper/baseinfo/BasePreventBirdMapper.xml

@@ -276,14 +276,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/baseinfo/BasePreventFloodMapper.xml

@@ -315,14 +315,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/baseinfo/BasePreventForeignMapper.xml

@@ -279,14 +279,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/baseinfo/BasePreventIceMapper.xml

@@ -279,14 +279,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/baseinfo/BasePreventRustMapper.xml

@@ -291,14 +291,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/baseinfo/BasePreventThawMapper.xml

@@ -327,14 +327,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/baseinfo/BasePreventThunderMapper.xml

@@ -267,14 +267,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/baseinfo/BasePreventTreeMapper.xml

@@ -339,14 +339,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/baseinfo/BasePreventWindMapper.xml

@@ -279,14 +279,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/baseinfo/BusBlqMapper.xml

@@ -900,14 +900,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/baseinfo/BusDmcgyqMapper.xml

@@ -302,14 +302,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
       <if test="sjbh!=null and sjbh!=''">
         and t.sjbh=#{sjbh}

railway-business/src/main/resources/mapper/baseinfo/BusFdfxjyqMapper.xml

@@ -590,13 +590,13 @@
       <if test="createBy!=null and createBy!=''">
         and create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
+      <if test="createTime!=null">
         and create_time=#{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
+      <if test="updateTime!=null">
         and update_time=#{updateTime}
       </if>
     </where>

railway-business/src/main/resources/mapper/baseinfo/BusFjxgmdMapper.xml

@@ -209,14 +209,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/baseinfo/BusGlkgMapper.xml

@@ -205,14 +205,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
     order by t.create_time desc

railway-business/src/main/resources/mapper/baseinfo/BusSdtzMapper.xml

@@ -203,14 +203,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/baseinfo/BusZzdzxxMapper.xml

@@ -361,14 +361,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
   </select>

railway-business/src/main/resources/mapper/catenary/BusJcbBlqMapper.xml

@@ -381,7 +381,7 @@
       <if test="temperature!=null and temperature!=''">
         and t.temperature=#{temperature}
       </if>
-      <if test="checkDate!=null and checkDate!=''">
+      <if test="checkDate!=null">
         and t.check_date=#{checkDate}
       </if>
       <if test="picUrl!=null and picUrl!=''">
@@ -456,14 +456,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
       <if test="submitState!=null and submitState!=''">
         and t.submit_state <![CDATA[ >= ]]> #{submitState}
@@ -533,11 +533,14 @@
         and t.pillar_code=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.check_user=#{operator}
+        and t.check_user like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
+      <if test="operationDate!=null">
+        and t.check_date=#{operationDate}
+      </if>
     </where>
   </select>
 
@@ -559,11 +562,14 @@
         and t.pillar_code=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.check_user=#{operator}
+        and t.check_user like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
+      <if test="operationDate!=null">
+        and t.check_date=#{operationDate}
+      </if>
     </where>
   </select>
 

railway-business/src/main/resources/mapper/catenary/BusJcbDmcgyqMapper.xml

@@ -371,7 +371,7 @@
       <if test="temperature!=null and temperature!=''">
         and t.temperature=#{temperature}
       </if>
-      <if test="checkDate!=null and checkDate!=''">
+      <if test="checkDate!=null">
         and t.check_date=#{checkDate}
       </if>
       <if test="dgqwgAzlg!=null and dgqwgAzlg!=''">
@@ -431,14 +431,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
       <if test="userId!=null and userId!=''">
         and t.user_id=#{userId}
@@ -479,11 +479,14 @@
         and t.pillar_code=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.check_user=#{operator}
+        and t.check_user like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
+      <if test="operationDate!=null">
+        and t.check_date=#{operationDate}
+      </if>
     </where>
   </select>
 
@@ -505,11 +508,14 @@
         and t.pillar_code=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.check_user=#{operator}
+        and t.check_user like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
+      <if test="operationDate!=null">
+        and t.check_date=#{operationDate}
+      </if>
     </where>
   </select>
 

railway-business/src/main/resources/mapper/catenary/BusJcbFdfxjyqMapper.xml

@@ -504,7 +504,7 @@
       <if test="temperature!=null and temperature!=''">
         and t.temperature=#{temperature}
       </if>
-      <if test="checkDate!=null and checkDate!=''">
+      <if test="checkDate!=null">
         and t.check_date=#{checkDate}
       </if>
       <if test="picUrl!=null and picUrl!=''">
@@ -600,14 +600,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
       <if test="submitState!=null and submitState!=''">
         and t.submit_state <![CDATA[ >= ]]> #{submitState}
@@ -696,11 +696,14 @@
         and t.pillar_code=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.check_user=#{operator}
+        and t.check_user like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
+      <if test="operationDate!=null">
+        and t.check_date=#{operationDate}
+      </if>
     </where>
   </select>
 
@@ -722,11 +725,14 @@
         and t.pillar_code=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.check_user=#{operator}
+        and t.check_user like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
+      <if test="operationDate!=null">
+        and t.check_date=#{operationDate}
+      </if>
     </where>
   </select>
 

railway-business/src/main/resources/mapper/catenary/BusJcbGlkgMapper.xml

@@ -705,7 +705,7 @@
       <if test="temperature!=null and temperature!=''">
         and t.temperature=#{temperature}
       </if>
-      <if test="checkDate!=null and checkDate!=''">
+      <if test="checkDate!=null">
         and t.check_date=#{checkDate}
       </if>
       <if test="jgxA!=null and jgxA!=''">
@@ -879,14 +879,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
       <if test="submitState!=null and submitState!=''">
         and t.submit_state <![CDATA[ >= ]]> #{submitState}
@@ -952,11 +952,14 @@
         and t.pillar_code=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.check_user=#{operator}
+        and t.check_user like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
+      <if test="operationDate!=null">
+        and t.check_date=#{operationDate}
+      </if>
     </where>
   </select>
 
@@ -978,11 +981,14 @@
         and t.pillar_code=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.check_user=#{operator}
+        and t.check_user like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
+      <if test="operationDate!=null">
+        and t.check_date=#{operationDate}
+      </if>
     </where>
   </select>
 

railway-business/src/main/resources/mapper/catenary/BusJcbJcxcMapper.xml

@@ -497,7 +497,7 @@
       <if test="temperature!=null and temperature!=''">
         and t.temperature=#{temperature}
       </if>
-      <if test="checkDate!=null and checkDate!=''">
+      <if test="checkDate!=null">
         and t.check_date=#{checkDate}
       </if>
       <if test="gz1lcz!=null and gz1lcz!=''">
@@ -608,14 +608,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
       <if test="userId!=null and userId!=''">
         and t.user_id=#{userId}
@@ -656,11 +656,14 @@
         and t.pillar_code=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.check_user=#{operator}
+        and t.check_user like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
+      <if test="operationDate!=null">
+        and t.check_date=#{operationDate}
+      </if>
     </where>
   </select>
 
@@ -682,11 +685,14 @@
         and t.pillar_code=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.check_user=#{operator}
+        and t.check_user like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
+      <if test="operationDate!=null">
+        and t.check_date=#{operationDate}
+      </if>
     </where>
   </select>
 

railway-business/src/main/resources/mapper/catenary/BusJcbWjcxcMapper.xml

@@ -444,7 +444,7 @@
       <if test="temperature!=null and temperature!=''">
         and t.temperature=#{temperature}
       </if>
-      <if test="checkDate!=null and checkDate!=''">
+      <if test="checkDate!=null">
         and t.check_date=#{checkDate}
       </if>
       <if test="lbjzt!=null and lbjzt!=''">
@@ -534,14 +534,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
       <if test="userId!=null and userId!=''">
         and t.user_id=#{userId}
@@ -585,11 +585,14 @@
         and t.pillar_code=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.check_user=#{operator}
+        and t.check_user like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
+      <if test="operationDate!=null">
+        and t.check_date=#{operationDate}
+      </if>
     </where>
   </select>
 
@@ -611,11 +614,14 @@
         and t.pillar_code=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.check_user=#{operator}
+        and t.check_user like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
+      <if test="operationDate!=null">
+        and t.check_date=#{operationDate}
+      </if>
     </where>
   </select>
 

railway-business/src/main/resources/mapper/catenary/BusJcebGjsfxMapper.xml

@@ -288,7 +288,7 @@
       <if test="pillarEnd!=null and pillarEnd!=''">
         and t.pillar_end=#{pillarEnd}
       </if>
-      <if test="operationDate!=null and operationDate!=''">
+      <if test="operationDate!=null">
         and t.operation_date=#{operationDate}
       </if>
       <if test="lmdjcspjlZhz1!=null and lmdjcspjlZhz1!=''">
@@ -331,7 +331,7 @@
         and t.xmzjcxcztyyggjcctg=#{xmzjcxcztyyggjcctg}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="remark!=null and remark!=''">
         and t.remark=#{remark}
@@ -345,14 +345,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
     <if test="orderBy!=null and orderBy!=''">
@@ -390,7 +390,7 @@
         and t.pillar_start=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -416,7 +416,7 @@
         and t.pillar_start=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}

railway-business/src/main/resources/mapper/catenary/BusJcebJddzMapper.xml

@@ -227,7 +227,7 @@
       <if test="mdh!=null and mdh!=''">
         and t.mdh=#{mdh}
       </if>
-      <if test="operationDate!=null and operationDate!=''">
+      <if test="operationDate!=null">
         and t.operation_date=#{operationDate}
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
@@ -246,7 +246,7 @@
         and t.sfhg=#{sfhg}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="remark!=null and remark!=''">
         and t.remark=#{remark}
@@ -257,14 +257,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
       <if test="userId!=null and userId!=''">
         and t.user_id=#{userId}
@@ -308,7 +308,7 @@
         and t.pillar_start=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -334,7 +334,7 @@
         and t.pillar_start=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}

railway-business/src/main/resources/mapper/catenary/BusJcebJyzqsjlMapper.xml

@@ -214,11 +214,11 @@
       <if test="sl!=null and sl!=''">
         and t.sl=#{sl}
       </if>
-      <if test="operationDate!=null and operationDate!=''">
+      <if test="operationDate!=null">
         and t.operation_date=#{operationDate}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="remark!=null and remark!=''">
         and t.remark=#{remark}
@@ -232,14 +232,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
     <if test="orderBy!=null and orderBy!=''">
@@ -277,7 +277,7 @@
         and t.pillar_start=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -303,7 +303,7 @@
         and t.pillar_start=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}

railway-business/src/main/resources/mapper/catenary/BusJcebLbjghjlMapper.xml

@@ -251,11 +251,11 @@
       <if test="ghyy!=null and ghyy!=''">
         and t.ghyy=#{ghyy}
       </if>
-      <if test="operationDate!=null and operationDate!=''">
+      <if test="operationDate!=null">
         and t.operation_date=#{operationDate}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="remark!=null and remark!=''">
         and t.remark=#{remark}
@@ -269,14 +269,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
     <if test="orderBy!=null and orderBy!=''">
@@ -314,7 +314,7 @@
         and t.pillar_start=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -340,7 +340,7 @@
         and t.pillar_start=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}

railway-business/src/main/resources/mapper/catenary/BusJcebQmjcjlMapper.xml

@@ -286,7 +286,7 @@
         and t.sbzt=#{sbzt}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="gzldr!=null and gzldr!=''">
         and t.gzldr=#{gzldr}
@@ -294,7 +294,7 @@
       <if test="confirmUser!=null and confirmUser!=''">
         and t.confirm_user=#{confirmUser}
       </if>
-      <if test="operationDate!=null and operationDate!=''">
+      <if test="operationDate!=null">
         and t.operation_date=#{operationDate}
       </if>
       <if test="remark!=null and remark!=''">
@@ -309,14 +309,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
     </where>
     <if test="orderBy!=null and orderBy!=''">
@@ -354,7 +354,7 @@
         and t.pillar_start=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -380,7 +380,7 @@
         and t.pillar_start=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}

railway-business/src/main/resources/mapper/catenary/BusJcebXsjcjlMapper.xml

@@ -242,7 +242,7 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
-      <if test="operationDate!=null and operationDate!=''">
+      <if test="operationDate!=null">
         and t.operation_date=#{operationDate}
       </if>
       <if test="xsjcfs!=null and xsjcfs!=''">
@@ -261,7 +261,7 @@
         and t.yqwcsj=#{yqwcsj}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="clcs!=null and clcs!=''">
         and t.clcs=#{clcs}
@@ -287,14 +287,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
       <if test="userId!=null and userId!=''">
         and t.user_id=#{userId}
@@ -338,7 +338,7 @@
         and t.pillar_start=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -364,7 +364,7 @@
         and t.pillar_start=#{pillarCode}
       </if>
       <if test="operator!=null and operator!=''">
-        and t.operator=#{operator}
+        and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}

railway-business/src/main/resources/mapper/catenary/BusJlgzMapper.xml

@@ -210,14 +210,14 @@
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
       </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
+      <if test="createTime!=null">
+        and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
         and t.update_by=#{updateBy}
       </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
+      <if test="updateTime!=null">
+        and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
       <if test="delFlag!=null and delFlag!=''">
         and t.del_flag=#{delFlag}
@@ -262,5 +262,6 @@
       GROUP BY jlgz.yylx
     ) res right join sys_dict_data dictYylx on res.yylx = dictYylx.dict_value
     where dictYylx.dict_type = 'gzyy'
+    order by ifnull(res.total,0) desc, dictYylx.dict_sort
   </select>
 </mapper>

railway-business/src/main/resources/mapper/safetool/BaseSafetyToolMapper.xml

@@ -348,14 +348,14 @@
                 <if test="createBy!=null and createBy!=''">
                     and t.create_by=#{createBy}
                 </if>
-                <if test="createTime!=null and createTime!=''">
-                    and t.create_time=#{createTime}
+                <if test="createTime!=null">
+                    and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
                 </if>
                 <if test="updateBy!=null and updateBy!=''">
                     and t.update_by=#{updateBy}
                 </if>
-                <if test="updateTime!=null and updateTime!=''">
-                    and t.update_time=#{updateTime}
+                <if test="updateTime!=null">
+                    and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
                 </if>
         </where>
     </select>

railway-business/src/main/resources/mapper/safetool/SecScheduledToolMapper.xml

@@ -134,13 +134,13 @@
                 <if test="createBy!=null and createBy!=''">
                     and create_by=#{createBy}
                 </if>
-                <if test="createTime!=null and createTime!=''">
+                <if test="createTime!=null">
                     and create_time=#{createTime}
                 </if>
                 <if test="updateBy!=null and updateBy!=''">
                     and update_by=#{updateBy}
                 </if>
-                <if test="updateTime!=null and updateTime!=''">
+                <if test="updateTime!=null">
                     and update_time=#{updateTime}
                 </if>
         </where>

railway-common/src/main/java/com/railway/common/core/domain/BaseEntity.java

@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * Entity基类
@@ -30,6 +31,7 @@ public class BaseEntity implements Serializable {
   /**
    * 创建时间
    */
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   private Date createTime;
 
@@ -41,6 +43,7 @@ public class BaseEntity implements Serializable {
   /**
    * 更新时间
    */
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   private Date updateTime;