Explorar el Código

评价管理调整

dzx hace 1 semana
padre
commit
988b5b51ec

+ 1 - 1
src/main/java/com/xjrsoft/module/evaluate/dto/AddEvaluateResultDto.java

@@ -35,6 +35,6 @@ public class AddEvaluateResultDto implements Serializable {
     private String opinion;
 
     @ApiModelProperty("选项")
-    private String option;
+    private String optionContent;
 
 }

+ 1 - 1
src/main/java/com/xjrsoft/module/evaluate/entity/EvaluateResult.java

@@ -106,5 +106,5 @@ public class EvaluateResult implements Serializable {
     private String submitRecordId;
 
     @ApiModelProperty("选项内容")
-    private String optionJson;
+    private String optionContent;
 }

+ 2 - 1
src/main/resources/mapper/evaluate/EvaluateManageMapper.xml

@@ -174,7 +174,8 @@
                t2.opinion,
                t1.input_not_null,
                t1.option_json,
-            t2.option_json as option_content
+               t1.type,
+            t2.option_content
         FROM evaluate_submit_record t
                  LEFT JOIN evaluate_result t2 ON t2.submit_record_id = t.id
                  left join evaluate_manage_item t1 on t1.id = t2.evaluate_item_id