From a7ffb0b99e4282cd523207451244e762e4a795cb Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 31 May 2017 09:11:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/ContentMessageTemplateController.java | 1 - .../content/OrganizMessageController.java | 20 ++++++ .../controller/sys/SysOrganizationsController.java | 32 ++++++--- .../webapp/WEB-INF/views/content/org_list.html | 77 ++++++++++++++++++++ .../webapp/WEB-INF/views/content/org_operate.html | 82 ++++++++++++++++++++++ 5 files changed, 200 insertions(+), 12 deletions(-) create mode 100644 parent/center.manager/src/main/java/com/lyms/cm/controller/content/OrganizMessageController.java create mode 100644 parent/center.manager/src/main/webapp/WEB-INF/views/content/org_list.html create mode 100644 parent/center.manager/src/main/webapp/WEB-INF/views/content/org_operate.html diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java index ddc53f1..5d10b46 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java @@ -63,7 +63,6 @@ public class ContentMessageTemplateController extends BaseController { temp.setModifyTime(new Date()); } boolean tag = messageTemplateService.updateBatchById(template); - return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/OrganizMessageController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/OrganizMessageController.java new file mode 100644 index 0000000..545b4be --- /dev/null +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/OrganizMessageController.java @@ -0,0 +1,20 @@ +package com.lyms.cm.controller.content; + +import com.lyms.web.controller.BaseController; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @auther yangfei + * @createTime 2017年05月27日 16时38分 + * @discription + */ +@Controller +@RequestMapping("/organizMessage") +public class OrganizMessageController extends BaseController { + + @RequestMapping("/toList") + public String toOrgan() { + return "/content/org_list"; + } +} diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganizationsController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganizationsController.java index 0f9e0b9..ddf9964 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganizationsController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganizationsController.java @@ -1,7 +1,13 @@ package com.lyms.cm.controller.sys; -import java.util.Map; - +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.lyms.base.common.entity.organ.Organizations; +import com.lyms.base.common.service.organ.OrganizationsService; +import com.lyms.constants.OperationName; +import com.lyms.util.StrUtils; +import com.lyms.web.bean.AjaxResult; +import com.lyms.web.controller.BaseController; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -11,15 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.lyms.base.common.entity.organ.OrganGroup; -import com.lyms.base.common.entity.organ.Organizations; -import com.lyms.base.common.service.organ.OrganizationsService; -import com.lyms.constants.OperationName; -import com.lyms.util.StrUtils; -import com.lyms.web.bean.AjaxResult; -import com.lyms.web.controller.BaseController; +import java.util.Map; /** *

@@ -48,6 +46,18 @@ public class SysOrganizationsController extends BaseController { public String toOrgan() { return "/organ/org_list"; } + /** + *

  • @Description:璺宠浆鍒版満鏋勫垪琛ㄩ〉 + *
  • @return + *
  • 鍒涘缓浜猴細maliang + *
  • 鍒涘缓鏃堕棿锛2017骞3鏈8鏃 + *
  • 淇敼浜猴細 + *
  • 淇敼鏃堕棿锛 + */ + @RequestMapping("/toOrgOperate") + public String toOrgOperate() { + return "/content/org_operate"; + } /** *
  • @Description:鑾峰彇缁撴瀯鍒楄〃 diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_list.html new file mode 100644 index 0000000..2e5d73f --- /dev/null +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_list.html @@ -0,0 +1,77 @@ +#override("body") +
    +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    +
    + 鏌ヨ +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +#end +#override("js") + +#end +#extends("/common/base_list.html") + + + diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_operate.html b/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_operate.html new file mode 100644 index 0000000..7f2bd64 --- /dev/null +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_operate.html @@ -0,0 +1,82 @@ +#override("body") +
    +
    +
    +

    鍖婚櫌鍚嶇О

    +
    +
    +
    +
    +
    +
    +
    +
      +
    • 鍖婚櫌浠嬬粛
      • +
    • 绉戝浠嬬粛
      • +
    • 鍖荤敓浠嬬粛
      • +
    • 妫鏌ラ」鐩
      • +
    • 瀛曟湡浜ф
      • +
    • 鍎跨淇濆仴
      • +
    • 瀛曞瀛︽牎
      • +
    • 搴婁綅棰勭害
      • +
    • 鐭俊鍐呭璁剧疆
      • +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + + +
    + + +
    +
    +
    +
    +
    + 鏌ヨ +
    +
    +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    + +
    +
    + #end + #extends("/common/base_list.html") \ No newline at end of file -- 1.8.3.1