From b42220961cfdfd2189641078e7b68d2ae5a93be7 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Fri, 26 Apr 2024 11:12:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mingsoft/cms/action/CmsSignAction.java    |  76 +-
 .../mingsoft/cms/action/ContentAction.java    |  43 +-
 .../mingsoft/cms/action/DutyPoliceAction.java | 137 ++++
 .../cms/action/DutyStandbyAction.java         |   5 +-
 .../cms/action/PhoneContactsAction.java       |   5 -
 .../cms/action/web/CmsSignAction.java         | 151 ++++
 .../cms/action/web/DutyPoliceAction.java      |  84 +++
 .../cms/action/web/DutyStandbyAction.java     |  13 +-
 .../cms/action/web/PhoneContactsAction.java   |   9 +-
 .../net/mingsoft/cms/biz/ICmsSignBiz.java     |   2 +-
 .../net/mingsoft/cms/biz/IDutyPoliceBiz.java  |  44 ++
 .../mingsoft/cms/biz/impl/CmsSignBizImpl.java |   4 +
 .../cms/biz/impl/DutyPoliceBizImpl.java       |  73 ++
 .../net/mingsoft/cms/dao/ICmsSignDao.java     |   3 +-
 .../java/net/mingsoft/cms/dao/ICmsSignDao.xml |   8 +
 .../net/mingsoft/cms/dao/IDutyPoliceDao.java  |  46 ++
 .../net/mingsoft/cms/dao/IDutyPoliceDao.xml   | 104 +++
 .../mingsoft/cms/entity/CmsSignEntity.java    |   1 -
 .../mingsoft/cms/entity/DutyPoliceEntity.java | 119 ++++
 .../mingsoft/cms/excel/DutyPoliceExcel.java   |  81 +++
 .../WEB-INF/manager/cms/content/form.ftl      | 115 ++-
 .../template/1/default/chuhuijiyao-detail.htm | 267 +++----
 .../webapp/template/1/default/css/header.css  |   6 +-
 src/main/webapp/template/1/default/index.htm  | 664 +++++++++---------
 .../webapp/template/1/default/tongxunlu.htm   |   6 +-
 .../1/default/zhibanbeiqing-detail.htm        |   6 +-
 .../template/1/default/zhibanbeiqing-list.htm | 441 +++++++-----
 27 files changed, 1803 insertions(+), 710 deletions(-)
 create mode 100644 src/main/java/net/mingsoft/cms/action/DutyPoliceAction.java
 create mode 100644 src/main/java/net/mingsoft/cms/action/web/CmsSignAction.java
 create mode 100644 src/main/java/net/mingsoft/cms/action/web/DutyPoliceAction.java
 create mode 100644 src/main/java/net/mingsoft/cms/biz/IDutyPoliceBiz.java
 create mode 100644 src/main/java/net/mingsoft/cms/biz/impl/DutyPoliceBizImpl.java
 create mode 100644 src/main/java/net/mingsoft/cms/dao/IDutyPoliceDao.java
 create mode 100644 src/main/java/net/mingsoft/cms/dao/IDutyPoliceDao.xml
 create mode 100644 src/main/java/net/mingsoft/cms/entity/DutyPoliceEntity.java
 create mode 100644 src/main/java/net/mingsoft/cms/excel/DutyPoliceExcel.java

diff --git a/src/main/java/net/mingsoft/cms/action/CmsSignAction.java b/src/main/java/net/mingsoft/cms/action/CmsSignAction.java
index 2bf14bb5..8758a354 100644
--- a/src/main/java/net/mingsoft/cms/action/CmsSignAction.java
+++ b/src/main/java/net/mingsoft/cms/action/CmsSignAction.java
@@ -66,13 +66,52 @@ public class CmsSignAction extends BaseAction{
 	@Autowired
 	private IManagerBiz managerBiz;
 
+	/**
+	 * 获取账号
+	 * @param
+	 */
+	@ApiOperation(value = "获取账号列表接口")
+	@GetMapping ("/getManagerList")
+	@ResponseBody
+	public ResultData getManagerList() {
+		//查询所有部门用户
+		List<ManagerEntity> managerList = managerBiz.list();
+		List<String> managers = managerList.stream().filter(manager -> !manager.getManagerName().equals("msopen")).map(ManagerEntity::getManagerNickName).collect(Collectors.toList());
+		return ResultData.build().success(managers);
+	}
+
+	/**
+	 * 保存需签收科室
+	 * @param
+	 */
+	@ApiOperation(value = "保存需签收科室接口")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "cmsSigns", value = "需签收科室列表", required =true,paramType="query"),
+	})
+	@PostMapping("/saveList")
+	@ResponseBody
+	@LogAnn(title = "保存需签收科室", businessType = BusinessTypeEnum.INSERT)
+	public ResultData saveList(@RequestBody List<CmsSignEntity> cmsSigns) {
+		//把之前选的删掉
+		String contentId = cmsSigns.get(0).getContentId();
+		cmsSignBiz.deleteByContentId(contentId);
+		//循环插入新的
+		for(CmsSignEntity cmsSign : cmsSigns){
+			cmsSign.setIsSign("0");
+			cmsSign.setCreateDate(new Date());
+			cmsSign.setCreateBy(BasicUtil.getManager().getId());
+			cmsSignBiz.save(cmsSign);
+		}
+		return ResultData.build().success("保存成功！");
+	}
+
 
 
 	/**
-	 * 保存文章牵手
+	 * 保存文章签收
 	 * @param cmsSign 文章实体
 	 */
-	@ApiOperation(value = "保存文章列表接口")
+	@ApiOperation(value = "保存文章签收接口")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "contentId", value = "文章关联id", required =true,paramType="query"),
 			@ApiImplicitParam(name = "managerName", value = "用户名", required =false,paramType="query"),
