diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java b/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java index 165f382d..ea2a9442 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java @@ -49,7 +49,7 @@ public class CompanyController { @PostMapping("/allCompanyByParent") public RestResponse findCompanyByNoParent(@RequestParam Map map, HttpServletRequest request) { String token = request.getHeader("user-token"); - if(token == null){ + if (token == null) { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); @@ -99,7 +99,7 @@ public class CompanyController { @PostMapping("/companyByCondition") public RestResponse findcompanyByCondition(@RequestParam Map map, HttpServletRequest request) { String token = request.getHeader("user-token"); - if(token == null){ + if (token == null) { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); @@ -145,7 +145,7 @@ public class CompanyController { @PostMapping("/allPostByOrganization") public RestResponse allPostByParent(@RequestParam Map map, HttpServletRequest request) { String token = request.getHeader("user-token"); - if(token == null){ + if (token == null) { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); @@ -202,7 +202,7 @@ public class CompanyController { @PostMapping("/post_role") public RestResponse addUser(@RequestBody Map map, HttpServletRequest request) { String token = request.getHeader("user-token"); - if(token == null){ + if (token == null) { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); @@ -324,9 +324,9 @@ public class CompanyController { * @return */ @GetMapping("/findPostRole") - public RestResponse findPostRole(@RequestParam Map map, HttpServletRequest request) { + public RestResponse findPostRole(@RequestParam Map map, HttpServletRequest request) { String token = request.getHeader("user-token"); - if(token == null){ + if (token == null) { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); @@ -363,7 +363,7 @@ public class CompanyController { public RestResponse InitTreeMenus(HttpServletRequest request) { List list = new ArrayList<>(); String token = request.getHeader("user-token"); - if(token == null){ + if (token == null) { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); @@ -382,20 +382,88 @@ public class CompanyController { public RestResponse departmentTreeMenus(HttpServletRequest request) { List list = new ArrayList<>(); String token = request.getHeader("user-token"); - if(token == null){ + if (token == null) { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); String header = request.getHeader("user-agent"); String crypt = Md5.crypt(header); - list = companyService.BuildQyWxAdministrationTreeMenus(userToken,crypt); + list = companyService.BuildQyWxAdministrationTreeMenus(userToken, crypt); return new RestResponse(list); } - + /** + * 用于创建施工单位 + * + * @param map 创建数据 + * @return + */ @PostMapping("/constructionUnitAdd") - public RestResponse constructionUnitAdd(@RequestBody Map map){ - return CrudUtil.insertHandle(constructionUnitService.addConstructionUnit(map),1); + public RestResponse constructionUnitAdd(@RequestBody Map map) { + return CrudUtil.insertHandle(constructionUnitService.addConstructionUnit(map), 1); + } + + /** + * 用于根据条件查询施工单位 + * + * @param map 查询条件 + * @return + */ + @GetMapping("/allConstructionUnit") + public RestResponse allConstructionUnit(@RequestParam Map map) { + List constructionUnitByCondition = constructionUnitService.findConstructionUnitByCondition(map); + return new RestResponse(constructionUnitByCondition, constructionUnitService.findConstructionUnitCountByCondition(map), 200); + } + + /** + * 用于修改施工单位信息 + * + * @param map 修改数据 + * @return + */ + @PostMapping("/ConstructionUnitEdit") + public RestResponse ConstructionUnitEdit(@RequestBody Map map) { + return CrudUtil.updateHandle(constructionUnitService.updateConstructionUnit(map), 1); + } + + /** + * 用于修改施工单位的状态 + * + * @param map 修改数据 + * @return + */ + @PostMapping("/ConstructionUnitStateEdit") + public RestResponse ConstructionUnitStateEdit(@RequestBody Map map) { + if (!map.containsKey("state")) { + map.put("state", 2); + } + return CrudUtil.updateHandle(constructionUnitService.updateConstructionUnitState(map), 1); + } + + + @PostMapping("/ConstructionUnitDel") + public RestResponse ConstructionUnitDel(@RequestBody Map map) { + Integer result = 0; + int count = 1; + map.put("state", 3); + if (map.containsKey("id")) { + // 如果是删除一个 + + result += constructionUnitService.updateConstructionUnitState(map); + } else if (map.containsKey("ids")) { + // 如果删除多个 + + // 获取要删除的id + List ids = (List) map.get("ids"); + count = ids.size(); + map.remove("ids"); + for (Object id : ids + ) { + map.put("id", id); + result += constructionUnitService.updateConstructionUnitState(map); + } + } + return CrudUtil.deleteHandle(result, count); } } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 600a3415..0a462d96 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -77,6 +77,9 @@ public class PageController { @Autowired private SplitUnitService splitUnitService; + @Autowired + private ConstructionUnitService constructionUnitService; + @GetMapping("/") public ModelAndView Init(HttpServletRequest request) { @@ -2911,4 +2914,18 @@ public class PageController { return "pages/constructionunit/constructionunit_add"; } + + @GetMapping("/constructionUnitOut") + public String constructionUnitOut(){ + return "pages/constructionunit/constructionunit_out"; + } + + @GetMapping("/constructionUnitEdit") + public ModelAndView constructionUnitEdit(Integer id){ + ModelAndView mv = new ModelAndView(); + mv.setViewName("pages/constructionunit/constructionunit_edit"); + ConstructionUnit constructionUnitById = constructionUnitService.findConstructionUnitById(id); + mv.addObject("record",constructionUnitById); + return mv; + } } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml index 6fbda929..7532bb0d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml @@ -86,7 +86,7 @@ update constructionunit - namd = #{name}, + name = #{name}, state = #{state}, diff --git a/src/main/resources/templates/pages/constructionunit/constructionunit_edit.html b/src/main/resources/templates/pages/constructionunit/constructionunit_edit.html new file mode 100644 index 00000000..90954ff7 --- /dev/null +++ b/src/main/resources/templates/pages/constructionunit/constructionunit_edit.html @@ -0,0 +1,107 @@ + + + + + layui + + + + + + + +
+
+
+ 施工单位创建 +
+
+
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+
+ +
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/templates/pages/constructionunit/constructionunit_out.html b/src/main/resources/templates/pages/constructionunit/constructionunit_out.html new file mode 100644 index 00000000..859ff4d4 --- /dev/null +++ b/src/main/resources/templates/pages/constructionunit/constructionunit_out.html @@ -0,0 +1,346 @@ + + + + + layui + + + + + + + +
+
+
+ 搜索信息 +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+ + + + + + + + + +
+ + + +
+
+ + + + + \ No newline at end of file