【CHG】修改接触网查询条件

railway-business/src/main/java/com/railway/business/catenary/controller/BusJcbDmcgyqController.java

@@ -148,13 +148,6 @@ public class BusJcbDmcgyqController extends BaseController {
     return sysFileService.uploadFile(localFilePath);
   }
 
-  @ApiOperation(value = "检测表list")
-  @GetMapping(value = "jcebList")
-  public TableDataInfo jcebList(JcebQueryVo query) {
-    startPage();
-    return getDataTable(busJcbDmcgyqService.getJcebList(query));
-  }
-
   @ApiOperation(value = "检测表单个详情")
   @GetMapping(value = "/jcebInfo")
   public AjaxResult getJcebInfo(BusJcbDmcgyq busJcbDmcgyq) {

railway-business/src/main/java/com/railway/business/catenary/controller/BusJcebController.java

@@ -5,6 +5,7 @@ import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.domain.vo.JcebStationVo;
+import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.enums.JcebTypeEnum;
 import com.railway.business.catenary.enums.SortTypeEnum;
 import com.railway.business.catenary.service.IBusJcbBlqService;
@@ -134,8 +135,12 @@ public class BusJcebController extends BaseController {
   @GetMapping(value = "listByType")
   public TableDataInfo listByType(JcebQueryVo query) {
     startPage();
-    JcebQueryUtil.setBusJcebQuery(query);
     JcebTypeEnum jcebTypeEnum = JcebTypeEnum.ofValue(query.getJcebType());
+    // 设置查询权限
+    JcebQueryUtil.setBusJcebQuery(query);
+    if (jcebTypeEnum.isJcabType()) {
+      query.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
+    }
     query.setJcebTypeText(jcebTypeEnum.getDescribe());
     List<JcebRecordVo> list = null;
     switch (jcebTypeEnum) {
@@ -188,8 +193,12 @@ public class BusJcebController extends BaseController {
   @GetMapping(value = "exportExcel")
   public AjaxResult exportExcel(JcebQueryVo query) {
     JcebTypeEnum jcebTypeEnum = JcebTypeEnum.ofValue(query.getJcebType());
-    String localFilePath = null;
+    // 设置查询权限
     JcebQueryUtil.setBusJcebQuery(query);
+    if (jcebTypeEnum.isJcabType()) {
+      query.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
+    }
+    String localFilePath = null;
     switch (jcebTypeEnum) {
       case Jddz:
         localFilePath = jddzService.exportExcel(query);
@@ -242,8 +251,16 @@ public class BusJcebController extends BaseController {
   @ApiOperation(value = "汇总列表")
   @GetMapping(value = "listAll")
   public TableDataInfo listAll(JcebQueryVo query) {
+    // 设置查询权限
+    JcebQueryUtil.setBusJcebQuery(query);
+    String submitState = query.getSubmitState();
     List<JcebCountVo> list = new ArrayList<>();
     for (JcebTypeEnum jcebTypeEnum : JcebTypeEnum.values()) {
+      if (jcebTypeEnum.isJcabType()) {
+        query.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
+      } else {
+        query.setSubmitState(submitState);
+      }
       JcebCountVo jcebRecordVo = null;
       switch (jcebTypeEnum) {
         case Jddz:

railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebQueryParamVo.java

@@ -20,6 +20,9 @@ public class JcebQueryParamVo implements Serializable {
   @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
   private String submitState;
 
+  @ApiModelProperty(value = "岗位类型", hidden = true)
+  private String postType;
+
   @ApiModelProperty(value = "创建者")
   private String createBy;
 

railway-business/src/main/java/com/railway/business/catenary/enums/JcebTypeEnum.java

@@ -6,7 +6,9 @@ package com.railway.business.catenary.enums;
  * @author railway
  */
 public enum JcebTypeEnum {
-  /** 检测表类型 */
+  /**
+   * 检测表类型
+   */
   Gjsfx("gjsfx", "关节式分相"),
   Jddz("jddz", "接地电阻"),
   Jyzqsjl("jyzqsjl", "绝缘子清扫记录"),
@@ -15,7 +17,9 @@ public enum JcebTypeEnum {
   Xsjcjl("xsjcjl", "巡视检查记录"),
   Fzswjfxc("fzswjfxc", "辅助索无交分线岔"),
 
-  /** 检查表类型 */
+  /**
+   * 检查表类型
+   */
   Blq("blq", "避雷器"),
   Dmcgyq("dmcgyq", "地面磁感应器"),
   Fdfxjyq("fdfxjyq", "dxf分段绝缘器"),
@@ -40,6 +44,11 @@ public enum JcebTypeEnum {
     return describe;
   }
 
+  public Boolean isJcabType() {
+    return this == Blq || this == Dmcgyq || this == Fdfxjyq
+        || this == Glkg || this == Jcxc || this == Wjcxc;
+  }
+
   public static JcebTypeEnum ofValue(String code) {
     for (JcebTypeEnum investor : JcebTypeEnum.values()) {
       if (investor.getTypeCode().equals(code)) {

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbDmcgyqService.java

@@ -44,13 +44,6 @@ public interface IBusJcbDmcgyqService{
     */
     List<BusJcbDmcgyq> getList(BusJcbDmcgyq busJcbDmcgyq);
 
-    /**
-     * 检测表list
-     * @param query
-     * @return
-     */
-    List<BusJcbDmcgyq> getJcebList(JcebQueryVo query);
-
     /**
      * 获取上次检查记录
      */

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbBlqServiceImpl.java

@@ -187,7 +187,6 @@ public class BusJcbBlqServiceImpl extends BusJcabServiceImpl implements IBusJcbB
    */
   @Override
   public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
-    setJcebQuery(query);
     return busJcbBlqMapper.getListByType(query);
   }
 
@@ -198,7 +197,6 @@ public class BusJcbBlqServiceImpl extends BusJcabServiceImpl implements IBusJcbB
    */
   @Override
   public JcebCountVo getCountByType(JcebQueryVo query) {
-    setJcebQuery(query);
     return busJcbBlqMapper.getCountByType(query);
   }
 

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbDmcgyqServiceImpl.java

@@ -13,16 +13,12 @@ import com.railway.business.catenary.enums.JcebTypeEnum;
 import com.railway.business.catenary.mapper.BusJcbDmcgyqMapper;
 import com.railway.business.catenary.service.IBusJcbDmcgyqService;
 import com.railway.business.push.service.IBusPushMsgService;
-import com.railway.common.core.page.PageDomain;
-import com.railway.common.core.page.TableSupport;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.bean.BeanUtils;
 import com.railway.common.utils.poi.EasyExcelUtil;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -176,22 +172,12 @@ public class BusJcbDmcgyqServiceImpl extends BusJcabServiceImpl implements IBusJ
    */
   @Override
   public String exportExcel(JcebQueryVo query) {
-    setJcebQuery(query);
     List<BusJcbDmcgyq> list = busJcbDmcgyqMapper.getJcebList(query);
     String fileName = "地磁感应器检测记录.xls";
     String templateFileName = "excel/template/地磁感应器检测记录.xls";
     return new EasyExcelUtil().writeExcel(fileName, templateFileName, list);
   }
 
-  /**
-   * 检测表list
-   */
-  @Override
-  public List<BusJcbDmcgyq> getJcebList(JcebQueryVo query) {
-    setJcebQuery(query);
-    return busJcbDmcgyqMapper.getJcebList(query);
-  }
-
   /**
    * 获取单个jceb
    */
@@ -293,7 +279,6 @@ public class BusJcbDmcgyqServiceImpl extends BusJcabServiceImpl implements IBusJ
    */
   @Override
   public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
-    setJcebQuery(query);
     return busJcbDmcgyqMapper.getListByType(query);
   }
 

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbFdfxjyqServiceImpl.java

@@ -200,7 +200,6 @@ public class BusJcbFdfxjyqServiceImpl extends BusJcabServiceImpl implements IBus
    */
   @Override
   public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
-    setJcebQuery(query);
     return busJcbFdfxjyqMapper.getListByType(query);
   }
 

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbGlkgServiceImpl.java

@@ -174,7 +174,6 @@ public class BusJcbGlkgServiceImpl extends BusJcabServiceImpl implements IBusJcb
 	 */
 	@Override
 	public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
-		setJcebQuery(query);
 		return busJcbGlkgMapper.getListByType(query);
 	}
 
@@ -193,7 +192,7 @@ public class BusJcbGlkgServiceImpl extends BusJcabServiceImpl implements IBusJcb
 	public String exportExcel(JcebQueryVo query) {
 		setJcebQuery(query);
 		List<BusJcbGlkg> list = busJcbGlkgMapper.getJcebList(query);
-		list = list.stream().map(x -> formatOne(x)).collect(Collectors.toList());
+		list = list.stream().map(this::formatOne).collect(Collectors.toList());
 		String fileName = "隔离开关检测记录.xls";
 		String templateFileName = "excel/template/隔离开关检测记录.xls";
 		return new EasyExcelUtil().writeExcel(fileName, templateFileName, list);

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbJcxcServiceImpl.java

@@ -172,7 +172,7 @@ public class BusJcbJcxcServiceImpl extends BusJcabServiceImpl implements IBusJcb
   @Override
   public String exportExcel(JcebQueryVo query) {
       List<BusJcbJcxc> list = busJcbJcxcMapper.getJcebList(query);
-      list = list.stream().map(x -> transData(x)).collect(Collectors.toList());
+      list = list.stream().map(this::transData).collect(Collectors.toList());
       Map<String, Object> params = new HashMap<>();
       String fileName = "交叉线岔检测（修）记录.xls";
       String templateFileName = "excel/template/交叉线岔检测（修）记录.xls";
@@ -225,7 +225,6 @@ public class BusJcbJcxcServiceImpl extends BusJcabServiceImpl implements IBusJcb
    */
   @Override
   public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
-    setJcebQuery(query);
     return busJcbJcxcMapper.getListByType(query);
   }
 

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbWjcxcServiceImpl.java

@@ -172,7 +172,7 @@ public class BusJcbWjcxcServiceImpl extends BusJcabServiceImpl implements IBusJc
   @Override
   public String exportExcel(JcebQueryVo query) {
     List<BusJcbWjcxc> list = busJcbWjcxcMapper.getJcebList(query);
-    list = list.stream().map(x -> transData(x)).collect(Collectors.toList());
+    list = list.stream().map(this::transData).collect(Collectors.toList());
     Map<String, Object> params = new HashMap<>();
     String fileName = "无交叉线岔检测（修）记录.xls";
     String templateFileName = "excel/template/无交叉线岔检测（修）记录.xls";
@@ -203,7 +203,6 @@ public class BusJcbWjcxcServiceImpl extends BusJcabServiceImpl implements IBusJc
    */
   @Override
   public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
-    setJcebQuery(query);
     return busJcbWjcxcMapper.getListByType(query);
   }
 

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebLbjghjlServiceImpl.java

@@ -6,15 +6,13 @@ import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.enums.JcebTypeEnum;
 import com.railway.business.catenary.mapper.BusJcebLbjghjlMapper;
 import com.railway.business.catenary.service.IBusJcebLbjghjlService;
-import com.railway.business.catenary.util.JcebQueryUtil;
 import com.railway.business.push.service.IBusPushMsgService;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.EasyExcelUtil;
+import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 /**
  * 检测表-零部件更换记录
  *
@@ -124,7 +122,6 @@ public class BusJcebLbjghjlServiceImpl extends BusJcebServiceImpl<BusJcebLbjghjl
 
   @Override
   public String exportExcel(JcebQueryVo query) {
-    JcebQueryUtil.setBusJcebQuery(query);
     List<BusJcebLbjghjl> list = busJcebLbjghjlMapper.getJcebList(query);
     String fileName = "零部件更换记录.xls";
     String templateFileName = "excel/template/零部件更换记录.xls";

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebQmjcjlServiceImpl.java

@@ -6,7 +6,6 @@ import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.enums.JcebTypeEnum;
 import com.railway.business.catenary.mapper.BusJcebQmjcjlMapper;
 import com.railway.business.catenary.service.IBusJcebQmjcjlService;
-import com.railway.business.catenary.util.JcebQueryUtil;
 import com.railway.business.push.service.IBusPushMsgService;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.EasyExcelUtil;
@@ -123,7 +122,6 @@ public class BusJcebQmjcjlServiceImpl extends BusJcebServiceImpl<BusJcebQmjcjl>
 
   @Override
   public String exportExcel(JcebQueryVo query) {
-    JcebQueryUtil.setBusJcebQuery(query);
     List<BusJcebQmjcjl> list = busJcebQmjcjlMapper.getJcebList(query);
     String fileName = "全面检查记录.xls";
     String templateFileName = "excel/template/全面检查记录.xls";

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebServiceImpl.java

@@ -67,8 +67,6 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
    */
   @Override
   public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
-    // 设置查询权限
-    JcebQueryUtil.setBusJcebQuery(query);
     return busJcebMapper.getListByType(query);
   }
 
@@ -77,8 +75,6 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
    */
   @Override
   public JcebCountVo getCountByType(JcebQueryVo query) {
-    // 设置查询权限
-    JcebQueryUtil.setBusJcebQuery(query);
     return busJcebMapper.getCountByType(query);
   }
 

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebXsjcjlServiceImpl.java

@@ -6,17 +6,15 @@ import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.enums.JcebTypeEnum;
 import com.railway.business.catenary.mapper.BusJcebXsjcjlMapper;
 import com.railway.business.catenary.service.IBusJcebXsjcjlService;
-import com.railway.business.catenary.util.JcebQueryUtil;
 import com.railway.business.push.service.IBusPushMsgService;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.EasyExcelUtil;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author zcf
@@ -140,7 +138,6 @@ public class BusJcebXsjcjlServiceImpl extends BusJcebServiceImpl<BusJcebXsjcjl>
 
   @Override
   public String exportExcel(JcebQueryVo query) {
-    JcebQueryUtil.setBusJcebQuery(query);
     List<BusJcebXsjcjl> list = busJcebXsjcjlMapper.getJcebList(query);
     Map<String, Object> params = new HashMap<>();
     String fileName = "巡检记录.xls";

railway-business/src/main/java/com/railway/business/catenary/util/JcebQueryUtil.java

@@ -32,6 +32,7 @@ public class JcebQueryUtil {
       log.debug("^_^ 管理员设置为查询已提交表 ^_^");
       jcebQuery.setSubmitState(JcebStatusEnum.REPORTED.getCode());
       jcebQuery.setCreateBy(null);
+      jcebQuery.setPostType(PostTypeEnum.CENTER.getCode());
       return jcebQuery;
     }
     // 角色数据权限
@@ -53,14 +54,17 @@ public class JcebQueryUtil {
       log.debug("^_^ 车间领导设置为查询已提交表 ^_^");
       jcebQuery.setDeptId(getDeptIdCache(user.getUserId()));
       jcebQuery.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+      jcebQuery.setPostType(PostTypeEnum.CENTER.getCode());
       jcebQuery.setCreateBy(null);
     }else if(PostTypeEnum.LEADER == postType || scope.equals(DataScopeAspect.DATA_SCOPE_DEPT)
         || scope.equals(DataScopeAspect.DATA_SCOPE_DEPT_AND_CHILD)){
       jcebQuery.setDeptId(user.getDeptId());
       jcebQuery.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+      jcebQuery.setPostType(PostTypeEnum.LEADER.getCode());
       jcebQuery.setCreateBy(null);
     }else {
       jcebQuery.setCreateBy(user.getUserName());
+      jcebQuery.setPostType(PostTypeEnum.STAFF.getCode());
     }
     return jcebQuery;
   }

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

@@ -482,7 +482,7 @@
         and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
     </where>
     <if test="orderBy!=null and orderBy!=''">
@@ -536,7 +536,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -583,7 +583,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -624,7 +624,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -464,7 +464,7 @@
         and t.czwt=#{czwt}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -505,7 +505,7 @@
     <where>
       t.del_flag='0' and t.submit_state = '9'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -553,7 +553,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -594,7 +594,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -656,7 +656,7 @@
         and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="delFlag!=null and delFlag!=''">
         and t.del_flag=#{delFlag}
@@ -730,7 +730,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -777,7 +777,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -812,7 +812,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -947,7 +947,7 @@
         and DATE_FORMAT(t.update_time, '%Y-%m-%d') = #{updateTime}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="delFlag!=null and delFlag!=''">
         and t.del_flag=#{delFlag}
@@ -999,7 +999,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -1046,7 +1046,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -1087,7 +1087,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -633,7 +633,7 @@
         and t.czwt=#{czwt}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -672,7 +672,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -719,7 +719,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -760,7 +760,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -607,7 +607,7 @@
         and t.czwt=#{czwt}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -649,7 +649,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -696,7 +696,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -737,7 +737,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -345,7 +345,7 @@
         and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -375,7 +375,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -419,7 +419,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -457,7 +457,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -343,7 +343,7 @@
         and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -379,7 +379,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -423,7 +423,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -461,7 +461,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -261,7 +261,7 @@
         and t.remark=#{remark}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -303,7 +303,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -347,7 +347,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -385,7 +385,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -230,7 +230,7 @@
         and t.remark=#{remark}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="delFlag!=null and delFlag!=''">
         and t.del_flag=#{delFlag}
@@ -269,7 +269,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -313,7 +313,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -351,7 +351,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -270,7 +270,7 @@
         and t.remark=#{remark}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="delFlag!=null and delFlag!=''">
         and t.del_flag=#{delFlag}
@@ -312,7 +312,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -356,7 +356,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -394,7 +394,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -310,7 +310,7 @@
         and t.remark=#{remark}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="delFlag!=null and delFlag!=''">
         and t.del_flag=#{delFlag}
@@ -349,7 +349,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -393,7 +393,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -431,7 +431,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -294,7 +294,7 @@
         and t.remark=#{remark}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -336,7 +336,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -380,7 +380,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -418,7 +418,7 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state <![CDATA[ >= ]]> #{submitState}
+        and t.submit_state = #{submitState}
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}