【NEW】增加辅助索无交分线岔

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

@@ -13,6 +13,7 @@ import com.railway.business.catenary.service.IBusJcbFdfxjyqService;
 import com.railway.business.catenary.service.IBusJcbGlkgService;
 import com.railway.business.catenary.service.IBusJcbJcxcService;
 import com.railway.business.catenary.service.IBusJcbWjcxcService;
+import com.railway.business.catenary.service.IBusJcebFzswjfxcService;
 import com.railway.business.catenary.service.IBusJcebGjsfxService;
 import com.railway.business.catenary.service.IBusJcebJddzService;
 import com.railway.business.catenary.service.IBusJcebJyzqsjlService;
@@ -52,6 +53,7 @@ public class BusJcebController extends BaseController {
   private final IBusJcebJyzqsjlService jyzqsjlService;
   private final IBusJcebJddzService jddzService;
   private final IBusJcebGjsfxService gjsfxService;
+  private final IBusJcebFzswjfxcService fzswjfxcService;
 
   private final IBusJcbBlqService blqService;
   private final IBusJcbDmcgyqService dmcgyqService;
@@ -70,6 +72,7 @@ public class BusJcebController extends BaseController {
       IBusJcebJyzqsjlService jyzqsjlService,
       IBusJcebJddzService jddzService,
       IBusJcebGjsfxService gjsfxService,
+      IBusJcebFzswjfxcService fzswjfxcService,
       IBusJcbBlqService blqService,
       IBusJcbDmcgyqService dmcgyqService,
       IBusJcbFdfxjyqService fdfxjyqService,
@@ -84,6 +87,7 @@ public class BusJcebController extends BaseController {
     this.jyzqsjlService = jyzqsjlService;
     this.jddzService = jddzService;
     this.gjsfxService = gjsfxService;
+    this.fzswjfxcService = fzswjfxcService;
     this.blqService = blqService;
     this.dmcgyqService = dmcgyqService;
     this.fdfxjyqService = fdfxjyqService;
@@ -152,12 +156,15 @@ public class BusJcebController extends BaseController {
       case Lbjghjl:
         list = lbjghjlService.getListByType(query);
         break;
+      case Fzswjfxc:
+        list = fzswjfxcService.getListByType(query);
+        break;
       case Blq:
         list = blqService.getListByType(query);
         break;
-//      case Dmcgyq:
-//        list = dmcgyqService.getListByType(query);
-//        break;
+      case Dmcgyq:
+        list = dmcgyqService.getListByType(query);
+        break;
       case Fdfxjyq:
         list = fdfxjyqService.getListByType(query);
         break;
@@ -201,6 +208,9 @@ public class BusJcebController extends BaseController {
       case Lbjghjl:
         localFilePath = lbjghjlService.exportExcel(query);
         break;
+      case Fzswjfxc:
+        localFilePath = fzswjfxcService.exportExcel(query);
+        break;
       case Blq:
         localFilePath = blqService.exportExcel(query);
         break;
@@ -253,6 +263,9 @@ public class BusJcebController extends BaseController {
         case Lbjghjl:
           jcebRecordVo = lbjghjlService.getCountByType(query);
           break;
+        case Fzswjfxc:
+          jcebRecordVo = fzswjfxcService.getCountByType(query);
+          break;
         case Blq:
           jcebRecordVo = blqService.getCountByType(query);
           break;

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

@@ -0,0 +1,87 @@
+package com.railway.business.catenary.controller;
+
+import com.railway.business.catenary.domain.BusJcebFzswjfxc;
+import com.railway.business.catenary.service.IBusJcebFzswjfxcService;
+import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.domain.AjaxResult;
+import com.railway.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(value = "rest/catenary/bus/jceb/fzswjfxc", tags = "检测表 - 辅助索无交分线岔")
+@RestController
+@Validated
+@RequestMapping(value = "business/catenary/bus/jceb/fzswjfxc")
+public class BusJcebFzswjfxcController extends BaseController {
+
+  private final IBusJcebFzswjfxcService busJcebFzswjfxcService;
+
+  public BusJcebFzswjfxcController(IBusJcebFzswjfxcService busJcebFzswjfxcService) {
+    this.busJcebFzswjfxcService = busJcebFzswjfxcService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BusJcebFzswjfxc busJcebFzswjfxc) {
+    return toAjax(busJcebFzswjfxcService.create(busJcebFzswjfxc));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@RequestParam Long[] ids) {
+    return toAjax(busJcebFzswjfxcService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BusJcebFzswjfxc busJcebFzswjfxc) {
+    return toAjax(busJcebFzswjfxcService.update(busJcebFzswjfxc));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(Long id) {
+    BusJcebFzswjfxc info = busJcebFzswjfxcService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BusJcebFzswjfxc busJcebFzswjfxc) {
+    startPage();
+    List<BusJcebFzswjfxc> list = busJcebFzswjfxcService.getList(busJcebFzswjfxc);
+    return getDataTable(list);
+  }
+
+  @ApiOperation(value = "提交")
+  @PutMapping("/submit")
+  public AjaxResult submit(@RequestBody BusJcebFzswjfxc busJcebFzswjfxc) {
+    return toAjax(busJcebFzswjfxcService.submit(busJcebFzswjfxc));
+  }
+
+  @ApiOperation(value = "退回")
+  @PutMapping("/reject")
+  public AjaxResult reject(@RequestBody BusJcebFzswjfxc busJcebFzswjfxc) {
+    return toAjax(busJcebFzswjfxcService.reject(busJcebFzswjfxc));
+  }
+
+  @ApiOperation(value = "确认")
+  @PutMapping("/confirm")
+  public AjaxResult confirm(@RequestBody BusJcebFzswjfxc busJcebFzswjfxc) {
+    return toAjax(busJcebFzswjfxcService.confirm(busJcebFzswjfxc));
+  }
+
+}

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

@@ -30,73 +30,73 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(value = "business/catenary/bus/jceb/gjsfx")
 public class BusJcebGjsfxController extends BaseController {
 
-    private final IBusJcebGjsfxService busJcebGjsfxService;
-    private final ISysFileService sysFileService;
+  private final IBusJcebGjsfxService busJcebGjsfxService;
+  private final ISysFileService sysFileService;
 
-    public BusJcebGjsfxController(IBusJcebGjsfxService busJcebGjsfxService,ISysFileService sysFileService) {
-        this.busJcebGjsfxService = busJcebGjsfxService;
-        this.sysFileService = sysFileService;
-    }
+  public BusJcebGjsfxController(IBusJcebGjsfxService busJcebGjsfxService,
+      ISysFileService sysFileService) {
+    this.busJcebGjsfxService = busJcebGjsfxService;
+    this.sysFileService = sysFileService;
+  }
 
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BusJcebGjsfx busJcebGjsfx) {
-        return toAjax(busJcebGjsfxService.create(busJcebGjsfx));
-    }
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BusJcebGjsfx busJcebGjsfx) {
+    return toAjax(busJcebGjsfxService.create(busJcebGjsfx));
+  }
 
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
-        return toAjax(busJcebGjsfxService.delete(ids));
-    }
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@RequestParam Long[] ids) {
+    return toAjax(busJcebGjsfxService.delete(ids));
+  }
 
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BusJcebGjsfx busJcebGjsfx) {
-        return toAjax(busJcebGjsfxService.update(busJcebGjsfx));
-    }
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BusJcebGjsfx busJcebGjsfx) {
+    return toAjax(busJcebGjsfxService.update(busJcebGjsfx));
+  }
 
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
-        BusJcebGjsfx info = busJcebGjsfxService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(Long id) {
+    BusJcebGjsfx info = busJcebGjsfxService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
 
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BusJcebGjsfx busJcebGjsfx) {
-        startPage();
-        List<BusJcebGjsfx> list = busJcebGjsfxService.getList(busJcebGjsfx);
-        return getDataTable(list);
-    }
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BusJcebGjsfx busJcebGjsfx) {
+    startPage();
+    List<BusJcebGjsfx> list = busJcebGjsfxService.getList(busJcebGjsfx);
+    return getDataTable(list);
+  }
 
+  @ApiOperation(value = "提交")
+  @PutMapping("/submit")
+  public AjaxResult submit(@RequestBody BusJcebGjsfx busJcebGjsfx) {
+    return toAjax(busJcebGjsfxService.submit(busJcebGjsfx));
+  }
 
-    @ApiOperation(value = "提交")
-    @PutMapping("/submit")
-    public AjaxResult submit(@RequestBody BusJcebGjsfx busJcebGjsfx) {
-        return toAjax(busJcebGjsfxService.submit(busJcebGjsfx));
-    }
+  @ApiOperation(value = "退回")
+  @PutMapping("/reject")
+  public AjaxResult reject(@RequestBody BusJcebGjsfx busJcebGjsfx) {
+    return toAjax(busJcebGjsfxService.reject(busJcebGjsfx));
+  }
 
-    @ApiOperation(value = "退回")
-    @PutMapping("/reject")
-    public AjaxResult reject(@RequestBody BusJcebGjsfx busJcebGjsfx) {
-        return toAjax(busJcebGjsfxService.reject(busJcebGjsfx));
-    }
+  @ApiOperation(value = "确认")
+  @PutMapping("/confirm")
+  public AjaxResult confirm(@RequestBody BusJcebGjsfx busJcebGjsfx) {
+    return toAjax(busJcebGjsfxService.confirm(busJcebGjsfx));
+  }
 
-    @ApiOperation(value = "确认")
-    @PutMapping("/confirm")
-    public AjaxResult confirm(@RequestBody BusJcebGjsfx busJcebGjsfx) {
-        return toAjax(busJcebGjsfxService.confirm(busJcebGjsfx));
-    }
-
-    @ApiOperation(value = "导出excel")
-    @GetMapping(value = "exportExcel")
-    public AjaxResult exportExcel(JcebQueryVo query) {
-        String localFilePath = busJcebGjsfxService.exportExcel(query);
-        return sysFileService.uploadFile(localFilePath);
-    }
+  @ApiOperation(value = "导出excel")
+  @GetMapping(value = "exportExcel")
+  public AjaxResult exportExcel(JcebQueryVo query) {
+    String localFilePath = busJcebGjsfxService.exportExcel(query);
+    return sysFileService.uploadFile(localFilePath);
+  }
 
 }

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

@@ -24,72 +24,73 @@ import java.util.List;
 @RequestMapping(value = "business/catenary/bus/jceb/jddz")
 public class BusJcebJddzController extends BaseController {
 
-    private final IBusJcebJddzService busJcebJddzService;
-    private final ISysFileService sysFileService;
+  private final IBusJcebJddzService busJcebJddzService;
+  private final ISysFileService sysFileService;
 
-    public BusJcebJddzController(IBusJcebJddzService busJcebJddzService, ISysFileService sysFileService) {
-        this.busJcebJddzService = busJcebJddzService;
-        this.sysFileService = sysFileService;
-    }
+  public BusJcebJddzController(IBusJcebJddzService busJcebJddzService,
+      ISysFileService sysFileService) {
+    this.busJcebJddzService = busJcebJddzService;
+    this.sysFileService = sysFileService;
+  }
 
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BusJcebJddz busJcebJddz) {
-        return toAjax(busJcebJddzService.create(busJcebJddz));
-    }
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BusJcebJddz busJcebJddz) {
+    return toAjax(busJcebJddzService.create(busJcebJddz));
+  }
 
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
-        return toAjax(busJcebJddzService.delete(ids));
-    }
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@RequestParam Long[] ids) {
+    return toAjax(busJcebJddzService.delete(ids));
+  }
 
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BusJcebJddz busJcebJddz) {
-        return toAjax(busJcebJddzService.update(busJcebJddz));
-    }
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BusJcebJddz busJcebJddz) {
+    return toAjax(busJcebJddzService.update(busJcebJddz));
+  }
 
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
-        BusJcebJddz info = busJcebJddzService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(Long id) {
+    BusJcebJddz info = busJcebJddzService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
 
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BusJcebJddz busJcebJddz) {
-        startPage();
-        List<BusJcebJddz> list = busJcebJddzService.getList(busJcebJddz);
-        return getDataTable(list);
-    }
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BusJcebJddz busJcebJddz) {
+    startPage();
+    List<BusJcebJddz> list = busJcebJddzService.getList(busJcebJddz);
+    return getDataTable(list);
+  }
 
