guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into lmy20231215-动火bug修改

main
limingyu 2023-12-19 14:15:35 +08:00
parent 6997c26a5f 1cb56a5c82
commit e29300756e
35 changed files with 932 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/controller/app/AppHiddenController.java
View File

@ -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);
}
}

20
src/main/java/com/zcloud/controller/bus/CorpInfoController.java
View File

@ -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<String, String> map = new HashMap<String, String>();
String errInfo = "success";
PageData pd = new PageData();
pd.put("DEPARTMENT_ID", "0"); //查询父节点为0的根节点数据
List<PageData> rootList = departmentService.listTreeManageAndCorpHasOrder(pd);
JSONArray arr = JSONArray.fromObject(rootList);
map.put("zTreeNodes", arr.toString());
map.put("result", errInfo);
return map;
}
}

2
src/main/java/com/zcloud/controller/bus/HiddenController.java
View File

@ -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);
}

2
src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java
View File

@ -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)){ // 动火前 负责人

19
src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
View File

@ -761,4 +761,23 @@ public class OutSourcedController extends BaseController {
return map;
}
/**
* 批量删除
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/updateState")
@ResponseBody
public Object updateState() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
outsourcedService.updateState(pd);
map.put("result", errInfo); //返回结果
return map;
}
}

38
src/main/java/com/zcloud/controller/openApi/OpenApiController.java
View File

@ -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
*/
@ -97,4 +119,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<String,Object> map = new HashMap<String,Object>();
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;
}
}

1
src/main/java/com/zcloud/controller/system/DepartmentController.java
View File

@ -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;

94
src/main/java/com/zcloud/controller/xgf/CorpFgsController.java Normal file
View File

@ -0,0 +1,94 @@
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<String,Object> map = new HashMap<String,Object>();
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() + "&currentPage=" + page.getUrlCurrentPage();
}
/**
* 相关方单位--根据企业端corpInfoId查询到对应的相关方部门树形结构
* @return
* @throws Exception
*/
@RequestMapping(value="/listTreeByFgsId")
@ResponseBody
public Object listTreeByFgsId() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpFgs/listTreeByFgsId", pd);
return result;
}
}

1
src/main/java/com/zcloud/controller/xgf/FlowTrainController.java
View File

@ -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;
}

240
src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java Normal file
View File

@ -0,0 +1,240 @@
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();
pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
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;
}
}

1
src/main/java/com/zcloud/controller/xgf/XgfCorpController.java
View File

@ -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;

16
src/main/java/com/zcloud/controller/xgf/XgfDictionariesController.java
View File

@ -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;
}
}

110
src/main/java/com/zcloud/controller/xgf/app/AppCorpFgsController.java Normal file
View File

@ -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<String,Object> map = new HashMap<String,Object>();
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() + "&currentPage=" + page.getUrlCurrentPage();
}
/**
* 相关方单位--根据企业端corpInfoId查询到对应的相关方部门树形结构
* @return
* @throws Exception
*/
@RequestMapping(value="/listTreeByFgsId")
@ResponseBody
public Object listTreeByFgsId() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
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<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpUserFgs/findUserByDepartmentId", pd);
return result;
}
}

4
src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java
View File

@ -173,5 +173,9 @@ public interface DepartmentMapper{
* @return
*/
List<PageData> listTreeManageAndCorpForPcPunishThePerson(PageData pd);
PageData getInfo(PageData pd) throws Exception;
List<PageData> listTreeManageAndCorpHasOrder(PageData pd);
}

2
src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
View File

@ -299,4 +299,6 @@ public interface UsersMapper {
List<PageData> selectUserListByUserIds(PageData pd);
void resetCardNo(PageData pd);
PageData getUserInfo(PageData pd);
}

2
src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java
View File

@ -73,5 +73,7 @@ public interface OutSourcedMapper{
//校验结束重点工程是否有为完成的内容
PageData jieshuOutSourced(PageData pd);
void updateState(PageData pd);
}

117
src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java Normal file
View File

