From 38bdba0109c09a7920106fa49bb350c8ddd0d9c6 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 5 Dec 2023 10:43:41 +0800
Subject: [PATCH 1/3] =?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<String, Object> map = new HashMap<String, Object>();
+ 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<String, Object> dataMap = new HashMap<String, Object>();
+ List<String> titles = new ArrayList<String>();
+ 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<HashMap<String, Object>> varOList = (List<HashMap<String, Object>>) result.get("unitCorp");
+
+ List<PageData> varList = new ArrayList<PageData>();
+ 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<String,Object> map = new HashMap<String,Object>();
+ String errInfo = "success";
+ PageData pd = new PageData();
+ pd = this.getPageData();
+ Map result = HttpClientService.doPost(url + "/api/dictionaries/listSelectTree", pd);
+ return result;
+ }
}
From de3503d0e86fbb94d2b9b24d22bdb5860982d591 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 6 Dec 2023 15:02:41 +0800
Subject: [PATCH 2/3] =?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 <liujun@zcloudchina.com>
Date: Thu, 7 Dec 2023 15:02:01 +0800
Subject: [PATCH 3/3] =?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<PageData> 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<PageData> 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<PageData> listTreeManageAndCorp1(PageData pd)throws Exception;
List<PageData> 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<PageData> 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<PageData> 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 @@
</foreach>
</if>
</select>
+ <select id="getInfo" resultType="com.zcloud.entity.PageData">
+ select * from vi_department_all where DEPARTMENT_ID = #{DEPARTMENT_ID}
+ </select>
</mapper>
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"
</foreach>
</if>
</select>
+ <select id="getUserInfo" resultType="com.zcloud.entity.PageData">
+ select * from vi_user_all where USER_ID = #{USER_ID}
+ </select>
</mapper>