合同编号修改，公告编号、展示页修改

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -31,7 +31,16 @@ import java.util.Map;
  * @version 2017-03-21
  */
 public class WorkContractInfo extends ActEntity<WorkContractInfo> {
-    public static final String SERIAL_BIZCODE = "2";
+	//工程咨询
+    public static final String SERIAL_CONSULT = "2";
+	//工程审核
+    public static final String SERIAL_CHECK = "103";
+	//招标代理
+    public static final String SERIAL_AGENCY = "104";
+	//跟踪审计
+    public static final String SERIAL_AUDIT = "105";
+	//其他
+    public static final String SERIAL_ELST = "106";
 
     /*新增属性*/
 	private WorkBidProject project;		// 投标项目

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -603,14 +603,32 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		String processInstanceId = workContractInfo.getProcessInstanceId();
 		String contractTypeCode = workContractInfo.getContractTypeDoc();
 		String contractType = "";
+		String contractTypeId = "";
 		List<MainDictDetail> list1 = DictUtils.getMainDictList("contract_info_type");
 		for(MainDictDetail mainDictDetail:list1){
 			if(mainDictDetail.getValue().equals(contractTypeCode)){
 				  contractType = mainDictDetail.getLabel();
+				  contractTypeId = mainDictDetail.getValue();
 			}
 		}
 		if (StringUtils.isBlank(workContractInfo.getContractNum())) {
-			workContractInfo.setContractNum(serialNumTplService.genSerialNumNotNum(UserUtils.get(workContractInfo.getCreateBy().getId()).getCompany(), WorkContractInfo.SERIAL_BIZCODE).replace("TYPE",contractType));
+			//根据合同类型生成合同编号
+			String type = null;
+			if("100".equals(contractTypeId)){
+				type = WorkContractInfo.SERIAL_CONSULT;
+			}else if("101".equals(contractTypeId)){
+				type = WorkContractInfo.SERIAL_CHECK;
+			}else if("102".equals(contractTypeId)){
+				type = WorkContractInfo.SERIAL_AGENCY;
+			}else if("103".equals(contractTypeId)){
+				type = WorkContractInfo.SERIAL_AUDIT;
+			}else {
+				type = WorkContractInfo.SERIAL_ELST;
+			}
+			workContractInfo.setContractNum(serialNumTplService.genSerialNum(UserUtils.get(workContractInfo.getCreateBy().getId()).getCompany(), type).replace("TYPE",contractType));
+
+			/*//生成合同编号
+			workContractInfo.setContractNum(serialNumTplService.genSerialNumNotNum(UserUtils.get(workContractInfo.getCreateBy().getId()).getCompany(), WorkContractInfo.SERIAL_CONSULT).replace("TYPE",contractType));
 			//根据当前合同编号查询对应最后一条合同编号
 			String contractLastNumStr = dao.getContractLastNum(workContractInfo.getContractNum());
 			if(StringUtils.isNotBlank(contractLastNumStr)) {
@@ -621,7 +639,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			}else {
 				//更新合同编号
 				workContractInfo.setContractNum(workContractInfo.getContractNum() + String.format("%04d", 1));
-			}
+			}*/
 			long end2 = System.currentTimeMillis();
 			logger.info("合同送审-项目编码设置任务结束，共耗时：[" + (end2-begin) / 1000 + "]秒");
 		}

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

@@ -114,12 +114,12 @@
 							<form:input path="createBy.name" htmlEscape="false" maxlength="200"  class=" form-control layui-input"/>
 						</div>
 					</div>
-					<div class="layui-item query athird">
+					<%--<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>--%>
 					<div style="clear:both;"></div>
 				</div>
 			</form:form>
@@ -152,20 +152,20 @@
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center',  width:40,title: '序号'}
                 ,{field:'number',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%')\">" +
+                    var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看公告', '${ctx}/oa/oaNotify/view?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){
+                ,{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.title +"'>" + d.title + "</span>";
                 }}
-                ,{field:'status',align:'center', title: '公告状态', width:80}
+                /*,{field:'status',align:'center', title: '公告状态', width:80}*/
                 ,{field:'startDate', align:'center',title: '开始时间',width:150}
                 ,{field:'endDate', align:'center',title: '结束时间',width:150}
                 /*,{field:'vtatus', align:'center',title: '查阅状态', width:80}*/