@@ -81,9 +120,14 @@ public class CmsSignAction extends BaseAction{
 	@ResponseBody
 	@LogAnn(title = "保存文章签收", businessType = BusinessTypeEnum.INSERT)
 	public ResultData save(@ModelAttribute @ApiIgnore CmsSignEntity cmsSign) {
-		cmsSign.setCreateDate(new Date());
-		cmsSign.setCreateBy(BasicUtil.getManager().getId());
-		cmsSignBiz.save(cmsSign);
+		LambdaQueryWrapper<CmsSignEntity> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(CmsSignEntity::getContentId,cmsSign.getContentId());
+		wrapper.eq(CmsSignEntity::getManagerName,cmsSign.getManagerName());
+		cmsSign = cmsSignBiz.getOne(wrapper);
+		cmsSign.setIsSign("1");
+		cmsSign.setUpdateDate(new Date());
+		cmsSign.setUpdateBy(BasicUtil.getManager().getId());
+		cmsSignBiz.updateById(cmsSign);
 		return ResultData.build().success("保存成功！");
 	}
 
@@ -102,29 +146,11 @@ public class CmsSignAction extends BaseAction{
 	@RequestMapping(value = "/list",method = {RequestMethod.GET,RequestMethod.POST})
 	@ResponseBody
 	public ResultData list(@ModelAttribute @ApiIgnore CmsSignEntity cmsSign) {
-		//查询已经签收的部门用户
+		//查询签收列表
 		LambdaQueryWrapper<CmsSignEntity> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(CmsSignEntity::getContentId,cmsSign.getContentId());
 		List<CmsSignEntity> contentList = cmsSignBiz.list(wrapper);
-		List<String> singList = contentList.stream().map(CmsSignEntity::getManagerName).collect(Collectors.toList());
-		//查询所有部门用户
-		List<ManagerEntity> managerList = managerBiz.list();
-		List<String> managers = managerList.stream().map(ManagerEntity::getManagerNickName).collect(Collectors.toList());
-		List<CmsSignEntity> list = new ArrayList<>();
-		for(String manager : managers){
-			if(manager.equals("msopen")){
-				continue;
-			}
-			CmsSignEntity entity = new CmsSignEntity();
-			entity.setManagerName(manager);
-			if(singList.contains(manager)){
-				entity.setIsSign("1");
-			}else{
-				entity.setIsSign("0");
-			}
-			list.add(entity);
-		}
-		return ResultData.build().success(list);
+		return ResultData.build().success(contentList);
 	}
 
 }
diff --git a/src/main/java/net/mingsoft/cms/action/ContentAction.java b/src/main/java/net/mingsoft/cms/action/ContentAction.java
index d82659cd..461974c4 100755
--- a/src/main/java/net/mingsoft/cms/action/ContentAction.java
+++ b/src/main/java/net/mingsoft/cms/action/ContentAction.java
@@ -37,9 +37,11 @@ import net.mingsoft.basic.util.StringUtil;
 import net.mingsoft.cms.bean.ContentBean;
 import net.mingsoft.cms.biz.ICategoryBiz;
 import net.mingsoft.cms.biz.IContentBiz;
+import net.mingsoft.cms.biz.IDutyPoliceBiz;
 import net.mingsoft.cms.biz.IDutyStandbyBiz;
 import net.mingsoft.cms.entity.CategoryEntity;
 import net.mingsoft.cms.entity.ContentEntity;
+import net.mingsoft.cms.entity.DutyPoliceEntity;
 import net.mingsoft.cms.entity.DutyStandbyEntity;
 import net.mingsoft.mdiy.biz.IModelBiz;
 import net.mingsoft.mdiy.entity.ModelEntity;
@@ -86,6 +88,9 @@ public class ContentAction extends BaseAction {
 	@Autowired
 	private IDutyStandbyBiz dutyStandbyBiz;
 
+	@Autowired
+	private IDutyPoliceBiz dutyPoliceBiz;
+
 	/**
 	 * 返回主界面index
 	 */
@@ -243,14 +248,24 @@ public class ContentAction extends BaseAction {
 		}
 
 		contentBiz.save(content);
+		//获取栏目实体
+		CategoryEntity categoryEntity = categoryBiz.getById(content.getCategoryId());
 		//值班备勤需要将文章Id存到值班备勤表中
-		if("1773193604170002434".equals(content.getCategoryId())){
+		if("值班备勤".equals(categoryEntity.getCategoryTitle())){
 			List<DutyStandbyEntity> dutyStandbyEntityList = dutyStandbyBiz.list(new LambdaQueryWrapper<DutyStandbyEntity>().eq(DutyStandbyEntity::getFilePath,content.getFilePath()));
 			for(DutyStandbyEntity dutyStandbyEntity : dutyStandbyEntityList){
 				dutyStandbyEntity.setContentId(content.getId());
 				dutyStandbyBiz.updateById(dutyStandbyEntity);
 			}
 		}
+		//值日警官需要将文章Id存到值日警官表中
+		if("值日警官".equals(categoryEntity.getCategoryTitle())){
+			List<DutyPoliceEntity> dutyPoliceEntityList = dutyPoliceBiz.list(new LambdaQueryWrapper<DutyPoliceEntity>().eq(DutyPoliceEntity::getFilePath,content.getFilePath()));
+			for(DutyPoliceEntity dutyPoliceEntity : dutyPoliceEntityList){
+				dutyPoliceEntity.setContentId(content.getId());
+				dutyPoliceBiz.updateById(dutyPoliceEntity);
+			}
+		}
 		return ResultData.build().success(content);
 	}
 
@@ -287,6 +302,8 @@ public class ContentAction extends BaseAction {
 		contentBiz.removeByIds(ids);
 		//如果是值班备勤，删除对应值班备勤数据
 		dutyStandbyBiz.deleteByContentIds(ids);
+		//如果是值日警官，删除对应值日警官数据
+		dutyPoliceBiz.deleteByContentIds(ids);
 		return ResultData.build().success();
 	}
 
@@ -338,14 +355,24 @@ public class ContentAction extends BaseAction {
 			return ResultData.build().error(getResString("err.empty", this.getResString("content.datetime")));
 		}
 		contentBiz.saveOrUpdate(content);
-		 //值班备勤需要将文章Id存到值班备勤表中
-		 if("1773193604170002434".equals(content.getCategoryId())){
-			 List<DutyStandbyEntity> dutyStandbyEntityList = dutyStandbyBiz.list(new LambdaQueryWrapper<DutyStandbyEntity>().eq(DutyStandbyEntity::getFilePath,content.getFilePath()));
-			 for(DutyStandbyEntity dutyStandbyEntity : dutyStandbyEntityList){
-				 dutyStandbyEntity.setContentId(content.getId());
-				 dutyStandbyBiz.updateById(dutyStandbyEntity);
-			 }
+		//获取栏目实体
+		CategoryEntity categoryEntity = categoryBiz.getById(content.getCategoryId());
+		//值班备勤需要将文章Id存到值班备勤表中
+		if("值班备勤".equals(categoryEntity.getCategoryTitle())){
+		 List<DutyStandbyEntity> dutyStandbyEntityList = dutyStandbyBiz.list(new LambdaQueryWrapper<DutyStandbyEntity>().eq(DutyStandbyEntity::getFilePath,content.getFilePath()));
+		 for(DutyStandbyEntity dutyStandbyEntity : dutyStandbyEntityList){
+			 dutyStandbyEntity.setContentId(content.getId());
+			 dutyStandbyBiz.updateById(dutyStandbyEntity);
+		 }
+		}
+		//值日警官需要将文章Id存到值日警官表中
+		if("值日警官".equals(categoryEntity.getCategoryTitle())){
+		 List<DutyPoliceEntity> dutyPoliceEntityList = dutyPoliceBiz.list(new LambdaQueryWrapper<DutyPoliceEntity>().eq(DutyPoliceEntity::getFilePath,content.getFilePath()));
+		 for(DutyPoliceEntity dutyPoliceEntity : dutyPoliceEntityList){
+			 dutyPoliceEntity.setContentId(content.getId());
+			 dutyPoliceBiz.updateById(dutyPoliceEntity);
 		 }
+		}
 		return ResultData.build().success(content);
 	}
 
diff --git a/src/main/java/net/mingsoft/cms/action/DutyPoliceAction.java b/src/main/java/net/mingsoft/cms/action/DutyPoliceAction.java
new file mode 100644
index 00000000..e46b9e58
--- /dev/null
+++ b/src/main/java/net/mingsoft/cms/action/DutyPoliceAction.java
@@ -0,0 +1,137 @@
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+package net.mingsoft.cms.action;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import net.mingsoft.base.entity.ResultData;
+import net.mingsoft.basic.action.BaseFileAction;
+import net.mingsoft.basic.bean.EUListBean;
+import net.mingsoft.basic.bean.UploadConfigBean;
+import net.mingsoft.basic.util.BasicUtil;
+import net.mingsoft.cms.biz.IDutyPoliceBiz;
+import net.mingsoft.cms.entity.DutyPoliceEntity;
+import net.mingsoft.cms.excel.DutyPoliceExcel;
+import net.mingsoft.excel.util.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 分类管理控制层
+ * @author 铭飞开发团队
+ * 创建日期：2019-11-28 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+@Api(tags={"后端-值日警官接口"})
+@Controller("dutyPoliceAction")
+@RequestMapping("/${ms.manager.path}/cms/dutyPolice")
+public class DutyPoliceAction extends BaseFileAction {
+
+
+	/**
+	 * 注入分类业务层
+	 */
+	@Autowired
+	private IDutyPoliceBiz dutyPoliceBiz;
+
+	/**
+	 * 查询分类列表
+	 * @param entity 分类实体
+	 */
+	@ApiOperation(value = "查询分类列表接口")
+	@ApiImplicitParams({
+    	@ApiImplicitParam(name = "id", value = "id", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "dutyDate", value = "值班日期", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "leaderName", value = "值日警官领导岗", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "deptName", value = "值日警官轮值科室", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "blDutyPerson", value = "北岭值班人员", required =false,paramType="query"),
+    })
+	@RequestMapping(value ="/list",method = {RequestMethod.GET,RequestMethod.POST})
+	@ResponseBody
+	public ResultData list(@ModelAttribute @ApiIgnore DutyPoliceEntity entity) {
+		entity.setSqlWhere("");
+		List list = dutyPoliceBiz.query(entity);
+		return ResultData.build().success(new EUListBean(list,(int)BasicUtil.endPage(list).getTotal()));
+	}
+
+	/**
+	 * 导入接口
+	 * @param
+	 */
+	@ApiOperation(value = "导入接口")
+	@PostMapping("/import")
+	@ResponseBody
+	public ResultData importData(@ApiIgnore UploadConfigBean bean) throws IOException {
+		List<DutyPoliceEntity> excelList = ExcelUtil.read(bean.getFile(), DutyPoliceEntity.class);
+		if(excelList!=null){
+			UploadConfigBean config = new UploadConfigBean(bean.getUploadPath(),bean.getFile(),null,false,bean.isRename());
+			String filePath = this.upload(config).get("data").toString();
+			for(DutyPoliceEntity entity : excelList){
+				//删除相同日期数据
+				dutyPoliceBiz.deleteByEntity(entity);
+				//导入数据
+				entity.setFilePath(filePath);
+				entity.setCreateDate(new Date());
+				entity.setCreateBy(BasicUtil.getManager().getId());
+				dutyPoliceBiz.save(entity);
+			}
+			return ResultData.build().success(filePath);
+		}else{
+			return ResultData.build().error("导入文件为空！");
+		}
+	}
+
+	/**
+	 * 导出模板
+	 */
+	@GetMapping("importTmplate")
+	@ApiOperation(value = "导入模板")
+	public void importTmplate(HttpServletResponse response) throws IOException {
+		List<DutyPoliceExcel> list = new ArrayList<>();
+		ExcelUtil.export(response, "值日警官导入模板", "值日警官", list, DutyPoliceExcel.class);
+	}
+
+	/**
+	 * 导入接口
+	 * @param
+	 */
+	@PostMapping("/deleteByContentIds")
+	@ResponseBody
+	public ResultData deleteByContentIds(@RequestParam(value = "contentIds",required = false)List<String> contentIds) throws IOException {
+		dutyPoliceBiz.deleteByContentIds(contentIds);
+		return ResultData.build().success("删除成功");
+	}
+
+
+
+}
diff --git a/src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java b/src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java
index 537a2f50..26938a4b 100644
--- a/src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java
+++ b/src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java
@@ -76,9 +76,8 @@ public class DutyStandbyAction extends BaseFileAction {
     	@ApiImplicitParam(name = "id", value = "id", required =false,paramType="query"),
     	@ApiImplicitParam(name = "dutyDate", value = "值班日期", required =false,paramType="query"),
     	@ApiImplicitParam(name = "monitor", value = "带班长", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "deputyMonitor", value = "副带班长", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "operator", value = "守机员", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "dutyPerson", value = "值班人员", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "policeDuty", value = "民警值班员", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "auxiliaryPoliceDuty", value = "辅警值班员", required =false,paramType="query"),
     	@ApiImplicitParam(name = "blDutyPerson", value = "北岭值班人员", required =false,paramType="query"),
     })
 	@RequestMapping(value ="/list",method = {RequestMethod.GET,RequestMethod.POST})
diff --git a/src/main/java/net/mingsoft/cms/action/PhoneContactsAction.java b/src/main/java/net/mingsoft/cms/action/PhoneContactsAction.java
index a9f292de..d0c9d6d2 100644
--- a/src/main/java/net/mingsoft/cms/action/PhoneContactsAction.java
+++ b/src/main/java/net/mingsoft/cms/action/PhoneContactsAction.java
@@ -22,7 +22,6 @@
 
 package net.mingsoft.cms.action;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -33,7 +32,6 @@ import net.mingsoft.basic.bean.EUListBean;
 import net.mingsoft.basic.bean.UploadConfigBean;
 import net.mingsoft.basic.util.BasicUtil;
 import net.mingsoft.cms.biz.IPhoneContactsBiz;
-import net.mingsoft.cms.entity.DutyStandbyEntity;
 import net.mingsoft.cms.entity.PhoneContactsEntity;
 import net.mingsoft.cms.excel.PhoneContactsExcel;
 import net.mingsoft.excel.util.ExcelUtil;
@@ -43,16 +41,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 分类管理控制层
diff --git a/src/main/java/net/mingsoft/cms/action/web/CmsSignAction.java b/src/main/java/net/mingsoft/cms/action/web/CmsSignAction.java
new file mode 100644
index 00000000..d223911b
--- /dev/null
+++ b/src/main/java/net/mingsoft/cms/action/web/CmsSignAction.java
@@ -0,0 +1,151 @@
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+package net.mingsoft.cms.action.web;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import net.mingsoft.base.entity.ResultData;
+import net.mingsoft.basic.annotation.LogAnn;
+import net.mingsoft.basic.biz.IManagerBiz;
+import net.mingsoft.basic.constant.e.BusinessTypeEnum;
+import net.mingsoft.basic.entity.ManagerEntity;
+import net.mingsoft.basic.util.BasicUtil;
+import net.mingsoft.cms.action.BaseAction;
+import net.mingsoft.cms.biz.ICmsSignBiz;
+import net.mingsoft.cms.entity.CmsSignEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 分类管理控制层
+ * @author 铭飞开发团队
+ * 创建日期：2019-11-28 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+@Api(tags={"前端端-文章签收接口"})
+@Controller("webCmsSignAction")
+@RequestMapping("/cms/sign")
+public class CmsSignAction extends BaseAction {
+
+
+	/**
+	 * 注入分类业务层
+	 */
+	@Autowired
+	private ICmsSignBiz cmsSignBiz;
+
+	@Autowired
+	private IManagerBiz managerBiz;
+
+	/**
+	 * 获取账号
+	 * @param
+	 */
+	@ApiOperation(value = "获取账号列表接口")
+	@GetMapping ("/getManagerList")
+	@ResponseBody
+	public ResultData getManagerList() {
+		//查询所有部门用户
+		List<ManagerEntity> managerList = managerBiz.list();
+		List<String> managers = managerList.stream().filter(manager -> !manager.getManagerName().equals("msopen")).map(ManagerEntity::getManagerNickName).collect(Collectors.toList());
+		return ResultData.build().success(managers);
+	}
+
+	/**
+	 * 保存需签收科室
+	 * @param
+	 */
+	@ApiOperation(value = "保存需签收科室接口")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "cmsSigns", value = "需签收科室列表", required =true,paramType="query"),
+	})
+	@PostMapping("/saveList")
+	@ResponseBody
+	@LogAnn(title = "保存需签收科室", businessType = BusinessTypeEnum.INSERT)
+	public ResultData saveList(@RequestBody List<CmsSignEntity> cmsSigns) {
+		//把之前选的删掉
+		String contentId = cmsSigns.get(0).getContentId();
+		cmsSignBiz.deleteByContentId(contentId);
+		//循环插入新的
+		for(CmsSignEntity cmsSign : cmsSigns){
+			cmsSign.setIsSign("0");
+			cmsSign.setCreateDate(new Date());
+			cmsSign.setCreateBy(BasicUtil.getManager().getId());
+			cmsSignBiz.save(cmsSign);
+		}
+		return ResultData.build().success("保存成功！");
+	}
+
+
+
+	/**
+	 * 保存文章签收
+	 * @param cmsSign 文章实体
+	 */
+	@ApiOperation(value = "保存文章签收接口")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "contentId", value = "文章关联id", required =true,paramType="query"),
+			@ApiImplicitParam(name = "managerName", value = "用户名", required =false,paramType="query"),
+	})
+	@PostMapping("/save")
+	@ResponseBody
+	@LogAnn(title = "保存文章签收", businessType = BusinessTypeEnum.INSERT)
+	public ResultData save(@ModelAttribute @ApiIgnore CmsSignEntity cmsSign) {
+		cmsSign.setCreateDate(new Date());
+		cmsSign.setCreateBy(BasicUtil.getManager().getId());
+		cmsSignBiz.save(cmsSign);
+		return ResultData.build().success("保存成功！");
+	}
+
+	/**
+	 * 查询签收列表接口
+	 * @param cmsSign
+	 * @return
+	 */
+	@ApiOperation(value = "查询签收列表接口")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "id", value = "文章id", required =false,paramType="query"),
+			@ApiImplicitParam(name = "contentId", value = "关联文章id", required =false,paramType="query"),
+			@ApiImplicitParam(name = "managerName", value = "用户名", required =false,paramType="query"),
+			@ApiImplicitParam(name = "isSign", value = "是否签收", required =false,paramType="query"),
+	})
+	@RequestMapping(value = "/list",method = {RequestMethod.GET,RequestMethod.POST})
+	@ResponseBody
+	public ResultData list(@ModelAttribute @ApiIgnore CmsSignEntity cmsSign) {
+		//查询签收列表
+		LambdaQueryWrapper<CmsSignEntity> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(CmsSignEntity::getContentId,cmsSign.getContentId());
+		List<CmsSignEntity> contentList = cmsSignBiz.list(wrapper);
+		return ResultData.build().success(contentList);
+	}
+
+}
diff --git a/src/main/java/net/mingsoft/cms/action/web/DutyPoliceAction.java b/src/main/java/net/mingsoft/cms/action/web/DutyPoliceAction.java
new file mode 100644
index 00000000..ed2518fe
--- /dev/null
+++ b/src/main/java/net/mingsoft/cms/action/web/DutyPoliceAction.java
@@ -0,0 +1,84 @@
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+package net.mingsoft.cms.action.web;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import net.mingsoft.base.entity.ResultData;
+import net.mingsoft.basic.bean.EUListBean;
+import net.mingsoft.basic.util.BasicUtil;
+import net.mingsoft.cms.action.BaseAction;
+import net.mingsoft.cms.biz.IDutyPoliceBiz;
+import net.mingsoft.cms.biz.IDutyStandbyBiz;
+import net.mingsoft.cms.entity.DutyPoliceEntity;
+import net.mingsoft.cms.entity.DutyStandbyEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+
+/**
+ * 分类管理控制层
+ * @author 铭飞开发团队
+ * 创建日期：2019-11-28 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+@Api(tags={"前端-值日警官接口"})
+@Controller("WebdutyPoliceAction")
+@RequestMapping("/cms/dutyPolice")
+public class DutyPoliceAction extends BaseAction {
+
+
+	/**
+	 * 注入分类业务层
+	 */
+	@Autowired
+	private IDutyPoliceBiz dutyPoliceBiz;
+
+	/**
+	 * 查询分类列表
+	 * @param entity 分类实体
+	 */
+	@ApiOperation(value = "查询分类列表接口")
+	@ApiImplicitParams({
+    	@ApiImplicitParam(name = "id", value = "id", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "dutyDate", value = "值班日期", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "leaderName", value = "值日警官领导岗", required =false,paramType="query"),
+		@ApiImplicitParam(name = "deptName", value = "值日警官轮值科室", required =false,paramType="query"),
+    })
+	@RequestMapping(value ="/list",method = {RequestMethod.GET,RequestMethod.POST})
+	@ResponseBody
+	public ResultData list(@ModelAttribute @ApiIgnore DutyPoliceEntity entity) {
+		entity.setSqlWhere("");
+		List list = dutyPoliceBiz.query(entity);
+		return ResultData.build().success(new EUListBean(list,(int)BasicUtil.endPage(list).getTotal()));
+	}
+
+}
diff --git a/src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java b/src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java
index 88ef439c..99bbc2d9 100644
--- a/src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java
+++ b/src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java
@@ -32,14 +32,14 @@ import net.mingsoft.basic.util.BasicUtil;
 import net.mingsoft.cms.action.BaseAction;
 import net.mingsoft.cms.biz.IDutyStandbyBiz;
 import net.mingsoft.cms.entity.DutyStandbyEntity;
-import net.mingsoft.excel.util.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -69,9 +69,8 @@ public class DutyStandbyAction extends BaseAction {
     	@ApiImplicitParam(name = "id", value = "id", required =false,paramType="query"),
     	@ApiImplicitParam(name = "dutyDate", value = "值班日期", required =false,paramType="query"),
     	@ApiImplicitParam(name = "monitor", value = "带班长", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "deputyMonitor", value = "副带班长", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "operator", value = "守机员", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "dutyPerson", value = "值班人员", required =false,paramType="query"),
+		@ApiImplicitParam(name = "policeDuty", value = "民警值班员", required =false,paramType="query"),
+		@ApiImplicitParam(name = "auxiliaryPoliceDuty", value = "辅警值班员", required =false,paramType="query"),
     	@ApiImplicitParam(name = "blDutyPerson", value = "北岭值班人员", required =false,paramType="query"),
     })
 	@RequestMapping(value ="/list",method = {RequestMethod.GET,RequestMethod.POST})
diff --git a/src/main/java/net/mingsoft/cms/action/web/PhoneContactsAction.java b/src/main/java/net/mingsoft/cms/action/web/PhoneContactsAction.java
index bf17360c..c4b6a80d 100644
--- a/src/main/java/net/mingsoft/cms/action/web/PhoneContactsAction.java
+++ b/src/main/java/net/mingsoft/cms/action/web/PhoneContactsAction.java
@@ -27,21 +27,14 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import net.mingsoft.base.entity.ResultData;
-import net.mingsoft.basic.bean.EUListBean;
 import net.mingsoft.basic.util.BasicUtil;
-import net.mingsoft.cms.biz.ICategoryBiz;
 import net.mingsoft.cms.biz.IPhoneContactsBiz;
-import net.mingsoft.cms.entity.CategoryEntity;
 import net.mingsoft.cms.entity.PhoneContactsEntity;
-import net.mingsoft.excel.util.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -72,7 +65,7 @@ public class PhoneContactsAction extends net.mingsoft.cms.action.BaseAction{
     	@ApiImplicitParam(name = "name", value = "姓名", required =false,paramType="query"),
     	@ApiImplicitParam(name = "phone", value = "手机号", required =false,paramType="query"),
     })
