diff --git a/src/main/java/cn/palmte/work/controller/backend/AccountController.java b/src/main/java/cn/palmte/work/controller/backend/AccountController.java index 3036d9d..d2b2df8 100644 --- a/src/main/java/cn/palmte/work/controller/backend/AccountController.java +++ b/src/main/java/cn/palmte/work/controller/backend/AccountController.java @@ -98,7 +98,7 @@ public class AccountController extends BaseController { model.put("userId", -1); model.put("account", new Admin()); model.put("roleList", sysRoleService.getAllEnableSysRole()); - model.put("deptList", deptRepository.findAll()); + model.put("deptList", deptRepository.findEnable()); model.put("positionList", userPositionRepository.findAll()); return "/admin/account_input"; } @@ -112,7 +112,7 @@ public class AccountController extends BaseController { model.put("account", admin); model.put("userId", userId); model.put("roleList", sysRoleService.getAllEnableSysRole()); - model.put("deptList", deptRepository.findAll()); + model.put("deptList", deptRepository.findEnable()); model.put("positionList", userPositionRepository.findAll()); return "/admin/account_input"; } diff --git a/src/main/java/cn/palmte/work/controller/backend/DepartmentController.java b/src/main/java/cn/palmte/work/controller/backend/DepartmentController.java index 15fa9e4..508a5b7 100644 --- a/src/main/java/cn/palmte/work/controller/backend/DepartmentController.java +++ b/src/main/java/cn/palmte/work/controller/backend/DepartmentController.java @@ -1,9 +1,7 @@ package cn.palmte.work.controller.backend; import cn.palmte.work.bean.ResponseMsg; -import cn.palmte.work.model.Dept; -import cn.palmte.work.model.ProcurementType; -import cn.palmte.work.model.Project; +import cn.palmte.work.model.*; import cn.palmte.work.service.DeptService; import cn.palmte.work.service.ProcurementTypeService; import cn.palmte.work.utils.Utils; @@ -31,6 +29,9 @@ public class DepartmentController extends BaseController{ @Autowired private DeptService deptService; + @Autowired + private DeptRepository deptRepository; + /** * 列表查询 * @param keywords @@ -72,6 +73,19 @@ public class DepartmentController extends BaseController{ return "/admin/department_input"; } + /** + * 跳转编辑页面 + * @param model + * @return + */ + @GetMapping(value = "/edit") + public String edit( Map model, @RequestParam("id") int id){ + Dept dept = deptRepository.findOne(id); + model.put("deptId", id); + model.put("department", dept); + return "/admin/department_input"; + } + /** * 保存 * @param deptId @@ -107,6 +121,20 @@ public class DepartmentController extends BaseController{ } } + /** + * 启用 禁用 + */ + @RequestMapping("/checkName") + @ResponseBody + public ResponseMsg checkName(@RequestParam("id") int id, + @RequestParam("name") String name, RedirectAttributes attr) { + Dept dept = deptRepository.findByNameEquals(name); + if (dept != null && id != dept.getId()) { + return ResponseMsg.buildFailedMsg("失败"); + } + return ResponseMsg.buildSuccessMsg("成功"); + } + /** * 导出 */ @@ -114,8 +142,8 @@ public class DepartmentController extends BaseController{ public void export(@RequestParam(value = "keywords",required = false) String keywords, HttpServletResponse httpServletResponse) throws IOException { Map searchInfo = getSearchInfo(keywords); downloadHeader(httpServletResponse , Utils.generateExcelName("部门表"), "application/octet-stream"); - String[] headers = {"部门名称","创建人","创建时间"}; - String[] exportColumns = {"name","createdBy","createdTime"}; + String[] headers = {"部门名称","创建人","创建时间", "状态"}; + String[] exportColumns = {"name","createdBy","createdTime", "status"}; ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, httpServletResponse.getOutputStream(), (pN, pS) -> deptService.list(searchInfo, pN, pS).getList()); } diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 067f0c3..54494f8 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -110,6 +110,7 @@ public class ProjectController extends BaseController { model.put("adminList", adminList); ConcurrentHashMap searchInfo = getSearchInfo(keywords, model); model.putIfAbsent("extend", "1"); + model.putIfAbsent("orderTypeStr", searchInfo.getOrDefault("orderType", "search")); Page page = projectService.list(searchInfo, pageNumber, pageSize); List list = page.getList(); if(CollectionUtil.isNotEmpty(list)){ diff --git a/src/main/java/cn/palmte/work/model/Dept.java b/src/main/java/cn/palmte/work/model/Dept.java index 4e06d1e..63e0c6b 100644 --- a/src/main/java/cn/palmte/work/model/Dept.java +++ b/src/main/java/cn/palmte/work/model/Dept.java @@ -38,6 +38,9 @@ public class Dept { @Transient private int tempId; + @Transient + private String status; + public Integer getId() { return id; } @@ -85,4 +88,12 @@ public class Dept { public void setTempId(int tempId) { this.tempId = tempId; } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } } \ No newline at end of file diff --git a/src/main/java/cn/palmte/work/model/DeptRepository.java b/src/main/java/cn/palmte/work/model/DeptRepository.java index 70a3164..ddbe489 100644 --- a/src/main/java/cn/palmte/work/model/DeptRepository.java +++ b/src/main/java/cn/palmte/work/model/DeptRepository.java @@ -1,8 +1,14 @@ package cn.palmte.work.model; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; public interface DeptRepository extends JpaRepository { Dept findByNameEquals(String name); + + @Query(value = "select * from dept where enabled = 1", nativeQuery = true) + List findEnable(); } diff --git a/src/main/java/cn/palmte/work/service/DeptService.java b/src/main/java/cn/palmte/work/service/DeptService.java index 990508f..2e8f0e5 100644 --- a/src/main/java/cn/palmte/work/service/DeptService.java +++ b/src/main/java/cn/palmte/work/service/DeptService.java @@ -36,7 +36,7 @@ public class DeptService { } public Page list(Map searchInfo, int pageNumber, int pageSize){ - QueryHelper queryHelper = new QueryHelper("SELECT *","dept"); + QueryHelper queryHelper = new QueryHelper("SELECT *, (CASE enabled WHEN 0 THEN '已禁用' WHEN 1 THEN '已启用' END) as status","dept"); queryHelper.addCondition(searchInfo.containsKey("name"), "name like ?", "%" + searchInfo.get("name") + "%"); queryHelper.addCondition(searchInfo.containsKey("enabled") && !"-1".equals(searchInfo.get("enabled")), diff --git a/src/main/resources/templates/admin/department_input.ftl b/src/main/resources/templates/admin/department_input.ftl index 35f877a..a0554c5 100644 --- a/src/main/resources/templates/admin/department_input.ftl +++ b/src/main/resources/templates/admin/department_input.ftl @@ -18,7 +18,7 @@
@@ -26,9 +26,9 @@
*部门名称
- +
@@ -55,7 +55,7 @@
- + @@ -69,6 +69,8 @@ \ No newline at end of file diff --git a/src/main/resources/templates/admin/department_list.ftl b/src/main/resources/templates/admin/department_list.ftl index 3461623..f97dc98 100644 --- a/src/main/resources/templates/admin/department_list.ftl +++ b/src/main/resources/templates/admin/department_list.ftl @@ -107,6 +107,13 @@
+ <@shiro.hasPermission name="DEPARTMENT_EDIT"> + + checked diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index e3e5ab2..3ed77c6 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -9,6 +9,11 @@ table-layout:fixed; word-break:break-all } + .focus{ + // 表格自动换行 + table-layout:fixed; + word-break:break-all + }
@@ -22,6 +27,7 @@
+ @@ -325,20 +331,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -873,6 +879,8 @@ var keywordsObj = {}; var extend = $("#extend").val(); keywordsObj.extend = extend; + if ($("#orderTypeStr").val()) + keywordsObj.orderType = $("#orderTypeStr").val(); if ($("#projectNo").val()) keywordsObj.projectNo = $("#projectNo").val(); if ($("#name").val())
序号项目编号项目名称项目类型垫资模式垫资利息垫资峰值项目合同金额项目毛利项目毛利率项目把握度汇智产品金额华智产品金额华三产品金额其他产品金额项目编号style="color: red" onclick="sub_function('projectNoDown')">style="color: red" onclick="sub_function('projectNoUp')">项目名称style="color: red" onclick="sub_function('projectNameDown')">style="color: red" onclick="sub_function('projectNameUp')">项目类型style="color: red" onclick="sub_function('projectTypeDown')">style="color: red" onclick="sub_function('projectTypeUp')">垫资模式style="color: red" onclick="sub_function('underModeDown')">style="color: red" onclick="sub_function('underModeUp')">垫资利息style="color: red" onclick="sub_function('underIntDown')">style="color: red" onclick="sub_function('underIntUp')">垫资峰值style="color: red" onclick="sub_function('underPeakDown')">style="color: red" onclick="sub_function('underPeakUp')">项目合同金额style="color: red" onclick="sub_function('projectContractDown')">style="color: red" onclick="sub_function('projectContractUp')">项目毛利style="color: red" onclick="sub_function('grossProfitDown')">style="color: red" onclick="sub_function('grossProfitUp')">项目毛利率style="color: red" onclick="sub_function('grossProfitMarginDown')">style="color: red" onclick="sub_function('grossProfitMarginUp')">项目把握度style="color: red" onclick="sub_function('certaintyDown')">style="color: red" onclick="sub_function('certaintyUp')">汇智产品金额style="color: red" onclick="sub_function('huizhiDown')">style="color: red" onclick="sub_function('huizhiUp')">华智产品金额style="color: red" onclick="sub_function('huazhiDown')">style="color: red" onclick="sub_function('huazhiUp')">华三产品金额style="color: red" onclick="sub_function('huasanDown')">style="color: red" onclick="sub_function('huasanUp')">其他产品金额style="color: red" onclick="sub_function('otherDown')">style="color: red" onclick="sub_function('otherUp')"> 项目状态 行业场景应用 解决方案