-    @ApiOperation(value = "提交")
-    @PutMapping("/submit")
-    public AjaxResult submit(@RequestBody BusJcebJddz busJcebJddz) {
-        return toAjax(busJcebJddzService.submit(busJcebJddz));
-    }
+  @ApiOperation(value = "提交")
+  @PutMapping("/submit")
+  public AjaxResult submit(@RequestBody BusJcebJddz busJcebJddz) {
+    return toAjax(busJcebJddzService.submit(busJcebJddz));
+  }
 
-    @ApiOperation(value = "退回")
-    @PutMapping("/reject")
-    public AjaxResult reject(@RequestBody BusJcebJddz busJcebJddz) {
-        return toAjax(busJcebJddzService.reject(busJcebJddz));
-    }
+  @ApiOperation(value = "退回")
+  @PutMapping("/reject")
+  public AjaxResult reject(@RequestBody BusJcebJddz busJcebJddz) {
+    return toAjax(busJcebJddzService.reject(busJcebJddz));
+  }
 
-    @ApiOperation(value = "确认")
-    @PutMapping("/confirm")
-    public AjaxResult confirm(@RequestBody BusJcebJddz busJcebJddz) {
-        return toAjax(busJcebJddzService.confirm(busJcebJddz));
-    }
+  @ApiOperation(value = "确认")
+  @PutMapping("/confirm")
+  public AjaxResult confirm(@RequestBody BusJcebJddz busJcebJddz) {
+    return toAjax(busJcebJddzService.confirm(busJcebJddz));
+  }
 
-    @ApiOperation(value = "导出excel")
-    @GetMapping(value = "exportExcel")
-    public AjaxResult exportExcel(JcebQueryVo query) {
-        String localFilePath = busJcebJddzService.exportExcel(query);
-        return sysFileService.uploadFile(localFilePath);
-    }
+  @ApiOperation(value = "导出excel")
+  @GetMapping(value = "exportExcel")
+  public AjaxResult exportExcel(JcebQueryVo query) {
+    String localFilePath = busJcebJddzService.exportExcel(query);
+    return sysFileService.uploadFile(localFilePath);
+  }
 
 }

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

@@ -30,72 +30,73 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(value = "business/catenary/bus/jceb/jyzqsjl")
 public class BusJcebJyzqsjlController extends BaseController {
 
-    private final IBusJcebJyzqsjlService busJcebJyzqsjlService;
-    private final ISysFileService sysFileService;
+  private final IBusJcebJyzqsjlService busJcebJyzqsjlService;
+  private final ISysFileService sysFileService;
 
-    public BusJcebJyzqsjlController(IBusJcebJyzqsjlService busJcebJyzqsjlService,ISysFileService sysFileService) {
-        this.busJcebJyzqsjlService = busJcebJyzqsjlService;
-        this.sysFileService = sysFileService;
-    }
+  public BusJcebJyzqsjlController(IBusJcebJyzqsjlService busJcebJyzqsjlService,
+      ISysFileService sysFileService) {
+    this.busJcebJyzqsjlService = busJcebJyzqsjlService;
+    this.sysFileService = sysFileService;
+  }
 
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BusJcebJyzqsjl busJcebJyzqsjl) {
-        return toAjax(busJcebJyzqsjlService.create(busJcebJyzqsjl));
-    }
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BusJcebJyzqsjl busJcebJyzqsjl) {
+    return toAjax(busJcebJyzqsjlService.create(busJcebJyzqsjl));
+  }
 
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
-        return toAjax(busJcebJyzqsjlService.delete(ids));
-    }
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@RequestParam Long[] ids) {
+    return toAjax(busJcebJyzqsjlService.delete(ids));
+  }
 
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BusJcebJyzqsjl busJcebJyzqsjl) {
-        return toAjax(busJcebJyzqsjlService.update(busJcebJyzqsjl));
-    }
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BusJcebJyzqsjl busJcebJyzqsjl) {
+    return toAjax(busJcebJyzqsjlService.update(busJcebJyzqsjl));
+  }
 
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
-        BusJcebJyzqsjl info = busJcebJyzqsjlService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(Long id) {
+    BusJcebJyzqsjl info = busJcebJyzqsjlService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
 
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BusJcebJyzqsjl busJcebJyzqsjl) {
-        startPage();
-        List<BusJcebJyzqsjl> list = busJcebJyzqsjlService.getList(busJcebJyzqsjl);
-        return getDataTable(list);
-    }
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BusJcebJyzqsjl busJcebJyzqsjl) {
+    startPage();
+    List<BusJcebJyzqsjl> list = busJcebJyzqsjlService.getList(busJcebJyzqsjl);
+    return getDataTable(list);
+  }
 