-	@PostMapping(value="/list")
+	@RequestMapping(value ="/list",method = {RequestMethod.GET,RequestMethod.POST})
 	@ResponseBody
 	public ResultData list(@ModelAttribute @ApiIgnore PhoneContactsEntity entity) {
 		BasicUtil.startPage();
diff --git a/src/main/java/net/mingsoft/cms/biz/ICmsSignBiz.java b/src/main/java/net/mingsoft/cms/biz/ICmsSignBiz.java
index fe95ce76..cafcba6c 100644
--- a/src/main/java/net/mingsoft/cms/biz/ICmsSignBiz.java
+++ b/src/main/java/net/mingsoft/cms/biz/ICmsSignBiz.java
@@ -36,5 +36,5 @@ import java.util.List;
  * 历史修订：<br/>
  */
 public interface ICmsSignBiz extends IBaseBiz<CmsSignEntity> {
-
+    void deleteByContentId(String contentId);
 }
diff --git a/src/main/java/net/mingsoft/cms/biz/IDutyPoliceBiz.java b/src/main/java/net/mingsoft/cms/biz/IDutyPoliceBiz.java
new file mode 100644
index 00000000..1e20a468
--- /dev/null
+++ b/src/main/java/net/mingsoft/cms/biz/IDutyPoliceBiz.java
@@ -0,0 +1,44 @@
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+package net.mingsoft.cms.biz;
+
+import net.mingsoft.base.biz.IBaseBiz;
+import net.mingsoft.cms.entity.DutyPoliceEntity;
+import net.mingsoft.cms.entity.DutyStandbyEntity;
+
+import java.util.List;
+
+
+/**
+ * 分类业务
+ * @author 铭飞开发团队
+ * 创建日期：2019-11-28 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+public interface IDutyPoliceBiz extends IBaseBiz<DutyPoliceEntity> {
+
+    void deleteByEntity(DutyPoliceEntity entity);
+
+    void deleteByContentIds(List<String> contentIds);
+
+}
diff --git a/src/main/java/net/mingsoft/cms/biz/impl/CmsSignBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/CmsSignBizImpl.java
index 6b83b326..44e587dd 100644
--- a/src/main/java/net/mingsoft/cms/biz/impl/CmsSignBizImpl.java
+++ b/src/main/java/net/mingsoft/cms/biz/impl/CmsSignBizImpl.java
@@ -60,4 +60,8 @@ public class CmsSignBizImpl extends BaseBizImpl<ICmsSignDao, CmsSignEntity> impl
         return cmsSignDao;
     }
 
+    @Override
+    public void deleteByContentId(String contentId) {
+        baseMapper.deleteByContentId(contentId);
+    }
 }
diff --git a/src/main/java/net/mingsoft/cms/biz/impl/DutyPoliceBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/DutyPoliceBizImpl.java
new file mode 100644
index 00000000..02c79e48
--- /dev/null
+++ b/src/main/java/net/mingsoft/cms/biz/impl/DutyPoliceBizImpl.java
@@ -0,0 +1,73 @@
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+
+package net.mingsoft.cms.biz.impl;
+
+import net.mingsoft.base.biz.impl.BaseBizImpl;
+import net.mingsoft.base.dao.IBaseDao;
+import net.mingsoft.cms.biz.IDutyPoliceBiz;
+import net.mingsoft.cms.biz.IDutyStandbyBiz;
+import net.mingsoft.cms.dao.IDutyPoliceDao;
+import net.mingsoft.cms.dao.IDutyStandbyDao;
+import net.mingsoft.cms.entity.DutyPoliceEntity;
+import net.mingsoft.cms.entity.DutyStandbyEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 分类管理持久化层
+ * @author 铭飞开发团队
+ * 创建日期：2019-11-28 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+@Service("dutyPoliceBizImpl")
+@Transactional(rollbackFor = RuntimeException.class)
+public class DutyPoliceBizImpl extends BaseBizImpl<IDutyPoliceDao, DutyPoliceEntity> implements IDutyPoliceBiz {
+
+
+    @Autowired
+    private IDutyPoliceDao dutyPoliceDao;
+
+
+
+    @Override
+    protected IBaseDao getDao() {
+        return dutyPoliceDao;
+    }
+
+
+    @Override
+    @Transactional
+    public void deleteByEntity(DutyPoliceEntity entity) {
+        dutyPoliceDao.deleteByEntity(entity);
+    }
+
+    @Override
+    public void deleteByContentIds(List<String> contentIds) {
+        dutyPoliceDao.deleteByContentIds(contentIds);
+    }
+}
diff --git a/src/main/java/net/mingsoft/cms/dao/ICmsSignDao.java b/src/main/java/net/mingsoft/cms/dao/ICmsSignDao.java
index 7ce4af86..0a22659d 100644
--- a/src/main/java/net/mingsoft/cms/dao/ICmsSignDao.java
+++ b/src/main/java/net/mingsoft/cms/dao/ICmsSignDao.java
@@ -25,6 +25,7 @@ package net.mingsoft.cms.dao;
 import net.mingsoft.base.dao.IBaseDao;
 import net.mingsoft.cms.entity.CmsSignEntity;
 import net.mingsoft.cms.entity.PhoneContactsEntity;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -37,5 +38,5 @@ import java.util.List;
  */
 @Component("cmsSignDao")
 public interface ICmsSignDao extends IBaseDao<CmsSignEntity> {
-
+    void deleteByContentId(@Param("contentId") String contentId);
 }
diff --git a/src/main/java/net/mingsoft/cms/dao/ICmsSignDao.xml b/src/main/java/net/mingsoft/cms/dao/ICmsSignDao.xml
index edd3d28b..cd251286 100644
--- a/src/main/java/net/mingsoft/cms/dao/ICmsSignDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/ICmsSignDao.xml
@@ -6,6 +6,7 @@
 		<id column="id" property="id" /><!--编号 -->
 		<result column="content_id" property="contentId" /><!--关联文章Id -->
 		<result column="manager_name" property="managerName" /><!--用户名 -->
+		<result column="is_sign" property="isSign" /><!--是否签收 -->
 		<result column="create_by" property="createBy" /><!--创建人 -->
 		<result column="create_date" property="createDate" /><!--创建时间 -->
 		<result column="update_by" property="updateBy" /><!--修改人 -->
@@ -20,6 +21,7 @@
 		<set>
 			<if test="contentId != null and contentId != ''">content_id=#{contentId},</if>
 			<if test="managerName != null and managerName != ''">manager_name=#{managerName},</if>
+			<if test="isSign != null and isSign != ''">is_sign=#{isSign},</if>
 			<if test="createBy &gt; 0">create_by=#{createBy},</if>
 			<if test="createDate != null">create_date=#{createDate},</if>
 			<if test="updateBy &gt; 0">update_by=#{updateBy},</if>
@@ -40,6 +42,7 @@
 		<where>
 			<if test="contentId != null and contentId != ''">and content_id=#{contentId}</if>
 			<if test="managerName != null and managerName != ''">and manager_name=#{managerName}</if>
+			<if test="isSign != null and isSign != ''">and is_sign=#{isSign}</if>
 			<if test="createBy &gt; 0"> and create_by=#{createBy} </if>
 			<if test="createDate != null"> and create_date=#{createDate} </if>
 			<if test="updateBy &gt; 0"> and update_by=#{updateBy} </if>
@@ -71,6 +74,7 @@
 		<where>
 			<if test="contentId != null and contentId != ''"> and content_id=#{contentId}</if>
 			<if test="managerName != null and managerName != ''">and manager_name=#{managerName}</if>
+			<if test="isSign != null and isSign != ''">and is_sign=#{isSign}</if>
 			<if test="createBy &gt; 0"> and create_by=#{createBy} </if>
 			<if test="createDate != null"> and create_date=#{createDate} </if>
 			<if test="updateBy &gt; 0"> and update_by=#{updateBy} </if>
@@ -80,4 +84,8 @@
 		</where>
 	</select>
 
+	<delete id="deleteByContentId" >
+		delete from cms_sign where content_id = #{contentId}
+	</delete>
+
 </mapper>
diff --git a/src/main/java/net/mingsoft/cms/dao/IDutyPoliceDao.java b/src/main/java/net/mingsoft/cms/dao/IDutyPoliceDao.java
new file mode 100644
index 00000000..bf84f056
--- /dev/null
+++ b/src/main/java/net/mingsoft/cms/dao/IDutyPoliceDao.java
@@ -0,0 +1,46 @@
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+package net.mingsoft.cms.dao;
+
+import net.mingsoft.base.dao.IBaseDao;
+import net.mingsoft.cms.entity.DutyPoliceEntity;
+import net.mingsoft.cms.entity.DutyStandbyEntity;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 分类持久层
+ * @author 铭飞开发团队
+ * 创建日期：2024-03-20 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+@Component("dutyPoliceDao")
+public interface IDutyPoliceDao extends IBaseDao<DutyPoliceEntity> {
+
+    void deleteByEntity(DutyPoliceEntity entity);
+
+
+    void deleteByContentIds(@Param("contentIds") List<String> contentIds);
+}
diff --git a/src/main/java/net/mingsoft/cms/dao/IDutyPoliceDao.xml b/src/main/java/net/mingsoft/cms/dao/IDutyPoliceDao.xml
new file mode 100644
index 00000000..807255f0
--- /dev/null
+++ b/src/main/java/net/mingsoft/cms/dao/IDutyPoliceDao.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="net.mingsoft.cms.dao.IDutyPoliceDao">
+
+	<resultMap id="resultMap" type="net.mingsoft.cms.entity.DutyPoliceEntity">
+		<id column="id" property="id" /><!--编号 -->
+		<result column="duty_date" property="dutyDate" /><!--值班日期 -->
+		<result column="leader_name" property="leaderName" /><!--值日警官领导岗 -->
+		<result column="dept_name" property="deptName" /><!--值日警官轮值科室 -->
+		<result column="create_by" property="createBy" /><!--创建人 -->
+		<result column="create_date" property="createDate" /><!--创建时间 -->
+		<result column="update_by" property="updateBy" /><!--修改人 -->
+		<result column="update_date" property="updateDate" /><!--修改时间 -->
+		<result column="del" property="del" /><!--删除标记 -->
+	</resultMap>
+
+
+	<!--更新-->
+	<update id="updateEntity" parameterType="net.mingsoft.cms.entity.DutyPoliceEntity">
+		update duty_police
+		<set>
+			<if test="dutyDate != null and dutyDate != ''">duty_date=#{dutyDate},</if>
+			<if test="leaderName != null and leaderName != ''">leader_name=#{leaderName},</if>
+			<if test="deptName != null and deptName != ''">dept_name=#{deptName},</if>
+			<if test="createBy &gt; 0">create_by=#{createBy},</if>
+			<if test="createDate != null">create_date=#{createDate},</if>
+			<if test="updateBy &gt; 0">update_by=#{updateBy},</if>
+			<if test="updateDate != null">update_date=#{updateDate},</if>
+			<if test="del != null">del=#{del},</if>
+		</set>
+		where id = #{id}
+	</update>
+
+	<!--根据id获取-->
+	<select id="getEntity" resultMap="resultMap" parameterType="int">
+		select * from duty_police where id=#{id}
+	</select>
+
+	<!--根据实体获取-->
+	<select id="getByEntity" resultMap="resultMap" parameterType="net.mingsoft.cms.entity.DutyPoliceEntity">
+		select * from duty_police
+		<where>
+			<if test="dutyDate != null and dutyDate != ''">and duty_date=#{dutyDate}</if>
+			<if test="leaderName != null and leaderName != ''">and leader_name=#{leaderName}</if>
+			<if test="deptName != null and deptName != ''">and dept_name=#{deptName}</if>
+			<if test="createBy &gt; 0"> and create_by=#{createBy} </if>
+			<if test="createDate != null"> and create_date=#{createDate} </if>
+			<if test="updateBy &gt; 0"> and update_by=#{updateBy} </if>
+			<if test="updateDate != null"> and update_date=#{updateDate} </if>
+			<if test="del != null"> and del=#{del} </if>
+		</where>
+	</select>
+
+	<!--删除-->
+	<delete id="deleteEntity" parameterType="int">
+		delete from duty_police  where id=#{id}
+	</delete>
+
+	<delete id="deleteByEntity" parameterType="int">
+		delete from duty_police
+		<where>
+			<if test="dutyDate != null and dutyDate != ''">and duty_date=#{dutyDate}</if>
+		</where>
+	</delete>
+
+	<!--批量删除-->
+	<delete id="delete" >
+		delete from duty_police
+		<where>
+			id  in <foreach collection="ids" item="item" index="index"
+							open="(" separator="," close=")">#{item}</foreach>
+		</where>
+	</delete>
+	<!--查询全部-->
+	<select id="queryAll" resultMap="resultMap">
+		select * from duty_police order by id desc
+	</select>
+	<!--条件查询-->
+	<select id="query" resultMap="resultMap">
+		select * from duty_police
+		<where>
+			<if test="dutyDate != null and dutyDate != ''">and duty_date=#{dutyDate}</if>
+			<if test="leaderName != null and leaderName != ''">and leader_name=#{leaderName}</if>
+			<if test="deptName != null and deptName != ''">and dept_name=#{deptName}</if>
+			<if test="contentId != null and contentId != ''">and content_id=#{contentId}</if>
+			<if test="filePath != null and filePath != ''">and file_path=#{filePath}</if>
+			<if test="createBy &gt; 0"> and create_by=#{createBy} </if>
+			<if test="createDate != null"> and create_date=#{createDate} </if>
+			<if test="updateBy &gt; 0"> and update_by=#{updateBy} </if>
+			<if test="updateDate != null"> and update_date=#{updateDate} </if>
+			<if test="del != null"> and del=#{del} </if>
+			<include refid="net.mingsoft.base.dao.IBaseDao.sqlWhere"></include>
+		</where>
+	</select>
+
+	<delete id="deleteByContentIds" parameterType="String">
+		delete from duty_police
+		<where>
+			content_id  in <foreach collection="contentIds" item="item" index="index"
+							open="(" separator="," close=")">#{item}</foreach>
+		</where>
+	</delete>
+
+</mapper>
diff --git a/src/main/java/net/mingsoft/cms/entity/CmsSignEntity.java b/src/main/java/net/mingsoft/cms/entity/CmsSignEntity.java
index c9571df1..f2adefd0 100644
--- a/src/main/java/net/mingsoft/cms/entity/CmsSignEntity.java
+++ b/src/main/java/net/mingsoft/cms/entity/CmsSignEntity.java
@@ -52,7 +52,6 @@ private static final long serialVersionUID = 1574925152617L;
 	/**
 	 * 是否签收
 	 */
-	@TableField(exist = false)
 	private String isSign;
 
 	@Override
diff --git a/src/main/java/net/mingsoft/cms/entity/DutyPoliceEntity.java b/src/main/java/net/mingsoft/cms/entity/DutyPoliceEntity.java
new file mode 100644
index 00000000..e60fddbe
--- /dev/null
+++ b/src/main/java/net/mingsoft/cms/entity/DutyPoliceEntity.java
@@ -0,0 +1,119 @@
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+package net.mingsoft.cms.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableName;
+import net.mingsoft.base.entity.BaseEntity;
+
+/**
+* 值日警官表
+* @author 铭飞开发团队
+* 创建日期：2024-03-20 15:12:32<br/>
+* 历史修订：<br/>
+*/
+@TableName("duty_police")
+public class DutyPoliceEntity extends BaseEntity {
+
+
+	private static final long serialVersionUID = -202180033093209501L;
+	private String id;
+
+	/**
+	* 值班日期
+	*/
+	@ExcelProperty("值班日期")
+	private String dutyDate;
+
+	/**
+	 * 带班长
+	 */
+	@ExcelProperty("值日警官领导岗")
+	private String leaderName;
+
+	/**
+	 * 民警值班员
+	 */
+	@ExcelProperty("值日警官轮值科室")
+	private String deptName;
+
+	/**
+	 * 上传文件路径
+	 */
+	private String filePath;
+
+	/**
+	 * 关联文章Id
+	 */
+	private String contentId;
+
+	@Override
+	public String getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getDutyDate() {
+		return dutyDate;
+	}
+
+	public void setDutyDate(String dutyDate) {
+		this.dutyDate = dutyDate;
+	}
+
+	public String getLeaderName() {
+		return leaderName;
+	}
+
+	public void setLeaderName(String leaderName) {
+		this.leaderName = leaderName;
+	}
+
+	public String getDeptName() {
+		return deptName;
+	}
+
+	public void setDeptName(String deptName) {
+		this.deptName = deptName;
+	}
+
+	public String getFilePath() {
+		return filePath;
+	}
+
+	public void setFilePath(String filePath) {
+		this.filePath = filePath;
+	}
+
+	public String getContentId() {
+		return contentId;
+	}
+
+	public void setContentId(String contentId) {
+		this.contentId = contentId;
+	}
+}
diff --git a/src/main/java/net/mingsoft/cms/excel/DutyPoliceExcel.java b/src/main/java/net/mingsoft/cms/excel/DutyPoliceExcel.java
new file mode 100644
index 00000000..be2e8139
--- /dev/null
+++ b/src/main/java/net/mingsoft/cms/excel/DutyPoliceExcel.java
@@ -0,0 +1,81 @@
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+package net.mingsoft.cms.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import java.io.Serializable;
+
+/**
+* 值班备勤表
+* @author 铭飞开发团队
+* 创建日期：2024-03-20 15:12:32<br/>
+* 历史修订：<br/>
+*/
+public class DutyPoliceExcel implements Serializable {
+
+
+	private static final long serialVersionUID = -8204345859257208121L;
+	/**
+	* 值班日期
+	*/
+	@ExcelProperty("值班日期")
+	private String dutyDate;
+
+	/**
+	 * 值日警官领导岗
+	 */
+	@ExcelProperty("值日警官领导岗")
+	private String leaderName;
+
+	/**
+	 * 值日警官轮值科室
+	 */
+	@ExcelProperty("值日警官轮值科室")
+	private String deptName;
+
+
+	public String getDutyDate() {
+		return dutyDate;
+	}
+
+	public void setDutyDate(String dutyDate) {
+		this.dutyDate = dutyDate;
+	}
+
+	public String getLeaderName() {
+		return leaderName;
+	}
+
+	public void setLeaderName(String leaderName) {
+		this.leaderName = leaderName;
+	}
+
+	public String getDeptName() {
+		return deptName;
+	}
+
+	public void setDeptName(String deptName) {
+		this.deptName = deptName;
+	}
+}
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
index e928e6c0..c9b99c42 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
@@ -22,7 +22,7 @@
                 </@shiro.hasPermission>
                 <el-button v-if="categoryType==1" size="mini" class="iconfont icon-fanhui" plain onclick="javascript:history.go(-1)">返回
                 </el-button>
-                <el-button v-if="categoryType==2 && false" size="mini" type="danger" icon="el-icon-delete" @click="del()">删除1
+                <el-button v-if="categoryType==2" size="mini" type="danger" icon="el-icon-delete" @click="del()">删除
                 </el-button>
             </el-col>
         </el-row>
@@ -188,6 +188,24 @@
                                     </div>
                                 </el-form-item>
                             </el-col>
+                            <el-col :span=12>
+                                <el-form-item label="文章标签" prop="contentTags">
+                                    <el-select v-model="form.contentTags"
+                                               :style="{width: '100%'}"
+                                               :filterable="false"
+                                               :disabled="false"
+                                               :multiple="true" :clearable="true"
+                                               placeholder="请选择文章标签">
+                                        <el-option v-for='item in contentTagsOptions' :key="item.dictValue"
+                                                   :value="item.dictValue"
+                                                   :label="item.dictLabel"></el-option>
+                                    </el-select>
+                                    <div class="ms-form-tip">
+                                        标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'$'}{field.tags}</a>
+                                        通过自定义字典可扩展数据；字典类型：文章标签
+                                    </div>
+                                </el-form-item>
+                            </el-col>
                         </el-row>
                         <el-row
                                 :gutter=0
