bug处理

project_data/sql/0.0.3/soc/soc.sql

@@ -422,7 +422,7 @@ ALTER TABLE  core_safetycheck_rule MODIFY COLUMN create_by varchar(255) CHARACTE
 alter table core_drill_task  modify status int default 0 null comment '任务状态:0:待登记,5:待提交,1:待签名,2待评价,3:已完成,4:已逾期';
 alter table core_drill_dictionary modify drill_type varchar(12) null comment '演练项目,字典表关联取值';
 alter table core_drill_dictionary modify drill_type_name varchar(32) null comment '演练项目名称';
-
+alter table core_drill_task modify comment varchar(2000) null comment '点评总结(登记人自评)';
 DELIMITER ??
 DROP PROCEDURE IF EXISTS schema_change ??
 	CREATE PROCEDURE schema_change () BEGIN

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/dto/CoreDrillTaskEditDto.java

@@ -42,6 +42,9 @@ public class CoreDrillTaskEditDto {
     @ApiModelProperty(value = "演练情况")
     private String drillSituation;
 
+    @ApiModelProperty(value = "点评总结")
+    private String comment;
+
     @ApiModelProperty(value = "图片")
     private String imageList;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/dto/CoreDrillTaskEvaluateDto.java

@@ -13,6 +13,6 @@ public class CoreDrillTaskEvaluateDto {
     @ApiModelProperty(value = "评分")
     private String score;
 
-    @ApiModelProperty(value = "评语")
-    private String comment;
+    /*@ApiModelProperty(value = "评语")
+    private String comment;*/
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -293,6 +293,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         coreDrillTask.setDrillSite(request.getDrillSite());
         coreDrillTask.setPresetCase(request.getPresetCase());
         coreDrillTask.setDrillSituation(request.getDrillSituation());
+        coreDrillTask.setComment(request.getComment());
         coreDrillTask.setRecorderId(SecurityUtils.getUserId());
         coreDrillTask.setImageList(request.getImageList());
         if (ObjectUtil.isNotEmpty(request.getFileList())) {
@@ -730,7 +731,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         }
         drillTask.setCommentScore(request.getScore());
         drillTask.setStatus(DrillDoStatus.DONE.getCode());
-        drillTask.setComment(request.getComment());
+       //drillTask.setComment(request.getComment());
         drillTask.setRecStatus(0);
         int i = baseMapper.updateById(drillTask);
         buildDrillTaskPdf(request.getTaskId());