-    @ApiOperation(value = "提交")
-    @PutMapping("/submit")
-    public AjaxResult submit(@RequestBody BusJcebJyzqsjl busJcebJyzqsjl) {
-        return toAjax(busJcebJyzqsjlService.submit(busJcebJyzqsjl));
-    }
+  @ApiOperation(value = "提交")
+  @PutMapping("/submit")
+  public AjaxResult submit(@RequestBody BusJcebJyzqsjl busJcebJyzqsjl) {
+    return toAjax(busJcebJyzqsjlService.submit(busJcebJyzqsjl));
+  }
 
-    @ApiOperation(value = "退回")
-    @PutMapping("/reject")
-    public AjaxResult reject(@RequestBody BusJcebJyzqsjl busJcebJyzqsjl) {
-        return toAjax(busJcebJyzqsjlService.reject(busJcebJyzqsjl));
-    }
+  @ApiOperation(value = "退回")
+  @PutMapping("/reject")
+  public AjaxResult reject(@RequestBody BusJcebJyzqsjl busJcebJyzqsjl) {
+    return toAjax(busJcebJyzqsjlService.reject(busJcebJyzqsjl));
+  }
 
-    @ApiOperation(value = "确认")
-    @PutMapping("/confirm")
-    public AjaxResult confirm(@RequestBody BusJcebJyzqsjl busJcebJyzqsjl) {
-        return toAjax(busJcebJyzqsjlService.confirm(busJcebJyzqsjl));
-    }
+  @ApiOperation(value = "确认")
+  @PutMapping("/confirm")
+  public AjaxResult confirm(@RequestBody BusJcebJyzqsjl busJcebJyzqsjl) {
+    return toAjax(busJcebJyzqsjlService.confirm(busJcebJyzqsjl));
+  }
 
-    @ApiOperation(value = "导出excel")
-    @GetMapping(value = "exportExcel")
-    public AjaxResult exportExcel(JcebQueryVo query) {
-        String localFilePath = busJcebJyzqsjlService.exportExcel(query);
-        return sysFileService.uploadFile(localFilePath);
-    }
+  @ApiOperation(value = "导出excel")
+  @GetMapping(value = "exportExcel")
+  public AjaxResult exportExcel(JcebQueryVo query) {
+    String localFilePath = busJcebJyzqsjlService.exportExcel(query);
+    return sysFileService.uploadFile(localFilePath);
+  }
 
 }

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

@@ -24,72 +24,73 @@ import java.util.List;
 @RequestMapping(value = "business/catenary/bus/jceb/lbjghjl")
 public class BusJcebLbjghjlController extends BaseController {
 
-    private final IBusJcebLbjghjlService busJcbLbjghjlService;
-    private final ISysFileService sysFileService;
+  private final IBusJcebLbjghjlService busJcbLbjghjlService;
+  private final ISysFileService sysFileService;
 
-    public BusJcebLbjghjlController(IBusJcebLbjghjlService busJcbLbjghjlService, ISysFileService sysFileService) {
-        this.busJcbLbjghjlService = busJcbLbjghjlService;
-        this.sysFileService = sysFileService;
-    }
+  public BusJcebLbjghjlController(IBusJcebLbjghjlService busJcbLbjghjlService,
+      ISysFileService sysFileService) {
+    this.busJcbLbjghjlService = busJcbLbjghjlService;
+    this.sysFileService = sysFileService;
+  }
 
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BusJcebLbjghjl busJcebLbjghjl) {
-        return toAjax(busJcbLbjghjlService.create(busJcebLbjghjl));
-    }
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BusJcebLbjghjl busJcebLbjghjl) {
+    return toAjax(busJcbLbjghjlService.create(busJcebLbjghjl));
+  }
 
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
-        return toAjax(busJcbLbjghjlService.delete(ids));
-    }
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@PathVariable(value = "ids") Long[] ids) {
+    return toAjax(busJcbLbjghjlService.delete(ids));
+  }
 
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BusJcebLbjghjl busJcebLbjghjl) {
-        return toAjax(busJcbLbjghjlService.update(busJcebLbjghjl));
-    }
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BusJcebLbjghjl busJcebLbjghjl) {
+    return toAjax(busJcbLbjghjlService.update(busJcebLbjghjl));
+  }
 
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(@PathVariable(value = "id") String id) {
-        BusJcebLbjghjl info = busJcbLbjghjlService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(@PathVariable(value = "id") Long id) {
+    BusJcebLbjghjl info = busJcbLbjghjlService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
 
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BusJcebLbjghjl busJcebLbjghjl) {
-        startPage();
-        List<BusJcebLbjghjl> list = busJcbLbjghjlService.getList(busJcebLbjghjl);
-        return getDataTable(list);
-    }
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BusJcebLbjghjl busJcebLbjghjl) {
+    startPage();
+    List<BusJcebLbjghjl> list = busJcbLbjghjlService.getList(busJcebLbjghjl);
+    return getDataTable(list);
+  }
 
-    @ApiOperation(value = "导出excel")
-    @GetMapping(value = "exportExcel")
-    public AjaxResult exportExcel(JcebQueryVo query) {
-        String localFilePath = busJcbLbjghjlService.exportExcel(query);
-        return sysFileService.uploadFile(localFilePath);
-    }
+  @ApiOperation(value = "导出excel")
+  @GetMapping(value = "exportExcel")
+  public AjaxResult exportExcel(JcebQueryVo query) {
+    String localFilePath = busJcbLbjghjlService.exportExcel(query);
+    return sysFileService.uploadFile(localFilePath);
+  }
 
-    @ApiOperation(value = "提交")
-    @PutMapping("/submit")
-    public AjaxResult submit(@RequestBody BusJcebLbjghjl busJcebLbjghjl) {
-        return toAjax(busJcbLbjghjlService.submit(busJcebLbjghjl));
-    }
+  @ApiOperation(value = "提交")
+  @PutMapping("/submit")
+  public AjaxResult submit(@RequestBody BusJcebLbjghjl busJcebLbjghjl) {
+    return toAjax(busJcbLbjghjlService.submit(busJcebLbjghjl));
+  }
 
-    @ApiOperation(value = "退回")
-    @PutMapping("/reject")
-    public AjaxResult reject(@RequestBody BusJcebLbjghjl busJcebLbjghjl) {
-        return toAjax(busJcbLbjghjlService.reject(busJcebLbjghjl));
-    }
+  @ApiOperation(value = "退回")
+  @PutMapping("/reject")
+  public AjaxResult reject(@RequestBody BusJcebLbjghjl busJcebLbjghjl) {
+    return toAjax(busJcbLbjghjlService.reject(busJcebLbjghjl));
+  }
 