@@ -218,21 +236,19 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span=12>
-                                <el-form-item label="文章标签" prop="contentTags">
-                                    <el-select v-model="form.contentTags"
+                                <el-form-item label="下发科室" >
+                                    <el-select v-model="form.signOfficeList"
                                                :style="{width: '100%'}"
                                                :filterable="false"
                                                :disabled="false"
                                                :multiple="true" :clearable="true"
-                                               placeholder="请选择文章标签">
-                                        <el-option v-for='item in contentTagsOptions' :key="item.dictValue"
-                                                   :value="item.dictValue"
-                                                   :label="item.dictLabel"></el-option>
+                                               placeholder="请选择下发科室"
+                                               @change="e=>handleOfficeChange(e)"
+                                            >
+                                        <el-option v-for='item in signOfficeOptions' :key="item"
+                                                   :value="item"
+                                                   :label="item"></el-option>
                                     </el-select>
-                                    <div class="ms-form-tip">
-                                        标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'$'}{field.tags}</a>
-                                        通过自定义字典可扩展数据；字典类型：文章标签
-                                    </div>
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -343,9 +359,12 @@
                     //文章外链接
                     contentOutLink: '',
                     contentDatetime: ms.util.date.fmt(Date.now(),"yyyy-MM-dd hh:mm:ss"),
+                    //下发科室
+                    signOfficeList:[],
                 },
                 categoryType: '1',
                 contentTypeOptions: [],
