【CHG】修改检测表生成流程

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

@@ -84,4 +84,10 @@ public class BusJcebFzswjfxcController extends BaseController {
     return toAjax(busJcebFzswjfxcService.confirm(busJcebFzswjfxc));
   }
 
+  @ApiOperation(value = "中心领导确认")
+  @PutMapping("/centerLeaderConfirm")
+  public AjaxResult centerLeaderConfirm(@RequestBody BusJcebFzswjfxc busJcebFzswjfxc) {
+    return toAjax(busJcebFzswjfxcService.centerLeaderConfirm(busJcebFzswjfxc));
+  }
+
 }

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

@@ -92,6 +92,12 @@ public class BusJcebGjsfxController extends BaseController {
     return toAjax(busJcebGjsfxService.confirm(busJcebGjsfx));
   }
 
+  @ApiOperation(value = "中心领导确认")
+  @PutMapping("/centerLeaderConfirm")
+  public AjaxResult centerLeaderConfirm(@RequestBody BusJcebGjsfx busJcebGjsfx) {
+    return toAjax(busJcebGjsfxService.centerLeaderConfirm(busJcebGjsfx));
+  }
+
   @ApiOperation(value = "导出excel")
   @GetMapping(value = "exportExcel")
   public AjaxResult exportExcel(JcebQueryVo query) {

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

@@ -86,6 +86,12 @@ public class BusJcebJddzController extends BaseController {
     return toAjax(busJcebJddzService.confirm(busJcebJddz));
   }
 
+  @ApiOperation(value = "中心领导确认")
+  @PutMapping("/centerLeaderConfirm")
+  public AjaxResult centerLeaderConfirm(@RequestBody BusJcebJddz busJcebJddz) {
+    return toAjax(busJcebJddzService.centerLeaderConfirm(busJcebJddz));
+  }
+
   @ApiOperation(value = "导出excel")
   @GetMapping(value = "exportExcel")
   public AjaxResult exportExcel(JcebQueryVo query) {

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

@@ -92,6 +92,12 @@ public class BusJcebJyzqsjlController extends BaseController {
     return toAjax(busJcebJyzqsjlService.confirm(busJcebJyzqsjl));
   }
 
+  @ApiOperation(value = "中心领导确认")
+  @PutMapping("/centerLeaderConfirm")
+  public AjaxResult centerLeaderConfirm(@RequestBody BusJcebJyzqsjl busJcebJyzqsjl) {
+    return toAjax(busJcebJyzqsjlService.centerLeaderConfirm(busJcebJyzqsjl));
+  }
+
   @ApiOperation(value = "导出excel")
   @GetMapping(value = "exportExcel")
   public AjaxResult exportExcel(JcebQueryVo query) {

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

@@ -93,4 +93,10 @@ public class BusJcebLbjghjlController extends BaseController {
     return toAjax(busJcbLbjghjlService.confirm(busJcebLbjghjl));
   }
 
+  @ApiOperation(value = "中心领导确认")
+  @PutMapping("/centerLeaderConfirm")
+  public AjaxResult centerLeaderConfirm(@RequestBody BusJcebLbjghjl busJcebLbjghjl) {
+    return toAjax(busJcbLbjghjlService.centerLeaderConfirm(busJcebLbjghjl));
+  }
+
 }

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

@@ -93,4 +93,10 @@ public class BusJcebQmjcjlController extends BaseController {
     return toAjax(busJcbQmjcjlService.confirm(busJcebQmjcjl));
   }
 
+  @ApiOperation(value = "中心领导确认")
+  @PutMapping("/centerLeaderConfirm")
+  public AjaxResult centerLeaderConfirm(@RequestBody BusJcebQmjcjl busJcebQmjcjl) {
+    return toAjax(busJcbQmjcjlService.centerLeaderConfirm(busJcebQmjcjl));
+  }
+
 }

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

@@ -86,6 +86,12 @@ public class BusJcebXsjcjlController extends BaseController {
     return toAjax(busJcebXsjcjlService.confirm(busJcebXsjcjl));
   }
 
+  @ApiOperation(value = "中心领导确认")
+  @PutMapping("/centerLeaderConfirm")
+  public AjaxResult centerLeaderConfirm(@RequestBody BusJcebXsjcjl busJcebXsjcjl) {
+    return toAjax(busJcebXsjcjlService.centerLeaderConfirm(busJcebXsjcjl));
+  }
+
   @ApiOperation(value = "导出excel")
   @GetMapping(value = "exportExcel")
   public AjaxResult exportExcel(JcebQueryVo query) {

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

@@ -70,6 +70,12 @@ public class BusJceb extends BaseEntity {
   @ApiModelProperty(value = "确认日期")
   private LocalDate confirmDate;
 
+  @ApiModelProperty(value = "中心领导确认人")
+  private String centerConfirmUser;
+
+  @ApiModelProperty(value = "中心领导确认日期")
+  private LocalDate centerConfirmDate;
+
   @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
   @Length(min = 1, max = 1, message = "【提交状态 0未提交 1已提交 2已退回 9已确认】长度必须介于 {min} 和 {max} 之间")
   private String submitState;

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

@@ -71,4 +71,11 @@ public interface IBusJcebService<T extends BusJceb> {
      * @return 确认结果
      */
     int confirm(T t);
+
+    /**
+     * 中心领导确认
+     * @param t 检测表参数
+     * @return 确认结果
+     */
+    int centerLeaderConfirm(T t);
 }

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

@@ -106,9 +106,9 @@ public class BusJcebFzswjfxcServiceImpl extends BusJcebServiceImpl<BusJcebFzswjf
    * @return 退回结果
    */
   @Override
-  public int reject(BusJcebFzswjfxc busJcebGjsfx) {
-    setReject(busJcebGjsfx);
-    return update(busJcebGjsfx);
+  public int reject(BusJcebFzswjfxc busJcebFzswjfxc) {
+    setReject(busJcebFzswjfxc);
+    return update(busJcebFzswjfxc);
   }
 
   /**
@@ -117,9 +117,15 @@ public class BusJcebFzswjfxcServiceImpl extends BusJcebServiceImpl<BusJcebFzswjf
    * @return 确认结果
    */
   @Override
-  public int confirm(BusJcebFzswjfxc busJcebGjsfx) {
-    setConfirm(busJcebGjsfx);
-    return update(busJcebGjsfx);
+  public int confirm(BusJcebFzswjfxc busJcebFzswjfxc) {
+    setConfirm(busJcebFzswjfxc);
+    return update(busJcebFzswjfxc);
+  }
+
+  @Override
+  public int centerLeaderConfirm(BusJcebFzswjfxc busJcebFzswjfxc) {
+    setCenterLeaderConfirm(busJcebFzswjfxc);
+    return update(busJcebFzswjfxc);
   }
 
   /**

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

@@ -122,6 +122,12 @@ public class BusJcebGjsfxServiceImpl extends BusJcebServiceImpl<BusJcebGjsfx>
     return update(busJcebGjsfx);
   }
 
+  @Override
+  public int centerLeaderConfirm(BusJcebGjsfx busJcebGjsfx) {
+    setCenterLeaderConfirm(busJcebGjsfx);
+    return update(busJcebGjsfx);
+  }
+
   /**
    * 导出Excel
    *

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

@@ -3,7 +3,6 @@ package com.railway.business.catenary.service.impl;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.catenary.domain.BusJcebJddz;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
-import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.enums.JcebTypeEnum;
 import com.railway.business.catenary.mapper.BusJcebJddzMapper;
 import com.railway.business.catenary.service.IBusJcebJddzService;
@@ -122,6 +121,12 @@ public class BusJcebJddzServiceImpl extends BusJcebServiceImpl<BusJcebJddz>
     return update(busJcebJddz);
   }
 
+  @Override
+  public int centerLeaderConfirm(BusJcebJddz busJcebJddz) {
+    setCenterLeaderConfirm(busJcebJddz);
+    return update(busJcebJddz);
+  }
+
   /**
    * 导出Excel
    *
@@ -136,7 +141,7 @@ public class BusJcebJddzServiceImpl extends BusJcebServiceImpl<BusJcebJddz>
       params = getExcelParam(list.get(0));
     }
     list = list.stream()
-            .map(x -> {x.setSfhg(StringUtils.YES_VALUE.equals(x.getSfhg()) ? "合格" : "不合格"); return x;})
+            .peek(x -> x.setSfhg(StringUtils.YES_VALUE.equals(x.getSfhg()) ? "合格" : "不合格"))
             .collect(Collectors.toList());
     String fileName = "接地电阻测量记录.xls";
     String templateFileName = templatePath + "/excel/接地电阻测量记录.xls";

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

@@ -122,6 +122,12 @@ public class BusJcebJyzqsjlServiceImpl extends BusJcebServiceImpl<BusJcebJyzqsjl
     return update(busJcebJyzqsjl);
   }
 
+  @Override
+  public int centerLeaderConfirm(BusJcebJyzqsjl busJcebJyzqsjl) {
+    setCenterLeaderConfirm(busJcebJyzqsjl);
+    return update(busJcebJyzqsjl);
+  }
+
   /**
    * 导出Excel
    *

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

@@ -120,6 +120,12 @@ public class BusJcebLbjghjlServiceImpl extends BusJcebServiceImpl<BusJcebLbjghjl
     return update(busJcebLbjghjl);
   }
 
+  @Override
+  public int centerLeaderConfirm(BusJcebLbjghjl busJcebLbjghjl) {
+    setCenterLeaderConfirm(busJcebLbjghjl);
+    return update(busJcebLbjghjl);
+  }
+
   @Override
   public String exportExcel(JcebQueryVo query) {
     List<BusJcebLbjghjl> list = busJcebLbjghjlMapper.getJcebList(query);

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

@@ -120,6 +120,12 @@ public class BusJcebQmjcjlServiceImpl extends BusJcebServiceImpl<BusJcebQmjcjl>
     return update(busJcebQmjcjl);
   }
 
+  @Override
+  public int centerLeaderConfirm(BusJcebQmjcjl busJcebQmjcjl) {
+    setCenterLeaderConfirm(busJcebQmjcjl);
+    return update(busJcebQmjcjl);
+  }
+
   @Override
   public String exportExcel(JcebQueryVo query) {
     List<BusJcebQmjcjl> list = busJcebQmjcjlMapper.getJcebList(query);

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

@@ -181,9 +181,23 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
   protected void setConfirm(BusJceb jceb) {
     jceb.setConfirmUser(SecurityUtils.getUserRealName());
     jceb.setConfirmDate(LocalDate.now());
+    jceb.setSubmitState(JcebStatusEnum.COMPLETING.getCode());
+    String title = getJcebType() + "检测表车间领导已确认";
+    String content = "您提交的" + getJcebType() + "检测表车间领导已确认，点击查看详情";
+    busPushMsgService.update(jceb.getId(), getJcebTypeEnum().getTypeCode());
+    busPushMsgService.create(jceb.getCreateBy(), title, content, getPushParam(jceb), jceb.getId(),
+        getJcebTypeEnum().getTypeCode());
+  }
+
+  /**
+   * 中心领导确认
+   */
+  protected void setCenterLeaderConfirm(BusJceb jceb) {
+    jceb.setCenterConfirmDate(LocalDate.now());
+    jceb.setCenterConfirmUser(SecurityUtils.getUserRealName());
     jceb.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
-    String title = getJcebType() + "检测表已确认";
-    String content = "您提交的" + getJcebType() + "检测表已确认，点击查看详情";
+    String title = getJcebTypeEnum().getDescribe() + "检测表中心领导已确认";
+    String content = "您提交的" + getJcebTypeEnum().getDescribe() + "检测表中心领导已确认，点击查看详情";
     busPushMsgService.update(jceb.getId(), getJcebTypeEnum().getTypeCode());
     busPushMsgService.create(jceb.getCreateBy(), title, content, getPushParam(jceb), jceb.getId(),
         getJcebTypeEnum().getTypeCode());

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

@@ -58,6 +58,8 @@ public class JcebQueryUtil {
       log.debug("^_^ 中心领导根据选择的车间查询 ^_^");
       // jcebQuery.setDeptId(getDeptIdCache(user.getUserId()))
       jcebQuery.setPostType(PostTypeEnum.CENTER.getCode());
+      // 中心领导只查看车间领导或中心领导确认过的检查表记录
+      jcebQuery.setSubmitState(JcebStatusEnum.COMPLETING.getCode());
     }else if(PostTypeEnum.LEADER == postType || scope.equals(DataScopeAspect.DATA_SCOPE_DEPT)
         || scope.equals(DataScopeAspect.DATA_SCOPE_DEPT_AND_CHILD)){
       log.debug("^_^ 车间领导设置为查询已提交表 ^_^");
@@ -80,12 +82,7 @@ public class JcebQueryUtil {
 
   public static void setBusJcab(BusJcab jcab){
     JcebQueryParamVo jcebQuery = getJcebQuery(jcab.getSubmitState());
-    if(PostTypeEnum.CENTER.getCode().equals(jcebQuery.getPostType())){
-      // 中心领导只查看车间领导或中心领导确认过的检查表记录
-      jcab.setSubmitState(JcebStatusEnum.COMPLETING.getCode());
-    }else {
-      jcab.setSubmitState(jcebQuery.getSubmitState());
-    }
+    jcab.setSubmitState(jcebQuery.getSubmitState());
     jcab.setDeptId(jcebQuery.getDeptId());
     jcab.setCreateBy(jcebQuery.getCreateBy());
   }
@@ -109,6 +106,7 @@ public class JcebQueryUtil {
     Long deptId = redisCache.getCacheObject(getCacheKey(userId));
     if(StringUtils.isEmpty(deptId)) {
       // 取默认选择的车间
+      log.debug("2022.5.20改为不再取默认车间");
       // deptId = redisCache.getCacheObject(Constants.LEADER_VIEW_DEPT_INIT_KEY)
     }
     return deptId;

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

@@ -502,10 +502,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -569,10 +570,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -628,10 +630,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -681,10 +684,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>

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

@@ -478,10 +478,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -530,10 +531,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -589,10 +591,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -641,10 +644,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>

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

@@ -668,10 +668,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -753,10 +754,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -811,10 +813,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -857,10 +860,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>

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

@@ -960,10 +960,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -1023,10 +1024,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -1081,10 +1083,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -1133,10 +1136,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>

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

@@ -647,10 +647,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -697,10 +698,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -755,10 +757,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -807,10 +810,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>

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

@@ -621,10 +621,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -674,10 +675,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -732,10 +734,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>
@@ -784,10 +787,11 @@
         and (
         t.submit_state = #{submitState}
         <if test="submitState == '3'">
-          or t.submit_state = '9' or DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
         </if>
         <if test="submitState == '9'">
-          or DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
         </if>
         )
       </if>

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

@@ -28,6 +28,8 @@
     <result column="confirm_user" property="confirmUser"/>
     <result column="confirm_user_real_name" property="confirmUserRealName"/>
     <result column="confirm_date" property="confirmDate"/>
+    <result column="center_confirm_user" property="centerConfirmUser"/>
+    <result column="center_confirm_date" property="centerConfirmDate"/>
     <result column="remark" property="remark"/>
     <result column="submit_state" property="submitState"/>
     <result column="del_flag" property="delFlag"/>
@@ -61,6 +63,8 @@
     t.operator,
     t.confirm_user,
     t.confirm_date,
+    t.center_confirm_user,
+    t.center_confirm_date,
     t.remark,
     t.submit_state,
     t.del_flag,
@@ -260,6 +264,8 @@
       <if test='null != operator'>operator = #{operator},</if>
       <if test='null != confirmUser'>confirm_user = #{confirmUser},</if>
       <if test='null != confirmDate'>confirm_date = #{confirmDate},</if>
+      <if test='null != centerConfirmUser'>center_confirm_user = #{centerConfirmUser},</if>
+      <if test='null != centerConfirmDate'>center_confirm_date = #{centerConfirmDate},</if>
       <if test='null != remark'>remark = #{remark},</if>
       <if test='null != submitState'>submit_state = #{submitState},</if>
       <if test='null != delFlag'>del_flag = #{delFlag},</if>
@@ -352,7 +358,16 @@
         and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -385,7 +400,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -432,7 +456,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -473,7 +506,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -28,6 +28,8 @@
     <result column="confirm_user" property="confirmUser"/>
     <result column="confirm_user_real_name" property="confirmUserRealName"/>
     <result column="confirm_date" property="confirmDate"/>
+    <result column="center_confirm_user" property="centerConfirmUser"/>
+    <result column="center_confirm_date" property="centerConfirmDate"/>
     <result column="remark" property="remark"/>
     <result column="submit_state" property="submitState"/>
     <result column="del_flag" property="delFlag"/>
@@ -61,6 +63,8 @@
     t.operator,
     t.confirm_user,
     t.confirm_date,
+    t.center_confirm_user,
+    t.center_confirm_date,
     t.remark,
     t.submit_state,
     t.del_flag,
@@ -260,6 +264,8 @@
       <if test='null != operator'>operator = #{operator},</if>
       <if test='null != confirmUser'>confirm_user = #{confirmUser},</if>
       <if test='null != confirmDate'>confirm_date = #{confirmDate},</if>
+      <if test='null != centerConfirmUser'>center_confirm_user = #{centerConfirmUser},</if>
+      <if test='null != centerConfirmDate'>center_confirm_date = #{centerConfirmDate},</if>
       <if test='null != remark'>remark = #{remark},</if>
       <if test='null != submitState'>submit_state = #{submitState},</if>
       <if test='null != delFlag'>del_flag = #{delFlag},</if>
@@ -350,7 +356,16 @@
         and t.operator like concat('%', #{operator}, '%')
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -389,7 +404,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -436,7 +460,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -477,7 +510,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -23,6 +23,8 @@
     <result column="confirm_user" property="confirmUser"/>
     <result column="confirm_user_real_name" property="confirmUserRealName"/>
     <result column="confirm_date" property="confirmDate"/>
+    <result column="center_confirm_user" property="centerConfirmUser"/>
+    <result column="center_confirm_date" property="centerConfirmDate"/>
     <result column="remark" property="remark"/>
     <result column="submit_state" property="submitState"/>
     <result column="create_by" property="createBy"/>
@@ -52,6 +54,8 @@
     t.operator,
     t.confirm_user,
     t.confirm_date,
+    t.center_confirm_user,
+    t.center_confirm_date,
     t.remark,
     t.submit_state,
     t.create_by,
@@ -195,6 +199,8 @@
       <if test='null != operator'>operator = #{operator},</if>
       <if test='null != confirmUser'>confirm_user = #{confirmUser},</if>
       <if test='null != confirmDate'>confirm_date = #{confirmDate},</if>
+      <if test='null != centerConfirmUser'>center_confirm_user = #{centerConfirmUser},</if>
+      <if test='null != centerConfirmDate'>center_confirm_date = #{centerConfirmDate},</if>
       <if test='null != remark'>remark = #{remark},</if>
       <if test='null != submitState'>submit_state = #{submitState},</if>
       <if test='null != updateBy'>update_by = #{updateBy},</if>
@@ -268,7 +274,16 @@
         and t.remark=#{remark}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -313,7 +328,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -360,7 +384,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -401,7 +434,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -21,6 +21,8 @@
     <result column="confirm_user" property="confirmUser"/>
     <result column="confirm_user_real_name" property="confirmUserRealName"/>
     <result column="confirm_date" property="confirmDate"/>
+    <result column="center_confirm_user" property="centerConfirmUser"/>
+    <result column="center_confirm_date" property="centerConfirmDate"/>
     <result column="remark" property="remark"/>
     <result column="submit_state" property="submitState"/>
     <result column="del_flag" property="delFlag"/>
@@ -48,6 +50,8 @@
     t.operator,
     t.confirm_user,
     t.confirm_date,
+    t.center_confirm_user,
+    t.center_confirm_date,
     t.remark,
     t.submit_state,
     t.del_flag,
@@ -177,6 +181,8 @@
       <if test='null != operator'>operator = #{operator},</if>
       <if test='null != confirmUser'>confirm_user = #{confirmUser},</if>
       <if test='null != confirmDate'>confirm_date = #{confirmDate},</if>
+      <if test='null != centerConfirmUser'>center_confirm_user = #{centerConfirmUser},</if>
+      <if test='null != centerConfirmDate'>center_confirm_date = #{centerConfirmDate},</if>
       <if test='null != remark'>remark = #{remark},</if>
       <if test='null != submitState'>submit_state = #{submitState},</if>
       <if test='null != delFlag'>del_flag = #{delFlag},</if>
@@ -237,7 +243,16 @@
         and t.remark=#{remark}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="delFlag!=null and delFlag!=''">
         and t.del_flag=#{delFlag}
@@ -279,7 +294,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -326,7 +350,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -367,7 +400,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -21,6 +21,8 @@
     <result column="confirm_user" property="confirmUser"/>
     <result column="confirm_user_real_name" property="confirmUserRealName"/>
     <result column="confirm_date" property="confirmDate"/>
+    <result column="center_confirm_user" property="centerConfirmUser"/>
+    <result column="center_confirm_date" property="centerConfirmDate"/>
     <result column="remark" property="remark"/>
     <result column="submit_state" property="submitState"/>
     <result column="del_flag" property="delFlag"/>
@@ -46,6 +48,8 @@
     operator,
     t.confirm_user,
     t.confirm_date,
+    t.center_confirm_user,
+    t.center_confirm_date,
     remark,
     submit_state,
     del_flag,
@@ -196,6 +200,8 @@
       <if test='null != operator'>operator = #{operator},</if>
       <if test='null != confirmUser'>confirm_user = #{confirmUser},</if>
       <if test='null != confirmDate'>confirm_date = #{confirmDate},</if>
+      <if test='null != centerConfirmUser'>center_confirm_user = #{centerConfirmUser},</if>
+      <if test='null != centerConfirmDate'>center_confirm_date = #{centerConfirmDate},</if>
       <if test='null != remark'>remark = #{remark},</if>
       <if test='null != submitState'>submit_state = #{submitState},</if>
       <if test='null != delFlag'>del_flag = #{delFlag},</if>
@@ -277,7 +283,16 @@
         and t.remark=#{remark}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="delFlag!=null and delFlag!=''">
         and t.del_flag=#{delFlag}
@@ -322,7 +337,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -369,7 +393,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -410,7 +443,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -24,6 +24,8 @@
     <result column="operation_date" property="operationDate"/>
     <result column="confirm_user_real_name" property="confirmUserRealName"/>
     <result column="confirm_date" property="confirmDate"/>
+    <result column="center_confirm_user" property="centerConfirmUser"/>
+    <result column="center_confirm_date" property="centerConfirmDate"/>
     <result column="remark" property="remark"/>
     <result column="submit_state" property="submitState"/>
     <result column="del_flag" property="delFlag"/>
@@ -53,6 +55,8 @@
     t.operation_date,
     t.confirm_user,
     t.confirm_date,
+    t.center_confirm_user,
+    t.center_confirm_date,
     t.remark,
     t.submit_state,
     t.del_flag,
@@ -229,6 +233,8 @@
       <if test='null != gzldr'>gzldr = #{gzldr},</if>
       <if test='null != confirmUser'>confirm_user = #{confirmUser},</if>
       <if test='null != confirmDate'>confirm_date = #{confirmDate},</if>
+      <if test='null != centerConfirmUser'>center_confirm_user = #{centerConfirmUser},</if>
+      <if test='null != centerConfirmDate'>center_confirm_date = #{centerConfirmDate},</if>
       <if test='null != operationDate'>operation_date = #{operationDate},</if>
       <if test='null != remark'>remark = #{remark},</if>
       <if test='null != submitState'>submit_state = #{submitState},</if>
@@ -314,7 +320,16 @@
         and t.remark=#{remark}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="delFlag!=null and delFlag!=''">
         and t.del_flag=#{delFlag}
@@ -356,7 +371,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -403,7 +427,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -444,7 +477,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}

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

@@ -18,6 +18,8 @@
     <result column="confirm_user" property="confirmUser"/>
     <result column="confirm_user_real_name" property="confirmUserRealName"/>
     <result column="confirm_date" property="confirmDate"/>
+    <result column="center_confirm_user" property="centerConfirmUser"/>
+    <result column="center_confirm_date" property="centerConfirmDate"/>
     <result column="clcs" property="clcs"/>
     <result column="cljg" property="cljg"/>
     <result column="clqxldr" property="clqxldr"/>
@@ -47,6 +49,8 @@
     t.operator,
     t.confirm_user,
     t.confirm_date,
+    t.center_confirm_user,
+    t.center_confirm_date,
     t.clcs,
     t.cljg,
     t.clqxldr,
@@ -218,6 +222,8 @@
       <if test='null != operator'>operator = #{operator},</if>
       <if test='null != confirmUser'>confirm_user = #{confirmUser},</if>
       <if test='null != confirmDate'>confirm_date = #{confirmDate},</if>
+      <if test='null != centerConfirmUser'>center_confirm_user = #{centerConfirmUser},</if>
+      <if test='null != centerConfirmDate'>center_confirm_date = #{centerConfirmDate},</if>
       <if test='null != clcs'>clcs = #{clcs},</if>
       <if test='null != cljg'>cljg = #{cljg},</if>
       <if test='null != clqxldr'>clqxldr = #{clqxldr},</if>
@@ -301,7 +307,16 @@
         and t.remark=#{remark}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="createBy!=null and createBy!=''">
         and t.create_by=#{createBy}
@@ -346,7 +361,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -393,7 +417,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
@@ -434,7 +467,16 @@
     <where>
       t.del_flag='0'
       <if test="submitState!=null and submitState!=''">
-        and t.submit_state = #{submitState}
+        and (
+        t.submit_state = #{submitState}
+        <if test="submitState == '3'">
+          or t.submit_state = '9'
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[<]]> 3 and t.submit_state = '3')
+        </if>
+        <if test="submitState == '9'">
+          or (DATEDIFF(t.confirm_date,NOW()) <![CDATA[>=]]> 3 and t.submit_state = '3')
+        </if>
+        )
       </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}