-    @ApiOperation(value = "确认")
-    @PutMapping("/confirm")
-    public AjaxResult confirm(@RequestBody BusJcebLbjghjl busJcebLbjghjl) {
-        return toAjax(busJcbLbjghjlService.confirm(busJcebLbjghjl));
-    }
+  @ApiOperation(value = "确认")
+  @PutMapping("/confirm")
+  public AjaxResult confirm(@RequestBody BusJcebLbjghjl busJcebLbjghjl) {
+    return toAjax(busJcbLbjghjlService.confirm(busJcebLbjghjl));
+  }
 
 }

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

@@ -24,72 +24,73 @@ import java.util.List;
 @RequestMapping(value = "business/catenary/bus/jceb/qmjcjl")
 public class BusJcebQmjcjlController extends BaseController {
 
-    private final IBusJcebQmjcjlService busJcbQmjcjlService;
-    private final ISysFileService sysFileService;
+  private final IBusJcebQmjcjlService busJcbQmjcjlService;
+  private final ISysFileService sysFileService;
 
-    public BusJcebQmjcjlController(IBusJcebQmjcjlService busJcbQmjcjlService, ISysFileService sysFileService) {
-        this.busJcbQmjcjlService = busJcbQmjcjlService;
-        this.sysFileService = sysFileService;
-    }
+  public BusJcebQmjcjlController(IBusJcebQmjcjlService busJcbQmjcjlService,
+      ISysFileService sysFileService) {
+    this.busJcbQmjcjlService = busJcbQmjcjlService;
+    this.sysFileService = sysFileService;
+  }
 
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BusJcebQmjcjl busJcebQmjcjl) {
-        return toAjax(busJcbQmjcjlService.create(busJcebQmjcjl));
-    }
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BusJcebQmjcjl busJcebQmjcjl) {
+    return toAjax(busJcbQmjcjlService.create(busJcebQmjcjl));
+  }
 
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
-        return toAjax(busJcbQmjcjlService.delete(ids));
-    }
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@PathVariable(value = "ids") Long[] ids) {
+    return toAjax(busJcbQmjcjlService.delete(ids));
+  }
 
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BusJcebQmjcjl busJcebQmjcjl) {
-        return toAjax(busJcbQmjcjlService.update(busJcebQmjcjl));
-    }
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BusJcebQmjcjl busJcebQmjcjl) {
+    return toAjax(busJcbQmjcjlService.update(busJcebQmjcjl));
+  }
 
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(@PathVariable(value = "id") String id) {
-        BusJcebQmjcjl info = busJcbQmjcjlService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(@PathVariable(value = "id") Long id) {
+    BusJcebQmjcjl info = busJcbQmjcjlService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
 
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BusJcebQmjcjl busJcebQmjcjl) {
-        startPage();
-        List<BusJcebQmjcjl> list = busJcbQmjcjlService.getList(busJcebQmjcjl);
-        return getDataTable(list);
-    }
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BusJcebQmjcjl busJcebQmjcjl) {
+    startPage();
+    List<BusJcebQmjcjl> list = busJcbQmjcjlService.getList(busJcebQmjcjl);
+    return getDataTable(list);
+  }
 
-    @ApiOperation(value = "导出excel")
-    @GetMapping(value = "exportExcel")
-    public AjaxResult exportExcel(JcebQueryVo query) {
-        String localFilePath = busJcbQmjcjlService.exportExcel(query);
-        return sysFileService.uploadFile(localFilePath);
-    }
+  @ApiOperation(value = "导出excel")
+  @GetMapping(value = "exportExcel")
+  public AjaxResult exportExcel(JcebQueryVo query) {
+    String localFilePath = busJcbQmjcjlService.exportExcel(query);
+    return sysFileService.uploadFile(localFilePath);
+  }
 
-    @ApiOperation(value = "提交")
-    @PutMapping("/submit")
-    public AjaxResult submit(@RequestBody BusJcebQmjcjl busJcebQmjcjl) {
-        return toAjax(busJcbQmjcjlService.submit(busJcebQmjcjl));
-    }
+  @ApiOperation(value = "提交")
+  @PutMapping("/submit")
+  public AjaxResult submit(@RequestBody BusJcebQmjcjl busJcebQmjcjl) {
+    return toAjax(busJcbQmjcjlService.submit(busJcebQmjcjl));
+  }
 
-    @ApiOperation(value = "退回")
-    @PutMapping("/reject")
-    public AjaxResult reject(@RequestBody BusJcebQmjcjl busJcebQmjcjl) {
-        return toAjax(busJcbQmjcjlService.reject(busJcebQmjcjl));
-    }
+  @ApiOperation(value = "退回")
+  @PutMapping("/reject")
+  public AjaxResult reject(@RequestBody BusJcebQmjcjl busJcebQmjcjl) {
+    return toAjax(busJcbQmjcjlService.reject(busJcebQmjcjl));
+  }
 
-    @ApiOperation(value = "确认")
-    @PutMapping("/confirm")
-    public AjaxResult confirm(@RequestBody BusJcebQmjcjl busJcebQmjcjl) {
-        return toAjax(busJcbQmjcjlService.confirm(busJcebQmjcjl));
-    }
+  @ApiOperation(value = "确认")
+  @PutMapping("/confirm")
+  public AjaxResult confirm(@RequestBody BusJcebQmjcjl busJcebQmjcjl) {
+    return toAjax(busJcbQmjcjlService.confirm(busJcebQmjcjl));
+  }
 
 }

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

@@ -24,72 +24,73 @@ import java.util.List;
 @RequestMapping(value = "business/catenary/bus/jceb/xsjcjl")
 public class BusJcebXsjcjlController extends BaseController {
 
-    private final IBusJcebXsjcjlService busJcebXsjcjlService;
-    private final ISysFileService sysFileService;
+  private final IBusJcebXsjcjlService busJcebXsjcjlService;
+  private final ISysFileService sysFileService;
 
-    public BusJcebXsjcjlController(IBusJcebXsjcjlService busJcebXsjcjlService, ISysFileService sysFileService) {
-        this.busJcebXsjcjlService = busJcebXsjcjlService;
-        this.sysFileService = sysFileService;
-    }
+  public BusJcebXsjcjlController(IBusJcebXsjcjlService busJcebXsjcjlService,
+      ISysFileService sysFileService) {
+    this.busJcebXsjcjlService = busJcebXsjcjlService;
+    this.sysFileService = sysFileService;
+  }
 
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BusJcebXsjcjl busJcebXsjcjl) {
-        return toAjax(busJcebXsjcjlService.create(busJcebXsjcjl));
-    }
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BusJcebXsjcjl busJcebXsjcjl) {
+    return toAjax(busJcebXsjcjlService.create(busJcebXsjcjl));
+  }
 
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
-        return toAjax(busJcebXsjcjlService.delete(ids));
-    }
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@RequestParam Long[] ids) {
+    return toAjax(busJcebXsjcjlService.delete(ids));
+  }
 
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BusJcebXsjcjl busJcebXsjcjl) {
-        return toAjax(busJcebXsjcjlService.update(busJcebXsjcjl));
-    }
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BusJcebXsjcjl busJcebXsjcjl) {
+    return toAjax(busJcebXsjcjlService.update(busJcebXsjcjl));
+  }
 
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
-        BusJcebXsjcjl info = busJcebXsjcjlService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(Long id) {
+    BusJcebXsjcjl info = busJcebXsjcjlService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
 
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BusJcebXsjcjl busJcebXsjcjl) {
-        startPage();
-        List<BusJcebXsjcjl> list = busJcebXsjcjlService.getList(busJcebXsjcjl);
-        return getDataTable(list);
-    }
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BusJcebXsjcjl busJcebXsjcjl) {
+    startPage();
+    List<BusJcebXsjcjl> list = busJcebXsjcjlService.getList(busJcebXsjcjl);
+    return getDataTable(list);
+  }
 
-    @ApiOperation(value = "提交")
-    @PutMapping("/submit")
-    public AjaxResult submit(@RequestBody BusJcebXsjcjl busJcebXsjcjl) {
-        return toAjax(busJcebXsjcjlService.submit(busJcebXsjcjl));
-    }
+  @ApiOperation(value = "提交")
+  @PutMapping("/submit")
+  public AjaxResult submit(@RequestBody BusJcebXsjcjl busJcebXsjcjl) {
+    return toAjax(busJcebXsjcjlService.submit(busJcebXsjcjl));
+  }
 