+                signOfficeOptions: [],
                 contentTagsOptions: [],
                 categoryIdOptions: [],
                 contentDisplayOptions: [{
@@ -388,6 +407,11 @@
             }
         },
         methods: {
+            handleOfficeChange: function (e) {
+                var that = this
+                that.form.signOfficeList = e
+                this.form.signOfficeList = e
+            },
             save: function () {
                 var _this = this;
                 var that = this; //自定义模型需要验证
@@ -414,7 +438,7 @@
                     that.form.contentImg = [];
                 }
 
-                this.$refs.form[0].validate(function (valid) {
+                this.$refs.form[0].validate(function (valid,data) {
                     if (valid) {
                         that.saveDisabled = true; //判断
 
@@ -458,6 +482,17 @@
                                     window.model.form.linkId = data.data.id;
                                     window.model.save();
                                 }
+
+                                if(that.form.signOfficeList && that.form.signOfficeList.length){
+                                    let newArr = []
+                                    that.form.signOfficeList.map(i=>newArr.push({managerName:i,contentId:data.data.id}))
+                                    ms.http.post(ms.manager + "/cms/sign/saveList.do", newArr,{
+                                        headers: {
+                                            'Content-Type': 'application/json'
+                                        }
+                                    })
+                                }
+
                                 that.$notify({
                                     title: '成功',
                                     message: '保存成功',
@@ -584,21 +619,45 @@
                         } else {
                             res.data.contentImg = [];
                         }
+                        //查询当前文章的科室
+                        if(ms.util.getParameter("id")){
+                            ms.http.get(ms.manager + "/cms/sign/list.do",{
+                                "contentId": ms.util.getParameter("id")
+                            }).then(res2=>{
+                                if(res2.result){
+                                    res.data.signOfficeList = res2.data.map(i=>i.managerName);
+                                }
+                                that.form = res.data;
+                                var category = that.categoryIdOptions.filter(function (f) {
+                                    return f['id'] == that.form.categoryId;
+                                });
 
-                        that.form = res.data;
-                        var category = that.categoryIdOptions.filter(function (f) {
-                            return f['id'] == that.form.categoryId;
-                        });
+                                if (category.length > 0) {
+                                    that.categoryType = category[0].categoryType
+                                    if (category[0].categoryType == '2' || category[0].categoryType == '3') {
+                                        that.returnIsShow = false;
+                                    }
+                                }
+                                that.changeModel();
+                            })
+                        }else{
+                            that.form = res.data;
+                            var category = that.categoryIdOptions.filter(function (f) {
+                                return f['id'] == that.form.categoryId;
+                            });
 
-                        if (category.length > 0) {
-                            that.categoryType = category[0].categoryType
-                            if (category[0].categoryType == '2' || category[0].categoryType == '3') {
-                                that.returnIsShow = false;
+                            if (category.length > 0) {
+                                that.categoryType = category[0].categoryType
+                                if (category[0].categoryType == '2' || category[0].categoryType == '3') {
+                                    that.returnIsShow = false;
+                                }
                             }
+                            that.changeModel();
                         }
-                        that.changeModel();
+
                     }
                 });
+
             },
             //根据封面获取当前文章
             getFromFengMian: function (categoryId) {
@@ -809,7 +868,19 @@
         created: function () {
             this.contentCategoryIdOptionsGet();
             this.contentTypeOptionsGet();
-            this.contentTagsOptionsGet();
+            this.contentTagsOptionsGet()
+
+        },
+        mounted: function () {
+            //查询所有科室
+            ms.http.get(ms.manager + "/cms/sign/getManagerList.do").then(res=>{
+                if(res.result){
+                        this.signOfficeOptions = res.data;
+                    }
+            })
+        },
+        beforeDestroy: function () {
+            localStorage.removeItem('filePath')
         }
     });
 </script>
diff --git a/src/main/webapp/template/1/default/chuhuijiyao-detail.htm b/src/main/webapp/template/1/default/chuhuijiyao-detail.htm
index e959c250..03ff007d 100644
--- a/src/main/webapp/template/1/default/chuhuijiyao-detail.htm
+++ b/src/main/webapp/template/1/default/chuhuijiyao-detail.htm
@@ -23,147 +23,160 @@
 </head>
 
 <body>
-  <div>
-    <#include "header.htm" />
-    <div class="o_big">
-        <h1>${field.typedescrip}</h1>
-    </div>
-    <!--正文begin-->
-    <!--<div class="wrap">
+    <div>
+        <#include "header.htm" />
+        <div class="o_big">
+            <h1>${field.typedescrip}</h1>
+        </div>
+        <!--正文begin-->
+        <!--<div class="wrap">
         <div class="product_a anim anim-1"></div>
     </div>-->
-    <div class="index-contentbox">
-        <div class="wrap">
-            <div class="pagebreadcrumb"> 
-                <a href='/html/web/index.html'>首页</a>><a
-                            href='/html/web/index.html'>${field.typetitle}</a>
-            </div>
-            <h1 class="chuhuijiyao_title">${field.typetitle}</h1>
-            <div class="about_x anim anim-2">
-                <div class="show_t" style="font-size:22px;color:#000;font-weight:bold">${field.title}</div>
-                <div class="con_line" style="font-size:18px;">
-                    发布时间：${field.date?string("yyyy-MM-dd")}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;发布科室：${field.author}
-                </div>
-                <div class="con_id">
-                    <div >${field.content}</div>    	
-                </div>
-              <#if field.typetitle == '会议通知' || field.typetitle == '通知公告'>
-              <div style="border-bottom:1px #c8c8c8 dashed"></div>
-               </#if>
-              <#if field.typetitle == '会议通知' || field.typetitle == '通知公告'>
-              <div id="signed">
-                <div class="signed">
-                  <span>已签收：</span>{{signedStr}}
-                </div>
-                <div class="unsigned">
-                	<span>未签收：</span>{{unSignedStr}}
-                </div>
-                <div style="display:flex;justify-content:center">
-                	<button class="signBtn" style="width:150px;height:50px;background:#004ebd;color:#fff;font-size:18px;margin-bottom:50px;cursor:pointer" @click="handleSign(${field.id})" data-fieldid="${field.id}" v-if="signBtnFlag">点击签收</button>
+        <div class="index-contentbox">
+            <div class="wrap">
+                <div class="pagebreadcrumb">
+                    <a href='/html/web/index.html'>首页</a>><a href='/html/web/index.html'>${field.typetitle}</a>
                 </div>
-              </div>
-               </#if>
-                {ms:arclist tableName="MDIY_MODEL_NEWS"}
-                <div id="myList"></div>
-                {/ms:arclist}
-              <div>
-              </div>
-              <script>
-                var app = new Vue({
-                  el: '#signed',
-                  data: {
-                    signedStr:'',
-                	unSignedStr:'',
-                	signBtnFlag:true,
-                  },
-                  methods:{
-                  	handleSign(contentId){
-                		   axios.get('/ms/checkLogin.do').then(res=>{
-                     			if(res.data.code == 200 && res.data.result){
-                					axios.post('/ms/cms/sign/save.do',{contentId:String(contentId),managerName:res.data.data.managerNickName}, {
-          headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
-          }
-        }).then(res2=>{
-                			if(res2.data.code == 200){
-                				alert('签收成功')
-                				location.reload()
-                				}else{
-                				alert('签收失败请联系管理员')
-                			}					
-                			})
-                               		}else{
-                               		alert('请登录');
-   							}
-              			})  
-                	}
-                  },
-                  mounted(){
-					axios.post('/ms/cms/sign/list.do',{contentId: ${field.id}}, {
-          headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
-          }
-        }).then(res=>{
-                		res.data.data.map(i=>{
-                			if(i.isSign == '1'){
-                				this.signedStr += i.managerName + '、'
-                			}else{
-                				this.unSignedStr += i.managerName + '、'
-                			}
-                		})
-                			this.signedStr =  this.signedStr.substr(0,this.signedStr.length-1)
-                			this.unSignedStr = this.unSignedStr.substr(0,this.unSignedStr.length-1)
-                            axios.get('/ms/checkLogin.do').then(res2=>{
-                                    if(res.data.data.some(i=>i.isSign == '1' && i.managerName == res2.data.data.managerNickName )){
-                                        this.signBtnFlag = false
-                                    }
-                			})
-                	})
+                <h1 class="chuhuijiyao_title">${field.typetitle}</h1>
+                <div class="about_x anim anim-2">
+                    <div class="show_t" style="font-size:22px;color:#000;font-weight:bold">${field.title}</div>
+                    <div class="con_line" style="font-size:18px;">
+                        发布时间：${field.date?string("yyyy-MM-dd")}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;发布科室：${field.author}
+                    </div>
+                    <div class="con_id">
+                        <div>${field.content}</div>
+                    </div>
+                    <#if field.typetitle=='会议通知' || field.typetitle=='通知公告'>
+                        <div style="border-bottom:1px #c8c8c8 dashed"></div>
+                    </#if>
+                    <#if field.typetitle=='会议通知' || field.typetitle=='通知公告'>
+                        <div id="signed">
+                            <div class="signed">
+                                <span>已签收：</span>{{signedStr}}
+                            </div>
+                            <div class="unsigned">
+                                <span>未签收：</span>{{unSignedStr}}
+                            </div>
+                            <div style="display:flex;justify-content:center">
+                                <button class="signBtn"
+                                    style="width:150px;height:50px;background:#004ebd;color:#fff;font-size:18px;margin-bottom:50px;cursor:pointer"
+                                    @click="handleSign()"
+                                    v-if="signBtnFlag && isLogin">点击签收</button>
+                            </div>
+                        </div>
+                    </#if>
+                    {ms:arclist tableName="MDIY_MODEL_NEWS"}
+                    <div id="myList"></div>
+                    {/ms:arclist}
+                    <div>
+                    </div>
+                    <script>
+                        var app = new Vue({
+                            el: '#signed',
+                            data: {
+                                signedStr: '',
+                                unSignedStr: '',
+                                signBtnFlag: false,
+                      			isLogin:false
+                            },
+                            methods: {
+                                handleSign() {
+                                    axios.get('/ms/checkLogin.do').then(res => {
+                                        if (res.data.code == 200 && res.data.result) {
+                                            axios.post('/ms/cms/sign/save.do', { contentId: String(window.location.href.substr(window.location.href.lastIndexOf('/')+1,19)), managerName: res.data.data.managerNickName }, {
+                                                headers: {
+                                                    'Content-Type': 'application/x-www-form-urlencoded'
+                                                }
+                                            }).then(res2 => {
+                                                if (res2.data.code == 200) {
+                                                    alert('签收成功')
+                                                    location.reload()
+                                                } else {
+                                                    alert('签收失败请联系管理员')
+                                                }
+                                            })
+                                        } else {
+                                            alert('请登录');
+                                        }
+                                    })
+                                }
+                            },
+                            mounted() {
+                      			axios.get('/ms/checkLogin.do').then(res => {
+                                        if (res.data.code == 200 && res.data.result) {
+                                            this.isLogin = true
+                                        }
+                                 })
+                      
+                                axios.post('/cms/sign/list.do', { contentId: window.location.href.substr(window.location.href.lastIndexOf('/')+1,19)}, {
+                            headers: {
+                                'Content-Type': 'application/x-www-form-urlencoded'
+                            }
+                        }).then(res => {
+                            res.data.data.map(i => {
+                                if (i.isSign == '1') {
+                                    this.signedStr += i.managerName + '、'
+                                } else {
+                                    this.unSignedStr += i.managerName + '、'
+                                }
+                            })
+                            this.signedStr = this.signedStr.substr(0, this.signedStr.length - 1)
+                            this.unSignedStr = this.unSignedStr.substr(0, this.unSignedStr.length - 1)
+                            axios.get('/ms/checkLogin.do').then(res2 => {
+                                if (res.data.data.some(i => i.isSign == '0' && i.managerName == res2.data.data.managerNickName)) {
+                                    this.signBtnFlag = true
+                                }
+                            })
+                        })
                 }
               })
-              </script>
-                <script>
-                    var images = ${ field.IMGS };
+                    </script>
+                    <script>
+                        var images = ${ field.IMGS };
 
-                    // 遍历对象数组
-                    for (var i = 0; i < images.length; i++) {
-                        var imgElement = document.createElement("img"); // 创建新的<img>元素
+                        // 遍历对象数组
+                        for (var i = 0; i < images.length; i++) {
+                            var imgElement = document.createElement("img"); // 创建新的<img>元素
 
-                        // 设置图片路径为当前对象的属性值
-                        imgElement.src = images[i].response.data;
-                        imgElement.style.width = "400px"
-                        imgElement.style.height = "400px"
-                        imgElement.style.margin = "0 10px 0 0"
+                            // 设置图片路径为当前对象的属性值
+                            imgElement.src = images[i].response.data;
+                            imgElement.style.width = "400px"
+                            imgElement.style.height = "400px"
+                            imgElement.style.margin = "0 10px 0 0"
 
-                        // 将<img>元素添加到页面上的指定位置（此处假设目标容器id为"container"）
-                        document.getElementById("myList").appendChild(imgElement);
-                    }
+                            // 将<img>元素添加到页面上的指定位置（此处假设目标容器id为"container"）
+                            document.getElementById("myList").appendChild(imgElement);
+                        }
 
-                </script>
+                    </script>
+                </div>
             </div>
+        </div>
+        <!--正文end-->
+        <#include "footer.htm" />
+        <script language="javascript" src="/{ms:global.style/}js/foot.js"></script><!--尾部end-->
     </div>
-               </div>
-    <!--正文end-->
-    <#include "footer.htm" />
-    <script language="javascript" src="/{ms:global.style/}js/foot.js"></script><!--尾部end-->
-  </div>
 </body>
-  <style>
-  	.signed{
-    	color:#999999;
-    	font-size:18px;
-    	margin:50px 0 30px 0;
+<style>
+    .signed {
+        color: #999999;
+        font-size: 18px;
+        margin: 50px 0 30px 0;
     }
-    .signed span{
-    	font-weight:bold
+
+    .signed span {
+        font-weight: bold
     }
-    .unsigned{
-    	color:#df1f00;
-    	font-size:18px;
-    	margin-bottom:50px;
+
+    .unsigned {
+        color: #df1f00;
+        font-size: 18px;
+        margin-bottom: 50px;
     }
-    .unsigned span{
-    	font-weight:bold
+
+    .unsigned span {
+        font-weight: bold
     }
-  </style>
+</style>
+
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/template/1/default/css/header.css b/src/main/webapp/template/1/default/css/header.css
index a7ed2e4c..7a8ffb52 100644
--- a/src/main/webapp/template/1/default/css/header.css
+++ b/src/main/webapp/template/1/default/css/header.css
@@ -1,8 +1,8 @@
 .header_box {
   width:1920px;
-  height: 600px;
-  background: url(../images/banner.png);
-  background-size: 1920px 600px;
+  height: 500px;
+  background: url(../images/banner.jpg);
+  background-size: 1920px 500px;
   background-repeat: no-repeat;
 }
 
diff --git a/src/main/webapp/template/1/default/index.htm b/src/main/webapp/template/1/default/index.htm
index 36ac84b3..ccfe137c 100644
--- a/src/main/webapp/template/1/default/index.htm
+++ b/src/main/webapp/template/1/default/index.htm
@@ -1,32 +1,35 @@
 <!DOCTYPE html>
 <html>
+
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <meta name="renderer" content="webkit">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
-    <meta name="robots" content="index, follow"/>
-    <title>{ms:global.name/}</title>
-    <meta name="keywords" content="{ms:global.keyword/}">
-    <meta name="description" content="{ms:global.descrip/}">
-    <meta http-equiv="Cache-Control" content="no-transform"/>
-    <meta http-equiv="Cache-Control" content="no-siteapp"/>
-    <meta name="applicable-device" content="pc,mobile"/>
-    <link href="/favicon.ico" rel="shortcut icon"/>
-    <link href="/{ms:global.style/}css/style.css" rel="stylesheet"/>
-  	<link href="/{ms:global.style/}css/swiper.min.css" rel="stylesheet"/>
-    <link href="/{ms:global.style/}css/index.css" rel="stylesheet"/>
-    <script src="/{ms:global.style/}js/jquery-1.8.3.min.js"></script>
-    <script type="text/javascript" src="/{ms:global.style/}js/jquery.superslide.2.1.1.js">//pc导航</script>
-    <script type="text/javascript" src="/{ms:global.style/}js/jquery.bxslider.min.js">/*轮显*/</script>
-    <script src="/{ms:global.style/}js/anim.js">//动画</script>
-    <script src="/{ms:global.style/}js/owl.carousel.js"></script>
-    <script type="text/javascript" src="/{ms:global.style/}js/basic.js"></script>
-  	<script src="/{ms:global.style/}/js/swiper.min.js"></script>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta name="renderer" content="webkit">
+  <meta name="viewport"
+    content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+  <meta name="robots" content="index, follow" />
+  <title>{ms:global.name/}</title>
+  <meta name="keywords" content="{ms:global.keyword/}">
+  <meta name="description" content="{ms:global.descrip/}">
+  <meta http-equiv="Cache-Control" content="no-transform" />
+  <meta http-equiv="Cache-Control" content="no-siteapp" />
+  <meta name="applicable-device" content="pc,mobile" />
+  <link href="/favicon.ico" rel="shortcut icon" />
+  <link href="/{ms:global.style/}css/style.css" rel="stylesheet" />
+  <link href="/{ms:global.style/}css/swiper.min.css" rel="stylesheet" />
+  <link href="/{ms:global.style/}css/index.css" rel="stylesheet" />
+  <script src="/{ms:global.style/}js/jquery-1.8.3.min.js"></script>
+  <script type="text/javascript" src="/{ms:global.style/}js/jquery.superslide.2.1.1.js">//pc导航</script>
+  <script type="text/javascript" src="/{ms:global.style/}js/jquery.bxslider.min.js">/*轮显*/</script>
+  <script src="/{ms:global.style/}js/anim.js">//动画</script>
+  <script src="/{ms:global.style/}js/owl.carousel.js"></script>
+  <script type="text/javascript" src="/{ms:global.style/}js/basic.js"></script>
+  <script src="/{ms:global.style/}/js/swiper.min.js"></script>
 </head>
+
 <body>
-<#include "header.htm" />
- 
-    <div class="index-contentbox">
+  <#include "header.htm" />
+
+  <div class="index-contentbox">
     <div style="margin: 50px 0; width: 100%;">
       <a>
         <img src="/{ms:global.style/}images/hf.png" width="1440px" height="140px" class="oimg">
@@ -39,29 +42,29 @@
     <div class="cg_news">
       <div class="top_news">
         <a href="/html/web/article/dongtaiyaowen/index.html">
-        <div class="tnjump">
-          更多>>
-        </div>
+          <div class="tnjump">
+            更多>>
+          </div>
         </a>
         <div class="swiper-news" style="width:86%;overflow:hidden;margin-bottom: 30px;">
           <div class="swiper-wrapper  news-wrapper">
-              {ms:arclist typeid=1765306882908344322 flag="h"}
+            {ms:arclist typeid=1765306882908344322 flag="h"}
             <div class="swiper-slide" style="display: block;">
               <!--<a href="http://192.168.1.104:8080/html/webdongtaiyaowen/1769971821543133186.html" target="_blank">
                       <img src='/upload/1/cms/content/1710831357309.jpg' alt="" />
                   </a>
                   <span>南宁 政府工作报告对全市档案工作给予肯...</span> -->
-              <a href="{ms:global.html/}${field.link}" >
-              <div style="display: flex; align-items: center;">
-                <div class="new_tag">头条</div>
-                <div class="new_tit"> ${field.title}</div>
-              </div>
-              <div class="new_msg">
-                ${field.descrip}
-              </div>
-                </a>
+              <a href="{ms:global.html/}${field.link}">
+                <div style="display: flex; align-items: center;">
+                  <div class="new_tag">头条</div>
+                  <div class="new_tit"> ${field.title}</div>
+                </div>
+                <div class="new_msg">
+                  ${field.descrip}
+                </div>
+              </a>
             </div>
-              {/ms:arclist}
+            {/ms:arclist}
             <!-- <div class="swiper-slide" style="justify-content: flex-start;">
               <div class="new_tag">头条</div>
               <div class="new_tit">国家档案局2019年度部门决算</div>
@@ -80,7 +83,7 @@
           });
         </script>
       </div>
-        <img src="/{ms:global.style/}images/line.png"/>
+      <img src="/{ms:global.style/}images/line.png" />
       <div class="center_news">
         <div class="slider_news">
           <div class="swiper-container">
@@ -91,12 +94,19 @@
     height: 100%;
     cursor: pointer;">
                   <img src='{@ms:file field.litpic/}' alt="">
-               <div style="width:82px;height:82px;background:red;position:absolute;top:30px;left:30px;display:flex;flex-direction:column;align-items:center;color:#fff"><div style="font-size:30px;margin-top:12px">${field.date?string("dd")}</div><div style="font-size:14px">${field.date?string("yyyy-MM")}</div> </div>
-                <span><div style="width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap">${field.title}</div></span>
-                   </a>
+                  <div
+                    style="width:82px;height:82px;background:red;position:absolute;top:30px;left:30px;display:flex;flex-direction:column;align-items:center;color:#fff">
+                    <div style="font-size:30px;margin-top:12px">${field.date?string("dd")}</div>
+                    <div style="font-size:14px">${field.date?string("yyyy-MM")}</div>
+                  </div>
+                  <span>
+                    <div style="width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap">${field.title}
+                    </div>
+                  </span>
+                </a>
               </div>
               {/ms:arclist}
-              
+
             </div>
 
             <div class="swiper-pagination"></div>
@@ -120,7 +130,7 @@
         </script>
         <div class="right_news">
           <ul class="right_ul_news" id="news_list">
-          {ms:arclist typeid=1765306882908344322 size=10 noflag=h}
+            {ms:arclist typeid=1765306882908344322 size=10 noflag=h}
             <#if field.index gt 3>
               <a href="{ms:global.html/}${field.link}">
                 <li class="news_link">
@@ -128,16 +138,16 @@
                     <div class="newd"></div>
                     <div class="newb" data-time="${field.date?string('yyyy-MM-dd')}">NEW</div>
                     <div class=" nwest titlelong" data-time="${field.date?string('yyyy-MM-dd')}">
-                      		{@ms:len field.title 26 /}
+                      {@ms:len field.title 26 /}
                     </div>
                     <div class=" nwest titleshort" data-time="${field.date?string('yyyy-MM-dd')}">
-                      		{@ms:len field.title 23 /}
+                      {@ms:len field.title 23 /}
                     </div>
                   </div>
                   <span class="fr">${field.date?string("yyyy-MM-dd")}</span>
                 </li>
               </a>
-              </#if>
+            </#if>
             {/ms:arclist}
           </ul>
         </div>
@@ -146,9 +156,9 @@
   </div>
 
 
-  
-  
-  
+
+
+
 
   <!-- 新闻公告文章-->
   <div class="article_box">
@@ -170,9 +180,11 @@
               <li class="bot_arti_li">
                 <div>
                   <div class="newd"></div>
-                  <div class="newb" data-time="${field.date?string('yyyy-MM-dd')}">NEW</div>
-                  <div class="newe font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd')}" title="${field.title}">{@ms:len field.title 12 /}</div>
-                  <div class="newc font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd')}" title="${field.title}">
+                  <div class="newb" data-time="${field.date?string('yyyy-MM-dd HH:MM:ss')}">NEW</div>
+                  <div class="newe font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd HH:MM:ss')}"
+                    title="${field.title}">{@ms:len field.title 12 /}</div>
+                  <div class="newc font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd HH:MM:ss')}"
+                    title="${field.title}">
                     {@ms:len field.title 16 /}
                   </div>
                 </div>
@@ -180,8 +192,6 @@
               </li>
             </a>
             {/ms:arclist}
-           
-           
           </ul>
         </div>
       </li>
@@ -198,22 +208,23 @@
         </div>
         <div class="bottom_arti">
           <ul class="bot_arti_ul">
-             {ms:arclist typeid=1773220534793547778 size=5}
-              <a href="{ms:global.html/}${field.link}">
+            {ms:arclist typeid=1773220534793547778 size=5}
+            <a href="{ms:global.html/}${field.link}">
               <li class="bot_arti_li">
                 <div>
                   <div class="newd"></div>
                   <div class="newb" data-time="${field.date?string('yyyy-MM-dd')}">NEW</div>
-                  <div class="newe font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd')}" style>{@ms:len field.title 12 /}</div>
-                  <div class="font-overflow-one nwest newc" data-time="${field.date?string('yyyy-MM-dd')}" >
+                  <div class="newe font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd')}" style>
+                    {@ms:len field.title 12 /}</div>
+                  <div class="font-overflow-one nwest newc" data-time="${field.date?string('yyyy-MM-dd')}">
                     {@ms:len field.title 16 /}
                   </div>
                 </div>
                 <span class="fr">${field.date?string("MM-dd")}</span>
               </li>
             </a>
-        {/ms:arclist}
-       
+            {/ms:arclist}
+
           </ul>
         </div>
       </li>
@@ -223,27 +234,28 @@
             <img src="/{ms:global.style/}images/lj18.png" alt="" srcset="">
             <div class="top_arti-t">领导批示 </div>
           </div>
-          <a href="/html/web/article/lingdaopishi/index.html" >
+          <a href="/html/web/article/lingdaopishi/index.html">
             <div class="top_arti-gd">更多>></div>
           </a>
         </div>
         <div class="bottom_arti">
           <ul class="bot_arti_ul">
-             {ms:arclist typeid=1773220621120712706 size=5}
+            {ms:arclist typeid=1773220621120712706 size=5}
             <a href="{ms:global.html/}${field.link}">
               <li class="bot_arti_li">
                 <div>
                   <div class="newd"></div>
                   <div class="newb" data-time="${field.date?string('yyyy-MM-dd')}">NEW</div>
-                  <div class="newe font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd')}" style>{@ms:len field.title 12 /}</div>
-                  <div class="font-overflow-one nwest newc" data-time="${field.date?string('yyyy-MM-dd')}" >
+                  <div class="newe font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd')}" style>
+                    {@ms:len field.title 12 /}</div>
+                  <div class="font-overflow-one nwest newc" data-time="${field.date?string('yyyy-MM-dd')}">
                     {@ms:len field.title 16 /}
                   </div>
                 </div>
                 <span class="fr">${field.date?string("MM-dd")}</span>
               </li>
             </a>
-         {/ms:arclist}
+            {/ms:arclist}
           </ul>
         </div>
       </li>
@@ -260,20 +272,21 @@
         <div class="bottom_arti">
           <ul class="bot_arti_ul">
             {ms:arclist typeid=1773220710442610689 size=5}
-           <a href="{ms:global.html/}${field.link}">
+            <a href="{ms:global.html/}${field.link}">
               <li class="bot_arti_li">
                 <div>
                   <div class="newd"></div>
                   <div class="newb" data-time="${field.date?string('yyyy-MM-dd')}">NEW</div>
-                  <div class="newe font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd')}" style>{@ms:len field.title 12 /}</div>
-                  <div class="font-overflow-one nwest newc" data-time="${field.date?string('yyyy-MM-dd')}" >
+                  <div class="newe font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd')}" style>
+                    {@ms:len field.title 12 /}</div>
+                  <div class="font-overflow-one nwest newc" data-time="${field.date?string('yyyy-MM-dd')}">
                     {@ms:len field.title 16 /}
                   </div>
                 </div>
                 <span class="fr">${field.date?string("MM-dd")}</span>
               </li>
             </a>
-           {/ms:arclist}
+            {/ms:arclist}
           </ul>
         </div>
       </li>
@@ -295,7 +308,8 @@
                 <div>
                   <div class="newd"></div>
                   <div class="newb" data-time="${field.date?string('yyyy-MM-dd')}">NEW</div>
-                  <div class="newe font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd')}" style>{@ms:len field.title 12 /}</div>
+                  <div class="newe font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd')}" style>
+                    {@ms:len field.title 12 /}</div>
                   <div class="font-overflow-one nwest newc" data-time="${field.date?string('yyyy-MM-dd')}">
                     {@ms:len field.title 16 /}
                   </div>
@@ -303,7 +317,7 @@
                 <span class="fr">${field.date?string("MM-dd")}</span>
               </li>
             </a>
-          {/ms:arclist}
+            {/ms:arclist}
           </ul>
         </div>
       </li>
@@ -319,59 +333,60 @@
         </div>
         <div class="bottom_arti">
           <ul class="bot_arti_ul">
-           
-          {ms:arclist typeid=1773220863731838978 size=5}
+
+            {ms:arclist typeid=1773220863731838978 size=5}
             <a href="{ms:global.html/}${field.link}">
               <li class="bot_arti_li">
                 <div>
                   <div class="newd"></div>
                   <div class="newb" data-time="${field.date?string('yyyy-MM-dd')}">NEW</div>
-                  <div class="newe font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd')}" style>{@ms:len field.title 12 /}</div>
-                  <div class="font-overflow-one nwest newc" data-time="${field.date?string('yyyy-MM-dd')}" >
+                  <div class="newe font-overflow-one nwest" data-time="${field.date?string('yyyy-MM-dd')}" style>
+                    {@ms:len field.title 12 /}</div>
+                  <div class="font-overflow-one nwest newc" data-time="${field.date?string('yyyy-MM-dd')}">
                     {@ms:len field.title 16 /}
                   </div>
                 </div>
                 <span class="fr">${field.date?string("MM-dd")}</span>
               </li>
             </a>
-             {/ms:arclist}
+            {/ms:arclist}
           </ul>
         </div>
       </li>
     </ul>
   </div>
-    
-  
+
+
   <div class="index-contentbox">
     <div style="margin: 50px 0; width: 100%;">
       <div class="swiper swiperCgdt">
-          <!--自定义新增class:swiperOne js代码中使用类名-->
-          <div class="swiper-wrapper wrapper_star">
-		{ms:arclist typeid=1779824029474848769 }
-            <div class="swiper-slide slider_star blue-slide">
-              <a href="{ms:global.html/}${field.link}">
+        <!--自定义新增class:swiperOne js代码中使用类名-->
+        <div class="swiper-wrapper wrapper_star">
+          {ms:arclist typeid=1779824029474848769 }
+          <div class="swiper-slide slider_star blue-slide">
+            <a href="{ms:global.html/}${field.link}">
               <div style="width:100%;height:100%;">
                 <img style="width:100%;" src="{@ms:file field.litpic/}" class="oimg">
               </div>
-                </a>
-            </div>
-            {/ms:arclist}
+            </a>
           </div>
-          <!-- 如果需要导航按钮 -->
-          <!-- <div class="swiper-button-prev pre-btn">
+          {/ms:arclist}
+        </div>
+        <!-- 如果需要导航按钮 -->
+        <!-- <div class="swiper-button-prev pre-btn">
 
           </div>
           <div class="swiper-button-next next-btn">
 
           </div> -->
-        </div>
+      </div>
     </div>
     <script>
       var swiper4 = new Swiper('.swiperCgdt', {
         autoplay: true,
         loop: true,
         slidesPerView: 1,
-        spaceBetween:9999,
+        spaceBetween: 9999,
         navigation: {
           nextEl: '.pre-btn-two',
           prevEl: '.next-btn-two',
@@ -383,23 +398,23 @@
       <div class="dt_left">
         <div class="dt_tit ">
           <div class="titfont">车管动态</div>
-            <a href="/html/web/article/cheguandongtai/index.html">
-          <div style="font-size: 18px;
+          <a href="/html/web/article/cheguandongtai/index.html">
+            <div style="font-size: 18px;
     color: #C8C8C8;">更多>></div>
-         </a>
+          </a>
         </div>
         <div class="dt_con">
           <ul>
             {ms:arclist typeid=1773220968757211138 size=3}
-            
+
             <li>
-              <a href="{ms:global.html/}${field.link}" >
-              <img src="{@ms:file field.litpic/}" alt="">
-              <div class="img_txt font-overflow-two " style="height:50px">${field.title}</div>
-              <div class="dt_con_time">${field.date?string("yyyy-MM-dd")}</div>
-                </a>
+              <a href="{ms:global.html/}${field.link}">
+                <img src="{@ms:file field.litpic/}" alt="">
+                <div class="img_txt font-overflow-two " style="height:50px">${field.title}</div>
+                <div class="dt_con_time">${field.date?string("yyyy-MM-dd")}</div>
+              </a>
             </li>
-            
+
             {/ms:arclist}
           </ul>
         </div>
@@ -414,7 +429,7 @@
           <div class="swiper-star swiper swiperOne dis">
             <!--自定义新增class:swiperOne js代码中使用类名-->
             <div class="swiper-wrapper wrapper_star">
-		{ms:arclist typeid=1773193652723265537}
+              {ms:arclist typeid=1773193652723265537}
               <div class="swiper-slide slider_star blue-slide">
                 <div style="width:100%;height:100%;">
                   <img style="width:100%;height:100%;
@@ -425,7 +440,7 @@
                   <div>${field.title}</div>
                 </div>
               </div>
-    	 {/ms:arclist}        
+              {/ms:arclist}
             </div>
             <!-- 如果需要导航按钮 -->
             <div class="swiper-button-prev pre-btn">
@@ -449,7 +464,7 @@
                   <div>${field.title}</div>
                 </div>
               </div>
-               {/ms:arclist}   
+              {/ms:arclist}
             </div>
             <!-- 如果需要导航按钮 -->
             <div class="swiper-button-prev pre-btn-jdgw">
@@ -479,8 +494,8 @@
         <div class="bottom_arti">
           <ul class="bot_arti_ul">
             {ms:arclist typeid=1773221037258584065 size=5}
-            
-            <a href="{ms:global.html/}${field.link}" >
+
+            <a href="{ms:global.html/}${field.link}">
               <li class="bot_arti_li">
                 <div style="width: 74%;">
                   <div class="newd"></div>
@@ -491,11 +506,11 @@
                 <span class="fr">${field.date?string("MM-dd")}</span>
               </li>
             </a>
-          {/ms:arclist}
+            {/ms:arclist}
           </ul>
         </div>
       </li>
-      <li class="article_con article_con2" >
+      <li class="article_con article_con2">
         <div class="top_arti">
           <div style="display: flex;align-items: center;">
             <div class="top_arti-t">政工通告 </div>
@@ -506,13 +521,13 @@
         </div>
         <div class="bottom_arti">
           <ul class="bot_arti_ul">
-             {ms:arclist typeid=1773221125271859201 size=5}
+            {ms:arclist typeid=1773221125271859201 size=5}
             <a href="{ms:global.html/}${field.link}" class="logCheck">
               <li class="bot_arti_li">
                 <div style="width: 74%;">
                   <div class="newd"></div>
                   <div class="nwest font-overflow-one" style="display: inline-block;;width:88%">
-                     ${field.title}
+                    ${field.title}
                   </div>
                 </div>
                 <span class="fr">${field.date?string("MM-dd")}</span>
@@ -534,7 +549,7 @@
         <div class="bottom_arti">
           <ul class="bot_arti_ul">
             {ms:arclist typeid=1773221201134235650 size=5}
-           <a href="{ms:global.html/}${field.link}">
+            <a href="{ms:global.html/}${field.link}">
               <li class="bot_arti_li">
                 <div style="width: 74%;">
                   <div class="newd"></div>
@@ -561,7 +576,7 @@
         <div class="bottom_arti">
           <ul class="bot_arti_ul">
             {ms:arclist typeid=1773221266934476802 size=5}
-           <a href="{ms:global.html/}${field.link}" >
+            <a href="{ms:global.html/}${field.link}">
               <li class="bot_arti_li">
                 <div style="width: 74%;">
                   <div class="newd"></div>
@@ -587,7 +602,7 @@
         <div class="right_star_top">
           <div class="rigth_top_tit">
             <div class="titfont">今日值班
-             <div class="dateCard">
+              <div class="dateCard">
                 <li id="z_year1"></li>
                 <li id="z_year2"></li>
                 <li id="z_year3"></li>
@@ -599,11 +614,11 @@
                 <li id="z_day1"></li>
                 <li id="z_day2"></li>
                 <div style="font-size: 16px;">日</div>
-            </div>
+              </div>
             </div>
             <a href="/html/web/zhibanbeiqin/index.html">
-            <div style="color: #C8C8C8;font-size:18px;line-height: 50px;cursor: pointer;">更多>></div>
-              </a>
+              <div style="color: #C8C8C8;font-size:18px;line-height: 50px;cursor: pointer;">更多>></div>
+            </a>
           </div>
           <div class="right_top_con">
             <div class="right_top_con_h">
@@ -626,16 +641,16 @@
               <div class="titfont" style="margin-right: 24px;">发布量统计</div>
               <div class="fbl" style="color: #C8C8C8;font-size:18px;line-height: 50px;">数据统计截止2024年3月12日</div>
             </div>
-           <div class="qgs">
-             <div  data-type='2'>区市车管所</div>
-             <div class="qgselected" data-type='1'>市车管所</div>
+            <div class="qgs">
+              <div data-type='2'>区市车管所</div>
+              <div class="qgselected" data-type='1'>市车管所</div>
             </div>
           </div>
           <div class="right_top_con">
             <div class="right_top_bottom_h"> </div>
             <div class="right_top_bottom_tr">
-              
-             
+
+
             </div>
           </div>
         </div>
@@ -647,10 +662,10 @@
           <a href="${field.outlink}" target="_blank" class="switchColor">
             <div style="background-image:url({@ms:file field.litpic/})">${field.title}</div>
           </a>
-           {/ms:arclist}
+          {/ms:arclist}
         </div>
       </div>
-    
+
     </div>
 
     <script>
@@ -665,52 +680,52 @@
             .addClass('dis')
             .siblings()
             .removeClass('dis');
-      
-      		swiper.autoplay.start()
-      		swiper2.autoplay.start()
+
+          swiper.autoplay.start()
+          swiper2.autoplay.start()
         });
       });
       var swiper = new Swiper('.swiperOne', {
         loop: true,
-      	autoplay: {
-              delay: 3000,
-              disableOnInteraction: false,
-      	},
-        observer: true, 
-      	observeParents: true,
+        autoplay: {
+          delay: 3000,
+          disableOnInteraction: false,
+        },
+        observer: true,
+        observeParents: true,
         navigation: {
           nextEl: '.pre-btn',
           prevEl: '.next-btn',
         },
-      
+
       });
       var swiper2 = new Swiper('.swiperTwo', {
         loop: true,
-      	autoplay: {
-              delay: 3000,
-              disableOnInteraction: false,
-      	},
-        observer: true, 
-      	observeParents: true,
+        autoplay: {
+          delay: 3000,
+          disableOnInteraction: false,
+        },
+        observer: true,
+        observeParents: true,
         navigation: {
           nextEl: '.pre-btn-jdgw',
           prevEl: '.next-btn-jdgw',
         },
       })
       $('.switchColor').each(function (i, p) {
-     	if(i == 0){
-      		$(p).css('color','#2C5A9E')
-      }else if(i == 1){
-      		$(p).css('color','#1E74E5 ')
-      	}else if(i == 2){
-      		$(p).css('color','#2941BE ')
-      	}else if(i == 3){
-      		$(p).css('color','#1657B9 ')
-      	}else {
-      		$(p).css('color','#1064AE ')
-      	}
-    });
-	
+        if (i == 0) {
+          $(p).css('color', '#2C5A9E')
+        } else if (i == 1) {
+          $(p).css('color', '#1E74E5 ')
+        } else if (i == 2) {
+          $(p).css('color', '#2941BE ')
+        } else if (i == 3) {
+          $(p).css('color', '#1657B9 ')
+        } else {
+          $(p).css('color', '#1064AE ')
+        }
+      });
+
     </script>
     <div class="cgfc_box">
       <div class="top_cgfc">
@@ -720,13 +735,13 @@
         <div class="swiper swiperCgfc">
           <!--自定义新增class:swiperOne js代码中使用类名-->
           <div class="swiper-wrapper wrapper_star">
-{ms:arclist typeid=1773542134583328769 }
+            {ms:arclist typeid=1773542134583328769 }
             <div class="swiper-slide slider_star blue-slide">
               <a href="{ms:global.html/}${field.link}">
-              <div style="width:100%;height:100%;">
-                <img style="width:100%;height:100%;" src="{@ms:file field.litpic/}">
-              </div>
-                </a>
+                <div style="width:100%;height:100%;">
+                  <img style="width:100%;height:100%;" src="{@ms:file field.litpic/}">
+                </div>
+              </a>
             </div>
             {/ms:arclist}
           </div>
@@ -752,29 +767,29 @@
         },
       })
     </script>
