【ADD】隔离开关检查表增加提交，退回，确认方法。

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

@@ -2,21 +2,17 @@ package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusJcbGlkg;
 import com.railway.business.catenary.service.IBusJcbGlkgService;
+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.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;
-import javax.websocket.server.PathParam;
+import java.util.List;
 
 @Api(value = "rest/catenary/bus/jcb/glkg", tags = "APP-隔离开关检查表")
 @RestController
@@ -29,9 +25,31 @@ public class BusJcbGlkgController extends BaseController {
     @ApiOperation(value = "新增")
     @PostMapping("/add")
     public AjaxResult add(@Validated @RequestBody BusJcbGlkg busJcbGlkg) {
+        busJcbGlkg.setCreateBy(getUsername());
         return toAjax(busJcbGlkgService.create(busJcbGlkg));
     }
 
+    @ApiOperation(value = "提交")
+    @PutMapping("/submit")
+    public AjaxResult submit(@RequestBody BusJcbGlkg busJcbGlkg) {
+        busJcbGlkg.setUpdateBy(getUsername());
+        return toAjax(busJcbGlkgService.submit(busJcbGlkg));
+    }
+
+    @ApiOperation(value = "退回")
+    @PutMapping("/reject")
+    public AjaxResult reject(@RequestBody BusJcbGlkg busJcbGlkg) {
+        busJcbGlkg.setUpdateBy(getUsername());
+        return toAjax(busJcbGlkgService.reject(busJcbGlkg));
+    }
+
+    @ApiOperation(value = "确认")
+    @PutMapping("/confirm")
+    public AjaxResult confirm(@RequestBody BusJcbGlkg busJcbGlkg) {
+        busJcbGlkg.setUpdateBy(getUsername());
+        return toAjax(busJcbGlkgService.confirm(busJcbGlkg));
+    }
+
     @ApiOperation(value = "删除")
     @DeleteMapping("/{ids}")
     public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
@@ -41,6 +59,7 @@ public class BusJcbGlkgController extends BaseController {
     @ApiOperation(value = "更新")
     @PutMapping("/update")
     public AjaxResult update(@RequestBody @Valid BusJcbGlkg busJcbGlkg) {
+        busJcbGlkg.setUpdateBy(getUsername());
         return toAjax(busJcbGlkgService.update(busJcbGlkg));
     }
 

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

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
-
-import java.util.Date;
 /**
  * 隔离开关检查表
  * @author author 2021-10-13
@@ -17,7 +15,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 public class BusJcbGlkg extends BaseEntity{
 
-    @ApiModelProperty(value = "主键", hidden = true)
+    @ApiModelProperty(value = "主键")
     private String id;
 
     @ApiModelProperty(value = "区间")

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

@@ -14,6 +14,27 @@ public interface IBusJcbGlkgService{
     */
     int create(BusJcbGlkg busJcbGlkg);
 
+    /**
+     * 提交
+     * @param busJcbGlkg
+     * @return
+     */
+    int submit(BusJcbGlkg busJcbGlkg);
+
+    /**
+     * 退回
+     * @param busJcbGlkg
+     * @return
+     */
+    int reject(BusJcbGlkg busJcbGlkg);
+
+    /**
+     * 确认
+     * @param busJcbGlkg
+     * @return
+     */
+    int confirm(BusJcbGlkg busJcbGlkg);
+
     /**
     * @Description: 删除
     */

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

@@ -27,13 +27,12 @@ private BusJcbGlkgMapper busJcbGlkgMapper;
 	/**
 	* @Description: 新增
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusJcbGlkg busJcbGlkg) {
 		Long userID = SecurityUtils.getUserId();
 		busJcbGlkg.setCreateTime(new Date());
-		busJcbGlkg.setCreateBy(String.valueOf(userID));
 		busJcbGlkg.setUpdateTime(new Date());
-		busJcbGlkg.setUpdateBy(String.valueOf(userID));
 		busJcbGlkg.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
 		if (StringUtils.isBlank(busJcbGlkg.getSubmitState())) {
 			busJcbGlkg.setSubmitState(TestTableStatusEnum.UNREPORTED.getCode());
@@ -42,9 +41,49 @@ private BusJcbGlkgMapper busJcbGlkgMapper;
 		return busJcbGlkgMapper.insert(busJcbGlkg);
 	}
 
+	/**
+	 * 提交
+	 * @param busJcbGlkg
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int submit(BusJcbGlkg busJcbGlkg) {
+		busJcbGlkg.setUpdateTime(new Date());
+		busJcbGlkg.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
+		return busJcbGlkgMapper.update(busJcbGlkg);
+	}
+
+	/**
+	 * 退回
+	 * @param busJcbGlkg
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int reject(BusJcbGlkg busJcbGlkg) {
+		busJcbGlkg.setUpdateTime(new Date());
+		busJcbGlkg.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
+		return busJcbGlkgMapper.update(busJcbGlkg);
+	}
+
+	/**
+	 * 确认
+	 * @param busJcbGlkg
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int confirm(BusJcbGlkg busJcbGlkg) {
+		busJcbGlkg.setUpdateTime(new Date());
+		busJcbGlkg.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
+		return busJcbGlkgMapper.update(busJcbGlkg);
+	}
+
 	/**
 	* @Description: 删除
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int delete(String[] ids) {
 		int r =0;
@@ -58,17 +97,18 @@ private BusJcbGlkgMapper busJcbGlkgMapper;
 	/**
 	* @Description: 更新
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusJcbGlkg busJcbGlkg) {
 		Long userID = SecurityUtils.getUserId();
 		busJcbGlkg.setUpdateTime(new Date());
-		busJcbGlkg.setUpdateBy(String.valueOf(userID));
 		return busJcbGlkgMapper.update(busJcbGlkg);
 	}
 
 	/**
 	* @Description: 获取单个
 	*/
+	@Override
 	public BusJcbGlkg getInfo(String id) {
 		return busJcbGlkgMapper.getInfo(id);
 	}
@@ -76,6 +116,7 @@ private BusJcbGlkgMapper busJcbGlkgMapper;
 	/**
 	* @Description: 查询列表
 	*/
+	@Override
 	public List<BusJcbGlkg> getList(BusJcbGlkg busJcbGlkg) {
 		return busJcbGlkgMapper.getList(busJcbGlkg);
 	}