-    @ApiOperation(value = "退回")
-    @PutMapping("/reject")
-    public AjaxResult reject(@RequestBody BusJcebXsjcjl busJcebXsjcjl) {
-        return toAjax(busJcebXsjcjlService.reject(busJcebXsjcjl));
-    }
+  @ApiOperation(value = "退回")
+  @PutMapping("/reject")
+  public AjaxResult reject(@RequestBody BusJcebXsjcjl busJcebXsjcjl) {
+    return toAjax(busJcebXsjcjlService.reject(busJcebXsjcjl));
+  }
 
-    @ApiOperation(value = "确认")
-    @PutMapping("/confirm")
-    public AjaxResult confirm(@RequestBody BusJcebXsjcjl busJcebXsjcjl) {
-        return toAjax(busJcebXsjcjlService.confirm(busJcebXsjcjl));
-    }
+  @ApiOperation(value = "确认")
+  @PutMapping("/confirm")
+  public AjaxResult confirm(@RequestBody BusJcebXsjcjl busJcebXsjcjl) {
+    return toAjax(busJcebXsjcjlService.confirm(busJcebXsjcjl));
+  }
 
-    @ApiOperation(value = "导出excel")
-    @GetMapping(value = "exportExcel")
-    public AjaxResult exportExcel(JcebQueryVo query) {
-        String localFilePath = busJcebXsjcjlService.exportExcel(query);
-        return sysFileService.uploadFile(localFilePath);
-    }
+  @ApiOperation(value = "导出excel")
+  @GetMapping(value = "exportExcel")
+  public AjaxResult exportExcel(JcebQueryVo query) {
+    String localFilePath = busJcebXsjcjlService.exportExcel(query);
+    return sysFileService.uploadFile(localFilePath);
+  }
 
 }

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

@@ -0,0 +1,100 @@
+package com.railway.business.catenary.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * 检测表-辅助索无交分线岔
+ *
+ * @author author 2022-03-04
+ */
+@Data
+@ApiModel("检测表-辅助索无交分线岔")
+@EqualsAndHashCode(callSuper = true)
+public class BusJcebFzswjfxc extends BusJceb {
+
+  @ApiModelProperty(value = "主键", hidden = true)
+  private Long id;
+
+  @ApiModelProperty(value = "区间站场id")
+  private Long deptStationId;
+
+  @ApiModelProperty(value = "支柱号及吊弦位置")
+  @Length(min = 1, max = 10, message = "【支柱号及吊弦位置】长度必须介于 {min} 和 {max} 之间")
+  private String pillarCode;
+
+  @ApiModelProperty(value = "线岔编号")
+  @Length(min = 1, max = 50, message = "【线岔编号】长度必须介于 {min} 和 {max} 之间")
+  private String xch;
+
+  @ApiModelProperty(value = "线岔id")
+  private Long xcId;
+
+  @ApiModelProperty(value = "检查日期")
+  private Date operationDate;
+
+  @ApiModelProperty(value = "正线支拉出值")
+  @Length(min = 1, max = 10, message = "【正线支拉出值】长度必须介于 {min} 和 {max} 之间")
+  private String zxzlcz;
+
+  @ApiModelProperty(value = "辅线支拉出值（相对直股）")
+  @Length(min = 1, max = 10, message = "【辅线支拉出值（相对直股）】长度必须介于 {min} 和 {max} 之间")
+  private String fxzlczXdzg;
+
+  @ApiModelProperty(value = "辅线支拉出值（相对曲股）")
+  @Length(min = 1, max = 10, message = "【辅线支拉出值（相对曲股）】长度必须介于 {min} 和 {max} 之间")
+  private String fxzlczXdqg;
+
+  @ApiModelProperty(value = "侧线支拉出值")
+  @Length(min = 1, max = 10, message = "【侧线支拉出值】长度必须介于 {min} 和 {max} 之间")
+  private String cxzlcz;
+
+  @ApiModelProperty(value = "正线支导高")
+  @Length(min = 1, max = 10, message = "【正线支导高】长度必须介于 {min} 和 {max} 之间")
+  private String zxzdg;
+
+  @ApiModelProperty(value = "辅线支导高（相对直股）")
+  @Length(min = 1, max = 10, message = "【辅线支导高（相对直股）】长度必须介于 {min} 和 {max} 之间")
+  private String fxzdgXdzg;
+
+  @ApiModelProperty(value = "辅线支导高（相对曲股）")
+  @Length(min = 1, max = 10, message = "【辅线支导高（相对曲股）】长度必须介于 {min} 和 {max} 之间")
+  private String fxzdgXdqg;
+
+  @ApiModelProperty(value = "侧线支导高")
+  @Length(min = 1, max = 10, message = "【侧线支导高】长度必须介于 {min} 和 {max} 之间")
+  private String cxzdg;
+
+  @ApiModelProperty(value = "两轨间距720mm处拉出值/导高（正线支相对正线导高）")
+  @Length(min = 1, max = 10, message = "【两轨间距720mm处拉出值/导高（正线支相对正线导高）】长度必须介于 {min} 和 {max} 之间")
+  private String zxzxdzxdg;
+
+  @ApiModelProperty(value = "两轨间距720mm处拉出值/导高（正线支相对正线拉出值）")
+  @Length(min = 1, max = 10, message = "【两轨间距720mm处拉出值/导高（正线支相对正线拉出值）】长度必须介于 {min} 和 {max} 之间")
+  private String zxzxdzxlcz;
+
+  @ApiModelProperty(value = "两轨间距720mm处拉出值/导高（侧线支相对正线导高）")
+  @Length(min = 1, max = 10, message = "【两轨间距720mm处拉出值/导高（侧线支相对正线导高）】长度必须介于 {min} 和 {max} 之间")
+  private String cxzxdzxdg;
+
+  @ApiModelProperty(value = "两轨间距720mm处拉出值/导高（侧线支相对正线拉出值）")
+  @Length(min = 1, max = 10, message = "【两轨间距720mm处拉出值/导高（侧线支相对正线拉出值）】长度必须介于 {min} 和 {max} 之间")
+  private String cxzxdzxlcz;
+
+  @ApiModelProperty(value = "检测人")
+  @Length(min = 1, max = 255, message = "【检测人】长度必须介于 {min} 和 {max} 之间")
+  private String operator;
+
+  @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
+  @Length(min = 1, max = 1, message = "【提交状态 0未提交 1已提交 2已退回 9已确认】长度必须介于 {min} 和 {max} 之间")
+  private String submitState;
+
+  @ApiModelProperty(value = "del_flag")
+  @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+  private String delFlag;
+
+}

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

