安灯报表优化

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java

@@ -301,16 +301,9 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "组织名称")
     private String organizeNameRdd;
 
-    /**
-     * 1 = 是，2 = 否
-     */
-    @Column(name = "IS_RESOLVE")
-    @ApiParam(value = "是否驳回", example = "2")
-    private Integer isResolve;
-
-    @Column(name = "RESOLVE_OPINION")
+    @Column(name = "REJECT_OPINION")
     @ApiParam(value = "驳回意见")
-    private String resolveOpinion;
+    private String rejectOpinion;
 
     @Transient
     @ApiParam(value = "安灯状态集合")

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java

@@ -256,6 +256,14 @@ public class AndonManageRecord extends BaseBean {
     @ApiParam(value = "重要等级名称")
     private String importanceNameRdd;
 
+    @Column(name = "ORGANIZE_NAME_RDD")
+    @ApiParam(value = "组织名称")
+    private String organizeNameRdd;
+
+    @Column(name = "REJECT_OPINION")
+    @ApiParam(value = "驳回意见")
+    private String rejectOpinion;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;