diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/domain/Notice.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/domain/Notice.java index eccc65c3..de1b8313 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/domain/Notice.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/domain/Notice.java @@ -6,6 +6,9 @@ import com.zdxt.common.BaseDomain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.Date; +import java.util.List; + /** * 通知公告表 sys_notice * @@ -15,20 +18,39 @@ public class Notice extends BaseDomain { private static final long serialVersionUID = 1L; - /** 公告ID */ + /** 通知ID */ private String noticeId; - /** 公告标题 */ + /** 通知标题 */ private String noticeTitle; - /** 公告类型（1通知 2公告） */ - private String noticeType; + /** 发布对象（0全部 1监督端 2执法端 3 企业端） */ + private String objectType; - /** 公告内容 */ + /** 通知内容 */ private String noticeContent; /** 公告状态（0正常 1关闭） */ private String status; + /** 创建者id */ + private String createBy; + /** 创建时间 */ + private Date createTime; + /** 更新时间 */ + private Date updateTime; + /** 更新者 */ + private String updateBy; + /** 发布部门多个 */ + private String bureauDeptIds; + /** 发布部门名称多个 */ + private String bureauDeptNames; + /** 备注 */ + private String remark; + /** 发布部门名称列表 */ + private List bureauDeptNameList; + private String beginTime; + private String endTime; + public String getNoticeId() { @@ -52,14 +74,12 @@ public class Notice extends BaseDomain return noticeTitle; } - public void setNoticeType(String noticeType) - { - this.noticeType = noticeType; + public String getObjectType() { + return objectType; } - public String getNoticeType() - { - return noticeType; + public void setObjectType(String objectType) { + this.objectType = objectType; } public void setNoticeContent(String noticeContent) @@ -82,19 +102,115 @@ public class Notice extends BaseDomain return status; } + @Override + public String getCreateBy() { + return createBy; + } + + @Override + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + @Override + public Date getCreateTime() { + return createTime; + } + + @Override + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + @Override + public Date getUpdateTime() { + return updateTime; + } + + @Override + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + @Override + public String getUpdateBy() { + return updateBy; + } + + @Override + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public String getBureauDeptIds() { + return bureauDeptIds; + } + + public void setBureauDeptIds(String bureauDeptIds) { + this.bureauDeptIds = bureauDeptIds; + } + + public String getBureauDeptNames() { + return bureauDeptNames; + } + + public void setBureauDeptNames(String bureauDeptNames) { + this.bureauDeptNames = bureauDeptNames; + } + + @Override + public String getRemark() { + return remark; + } + + @Override + public void setRemark(String remark) { + this.remark = remark; + } + + public List getBureauDeptNameList() { + return bureauDeptNameList; + } + + public void setBureauDeptNameList(List bureauDeptNameList) { + this.bureauDeptNameList = bureauDeptNameList; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("noticeId", getNoticeId()) .append("noticeTitle", getNoticeTitle()) - .append("noticeType", getNoticeType()) + .append("objectType", getObjectType()) .append("noticeContent", getNoticeContent()) .append("status", getStatus()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) + .append("bureauDeptIds",getBureauDeptIds()) + .append("bureauDeptNames",getBureauDeptNames()) .append("remark", getRemark()) + .append("bureauDeptNameList",getBureauDeptNameList()) + .append("beginTime",getBeginTime()) + .append("endTime",getEndTime()) .toString(); } + } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/NoticeMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/NoticeMapper.xml index 9b8a4a8e..17d057c8 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/NoticeMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/NoticeMapper.xml @@ -7,18 +7,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + - select notice_id, notice_title, notice_type, notice_content, status, create_by, create_time, update_by, update_time, remark + select notice_id, notice_title, object_type, notice_content, status, create_by, create_time, update_by, update_time,bureau_dept_ids,bureau_dept_names,remark from sys_notice @@ -33,46 +35,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND notice_title like concat('%', #{noticeTitle}, '%') - - AND notice_type = #{noticeType} + + AND object_type = #{objectType} - - AND create_by like concat('%', #{createBy}, '%') + + AND bureau_dept_names like concat('%', #{bureauDeptNames}, '%') + + AND DATE_FORMAT(create_time,'%Y-%m-%d')>=#{beginTime} + + + AND #{endTime}>=DATE_FORMAT(create_time,'%Y-%m-%d') + - insert into sys_notice ( + insert into sys_notice + notice_id, notice_title, - notice_type, + object_type, notice_content, status, remark, create_by, - create_time - )values( + create_time, + bureau_dept_ids, + bureau_dept_names, + + #{noticeId}, #{noticeTitle}, - #{noticeType}, + #{objectType}, #{noticeContent}, #{status}, #{remark}, #{createBy}, - sysdate() - ) + sysdate(), + #{bureauDeptIds}, + #{bureauDeptNames}, + update sys_notice notice_title = #{noticeTitle}, - notice_type = #{noticeType}, + object_type = #{objectType}, notice_content = #{noticeContent}, status = #{status}, update_by = #{updateBy}, - update_time = sysdate() + remark = #{remark}, + update_time = sysdate(), + bureau_dept_ids = #{bureauDeptIds}, + bureau_dept_names = #{bureauDeptNames}, where notice_id = #{noticeId} diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/add.html index c31f5055..a727f5e2 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/add.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/add.html @@ -9,21 +9,29 @@
- +
- +
- + +
+ +
注：多部门请用，分隔
+
+
+ +
+
- +
@@ -36,7 +44,7 @@
- +
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/detail.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/detail.html index 0a4f438c..3792f237 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/detail.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/detail.html @@ -2,36 +2,73 @@ - + + + -
- - -
- -
- -
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
-
- -
- -
-
-
- -
- -
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+ +
+
+ +
- -
+
+ +
+ diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/edit.html index 575c534f..70b1fc88 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/edit.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/edit.html @@ -10,21 +10,29 @@
- +
- + +
+ +
+ +
注：多部门请用，分隔
+
+
+
- +
- +
@@ -37,9 +45,9 @@
- +
-
+
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/notice.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/notice.html index 8ca440e5..a5c0e811 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/notice.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/notice.html @@ -1,117 +1,126 @@ - + -
-
-
- -
-
    -
  • - 公告标题： -
    • -
  • - 操作人员： -
    • -
  • - 公告类型： -
    • -
  • -  搜索 -  重置 -
    • -
-
- -
- - - -
-
-
-
+
+
+
+
+
+
    +
  • + 通知标题： +
    • +
  • +

    发布时间：

    + + - + +
    • +
  • + 发布部门： +
    • +
  • + 发布对象： +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + + +
+
+
- - + $(function () { + var options = { + url: prefix + "/list", + createUrl: prefix + "/add", + updateUrl: prefix + "/edit/{id}", + removeUrl: prefix + "/remove", + modalName: "通知", + uniqueId:"noticeId", + columns: [{ + checkbox: true + }, + { + field: 'noticeTitle', + title: '通知标题' + }, + { + field: 'createTime', + title: '发布时间', + // sortable: true + }, + { + field: 'bureauDeptNames', + title: '发布部门', + }, + { + field: 'objectType', + title: '发布对象', + align: 'center', + formatter: function (value, row, index) { + return $.table.selectDictLabel(types, value); + } + }, + { + field: 'status', + title: '发布状态', + align: 'center', + formatter: function (value, row, index) { + return $.table.selectDictLabel(datas, value); + } + }, + { + title: '操作', + align: 'center', + formatter: function (value, row, index) { + return '' + '详情' + ''; + } + }] + }; + $.table.init(options); + }); + function openNoticeDetails(noticeId){ + console.log(noticeId); + $.modal.openClose("通知公告详情", prefix + "/detail/" + noticeId); + } + \ No newline at end of file