@@ -13,8 +13,9 @@ public enum JcebTypeEnum {
   Lbjghjl("lbjghjl", "零部件更换记录"),
   Qmjcjl("qmjcjl", "全面检查记录"),
   Xsjcjl("xsjcjl", "巡视检查记录"),
+  Fzswjfxc("fzswjfxc", "辅助索无交分线岔"),
 
-  /** 检测表类型 */
+  /** 检查表类型 */
   Blq("blq", "避雷器"),
   Dmcgyq("dmcgyq", "地面磁感应器"),
   Fdfxjyq("fdfxjyq", "dxf分段绝缘器"),

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcebFzswjfxcMapper.java

@@ -0,0 +1,17 @@
+package com.railway.business.catenary.mapper;
+
+import com.railway.business.catenary.domain.BusJcebFzswjfxc;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 检测表-辅助索无交分线岔
+ *
+ * @author author
+ * @date 2022/03/04
+ */
+@Mapper
+@Repository
+public interface BusJcebFzswjfxcMapper extends BusJcebMapper<BusJcebFzswjfxc> {
+
+}

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcebMapper.java

@@ -19,7 +19,7 @@ public interface BusJcebMapper<T extends BusJceb> {
   /**
    * 删除
    */
-  int delete(@Param("id") String id);
+  int delete(@Param("id") Long id);
 
   /**
    * 更新状态
@@ -46,7 +46,7 @@ public interface BusJcebMapper<T extends BusJceb> {
   /**
    * 获取单个
    */
-  T getInfo(@Param("id") String id);
+  T getInfo(@Param("id") Long id);
 
   /**
    * 查询列表

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

@@ -0,0 +1,13 @@
+package com.railway.business.catenary.service;
+
+import com.railway.business.catenary.domain.BusJcebFzswjfxc;
+
+/**
+ * 检测表-辅助索无交分线岔
+ *
+ * @author author
+ * @date 2022/03/04
+ */
+public interface IBusJcebFzswjfxcService  extends IBusJcebService<BusJcebFzswjfxc>{
+
+}

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

@@ -25,12 +25,12 @@ public interface IBusJcebService<T extends BusJceb> {
     /**
     * 删除
     */
-    int delete(String[] ids);
+    int delete(Long[] ids);
 
     /**
      * 获取单个
      */
-    T getInfo(String id);
+    T getInfo(Long id);
 
     /**
      * 导出Excel

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

@@ -0,0 +1,148 @@
+package com.railway.business.catenary.service.impl;
+
+import com.railway.business.baseinfo.service.IBaseStationService;
+import com.railway.business.catenary.domain.BusJcebFzswjfxc;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.enums.JcebTypeEnum;
+import com.railway.business.catenary.mapper.BusJcebFzswjfxcMapper;
+import com.railway.business.catenary.service.IBusJcebFzswjfxcService;
+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 java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 检测表-辅助索无交分线岔
+ *
+ * @author author
+ * @date 2022/03/04
+ */
+@Service
+public class BusJcebFzswjfxcServiceImpl extends BusJcebServiceImpl<BusJcebFzswjfxc>
+    implements IBusJcebFzswjfxcService {
+
+  private final BusJcebFzswjfxcMapper busJcebFzswjfxcMapper;
+
+  public BusJcebFzswjfxcServiceImpl(BusJcebFzswjfxcMapper busJcebFzswjfxcMapper,
+      IBaseStationService stationService, IBusPushMsgService busPushMsgService) {
+    super(busJcebFzswjfxcMapper, stationService, busPushMsgService);
+    this.busJcebFzswjfxcMapper = busJcebFzswjfxcMapper;
+  }
+
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusJcebFzswjfxc busJcebFzswjfxc) {
+    busJcebFzswjfxc.setCreateTime(new Date());
+    busJcebFzswjfxc.setCreateBy(SecurityUtils.getUsername());
+    return busJcebFzswjfxcMapper.insert(busJcebFzswjfxc);
+  }
+
+  /**
+   * 获取检查表类型名
+   * @return 类型名
+   */
+  @Override
+  JcebTypeEnum getJcebTypeEnum() {
+    return JcebTypeEnum.Fzswjfxc;
+  }
+
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusJcebFzswjfxc busJcebFzswjfxc) {
+    busJcebFzswjfxc.setUpdateTime(new Date());
+    busJcebFzswjfxc.setUpdateBy(SecurityUtils.getUsername());
+    return busJcebFzswjfxcMapper.update(busJcebFzswjfxc);
+  }
+
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusJcebFzswjfxc getInfo(Long id) {
+    return busJcebFzswjfxcMapper.getInfo(id);
+  }
+
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusJcebFzswjfxc> getList(BusJcebFzswjfxc busJcebFzswjfxc) {
+    return busJcebFzswjfxcMapper.getList(busJcebFzswjfxc);
+  }
+
+  /**
+   * 提交
+   *
+   * @return 提交结果
+   */
+  @Override
+  public int submit(BusJcebFzswjfxc bean) {
+    setSubmit(bean);
+    int ret;
+    if (StringUtils.isEmpty(bean.getId())) {
+      ret = create(bean);
+    } else {
+      ret = update(bean);
+    }
+    // 推送消息
+    if(ret > 0) {
+      pushSubmit(bean);
+    }
+    return ret;
+  }
+
+  /**
+   * 退回
+   *
+   * @return 退回结果
+   */
+  @Override
+  public int reject(BusJcebFzswjfxc busJcebGjsfx) {
+    setReject(busJcebGjsfx);
+    return update(busJcebGjsfx);
+  }
+
+  /**
+   * 确认
+   *
+   * @return 确认结果
+   */
+  @Override
+  public int confirm(BusJcebFzswjfxc busJcebGjsfx) {
+    setConfirm(busJcebGjsfx);
+    return update(busJcebGjsfx);
+  }
+
+  /**
+   * 导出Excel
+   *
+   * @param query 查询条件
+   * @return 文件路径
+   */
+  @Override
+  public String exportExcel(JcebQueryVo query) {
+    List<BusJcebFzswjfxc> list = busJcebFzswjfxcMapper.getJcebList(query);
+    Map<String, Object> params = new HashMap<>();
+    if(!list.isEmpty()) {
+      params.put("stationName", list.get(0).getStationName());
+      params.put("createBy",list.get(0).getCreateBy());
+      params.put("operator",list.get(0).getOperator());
+    }
+    String fileName = "辅助索无交分线岔.xls";
+    String templateFileName = "excel/template/辅助索无交分线岔.xls";
+    return new EasyExcelUtil().getExcel(params, list, templateFileName, fileName);
+  }
+
+}

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

@@ -43,20 +43,6 @@ public class BusJcebGjsfxServiceImpl extends BusJcebServiceImpl<BusJcebGjsfx>
     return busJcebGjsfxMapper.insert(busJcebGjsfx);
   }
 
-  /**
-   * 删除
-   */
-  @Override
-  @Transactional(rollbackFor = Exception.class)
-  public int delete(String[] ids) {
-    int r = 0;
-    for (String id : ids) {
-      int j = busJcebGjsfxMapper.delete(id);
-      r = r + j;
-    }
-    return r;
-  }
-
   /**
    * 获取检查表类型名
    * @return 类型名
@@ -80,7 +66,7 @@ public class BusJcebGjsfxServiceImpl extends BusJcebServiceImpl<BusJcebGjsfx>
    * 获取单个
    */
   @Override
-  public BusJcebGjsfx getInfo(String id) {
+  public BusJcebGjsfx getInfo(Long id) {
     return busJcebGjsfxMapper.getInfo(id);
   }
 

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

@@ -44,20 +44,6 @@ public class BusJcebJddzServiceImpl extends BusJcebServiceImpl<BusJcebJddz>
     return busJcebJddzMapper.insert(busJcebJddz);
   }
 
-  /**
-   * 删除
-   */
-  @Override
-  @Transactional(rollbackFor = Exception.class)
-  public int delete(String[] ids) {
-    int r = 0;
-    for (String id : ids) {
-      int j = busJcebJddzMapper.delete(id);
-      r = r + j;
-    }
-    return r;
-  }
-
   /**
    * 获取检查表类型名
    * @return 类型名
@@ -81,7 +67,7 @@ public class BusJcebJddzServiceImpl extends BusJcebServiceImpl<BusJcebJddz>
    * 获取单个
    */
   @Override
-  public BusJcebJddz getInfo(String id) {
+  public BusJcebJddz getInfo(Long id) {
     return busJcebJddzMapper.getInfo(id);
   }
 

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

@@ -45,20 +45,6 @@ public class BusJcebJyzqsjlServiceImpl extends BusJcebServiceImpl<BusJcebJyzqsjl
     return busJcebJyzqsjlMapper.insert(busJcebJyzqsjl);
   }
 
-  /**
-   * 删除
-   */
-  @Override
-  @Transactional(rollbackFor = Exception.class)
-  public int delete(String[] ids) {
-    int r = 0;
-    for (String id : ids) {
-      int j = busJcebJyzqsjlMapper.delete(id);
-      r = r + j;
-    }
-    return r;
-  }
-
   /**
    * 获取检查表类型名
    * @return 类型名
@@ -82,7 +68,7 @@ public class BusJcebJyzqsjlServiceImpl extends BusJcebServiceImpl<BusJcebJyzqsjl
    * 获取单个
    */
   @Override
