change 3 vuotta sitten
vanhempi
commit
21101d70ec

+ 3 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserAddBo.java

@@ -40,9 +40,9 @@ public class InformUserAddBo {
     @ApiModelProperty("$column.columnComment")
     private Long informId;
 
-    /** 通知内容无绑定通知 */
-    @ApiModelProperty("通知内容无绑定通知")
-    private String informSystemText;
+    /** 绑定系统通知内容 */
+    @ApiModelProperty("绑定系统通知内容")
+    private Long remindId;
     /** 1系统通知 2教务通知 */
     @ApiModelProperty("1系统通知 2教务通知")
     private Integer systemStatus;

+ 3 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserEditBo.java

@@ -45,9 +45,9 @@ public class InformUserEditBo {
     @ApiModelProperty("$column.columnComment")
     private Long informId;
 
-    /** 通知内容无绑定通知 */
-    @ApiModelProperty("通知内容无绑定通知")
-    private String informSystemText;
+    /** 绑定系统通知内容 */
+    @ApiModelProperty("绑定系统通知内容")
+    private Long remindId;
     /** 1系统通知 2教务通知 */
     @ApiModelProperty("1系统通知 2教务通知")
     private Integer systemStatus;

+ 5 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserQueryBo.java

@@ -57,10 +57,12 @@ public class InformUserQueryBo extends BaseEntity {
 	@ApiModelProperty("$column.columnComment")
 	private Long informId;
 
-	/** 通知内容无绑定通知 */
-	@ApiModelProperty("通知内容无绑定通知")
-	private String informSystemText;
+
 	/** 1系统通知 2教务通知 */
 	@ApiModelProperty("1系统通知 2教务通知")
 	private Integer systemStatus;
+
+	/** 绑定系统通知内容 */
+	@ApiModelProperty("绑定系统通知内容")
+	private Long remindId;
 }

+ 2 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformUser.java

@@ -43,8 +43,8 @@ private static final long serialVersionUID=1L;
     /** $column.columnComment */
     private Long informId;
 
-    /** 通知内容无绑定通知 */
-    private String informSystemText;
+    /** 绑定系统通知内容 */
+    private Long remindId;
     /** 1系统通知 2教务通知 */
     private Integer systemStatus;
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformServiceImpl.java

@@ -156,6 +156,10 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
             InformUserAddBo informUserAddBo = new InformUserAddBo();
             informUserAddBo.setInformId(add.getInformId());
             informUserAddBo.setUserId(userId);
+            if (bo.getIssueStatus() == 1){
+                informUserAddBo.setSendTime(DateUtils.getNowTime());
+                informUserAddBo.setSendStatus(1);
+            }
             informUserAddBo.setCreateTime(DateUtils.getNowTime());
             informUserAddBo.setUpdateTime(DateUtils.getNowTime());
             iInformUserService.insertByAddBo(informUserAddBo);

+ 4 - 5
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/vo/InformUserVo.java

@@ -65,15 +65,14 @@ public class InformUserVo {
 	@ApiModelProperty("通知绑定")
 	private InformVo informVo;
 
-	/** 通知内容无绑定通知 */
-	@Excel(name = "通知内容无绑定通知")
-	@ApiModelProperty("通知内容无绑定通知")
-	private String informSystemText;
 	/** 1系统通知 2教务通知 */
 	@Excel(name = "1系统通知 2教务通知")
 	@ApiModelProperty("1系统通知 2教务通知")
 	private Integer systemStatus;
-
+	/** 绑定系统通知内容 */
+	@Excel(name = "绑定系统通知内容")
+	@ApiModelProperty("绑定系统通知内容")
+	private Long remindId;
 
 	@Excel(name = "班级名称")
 	@ApiModelProperty("班级名称")