Merge remote-tracking branch 'origin/master'

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

@@ -17,7 +17,7 @@ import java.util.List;
 @Api(value = "rest/bus/jcb/dmcgyq", tags = "检查表 - 地面磁感应器")
 @RestController
 @Validated
-@RequestMapping(value = "bus/jcb/dmcgyq")
+@RequestMapping(value = "business/catenary/bus/jcb/dmcgyq")
 public class BusJcbDmcgyqController extends BaseController {
     @Autowired
     private IBusJcbDmcgyqService busJcbDmcgyqService;
@@ -29,9 +29,9 @@ public class BusJcbDmcgyqController extends BaseController {
     }
 
     @ApiOperation(value = "删除")
-    @DeleteMapping("/{id}")
-    public AjaxResult delete(@PathVariable String id) {
-        return toAjax(busJcbDmcgyqService.delete(id));
+    @DeleteMapping("/{ids}")
+    public AjaxResult delete(@RequestParam String[] ids) {
+        return toAjax(busJcbDmcgyqService.delete(ids));
     }
 
     @ApiOperation(value = "更新")

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbJcxcController.java

@@ -0,0 +1,87 @@
+package com.railway.web.controller.business.catenary;
+
+import com.railway.business.catenary.domain.BusJcbJcxc;
+import com.railway.business.catenary.service.IBusJcbJcxcService;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Api(value = "rest/catenary/bus/jcb/jcxc", tags = "检查表-交叉线岔")
+@RestController
+@Validated
+@RequestMapping(value = "business/catenary/bus/jcb/jcxc")
+public class BusJcbJcxcController extends BaseController {
+    @Autowired
+    private IBusJcbJcxcService busJcbJcxcService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    public AjaxResult add(@Validated @RequestBody BusJcbJcxc busJcbJcxc) {
+        return toAjax(busJcbJcxcService.create(busJcbJcxc));
+    }
+
+    @ApiOperation(value = "删除")
+    @DeleteMapping("/{ids}")
+    public AjaxResult delete(@RequestParam String[] ids) {
+        return toAjax(busJcbJcxcService.delete(ids));
+    }
+
+    @ApiOperation(value = "更新")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody @Valid BusJcbJcxc busJcbJcxc) {
+        return toAjax(busJcbJcxcService.update(busJcbJcxc));
+    }
+
+    @ApiOperation(value = "单个")
+    @GetMapping(value = {"/", "/{id}"})
+    public AjaxResult getInfo(String id) {
+        BusJcbJcxc info = busJcbJcxcService.getInfo(id);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("info",info);
+        return ajax;
+    }
+
+    @ApiOperation(value = "列表")
+    @GetMapping(value = "list")
+    public TableDataInfo getList(BusJcbJcxc busJcbJcxc) {
+        startPage();
+        List<BusJcbJcxc> list = busJcbJcxcService.getList(busJcbJcxc);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "获取上次检测值")
+    @GetMapping(value = "/getLastOne")
+    public AjaxResult getLastOne() {
+        BusJcbJcxc info = busJcbJcxcService.getLastRecord();
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("info",info);
+        return ajax;
+    }
+
+    @ApiOperation(value = "提交")
+    @PutMapping("/submit")
+    public AjaxResult submit(@RequestBody BusJcbJcxc busJcbJcxc) {
+        return toAjax(busJcbJcxcService.submit(busJcbJcxc));
+    }
+
+    @ApiOperation(value = "退回")
+    @PutMapping("/reject")
+    public AjaxResult reject(@RequestBody BusJcbJcxc busJcbJcxc) {
+        return toAjax(busJcbJcxcService.reject(busJcbJcxc));
+    }
+
+    @ApiOperation(value = "确认")
+    @PutMapping("/confirm")
+    public AjaxResult confirm(@RequestBody BusJcbJcxc busJcbJcxc) {
+        return toAjax(busJcbJcxcService.confirm(busJcbJcxc));
+    }
+
+}

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbQmjcjlController.java

@@ -0,0 +1,78 @@
+package com.railway.web.controller.business.catenary;
+
+import com.railway.business.catenary.domain.BusJcbQmjcjl;
+import com.railway.business.catenary.service.IBusJcbQmjcjlService;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Api(value = "rest/catenary/bus/jcb/qmjcjl", tags = "检测表-全面检查记录")
+@RestController
+@Validated
+@RequestMapping(value = "business/catenary/bus/jcb/qmjcjl")
+public class BusJcbQmjcjlController extends BaseController {
+    @Autowired
+    private IBusJcbQmjcjlService busJcbQmjcjlService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    public AjaxResult add(@Validated @RequestBody BusJcbQmjcjl busJcbQmjcjl) {
+        return toAjax(busJcbQmjcjlService.create(busJcbQmjcjl));
+    }
+
+    @ApiOperation(value = "删除")
+    @DeleteMapping("/{ids}")
+    public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
+        return toAjax(busJcbQmjcjlService.delete(ids));
+    }
+
+    @ApiOperation(value = "更新")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody @Valid BusJcbQmjcjl busJcbQmjcjl) {
+        return toAjax(busJcbQmjcjlService.update(busJcbQmjcjl));
+    }
+
+    @ApiOperation(value = "单个")
+    @GetMapping(value = {"/", "/{id}"})
+    public AjaxResult getInfo(@PathVariable(value = "id") String id) {
+        BusJcbQmjcjl info = busJcbQmjcjlService.getInfo(id);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("info",info);
+        return ajax;
+    }
+
+    @ApiOperation(value = "列表")
+    @GetMapping(value = "list")
+    public TableDataInfo getList(BusJcbQmjcjl busJcbQmjcjl) {
+        startPage();
+        List<BusJcbQmjcjl> list = busJcbQmjcjlService.getList(busJcbQmjcjl);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "提交")
+    @PutMapping("/submit")
+    public AjaxResult submit(@RequestBody BusJcbQmjcjl busJcbQmjcjl) {
+        return toAjax(busJcbQmjcjlService.submit(busJcbQmjcjl));
+    }
+
+    @ApiOperation(value = "退回")
+    @PutMapping("/reject")
+    public AjaxResult reject(@RequestBody BusJcbQmjcjl busJcbQmjcjl) {
+        return toAjax(busJcbQmjcjlService.reject(busJcbQmjcjl));
+    }
+
+    @ApiOperation(value = "确认")
+    @PutMapping("/confirm")
+    public AjaxResult confirm(@RequestBody BusJcbQmjcjl busJcbQmjcjl) {
+        return toAjax(busJcbQmjcjlService.confirm(busJcbQmjcjl));
+    }
+
+}

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbWjcxcController.java

@@ -0,0 +1,91 @@
+package com.railway.web.controller.business.catenary;
+
+import com.railway.business.catenary.domain.BusJcbWjcxc;
+import com.railway.business.catenary.service.IBusJcbWjcxcService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.WebDataBinder;
+import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.domain.AjaxResult;
+import com.railway.common.core.page.TableDataInfo;
+import javax.validation.Valid;
+import java.util.List;
+
+import javax.validation.Valid;
+
+@Api(value = "rest/catenary/bus/jcb/wjcxc", tags = "检查表-无交叉线岔")
+@RestController
+@Validated
+@RequestMapping(value = "business/catenary/bus/jcb/wjcxc")
+public class BusJcbWjcxcController extends BaseController {
+    @Autowired
+    private IBusJcbWjcxcService busJcbWjcxcService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    public AjaxResult add(@Validated @RequestBody BusJcbWjcxc busJcbWjcxc) {
+        return toAjax(busJcbWjcxcService.create(busJcbWjcxc));
+    }
+
+    @ApiOperation(value = "删除")
+    @DeleteMapping("/{ids}")
+    public AjaxResult delete(@RequestParam String[] ids) {
+        return toAjax(busJcbWjcxcService.delete(ids));
+    }
+
+    @ApiOperation(value = "更新")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody @Valid BusJcbWjcxc busJcbWjcxc) {
+        return toAjax(busJcbWjcxcService.update(busJcbWjcxc));
+    }
+
+    @ApiOperation(value = "单个")
+    @GetMapping(value = {"/", "/{id}"})
+    public AjaxResult getInfo(String id) {
+        BusJcbWjcxc info = busJcbWjcxcService.getInfo(id);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("info",info);
+        return ajax;
+    }
+
+    @ApiOperation(value = "列表")
+    @GetMapping(value = "list")
+    public TableDataInfo getList(BusJcbWjcxc busJcbWjcxc) {
+        startPage();
+        List<BusJcbWjcxc> list = busJcbWjcxcService.getList(busJcbWjcxc);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "获取上次检测值")
+    @GetMapping(value = "/getLastOne")
+    public AjaxResult getLastOne() {
+        BusJcbWjcxc info = busJcbWjcxcService.getLastRecord();
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("info",info);
+        return ajax;
+    }
+
+    @ApiOperation(value = "提交")
+    @PutMapping("/submit")
+    public AjaxResult submit(@RequestBody BusJcbWjcxc busJcbWjcxc) {
+        return toAjax(busJcbWjcxcService.submit(busJcbWjcxc));
+    }
+
+    @ApiOperation(value = "退回")
+    @PutMapping("/reject")
+    public AjaxResult reject(@RequestBody BusJcbWjcxc busJcbWjcxc) {
+        return toAjax(busJcbWjcxcService.reject(busJcbWjcxc));
+    }
+
+    @ApiOperation(value = "确认")
+    @PutMapping("/confirm")
+    public AjaxResult confirm(@RequestBody BusJcbWjcxc busJcbWjcxc) {
+        return toAjax(busJcbWjcxcService.confirm(busJcbWjcxc));
+    }
+
+
+}

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

