From a4e65f049f9acc4da3252551614babf3040e27dd Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Wed, 22 Nov 2023 14:37:03 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B1=95=E7=A4=BA=E4=BB=A5=E5=8F=8A=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/HotWorkApplicationController.java | 2 ++ .../highriskwork/HotWorkApplicationMapper.xml | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java index 9622785c..49fedbd9 100644 --- a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java @@ -1311,6 +1311,8 @@ public class HotWorkApplicationController extends BaseController { hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName")); hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID")); }else if("4".equals(type)){ // 现场管辖单位负责人 + hot.put("UNIT_LEADER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + hot.put("UNIT_LEADER_DEPARTMENT_NAME",userPageData.getString("deptName")); hot.put("UNIT_LEADER_NAME",userPageData.getString("userName")); hot.put("UNIT_LEADER_ID",userPageData.getString("USER_ID")); }else if("5".equals(type)){ // 动火前 负责人 diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml index bbdcd6ca..65fe920e 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml @@ -321,6 +321,9 @@ left join vi_user_all ua on ua.USER_ID = f.OPERATOR LEFT JOIN bus_hotworkapplicationuser bhu ON bhu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID LEFT JOIN vi_user_all bhuuser ON bhuuser.USER_ID = bhu.USER_ID + left join bus_hotworkapplicationuser hot on f.HOTWORKAPPLICATION_ID = hot.FOREIGN_KEY and hot.ISDELETE ='0' and hot.state='4' + left join sys_user hu on hot.USER_ID = hu.USER_ID + left join oa_department hd on hd.DEPARTMENT_ID = hu.DEPARTMENT_ID where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -342,6 +345,18 @@ and (f.JOB_NUMBER LIKE CONCAT(CONCAT('%', #{pd.keyJobNumber}),'%')) + + and f.JOB_CONTENT LIKE CONCAT(CONCAT('%', #{pd.JOB_CONTENT}),'%') + + + and f.HOT_WORK_POSITION LIKE CONCAT(CONCAT('%', #{pd.HOT_WORK_POSITION}),'%') + + + and f.HOT_WORK_LEVEL_INDEX = #{pd.HOT_WORK_LEVEL_INDEX} + + + and hd.DEPARTMENT_ID = #{pd.UNIT_LEADER_DEPARTMENT_ID} + and f.STATE = #{pd.keyState} From bbaad2b6d7e4e047edd5d513a6b1d87fa8c87e1f Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Wed, 22 Nov 2023 17:52:09 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=8A=B6=E6=80=81=E6=94=B98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/app/AppHiddenController.java | 2 +- src/main/java/com/zcloud/controller/bus/HiddenController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java index f5bc0433..2e4fe821 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java @@ -1656,7 +1656,7 @@ public class AppHiddenController extends BaseController { inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); inspection.put("OPERATOR", pd.getString("FINAL_CHECKOR")); inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); - inspection.put("INSPECTION_STATUS", "7"); // 已验收 + inspection.put("INSPECTION_STATUS", "8"); // 已验收 safetyenvironmentalService.editStatus(inspection); } } diff --git a/src/main/java/com/zcloud/controller/bus/HiddenController.java b/src/main/java/com/zcloud/controller/bus/HiddenController.java index f9674020..925cd04c 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenController.java @@ -2902,7 +2902,7 @@ public class HiddenController extends BaseController { inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); inspection.put("OPERATOR", Jurisdiction.getUSER_ID()); inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); - inspection.put("INSPECTION_STATUS", "7"); // 已验收 + inspection.put("INSPECTION_STATUS", "8"); // 已验收 safetyenvironmentalService.editStatus(inspection); } From 38bdba0109c09a7920106fa49bb350c8ddd0d9c6 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 5 Dec 2023 10:43:41 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=AE=A1=E6=A0=B8=E7=A7=BB=E5=8A=A8=E5=88=B0=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xgf/RelevantUnitsController.java | 239 ++++++++++++++++++ .../controller/xgf/XgfCorpController.java | 1 - .../xgf/XgfDictionariesController.java | 16 ++ 3 files changed, 255 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java diff --git a/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java b/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java new file mode 100644 index 00000000..3af5bc64 --- /dev/null +++ b/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java @@ -0,0 +1,239 @@ +package com.zcloud.controller.xgf; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.util.DateUtil; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.ObjectExcelView; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import java.util.*; + +/** + * 说明：相关方管理 + * 作者：luoxiaobao + * 时间：2022-06-07 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/relevantunits") +public class RelevantUnitsController extends BaseController { + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + /** + * 相关方单位信息审核模块的列表 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list() throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/list", pd); + return result; + } + + /** + * 审核 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/examine") + @ResponseBody + public Object examine() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); + String type = pd.getString("STATE"); //2 通过 3.未通过 + if ("2".equals(type)) { + pd.put("STATE", "2"); // 审核状态改为通过 + } else if ("3".equals(type)) { + pd.put("STATE", "3"); // 审核状态改为打回 + } + // Map result2 = HttpClientService.doPost(XGF_EDITROLEBTG, pd); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/corpInfoAudit", pd); + map.put("result", errInfo); + return map; + } + + /** + * 相关方单位人员-人员基础信息管理-list + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getCorpInfoDetail") + @ResponseBody + public Object getCorpInfoDetail() throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/getDataForEditByCorpInfoIdForApi", pd); + return result; + } + + /** + * 相关方单位账号管理-列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getCorpInfoList") + @ResponseBody + public Object getCorpInfoList(Page page) throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/list", pd); + return result; + } + + /** + * 导出到excel + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/excelAll") + @RequiresPermissions("toExcel") + public ModelAndView exportExcel() throws Exception { + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("序号"); //1 + titles.add("企业状态"); //2 + titles.add("股份主管部门"); //3 + titles.add("基层单位主管公司"); //4 + titles.add("基层单位主管部门"); //5 + titles.add("相关方单位名称"); //6 + titles.add("统一社会信用代码"); //7 + titles.add("经营地址"); //8 + titles.add("法人"); //9 + titles.add("联系人"); //10 + titles.add("联系电话"); //11 + titles.add("用工形式"); //12 + titles.add("选取形式"); //13 + titles.add("流动人员比例%"); //14 + titles.add("添加人"); //15 + titles.add("添加时间"); //16 + dataMap.put("titles", titles); + + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/unitCorpInfo", pd); + List> varOList = (List>) result.get("unitCorp"); + + List varList = new ArrayList(); + for (int i = 0; i < varOList.size(); i++) { + PageData vpd = new PageData(); + vpd.put("var1", i + 1); + if (varOList.get(i).get("STATE").equals("0")) { + vpd.put("var2", "未填报"); + } else if (varOList.get(i).get("STATE").equals("1")) { + vpd.put("var2", "待审核"); + } else if (varOList.get(i).get("STATE").equals("2")) { + vpd.put("var2", "已审核"); + } else if (varOList.get(i).get("STATE").equals("3")) { + vpd.put("var2", "已打回"); + } else if (varOList.get(i).get("STATE").equals("4")) { + vpd.put("var2", "已填报"); + } + + vpd.put("var3", varOList.get(i).get("MAIN_DEPARTMENT_NAME")); + vpd.put("var4", varOList.get(i).get("SUPERVISE_CORPINFO_NAME")); + vpd.put("var5", varOList.get(i).get("SUPERVISE_DEPARTMENT_NAME")); + vpd.put("var6", varOList.get(i).get("RELEVANT_UNIT_NAME")); + vpd.put("var7", varOList.get(i).get("SOCIAL_CODE")); + vpd.put("var8", varOList.get(i).get("BUSINESS_ADDRESS")); + vpd.put("var9", varOList.get(i).get("LEGAL_PERSON")); + vpd.put("var10", varOList.get(i).get("CONTACT_PERSON")); + vpd.put("var11", varOList.get(i).get("CONTACT_TEL")); + vpd.put("var12", varOList.get(i).get("EMPLOYMENT_FORM_NAME")); + if (varOList.get(i).get("SELECT_FORM").equals("competitive_negotiation")) { + vpd.put("var13", "竞争性谈判"); + } + if (varOList.get(i).get("SELECT_FORM").equals("invite_tenders")) { + vpd.put("var13", "招标"); + } + vpd.put("var14", varOList.get(i).get("FLOATING_PERCENT")); + vpd.put("var15", varOList.get(i).get("CREATOR_NAME")); + vpd.put("var16", varOList.get(i).get("CREATTIME").toString().replace("T", " ").replace(".000+0000", "")); + varList.add(vpd); + } + dataMap.put("varList", varList); + ObjectExcelView erv = new ObjectExcelView(); + mv = new ModelAndView(erv, dataMap); + return mv; + } + + /** + * 保存数据 + * + * @throws Exception + */ + @RequestMapping(value = "/saveCorpInfo") + @ResponseBody + public Object saveCorpInfo() throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/saveDataForApi", pd); + return result; + } + + /** + * 查询相关方名称是否唯一 + * + * @throws Exception + */ + @RequestMapping(value = "/hasName") + @ResponseBody + public Object hasName() throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/hasName", pd); + return result; + } + + /** + * 查询相关方统一社会信用代码是否唯一 + * + * @throws Exception + */ + @RequestMapping(value = "/hasSocialCode") + @ResponseBody + public Object hasSocialCode() throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/hasSocialCode", pd); + return result; + } + + /** + * 查询相关方统一社会信用代码是否唯一 + * + * @throws Exception + */ + @RequestMapping(value = "/resetPassword") + @ResponseBody + public Object resetPassword() throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/resetPasswordByCorpInfoId", pd); + return result; + } + +} diff --git a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java index af776b24..d3e7835d 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java @@ -236,7 +236,6 @@ public class XgfCorpController extends BaseController { } else if ("3".equals(type)) { pd.put("STATE", "3"); // 审核状态改为打回 } - // Map result2 = HttpClientService.doPost(XGF_EDITROLEBTG, pd); Map result = HttpClientService.doPost(url + "/api/corpinfo/corpInfoAudit", pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/xgf/XgfDictionariesController.java b/src/main/java/com/zcloud/controller/xgf/XgfDictionariesController.java index 4f566b8a..0555b29b 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfDictionariesController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfDictionariesController.java @@ -54,4 +54,20 @@ public class XgfDictionariesController extends BaseController { Map result = HttpClientService.doPost(url + "/api/dictionaries/getAreaLevels", pd); return result; } + + /** + * 字典 + * @return + * @throws Exception + */ + @RequestMapping(value="/listSelectTree") + @ResponseBody + public Object listSelectTree() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(url + "/api/dictionaries/listSelectTree", pd); + return result; + } } From 81450f048a79cbc01de2f93d0ccf22066b6768ab Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 5 Dec 2023 14:27:11 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=88=86=E5=85=AC=E5=8F=B8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/openApi/OpenApiController.java | 16 ++++ .../controller/xgf/CorpFgsController.java | 78 +++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 src/main/java/com/zcloud/controller/xgf/CorpFgsController.java diff --git a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java index 841f5464..970af126 100644 --- a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java +++ b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java @@ -97,4 +97,20 @@ public class OpenApiController extends BaseController { map.put("result", errInfo); return map; } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/corp/findById") + @ResponseBody + public Object findById() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = corpInfoService.findById(pd); //列出Post列表 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java b/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java new file mode 100644 index 00000000..96b0084b --- /dev/null +++ b/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java @@ -0,0 +1,78 @@ +package com.zcloud.controller.xgf; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.Jurisdiction; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author fangjiakai + * @date 2023/05/15 11:09 + */ +@Controller +@RequestMapping("/corpFgs") +public class CorpFgsController extends BaseController { + + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + /** + * 相关方单位列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value="/corpFgsList") + @ResponseBody + public Object batchList(Page page) throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpFgs/corpFgsList" +getPageUrl(page), pd); + return result; + } + + /** + * 相关方单位人员列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value="/corpUserFgsList") + @ResponseBody + public Object batchUserList(Page page) throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserFgsList" +getPageUrl(page), pd); + return result; + } + + /** + * 相关方单位人员-人员基础信息管理-人员详细信息 + * @return + * @throws Exception + */ + @RequestMapping(value="/getCorpUserDetail") + @ResponseBody + public Object getCorpUserDetail() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserDetailInfoById", pd); + return result; + } + + private String getPageUrl(Page page){ + return "?showCount=" +page.getShowCount() + "¤tPage=" + page.getUrlCurrentPage(); + } + + +} From 2817e16fe5aef77a7ed82ce6a68c39710a10dd23 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Wed, 6 Dec 2023 13:43:53 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=85=AB=E9=A1=B9?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/xgf/CorpFgsController.java | 16 +++ .../xgf/app/AppCorpFgsController.java | 110 ++++++++++++++++++ .../service/corpFgs/CorpFgsService.java | 19 +++ .../corpFgs/impl/CorpFgsServiceImpl.java | 46 ++++++++ .../gf/impl/GFBlindBoardServiceImpl.java | 11 +- .../gf/impl/GFHighWorkServiceImpl.java | 9 +- 6 files changed, 209 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/zcloud/controller/xgf/app/AppCorpFgsController.java create mode 100644 src/main/java/com/zcloud/service/corpFgs/CorpFgsService.java create mode 100644 src/main/java/com/zcloud/service/corpFgs/impl/CorpFgsServiceImpl.java diff --git a/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java b/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java index 96b0084b..ab9db99b 100644 --- a/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java +++ b/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java @@ -74,5 +74,21 @@ public class CorpFgsController extends BaseController { return "?showCount=" +page.getShowCount() + "¤tPage=" + page.getUrlCurrentPage(); } + /** + * 相关方单位--根据企业端corpInfoId查询到对应的相关方部门树形结构 + * @return + * @throws Exception + */ + @RequestMapping(value="/listTreeByFgsId") + @ResponseBody + public Object listTreeByFgsId() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpFgs/listTreeByFgsId", pd); + return result; + } + } diff --git a/src/main/java/com/zcloud/controller/xgf/app/AppCorpFgsController.java b/src/main/java/com/zcloud/controller/xgf/app/AppCorpFgsController.java new file mode 100644 index 00000000..fef97c0b --- /dev/null +++ b/src/main/java/com/zcloud/controller/xgf/app/AppCorpFgsController.java @@ -0,0 +1,110 @@ +package com.zcloud.controller.xgf.app; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author fangjiakai + * @date 2023/05/15 11:09 + */ +@Controller +@RequestMapping("/app/corpFgs") +public class AppCorpFgsController extends BaseController { + + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + /** + * 相关方单位列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value="/corpFgsList") + @ResponseBody + public Object batchList(Page page) throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpFgs/corpFgsList" +getPageUrl(page), pd); + return result; + } + + /** + * 相关方单位人员列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value="/corpUserFgsList") + @ResponseBody + public Object batchUserList(Page page) throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserFgsList" +getPageUrl(page), pd); + return result; + } + + /** + * 相关方单位人员-人员基础信息管理-人员详细信息 + * @return + * @throws Exception + */ + @RequestMapping(value="/getCorpUserDetail") + @ResponseBody + public Object getCorpUserDetail() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserDetailInfoById", pd); + return result; + } + + private String getPageUrl(Page page){ + return "?showCount=" +page.getShowCount() + "¤tPage=" + page.getUrlCurrentPage(); + } + + /** + * 相关方单位--根据企业端corpInfoId查询到对应的相关方部门树形结构 + * @return + * @throws Exception + */ + @RequestMapping(value="/listTreeByFgsId") + @ResponseBody + public Object listTreeByFgsId() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpFgs/listTreeByFgsId", pd); + return result; + } + + /** + * 根据相关方部门id获取部门下所有人员 + * @return + * @throws Exception + */ + @RequestMapping(value="/findUserByDepartmentId") + @ResponseBody + public Object findUserByDepartmentId() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpUserFgs/findUserByDepartmentId", pd); + return result; + } + + +} diff --git a/src/main/java/com/zcloud/service/corpFgs/CorpFgsService.java b/src/main/java/com/zcloud/service/corpFgs/CorpFgsService.java new file mode 100644 index 00000000..bf5fc6e7 --- /dev/null +++ b/src/main/java/com/zcloud/service/corpFgs/CorpFgsService.java @@ -0,0 +1,19 @@ +package com.zcloud.service.corpFgs; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：用电气体检测 + * 作者：luoxiaobao + * 时间：2021-09-08 + * 官网：www.zcloudchina.com + */ +public interface CorpFgsService { + + String getXgfUserName(String workUser); + +} + diff --git a/src/main/java/com/zcloud/service/corpFgs/impl/CorpFgsServiceImpl.java b/src/main/java/com/zcloud/service/corpFgs/impl/CorpFgsServiceImpl.java new file mode 100644 index 00000000..c8a95429 --- /dev/null +++ b/src/main/java/com/zcloud/service/corpFgs/impl/CorpFgsServiceImpl.java @@ -0,0 +1,46 @@ +package com.zcloud.service.corpFgs.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.eightWork.ElectricityYthGasMapper; +import com.zcloud.service.corpFgs.CorpFgsService; +import com.zcloud.service.eightWork.ElectricityYthGasService; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; + +/** + * 说明：用电气体检测 + * 作者：luoxiaobao + * 时间：2021-09-08 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class CorpFgsServiceImpl implements CorpFgsService { + + + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + @Override + public String getXgfUserName(String workUser){ + PageData pd = new PageData(); + pd.put("USER_ID",workUser); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/user/findUserById", pd); + Map pageData = (Map) result.get("pd"); + if(Tools.isEmpty(pageData)){ + return workUser; + }else { + return pageData.get("NAME").toString(); + } + + } +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java index 49bf00e3..991d6f6e 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java @@ -1,8 +1,10 @@ package com.zcloud.service.gf.impl; +import com.zcloud.controller.xgf.app.AppCorpFgsController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.gf.GFBlindBoardMapper; +import com.zcloud.service.corpFgs.CorpFgsService; import com.zcloud.service.gf.GFBlindBoardService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,6 +25,9 @@ public class GFBlindBoardServiceImpl implements GFBlindBoardService { @Resource private GFBlindBoardMapper GFblindboardMapper; + @Resource + private CorpFgsService corpFgsService; + /**新增 * @param pd * @throws Exception @@ -76,7 +81,11 @@ public class GFBlindBoardServiceImpl implements GFBlindBoardService { * @throws Exception */ public PageData findById(PageData pd)throws Exception{ - return GFblindboardMapper.findById(pd); + PageData pageData = GFblindboardMapper.findById(pd); + //调用接口 获取用户信息 + String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER")); + pageData.put("WORK_USER",workUser); + return pageData; } /**批量删除 diff --git a/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java index 19dc4e2a..5a86ee6b 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java @@ -3,6 +3,7 @@ package com.zcloud.service.gf.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.gf.GFHighWorkMapper; +import com.zcloud.service.corpFgs.CorpFgsService; import com.zcloud.service.gf.GFHighWorkService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,6 +23,8 @@ public class GFHighWorkServiceImpl implements GFHighWorkService { @Resource private GFHighWorkMapper GFhighworkMapper; + @Resource + private CorpFgsService corpFgsService; /**新增 * @param pd @@ -77,7 +80,11 @@ public class GFHighWorkServiceImpl implements GFHighWorkService { * @throws Exception */ public PageData findById(PageData pd)throws Exception{ - return GFhighworkMapper.findById(pd); + PageData pageData = GFhighworkMapper.findById(pd); + //调用接口 获取用户信息 + String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER")); + pageData.put("PROJECT_MANAGER",workUser); + return pageData; } /**批量删除 From de3503d0e86fbb94d2b9b24d22bdb5860982d591 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 6 Dec 2023 15:02:41 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/xgf/RelevantUnitsController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java b/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java index 3af5bc64..443a6470 100644 --- a/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java +++ b/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java @@ -190,6 +190,7 @@ public class RelevantUnitsController extends BaseController { public Object saveCorpInfo() throws Exception { PageData pd = new PageData(); pd = this.getPageData(); + pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/saveDataForApi", pd); return result; } From 32f2a32e67a017bc2665dc8ad4c2e614d69cb937 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 7 Dec 2023 15:02:01 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E5=8E=86=E5=8F=B2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/openApi/OpenApiController.java | 22 +++++++++++++++++++ .../datasource/system/DepartmentMapper.java | 2 ++ .../mapper/datasource/system/UsersMapper.java | 2 ++ .../service/system/DepartmentService.java | 2 ++ .../zcloud/service/system/UsersService.java | 2 ++ .../system/impl/DepartmentServiceImpl.java | 5 +++++ .../service/system/impl/UsersServiceImpl.java | 5 +++++ .../datasource/system/DepartmentMapper.xml | 3 +++ .../mybatis/datasource/system/UsersMapper.xml | 3 +++ 9 files changed, 46 insertions(+) diff --git a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java index 841f5464..dcb1e989 100644 --- a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java +++ b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java @@ -82,6 +82,28 @@ public class OpenApiController extends BaseController { return map; } + @RequestMapping(value="/user/getUserInfo") + @ResponseBody + public Object getUserInfo() throws Exception{ + PageData map = new PageData(); + PageData pd = this.getPageData(); + PageData userInfo = usersService.getUserInfo(pd); //列出Post列表 + map.putAll(userInfo); + map.put("result", "success"); + return map; + } + + @RequestMapping(value="/department/getDepartmentInfo") + @ResponseBody + public Object getDepartmentInfo() throws Exception{ + PageData map = new PageData(); + PageData pd = this.getPageData(); + PageData departmentInfo = departmentService.getDepartmentInfo(pd); //列出Post列表 + map.putAll(departmentInfo); + map.put("result", "success"); + return map; + } + /**列表 * @throws Exception */ diff --git a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java index da0ee487..c35c14e6 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java @@ -173,5 +173,7 @@ public interface DepartmentMapper{ * @return */ List listTreeManageAndCorpForPcPunishThePerson(PageData pd); + + PageData getInfo(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 63de3eb8..198a7090 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -292,4 +292,6 @@ public interface UsersMapper { List selectUserListByUserIds(PageData pd); void resetCardNo(PageData pd); + + PageData getUserInfo(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/DepartmentService.java b/src/main/java/com/zcloud/service/system/DepartmentService.java index 61c7e0ba..b863fdab 100644 --- a/src/main/java/com/zcloud/service/system/DepartmentService.java +++ b/src/main/java/com/zcloud/service/system/DepartmentService.java @@ -223,5 +223,7 @@ public interface DepartmentService{ List listTreeManageAndCorp1(PageData pd)throws Exception; List listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception; + + PageData getDepartmentInfo(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 74747c24..eb3c9194 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -343,4 +343,6 @@ public interface UsersService { List selectUserListByUserIds(PageData selectPageData); void resetCardNo(PageData pd); + + PageData getUserInfo(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java index 7d631fdd..7ed7767a 100644 --- a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java @@ -409,5 +409,10 @@ public class DepartmentServiceImpl implements DepartmentService{ public List listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception { return departmentMapper.listTreeManageAndCorpForPcPunishThePerson(pd); } + + @Override + public PageData getDepartmentInfo(PageData pd) throws Exception { + return departmentMapper.getInfo(pd); + } } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index 9bec3e26..62bd107b 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -434,4 +434,9 @@ public class UsersServiceImpl implements UsersService { public void resetCardNo(PageData pd) { usersMapper.resetCardNo(pd); } + + @Override + public PageData getUserInfo(PageData pd) { + return usersMapper.getUserInfo(pd); + } } diff --git a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml index 1f8157e8..f4ffc72b 100644 --- a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml @@ -550,4 +550,7 @@ + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 52653c68..c2b10336 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1287,4 +1287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + From e0d63a1bcb5cd5b0519aceac6c6d3eec8b7412fc Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 12 Dec 2023 10:23:44 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E9=83=A8=E7=BD=B231=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index cd3b02af..c8ee675a 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -75,7 +75,7 @@ rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 #rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=192.168.151.57:9876 +rocketmq.name-server=192.168.0.31:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 From 2521ccf7372fc9bef4a010bea6746f40b9bb3a9f Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 12 Dec 2023 10:24:05 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E9=83=A8=E7=BD=B231=E4=B8=93=E7=94=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a93edfdf..a48eb064 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,7 +3,7 @@ server.port=8091 #?? #spring.profiles.active=local -#?? +#31ʱʹ spring.profiles.active=dev #?? #spring.profiles.active=master From c998e2ebb036d86ca593e15a60cbaa578fcb890e Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 12 Dec 2023 19:16:04 +0800 Subject: [PATCH 10/16] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/bus/CorpInfoController.java | 20 +++ .../system/DepartmentController.java | 1 + .../datasource/system/DepartmentMapper.java | 2 + .../dsno2/system/Department2Mapper.java | 117 ++++++++++++++++++ .../service/system/DepartmentService.java | 2 + .../system/impl/DepartmentServiceImpl.java | 5 + .../datasource/system/DepartmentMapper.xml | 26 ++++ 7 files changed, 173 insertions(+) create mode 100644 src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java diff --git a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java index 9c96a3ea..a66edc34 100644 --- a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java +++ b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java @@ -10,6 +10,7 @@ import java.util.Map; import com.zcloud.service.bus.CorpInfoRelatedService; import com.zcloud.service.system.DictionariesService; import com.zcloud.util.*; +import net.sf.json.JSONArray; import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -583,4 +584,23 @@ public class CorpInfoController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 显示列表ztree(只查企业端部门) 有排序 + * + * @return + */ + @RequestMapping(value = "/listTreeManageAndCorpHasOrder") + @ResponseBody + public Object listTreeManageAndCorpHasOrder() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd.put("DEPARTMENT_ID", "0"); //查询父节点为0的根节点数据 + List rootList = departmentService.listTreeManageAndCorpHasOrder(pd); + JSONArray arr = JSONArray.fromObject(rootList); + map.put("zTreeNodes", arr.toString()); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/system/DepartmentController.java b/src/main/java/com/zcloud/controller/system/DepartmentController.java index c749fdbe..9cd23a10 100644 --- a/src/main/java/com/zcloud/controller/system/DepartmentController.java +++ b/src/main/java/com/zcloud/controller/system/DepartmentController.java @@ -11,6 +11,7 @@ import com.zcloud.util.ObjectExcelView; import net.sf.json.JSONArray; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java index c35c14e6..5b9f4d3d 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java @@ -175,5 +175,7 @@ public interface DepartmentMapper{ List listTreeManageAndCorpForPcPunishThePerson(PageData pd); PageData getInfo(PageData pd) throws Exception; + + List listTreeManageAndCorpHasOrder(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java b/src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java new file mode 100644 index 00000000..8bc15d35 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java @@ -0,0 +1,117 @@ +package com.zcloud.mapper.dsno2.system; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Department; + +import java.util.List; + +/** + * 说明： 组织机构接Mapper + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +public interface Department2Mapper { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List datalistPage(Page page)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**通过编码获取数据 + * @param pd + * @throws Exception + */ + public PageData findByBianma(PageData pd)throws Exception; + + /** + * 通过ID获取其子级列表 + * @param parentId + * @return + * @throws Exception + */ + public List listSubDepartmentByParentId(String parentId) throws Exception; + + /** + * 通过ID获取其子级列表 + * @param parentId + * @return + * @throws Exception + */ + public List listByCorpInfoId(String parentId,String CORPINFO_ID) throws Exception; + List deptinformation(PageData pageData) throws Exception; + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理) + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllDepartment(String parentId) throws Exception; + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用 + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllDepartmentToSelect(String parentId, List zdepartmentPdList) throws Exception; + + /**获取某个部门所有下级部门ID(返回拼接字符串 in的形式) + * @param DEPARTMENT_ID + * @return + * @throws Exception + */ + public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception; + + public List listAll(PageData pd); + + public List listAllMent (PageData pd); + + public List listAllDepartmentByType(PageData pd) throws Exception; + + void saveCorpdept(PageData pd); + + List saftpersonlist(PageData pd) throws Exception; + + List saftmanagelist(PageData pd); + + List findbyCorpIdtoDeptlistPage(Page page); + + List findByDeptIdlistPage(Page page); + + public PageData findCorpDeptDetail(PageData pd); + + void editNameBDId(PageData deptPageData); + + //从管理端修改部门 新 + void editCorpdeptNew(PageData pd); + + List listTreeCorpDept(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/system/DepartmentService.java b/src/main/java/com/zcloud/service/system/DepartmentService.java index b863fdab..a79792c5 100644 --- a/src/main/java/com/zcloud/service/system/DepartmentService.java +++ b/src/main/java/com/zcloud/service/system/DepartmentService.java @@ -225,5 +225,7 @@ public interface DepartmentService{ List listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception; PageData getDepartmentInfo(PageData pd) throws Exception; + + List listTreeManageAndCorpHasOrder(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java index 7ed7767a..13c86e06 100644 --- a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java @@ -414,5 +414,10 @@ public class DepartmentServiceImpl implements DepartmentService{ public PageData getDepartmentInfo(PageData pd) throws Exception { return departmentMapper.getInfo(pd); } + + @Override + public List listTreeManageAndCorpHasOrder(PageData pd) { + return departmentMapper.listTreeManageAndCorpHasOrder(pd); + } } diff --git a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml index f4ffc72b..2215e418 100644 --- a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml @@ -553,4 +553,30 @@ + From cfc13f4ae0d8d4091d12b57ae8e8d9b7793ce39b Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Wed, 13 Dec 2023 14:45:11 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1=E5=8A=9F=E8=83=BD=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../keyProjects/OutSourcedController.java | 19 +++++++++++++++++++ .../dsno2/keyProjects/OutSourcedMapper.java | 2 ++ .../keyProjects/OutSourcedService.java | 2 ++ .../impl/OutSourcedServiceImpl.java | 8 ++++++++ .../dsno2/keyProjects/OutSourcedMapper.xml | 12 ++++++++++++ 5 files changed, 43 insertions(+) diff --git a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java index dd972b2c..28789e86 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java @@ -761,4 +761,23 @@ public class OutSourcedController extends BaseController { return map; } + + /** + * 批量删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/updateState") + @ResponseBody + public Object updateState() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + outsourcedService.updateState(pd); + map.put("result", errInfo); //返回结果 + return map; + } + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java index c63201ea..569023c7 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java @@ -73,5 +73,7 @@ public interface OutSourcedMapper{ //校验结束重点工程是否有为完成的内容 PageData jieshuOutSourced(PageData pd); + + void updateState(PageData pd); } diff --git a/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java b/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java index f6e1474a..bf05b77d 100644 --- a/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java +++ b/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java @@ -74,5 +74,7 @@ public interface OutSourcedService{ //校验结束重点工程是否有为完成的内容 PageData jieshuOutSourced(PageData pd); + + void updateState(PageData pd); } diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java index db3f5b50..af090e91 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java @@ -4,10 +4,12 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.dsno2.keyProjects.OutSourcedMapper; import com.zcloud.service.keyProjects.OutSourcedService; +import com.zcloud.util.DateUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; /** @@ -98,5 +100,11 @@ public class OutSourcedServiceImpl implements OutSourcedService { public PageData jieshuOutSourced(PageData pd) { return outsourcedMapper.jieshuOutSourced(pd); } + + @Override + public void updateState(PageData pd) { + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); + outsourcedMapper.updateState(pd); + } } diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 3fbb08db..8b4c1a84 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -683,4 +683,16 @@ ) AI ON AI.OUTSOURCED_ID = o.OUTSOURCED_ID WHERE o.OUTSOURCED_ID=#{OUTSOURCED_ID} + + + + update + + set + STATE = #{STATE}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME} + where + OUTSOURCED_ID = #{OUTSOURCED_ID} + From 253f559ba5da375508240a76ed5c6091ffc50859 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 14 Dec 2023 09:52:05 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/dsno2/keyProjects/OutSourcedMapper.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 8b4c1a84..7f2e8852 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -106,7 +106,8 @@ COMPETENT_DEPT_ID, GROUP_UNIT, MANAGER_DEPARTMENT_ID, - JURISDICTION_UNIT + JURISDICTION_UNIT, + IS_SMS @@ -154,7 +155,8 @@ #{COMPETENT_DEPT_ID}, #{GROUP_UNIT}, #{MANAGER_DEPARTMENT_ID}, - #{JURISDICTION_UNIT} + #{JURISDICTION_UNIT}, + #{IS_SMS} From 71e3449f48fb86b9e026b9904ff82a4fe3e9f6f2 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 14 Dec 2023 16:50:11 +0800 Subject: [PATCH 13/16] =?UTF-8?q?12618=20=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=20=E5=88=A4=E7=A9=BA=E6=8F=90=E7=A4=BA=E8=AF=AD?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/xgf/FlowTrainController.java | 1 - .../mybatis/datasource/system/UsersMapper.xml | 13 +++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java index 2a561de1..d3c4f6e1 100644 --- a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java +++ b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java @@ -31,7 +31,6 @@ public class FlowTrainController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("MAndTUserId",Jurisdiction.getUSER_ID()); -// pd.put("TRAIN_CORP_LEADER", Jurisdiction.getUSER_ID()); Map result = HttpClientService.doPost(xgfUrl + "/openApi/trainingbatch/list" +getPageUrl(page), pd); return result; } diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index effedd65..59ce3768 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1317,6 +1317,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select * from vi_user_all + + where USER_ID = #{USER_ID} + + + where USER_ID in + + #{item} + + + From 8446811b6fa2fcdf7acef66caf6b9ef04a72ab8b Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 14 Dec 2023 17:23:42 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E6=90=9C=E7=B4=A2bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/bus/ShiftWorkRulesMapper.xml | 109 +++++++++--------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml b/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml index 282cf422..37acd5f1 100644 --- a/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml @@ -1,65 +1,65 @@ - + BUS_SHIFTWORKRULES - + SYS_DICTIONARIES - + - f.NAME, - f.CORPINFO_ID, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, + f.NAME, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE, f.PARENTID, f.LEVEL, f.ISCUSTOM, f.SHIFTWORKRULES_ID - + - NAME, - CORPINFO_ID, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, + NAME, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE, PARENTID, LEVEL, ISCUSTOM, SHIFTWORKRULES_ID - + - #{NAME}, - #{CORPINFO_ID}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, + #{NAME}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE}, #{PARENTID}, #{LEVEL}, #{ISCUSTOM}, #{SHIFTWORKRULES_ID} - + - insert into + insert into ( @@ -67,7 +67,7 @@ ) - + update @@ -76,10 +76,10 @@ ISDELETE = '1', OPERATOR = #{OPERATOR}, OPERATTIME = #{OPERATTIME} - where + where SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID} - + update @@ -88,15 +88,15 @@ ISDELETE = '1', OPERATOR = #{OPERATOR}, OPERATTIME = #{OPERATTIME} - where + where PARENTID = #{PARENTID} - + update - set + set NAME = #{NAME}, @@ -109,56 +109,57 @@ OPERATTIME = #{OPERATTIME}, - + SHIFTWORKRULES_ID = SHIFTWORKRULES_ID - where + where SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID} - + - + - + - + update set ISDELETE = '1' - where + where SHIFTWORKRULES_ID in #{item} - +