公告-添加文号字段

src/main/java/com/jeeplus/modules/oa/entity/OaNotify.java

@@ -57,6 +57,7 @@ public class OaNotify extends ActEntity<OaNotify> {
 	private String processInstanceId;
 	private Integer closeStatus;  //关闭状态
 	private String flagAdmin;     //管理员状态（1：管理员，0：非管理员）
+	private String referenceNumber;     //文号
 
     public String getHome() {
         return home;
@@ -358,6 +359,14 @@ public class OaNotify extends ActEntity<OaNotify> {
 	public void setFlagAdmin(String flagAdmin) {
 		this.flagAdmin = flagAdmin;
 	}
+
+	public String getReferenceNumber() {
+		return referenceNumber;
+	}
+
+	public void setReferenceNumber(String referenceNumber) {
+		this.referenceNumber = referenceNumber;
+	}
 	/*	@Override
 	public String toString() {
 		return "OaNotify [type=" + type + ", title=" + title + ", content=" + content + ", files=" + files + ", status="

src/main/java/com/jeeplus/modules/oa/web/OaNotifyController.java

@@ -152,6 +152,10 @@ public class OaNotifyController extends BaseController {
 			OaNotifyView oaNotifyView = oaNotifyService.getOaNotifyView(oaNotify.getId(), UserUtils.getUser().getId());
 			//更新查看公告已看数据
 			oaNotifyService.saveOaNotifyView(oaNotifyView,oaNotify.getId());
+
+			//根据公告id查询查看公告记录信息(先修改查看记录 再进行查询)
+			List<OaNotifyView> oaNotifyViewList = oaNotifyService.getOaNotifyViewList(oaNotify.getId());
+			model.addAttribute("oaNotifyViewList", oaNotifyViewList);
 			return "modules/oa/oaNotifyView";
 		}
 		return "modules/oa/oaNotifyForm";

src/main/resources/mappings/modules/oa/OaNotifyDao.xml

@@ -22,6 +22,7 @@
 		a.start_date AS "startDate",
 		a.end_date AS "endDate",
 		a.process_instance_id AS "processInstanceId",
+		a.reference_number AS "referenceNumber",
 	    b.read_num ,
 	    b.un_read_num,
 	    u.name AS "createBy.name",
@@ -290,6 +291,7 @@
 		a.start_date AS "startDate",
 		a.end_date AS "endDate",
 		a.number AS "number",
+		a.reference_number AS "referenceNumber",
         a.process_instance_id AS "processInstanceId"
 		FROM oa_notify a
 		LEFT JOIN sys_office o ON o.id = a.office_id
@@ -308,6 +310,9 @@
 		<if test="number != null and number != ''">
 			AND a.number = #{number}
 		</if>
+		<if test="referenceNumber != null and referenceNumber != ''">
+			AND a.reference_number like concat('%',#{referenceNumber},'%')
+		</if>
 		<if test="status != null and status != ''">
 			AND a.STATUS = #{status}
 		</if>
@@ -385,7 +390,8 @@
 			number,
 			process_instance_id,
 			DEL_FLAG,
-			close_status
+			close_status,
+			reference_number
 		) VALUES (
 			#{id},
 			#{type},
@@ -406,7 +412,8 @@
 			#{number},
 			#{processInstanceId},
 			#{delFlag},
-			#{closeStatus}
+			#{closeStatus},
+			#{referenceNumber}
 		)
 	</insert>
 	
@@ -433,6 +440,9 @@
 			<if test="closeStatus != null and closeStatus != ''">
 				,close_status = #{closeStatus}
 			</if>
+			<if test="referenceNumber != null and referenceNumber != ''">
+				,reference_number = #{referenceNumber}
+			</if>
 		WHERE id = #{id}
 	</update>
 	<update id="saveRemarks">

src/main/webapp/webpage/modules/oa/oaNotifyAudit.jsp

@@ -139,14 +139,10 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">公告编号：</label>
+                    <label class="layui-form-label">文号：</label>
                     <div class="layui-input-block">
-                        <div class="input-group">
-                            <form:input path="number" htmlEscape="false" readonly="true" maxlength="30" class="form-control layui-input"/>
-                            <span class="input-group-btn">
-                                <label class="form-status"><c:choose><c:when test="${not empty oaNotify.status}">${fns:getDictLabel(oaNotify.status, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
-                             </span>
-                        </div>
+                        <input htmlEscape="false" readonly="true" maxlength="30" class="form-control required layui-input"
+                               value="${oaNotify.referenceNumber}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/oa/oaNotifyForm.jsp

@@ -155,14 +155,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>公告编号：</label>
+                    <label class="layui-form-label">文号：</label>
                     <div class="layui-input-block">
-                        <div class="input-group">
-                            <form:input path="number" htmlEscape="false" readonly="true" maxlength="30" class="form-control layui-input"/>
-                            <span class="input-group-btn">
-                                <label class="form-status"><c:choose><c:when test="${not empty oaNotify.status}">${fns:getDictLabel(oaNotify.status, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
-                             </span>
-                        </div>
+                        <form:input path="referenceNumber" htmlEscape="false" maxlength="30" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -173,13 +168,6 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">创建日期：</label>
-                    <div class="layui-input-block">
-                        <input id="createDate" name="createDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date layui-input laydate-icon"
-                               value="<fmt:formatDate value="${oaNotify.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
-                    </div>
-                </div>
                 <div class="layui-item layui-col-sm6 ">
                     <label class="layui-form-label"><span class="require-item">*</span>开始日期：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/oa/oaNotifyList.jsp

@@ -28,12 +28,12 @@
             laydate.render({
                 elem: '#createStartDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                 event: 'focus', //响应事件。如果没有传入event，则按照默认的click
-                type : 'datetime'
+                type : 'date'
             });
             laydate.render({
                 elem: '#createEndDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                 event: 'focus', //响应事件。如果没有传入event，则按照默认的click
-                type : 'datetime'
+                type : 'date'
             });
         });
 
@@ -258,21 +258,21 @@
 				</div>
 				<div id="moresees" style="clear:both;display:none;">
 					<div class="layui-item query athird">
-						<label class="layui-form-label">公告编号：</label>
+						<label class="layui-form-label">公告文号：</label>
 						<div class="layui-input-block with-icon">
-							<form:input path="number" htmlEscape="false" maxlength="200"  class=" form-control layui-input"/>
+							<form:input path="referenceNumber" htmlEscape="false" maxlength="200"  class=" form-control layui-input"/>
 						</div>
 					</div>
 					<div class="layui-item query athird">
 						<label class="layui-form-label">创建日期：</label>
 						<div class="layui-input-block">
-							<input class="form-control layer-date laydate-icon layui-input laydate-icondate" id="createStartDate" name="createStartDate" value="<fmt:formatDate value="${oaNotify.createStartDate}" pattern="yyyy-MM-dd"/>" onclick="laydate({istime: false, format: 'YYYY-MM-DD'})">
-						</div>
-					</div>
-					<div class="layui-item query athird">
-						<label class="layui-form-label">——&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
-						<div class="layui-input-block">
-							<input class="form-control layer-date laydate-icon layui-input laydate-icondate" id="createEndDate" name="createEndDate" value="<fmt:formatDate value="${oaNotify.createEndDate}" pattern="yyyy-MM-dd"/>" onclick="laydate({istime: false, format: 'YYYY-MM-DD'})">
+							<input id="createStartDate" name="createStartDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+								   value="<fmt:formatDate value="${oaNotify.createStartDate}" pattern="yyyy-MM-dd"/>"/>
+							</input>
+							<span class="group-sep">-</span>
+							<input id="createEndDate" name="createEndDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+								   value="<fmt:formatDate value="${oaNotify.createEndDate}" pattern="yyyy-MM-dd"/>"/>
+							</input>
 						</div>
 					</div>
 					<div class="layui-item query athird">
@@ -287,12 +287,6 @@
 							<form:input path="createBy.name" htmlEscape="false" maxlength="200"  class=" form-control layui-input"/>
 						</div>
 					</div>
-					<div class="layui-item query athird">
-						<label class="layui-form-label">阅读状态：</label>
-						<div class="layui-input-block">
-							<form:radiobuttons path="status" class="i-checks" items="${fns:getDictList('oa_notify_status')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</div>
-					</div>
 					<div style="clear:both;"></div>
 				</div>
 			</form:form>
@@ -333,16 +327,16 @@
             ,cols: [[
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center',  width:40,title: '序号'}
-                ,{field:'number',align:'center', title: '公告编号', minWidth:150/*,templet:function(d){
+				,{field:'title',align:'center', title: '公告标题', minWidth:150,templet:function(d){
+						var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看公告', '${ctx}/oa/oaNotify/form?id=" + d.id + "&view=view','95%','95%')\">" +
+								"<span title=" + d.title + ">" + d.title + "</span></a>";
+						return xml;
+					}}
+                ,{field:'referenceNumber',align:'center', title: '公告文号', minWidth:150/*,templet:function(d){
                     var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看公告', '${ctx}/oa/oaNotify/form?id=" + d.id + "&view=view','95%','95%')\">" +
                         "<span title=" + d.number + ">" + d.number + "</span></a>";
                     return xml;
                 }*/}
-                ,{field:'title',align:'center', title: '公告标题', minWidth:150,templet:function(d){
-                    var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看公告', '${ctx}/oa/oaNotify/form?id=" + d.id + "&view=view','95%','95%')\">" +
-                        "<span title=" + d.title + ">" + d.title + "</span></a>";
-                    return xml;
-                }}
                 ,{field:'type',align:'center', title: '公告类型', width:80}
                 ,{field:'content',align:'center', title: '公告内容', minWidth:200,templet:function(d){
                     return "<span title='"+ d.content +"'>" + d.content + "</span>";
@@ -353,7 +347,9 @@
                 ,{field:'createBy', align:'center',title: '创建人', width:80,templet:function(d){
                         return "<span title='"+ d.createBy +"'>" + d.createBy + "</span>";
                     }}
-                ,{field:'createDate', align:'center',title: '创建时间',width:150}
+                ,{field:'tmdcreateDate', align:'center',title: '创建时间',width:150,templet:function(d){
+						return "<span title='"+ d.createDate +"'>" + d.tmdcreateDate + "</span>";
+					}}
                 ,{align:'center', title: '公告状态',  width:70,templet:function(d){
                         var st = getAuditState(d.status)
                         var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/oa/oaNotify/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -401,7 +397,9 @@
                     ,"vtatus":"${oaNotify.readNum} / ${oaNotify.readNum + oaNotify.unReadNum}"
                     ,"createBy":"${oaNotify.createBy.name}"
                     ,"createDate":"<fmt:formatDate value="${oaNotify.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+                    ,"tmdcreateDate":"<fmt:formatDate value="${oaNotify.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"procId":"${oaNotify.processInstanceId}"
+                    ,"referenceNumber":"${oaNotify.referenceNumber}"
 					<c:if test="${not empty oaNotify.candel}">,"candel":"1"</c:if>
 
                     <shiro:hasPermission name="oa:oaNotify:edit">,"canedit":<c:choose><c:when test="${oaNotify.status == 1}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>

src/main/webapp/webpage/modules/oa/oaNotifyModifyApply.jsp

@@ -156,14 +156,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>公告编号：</label>
+                    <label class="layui-form-label">文号：</label>
                     <div class="layui-input-block">
-                        <div class="input-group">
-                            <form:input path="number" htmlEscape="false" readonly="true" maxlength="30" class="form-control layui-input"/>
-                            <span class="input-group-btn">
-                                <label class="form-status"><c:choose><c:when test="${not empty oaNotify.status}">${fns:getDictLabel(oaNotify.status, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
-                             </span>
-                        </div>
+                        <form:input path="referenceNumber" htmlEscape="false" maxlength="30" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -174,13 +169,6 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">创建日期：</label>
-                    <div class="layui-input-block">
-                        <input id="createDate" name="createDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date layui-input laydate-icon"
-                               value="<fmt:formatDate value="${oaNotify.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
-                    </div>
-                </div>
                 <div class="layui-item layui-col-sm6 ">
                     <label class="layui-form-label"><span class="require-item">*</span>开始日期：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/oa/oaNotifyView.jsp

@@ -38,14 +38,10 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label">公告编号：</label>
+                <label class="layui-form-label">文号：</label>
                 <div class="layui-input-block">
-                    <div class="input-group">
-                        <form:input path="number" htmlEscape="false" readonly="true" maxlength="30" class="form-control layui-input"/>
-                        <span class="input-group-btn">
-                                <label class="form-status"><c:choose><c:when test="${not empty oaNotify.status}">${fns:getDictLabel(oaNotify.status, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
-                             </span>
-                    </div>
+                    <input htmlEscape="false" readonly="true" maxlength="30" class="form-control required layui-input"
+                           value="${oaNotify.referenceNumber}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">