@@ -118,6 +118,10 @@ public class BusJcbDmcgyq extends BaseEntity{
     @ApiModelProperty(value = "用户id")
     private Long userId;
 
+    @ApiModelProperty(value = "del_flag")
+    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+    private String delFlag;
+
     public BusJcbDmcgyq() {
     }
 

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

@@ -0,0 +1,195 @@
+package com.railway.business.catenary.domain;
+
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotNull;
+/**
+ * 检查表-交叉线岔
+ * @author zcf 2021-10-18
+ */
+@Data
+@ApiModel("检查表-交叉线岔")
+@EqualsAndHashCode(callSuper = true)
+public class BusJcbJcxc extends BaseEntity{
+
+    @ApiModelProperty(value = "主键", hidden = true)
+    private String id;
+
+    @ApiModelProperty(value = "站/区间")
+    @Length(min = 1, max = 100, message = "【站/区间】长度必须介于 {min} 和 {max} 之间")
+    private String zhanqujian;
+
+    @ApiModelProperty(value = "支柱号")
+    @Length(min = 1, max = 30, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
+    private String zhizhuhao;
+
+    @ApiModelProperty(value = "线岔号")
+    @Length(min = 1, max = 30, message = "【线岔号】长度必须介于 {min} 和 {max} 之间")
+    private String xianchahao;
+
+    @ApiModelProperty(value = "温度")
+    @Length(min = 1, max = 20, message = "【温度】长度必须介于 {min} 和 {max} 之间")
+    private String wendu;
+
+    @ApiModelProperty(value = "检查日期")
+    private String jianchariqi;
+
+    @ApiModelProperty(value = "工支1拉出值")
+    private Integer gz1lcz;
+
+    @ApiModelProperty(value = "工支2/非支拉出值")
+    private Integer gz2lcz;
+
+    @ApiModelProperty(value = "直股拉出值")
+    private Integer zglcz;
+
+    @ApiModelProperty(value = "曲股拉出值")
+    private Integer qglcz;
+
+    @ApiModelProperty(value = "内轨距")
+    private Integer ngj;
+
+    @ApiModelProperty(value = "偏离值")
+    private Integer plz;
+
+    @ApiModelProperty(value = "线岔限制管安装牢固 0是 1否")
+    @Length(min = 1, max = 1, message = "【线岔限制管安装牢固 0是 1否】长度必须介于 {min} 和 {max} 之间")
+    private String xcxzgazlg;
+
+    @ApiModelProperty(value = "线岔限制管安装牢固-故障描述")
+    @Length(min = 1, max = 100, message = "【线岔限制管安装牢固-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String xcxzgazlgGzms;
+
+    @ApiModelProperty(value = "两接触线间有一定的活动间隙")
+    @Length(min = 1, max = 1, message = "【两接触线间有一定的活动间隙】长度必须介于 {min} 和 {max} 之间")
+    private String hdjx;
+
+    @ApiModelProperty(value = "有活动间隙-故障描述")
+    @Length(min = 1, max = 100, message = "【有活动间隙-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String hdjxGzms;
+
+    @ApiModelProperty(value = "分合闸指示器与开关实际位置相符合")
+    @Length(min = 1, max = 1, message = "【分合闸指示器与开关实际位置相符合】长度必须介于 {min} 和 {max} 之间")
+    private String fhzzsq;
+
+    @ApiModelProperty(value = "分合闸指示器不符合-故障描述")
+    @Length(min = 1, max = 100, message = "【分合闸指示器不符合-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String fhzzsqGzms;
+
+    @ApiModelProperty(value = "无电气烧伤现象")
+    @Length(min = 1, max = 1, message = "【无电气烧伤现象】长度必须介于 {min} 和 {max} 之间")
+    private String dqssxx;
+
+    @ApiModelProperty(value = "电气烧伤现象-故障描述")
+    @Length(min = 1, max = 100, message = "【电气烧伤现象-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String dqssxxGzms;
+
+    @ApiModelProperty(value = "螺栓无松脱")
+    @Length(min = 1, max = 1, message = "【螺栓无松脱】长度必须介于 {min} 和 {max} 之间")
+    private String lswst;
+
+    @ApiModelProperty(value = "螺栓无松脱-故障描述")
+    @Length(min = 1, max = 100, message = "【螺栓无松脱-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String lswstGzms;
+
+    @ApiModelProperty(value = "限制管两端有吊弦")
+    @Length(min = 1, max = 1, message = "【限制管两端有吊弦】长度必须介于 {min} 和 {max} 之间")
+    private String xzgldydx;
+
+    @ApiModelProperty(value = "限制管两端有吊弦-故障描述")
+    @Length(min = 1, max = 100, message = "【限制管两端有吊弦-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String xzgldydxGzms;
+
+    @ApiModelProperty(value = "吊弦状态良好")
+    @Length(min = 1, max = 1, message = "【吊弦状态良好】长度必须介于 {min} 和 {max} 之间")
+    private String dxztlh;
+
+    @ApiModelProperty(value = "吊弦状态良好-故障描述")
+    @Length(min = 1, max = 100, message = "【吊弦状态良好-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String dxztlhGzms;
+
+    @ApiModelProperty(value = "垂直间距")
+    private Integer czjj;
+
+    @ApiModelProperty(value = "两工作支高差")
+    private Integer lgzzgc;
+
+    @ApiModelProperty(value = "工支与非支高差")
+    private Integer gzyfzgc;
+
+    @ApiModelProperty(value = "无线夹")
+    @Length(min = 1, max = 1, message = "【无线夹】长度必须介于 {min} 和 {max} 之间")
+    private String wxj;
+
+    @ApiModelProperty(value = "无线夹-故障描述")
+    @Length(min = 1, max = 100, message = "【无线夹-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String wxjGzms;
+
+    @ApiModelProperty(value = "滑动吊弦线夹状态")
+    @Length(min = 1, max = 1, message = "【滑动吊弦线夹状态】长度必须介于 {min} 和 {max} 之间")
+    private String hddxxjzt;
+
+    @ApiModelProperty(value = "滑动吊弦线夹状态-故障描述")
+    @Length(min = 1, max = 100, message = "【滑动吊弦线夹状态-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String hddxxjztGzms;
+
+    @ApiModelProperty(value = "交叉吊弦状态")
+    @Length(min = 1, max = 1, message = "【交叉吊弦状态】长度必须介于 {min} 和 {max} 之间")
+    private String jcdxzt;
+
+    @ApiModelProperty(value = "交叉吊弦状态-故障描述")
+    @Length(min = 1, max = 100, message = "【交叉吊弦状态-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String jcdxztGzms;
+
+    @ApiModelProperty(value = "电连接线无散股、断股及烧损")
+    @Length(min = 1, max = 1, message = "【电连接线无散股、断股及烧损】长度必须介于 {min} 和 {max} 之间")
+    private String dljxzt;
+
+    @ApiModelProperty(value = "电连接线-故障描述")
+    @Length(min = 1, max = 100, message = "【电连接线-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String dljxztGzms;
+
+    @ApiModelProperty(value = "设备状态 0合格 1不合格")
+    @Length(min = 1, max = 1, message = "【设备状态 0合格 1不合格】长度必须介于 {min} 和 {max} 之间")
+    private String sbzt;
+
+    @ApiModelProperty(value = "检查人")
+    @Length(min = 1, max = 20, message = "【检查人】长度必须介于 {min} 和 {max} 之间")
+    private String jcr;
+
+    @ApiModelProperty(value = "存在问题")
+    @Length(min = 1, max = 600, message = "【存在问题】长度必须介于 {min} 和 {max} 之间")
+    private String ctwt;
+
+    @ApiModelProperty(value = "提交状态")
+    @Length(min = 1, max = 1, message = "【提交状态】长度必须介于 {min} 和 {max} 之间")
+    private String submitStatus;
+
+    @ApiModelProperty(value = "create_by")
+    @Length(min = 1, max = 100, message = "【create_by】长度必须介于 {min} 和 {max} 之间")
+    private String createBy;
+
+    @ApiModelProperty(value = "update_by")
+    @Length(min = 1, max = 100, message = "【update_by】长度必须介于 {min} 和 {max} 之间")
+    private String updateBy;
+
+    @ApiModelProperty(value = "update_time")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "del_flag")
+    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+    private String delFlag;
+
+    public BusJcbJcxc() {
+    }
+
+}

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

@@ -0,0 +1,99 @@
+package com.railway.business.catenary.domain;
+
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotNull;
+/**
+ * 检测表-全面检查记录
+ * @author author 2021-10-19
+ */
+@Data
+@ApiModel("检测表-全面检查记录")
+@EqualsAndHashCode(callSuper = true)
+public class BusJcbQmjcjl extends BaseEntity{
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "站场(区间)")
+    @Length(min = 1, max = 100, message = "【站场(区间)】长度必须介于 {min} 和 {max} 之间")
+    private String qj;
+
+    @ApiModelProperty(value = "支柱号（或悬挂点）")
+    @Length(min = 1, max = 20, message = "【支柱号（或悬挂点）】长度必须介于 {min} 和 {max} 之间")
+    private String zzh;
+
+    @ApiModelProperty(value = "缺陷来源")
+    @Length(min = 1, max = 20, message = "【缺陷来源】长度必须介于 {min} 和 {max} 之间")
+    private String qxly;
+
+    @ApiModelProperty(value = "位置")
+    @Length(min = 1, max = 20, message = "【位置】长度必须介于 {min} 和 {max} 之间")
+    private String wz;
+
+    @ApiModelProperty(value = "缺陷内容")
+    @Length(min = 1, max = 200, message = "【缺陷内容】长度必须介于 {min} 和 {max} 之间")
+    private String qxnr;
+
+    @ApiModelProperty(value = "缺陷等级")
+    @Length(min = 1, max = 20, message = "【缺陷等级】长度必须介于 {min} 和 {max} 之间")
+    private String qxdj;
+
+    @ApiModelProperty(value = "处理措施")
+    @Length(min = 1, max = 200, message = "【处理措施】长度必须介于 {min} 和 {max} 之间")
+    private String clcs;
+
+    @ApiModelProperty(value = "修后状态")
+    @Length(min = 1, max = 20, message = "【修后状态】长度必须介于 {min} 和 {max} 之间")
+    private String xhzt;
+
+    @ApiModelProperty(value = "维护保养")
+    @Length(min = 1, max = 20, message = "【维护保养】长度必须介于 {min} 和 {max} 之间")
+    private String whby;
+
+    @ApiModelProperty(value = "绝缘清扫")
+    @Length(min = 1, max = 20, message = "【绝缘清扫】长度必须介于 {min} 和 {max} 之间")
+    private String jyqs;
+
+    @ApiModelProperty(value = "设备状态")
+    @Length(min = 1, max = 20, message = "【设备状态】长度必须介于 {min} 和 {max} 之间")
+    private String sbzt;
+
+    @ApiModelProperty(value = "操作人")
+    @Length(min = 1, max = 20, message = "【操作人】长度必须介于 {min} 和 {max} 之间")
+    private String czr;
+
+    @ApiModelProperty(value = "工作领导人")
+    @Length(min = 1, max = 20, message = "【工作领导人】长度必须介于 {min} 和 {max} 之间")
+    private String gzldr;
+
+    @ApiModelProperty(value = "验收人")
+    @Length(min = 1, max = 20, message = "【验收人】长度必须介于 {min} 和 {max} 之间")
+    private String ysr;
+
+    @ApiModelProperty(value = "日期")
+    @Length(min = 1, max = 10, message = "【日期】长度必须介于 {min} 和 {max} 之间")
+    private String rq;
+
+    @ApiModelProperty(value = "备注")
+    @Length(min = 1, max = 600, message = "【备注】长度必须介于 {min} 和 {max} 之间")
+    private String remark;
+
+    @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;
+
+    public BusJcbQmjcjl() {
+    }
+
+}

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

@@ -0,0 +1,158 @@
+package com.railway.business.catenary.domain;
+
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotNull;
+/**
+ * 检查表-无交叉线岔
+ * @author zcf 2021-10-19
+ */
+@Data
+@ApiModel("检查表-无交叉线岔")
+@EqualsAndHashCode(callSuper = true)
+public class BusJcbWjcxc extends BaseEntity{
+
+    @ApiModelProperty(value = "主键", hidden = true)
+    private String id;
+
+    @ApiModelProperty(value = "站/区间")
+    @Length(min = 1, max = 100, message = "【站/区间】长度必须介于 {min} 和 {max} 之间")
+    private String zhanqujian;
+
+    @ApiModelProperty(value = "支柱号")
+    @Length(min = 1, max = 30, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
+    private String zhizhuhao;
+
+    @ApiModelProperty(value = "线岔号")
+    @Length(min = 1, max = 30, message = "【线岔号】长度必须介于 {min} 和 {max} 之间")
+    private String xianchahao;
+
+    @ApiModelProperty(value = "温度")
+    @Length(min = 1, max = 20, message = "【温度】长度必须介于 {min} 和 {max} 之间")
+    private String wendu;
+
+    @ApiModelProperty(value = "检查日期")
+    private String jianchariqi;
+
+    @ApiModelProperty(value = "零部件状态是否良好")
+    @Length(min = 1, max = 1, message = "【零部件状态是否良好】长度必须介于 {min} 和 {max} 之间")
+    private String lbjzt;
+
+    @ApiModelProperty(value = "零部件状态-故障描述")
+    @Length(min = 1, max = 100, message = "【零部件状态-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String lbjztGzms;
+
+    @ApiModelProperty(value = "正线线夹对侧线拉出值")
+    private Integer zxlcz;
+
+    @ApiModelProperty(value = "正线线夹对侧线导高")
+    private Integer zxdg;
+
+    @ApiModelProperty(value = "侧线线夹对正线拉出值")
+    private Integer cxlcz;
+
+    @ApiModelProperty(value = "侧线线夹对正线导高")
+    private Integer cxdg;
+
+    @ApiModelProperty(value = "滑动线夹状态")
+    @Length(min = 1, max = 1, message = "【滑动线夹状态】长度必须介于 {min} 和 {max} 之间")
+    private String hdxjzt;
+
+    @ApiModelProperty(value = "滑动线夹状态-故障描述")
+    @Length(min = 1, max = 100, message = "【滑动线夹状态-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String hdxjztGzms;
+
+    @ApiModelProperty(value = "正线上的无线夹区")
+    private Integer zxwxjq;
+
+    @ApiModelProperty(value = "侧线上的无线夹区")
+    private Integer cxwxjq;
+
+    @ApiModelProperty(value = "电连接状态")
+    @Length(min = 1, max = 1, message = "【电连接状态】长度必须介于 {min} 和 {max} 之间")
+    private String dljzt;
+
+    @ApiModelProperty(value = "电连接状态-故障描述")
+    @Length(min = 1, max = 100, message = "【电连接状态-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String dljztGzms;
+
+    @ApiModelProperty(value = "a柱正线拉出值")
+    private Integer azzxlcz;
+
+    @ApiModelProperty(value = "a柱正线导高")
+    private Integer azzxdg;
+
+    @ApiModelProperty(value = "a柱侧线拉出值")
+    private Integer azcxlcz;
+
+    @ApiModelProperty(value = "a柱侧线导高")
+    private Integer azcxdg;
+
+    @ApiModelProperty(value = "b柱正线拉出值")
+    private Integer bzzxlcz;
+
+    @ApiModelProperty(value = "b柱正线导高")
+    private Integer bzzxdg;
+
+    @ApiModelProperty(value = "b柱侧线拉出值")
+    private Integer bzcxlcz;
+
+    @ApiModelProperty(value = "b柱侧线导高")
+    private Integer bzcxdg;
+
+    @ApiModelProperty(value = "c柱正线拉出值")
+    private Integer czzxlcz;
+
+    @ApiModelProperty(value = "c柱正线导高")
+    private Integer czzxdg;
+
+    @ApiModelProperty(value = "c柱侧线拉出值")
+    private Integer czcxlcz;
+
+    @ApiModelProperty(value = "c柱侧线导高")
+    private Integer czcxdg;
+
+    @ApiModelProperty(value = "设备状态 0合格 1不合格")
+    @Length(min = 1, max = 1, message = "【设备状态 0合格 1不合格】长度必须介于 {min} 和 {max} 之间")
+    private String sbzt;
+
+    @ApiModelProperty(value = "检查人")
+    @Length(min = 1, max = 20, message = "【检查人】长度必须介于 {min} 和 {max} 之间")
+    private String jcr;
+
+    @ApiModelProperty(value = "存在问题")
+    @Length(min = 1, max = 600, message = "【存在问题】长度必须介于 {min} 和 {max} 之间")
+    private String ctwt;
+
+    @ApiModelProperty(value = "提交状态")
+    @Length(min = 1, max = 1, message = "【提交状态】长度必须介于 {min} 和 {max} 之间")
+    private String submitStatus;
+
+    @ApiModelProperty(value = "create_by")
+    @Length(min = 1, max = 100, message = "【create_by】长度必须介于 {min} 和 {max} 之间")
+    private String createBy;
+
+    @ApiModelProperty(value = "update_by")
+    @Length(min = 1, max = 100, message = "【update_by】长度必须介于 {min} 和 {max} 之间")
+    private String updateBy;
+
+    @ApiModelProperty(value = "update_time")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "del_flag")
+    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+    private String delFlag;
+
+    public BusJcbWjcxc() {
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package com.railway.business.catenary.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.catenary.domain.BusJcbJcxc;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+* 检查表-交叉线岔
+* @author zcf
+* @date 2021/10/18
+*/
+@Mapper
+@Repository
+public interface BusJcbJcxcMapper {
+
+    /**
+    * @Description: 新增
+    */
+    int insert(BusJcbJcxc busJcbJcxc);
+
+    /**
+    * @Description: 删除
+    */
+    int delete(@Param("id") String id);
+
+    /**
+    * @Description: 更新
+    */
+    int update(BusJcbJcxc busJcbJcxc);
+
+    /**
+    * @Description: 获取单个
+    */
+    BusJcbJcxc getInfo(@Param("id") String id);
+
+    /**
+    * @Description: 查询列表
+    */
+    Page<BusJcbJcxc> getList(BusJcbJcxc busJcbJcxc);
+
+    /**
+     * @Description: 获取上次检查记录
+     */
+    BusJcbJcxc getLastRecord(Long userId);
+}

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

@@ -0,0 +1,43 @@
+package com.railway.business.catenary.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.catenary.domain.BusJcbQmjcjl;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+* 检测表-全面检查记录
+* @author author
+* @date 2021/10/19
+*/
+@Mapper
+@Repository
+public interface BusJcbQmjcjlMapper {
+
+    /**
+    * @Description: 新增
+    */
+    int insert(BusJcbQmjcjl busJcbQmjcjl);
+
+    /**
+    * @Description: 删除
+    */
+    int delete(@Param("id") String id);
+
+    /**
+    * @Description: 更新
+    */
+    int update(BusJcbQmjcjl busJcbQmjcjl);
+
+    /**
+    * @Description: 获取单个
+    */
+    BusJcbQmjcjl getInfo(@Param("id") String id);
+
+    /**
+    * @Description: 查询列表
+    */
+    Page<BusJcbQmjcjl> getList(BusJcbQmjcjl busJcbQmjcjl);
+
+}

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

@@ -0,0 +1,48 @@
+package com.railway.business.catenary.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.catenary.domain.BusJcbWjcxc;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+* 检查表-无交叉线岔
+* @author zcf
+* @date 2021/10/19
+*/
+@Mapper
+@Repository
+public interface BusJcbWjcxcMapper {
+
+    /**
+    * @Description: 新增
+    */
+    int insert(BusJcbWjcxc busJcbWjcxc);
+
+    /**
+    * @Description: 删除
+    */
+    int delete(@Param("id") String id);
+
+    /**
+    * @Description: 更新
+    */
+    int update(BusJcbWjcxc busJcbWjcxc);
+
+    /**
+    * @Description: 获取单个
+    */
+    BusJcbWjcxc getInfo(@Param("id") String id);
+
+    /**
+    * @Description: 查询列表
+    */
+    Page<BusJcbWjcxc> getList(BusJcbWjcxc busJcbWjcxc);
+
+    /**
+     * @Description: 获取上次检查记录
+     */
+    BusJcbWjcxc getLastRecord(Long userId);
+
+}

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

@@ -17,7 +17,7 @@ public interface IBusJcbDmcgyqService{
     /**
     * @Description: 删除
     */
-    int delete(String ids);
+    int delete(String[] ids);
 
     /**
     * @Description: 更新

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

@@ -0,0 +1,58 @@
+package com.railway.business.catenary.service;
+
+import com.railway.business.catenary.domain.BusJcbJcxc;
+
+import java.util.List;
+/**
+* 检查表-交叉线岔
+* @author zcf
+* @date 2021/10/18
+*/
+public interface IBusJcbJcxcService{
+
+    /**
+    * @Description: 新增
+    */
+    int create(BusJcbJcxc busJcbJcxc);
+
+    /**
+    * @Description: 删除
+    */
+    int delete(String[] ids);
+
+    /**
+    * @Description: 更新
+    */
+    int update(BusJcbJcxc busJcbJcxc);
+
+    /**
+    * @Description: 获取单个
+    */
+    BusJcbJcxc getInfo(String id);
+
+    /**
+    * @Description: 查询列表
+    */
+    List<BusJcbJcxc> getList(BusJcbJcxc busJcbJcxc);
+
+    /**
+     * @Description: 获取上次检查记录
+     */
+    BusJcbJcxc getLastRecord();
+
+    /**
+     * @Description: 提交
+     */
+    int submit(BusJcbJcxc busJcbJcxc);
+
+    /**
+     * @Description: 退回
+     */
+    int reject(BusJcbJcxc busJcbJcxc);
+
+    /**
+     * @Description: 确认
+     */
+    int confirm(BusJcbJcxc busJcbJcxc);
+
+}

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

@@ -0,0 +1,58 @@
+package com.railway.business.catenary.service;
+
+import com.railway.business.catenary.domain.BusJcbQmjcjl;
+
+import java.util.List;
+/**
+* 检测表-全面检查记录
+* @author author
+* @date 2021/10/19
+*/
+public interface IBusJcbQmjcjlService{
+
+    /**
+    * @Description: 新增
+    */
+    int create(BusJcbQmjcjl busJcbQmjcjl);
+
+    /**
+    * @Description: 删除
+    */
+    int delete(String[] ids);
+
+    /**
+    * @Description: 更新
+    */
+    int update(BusJcbQmjcjl busJcbQmjcjl);
+
+    /**
+    * @Description: 获取单个
+    */
+    BusJcbQmjcjl getInfo(String id);
+
+    /**
+    * @Description: 查询列表
+    */
+    List<BusJcbQmjcjl> getList(BusJcbQmjcjl busJcbQmjcjl);
+
+    /**
+     * 提交
+     * @param busJcbQmjcjl
+     * @return
+     */
+    int submit(BusJcbQmjcjl busJcbQmjcjl);
+
+    /**
+     * 退回
+     * @param busJcbQmjcjl
+     * @return
+     */
+    int reject(BusJcbQmjcjl busJcbQmjcjl);
+
+    /**
+     * 确认
+     * @param busJcbQmjcjl
+     * @return
+     */
+    int confirm(BusJcbQmjcjl busJcbQmjcjl);
+}

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

@@ -0,0 +1,57 @@
+package com.railway.business.catenary.service;
+
+import com.railway.business.catenary.domain.BusJcbWjcxc;
+import java.util.List;
+/**
+* 检查表-无交叉线岔
+* @author zcf
+* @date 2021/10/19
+*/
+public interface IBusJcbWjcxcService{
+
+    /**
+    * @Description: 新增
+    */
+    int create(BusJcbWjcxc busJcbWjcxc);
+
+    /**
+    * @Description: 删除
+    */
+    int delete(String[] ids);
+
+    /**
+    * @Description: 更新
+    */
+    int update(BusJcbWjcxc busJcbWjcxc);
+
+    /**
+    * @Description: 获取单个
+    */
+    BusJcbWjcxc getInfo(String id);
+
+    /**
+    * @Description: 查询列表
+    */
+    List<BusJcbWjcxc> getList(BusJcbWjcxc busJcbWjcxc);
+
+    /**
+     * @Description: 获取上次检查记录
+     */
+    BusJcbWjcxc getLastRecord();
+
+    /**
+     * @Description: 提交
+     */
+    int submit(BusJcbWjcxc busJcbWjcxc);
+
+    /**
+     * @Description: 退回
+     */
+    int reject(BusJcbWjcxc busJcbWjcxc);
+
+    /**
+     * @Description: 确认
+     */
+    int confirm(BusJcbWjcxc busJcbWjcxc);
+
+}

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

@@ -37,8 +37,13 @@ private BusJcbDmcgyqMapper busJcbDmcgyqMapper;
 	* @Description: 删除
 	*/
 	@Transactional(rollbackFor = Exception.class)
-	public int delete(String id) {
-		return	busJcbDmcgyqMapper.delete(id);
+	public int delete(String[] ids) {
+		int r =0;
+		for (String id : ids) {
+			int j= busJcbDmcgyqMapper.delete(id);
+			r = r + j;
+		}
+		return	r;
 	}
 
 	/**

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

@@ -0,0 +1,113 @@
+package com.railway.business.catenary.service.impl;
+
+import com.railway.business.catenary.domain.BusJcbJcxc;
+import com.railway.business.catenary.enums.TestTableStatusEnum;
+import com.railway.business.catenary.mapper.BusJcbJcxcMapper;
+import com.railway.business.catenary.service.IBusJcbJcxcService;
+import com.railway.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+/**
+* 检查表-交叉线岔
+* @author zcf
+* @date 2021/10/18
+*/
+@Service
+@Transactional(readOnly = true)
+public class BusJcbJcxcServiceImpl implements IBusJcbJcxcService{
+@Autowired
+private BusJcbJcxcMapper busJcbJcxcMapper;
+
+	/**
+	* @Description: 新增
+	*/
+	@Transactional(rollbackFor = Exception.class)
+	public int create(BusJcbJcxc busJcbJcxc) {
+		busJcbJcxc.setUserId(SecurityUtils.getUserId());
+	    busJcbJcxc.setCreateTime(new Date());
+        busJcbJcxc.setCreateBy(SecurityUtils.getUsername());
+		return busJcbJcxcMapper.insert(busJcbJcxc);
+	}
+
+	/**
+	* @Description: 删除
+	*/
+	@Transactional(rollbackFor = Exception.class)
+	public int delete(String[] ids) {
+		int r =0;
+		for (String id : ids) {
+			int j= busJcbJcxcMapper.delete(id);
+			r = r + j;
+		}
+		return	r;
+	}
+
+	/**
+	* @Description: 更新
+	*/
+	@Transactional(rollbackFor = Exception.class)
+	public int update(BusJcbJcxc busJcbJcxc) {
+		busJcbJcxc.setUpdateTime(new Date());
+    	busJcbJcxc.setUpdateBy(SecurityUtils.getUsername());
+		return busJcbJcxcMapper.update(busJcbJcxc);
+	}
+
+	/**
+	* @Description: 获取单个
+	*/
+	public BusJcbJcxc getInfo(String id) {
+		return busJcbJcxcMapper.getInfo(id);
+	}
+
+	/**
+	* @Description: 查询列表
+	*/
+	public List<BusJcbJcxc> getList(BusJcbJcxc busJcbJcxc) {
+		return busJcbJcxcMapper.getList(busJcbJcxc);
+	}
+
+	/**
+	 * @Description: 获取上次检查记录
+	 */
+	public BusJcbJcxc getLastRecord() {
+		return busJcbJcxcMapper.getLastRecord(SecurityUtils.getUserId());
+	}
+
+	/**
+	 * @Description: 提交
+	 */
+	@Transactional(rollbackFor = Exception.class)
+	public int submit(BusJcbJcxc busJcbJcxc) {
+		busJcbJcxc.setUpdateTime(new Date());
+		busJcbJcxc.setUpdateBy(SecurityUtils.getUsername());
+		busJcbJcxc.setSubmitStatus(TestTableStatusEnum.REPORTED.getCode());
+		return busJcbJcxcMapper.update(busJcbJcxc);
+	}
+
+	/**
+	 * @Description: 退回
+	 */
+	@Transactional(rollbackFor = Exception.class)
+	public int reject(BusJcbJcxc busJcbJcxc) {
+		busJcbJcxc.setUpdateTime(new Date());
+		busJcbJcxc.setUpdateBy(SecurityUtils.getUsername());
+		busJcbJcxc.setSubmitStatus(TestTableStatusEnum.RETURNED.getCode());
+		return busJcbJcxcMapper.update(busJcbJcxc);
+	}
+
+	/**
+	 * @Description: 确认
+	 */
+	@Transactional(rollbackFor = Exception.class)
+	public int confirm(BusJcbJcxc busJcbJcxc) {
+		busJcbJcxc.setUpdateTime(new Date());
+		busJcbJcxc.setUpdateBy(SecurityUtils.getUsername());
+		busJcbJcxc.setSubmitStatus(TestTableStatusEnum.COMPLETED.getCode());
+		return busJcbJcxcMapper.update(busJcbJcxc);
+	}
+	
+}

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

@@ -0,0 +1,120 @@
+package com.railway.business.catenary.service.impl;
+
+import com.railway.business.catenary.domain.BusJcbQmjcjl;
+import com.railway.business.catenary.enums.DelFlagEnum;
+import com.railway.business.catenary.enums.TestTableStatusEnum;
+import com.railway.business.catenary.mapper.BusJcbQmjcjlMapper;
+import com.railway.business.catenary.service.IBusJcbQmjcjlService;
+import com.railway.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+/**
+* 检测表-全面检查记录
+* @author author
+* @date 2021/10/19
+*/
+@Service
+@Transactional(readOnly = true)
+public class BusJcbQmjcjlServiceImpl implements IBusJcbQmjcjlService{
+@Autowired
+private BusJcbQmjcjlMapper busJcbQmjcjlMapper;
+
+	/**
+	* @Description: 新增
+	*/
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int create(BusJcbQmjcjl busJcbQmjcjl) {
+	    busJcbQmjcjl.setCreateTime(new Date());
+        busJcbQmjcjl.setCreateBy(SecurityUtils.getUsername());
+		busJcbQmjcjl.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
+		return busJcbQmjcjlMapper.insert(busJcbQmjcjl);
+	}
+
+	/**
+	* @Description: 删除
+	*/
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int delete(String[] ids) {
+		int r =0;
+		for (String id : ids) {
+			int j= busJcbQmjcjlMapper.delete(id);
+			r = r + j;
+		}
+		return	r;
+	}
+
+	/**
+	* @Description: 更新
+	*/
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int update(BusJcbQmjcjl busJcbQmjcjl) {
+		busJcbQmjcjl.setUpdateTime(new Date());
+    	busJcbQmjcjl.setUpdateBy(SecurityUtils.getUsername());
+		return busJcbQmjcjlMapper.update(busJcbQmjcjl);
+	}
+
+	/**
+	* @Description: 获取单个
+	*/
+	@Override
+	public BusJcbQmjcjl getInfo(String id) {
+		return busJcbQmjcjlMapper.getInfo(id);
+	}
+
+	/**
+	* @Description: 查询列表
+	*/
+	@Override
+	public List<BusJcbQmjcjl> getList(BusJcbQmjcjl busJcbQmjcjl) {
+		return busJcbQmjcjlMapper.getList(busJcbQmjcjl);
+	}
+
+	/**
+	 * 提交
+	 * @param busJcbQmjcjl
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int submit(BusJcbQmjcjl busJcbQmjcjl) {
+		busJcbQmjcjl.setUpdateTime(new Date());
+		busJcbQmjcjl.setUpdateBy(SecurityUtils.getUsername());
+		busJcbQmjcjl.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
+		return busJcbQmjcjlMapper.update(busJcbQmjcjl);
+	}
+
+	/**
+	 * 退回
+	 * @param busJcbQmjcjl
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int reject(BusJcbQmjcjl busJcbQmjcjl) {
+		busJcbQmjcjl.setUpdateTime(new Date());
+		busJcbQmjcjl.setUpdateBy(SecurityUtils.getUsername());
+		busJcbQmjcjl.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
+		return busJcbQmjcjlMapper.update(busJcbQmjcjl);
+	}
+
+	/**
+	 * 确认
+	 * @param busJcbQmjcjl
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int confirm(BusJcbQmjcjl busJcbQmjcjl) {
+		busJcbQmjcjl.setUpdateTime(new Date());
+		busJcbQmjcjl.setUpdateBy(SecurityUtils.getUsername());
+		busJcbQmjcjl.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
+		return busJcbQmjcjlMapper.update(busJcbQmjcjl);
+	}
+}

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

@@ -0,0 +1,113 @@
+package com.railway.business.catenary.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.railway.business.catenary.enums.TestTableStatusEnum;
+import com.railway.business.catenary.mapper.BusJcbWjcxcMapper;
+import com.railway.business.catenary.domain.BusJcbWjcxc;
+import com.railway.business.catenary.service.IBusJcbWjcxcService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.railway.common.utils.SecurityUtils;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Date;
+/**
+* 检查表-无交叉线岔
+* @author zcf
+* @date 2021/10/19
+*/
+@Service
+@Transactional(readOnly = true)
+public class BusJcbWjcxcServiceImpl implements IBusJcbWjcxcService{
+@Autowired
+private BusJcbWjcxcMapper busJcbWjcxcMapper;
+
+	/**
+	* @Description: 新增
+	*/
+	@Transactional(rollbackFor = Exception.class)
+	public int create(BusJcbWjcxc busJcbWjcxc) {
+		busJcbWjcxc.setUserId(SecurityUtils.getUserId());
+	    busJcbWjcxc.setCreateTime(new Date());
+        busJcbWjcxc.setCreateBy(SecurityUtils.getUsername());
+		return busJcbWjcxcMapper.insert(busJcbWjcxc);
+	}
+
+	/**
+	* @Description: 删除
+	*/
+	@Transactional(rollbackFor = Exception.class)
+	public int delete(String[] ids) {
+		int r =0;
+		for (String id : ids) {
+			int j= busJcbWjcxcMapper.delete(id);
+			r = r + j;
+		}
+		return	r;
+	}
+
+	/**
+	* @Description: 更新
+	*/
+	@Transactional(rollbackFor = Exception.class)
+	public int update(BusJcbWjcxc busJcbWjcxc) {
+		busJcbWjcxc.setUpdateTime(new Date());
+    	busJcbWjcxc.setUpdateBy(SecurityUtils.getUsername());
+		return busJcbWjcxcMapper.update(busJcbWjcxc);
+	}
+
+	/**
+	* @Description: 获取单个
+	*/
+	public BusJcbWjcxc getInfo(String id) {
+		return busJcbWjcxcMapper.getInfo(id);
+	}
+
+	/**
+	* @Description: 查询列表
+	*/
+	public List<BusJcbWjcxc> getList(BusJcbWjcxc busJcbWjcxc) {
+		return busJcbWjcxcMapper.getList(busJcbWjcxc);
+	}
+
+	/**
+	 * @Description: 获取上次检查记录
+	 */
+	public BusJcbWjcxc getLastRecord() {
+		return busJcbWjcxcMapper.getLastRecord(SecurityUtils.getUserId());
+	}
+
+	/**
+	 * @Description: 提交
+	 */
+	@Transactional(rollbackFor = Exception.class)
+	public int submit(BusJcbWjcxc busJcbWjcxc) {
+		busJcbWjcxc.setUpdateTime(new Date());
+		busJcbWjcxc.setUpdateBy(SecurityUtils.getUsername());
+		busJcbWjcxc.setSubmitStatus(TestTableStatusEnum.REPORTED.getCode());
+		return busJcbWjcxcMapper.update(busJcbWjcxc);
+	}
+
+	/**
+	 * @Description: 退回
+	 */
+	@Transactional(rollbackFor = Exception.class)
+	public int reject(BusJcbWjcxc busJcbWjcxc) {
+		busJcbWjcxc.setUpdateTime(new Date());
+		busJcbWjcxc.setUpdateBy(SecurityUtils.getUsername());
+		busJcbWjcxc.setSubmitStatus(TestTableStatusEnum.RETURNED.getCode());
+		return busJcbWjcxcMapper.update(busJcbWjcxc);
+	}
+
+	/**
+	 * @Description: 确认
+	 */
+	@Transactional(rollbackFor = Exception.class)
+	public int confirm(BusJcbWjcxc busJcbWjcxc) {
+		busJcbWjcxc.setUpdateTime(new Date());
+		busJcbWjcxc.setUpdateBy(SecurityUtils.getUsername());
+		busJcbWjcxc.setSubmitStatus(TestTableStatusEnum.COMPLETED.getCode());
+		return busJcbWjcxcMapper.update(busJcbWjcxc);
+	}
+}

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

@@ -307,7 +307,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM bus_jcb_dmcgyq
-        WHERE id = #{id}
+        WHERE id = #{id} and del_flag='0'
 
     </select>
 
@@ -330,6 +330,7 @@
         <include refid="Base_Column_List"/>
         FROM bus_jcb_dmcgyq
         <where>
+            del_flag='0'
                 <if test="zhanqujian!=null and zhanqujian!=''">
                     and zhanqujian=#{zhanqujian}
                 </if>

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

@@ -0,0 +1,607 @@
+<?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.BusJcbJcxcMapper">
+
+    <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusJcbJcxc">
+                <result column="id" property="id"/>
+                <result column="zhanqujian" property="zhanqujian"/>
+                <result column="zhizhuhao" property="zhizhuhao"/>
+                <result column="xianchahao" property="xianchahao"/>
+                <result column="wendu" property="wendu"/>
+                <result column="jianchariqi" property="jianchariqi"/>
+                <result column="gz1lcz" property="gz1lcz"/>
+                <result column="gz2lcz" property="gz2lcz"/>
+                <result column="zglcz" property="zglcz"/>
+                <result column="qglcz" property="qglcz"/>
+                <result column="ngj" property="ngj"/>
+                <result column="plz" property="plz"/>
+                <result column="xcxzgazlg" property="xcxzgazlg"/>
+                <result column="xcxzgazlg_gzms" property="xcxzgazlgGzms"/>
+                <result column="hdjx" property="hdjx"/>
+                <result column="hdjx_gzms" property="hdjxGzms"/>
+                <result column="fhzzsq" property="fhzzsq"/>
+                <result column="fhzzsq_gzms" property="fhzzsqGzms"/>
+                <result column="dqssxx" property="dqssxx"/>
+                <result column="dqssxx_gzms" property="dqssxxGzms"/>
+                <result column="lswst" property="lswst"/>
+                <result column="lswst_gzms" property="lswstGzms"/>
+                <result column="xzgldydx" property="xzgldydx"/>
+                <result column="xzgldydx_gzms" property="xzgldydxGzms"/>
+                <result column="dxztlh" property="dxztlh"/>
+                <result column="dxztlh_gzms" property="dxztlhGzms"/>
+                <result column="czjj" property="czjj"/>
+                <result column="lgzzgc" property="lgzzgc"/>
+                <result column="gzyfzgc" property="gzyfzgc"/>
+                <result column="wxj" property="wxj"/>
+                <result column="wxj_gzms" property="wxjGzms"/>
+                <result column="hddxxjzt" property="hddxxjzt"/>
+                <result column="hddxxjzt_gzms" property="hddxxjztGzms"/>
+                <result column="jcdxzt" property="jcdxzt"/>
+                <result column="jcdxzt_gzms" property="jcdxztGzms"/>
+                <result column="dljxzt" property="dljxzt"/>
+                <result column="dljxzt_gzms" property="dljxztGzms"/>
+                <result column="sbzt" property="sbzt"/>
+                <result column="jcr" property="jcr"/>
+                <result column="ctwt" property="ctwt"/>
+                <result column="submit_status" property="submitStatus"/>
+                <result column="create_by" property="createBy"/>
+                <result column="create_time" property="createTime"/>
+                <result column="update_by" property="updateBy"/>
+                <result column="update_time" property="updateTime"/>
+                <result column="user_id" property="userId"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+                id,
+                zhanqujian,
+                zhizhuhao,
+                xianchahao,
+                wendu,
+                jianchariqi,
+                gz1lcz,
+                gz2lcz,
+                zglcz,
+                qglcz,
+                ngj,
+                plz,
+                xcxzgazlg,
+                xcxzgazlg_gzms,
+                hdjx,
+                hdjx_gzms,
+                fhzzsq,
+                fhzzsq_gzms,
+                dqssxx,
+                dqssxx_gzms,
+                lswst,
+                lswst_gzms,
+                xzgldydx,
+                xzgldydx_gzms,
+                dxztlh,
+                dxztlh_gzms,
+                czjj,
+                lgzzgc,
+                gzyfzgc,
+                wxj,
+                wxj_gzms,
+                hddxxjzt,
+                hddxxjzt_gzms,
+                jcdxzt,
+                jcdxzt_gzms,
+                dljxzt,
+                dljxzt_gzms,
+                sbzt,
+                jcr,
+                ctwt,
+                submit_status,
+                create_by,
+                create_time,
+                update_by,
+                update_time,
+                user_id
+    </sql>
+
+    <insert id="insert" parameterType="com.railway.business.catenary.domain.BusJcbJcxc">
+        INSERT INTO bus_jcb_jcxc
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test ='null != zhanqujian'>
+                    zhanqujian,
+                    </if>
+                    <if test ='null != zhizhuhao'>
+                    zhizhuhao,
+                    </if>
+                    <if test ='null != xianchahao'>
+                    xianchahao,
+                    </if>
+                    <if test ='null != wendu'>
+                    wendu,
+                    </if>
+                    <if test ='null != jianchariqi'>
+                    jianchariqi,
+                    </if>
+                    <if test ='null != gz1lcz'>
+                    gz1lcz,
+                    </if>
+                    <if test ='null != gz2lcz'>
+                    gz2lcz,
+                    </if>
+                    <if test ='null != zglcz'>
+                    zglcz,
+                    </if>
+                    <if test ='null != qglcz'>
+                    qglcz,
+                    </if>
+                    <if test ='null != ngj'>
+                    ngj,
+                    </if>
+                    <if test ='null != plz'>
+                    plz,
+                    </if>
+                    <if test ='null != xcxzgazlg'>
+                    xcxzgazlg,
+                    </if>
+                    <if test ='null != xcxzgazlgGzms'>
+                    xcxzgazlg_gzms,
+                    </if>
+                    <if test ='null != hdjx'>
+                    hdjx,
+                    </if>
+                    <if test ='null != hdjxGzms'>
+                    hdjx_gzms,
+                    </if>
+                    <if test ='null != fhzzsq'>
+                    fhzzsq,
+                    </if>
+                    <if test ='null != fhzzsqGzms'>
+                    fhzzsq_gzms,
+                    </if>
+                    <if test ='null != dqssxx'>
+                    dqssxx,
+                    </if>
+                    <if test ='null != dqssxxGzms'>
+                    dqssxx_gzms,
+                    </if>
+                    <if test ='null != lswst'>
+                    lswst,
+                    </if>
+                    <if test ='null != lswstGzms'>
+                    lswst_gzms,
+                    </if>
+                    <if test ='null != xzgldydx'>
+                    xzgldydx,
+                    </if>
+                    <if test ='null != xzgldydxGzms'>
+                    xzgldydx_gzms,
+                    </if>
+                    <if test ='null != dxztlh'>
+                    dxztlh,
+                    </if>
+                    <if test ='null != dxztlhGzms'>
+                    dxztlh_gzms,
+                    </if>
+                    <if test ='null != czjj'>
+                    czjj,
+                    </if>
+                    <if test ='null != lgzzgc'>
+                    lgzzgc,
+                    </if>
+                    <if test ='null != gzyfzgc'>
+                    gzyfzgc,
+                    </if>
+                    <if test ='null != wxj'>
+                    wxj,
+                    </if>
+                    <if test ='null != wxjGzms'>
+                    wxj_gzms,
+                    </if>
+                    <if test ='null != hddxxjzt'>
+                    hddxxjzt,
+                    </if>
+                    <if test ='null != hddxxjztGzms'>
+                    hddxxjzt_gzms,
+                    </if>
+                    <if test ='null != jcdxzt'>
+                    jcdxzt,
+                    </if>
+                    <if test ='null != jcdxztGzms'>
+                    jcdxzt_gzms,
+                    </if>
+                    <if test ='null != dljxzt'>
+                    dljxzt,
+                    </if>
+                    <if test ='null != dljxztGzms'>
+                    dljxzt_gzms,
+                    </if>
+                    <if test ='null != sbzt'>
+                    sbzt,
+                    </if>
+                    <if test ='null != jcr'>
+                    jcr,
+                    </if>
+                    <if test ='null != ctwt'>
+                    ctwt,
+                    </if>
+                    <if test ='null != submitStatus'>
+                    submit_status,
+                    </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>
+                    <if test ='null != userId'>
+                    user_id
+                    </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                    <if test ='null != zhanqujian'>
+                    #{zhanqujian},
+                    </if>
+                    <if test ='null != zhizhuhao'>
+                    #{zhizhuhao},
+                    </if>
+                    <if test ='null != xianchahao'>
+                    #{xianchahao},
+                    </if>
+                    <if test ='null != wendu'>
+                    #{wendu},
+                    </if>
+                    <if test ='null != jianchariqi'>
+                    #{jianchariqi},
+                    </if>
+                    <if test ='null != gz1lcz'>
+                    #{gz1lcz},
+                    </if>
+                    <if test ='null != gz2lcz'>
+                    #{gz2lcz},
+                    </if>
+                    <if test ='null != zglcz'>
+                    #{zglcz},
+                    </if>
+                    <if test ='null != qglcz'>
+                    #{qglcz},
+                    </if>
+                    <if test ='null != ngj'>
+                    #{ngj},
+                    </if>
+                    <if test ='null != plz'>
+                    #{plz},
+                    </if>
+                    <if test ='null != xcxzgazlg'>
+                    #{xcxzgazlg},
+                    </if>
+                    <if test ='null != xcxzgazlgGzms'>
+                    #{xcxzgazlgGzms},
+                    </if>
+                    <if test ='null != hdjx'>
+                    #{hdjx},
+                    </if>
+                    <if test ='null != hdjxGzms'>
+                    #{hdjxGzms},
+                    </if>
+                    <if test ='null != fhzzsq'>
+                    #{fhzzsq},
+                    </if>
+                    <if test ='null != fhzzsqGzms'>
+                    #{fhzzsqGzms},
+                    </if>
+                    <if test ='null != dqssxx'>
+                    #{dqssxx},
+                    </if>
+                    <if test ='null != dqssxxGzms'>
+                    #{dqssxxGzms},
+                    </if>
+                    <if test ='null != lswst'>
+                    #{lswst},
+                    </if>
+                    <if test ='null != lswstGzms'>
+                    #{lswstGzms},
+                    </if>
+                    <if test ='null != xzgldydx'>
+                    #{xzgldydx},
+                    </if>
+                    <if test ='null != xzgldydxGzms'>
+                    #{xzgldydxGzms},
+                    </if>
+                    <if test ='null != dxztlh'>
+                    #{dxztlh},
+                    </if>
+                    <if test ='null != dxztlhGzms'>
+                    #{dxztlhGzms},
+                    </if>
+                    <if test ='null != czjj'>
+                    #{czjj},
+                    </if>
+                    <if test ='null != lgzzgc'>
+                    #{lgzzgc},
+                    </if>
+                    <if test ='null != gzyfzgc'>
+                    #{gzyfzgc},
+                    </if>
+                    <if test ='null != wxj'>
+                    #{wxj},
+                    </if>
+                    <if test ='null != wxjGzms'>
+                    #{wxjGzms},
+                    </if>
+                    <if test ='null != hddxxjzt'>
+                    #{hddxxjzt},
+                    </if>
+                    <if test ='null != hddxxjztGzms'>
+                    #{hddxxjztGzms},
+                    </if>
+                    <if test ='null != jcdxzt'>
+                    #{jcdxzt},
+                    </if>
+                    <if test ='null != jcdxztGzms'>
+                    #{jcdxztGzms},
+                    </if>
+                    <if test ='null != dljxzt'>
+                    #{dljxzt},
+                    </if>
+                    <if test ='null != dljxztGzms'>
+                    #{dljxztGzms},
+                    </if>
+                    <if test ='null != sbzt'>
+                    #{sbzt},
+                    </if>
+                    <if test ='null != jcr'>
+                    #{jcr},
+                    </if>
+                    <if test ='null != ctwt'>
+                    #{ctwt},
+                    </if>
+                    <if test ='null != submitStatus'>
+                    #{submitStatus},
+                    </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>
+                    <if test ='null != userId'>
+                    #{userId}
+                    </if>
+        </trim>
+    </insert>
+
+    <delete id="delete">
+        UPDATE bus_jcb_jcxc
+        set del_flag='1'
+        WHERE id = #{id}
+    </delete>
+
+    <update id="update" parameterType="com.railway.business.catenary.domain.BusJcbJcxc">
+        UPDATE bus_jcb_jcxc
+        <set>
+                    <if test ='null != zhanqujian'>zhanqujian = #{zhanqujian},</if>
+                    <if test ='null != zhizhuhao'>zhizhuhao = #{zhizhuhao},</if>
+                    <if test ='null != xianchahao'>xianchahao = #{xianchahao},</if>
+                    <if test ='null != wendu'>wendu = #{wendu},</if>
+                    <if test ='null != jianchariqi'>jianchariqi = #{jianchariqi},</if>
+                    <if test ='null != gz1lcz'>gz1lcz = #{gz1lcz},</if>
+                    <if test ='null != gz2lcz'>gz2lcz = #{gz2lcz},</if>
+                    <if test ='null != zglcz'>zglcz = #{zglcz},</if>
+                    <if test ='null != qglcz'>qglcz = #{qglcz},</if>
+                    <if test ='null != ngj'>ngj = #{ngj},</if>
+                    <if test ='null != plz'>plz = #{plz},</if>
+                    <if test ='null != xcxzgazlg'>xcxzgazlg = #{xcxzgazlg},</if>
+                    <if test ='null != xcxzgazlgGzms'>xcxzgazlg_gzms = #{xcxzgazlgGzms},</if>
+                    <if test ='null != hdjx'>hdjx = #{hdjx},</if>
+                    <if test ='null != hdjxGzms'>hdjx_gzms = #{hdjxGzms},</if>
+                    <if test ='null != fhzzsq'>fhzzsq = #{fhzzsq},</if>
+                    <if test ='null != fhzzsqGzms'>fhzzsq_gzms = #{fhzzsqGzms},</if>
+                    <if test ='null != dqssxx'>dqssxx = #{dqssxx},</if>
+                    <if test ='null != dqssxxGzms'>dqssxx_gzms = #{dqssxxGzms},</if>
+                    <if test ='null != lswst'>lswst = #{lswst},</if>
+                    <if test ='null != lswstGzms'>lswst_gzms = #{lswstGzms},</if>
+                    <if test ='null != xzgldydx'>xzgldydx = #{xzgldydx},</if>
+                    <if test ='null != xzgldydxGzms'>xzgldydx_gzms = #{xzgldydxGzms},</if>
+                    <if test ='null != dxztlh'>dxztlh = #{dxztlh},</if>
+                    <if test ='null != dxztlhGzms'>dxztlh_gzms = #{dxztlhGzms},</if>
+                    <if test ='null != czjj'>czjj = #{czjj},</if>
+                    <if test ='null != lgzzgc'>lgzzgc = #{lgzzgc},</if>
+                    <if test ='null != gzyfzgc'>gzyfzgc = #{gzyfzgc},</if>
+                    <if test ='null != wxj'>wxj = #{wxj},</if>
+                    <if test ='null != wxjGzms'>wxj_gzms = #{wxjGzms},</if>
+                    <if test ='null != hddxxjzt'>hddxxjzt = #{hddxxjzt},</if>
+                    <if test ='null != hddxxjztGzms'>hddxxjzt_gzms = #{hddxxjztGzms},</if>
+                    <if test ='null != jcdxzt'>jcdxzt = #{jcdxzt},</if>
+                    <if test ='null != jcdxztGzms'>jcdxzt_gzms = #{jcdxztGzms},</if>
+                    <if test ='null != dljxzt'>dljxzt = #{dljxzt},</if>
+                    <if test ='null != dljxztGzms'>dljxzt_gzms = #{dljxztGzms},</if>
+                    <if test ='null != sbzt'>sbzt = #{sbzt},</if>
+                    <if test ='null != jcr'>jcr = #{jcr},</if>
+                    <if test ='null != ctwt'>ctwt = #{ctwt},</if>
+                    <if test ='null != submitStatus'>submit_status = #{submitStatus},</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>
+                    <if test ='null != userId'>user_id = #{userId}</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
+
+    <select id="getInfo" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_jcb_jcxc
+        WHERE del_flag='0' and id = #{id}
+
+    </select>
+
+    <select id="getLastRecord" resultMap="BaseResultMap">
+        SELECT
+        a.GZ1LCZ, a.GZ2LCZ, a.ZGLCZ, a.QGLCZ, a.NGJ, a.PLZ, a.CZJJ, a.LGZZGC, a.GZYFZGC
+        FROM bus_jcb_jcxc a,
+            (
+            select max(update_time) as lastTime
+            from bus_jcb_jcxc
+            WHERE user_id = #{user_id}
+            and submit_status != '0'
+            ) b
+        WHERE a.update_time = b.lastTime
+
+    </select>
+
+    <select id="getList" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_jcb_jcxc
+        <where>
+            del_flag='0'
+                <if test="zhanqujian!=null and zhanqujian!=''">
+                    and zhanqujian=#{zhanqujian}
+                </if>
+                <if test="zhizhuhao!=null and zhizhuhao!=''">
+                    and zhizhuhao=#{zhizhuhao}
+                </if>
+                <if test="xianchahao!=null and xianchahao!=''">
+                    and xianchahao=#{xianchahao}
+                </if>
+                <if test="wendu!=null and wendu!=''">
+                    and wendu=#{wendu}
+                </if>
+                <if test="jianchariqi!=null and jianchariqi!=''">
+                    and jianchariqi=#{jianchariqi}
+                </if>
+                <if test="gz1lcz!=null and gz1lcz!=''">
+                    and gz1lcz=#{gz1lcz}
+                </if>
+                <if test="gz2lcz!=null and gz2lcz!=''">
+                    and gz2lcz=#{gz2lcz}
+                </if>
+                <if test="zglcz!=null and zglcz!=''">
+                    and zglcz=#{zglcz}
+                </if>
+                <if test="qglcz!=null and qglcz!=''">
+                    and qglcz=#{qglcz}
+                </if>
+                <if test="ngj!=null and ngj!=''">
+                    and ngj=#{ngj}
+                </if>
+                <if test="plz!=null and plz!=''">
+                    and plz=#{plz}
+                </if>
+                <if test="xcxzgazlg!=null and xcxzgazlg!=''">
+                    and xcxzgazlg=#{xcxzgazlg}
+                </if>
+                <if test="xcxzgazlgGzms!=null and xcxzgazlgGzms!=''">
+                    and xcxzgazlg_gzms=#{xcxzgazlgGzms}
+                </if>
+                <if test="hdjx!=null and hdjx!=''">
+                    and hdjx=#{hdjx}
+                </if>
+                <if test="hdjxGzms!=null and hdjxGzms!=''">
+                    and hdjx_gzms=#{hdjxGzms}
+                </if>
+                <if test="fhzzsq!=null and fhzzsq!=''">
+                    and fhzzsq=#{fhzzsq}
+                </if>
+                <if test="fhzzsqGzms!=null and fhzzsqGzms!=''">
+                    and fhzzsq_gzms=#{fhzzsqGzms}
+                </if>
+                <if test="dqssxx!=null and dqssxx!=''">
+                    and dqssxx=#{dqssxx}
+                </if>
+                <if test="dqssxxGzms!=null and dqssxxGzms!=''">
+                    and dqssxx_gzms=#{dqssxxGzms}
+                </if>
+                <if test="lswst!=null and lswst!=''">
+                    and lswst=#{lswst}
+                </if>
+                <if test="lswstGzms!=null and lswstGzms!=''">
+                    and lswst_gzms=#{lswstGzms}
+                </if>
+                <if test="xzgldydx!=null and xzgldydx!=''">
+                    and xzgldydx=#{xzgldydx}
+                </if>
+                <if test="xzgldydxGzms!=null and xzgldydxGzms!=''">
+                    and xzgldydx_gzms=#{xzgldydxGzms}
+                </if>
+                <if test="dxztlh!=null and dxztlh!=''">
+                    and dxztlh=#{dxztlh}
+                </if>
+                <if test="dxztlhGzms!=null and dxztlhGzms!=''">
+                    and dxztlh_gzms=#{dxztlhGzms}
+                </if>
+                <if test="czjj!=null and czjj!=''">
+                    and czjj=#{czjj}
+                </if>
+                <if test="lgzzgc!=null and lgzzgc!=''">
+                    and lgzzgc=#{lgzzgc}
+                </if>
+                <if test="gzyfzgc!=null and gzyfzgc!=''">
+                    and gzyfzgc=#{gzyfzgc}
+                </if>
+                <if test="wxj!=null and wxj!=''">
+                    and wxj=#{wxj}
+                </if>
+                <if test="wxjGzms!=null and wxjGzms!=''">
+                    and wxj_gzms=#{wxjGzms}
+                </if>
+                <if test="hddxxjzt!=null and hddxxjzt!=''">
+                    and hddxxjzt=#{hddxxjzt}
+                </if>
+                <if test="hddxxjztGzms!=null and hddxxjztGzms!=''">
+                    and hddxxjzt_gzms=#{hddxxjztGzms}
+                </if>
+                <if test="jcdxzt!=null and jcdxzt!=''">
+                    and jcdxzt=#{jcdxzt}
+                </if>
+                <if test="jcdxztGzms!=null and jcdxztGzms!=''">
+                    and jcdxzt_gzms=#{jcdxztGzms}
+                </if>
+                <if test="dljxzt!=null and dljxzt!=''">
+                    and dljxzt=#{dljxzt}
+                </if>
+                <if test="dljxztGzms!=null and dljxztGzms!=''">
+                    and dljxzt_gzms=#{dljxztGzms}
+                </if>
+                <if test="sbzt!=null and sbzt!=''">
+                    and sbzt=#{sbzt}
+                </if>
+                <if test="jcr!=null and jcr!=''">
+                    and jcr=#{jcr}
+                </if>
+                <if test="ctwt!=null and ctwt!=''">
+                    and ctwt=#{ctwt}
+                </if>
+                <if test="submitStatus!=null and submitStatus!=''">
+                    and submit_status=#{submitStatus}
+                </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>
+                <if test="userId!=null and userId!=''">
+                    and user_id=#{userId}
+                </if>
+        </where>
+    </select>
+
+</mapper>

railway-business/src/main/resources/mapper/business/BusJcbQmjcjlMapper.xml

@@ -0,0 +1,320 @@
+<?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.BusJcbQmjcjlMapper">
+
+    <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusJcbQmjcjl">
+                <result column="id" property="id"/>
+                <result column="qj" property="qj"/>
+                <result column="zzh" property="zzh"/>
+                <result column="qxly" property="qxly"/>
+                <result column="wz" property="wz"/>
+                <result column="qxnr" property="qxnr"/>
+                <result column="qxdj" property="qxdj"/>
+                <result column="clcs" property="clcs"/>
+                <result column="xhzt" property="xhzt"/>
+                <result column="whby" property="whby"/>
+                <result column="jyqs" property="jyqs"/>
+                <result column="sbzt" property="sbzt"/>
+                <result column="czr" property="czr"/>
+                <result column="gzldr" property="gzldr"/>
+                <result column="ysr" property="ysr"/>
+                <result column="rq" property="rq"/>
+                <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,
+                qj,
+                zzh,
+                qxly,
+                wz,
+                qxnr,
+                qxdj,
+                clcs,
+                xhzt,
+                whby,
+                jyqs,
+                sbzt,
+                czr,
+                gzldr,
+                ysr,
+                rq,
+                remark,
+                submit_state,
+                del_flag,
+                create_by,
+                create_time,
+                update_by,
+                update_time
+    </sql>
+
+    <insert id="insert" parameterType="com.railway.business.catenary.domain.BusJcbQmjcjl">
+        <selectKey keyProperty="id" order="BEFORE" resultType="String">
+            select replace(uuid(), '-', '') from dual
+        </selectKey>
+        INSERT INTO bus_jcb_qmjcjl
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test ='null != qj'>
+                    qj,
+                    </if>
+                    <if test ='null != zzh'>
+                    zzh,
+                    </if>
+                    <if test ='null != qxly'>
+                    qxly,
+                    </if>
+                    <if test ='null != wz'>
+                    wz,
+                    </if>
+                    <if test ='null != qxnr'>
+                    qxnr,
+                    </if>
+                    <if test ='null != qxdj'>
+                    qxdj,
+                    </if>
+                    <if test ='null != clcs'>
+                    clcs,
+                    </if>
+                    <if test ='null != xhzt'>
+                    xhzt,
+                    </if>
+                    <if test ='null != whby'>
+                    whby,
+                    </if>
+                    <if test ='null != jyqs'>
+                    jyqs,
+                    </if>
+                    <if test ='null != sbzt'>
+                    sbzt,
+                    </if>
+                    <if test ='null != czr'>
+                    czr,
+                    </if>
+                    <if test ='null != gzldr'>
+                    gzldr,
+                    </if>
+                    <if test ='null != ysr'>
+                    ysr,
+                    </if>
+                    <if test ='null != rq'>
+                    rq,
+                    </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 != qj'>
+                    #{qj},
+                    </if>
+                    <if test ='null != zzh'>
+                    #{zzh},
+                    </if>
+                    <if test ='null != qxly'>
+                    #{qxly},
+                    </if>
+                    <if test ='null != wz'>
+                    #{wz},
+                    </if>
+                    <if test ='null != qxnr'>
+                    #{qxnr},
+                    </if>
+                    <if test ='null != qxdj'>
+                    #{qxdj},
+                    </if>
+                    <if test ='null != clcs'>
+                    #{clcs},
+                    </if>
+                    <if test ='null != xhzt'>
+                    #{xhzt},
+                    </if>
+                    <if test ='null != whby'>
+                    #{whby},
+                    </if>
+                    <if test ='null != jyqs'>
+                    #{jyqs},
+                    </if>
+                    <if test ='null != sbzt'>
+                    #{sbzt},
+                    </if>
+                    <if test ='null != czr'>
+                    #{czr},
+                    </if>
+                    <if test ='null != gzldr'>
+                    #{gzldr},
+                    </if>
+                    <if test ='null != ysr'>
+                    #{ysr},
+                    </if>
+                    <if test ='null != rq'>
+                    #{rq},
+                    </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_jcb_qmjcjl
+        set del_flag='1'
+        WHERE id = #{id}
+    </delete>
+
+    <update id="update" parameterType="com.railway.business.catenary.domain.BusJcbQmjcjl">
+        UPDATE bus_jcb_qmjcjl
+        <set>
+                    <if test ='null != qj'>qj = #{qj},</if>
+                    <if test ='null != zzh'>zzh = #{zzh},</if>
+                    <if test ='null != qxly'>qxly = #{qxly},</if>
+                    <if test ='null != wz'>wz = #{wz},</if>
+                    <if test ='null != qxnr'>qxnr = #{qxnr},</if>
+                    <if test ='null != qxdj'>qxdj = #{qxdj},</if>
+                    <if test ='null != clcs'>clcs = #{clcs},</if>
+                    <if test ='null != xhzt'>xhzt = #{xhzt},</if>
+                    <if test ='null != whby'>whby = #{whby},</if>
+                    <if test ='null != jyqs'>jyqs = #{jyqs},</if>
+                    <if test ='null != sbzt'>sbzt = #{sbzt},</if>
+                    <if test ='null != czr'>czr = #{czr},</if>
+                    <if test ='null != gzldr'>gzldr = #{gzldr},</if>
+                    <if test ='null != ysr'>ysr = #{ysr},</if>
+                    <if test ='null != rq'>rq = #{rq},</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_jcb_qmjcjl
+        WHERE del_flag='0' and id = #{id}
+
+    </select>
+
+    <select id="getList" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_jcb_qmjcjl
+        <where>
+            del_flag='0'
+                <if test="qj!=null and qj!=''">
+                    and qj=#{qj}
+                </if>
+                <if test="zzh!=null and zzh!=''">
+                    and zzh=#{zzh}
+                </if>
+                <if test="qxly!=null and qxly!=''">
+                    and qxly=#{qxly}
+                </if>
+                <if test="wz!=null and wz!=''">
+                    and wz=#{wz}
+                </if>
+                <if test="qxnr!=null and qxnr!=''">
+                    and qxnr=#{qxnr}
+                </if>
+                <if test="qxdj!=null and qxdj!=''">
+                    and qxdj=#{qxdj}
+                </if>
+                <if test="clcs!=null and clcs!=''">
+                    and clcs=#{clcs}
+                </if>
+                <if test="xhzt!=null and xhzt!=''">
+                    and xhzt=#{xhzt}
+                </if>
+                <if test="whby!=null and whby!=''">
+                    and whby=#{whby}
+                </if>
+                <if test="jyqs!=null and jyqs!=''">
+                    and jyqs=#{jyqs}
+                </if>
+                <if test="sbzt!=null and sbzt!=''">
+                    and sbzt=#{sbzt}
+                </if>
+                <if test="czr!=null and czr!=''">
+                    and czr=#{czr}
+                </if>
+                <if test="gzldr!=null and gzldr!=''">
+                    and gzldr=#{gzldr}
+                </if>
+                <if test="ysr!=null and ysr!=''">
+                    and ysr=#{ysr}
+                </if>
+                <if test="rq!=null and rq!=''">
+                    and rq=#{rq}
+                </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>

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

@@ -0,0 +1,536 @@
+<?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.BusJcbWjcxcMapper">
+
+    <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusJcbWjcxc">
+                <result column="id" property="id"/>
+                <result column="zhanqujian" property="zhanqujian"/>
+                <result column="zhizhuhao" property="zhizhuhao"/>
+                <result column="xianchahao" property="xianchahao"/>
+                <result column="wendu" property="wendu"/>
+                <result column="jianchariqi" property="jianchariqi"/>
+                <result column="lbjzt" property="lbjzt"/>
+                <result column="lbjzt_gzms" property="lbjztGzms"/>
+                <result column="zxlcz" property="zxlcz"/>
+                <result column="zxdg" property="zxdg"/>
+                <result column="cxlcz" property="cxlcz"/>
+                <result column="cxdg" property="cxdg"/>
+                <result column="hdxjzt" property="hdxjzt"/>
+                <result column="hdxjzt_gzms" property="hdxjztGzms"/>
+                <result column="zxwxjq" property="zxwxjq"/>
+                <result column="cxwxjq" property="cxwxjq"/>
+                <result column="dljzt" property="dljzt"/>
+                <result column="dljzt_gzms" property="dljztGzms"/>
+                <result column="azzxlcz" property="azzxlcz"/>
+                <result column="azzxdg" property="azzxdg"/>
+                <result column="azcxlcz" property="azcxlcz"/>
+                <result column="azcxdg" property="azcxdg"/>
+                <result column="bzzxlcz" property="bzzxlcz"/>
+                <result column="bzzxdg" property="bzzxdg"/>
+                <result column="bzcxlcz" property="bzcxlcz"/>
+                <result column="bzcxdg" property="bzcxdg"/>
+                <result column="czzxlcz" property="czzxlcz"/>
+                <result column="czzxdg" property="czzxdg"/>
+                <result column="czcxlcz" property="czcxlcz"/>
+                <result column="czcxdg" property="czcxdg"/>
+                <result column="sbzt" property="sbzt"/>
+                <result column="jcr" property="jcr"/>
+                <result column="ctwt" property="ctwt"/>
+                <result column="submit_status" property="submitStatus"/>
+                <result column="create_by" property="createBy"/>
+                <result column="create_time" property="createTime"/>
+                <result column="update_by" property="updateBy"/>
+                <result column="update_time" property="updateTime"/>
+                <result column="user_id" property="userId"/>
+                <result column="del_flag" property="delFlag"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+                id,
+                zhanqujian,
+                zhizhuhao,
+                xianchahao,
+                wendu,
+                jianchariqi,
+                lbjzt,
+                lbjzt_gzms,
+                zxlcz,
+                zxdg,
+                cxlcz,
+                cxdg,
+                hdxjzt,
+                hdxjzt_gzms,
+                zxwxjq,
+                cxwxjq,
+                dljzt,
+                dljzt_gzms,
+                azzxlcz,
+                azzxdg,
+                azcxlcz,
+                azcxdg,
+                bzzxlcz,
+                bzzxdg,
+                bzcxlcz,
+                bzcxdg,
+                czzxlcz,
+                czzxdg,
+                czcxlcz,
+                czcxdg,
+                sbzt,
+                jcr,
+                ctwt,
+                submit_status,
+                create_by,
+                create_time,
+                update_by,
+                update_time,
+                user_id,
+                del_flag
+    </sql>
+
+    <insert id="insert" parameterType="com.railway.business.catenary.domain.BusJcbWjcxc">
+        INSERT INTO bus_jcb_wjcxc
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test ='null != zhanqujian'>
+                    zhanqujian,
+                    </if>
+                    <if test ='null != zhizhuhao'>
+                    zhizhuhao,
+                    </if>
+                    <if test ='null != xianchahao'>
+                    xianchahao,
+                    </if>
+                    <if test ='null != wendu'>
+                    wendu,
+                    </if>
+                    <if test ='null != jianchariqi'>
+                    jianchariqi,
+                    </if>
+                    <if test ='null != lbjzt'>
+                    lbjzt,
+                    </if>
+                    <if test ='null != lbjztGzms'>
+                    lbjzt_gzms,
+                    </if>
+                    <if test ='null != zxlcz'>
+                    zxlcz,
+                    </if>
+                    <if test ='null != zxdg'>
+                    zxdg,
+                    </if>
+                    <if test ='null != cxlcz'>
+                    cxlcz,
+                    </if>
+                    <if test ='null != cxdg'>
+                    cxdg,
+                    </if>
+                    <if test ='null != hdxjzt'>
+                    hdxjzt,
+                    </if>
+                    <if test ='null != hdxjztGzms'>
+                    hdxjzt_gzms,
+                    </if>
+                    <if test ='null != zxwxjq'>
+                    zxwxjq,
+                    </if>
+                    <if test ='null != cxwxjq'>
+                    cxwxjq,
+                    </if>
+                    <if test ='null != dljzt'>
+                    dljzt,
+                    </if>
+                    <if test ='null != dljztGzms'>
+                    dljzt_gzms,
+                    </if>
+                    <if test ='null != azzxlcz'>
+                    azzxlcz,
+                    </if>
+                    <if test ='null != azzxdg'>
+                    azzxdg,
+                    </if>
+                    <if test ='null != azcxlcz'>
+                    azcxlcz,
+                    </if>
+                    <if test ='null != azcxdg'>
+                    azcxdg,
+                    </if>
+                    <if test ='null != bzzxlcz'>
+                    bzzxlcz,
+                    </if>
+                    <if test ='null != bzzxdg'>
+                    bzzxdg,
+                    </if>
+                    <if test ='null != bzcxlcz'>
+                    bzcxlcz,
+                    </if>
+                    <if test ='null != bzcxdg'>
+                    bzcxdg,
+                    </if>
+                    <if test ='null != czzxlcz'>
+                    czzxlcz,
+                    </if>
+                    <if test ='null != czzxdg'>
+                    czzxdg,
+                    </if>
+                    <if test ='null != czcxlcz'>
+                    czcxlcz,
+                    </if>
+                    <if test ='null != czcxdg'>
+                    czcxdg,
+                    </if>
+                    <if test ='null != sbzt'>
+                    sbzt,
+                    </if>
+                    <if test ='null != jcr'>
+                    jcr,
+                    </if>
+                    <if test ='null != ctwt'>
+                    ctwt,
+                    </if>
+                    <if test ='null != submitStatus'>
+                    submit_status,
+                    </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>
+                    <if test ='null != userId'>
+                    user_id,
+                    </if>
+                    <if test ='null != delFlag'>
+                    del_flag
+                    </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                    <if test ='null != zhanqujian'>
+                    #{zhanqujian},
+                    </if>
+                    <if test ='null != zhizhuhao'>
+                    #{zhizhuhao},
+                    </if>
+                    <if test ='null != xianchahao'>
+                    #{xianchahao},
+                    </if>
+                    <if test ='null != wendu'>
+                    #{wendu},
+                    </if>
+                    <if test ='null != jianchariqi'>
+                    #{jianchariqi},
+                    </if>
+                    <if test ='null != lbjzt'>
+                    #{lbjzt},
+                    </if>
+                    <if test ='null != lbjztGzms'>
+                    #{lbjztGzms},
+                    </if>
+                    <if test ='null != zxlcz'>
+                    #{zxlcz},
+                    </if>
+                    <if test ='null != zxdg'>
+                    #{zxdg},
+                    </if>
+                    <if test ='null != cxlcz'>
+                    #{cxlcz},
+                    </if>
+                    <if test ='null != cxdg'>
+                    #{cxdg},
+                    </if>
+                    <if test ='null != hdxjzt'>
+                    #{hdxjzt},
+                    </if>
+                    <if test ='null != hdxjztGzms'>
+                    #{hdxjztGzms},
+                    </if>
+                    <if test ='null != zxwxjq'>
+                    #{zxwxjq},
+                    </if>
+                    <if test ='null != cxwxjq'>
+                    #{cxwxjq},
+                    </if>
+                    <if test ='null != dljzt'>
+                    #{dljzt},
+                    </if>
+                    <if test ='null != dljztGzms'>
+                    #{dljztGzms},
+                    </if>
+                    <if test ='null != azzxlcz'>
+                    #{azzxlcz},
+                    </if>
+                    <if test ='null != azzxdg'>
+                    #{azzxdg},
+                    </if>
+                    <if test ='null != azcxlcz'>
+                    #{azcxlcz},
+                    </if>
+                    <if test ='null != azcxdg'>
+                    #{azcxdg},
+                    </if>
+                    <if test ='null != bzzxlcz'>
+                    #{bzzxlcz},
+                    </if>
+                    <if test ='null != bzzxdg'>
+                    #{bzzxdg},
+                    </if>
+                    <if test ='null != bzcxlcz'>
+                    #{bzcxlcz},
+                    </if>
+                    <if test ='null != bzcxdg'>
+                    #{bzcxdg},
+                    </if>
+                    <if test ='null != czzxlcz'>
+                    #{czzxlcz},
+                    </if>
+                    <if test ='null != czzxdg'>
+                    #{czzxdg},
+                    </if>
+                    <if test ='null != czcxlcz'>
+                    #{czcxlcz},
+                    </if>
+                    <if test ='null != czcxdg'>
+                    #{czcxdg},
+                    </if>
+                    <if test ='null != sbzt'>
+                    #{sbzt},
+                    </if>
+                    <if test ='null != jcr'>
+                    #{jcr},
+                    </if>
+                    <if test ='null != ctwt'>
+                    #{ctwt},
+                    </if>
+                    <if test ='null != submitStatus'>
+                    #{submitStatus},
+                    </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>
+                    <if test ='null != userId'>
+                    #{userId},
+                    </if>
+                    <if test ='null != delFlag'>
+                    #{delFlag}
+                    </if>
+        </trim>
+    </insert>
+
+    <delete id="delete">
+        UPDATE bus_jcb_wjcxc
+        set del_flag='1'
+        WHERE id = #{id}
+    </delete>
+
+    <update id="update" parameterType="com.railway.business.catenary.domain.BusJcbWjcxc">
+        UPDATE bus_jcb_wjcxc
+        <set>
+                    <if test ='null != zhanqujian'>zhanqujian = #{zhanqujian},</if>
+                    <if test ='null != zhizhuhao'>zhizhuhao = #{zhizhuhao},</if>
+                    <if test ='null != xianchahao'>xianchahao = #{xianchahao},</if>
+                    <if test ='null != wendu'>wendu = #{wendu},</if>
+                    <if test ='null != jianchariqi'>jianchariqi = #{jianchariqi},</if>
+                    <if test ='null != lbjzt'>lbjzt = #{lbjzt},</if>
+                    <if test ='null != lbjztGzms'>lbjzt_gzms = #{lbjztGzms},</if>
+                    <if test ='null != zxlcz'>zxlcz = #{zxlcz},</if>
+                    <if test ='null != zxdg'>zxdg = #{zxdg},</if>
+                    <if test ='null != cxlcz'>cxlcz = #{cxlcz},</if>
+                    <if test ='null != cxdg'>cxdg = #{cxdg},</if>
+                    <if test ='null != hdxjzt'>hdxjzt = #{hdxjzt},</if>
+                    <if test ='null != hdxjztGzms'>hdxjzt_gzms = #{hdxjztGzms},</if>
+                    <if test ='null != zxwxjq'>zxwxjq = #{zxwxjq},</if>
+                    <if test ='null != cxwxjq'>cxwxjq = #{cxwxjq},</if>
+                    <if test ='null != dljzt'>dljzt = #{dljzt},</if>
+                    <if test ='null != dljztGzms'>dljzt_gzms = #{dljztGzms},</if>
+                    <if test ='null != azzxlcz'>azzxlcz = #{azzxlcz},</if>
+                    <if test ='null != azzxdg'>azzxdg = #{azzxdg},</if>
+                    <if test ='null != azcxlcz'>azcxlcz = #{azcxlcz},</if>
+                    <if test ='null != azcxdg'>azcxdg = #{azcxdg},</if>
+                    <if test ='null != bzzxlcz'>bzzxlcz = #{bzzxlcz},</if>
+                    <if test ='null != bzzxdg'>bzzxdg = #{bzzxdg},</if>
+                    <if test ='null != bzcxlcz'>bzcxlcz = #{bzcxlcz},</if>
+                    <if test ='null != bzcxdg'>bzcxdg = #{bzcxdg},</if>
+                    <if test ='null != czzxlcz'>czzxlcz = #{czzxlcz},</if>
+                    <if test ='null != czzxdg'>czzxdg = #{czzxdg},</if>
+                    <if test ='null != czcxlcz'>czcxlcz = #{czcxlcz},</if>
+                    <if test ='null != czcxdg'>czcxdg = #{czcxdg},</if>
+                    <if test ='null != sbzt'>sbzt = #{sbzt},</if>
+                    <if test ='null != jcr'>jcr = #{jcr},</if>
+                    <if test ='null != ctwt'>ctwt = #{ctwt},</if>
+                    <if test ='null != submitStatus'>submit_status = #{submitStatus},</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>
+                    <if test ='null != userId'>user_id = #{userId},</if>
+                    <if test ='null != delFlag'>del_flag = #{delFlag}</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
+
+    <select id="getInfo" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_jcb_wjcxc
+        WHERE del_flag='0' and id = #{id}
+
+    </select>
+
+    <select id="getLastRecord" resultMap="BaseResultMap">
+        SELECT
+        a.ZXLCZ, a.ZXDG, a.CXLCZ, a.CXDG, a.ZXWXJQ, a.CXWXJQ, a.AZZXLCZ, a.AZZXDG, a.AZCXLCZ, a.AZCXDG,
+        a.BZZXLCZ, a.BZZXDG, a.BZCXLCZ, a.BZCXDG,a.CZZXLCZ, a.CZZXDG, a.CZCXLCZ, a.CZCXDG
+        FROM bus_jcb_wjcxc a,
+            (
+            select max(update_time) as lastTime
+            from bus_jcb_wjcxc
+            WHERE user_id = #{user_id}
+            and submit_status != '0'
+            ) b
+        WHERE a.update_time = b.lastTime
+
+    </select>
+
+    <select id="getList" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_jcb_wjcxc
+        <where>
+            del_flag='0'
+                <if test="zhanqujian!=null and zhanqujian!=''">
+                    and zhanqujian=#{zhanqujian}
+                </if>
+                <if test="zhizhuhao!=null and zhizhuhao!=''">
+                    and zhizhuhao=#{zhizhuhao}
+                </if>
+                <if test="xianchahao!=null and xianchahao!=''">
+                    and xianchahao=#{xianchahao}
+                </if>
+                <if test="wendu!=null and wendu!=''">
+                    and wendu=#{wendu}
+                </if>
+                <if test="jianchariqi!=null and jianchariqi!=''">
+                    and jianchariqi=#{jianchariqi}
+                </if>
+                <if test="lbjzt!=null and lbjzt!=''">
+                    and lbjzt=#{lbjzt}
+                </if>
+                <if test="lbjztGzms!=null and lbjztGzms!=''">
+                    and lbjzt_gzms=#{lbjztGzms}
+                </if>
+                <if test="zxlcz!=null and zxlcz!=''">
+                    and zxlcz=#{zxlcz}
+                </if>
+                <if test="zxdg!=null and zxdg!=''">
+                    and zxdg=#{zxdg}
+                </if>
+                <if test="cxlcz!=null and cxlcz!=''">
+                    and cxlcz=#{cxlcz}
+                </if>
+                <if test="cxdg!=null and cxdg!=''">
+                    and cxdg=#{cxdg}
+                </if>
+                <if test="hdxjzt!=null and hdxjzt!=''">
+                    and hdxjzt=#{hdxjzt}
+                </if>
+                <if test="hdxjztGzms!=null and hdxjztGzms!=''">
+                    and hdxjzt_gzms=#{hdxjztGzms}
+                </if>
+                <if test="zxwxjq!=null and zxwxjq!=''">
+                    and zxwxjq=#{zxwxjq}
+                </if>
+                <if test="cxwxjq!=null and cxwxjq!=''">
+                    and cxwxjq=#{cxwxjq}
+                </if>
+                <if test="dljzt!=null and dljzt!=''">
+                    and dljzt=#{dljzt}
+                </if>
+                <if test="dljztGzms!=null and dljztGzms!=''">
+                    and dljzt_gzms=#{dljztGzms}
+                </if>
+                <if test="azzxlcz!=null and azzxlcz!=''">
+                    and azzxlcz=#{azzxlcz}
+                </if>
+                <if test="azzxdg!=null and azzxdg!=''">
+                    and azzxdg=#{azzxdg}
+                </if>
+                <if test="azcxlcz!=null and azcxlcz!=''">
+                    and azcxlcz=#{azcxlcz}
+                </if>
+                <if test="azcxdg!=null and azcxdg!=''">
+                    and azcxdg=#{azcxdg}
+                </if>
+                <if test="bzzxlcz!=null and bzzxlcz!=''">
+                    and bzzxlcz=#{bzzxlcz}
+                </if>
+                <if test="bzzxdg!=null and bzzxdg!=''">
+                    and bzzxdg=#{bzzxdg}
+                </if>
+                <if test="bzcxlcz!=null and bzcxlcz!=''">
+                    and bzcxlcz=#{bzcxlcz}
+                </if>
+                <if test="bzcxdg!=null and bzcxdg!=''">
+                    and bzcxdg=#{bzcxdg}
+                </if>
+                <if test="czzxlcz!=null and czzxlcz!=''">
+                    and czzxlcz=#{czzxlcz}
+                </if>
+                <if test="czzxdg!=null and czzxdg!=''">
+                    and czzxdg=#{czzxdg}
+                </if>
+                <if test="czcxlcz!=null and czcxlcz!=''">
+                    and czcxlcz=#{czcxlcz}
+                </if>
+                <if test="czcxdg!=null and czcxdg!=''">
+                    and czcxdg=#{czcxdg}
+                </if>
+                <if test="sbzt!=null and sbzt!=''">
+                    and sbzt=#{sbzt}
+                </if>
+                <if test="jcr!=null and jcr!=''">
+                    and jcr=#{jcr}
+                </if>
+                <if test="ctwt!=null and ctwt!=''">
+                    and ctwt=#{ctwt}
+                </if>
+                <if test="submitStatus!=null and submitStatus!=''">
+                    and submit_status=#{submitStatus}
+                </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>
+                <if test="userId!=null and userId!=''">
+                    and user_id=#{userId}
+                </if>
+                <if test="delFlag!=null and delFlag!=''">
+                    and del_flag=#{delFlag}
+                </if>
+        </where>
+    </select>
+
+</mapper>