-  public BusJcebJyzqsjl getInfo(String id) {
+  public BusJcebJyzqsjl getInfo(Long id) {
     return busJcebJyzqsjlMapper.getInfo(id);
   }
 

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

@@ -43,20 +43,6 @@ public class BusJcebLbjghjlServiceImpl extends BusJcebServiceImpl<BusJcebLbjghjl
     return busJcebLbjghjlMapper.insert(busJcebLbjghjl);
   }
 
-  /**
-   * 删除
-   */
-  @Override
-  @Transactional(rollbackFor = Exception.class)
-  public int delete(String[] ids) {
-    int r = 0;
-    for (String id : ids) {
-      int j = busJcebLbjghjlMapper.delete(id);
-      r = r + j;
-    }
-    return r;
-  }
-
   /**
    * 获取检查表类型名
    * @return 类型名
@@ -80,7 +66,7 @@ public class BusJcebLbjghjlServiceImpl extends BusJcebServiceImpl<BusJcebLbjghjl
    * 获取单个
    */
   @Override
-  public BusJcebLbjghjl getInfo(String id) {
+  public BusJcebLbjghjl getInfo(Long id) {
     return busJcebLbjghjlMapper.getInfo(id);
   }
 

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

@@ -42,20 +42,6 @@ public class BusJcebQmjcjlServiceImpl extends BusJcebServiceImpl<BusJcebQmjcjl>
     return busJcebQmjcjlMapper.insert(busJcebQmjcjl);
   }
 
-  /**
-   * 删除
-   */
-  @Override
-  @Transactional(rollbackFor = Exception.class)
-  public int delete(String[] ids) {
-    int r = 0;
-    for (String id : ids) {
-      int j = busJcebQmjcjlMapper.delete(id);
-      r = r + j;
-    }
-    return r;
-  }
-
   /**
    * 获取检查表类型名
    * @return 类型名
@@ -79,7 +65,7 @@ public class BusJcebQmjcjlServiceImpl extends BusJcebServiceImpl<BusJcebQmjcjl>
    * 获取单个
    */
   @Override