- 
+
   </div>
-   {ms:arclist size=1 typeid="1779682837839847426"}
-   <div id="flow" onmouseover="stop()" onmouseout="start()" style="top: 0; left: 0;">
+  {ms:arclist size=1 typeid="1779682837839847426"}
+  <div id="flow" onmouseover="stop()" onmouseout="start()" style="top: 0; left: 0;">
     <a href="{ms:global.html/}zhongyaotongzhi/index.html">
       <div id="flow-content">
         <img src="/{ms:global.style/}images/z2.png" style="width: 100%;">
         <!-- <div id="flow-content-tit">今日公告：</div> -->
-        
+
         <div id="flow-content-n">${field.title} </div>
       </div>
     </a>
-  
+
     <div id="flow-close" onclick="stopAd()">
       关闭
     </div>
   </div>
-     {/ms:arclist}
-  
-<#include "footer.htm" />
-<script src="/{ms:global.style/}js/moment.js"></script>
-<script language="javascript" src="/{ms:global.style/}js/foot.js"></script><!--尾部end-->
- <script>
+  {/ms:arclist}
+
+  <#include "footer.htm" />
+  <script src="/{ms:global.style/}js/moment.js"></script>
+  <script language="javascript" src="/{ms:global.style/}js/foot.js"></script><!--尾部end-->
+  <script>
 
 
     var xPos = 0;
@@ -787,194 +802,199 @@
     var yon = 0;
     var xon = 0;
     var interval;
