短板清单提交时要填提交原因

src/main/java/com/keymobile/indicators/model/entity/shortboard/ShortBoardTaskVal.java

@@ -10,9 +10,9 @@ import lombok.ToString;
 import java.util.Date;
 
 /**
- * @Description  
+ * @Description
  * @Author  hzc
- * @Date 2020-09-22 
+ * @Date 2020-09-22
  */
 
 @Setter
@@ -26,35 +26,35 @@ public class ShortBoardTaskVal  implements Serializable {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
-   	@Column(name = "id" )
+	@Column(name = "id" )
 	private Integer id;
 
 	/**
 	 * 短板清单id
 	 */
 	@ApiModelProperty("短板清单id")
-   	@Column(name = "short_board_task_id" )
+	@Column(name = "short_board_task_id" )
 	private Integer shortBoardTaskId;
 
 	/**
 	 * 原因分析
 	 */
 	@ApiModelProperty("原因分析")
-   	@Column(name = "analysis_causes" )
+	@Column(name = "analysis_causes" )
 	private String analysisCauses;
 
 	/**
 	 * 受理人员
 	 */
 	@ApiModelProperty("受理人员")
-   	@Column(name = "handle_user" )
+	@Column(name = "handle_user" )
 	private String handleUser;
 
 	/**
 	 * 制定措施
 	 */
 	@ApiModelProperty("制定措施")
-   	@Column(name = "create_measure" )
+	@Column(name = "create_measure" )
 	private String createMeasure;
 
 	/**
@@ -68,35 +68,35 @@ public class ShortBoardTaskVal  implements Serializable {
 	 * 执行改善措施
 	 */
 	@ApiModelProperty("执行改善措施")
-   	@Column(name = "start_measure" )
+	@Column(name = "start_measure" )
 	private String startMeasure;
 
 	/**
 	 * 执行人员
 	 */
 	@ApiModelProperty("执行人员")
-   	@Column(name = "start_user" )
+	@Column(name = "start_user" )
 	private String startUser;
 
 	/**
 	 * 创建时间
 	 */
 	@ApiModelProperty("创建时间")
-   	@Column(name = "create_time" )
+	@Column(name = "create_time" )
 	private Date createTime;
 
 	/**
 	 * 更新时间
 	 */
 	@ApiModelProperty("更新时间")
-   	@Column(name = "update_time" )
+	@Column(name = "update_time" )
 	private Date updateTime;
 
 	/**
 	 * 更新人
 	 */
 	@ApiModelProperty("更新人")
-   	@Column(name = "updater" )
+	@Column(name = "updater" )
 	private String updater;
 	/**
 	 * 改善后指标值
@@ -110,4 +110,11 @@ public class ShortBoardTaskVal  implements Serializable {
 	@ApiModelProperty("审核次数")
 	@Column(name="audit_count")
 	private Integer auditCount;
+
+	/**
+	 *提交意见
+	 **/
+	@Transient
+	private String description;
+
 }

src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardTaskService.java

@@ -125,14 +125,15 @@ public class ShortboardTaskService {
             //excel方法不更新短板任务清单
             return Result.genOkResult();
         }
-        ShortBoardTask shortboardTask = new ShortBoardTask();
-        shortboardTask.setUpdateTime(date);
-        shortboardTask.setUpdater(SystemUserUtil.getCurrentUser());
-        shortboardTask.setId(shortBoardTaskVal.getShortBoardTaskId());
-        shortboardTask.setStatus(Constants.SHORT_BOARD_START_IMPROVED);
-        shortboardTask.setActionRecord("已执行");
-        shortboardTaskMapper.updateByPrimaryKeySelective(shortboardTask);
-        return Result.genOkResult();
+//        ShortBoardTask shortboardTask = new ShortBoardTask();
+//        shortboardTask.setUpdateTime(date);
+//        shortboardTask.setUpdater(SystemUserUtil.getCurrentUser());
+//        shortboardTask.setId(shortBoardTaskVal.getShortBoardTaskId());
+//        shortboardTask.setStatus(Constants.SHORT_BOARD_START_IMPROVED);
+//        shortboardTask.setActionRecord("已执行");
+//        shortboardTaskMapper.updateByPrimaryKeySelective(shortboardTask);
+
+        return this.updateTaskStatus(shortBoardTaskVal.getShortBoardTaskId(),Constants.SHORT_BOARD_START_IMPROVED,shortBoardTaskVal.getDescription());
     }
 
     public ShortBoardTaskVal selectShortBoardTaskValByTaskIdId(Integer shortBoardTaskId) {