分段绝缘器添加审核状态

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

@@ -70,4 +70,25 @@ public class BusJcbFdfxjyqController extends BaseController {
         return ajax;
     }
 
+    @ApiOperation(value = "提交")
+    @PutMapping("/submit")
+    public AjaxResult submit(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) {
+        busJcbFdfxjyq.setUpdateBy(getUsername());
+        return toAjax(busJcbFdfxjyqService.submit(busJcbFdfxjyq));
+    }
+
+    @ApiOperation(value = "退回")
+    @PutMapping("/reject")
+    public AjaxResult reject(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) {
+        busJcbFdfxjyq.setUpdateBy(getUsername());
+        return toAjax(busJcbFdfxjyqService.reject(busJcbFdfxjyq));
+    }
+
+    @ApiOperation(value = "确认")
+    @PutMapping("/confirm")
+    public AjaxResult confirm(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) {
+        busJcbFdfxjyq.setUpdateBy(getUsername());
+        return toAjax(busJcbFdfxjyqService.confirm(busJcbFdfxjyq));
+    }
+
 }

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

@@ -162,9 +162,9 @@ public class BusJcbFdfxjyq extends BaseEntity{
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
-    @ApiModelProperty(value = "保存状态，1-保存 ，2-提交")
-    @Length(min = 1, max = 1, message = "【保存状态，1-保存 ，2-提交】长度必须介于 {min} 和 {max} 之间")
-    private String saveFlag;
+    @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} 之间")

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

@@ -1,6 +1,8 @@
 package com.railway.business.catenary.service;
 
 import com.railway.business.catenary.domain.BusJcbFdfxjyq;
+import com.railway.business.catenary.domain.BusJcbGlkg;
+
 import java.util.List;
 /**
 * dxf分选绝缘器检查表 
@@ -39,4 +41,25 @@ public interface IBusJcbFdfxjyqService{
     */
     BusJcbFdfxjyq getLastOne(BusJcbFdfxjyq busJcbFdfxjyq);
 
+    /**
+     * 提交
+     * @param busJcbFdfxjyq
+     * @return
+     */
+    int submit(BusJcbFdfxjyq busJcbFdfxjyq);
+
+    /**
+     * 退回
+     * @param busJcbFdfxjyq
+     * @return
+     */
+    int reject(BusJcbFdfxjyq busJcbFdfxjyq);
+
+    /**
+     * 确认
+     * @param busJcbFdfxjyq
+     * @return
+     */
+    int confirm(BusJcbFdfxjyq busJcbFdfxjyq);
+
 }

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

@@ -2,6 +2,8 @@ package com.railway.business.catenary.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.railway.business.catenary.domain.BusJcbGlkg;
+import com.railway.business.catenary.enums.TestTableStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbFdfxjyqMapper;
 import com.railway.business.catenary.domain.BusJcbFdfxjyq;
 import com.railway.business.catenary.service.IBusJcbFdfxjyqService;
@@ -74,4 +76,44 @@ private BusJcbFdfxjyqMapper busJcbFdfxjyqMapper;
 	public BusJcbFdfxjyq getLastOne(BusJcbFdfxjyq busJcbFdfxjyq) {
 		return busJcbFdfxjyqMapper.getLastOne(busJcbFdfxjyq);
 	}
+
+	/**
+	 * 提交
+	 * @param busJcbFdfxjyq
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int submit(BusJcbFdfxjyq busJcbFdfxjyq) {
+		busJcbFdfxjyq.setUpdateTime(new Date());
+		busJcbFdfxjyq.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
+		return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
+	}
+
+	/**
+	 * 退回
+	 * @param busJcbFdfxjyq
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int reject(BusJcbFdfxjyq busJcbFdfxjyq) {
+		busJcbFdfxjyq.setUpdateTime(new Date());
+		busJcbFdfxjyq.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
+		return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
+	}
+
+	/**
+	 * 确认
+	 * @param busJcbFdfxjyq
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int confirm(BusJcbFdfxjyq busJcbFdfxjyq) {
+		busJcbFdfxjyq.setUpdateTime(new Date());
+		busJcbFdfxjyq.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
+		return busJcbFdfxjyqMapper.update(busJcbFdfxjyq);
+	}
+
 }

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

@@ -44,7 +44,7 @@
                 <result column="create_time" property="createTime"/>
                 <result column="update_by" property="updateBy"/>
                 <result column="update_time" property="updateTime"/>
-                <result column="save_flag" property="saveFlag"/>
+                <result column="submit_state" property="submitState"/>
                 <result column="del_flag" property="delFlag"/>
     </resultMap>
 
@@ -89,14 +89,11 @@
                 create_time,
                 update_by,
                 update_time,
-                save_flag,
+                submit_state,
                 del_flag
     </sql>
 
     <insert id="insert" parameterType="com.railway.business.catenary.domain.BusJcbFdfxjyq">
-        <selectKey keyProperty="id" order="BEFORE" resultType="String">
-            select replace(uuid(), '-', '') from dual
-        </selectKey>
         INSERT INTO bus_jcb_fdfxjyq
         <trim prefix="(" suffix=")" suffixOverrides=",">
                     <if test ='null != fdfxjyqId'>
@@ -216,8 +213,8 @@
                     <if test ='null != updateTime'>
                     update_time,
                     </if>
-                    <if test ='null != saveFlag'>
-                    save_flag,
+                    <if test ='null != submitState'>
+                        submit_state,
                     </if>
                     <if test ='null != delFlag'>
                     del_flag
@@ -341,8 +338,8 @@
                     <if test ='null != updateTime'>
                     #{updateTime},
                     </if>
-                    <if test ='null != saveFlag'>
-                    #{saveFlag},
+                    <if test ='null != submitState'>
+                    #{submitState},
                     </if>
                     <if test ='null != delFlag'>
                     #{delFlag}
@@ -398,7 +395,7 @@
                     <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 != saveFlag'>save_flag = #{saveFlag},</if>
+                    <if test ='null != submitState'>submit_state = #{submitState},</if>
                     <if test ='null != delFlag'>del_flag = #{delFlag}</if>
         </set>
         WHERE id = #{id}
@@ -536,8 +533,8 @@
                 <if test="updateTime!=null and updateTime!=''">
                     and update_time=#{updateTime}
                 </if>
-                <if test="saveFlag!=null and saveFlag!=''">
-                    and save_flag=#{saveFlag}
+                <if test="submitState!=null and submitState!=''">
+                    and submit_state=#{submitState}
                 </if>
                 <if test="delFlag!=null and delFlag!=''">
                     and del_flag=#{delFlag}