@ -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<PageData> 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<Department> listSubDepartmentByParentId(String parentId) throws Exception;
/**
* 通过ID获取其子级列表
* @param parentId
* @return
* @throws Exception
*/
public List<Department> listByCorpInfoId(String parentId,String CORPINFO_ID) throws Exception;
List<PageData> deptinformation(PageData pageData) throws Exception;
/**
* 获取所有数据并填充每条数据的子级列表(递归处理)
* @param MENU_ID
* @return
* @throws Exception
*/
public List<Department> listAllDepartment(String parentId) throws Exception;
/**
* 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用
* @param MENU_ID
* @return
* @throws Exception
*/
public List<PageData> listAllDepartmentToSelect(String parentId, List<PageData> zdepartmentPdList) throws Exception;
/**获取某个部门所有下级部门ID(返回拼接字符串 in的形式)
* @param DEPARTMENT_ID
* @return
* @throws Exception
*/
public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception;
public List<PageData> listAll(PageData pd);
public List<PageData> listAllMent (PageData pd);
public List<Department> listAllDepartmentByType(PageData pd) throws Exception;
void saveCorpdept(PageData pd);
List<PageData> saftpersonlist(PageData pd) throws Exception;
List<PageData> saftmanagelist(PageData pd);
List<PageData> findbyCorpIdtoDeptlistPage(Page page);
List<PageData> findByDeptIdlistPage(Page page);
public PageData findCorpDeptDetail(PageData pd);
void editNameBDId(PageData deptPageData);
//从管理端修改部门 新
void editCorpdeptNew(PageData pd);
List<PageData> listTreeCorpDept(PageData pd);
}

19
src/main/java/com/zcloud/service/corpFgs/CorpFgsService.java Normal file
View File

@ -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);
}

46
src/main/java/com/zcloud/service/corpFgs/impl/CorpFgsServiceImpl.java Normal file
View File

@ -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<String,Object> result = HttpClientService.doPost(xgfUrl + "/openApi/user/findUserById", pd);
Map<String,Object> pageData = (Map<String, Object>) result.get("pd");
if(Tools.isEmpty(pageData)){
return workUser;
}else {
return pageData.get("NAME").toString();
}
}
}

11
src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java
View File