-   	var flowE = document.getElementById("flow");
-   if(flowE){
-    flowE.style.top = yPos + "px";
-  
-    function changePos() {
-      width = document.documentElement.clientWidth;
-      height = window.screen.availHeight - 120;
-      Hoffset = flowE.offsetHeight;
-      Woffset = flowE.offsetWidth;
-      flowE.style.left = (xPos + document.body.scrollLeft) + "px";
-      flowE.style.top = (yPos + document.body.scrollTop) + "px";
-      yon == 0 ? yPos += step : yPos -= step;
-      xon == 0 ? xPos -= step : xPos += step;
-      if (xPos >= (width - Woffset)) {
-        xPos = (width - Woffset);
-        xon = 0;
-      }
-      else if (xPos <= 0) {
-        xPos = 0;
-        xon = 1;
-      }
-      if (yPos >= (height - Hoffset)) {
-        yPos = (height - Hoffset);
-        yon = 1;
+    var flowE = document.getElementById("flow");
+    if (flowE) {
+      flowE.style.top = yPos + "px";
+
+      function changePos() {
+        width = document.documentElement.clientWidth;
+        height = window.screen.availHeight - 120;
+        Hoffset = flowE.offsetHeight;
+        Woffset = flowE.offsetWidth;
+        flowE.style.left = (xPos + document.body.scrollLeft) + "px";
+        flowE.style.top = (yPos + document.body.scrollTop) + "px";
+        yon == 0 ? yPos += step : yPos -= step;
+        xon == 0 ? xPos -= step : xPos += step;
+        if (xPos >= (width - Woffset)) {
+          xPos = (width - Woffset);
+          xon = 0;
+        }
+        else if (xPos <= 0) {
+          xPos = 0;
+          xon = 1;
+        }
+        if (yPos >= (height - Hoffset)) {
+          yPos = (height - Hoffset);
+          yon = 1;
+        }
+        else if (yPos <= 0) {
+          yPos = 0;
+          yon = 0;
+        }
       }
-      else if (yPos <= 0) {
-        yPos = 0;
-        yon = 0;
+      function stopAd() {
+        flowE.style.display = 'none';
+        clearInterval(interval);
       }
+
+      function start() { interval = setInterval('changePos()', delay); }
+      function stop() { clearInterval(interval); }
+      start();
     }
-    function stopAd() {
-      flowE.style.display = 'none';
-      clearInterval(interval);
-    }
+    var currentTime = window.moment().format('YYYY-MM-DD');
+                          
+    //发布时间在72小时内的显示new
+    var paseTime = window.moment().subtract(3, 'day').format('YYYY-MM-DD HH:MM:ss')
 
-    function start() { interval = setInterval('changePos()', delay); }
-    function stop() { clearInterval(interval); }
-    start();
-       }         
-       var currentTime = window.moment().format('YYYY-MM-DD');
-                        
-     $('.newe').each(function (i, p) {
-      if ($(p).data('time') == currentTime) {
+                          console.log(paseTime,'paseTimepaseTimepaseTimepaseTimepaseTime')
+                          
+    $('.newe').each(function (i, p) {
+      if (moment($(p).data('time')) > moment(paseTime)) {
         $(p).show()
-      }else{
-                        $(p).hide()
-                        }
+      } else {
+        $(p).hide()
+      }
     });
     $('.newb').each(function (i, p) {
-      if ($(p).data('time') == currentTime) {
+      if (moment($(p).data('time')) > moment(paseTime)) {
         $(p).show()
       }
     });
-     
+
     $('.newc').each(function (i, p) {
-      if ($(p).data('time') == currentTime) {
+      if (moment($(p).data('time')) > moment(paseTime)) {
         $(p).hide()
       }
     });
-     $('.titlelong').each(function (i, p) {
-      if ($(p).data('time') == currentTime) {
+    $('.titlelong').each(function (i, p) {
+      if (moment($(p).data('time')) > moment(paseTime)) {
         $(p).hide()
       }
     });
-     $('.titleshort').each(function (i, p) {
-      if ($(p).data('time') != currentTime) {
+    $('.titleshort').each(function (i, p) {
+      if (moment($(p).data('time')) < moment(paseTime)) {
         $(p).hide()
       }
     });
-                        var fbl = '数据统计截止' + currentTime
-  $(".fbl").text(fbl);
-        //年
-        document.getElementById('z_year1').innerText = String(new Date().getFullYear())[0];
-        document.getElementById('z_year2').innerText = String(new Date().getFullYear())[1];
-        document.getElementById('z_year3').innerText = String(new Date().getFullYear())[2];
-        document.getElementById('z_year4').innerText = String(new Date().getFullYear())[3];
-
-        //月
-        let month = String(new Date().getMonth() + 1)
-        if (month.length < 2) {
-            month = '0' + month;
+    var fbl = '数据统计截止' + currentTime
+    $(".fbl").text(fbl);
+    //年
+    document.getElementById('z_year1').innerText = String(new Date().getFullYear())[0];
+    document.getElementById('z_year2').innerText = String(new Date().getFullYear())[1];
+    document.getElementById('z_year3').innerText = String(new Date().getFullYear())[2];
+    document.getElementById('z_year4').innerText = String(new Date().getFullYear())[3];
+
+    //月
+    let month = String(new Date().getMonth() + 1)
+    if (month.length < 2) {
+      month = '0' + month;
+    }
+    document.getElementById('z_month1').innerText = month[0];
+    document.getElementById('z_month2').innerText = month[1];
+
+    // 日
+    let day = String(new Date().getDate())
+    if (day.length < 2) {
+      day = '0' + day;
+    }
+    document.getElementById('z_day1').innerText = day[0];
+    document.getElementById('z_day2').innerText = day[1];
+
+    $(function () {
+      axios.post('/statistics/publishList/list.do', { type: 1 }, {
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded'
         }
-        document.getElementById('z_month1').innerText = month[0];
-        document.getElementById('z_month2').innerText = month[1];
+      }).then(res => {
+        console.log('resl ====>', res)
+
+        if (res.data.code == 200 && res.data.result) {
+
+          for (var ss = 0; ss < res.data.data.rows.length; ss++) {
+
+            $(".right_top_bottom_tr").append('<div class="right_top_bottom_td"><div class="right_top_bottom_td_t"><div>' + res.data.data.rows[ss].manager + '</div></div><div class="right_top_bottom_td_b">' + res.data.data.rows[ss].count + '</div></div>');
+          }
+          $(".right_top_bottom_td_t").each(function (i) {
+            if (!(i % 6)) {
+              $(this).find('div').css('border-left', '0')
+            }
 
-        // 日
-        let day = String(new Date().getDate())
-        if (day.length < 2) {
-            day = '0' + day;
+          });
         }
-        document.getElementById('z_day1').innerText = day[0];
-        document.getElementById('z_day2').innerText = day[1];
-                           
-         $(function () {
-      axios.post('/statistics/publishList/list.do',{type: 1}, {
+      })
+      $('.qgs div').click(function () {
+        $(this).addClass('qgselected').siblings().removeClass('qgselected');
+        var typeid = $(this).attr("data-type");
+        axios.post('/statistics/publishList/list.do', { type: typeid }, {
           headers: {
             'Content-Type': 'application/x-www-form-urlencoded'
           }
-        }).then(res =>{
-                        console.log('resl ====>',res)
-   
-                       if(res.data.code == 200 && res.data.result){
-   
-    for(var ss = 0; ss<res.data.data.rows.length; ss++){
-                                                  
-                      $(".right_top_bottom_tr").append('<div class="right_top_bottom_td"><div class="right_top_bottom_td_t"><div>'+res.data.data.rows[ss].manager+'</div></div><div class="right_top_bottom_td_b">'+res.data.data.rows[ss].count+'</div></div>');    
-                }
-                                                   $(".right_top_bottom_td_t").each(function(i) {
-   if(!(i%6)){
-   $(this).find('div').css('border-left','0')
-   }
-
-});
-}
-                    })   
-        $('.qgs div').click(function () {
-          $(this).addClass('qgselected').siblings().removeClass('qgselected');
-          var typeid = $(this).attr("data-type");
-                     axios.post('/statistics/publishList/list.do',{type: typeid}, {
-          headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
+        }).then(res => {
+          console.log('resl ====>', res)
+          $(".right_top_bottom_tr").empty()
+          if (res.data.code == 200 && res.data.result) {
+
+            for (var ss = 0; ss < res.data.data.rows.length; ss++) {
+
+              $(".right_top_bottom_tr").append('<div class="right_top_bottom_td"><div class="right_top_bottom_td_t"><div>' + res.data.data.rows[ss].manager + '</div></div><div class="right_top_bottom_td_b">' + res.data.data.rows[ss].count + '</div></div>');
+            }
+            $(".right_top_bottom_td_t").each(function (i) {
+              if (!(i % 6)) {
+                $(this).find('div').css('border-left', '0')
+              }
+            });
           }
-        }).then(res =>{
-                        console.log('resl ====>',res)
-                       $(".right_top_bottom_tr").empty()
-   if(res.data.code == 200 && res.data.result){
-   
-    for(var ss = 0; ss<res.data.data.rows.length; ss++){
-                                                  
-                      $(".right_top_bottom_tr").append('<div class="right_top_bottom_td"><div class="right_top_bottom_td_t"><div>'+res.data.data.rows[ss].manager+'</div></div><div class="right_top_bottom_td_b">'+res.data.data.rows[ss].count+'</div></div>');    
-                }
-                                                   $(".right_top_bottom_td_t").each(function(i) {
-   if(!(i%6)){
-   $(this).find('div').css('border-left','0')
-   }
-
-});
-}
-                    })          
-        });
+        })
       });
-   
-   axios.get('/ms/checkLogin.do').then(res=>{
-                     if(res.data.code == 200 && res.data.result){
-                     $('.login_dl').hide()
-   					 
-                     }else{
-   
-   $('.logCheck').each(function (i, p) {
-   							$(p).on('click', function(event) {
-    						event.preventDefault(); // 阻止默认行为，例如导航到href指定的链接
-    						// 你的代码逻辑
-                                alert('请登录后查看');
-                            });
-   						})	
-   }
-              })  
-
- 	//值班备勤
-  	let dutyDate = moment().format('yyyy/M/D')
-   	
-   axios.get(`/cms/dutyStandby/list.do`,{params:{dutyDate}}).then(res=>{
+    });
+
+    axios.get('/ms/checkLogin.do').then(res => {
+      if (res.data.code == 200 && res.data.result) {
+        $('.login_dl').hide()
+
+      } else {
+
+        $('.logCheck').each(function (i, p) {
+          $(p).on('click', function (event) {
+            event.preventDefault(); // 阻止默认行为，例如导航到href指定的链接
+            // 你的代码逻辑
+            alert('请登录后查看');
+          });
+        })
+      }
+    })
+
+    //值班备勤
+    let dutyDate = moment().format('yyyy/M/D')
+
+    axios.get(`/cms/dutyStandby/list.do`, { params: { dutyDate } }).then(res => {
       const { rows } = res.data.data
-     if(rows.length){
-          $('.right_top_con_tr_monitor').text(rows[0].monitor)
-          $('.right_top_con_tr_deputyMonitor').text(rows[0].policeDuty)
-          $('.right_top_con_tr_operator').text(rows[0].auxiliaryPoliceDuty)
-          $('.right_top_con_tr_dutyPerson').text(rows[0].blDutyPerson)
+      if (rows.length) {
+        $('.right_top_con_tr_monitor').text(rows[0].monitor)
+        $('.right_top_con_tr_deputyMonitor').text(rows[0].policeDuty)
+        $('.right_top_con_tr_operator').text(rows[0].auxiliaryPoliceDuty)
+        $('.right_top_con_tr_dutyPerson').text(rows[0].blDutyPerson)
       }
 
-   	 if($('.right_top_con_tr_monitor').text() == ''){
-      		$('.right_top_con_tr_monitor').text('/')
-      		$('.right_top_con_tr_monitor').css("color", "#999999")
+      if ($('.right_top_con_tr_monitor').text() == '') {
+        $('.right_top_con_tr_monitor').text('/')
+        $('.right_top_con_tr_monitor').css("color", "#999999")
       }
-      if($('.right_top_con_tr_deputyMonitor').text() == ''){
-      		$('.right_top_con_tr_deputyMonitor').text('/')
-      		$('.right_top_con_tr_deputyMonitor').css("color", "#999999")
+      if ($('.right_top_con_tr_deputyMonitor').text() == '') {
+        $('.right_top_con_tr_deputyMonitor').text('/')
+        $('.right_top_con_tr_deputyMonitor').css("color", "#999999")
       }
-      if($('.right_top_con_tr_operator').text() == ''){
-      		$('.right_top_con_tr_operator').text('/')
-      		$('.right_top_con_tr_operator').css("color", "#999999")
+      if ($('.right_top_con_tr_operator').text() == '') {
+        $('.right_top_con_tr_operator').text('/')
+        $('.right_top_con_tr_operator').css("color", "#999999")
       }
-      if($('.right_top_con_tr_dutyPerson').text() == ''){
-      		$('.right_top_con_tr_dutyPerson').text('/')
-      		$('.right_top_con_tr_dutyPerson').css("color", "#999999")
+      if ($('.right_top_con_tr_dutyPerson').text() == '') {
+        $('.right_top_con_tr_dutyPerson').text('/')
+        $('.right_top_con_tr_dutyPerson').css("color", "#999999")
       }
-     })
+    })
 
-    </script>
+  </script>
 </body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/template/1/default/tongxunlu.htm b/src/main/webapp/template/1/default/tongxunlu.htm
index 02e69d69..4f15ff49 100644
--- a/src/main/webapp/template/1/default/tongxunlu.htm
+++ b/src/main/webapp/template/1/default/tongxunlu.htm
@@ -78,8 +78,8 @@
                 methods:{
                 	handleSelectDept(item){
                 		this.dept = item
-                		axios.get(`/ms/cms/phoneContacts/list.do`,{params:{deptName:item}}).then(res=>{
-                			this.phoneContactsList = res.data.data.rows
+                		axios.get(`/cms/phoneContacts/list.do`,{params:{deptName:item}}).then(res=>{
+                			this.phoneContactsList = res.data.data
                        })
                 	},
                 	pickUp(){
@@ -88,7 +88,7 @@
                 },
                   mounted(){
                 	//查部门
-                	axios.get(`/ms/cms/phoneContacts/getDept.do
+                	axios.get(`/cms/phoneContacts/getDept.do
                       `).then(res=>{
                 			this.deptList = res.data.data
                 			this.handleSelectDept(this.deptList[0])
diff --git a/src/main/webapp/template/1/default/zhibanbeiqing-detail.htm b/src/main/webapp/template/1/default/zhibanbeiqing-detail.htm
index 6ecd2645..c6bdd094 100644
--- a/src/main/webapp/template/1/default/zhibanbeiqing-detail.htm
+++ b/src/main/webapp/template/1/default/zhibanbeiqing-detail.htm
@@ -33,7 +33,7 @@
         <div class="wrap">
             <div class="chuhuijiyao_nav">
                 <a href='/html/web/index.html'>首页</a>><a
-                            href='/html/web/zhibanbeiqin/index.html'>${field.typetitle}</a>
+                            href='/html/web/zhibanbeiqin/index.html'>值班备勤</a>
             </div>
             <h1 class="chuhuijiyao_title" fieldId="${field.id}">${field.typetitle}</h1>
             <div class="dateCard">
@@ -102,9 +102,7 @@
                   mounted(){
       	this.date = moment().format('YYYY/M/D')
      		 let contentId = document.getElementsByClassName('chuhuijiyao_title')[0].getAttribute('fieldid')
-
-                axios.get(`/ms/cms/dutyStandby/list.do`, { params: { contentId } }).then(res => {
-                    console.log(res, 'resresresresresresresres')
+                axios.get(`/cms/dutyStandby/list.do`, { params: { contentId } }).then(res => {
                     this.dutyStandbyList = res.data.data.rows
                 })
       			}
diff --git a/src/main/webapp/template/1/default/zhibanbeiqing-list.htm b/src/main/webapp/template/1/default/zhibanbeiqing-list.htm
index ce1f4937..12148f99 100644
--- a/src/main/webapp/template/1/default/zhibanbeiqing-list.htm
+++ b/src/main/webapp/template/1/default/zhibanbeiqing-list.htm
@@ -2,199 +2,300 @@
 <html>
 
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="renderer" content="webkit">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <meta name="robots" content="index, follow" />
-    <title>${field.typetitle}</title>
-    <meta name="keywords" content="${field.typekeyword}">
-    <meta name="description" content="${field.typedescrip}">
-    <meta http-equiv="Cache-Control" content="no-transform" />
-    <meta http-equiv="Cache-Control" content="no-siteapp" />
-    <meta name="applicable-device" content="pc,mobile" />
-    <link href="/{ms:global.style/}css/style.css" rel="stylesheet" />
-    <link href="/{ms:global.style/}css/css.css" rel="stylesheet" />
-    <script src="/{ms:global.style/}js/jquery-1.8.3.min.js"></script>
-    <script type="text/javascript" src="/{ms:global.style/}js/jquery.superslide.2.1.1.js">//pc导航</script>
-    <script src="/{ms:global.style/}js/anim.js">//动画</script>
-    <script type="text/javascript" src="/{ms:global.style/}js/basic.js"></script>
-  	<script src="/{ms:global.style/}js/moment.js"></script>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta name="renderer" content="webkit">
+  <meta name="viewport"
+    content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+  <meta name="robots" content="index, follow" />
+  <title>${field.typetitle}</title>
+  <meta name="keywords" content="${field.typekeyword}">
+  <meta name="description" content="${field.typedescrip}">
+  <meta http-equiv="Cache-Control" content="no-transform" />
+  <meta http-equiv="Cache-Control" content="no-siteapp" />
+  <meta name="applicable-device" content="pc,mobile" />
+  <link href="/{ms:global.style/}css/style.css" rel="stylesheet" />
+  <link href="/{ms:global.style/}css/css.css" rel="stylesheet" />
+  <script src="/{ms:global.style/}js/jquery-1.8.3.min.js"></script>
+  <script type="text/javascript" src="/{ms:global.style/}js/jquery.superslide.2.1.1.js">//pc导航</script>
+  <script src="/{ms:global.style/}js/anim.js">//动画</script>
+  <script type="text/javascript" src="/{ms:global.style/}js/basic.js"></script>
+  <script src="/{ms:global.style/}js/moment.js"></script>
 </head>
 
 <body>
-    <#include "header.htm" />
-    <div class="wrap">
-        <div class="chuhuijiyao_nav" style="margin-top:50px">
-            <a href='/html/web/index.html'>首页</a>><span style="cursor:default">${field.typetitle}</span>
-        </div>
-        <h1 class="chuhuijiyao_title">${field.typetitle}</h1>
-        <div class="dateCard">
-            <li id="z_year1"></li>
-            <li id="z_year2"></li>
-            <li id="z_year3"></li>
-            <li id="z_year4"></li>
-            <div>年</div>
-            <li id="z_month1"></li>
-            <li id="z_month2"></li>
-            <div>月</div>
-            <li id="z_day1"></li>
-            <li id="z_day2"></li>
-            <div>日</div>
+  <#include "header.htm" />
+  <div class="wrap">
+    <div class="chuhuijiyao_nav" style="margin-top:50px">
+      <a href='/html/web/index.html'>首页</a>><span style="cursor:default">${field.typetitle}</span>
+    </div>
+    <h1 class="chuhuijiyao_title">${field.typetitle}</h1>
+    <div class="dateCard">
+      <li id="z_year1"></li>
+      <li id="z_year2"></li>
+      <li id="z_year3"></li>
+      <li id="z_year4"></li>
+      <div>年</div>
+      <li id="z_month1"></li>
+      <li id="z_month2"></li>
+      <div>月</div>
+      <li id="z_day1"></li>
+      <li id="z_day2"></li>
+      <div>日</div>
+    </div>
+    <div style="display:flex;margin-top:40px" id="zhiban">
+      <div class="asideBox">
+        <div class="asideBody" v-for="item in list" :key="item" @click="handleSelect(item)">
+          <div :style="checked == item?{background:'#004EBD',color:'#fff'}:{}">{{item||'/'}}</div>
         </div>
-        <div class="tableHeader">
+      </div>
+      <div style="display:flex;flex-direction:column;align-items:center;position:relative" v-show="checked == '值班备勤'">
+        <div class="tableBox">
+          <div class="tableHeader">
             <div style="width:16%;border-right:1px solid #E2E2E2">带班长</div>
-              <div style="width:28%;border-right:1px solid #E2E2E2">民警值班员</div>
-              <div style="width:28%;border-right:1px solid #E2E2E2">辅警值班员</div>
-              <div style="width:28%">北岭值班员</div>
+            <div style="width:28%;border-right:1px solid #E2E2E2">民警值班员</div>
+            <div style="width:28%;border-right:1px solid #E2E2E2">辅警值班员</div>
+            <div style="width:28%">北岭值班员</div>
+          </div>
+          <div class="tableBody">
+            <div class="right_top_con_tr_monitor" style="width:16%"></div>
+            <div class="right_top_con_tr_deputyMonitor" style="width:28%"></div>
+            <div class="right_top_con_tr_operator" style="width:28%"></div>
+            <div class="right_top_con_tr_dutyPerson" style="width:28%"></div>
+          </div>
         </div>
-        <div class="tableBody">
-          <div class="right_top_con_tr_monitor" style="width:16%"></div>
-              <div class="right_top_con_tr_deputyMonitor" style="width:28%"></div>
-              <div class="right_top_con_tr_operator" style="width:28%"></div>
-              <div class="right_top_con_tr_dutyPerson" style="width:28%"></div>
+        <ul style="width:1140px">
+          {ms:arclist size=999 typeid=1773193604170002434}
+          <li class="list_item">
+            <a href="{ms:global.html/}${field.link}">
+              <div class="chuhuijiyao_li_div">
+                <div class="chuhuijiyao_li_div_div">
+                  <p class="title2">${field.title}</p>
+                </div>
+                <label class="chuhuijiyao_date">${field.date?string("yyyy-MM-dd")}</label>
+              </div>
+            </a>
+            <#if field.index==7>
+              <div class="chuhuijiyao_line" />
+            </#if>
+          </li>
+          {/ms:arclist}
+        </ul>
+      </div>
+      <div v-show="checked == '值日警官'">
+      <div class="tableBox">
+          <div class="tableHeader">
+            <div style="width:50%;border-right:1px solid #E2E2E2">值日警官领导岗</div>
+            <div style="width:50%">值日警官轮值科室</div>
+          </div>
+          <div class="tableBody">
+            <div class="right_top_con_tr_leaderName" style="width:50%"></div>
+            <div class="right_top_con_tr_deptName" style="width:50%"></div>
+          </div>
         </div>
-        <ul>
-            {ms:arclist size=7 ispaging=true}
-            <li class="list_item">
-                <a href="{ms:global.html/}${field.link}">
-                    <div class="chuhuijiyao_li_div">
-                        <div class="chuhuijiyao_li_div_div">
-                            <p class="title2">${field.title}</p>
-                        </div>
-                        <label class="chuhuijiyao_date">${field.date?string("yyyy-MM-dd")}</label>
-                    </div>
-                </a>
-                <#if field.index==7>
-                    <div class="chuhuijiyao_line" />
-                </#if>
-            </li>
-            {/ms:arclist}
+        <ul style="width:1140px">
+          {ms:arclist size=999 typeid=1773193604170002435}
+          <li class="list_item">
+            <a href="{ms:global.html/}${field.link}">
+              <div class="chuhuijiyao_li_div">
+                <div class="chuhuijiyao_li_div_div">
+                  <p class="title2">${field.title}</p>
+                </div>
+                <label class="chuhuijiyao_date">${field.date?string("yyyy-MM-dd")}</label>
+              </div>
+            </a>
+            <#if field.index==7>
+              <div class="chuhuijiyao_line" />
+            </#if>
+          </li>
+          {/ms:arclist}
         </ul>
-         <#include "pagination.htm" />
+      </div>
     </div>
-    <!--正文end-->
-    <#include "footer.htm" />
-    <script language="javascript" src="/{ms:global.style/}js/foot.js"></script><!--尾部end-->
-    <script>
-        //年
-        document.getElementById('z_year1').innerText = String(new Date().getFullYear())[0];
-        document.getElementById('z_year2').innerText = String(new Date().getFullYear())[1];
-        document.getElementById('z_year3').innerText = String(new Date().getFullYear())[2];
-        document.getElementById('z_year4').innerText = String(new Date().getFullYear())[3];
-
-        //月
-        let month = String(new Date().getMonth() + 1)
-        if (month.length < 2) {
-            month = '0' + month;
-        }
-        document.getElementById('z_month1').innerText = month[0];
-        document.getElementById('z_month2').innerText = month[1];
-
-        // 日
-        let day = String(new Date().getDate())
-        if (day.length < 2) {
-            day = '0' + day;
-        }
-        document.getElementById('z_day1').innerText = day[0];
-        document.getElementById('z_day2').innerText = day[1];
-      
-      
-      //今日值班人员查询
-  let dutyDate = moment().format('yyyy/M/D')
- axios.get(`/cms/dutyStandby/list.do`,{params:{dutyDate}}).then(res=>{
-   	const { rows } = res.data.data
-   if(rows.length){
-   		$('.right_top_con_tr_monitor').text(rows[0].monitor)
-   		$('.right_top_con_tr_deputyMonitor').text(rows[0].policeDuty)
-          $('.right_top_con_tr_operator').text(rows[0].auxiliaryPoliceDuty)
-          $('.right_top_con_tr_dutyPerson').text(rows[0].blDutyPerson)
-   	}
-      if($('.right_top_con_tr_monitor').text() == ''){
-      		$('.right_top_con_tr_monitor').text('/')
-      		$('.right_top_con_tr_monitor').css("color", "#999999")
+  </div>
+  <!--正文end-->
+  <#include "footer.htm" />
+  <script language="javascript" src="/{ms:global.style/}js/foot.js"></script><!--尾部end-->
+  <script>
+    //年
+    document.getElementById('z_year1').innerText = String(new Date().getFullYear())[0];
+    document.getElementById('z_year2').innerText = String(new Date().getFullYear())[1];
+    document.getElementById('z_year3').innerText = String(new Date().getFullYear())[2];
+    document.getElementById('z_year4').innerText = String(new Date().getFullYear())[3];
+
+    //月
+    let month = String(new Date().getMonth() + 1)
+    if (month.length < 2) {
+      month = '0' + month;
+    }
+    document.getElementById('z_month1').innerText = month[0];
+    document.getElementById('z_month2').innerText = month[1];
+
+    // 日
+    let day = String(new Date().getDate())
+    if (day.length < 2) {
+      day = '0' + day;
+    }
+    document.getElementById('z_day1').innerText = day[0];
+    document.getElementById('z_day2').innerText = day[1];
+    let dutyDate = moment().format('yyyy/M/D')
+
+    //今日值班人员查询
+    function dutyStandbyQuery(){
+    axios.get(`/cms/dutyStandby/list.do`, { params: { dutyDate } }).then(res => {
+      const { rows } = res.data.data
+      if (rows.length) {
+        $('.right_top_con_tr_monitor').text(rows[0].monitor)
+        $('.right_top_con_tr_deputyMonitor').text(rows[0].policeDuty)
+        $('.right_top_con_tr_operator').text(rows[0].auxiliaryPoliceDuty)
+        $('.right_top_con_tr_dutyPerson').text(rows[0].blDutyPerson)
       }
-      if($('.right_top_con_tr_deputyMonitor').text() == ''){
-      		$('.right_top_con_tr_deputyMonitor').text('/')
-      		$('.right_top_con_tr_deputyMonitor').css("color", "#999999")
+      if ($('.right_top_con_tr_monitor').text() == '') {
+        $('.right_top_con_tr_monitor').text('/')
+        $('.right_top_con_tr_monitor').css("color", "#999999")
       }
-      if($('.right_top_con_tr_operator').text() == ''){
-      		$('.right_top_con_tr_operator').text('/')
-      		$('.right_top_con_tr_operator').css("color", "#999999")
+      if ($('.right_top_con_tr_deputyMonitor').text() == '') {
+        $('.right_top_con_tr_deputyMonitor').text('/')
+        $('.right_top_con_tr_deputyMonitor').css("color", "#999999")
       }
-      if($('.right_top_con_tr_dutyPerson').text() == ''){
-      		$('.right_top_con_tr_dutyPerson').text('/')
-      		$('.right_top_con_tr_dutyPerson').css("color", "#999999")
+      if ($('.right_top_con_tr_operator').text() == '') {
+        $('.right_top_con_tr_operator').text('/')
+        $('.right_top_con_tr_operator').css("color", "#999999")
       }
-   })
-    </script>
-</body>
-<style>
-    .dateCard {
-        display: flex;
-        align-items: center;
-        font-size: 22px;
+      if ($('.right_top_con_tr_dutyPerson').text() == '') {
+        $('.right_top_con_tr_dutyPerson').text('/')
+        $('.right_top_con_tr_dutyPerson').css("color", "#999999")
+      }
+    })
     }
 
-    .dateCard li {
-        background: #004ebd;
-        color: #fff;
-        margin-right: 2px;
-        width: 28px;
-        height: 28px;
-        text-align: center;
-        font-weight: bold;
+    //今日值日警官查询
+    function dutyPoliceQuery(){
+    let dutyDate = moment().format('yyyy/M/D')
+    axios.get(`/cms/dutyPolice/list.do`, { params: { dutyDate } }).then(res => {
+      const { rows } = res.data.data
+
+      if (rows.length) {
+        $('.right_top_con_tr_leaderName').text(rows[0].leaderName)
+        $('.right_top_con_tr_deptName').text(rows[0].deptName)
+      }
+      if ($('.right_top_con_tr_leaderName').text() == '') {
+        $('.right_top_con_tr_leaderName').text('/')
+        $('.right_top_con_tr_leaderName').css("color", "#999999")
+      }
+      if ($('.right_top_con_tr_deptName').text() == '') {
+        $('.right_top_con_tr_deptName').text('/')
+        $('.right_top_con_tr_deptName').css("color", "#999999")
+      }
+    })
     }
+    
+    var app = new Vue({
+      el: '#zhiban',
+      data: {
+        list: ['值班备勤', '值日警官'],
+        checked: "值班备勤",
+      },
+      methods: {
+        handleSelect(item) {
+          this.checked = item
+    	  dutyStandbyQuery()
+        },
+      },
+    	mounted(){
+    		dutyStandbyQuery()
+    		dutyPoliceQuery()
+    	}
+    })
+  </script>
+</body>
+<style>
+  .dateCard {
+    display: flex;
+    align-items: center;
+    font-size: 22px;
+  }
+
+  .dateCard li {
+    background: #004ebd;
+    color: #fff;
+    margin-right: 2px;
+    width: 28px;
+    height: 28px;
+    text-align: center;
+    font-weight: bold;
+  }
+
   .dateCard div {
-        font-size:16px;
-  		margin-right:2px
-    }
+    font-size: 16px;
+    margin-right: 2px
+  }
 
-    .tableHeader {
-        display: flex;
-        border-top: 6px solid #004EBD;
-        background: rgba(0, 78, 189, .06);
-        color: #9F9F9F;
-        font-size: 18px;
-        align-items: center;
-        justify-content: space-around;
-        height: 80px;
-        margin-top: 30px;
-    }
+  .tableBox {
+    width: 1140px
+  }
 
-    .tableHeader div {
-        width: 25%;
-        text-align: center;
-    }
+  .tableHeader {
+    display: flex;
+    border-top: 6px solid #004EBD;
+    background: rgba(0, 78, 189, .06);
+    color: #9F9F9F;
+    font-size: 18px;
+    align-items: center;
+    justify-content: space-around;
+    height: 80px;
+  }
 
-    .tableBody {
-        display: flex;
-        background-color: rgba(0, 78, 189, .1);
-        font-size: 22px;
-        align-items: center;
-        justify-content: space-around;
-        height: 80px;
-        margin-bottom: 50px;
-    }
+  .tableHeader div {
+    width: 25%;
+    text-align: center;
+  }
 
-    .tableBody div {
-        width: 25%;
-        text-align: center;
-    }
+  .tableBody {
+    display: flex;
+    background-color: rgba(0, 78, 189, .1);
+    font-size: 22px;
+    align-items: center;
+    justify-content: space-around;
+    height: 80px;
+    margin-bottom: 50px;
+  }
 
-    .title2 {
-        font-size: 18px;
-        color: #333333;
-        font-weight: 400;
-    }
+  .tableBody div {
+    width: 25%;
+    text-align: center;
+  }
 
-    .title2:hover {
-        font-weight: bold;
-        color: #003F91;
-    }
-    .list_item{
-        margin-bottom: 29px;
-    }
+  .title2 {
+    font-size: 18px;
+    color: #333333;
+    font-weight: 400;
+  }
+
+  .title2:hover {
+    font-weight: bold;
+    color: #003F91;
+  }
+
+  .list_item {
+    margin-bottom: 29px;
+  }
+
+  .asideBox {
+    width: 240px;
+    margin-right: 60px;
+    border-top: 6px solid #004EBD;
+    margin-bottom: 50px;
+  }
+
+  .asideBody {
+    font-size: 18px;
+    height: 80px;
+    text-indent: 53px;
+    color: #000;
+    line-height: 80px;
+    background: #F8F8F8;
+    cursor: pointer;
+  }
 </style>
 
 </html>
\ No newline at end of file