-  public BusJcebQmjcjl getInfo(String id) {
+  public BusJcebQmjcjl getInfo(Long id) {
     return busJcebQmjcjlMapper.getInfo(id);
   }
 

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

@@ -53,9 +53,9 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
-  public int delete(String[] ids) {
+  public int delete(Long[] ids) {
     int r = 0;
-    for (String id : ids) {
+    for (Long id : ids) {
       int j = busJcebMapper.delete(id);
       r = r + j;
     }

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

@@ -50,9 +50,9 @@ public class BusJcebXsjcjlServiceImpl extends BusJcebServiceImpl<BusJcebXsjcjl>
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
-  public int delete(String[] ids) {
+  public int delete(Long[] ids) {
     int r = 0;
-    for (String id : ids) {
+    for (Long id : ids) {
       int j = busJcebXsjcjlMapper.delete(id);
       r = r + j;
     }
@@ -82,7 +82,7 @@ public class BusJcebXsjcjlServiceImpl extends BusJcebServiceImpl<BusJcebXsjcjl>
    * 获取单个
    */
   @Override
-  public BusJcebXsjcjl getInfo(String id) {
+  public BusJcebXsjcjl getInfo(Long id) {
     return busJcebXsjcjlMapper.getInfo(id);
   }
 

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

@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.railway.business.catenary.mapper.BusJcebFzswjfxcMapper">
+
+  <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusJcebFzswjfxc">
+    <result column="id" property="id"/>
+    <result column="dept_station_id" property="deptStationId"/>
+    <result column="pillar_code" property="pillarCode"/>
+    <result column="xch" property="xch"/>
+    <result column="xc_id" property="xcId"/>
+    <result column="operation_date" property="operationDate"/>
+    <result column="zxzlcz" property="zxzlcz"/>
+    <result column="fxzlcz_xdzg" property="fxzlczXdzg"/>
+    <result column="fxzlcz_xdqg" property="fxzlczXdqg"/>
+    <result column="cxzlcz" property="cxzlcz"/>
+    <result column="zxzdg" property="zxzdg"/>
+    <result column="fxzdg_xdzg" property="fxzdgXdzg"/>
+    <result column="fxzdg_xdqg" property="fxzdgXdqg"/>
+    <result column="cxzdg" property="cxzdg"/>
+    <result column="zxzxdzxdg" property="zxzxdzxdg"/>
+    <result column="zxzxdzxlcz" property="zxzxdzxlcz"/>
+    <result column="cxzxdzxdg" property="cxzxdzxdg"/>
+    <result column="cxzxdzxlcz" property="cxzxdzxlcz"/>
+    <result column="operator" property="operator"/>
+    <result column="remark" property="remark"/>
+    <result column="submit_state" property="submitState"/>
+    <result column="del_flag" property="delFlag"/>
+    <result column="create_by" property="createBy"/>
+    <result column="create_time" property="createTime"/>
+    <result column="update_by" property="updateBy"/>
+    <result column="update_time" property="updateTime"/>
+  </resultMap>
+
+  <sql id="Base_Column_List">
+    id,
+    dept_station_id,
+    pillar_code,
+    xch,
+    xc_id,
+    operation_date,
+    zxzlcz,
+    fxzlcz_xdzg,
+    fxzlcz_xdqg,
+    cxzlcz,
+    zxzdg,
+    fxzdg_xdzg,
+    fxzdg_xdqg,
+    cxzdg,
+    zxzxdzxdg,
+    zxzxdzxlcz,
+    cxzxdzxdg,
+    cxzxdzxlcz,
+    operator,
+    remark,
+    submit_state,
+    del_flag,
+    create_by,
+    create_time,
+    update_by,
+    update_time
+  </sql>
+
+  <insert id="insert" parameterType="com.railway.business.catenary.domain.BusJcebFzswjfxc">
+    <selectKey keyProperty="id" order="BEFORE" resultType="String">
+      select replace(uuid(), '-', '') from dual
+    </selectKey>
+    INSERT INTO bus_jceb_fzswjfxc
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test='null != deptStationId'>
+        dept_station_id,
+      </if>
+      <if test='null != pillarCode'>
+        pillar_code,
+      </if>
+      <if test='null != xch'>
+        xch,
+      </if>
+      <if test='null != xcId'>
+        xc_id,
+      </if>
+      <if test='null != operationDate'>
+        operation_date,
+      </if>
+      <if test='null != zxzlcz'>
+        zxzlcz,
+      </if>
+      <if test='null != fxzlczXdzg'>
+        fxzlcz_xdzg,
+      </if>
+      <if test='null != fxzlczXdqg'>
+        fxzlcz_xdqg,
+      </if>
+      <if test='null != cxzlcz'>
+        cxzlcz,
+      </if>
+      <if test='null != zxzdg'>
+        zxzdg,
+      </if>
+      <if test='null != fxzdgXdzg'>
+        fxzdg_xdzg,
+      </if>
+      <if test='null != fxzdgXdqg'>
+        fxzdg_xdqg,
+      </if>
+      <if test='null != cxzdg'>
+        cxzdg,
+      </if>
+      <if test='null != zxzxdzxdg'>
+        zxzxdzxdg,
+      </if>
+      <if test='null != zxzxdzxlcz'>
+        zxzxdzxlcz,
+      </if>
+      <if test='null != cxzxdzxdg'>
+        cxzxdzxdg,
+      </if>
+      <if test='null != cxzxdzxlcz'>
+        cxzxdzxlcz,
+      </if>
+      <if test='null != operator'>
+        operator,
+      </if>
+      <if test='null != remark'>
+        remark,
+      </if>
+      <if test='null != submitState'>
+        submit_state,
+      </if>
+      <if test='null != delFlag'>
+        del_flag,
+      </if>
+      <if test='null != createBy'>
+        create_by,
+      </if>
+      <if test='null != createTime'>
+        create_time,
+      </if>
+      <if test='null != updateBy'>
+        update_by,
+      </if>
+      <if test='null != updateTime'>
+        update_time
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test='null != deptStationId'>
+        #{deptStationId},
+      </if>
+      <if test='null != pillarCode'>
+        #{pillarCode},
+      </if>
+      <if test='null != xch'>
+        #{xch},
+      </if>
+      <if test='null != xcId'>
+        #{xcId},
+      </if>
+      <if test='null != operationDate'>
+        #{operationDate},
+      </if>
+      <if test='null != zxzlcz'>
+        #{zxzlcz},
+      </if>
+      <if test='null != fxzlczXdzg'>
+        #{fxzlczXdzg},
+      </if>
+      <if test='null != fxzlczXdqg'>
+        #{fxzlczXdqg},
+      </if>
+      <if test='null != cxzlcz'>
+        #{cxzlcz},
+      </if>
+      <if test='null != zxzdg'>
+        #{zxzdg},
+      </if>
+      <if test='null != fxzdgXdzg'>
+        #{fxzdgXdzg},
+      </if>
+      <if test='null != fxzdgXdqg'>
+        #{fxzdgXdqg},
+      </if>
+      <if test='null != cxzdg'>
+        #{cxzdg},
+      </if>
+      <if test='null != zxzxdzxdg'>
+        #{zxzxdzxdg},
+      </if>
+      <if test='null != zxzxdzxlcz'>
+        #{zxzxdzxlcz},
+      </if>
+      <if test='null != cxzxdzxdg'>
+        #{cxzxdzxdg},
+      </if>
+      <if test='null != cxzxdzxlcz'>
+        #{cxzxdzxlcz},
+      </if>
+      <if test='null != operator'>
+        #{operator},
+      </if>
+      <if test='null != remark'>
+        #{remark},
+      </if>
+      <if test='null != submitState'>
+        #{submitState},
+      </if>
+      <if test='null != delFlag'>
+        #{delFlag},
+      </if>
+      <if test='null != createBy'>
+        #{createBy},
+      </if>
+      <if test='null != createTime'>
+        #{createTime},
+      </if>
+      <if test='null != updateBy'>
+        #{updateBy},
+      </if>
+      <if test='null != updateTime'>
+        #{updateTime}
+      </if>
+    </trim>
+  </insert>
+
+  <delete id="delete">
+    UPDATE bus_jceb_fzswjfxc
+    set del_flag='1'
+    WHERE id = #{id}
+  </delete>
+
+  <update id="update" parameterType="com.railway.business.catenary.domain.BusJcebFzswjfxc">
+    UPDATE bus_jceb_fzswjfxc
+    <set>
+      <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
+      <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
+      <if test='null != xch'>xch = #{xch},</if>
+      <if test='null != xcId'>xc_id = #{xcId},</if>
+      <if test='null != operationDate'>operation_date = #{operationDate},</if>
+      <if test='null != zxzlcz'>zxzlcz = #{zxzlcz},</if>
+      <if test='null != fxzlczXdzg'>fxzlcz_xdzg = #{fxzlczXdzg},</if>
+      <if test='null != fxzlczXdqg'>fxzlcz_xdqg = #{fxzlczXdqg},</if>
+      <if test='null != cxzlcz'>cxzlcz = #{cxzlcz},</if>
+      <if test='null != zxzdg'>zxzdg = #{zxzdg},</if>
+      <if test='null != fxzdgXdzg'>fxzdg_xdzg = #{fxzdgXdzg},</if>
+      <if test='null != fxzdgXdqg'>fxzdg_xdqg = #{fxzdgXdqg},</if>
+      <if test='null != cxzdg'>cxzdg = #{cxzdg},</if>
+      <if test='null != zxzxdzxdg'>zxzxdzxdg = #{zxzxdzxdg},</if>
+      <if test='null != zxzxdzxlcz'>zxzxdzxlcz = #{zxzxdzxlcz},</if>
+      <if test='null != cxzxdzxdg'>cxzxdzxdg = #{cxzxdzxdg},</if>
+      <if test='null != cxzxdzxlcz'>cxzxdzxlcz = #{cxzxdzxlcz},</if>
+      <if test='null != operator'>operator = #{operator},</if>
+      <if test='null != remark'>remark = #{remark},</if>
+      <if test='null != submitState'>submit_state = #{submitState},</if>
+      <if test='null != delFlag'>del_flag = #{delFlag},</if>
+      <if test='null != createBy'>create_by = #{createBy},</if>
+      <if test='null != createTime'>create_time = #{createTime},</if>
+      <if test='null != updateBy'>update_by = #{updateBy},</if>
+      <if test='null != updateTime'>update_time = #{updateTime}</if>
+    </set>
+    WHERE id = #{id}
+  </update>
+
+
+  <select id="getInfo" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM bus_jceb_fzswjfxc
+    WHERE del_flag='0' and id = #{id}
+
+  </select>
+
+  <select id="getList" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM bus_jceb_fzswjfxc
+    <where>
+      del_flag='0'
+      <if test="deptStationId!=null and deptStationId!=''">
+        and dept_station_id=#{deptStationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and pillar_code=#{pillarCode}
+      </if>
+      <if test="xch!=null and xch!=''">
+        and xch=#{xch}
+      </if>
+      <if test="xcId!=null and xcId!=''">
+        and xc_id=#{xcId}
+      </if>
+      <if test="operationDate!=null and operationDate!=''">
+        and operation_date=#{operationDate}
+      </if>
+      <if test="zxzlcz!=null and zxzlcz!=''">
+        and zxzlcz=#{zxzlcz}
+      </if>
+      <if test="fxzlczXdzg!=null and fxzlczXdzg!=''">
+        and fxzlcz_xdzg=#{fxzlczXdzg}
+      </if>
+      <if test="fxzlczXdqg!=null and fxzlczXdqg!=''">
+        and fxzlcz_xdqg=#{fxzlczXdqg}
+      </if>
+      <if test="cxzlcz!=null and cxzlcz!=''">
+        and cxzlcz=#{cxzlcz}
+      </if>
+      <if test="zxzdg!=null and zxzdg!=''">
+        and zxzdg=#{zxzdg}
+      </if>
+      <if test="fxzdgXdzg!=null and fxzdgXdzg!=''">
+        and fxzdg_xdzg=#{fxzdgXdzg}
+      </if>
+      <if test="fxzdgXdqg!=null and fxzdgXdqg!=''">
+        and fxzdg_xdqg=#{fxzdgXdqg}
+      </if>
+      <if test="cxzdg!=null and cxzdg!=''">
+        and cxzdg=#{cxzdg}
+      </if>
+      <if test="zxzxdzxdg!=null and zxzxdzxdg!=''">
+        and zxzxdzxdg=#{zxzxdzxdg}
+      </if>
+      <if test="zxzxdzxlcz!=null and zxzxdzxlcz!=''">
+        and zxzxdzxlcz=#{zxzxdzxlcz}
+      </if>
+      <if test="cxzxdzxdg!=null and cxzxdzxdg!=''">
+        and cxzxdzxdg=#{cxzxdzxdg}
+      </if>
+      <if test="cxzxdzxlcz!=null and cxzxdzxlcz!=''">
+        and cxzxdzxlcz=#{cxzxdzxlcz}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and operator=#{operator}
+      </if>
+      <if test="remark!=null and remark!=''">
+        and remark=#{remark}
+      </if>
+      <if test="submitState!=null and submitState!=''">
+        and submit_state=#{submitState}
+      </if>
+      <if test="delFlag!=null and delFlag!=''">
+        and del_flag=#{delFlag}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and create_by=#{createBy}
+      </if>
+      <if test="createTime!=null and createTime!=''">
+        and create_time=#{createTime}
+      </if>
+      <if test="updateBy!=null and updateBy!=''">
+        and update_by=#{updateBy}
+      </if>
+      <if test="updateTime!=null and updateTime!=''">
+        and update_time=#{updateTime}
+      </if>
+    </where>
+  </select>
+
+</mapper>