@ -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;
}
/**批量删除

9
src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java
View File

@ -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;
}
/**批量删除

2
src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java
View File

@ -74,5 +74,7 @@ public interface OutSourcedService{
//校验结束重点工程是否有为完成的内容
PageData jieshuOutSourced(PageData pd);
void updateState(PageData pd);
}

8
src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java
View File

@ -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);
}
}

4
src/main/java/com/zcloud/service/system/DepartmentService.java
View File

@ -223,5 +223,9 @@ public interface DepartmentService{
List<PageData> listTreeManageAndCorp1(PageData pd)throws Exception;
List<PageData> listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception;
PageData getDepartmentInfo(PageData pd) throws Exception;
List<PageData> listTreeManageAndCorpHasOrder(PageData pd);
}

2
src/main/java/com/zcloud/service/system/UsersService.java
View File

@ -350,4 +350,6 @@ public interface UsersService {
List<PageData> selectUserListByUserIds(PageData selectPageData);
void resetCardNo(PageData pd);
PageData getUserInfo(PageData pd);
}

10
src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java
View File

@ -409,5 +409,15 @@ 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);
}
@Override
public List<PageData> listTreeManageAndCorpHasOrder(PageData pd) {
return departmentMapper.listTreeManageAndCorpHasOrder(pd);
}
}

5
src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
View File

@ -468,4 +468,9 @@ public class UsersServiceImpl implements UsersService {
public void resetCardNo(PageData pd) {
usersMapper.resetCardNo(pd);
}
@Override
public PageData getUserInfo(PageData pd) {
return usersMapper.getUserInfo(pd);
}
}

2
src/main/resources/application-dev.properties
View File

@ -78,7 +78,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

22
src/main/resources/application-master.properties
View File

@ -64,4 +64,26 @@ smb.port=22
smb.user=root
smb.password=SJSKAQHBGLXT@20220311
smb.basePath=/mnt/qask/file/
#Mq\u914D\u7F6E
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.192.201:9876
rocketmq.producer.group=libmiddle
rocketmq.producer.send-message-timeout=3000
rocketmq.producer.compress-message-body-threshold=4096
rocketmq.producer.max-message-size=4194304
rocketmq.producer.retry-times-when-send-failed=3
rocketmq.producer.retry-next-server=true
rocketmq.producer.retry-times-when-send-async-failed=3
## topic \u524D\u7F00
mq.topic.info=info
mq.topic.eightWork=eightWork
mq.group.info=scheduled_tasks
mq.group.eightWork=scheduled_tasks_eightWork
corp.default.pic-path=https://qgqy.qhdsafety.com/file/
corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/

2
src/main/resources/application.properties
View File

@ -3,7 +3,7 @@ server.port=8091
#??
#spring.profiles.active=local
#??
#部署31时使用
spring.profiles.active=dev
#??
#spring.profiles.active=master

1
src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml
View File

@ -135,6 +135,7 @@
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
<!-- 根据需求自己加检索条件
字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or

15
src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
View File

@ -329,6 +329,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'
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
@ -350,6 +353,18 @@
<if test="pd.keyJobNumber != null and pd.keyJobNumber != ''">
and (f.JOB_NUMBER LIKE CONCAT(CONCAT('%', #{pd.keyJobNumber}),'%'))
</if>
<if test="pd.JOB_CONTENT != null and pd.JOB_CONTENT != ''">
and f.JOB_CONTENT LIKE CONCAT(CONCAT('%', #{pd.JOB_CONTENT}),'%')
</if>
<if test="pd.HOT_WORK_POSITION != null and pd.HOT_WORK_POSITION != ''">
and f.HOT_WORK_POSITION LIKE CONCAT(CONCAT('%', #{pd.HOT_WORK_POSITION}),'%')
</if>
<if test="pd.HOT_WORK_LEVEL_INDEX != null and pd.HOT_WORK_LEVEL_INDEX != ''">
and f.HOT_WORK_LEVEL_INDEX = #{pd.HOT_WORK_LEVEL_INDEX}
</if>
<if test="pd.UNIT_LEADER_DEPARTMENT_ID != null and pd.UNIT_LEADER_DEPARTMENT_ID != ''">
and hd.DEPARTMENT_ID = #{pd.UNIT_LEADER_DEPARTMENT_ID}
</if>
<if test="pd.keyState != null and pd.keyState != ''">
and f.STATE = #{pd.keyState}
</if>

29
src/main/resources/mybatis/datasource/system/DepartmentMapper.xml
View File

@ -550,4 +550,33 @@
</foreach>
</if>
</select>
<select id="getInfo" resultType="com.zcloud.entity.PageData">
select * from vi_department_all where DEPARTMENT_ID = #{DEPARTMENT_ID}
</select>
<select id="listTreeManageAndCorpHasOrder" resultType="com.zcloud.entity.PageData">
SELECT
*
FROM
(
SELECT
DEP_ORDER,
DEPARTMENT_ID id,
NAME name,
PARENT_ID pId,
f.CORPINFO_ID,
c.COR_ORDER
FROM
OA_DEPARTMENT f
LEFT JOIN bus_corp_info c ON f.CORPINFO_ID = c.CORPINFO_ID
WHERE
c.ISDELETE = '0'
ORDER BY
name,
DEP_ORDER ASC
) t
ORDER BY
( COR_ORDER + 0 ) ASC,
DEP_ORDER ASC,
name
</select>
</mapper>

12
src/main/resources/mybatis/datasource/system/UsersMapper.xml
View File

@ -1316,4 +1316,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</if>
</select>
<select id="getUserInfo" resultType="com.zcloud.entity.PageData">
select * from vi_user_all
<if test="USER_ID != null and USER_ID != ''">
where USER_ID = #{USER_ID}
</if>
<if test="USER_IDS != null and USER_IDS != ''">
where USER_ID in
<foreach item="item" index="index" collection="USER_IDS" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
</mapper>

18
src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
View File

@ -106,7 +106,8 @@
COMPETENT_DEPT_ID,
GROUP_UNIT,
MANAGER_DEPARTMENT_ID,
JURISDICTION_UNIT
JURISDICTION_UNIT,
IS_SMS
</sql>
<!-- 字段值 -->
@ -154,7 +155,8 @@
#{COMPETENT_DEPT_ID},
#{GROUP_UNIT},
#{MANAGER_DEPARTMENT_ID},
#{JURISDICTION_UNIT}
#{JURISDICTION_UNIT},
#{IS_SMS}
</sql>
<!-- 新增-->
@ -683,4 +685,16 @@
) AI ON AI.OUTSOURCED_ID = o.OUTSOURCED_ID
WHERE o.OUTSOURCED_ID=#{OUTSOURCED_ID}
</select>
<update id="updateState" parameterType="pd">
update
<include refid="tableName"></include>
set
STATE = #{STATE},
OPERATOR = #{OPERATOR},
OPERATTIME = #{OPERATTIME}
where
OUTSOURCED_ID = #{OUTSOURCED_ID}
</update>
</mapper>