diff --git a/src/main/java/com/zcloud/controller/app/AppUsersController.java b/src/main/java/com/zcloud/controller/app/AppUsersController.java index 97c26102..33e70397 100644 --- a/src/main/java/com/zcloud/controller/app/AppUsersController.java +++ b/src/main/java/com/zcloud/controller/app/AppUsersController.java @@ -7,6 +7,7 @@ import java.util.Map; import com.zcloud.service.system.*; import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.DisabledAccountException; @@ -397,4 +398,22 @@ public class AppUsersController extends BaseController { map.put("result", errInfo); return map; } + + //根据用户id查询部门 + @RequestMapping(value="/getDepartmentByUserId") + @ResponseBody + public Object getDepartmentByUserId()throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData data = usersService.findById(pd); + if (data == null || StringUtils.equals(data.getString("DEPARTMENT_ID"),"")) { + map.put("result", errInfo); + return map; + } + map.put("data", data); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java index b5484661..1ff1699c 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java @@ -34,6 +34,8 @@ public class AppHomeController extends BaseController { @Resource private GFBreakGroundService GFbreakGroundService; + @Resource + private GFConfinedSpaceService GFconfinedspaceService; @Autowired private ConfinedSpaceService confinedspaceService; @@ -77,7 +79,7 @@ public class AppHomeController extends BaseController { pd = this.getPageData(); PageData blindboardCount = GFblindboardService.countCheck(pd);// 待办盲板作业数统计 PageData breakGroundCount = GFbreakGroundService.countCheck(pd);// 待办动土作业数统计 - PageData confinedspaceCount = confinedspaceService.countCheck(pd);// 待办有限空间作业数统计 + PageData confinedspaceCount = GFconfinedspaceService.countCheck(pd);// 待办有限空间作业数统计 PageData electricityCount = GFelectricityService.countCheck(pd);// 待办临时用电作业数统计 PageData highworkCount = GFhighworkService.countCheck(pd);// 待办高处作业数统计 PageData hoistingCount = GFhoistingService.countCheck(pd);// 待办吊装作业数统计 diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java index f696040b..94ed8b8e 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java @@ -14,6 +14,7 @@ import com.zcloud.service.highriskwork.HotWorkSafetyMethodRecordService; import com.zcloud.service.highriskwork.HotworkToMeasuresService; import com.zcloud.service.system.DictionariesService; import com.zcloud.service.system.FHlogService; +import com.zcloud.service.system.UsersService; import com.zcloud.util.*; import com.zcloud.util.message.MessageService; import org.apache.commons.io.FileUtils; @@ -86,6 +87,8 @@ public class AppHotWorkApplicationController extends BaseController { * */ @Autowired + private UsersService usersService; + @Autowired private HotWorkApplicationService hotworkapplicationService; @Autowired private HotWorkApplicationUserService hotWorkApplicationUserService; @@ -1753,7 +1756,8 @@ public class AppHotWorkApplicationController extends BaseController { content.put("params2", "延时监火"); content.put("params3", "处理");// 作业操作 mes.put("CONTENT", content);// 站内信内容 - noticeCorpService.sendNotice(mes); + noticeCorpService.sendNoticeToDep(mes); //向部门中的所有人员发通知 +// noticeCorpService.sendNotice(mes); } else if(hot.getString("STATE").equals("30")){ PageData hotUser = hotUserList.get(0); String userID = hotUser.getString("USER_ID"); diff --git a/src/main/java/com/zcloud/controller/bus/ClassMessageController.java b/src/main/java/com/zcloud/controller/bus/ClassMessageController.java new file mode 100644 index 00000000..d65f9341 --- /dev/null +++ b/src/main/java/com/zcloud/controller/bus/ClassMessageController.java @@ -0,0 +1,74 @@ +package com.zcloud.controller.bus; + +import com.alibaba.fastjson.JSONObject; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.bus.ClassInfoService; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.Tools; +import com.zcloud.util.Warden; +import org.apache.commons.lang3.StringUtils; +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.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 说明：开课信息 + * 作者：luoxiaobao + * 时间：2023-09-27 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/classMessage") +public class ClassMessageController extends BaseController { + + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + private static int index = -1; + + + @Autowired + private ClassInfoService classInfoService; + + + @RequestMapping(value = "/getUserinfoList") + @ResponseBody + public Object getUserinfoList() throws Exception { + Map map = new HashMap<>(); + PageData condition = new PageData(); + PageData request = this.getPageData(); + condition.put("CLASS_MESSAGE_ID", request.getString("CLASS_MESSAGE_ID")); + condition.put("CLASS_INFO_ID", request.getString("CLASS_INFO_ID")); + condition.put("CER_TYPE", "7498057c4c1f4a11b9a960e66ea04a7a"); + List list = classInfoService.findinfoByCondition(condition); + map.put("list", list); + map.put("result", "success"); + return map; + } + + @RequestMapping(value = "/getClassinfo") + @ResponseBody + public Object getClassinfo() throws Exception { + Map map = new HashMap<>(); + PageData condition = new PageData(); + PageData request = this.getPageData(); + condition.put("TRAINUSERS_ID", request.getString("TRAINUSERS_ID")); + PageData entity = classInfoService.getClassinfo(condition); + map.put("pd", entity); + map.put("result", "success"); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java index 1308325e..0a0a35e0 100644 --- a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java +++ b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java @@ -274,6 +274,7 @@ public class CorpInfoController extends BaseController { pd2.put("TYPE",2); List fourImgs = imgfilesService.listAll(pd2);//四色图照图片 pd.put("INDUSTRYALL", CORP_TYPEALL); + pd.put("FOURTYPE", "1"); map.put("pd", pd); map.put("pdrelated",pdrelated); map.put("busImgs", busImgs); diff --git a/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java index 63b3648d..668e1c79 100644 --- a/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java +++ b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java @@ -156,6 +156,13 @@ public class IdentificationPartsController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + List byName = identificationpartsService.findByName(pd); + if (byName != null && byName.size() > 0) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "辨识部位已存在，请修改后重试"); + return map; + } pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 identificationpartsService.edit(pd); diff --git a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java index 65740013..611c6aa5 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java @@ -75,7 +75,7 @@ public class RiskUnitController extends BaseController { //pd.put("DEPARTMENT_ID",Jurisdiction.getDEPARTMENT_ID()); List list = riskunitService.listAll(pd); if(list!=null&&list.size()>0) { - map.put("result", "failed"); + map.put("result", "fail"); map.put("exception", "风险点（单元）已存在，请修改后重试"); return map; } diff --git a/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java b/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java index 91059b1f..634a357f 100644 --- a/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java +++ b/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java @@ -23,6 +23,7 @@ import com.zcloud.entity.PageData; import com.zcloud.service.firemanager.FireDeviceService; import com.zcloud.util.*; import com.zcloud.util.logAop.LogOperation; +import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -389,4 +390,57 @@ public class FireDeviceController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 导出数据到excel + * @return + * @throws Exception + */ + @RequestMapping(value = "/excelAll") + public ModelAndView excelAll() throws Exception { + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); +// String paramJson = pd.getString("param"); +// Map param = (Map) JSON.parse(paramJson); +// pd.putAll(param); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List varList = fireDeviceService.exportDataList(pd); + List exportList = new ArrayList<>(); //导出的数据列表 + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("消防区域编码"); + titles.add("消防点位名称"); + titles.add("消防点位编码"); + titles.add("负责部门"); + titles.add("负责人手机号"); + titles.add("消防器材类型"); + titles.add("消防器材编码"); + titles.add("有效期开始"); + titles.add("结束时间"); + titles.add("存放地点"); + titles.add("负责人"); + dataMap.put("titles", titles); + for (int i = 0; i < varList.size(); i++) { + PageData vpd = new PageData(); + vpd.put("var1", varList.get(i).getString("FIRE_REGION_CODE")); //消防区域编码 + vpd.put("var2", varList.get(i).getString("FIRE_POINT_NAME")); //消防点位名称 + vpd.put("var3", varList.get(i).getString("FIRE_POINT_CODE")); //消防点位编码 + vpd.put("var4", varList.get(i).getString("DEPARTMENTNAME")); //负责部门 + vpd.put("var5", varList.get(i).getString("USER_PHONE")); //负责人手机号 + vpd.put("var6", varList.get(i).getString("FIRE_DEVICE_TYPE_NAME")); //消防器材类型 + vpd.put("var7", varList.get(i).getString("FIRE_DEVICE_CODE")); //消防器材编码 + vpd.put("var8", varList.get(i).getString("VALIDITY_START_TIME")); //有效期开始 + vpd.put("var9", varList.get(i).getString("VALIDITY_END_TIME"));//结束时间 + vpd.put("var10", varList.get(i).getString("REMAKE"));//存放地点 + vpd.put("var11", varList.get(i).getString("USERNAME"));//负责人 + exportList.add(vpd); + } + dataMap.put("varList", exportList); + ObjectExcelView erv = new ObjectExcelView(); + mv = new ModelAndView(erv, dataMap); + return mv; + } } diff --git a/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java b/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java new file mode 100644 index 00000000..6592bb22 --- /dev/null +++ b/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java @@ -0,0 +1,124 @@ +package com.zcloud.controller.firemanager; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.FireResourcesService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/fireResources") +public class FireResourcesController extends BaseController { + + @Resource + private FireResourcesService fireResourcesService; + @RequestMapping(value = "/list") + @ResponseBody + public Object page(Page page) { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + page.setPd(pd); + if ("00004".equals(pd.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("FIRERESOURCES_NAME", pd.getString("FIRERESOURCES_NAME")); + paramMap.add("FIRERESOURCES_TYPE", pd.getString("FIRERESOURCES_TYPE")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/fireResources/list", paramMap, Map.class); + return result; + } + //获取当前人的公司id + List varList = fireResourcesService.datalistPage(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + @Value("${cfd.prevention.api.url}") + private String cfdUrl; + @Autowired + private RestTemplate restTemplate; + @RequestMapping(value = "/getById") + @ResponseBody + public Object getById() { + Map map = new HashMap(); + String errInfo = "success"; + PageData pddata = this.getPageData(); + if ("00004".equals(pddata.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("FIRERESOURCES_ID", pddata.getString("FIRERESOURCES_ID")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/fireResources/getById", paramMap, Map.class); + return result; + } + //获取当前人的公司id + PageData pd = fireResourcesService.getDataById(pddata); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + String FIRERESOURCES_ID = this.get32UUID(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("FIRERESOURCES_ID", FIRERESOURCES_ID); + pd.put("CREATIME", DateUtil.date2Str(new Date())); + pd.put("OPERATIME", DateUtil.date2Str(new Date())); + pd.put("ISDELETE", "0"); + fireResourcesService.save(pd,files); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("OPERATIME", DateUtil.date2Str(new Date())); + pd.put("ISDELETE", "0"); + fireResourcesService.edit(pd,files); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(Page page) { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + fireResourcesService.delete(pd); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java index ff394201..5bd872b4 100644 --- a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java +++ b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java @@ -821,6 +821,15 @@ public class HiddenApiController extends BaseController { if ("list".equals(pd.getString("hiddenVueType"))) { // 整改隐患 pd = Jurisdiction.getUserDataJurisdiction(pd); } + List hiddenTypeList = new ArrayList<>(); + for (Object key : pd.keySet()) { + if (key.toString().contains("hiddenType[")) { + hiddenTypeList.add(pd.getString(key.toString())); + } + } + if (hiddenTypeList.size() > 0) { + pd.put("hiddenTypeList", hiddenTypeList); + } /*上方的条件选择都是 condform */ /** diff --git a/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java b/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java index d92f570c..51b9fbbf 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java @@ -370,7 +370,7 @@ public class AIWarningController extends BaseController { if (Tools.notEmpty(jsonObject.get("IMG_PATH").toString())) { String imgName = this.get32UUID() + ".jpg"; String filePath = Const.FILEPATHAITP + "/" + DateUtil.getDays(); - Base64Utils.decodeToFile(Const.basePath + filePath + "/" + imgName, jsonObject.get("IMG_PATH").toString().replace("data:image/jpeg;base64,", "")); + Base64Utils.decodeToFile(Smb.basePath + filePath + "/" + imgName, jsonObject.get("IMG_PATH").toString().replace("data:image/jpeg;base64,", "")); pd.put("IMG_PATH", filePath + "/" + imgName); //报警图片（路径） } else { map.put("returnCode", "1001"); //缺少同步信息 diff --git a/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java index 35d66633..57a18522 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.keyProjects; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -37,6 +39,7 @@ public class PersonnelManagementController extends BaseController { @RequestMapping(value = "/add") @RequiresPermissions("personnelmanagement:add") @ResponseBody + @DockAnnotation public Object add() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -49,6 +52,8 @@ public class PersonnelManagementController extends BaseController { pd.put("ISDELETE", "0"); //是否删除 pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("PHONENUM"), Const.DEFAULT_PASSWORD).toString()); personnelmanagementService.save(pd); + pd.put("sendAllCorp",1); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -62,6 +67,7 @@ public class PersonnelManagementController extends BaseController { @RequestMapping(value = "/delete") @RequiresPermissions("personnelmanagement:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -76,6 +82,8 @@ public class PersonnelManagementController extends BaseController { map.put("msg", "只用添加人" + state + "可以删除相关方人员！"); } + pd.put("sendAllCorp",1); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -89,6 +97,7 @@ public class PersonnelManagementController extends BaseController { @RequestMapping(value = "/edit") @RequiresPermissions("personnelmanagement:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -103,6 +112,8 @@ public class PersonnelManagementController extends BaseController { map.put("msg", "只用添加人" + state + "可以删除相关方人员！"); } + pd.put("sendAllCorp",1); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -309,6 +320,7 @@ public class PersonnelManagementController extends BaseController { @RequestMapping(value = "/resetPwd") @ResponseBody + @DockAnnotation public Object resetPwd(Page page) throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -320,7 +332,8 @@ public class PersonnelManagementController extends BaseController { updateUser.put("PASSWORD", pwd); updateUser.put("PERSONNELMANAGEMENT_ID", pageData.getString("PERSONNELMANAGEMENT_ID")); personnelmanagementService.editPassword(updateUser); - + pd.put("sendAllCorp",1); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java index 9b536ed7..0f41a466 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java @@ -55,7 +55,7 @@ public class PlatformvideomanagementController extends BaseController { Map map = new HashMap(); PageData pd =this.getPageData(); map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls"); - if(!ObjectUtils.isEmpty(map)){ + if(ObjectUtils.isEmpty(map)){ map = new HashMap(); } map.put("result", "success"); @@ -71,7 +71,7 @@ public class PlatformvideomanagementController extends BaseController { Map map = new HashMap(); PageData pd =this.getPageData(); map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"rtsp"); - if(!ObjectUtils.isEmpty(map)){ + if(ObjectUtils.isEmpty(map)){ map = new HashMap(); } map.put("result", "success"); @@ -87,7 +87,7 @@ public class PlatformvideomanagementController extends BaseController { Map map = new HashMap(); PageData pd =this.getPageData(); map = HKUtil.cameraSearch(pd); - if(!ObjectUtils.isEmpty(map)){ + if(ObjectUtils.isEmpty(map)){ map = new HashMap(); } map.put("result", "success"); diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 99296de5..24459ab8 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -983,5 +983,27 @@ public class MapController extends BaseController { r.put("pd", pd); return r; } - + /** + * 企业端地图优化 + * 原有的地图查询速度太慢,达到5s以上,通过索引的方式暂时无法解决,所有使用业务优化sql,提升速度 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listbymeteorologicalByCorpinfo") + @ResponseBody + public Object listbymeteorologicalByCorpinfo() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + //根据条件增加参数或减少参数 都没有 直接返回空 + if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { + map.put("result", errInfo); + return map; + } + pd = meteorologicalinfoService.listbymeteorologicalByCorpinfoId(pd); //列出meteorological列表 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjAreaController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaController.java new file mode 100644 index 00000000..e9d7eb3b --- /dev/null +++ b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaController.java @@ -0,0 +1,121 @@ +package com.zcloud.controller.mkmj; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.ObjectExcelView; +import com.zcloud.util.Tools; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +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.*; + +/** + * 说明：门口门禁区域 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/mkmjArea") +public class MkmjAreaController extends BaseController { + + @Autowired + private MkmjAreaService mkmjAreaService; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @RequiresPermissions("mkmjArea:add") + @ResponseBody + public Object add() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 添加时间 + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("ISDELETE", "0"); //是否删除 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjAreaService.save(pd); + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @RequiresPermissions("mkmjArea:del") + @ResponseBody + public Object delete() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + return mkmjAreaService.delete(pd); + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @RequiresPermissions("mkmjArea:edit") + @ResponseBody + public Object edit() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjAreaService.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @RequiresPermissions("mkmjArea:list") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = mkmjAreaService.list(page); //列出Coursectk列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @RequiresPermissions("mkmjArea:edit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = mkmjAreaService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java new file mode 100644 index 00000000..411da8ff --- /dev/null +++ b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java @@ -0,0 +1,134 @@ +package com.zcloud.controller.mkmj; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaGateService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：门口门禁区域 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/mkmjAreaGate") +public class MkmjAreaGateController extends BaseController { + + @Autowired + private MkmjAreaGateService mkmjAreaGateService; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @RequiresPermissions("mkmjArea:add") + @ResponseBody + public Object add() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 添加时间 + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("ISDELETE", "0"); //是否删除 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjAreaGateService.save(pd); + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @RequiresPermissions("mkmjArea:del") + @ResponseBody + public Object delete() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + return mkmjAreaGateService.delete(pd); + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @RequiresPermissions("mkmjArea:edit") + @ResponseBody + public Object edit() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjAreaGateService.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @RequiresPermissions("mkmjArea:list") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = mkmjAreaGateService.list(page); //列出Coursectk列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @RequiresPermissions("mkmjArea:edit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = mkmjAreaGateService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /**定位 + * @param + * @throws Exception + */ + @RequestMapping(value="/savePosition") + @ResponseBody + public Object savePosition() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + return mkmjAreaGateService.savePosition(pd); //根据ID读取 + } + +} diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java new file mode 100644 index 00000000..ba8f91fc --- /dev/null +++ b/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java @@ -0,0 +1,122 @@ +package com.zcloud.controller.mkmj; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaGateService; +import com.zcloud.service.mkmj.MkmjGateLogService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：门口门禁区域 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/mkmjGateLog") +public class MkmjGateLogController extends BaseController { + + @Autowired + private MkmjGateLogService mkmjGateLogService; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @RequiresPermissions("mkmjArea:add") + @ResponseBody + public ReturnMap add() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("ISDELETE", "0"); //是否删除 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjGateLogService.save(pd); + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @RequiresPermissions("mkmjArea:del") + @ResponseBody + public ReturnMap delete() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + return mkmjGateLogService.delete(pd); + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @RequiresPermissions("mkmjArea:edit") + @ResponseBody + public ReturnMap edit() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjGateLogService.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @RequiresPermissions("mkmjArea:list") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = mkmjGateLogService.list(page); //列出Coursectk列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @RequiresPermissions("mkmjArea:edit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = mkmjGateLogService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjGateVideoController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjGateVideoController.java new file mode 100644 index 00000000..ef86aa56 --- /dev/null +++ b/src/main/java/com/zcloud/controller/mkmj/MkmjGateVideoController.java @@ -0,0 +1,140 @@ +package com.zcloud.controller.mkmj; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaGateService; +import com.zcloud.service.mkmj.MkmjGateVideoService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：门口门禁区域 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/mkmjGateVideo") +public class MkmjGateVideoController extends BaseController { + + @Autowired + private MkmjGateVideoService mkmjGateVideoService; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @RequiresPermissions("mkmjArea:add") + @ResponseBody + public Object add() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 添加时间 + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("ISDELETE", "0"); //是否删除 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjGateVideoService.save(pd); + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @RequiresPermissions("mkmjArea:del") + @ResponseBody + public Object delete() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + return mkmjGateVideoService.delete(pd); + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @RequiresPermissions("mkmjArea:edit") + @ResponseBody + public Object edit() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjGateVideoService.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @RequiresPermissions("mkmjArea:list") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = mkmjGateVideoService.list(page); //列出Coursectk列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @RequiresPermissions("mkmjArea:edit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = mkmjGateVideoService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + + /**定位 + * @param + * @throws Exception + */ + @RequestMapping(value="/savePosition") + @ResponseBody + public Object savePosition() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + mkmjGateVideoService.savePosition(pd); //根据ID读取 + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java index 353793ec..b81c7e6e 100644 --- a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java +++ b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java @@ -164,4 +164,41 @@ public class FlowTrainController extends BaseController { map.put("result", "success"); return map; } + /** + * 获取流程节点名称 + * @date 2024-02-23 + * @author liu jun + */ + @RequestMapping(value = "/getPintName") + @ResponseBody + public Object getPintName() throws Exception { + PageData request = this.getPageData(); + if (StringUtils.isEmpty(request.getString("FLOWS_TYPE"))) + throw new Exception("FLOWS_TYPE不能为空"); + Map map = new HashMap(); + if ("1".equals(request.getString("FLOWS_TYPE"))) { + switch (request.getString("FLOWS_STEP")) { + case "0": + map.put("Department", "指定主管部门"); + map.put("User", "指定主管部门审批人"); + map.put("UploadFile", "承诺书"); + break; + case "1": + case "2": + map.put("Department", "指定监管部门"); + map.put("User", "指定监管部门审批人"); + break; + default: + throw new Exception("FLOWS_STEP不合法"); + } + } else{ + if (request.getString("FLOWS_STEP").equals("0")) { + map.put("Department", "监管部门"); + map.put("User", "监管部门审批人"); + } + } + + map.put("result", "success"); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java b/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java index feb476ac..26bbb122 100644 --- a/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java +++ b/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java @@ -117,7 +117,6 @@ public class TrainingBatchController extends BaseController { * @throws Exception */ @RequestMapping(value = "/userList") - @RequiresPermissions("trainingbatch:list") @ResponseBody public Object userList(Page page) throws Exception { Map map = new HashMap(); diff --git a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java index d3e7835d..caa660ab 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java @@ -42,13 +42,17 @@ public class XgfCorpController extends BaseController { public Object getCorpInfoList(Page page) throws Exception { PageData pd = new PageData(); pd = this.getPageData(); - pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - if (Jurisdiction.getIS_MAIN().equals("1")) { //主账号 - pd.put("SUPERVISE_DEPARTMENT_ID", ""); + if ("1e6dbbe16004402f8d2c0e52afd9a676,3a854eefa7894e06aaa1a2611bca80f6,020578a4c1f04bc692ee25145c2efbe5,90966974de3c4b83aca6f8fd6432d5c2".contains(Jurisdiction.getCORPINFO_ID())) { + pd.put("CORP_INFO_ID", Jurisdiction.getCORPINFO_ID()); } else { - pd.put("SUPERVISE_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + if (Jurisdiction.getIS_MAIN().equals("1")) { //主账号 + pd.put("SUPERVISE_DEPARTMENT_ID", ""); + } else { + pd.put("SUPERVISE_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + } } - Map result = HttpClientService.doPost(url + "/api/corpinfo/list", pd); + Map result = HttpClientService.doPost(url + "/api/corpinfo/JiTuanTeShulist", pd); return result; } diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java index 3929e092..15352eb0 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -6,10 +6,13 @@ import com.zcloud.entity.PageData; import com.zcloud.service.xgf.TrainingBatchService; import com.zcloud.service.xgf.XgfUserService; 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.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.HashMap; @@ -29,7 +32,6 @@ public class XgfUserController extends BaseController { @Resource private TrainingBatchService trainingBatchService; - @RequestMapping(value = "/list") @ResponseBody public Object list(Page page) throws Exception { @@ -43,6 +45,9 @@ public class XgfUserController extends BaseController { return response; } + /** + * 人员信息审核 + */ @RequestMapping(value = "/approve") @ResponseBody public Object approve() throws Exception { @@ -54,6 +59,21 @@ public class XgfUserController extends BaseController { return response; } + + /** + * 人员信息审核 + */ + @RequestMapping(value = "/approvePlus") + @ResponseBody + public Object approvePlus(@RequestParam(value="chengNuoShu",required=false) MultipartFile[] chengNuoShu) throws Exception { + PageData request = this.getPageData(); + xgfUserService.approvePlus(request,chengNuoShu); + PageData response = new PageData(); + response.put("result", "success"); + response.put("data", request); + return response; + } + @RequestMapping(value = "/regulatoryUserList") @ResponseBody public Object regulatoryUserList() throws Exception{ @@ -95,4 +115,45 @@ public class XgfUserController extends BaseController { response.put("data", request); return response; } + + @RequestMapping(value = "/getAppointApproveList") + @ResponseBody + public Object getAppointApproveList(Page page) throws Exception{ + PageData request = this.getPageData(); + request.put("USER_ID", Jurisdiction.getUSER_ID()); + page.setPd(request); + PageData response = new PageData(); + response.put("result", "success"); + response.put("list", xgfUserService.getAppointApproveList(page)); + response.put("page", page); + return response; + } + + /** + * 人员指定审核 + */ + @RequestMapping(value = "/appointApprove") + @ResponseBody + public Object appointApprove() throws Exception{ + PageData request = this.getPageData(); + PageData response = new PageData(); + response.put("result", "success"); + response.put("data", request); + return response; + } + + /** + * 查看审批信息 + */ + @RequestMapping(value = "/getApproveInfo") + @ResponseBody + public Object getApproveInfo() throws Exception{ + PageData request = this.getPageData(); + PageData response = new PageData(); + response.put("list", xgfUserService.getApproveInfo(request)); + response.put("flow", xgfUserService.getFlowInfo(request)); + response.put("result", "success"); + response.put("data", request); + return response; + } } diff --git a/src/main/java/com/zcloud/mapper/datasource/bus/NoticeCorpUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/bus/NoticeCorpUserMapper.java index 94c210df..5859d6ee 100644 --- a/src/main/java/com/zcloud/mapper/datasource/bus/NoticeCorpUserMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/bus/NoticeCorpUserMapper.java @@ -4,7 +4,7 @@ import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：企业公告人员关系表 * 作者：luoxiaobao * 时间：2021-01-22 @@ -17,37 +17,37 @@ public interface NoticeCorpUserMapper{ * @throws Exception */ void save(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); - + /**列表 * @param page * @throws Exception */ List datalistPage(Page page); - + /**列表(全部) * @param pd * @throws Exception */ List listAll(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception */ PageData findById(PageData pd); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception @@ -58,7 +58,7 @@ public interface NoticeCorpUserMapper{ * @param pd */ void savaAll(PageData pd); - + void deleteByNotId(PageData pd); List getTypeCountByNotId (Page page); /** @@ -68,5 +68,11 @@ public interface NoticeCorpUserMapper{ * @throws Exception */ List getReadUserlistPage(Page page); + + /** + * 批量添加公告人员关系信息 + * @param noticeCorpUserList + */ + void batchSave(List noticeCorpUserList); } diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java index 2ff6a166..ae8154ea 100644 --- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java @@ -110,4 +110,6 @@ public interface FireDeviceMapper { void delDevicePreparedByIds(List fireCheckIdList); void deleteAll(PageData pd); + + List exportDataList(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java index f8fe4c5f..b4fc09d5 100644 --- a/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java @@ -15,7 +15,7 @@ import java.util.Map; public interface MapEightMapper { - List getCorpinfoIds(String[] ArrayDATA_IDS); + List getCorpinfoIds(String[] ArrayDATA_IDS); /** * 获取柱状图 @@ -359,11 +359,11 @@ public interface MapEightMapper { */ List listAllMeasuresCUTROADOrder(PageData pd); - /** - * 动火获取字典展示 - * @param shuzu - * @return - */ + /** + * 动火获取字典展示 + * @param shuzu + * @return + */ List getListDongHuo(List shuzu); /** @@ -397,5 +397,45 @@ public interface MapEightMapper { List findByHOISTINGAcceptuserId(PageData pd); List findByHOISTINGAcceptuserIds(PageData pd); + + /**有限空间作业查询 + * @param pd + * @throws Exception + */ + PageData findByIdCONFINEDSPACEOrder(PageData pd); + + /**有限空间作业措施查询 + * @param pd + * @throws Exception + */ + List listAllMeasuresCONFINEDSPACEOrder(PageData pd); + + /** + * 有限空间 + * @param pd + * @return + */ + List listAllCONFINEDSPACEOrder(PageData pd); + + /** + * 有限空间 + * @param pd + * @return + */ + List findByIdCONFINEDSPACEAcceptuser(PageData pd); + + /** + * 有限空间 + * @param pd + * @return + */ + List findByIdCONFINEDSPACEAcceptusers(PageData pd); + + /** + * 有限空间气体检测 + * @param pd + * @return + */ + PageData findByIdCONFINEDSPACEGasWH(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaGateMapper.java b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaGateMapper.java new file mode 100644 index 00000000..4ff0ced4 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaGateMapper.java @@ -0,0 +1,71 @@ +package com.zcloud.mapper.datasource.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjAreaGateMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /**. + * 校验名称是否重复 修改时传入数据id + * @param pageData + * @return + */ + PageData findByOnly(PageData pageData); + + /** + * 定位 + * @param pd + */ + void savePosition(PageData pd); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaMapper.java b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaMapper.java new file mode 100644 index 00000000..24fdc4bb --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjAreaMapper.java @@ -0,0 +1,73 @@ +package com.zcloud.mapper.datasource.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁区域 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjAreaMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /**. + * 校验名称是否重复 修改时传入数据id + * @param pageData + * @return + */ + PageData findByOnly(PageData pageData); + + /** + * 检验是否存在下级区域 + * @param pd + * @return + */ + List findByChild(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateLogMapper.java b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateLogMapper.java new file mode 100644 index 00000000..de486709 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateLogMapper.java @@ -0,0 +1,59 @@ +package com.zcloud.mapper.datasource.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁闸机出入记录 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjGateLogMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateVideoMapper.java b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateVideoMapper.java new file mode 100644 index 00000000..7cf117e4 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjGateVideoMapper.java @@ -0,0 +1,71 @@ +package com.zcloud.mapper.datasource.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁闸机摄像头 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjGateVideoMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /** + * 定位 + * @param pd + */ + void savePosition(PageData pd); + + /**. + * 校验名称是否重复 修改时传入数据id + * @param pageData + * @return + */ + PageData findByOnly(PageData pageData); +} + 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 73227ebc..376f7003 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -308,4 +308,6 @@ public interface UsersMapper { PageData getPersonByCardNo(PageData pd); PageData findByCardNo(PageData pd); + + List listUserByDepId(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/FlowDetailMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/FlowDetailMapper.java index 37ab6211..9e91a697 100644 --- a/src/main/java/com/zcloud/mapper/datasource/xgf/FlowDetailMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/FlowDetailMapper.java @@ -2,6 +2,8 @@ package com.zcloud.mapper.datasource.xgf; import com.zcloud.entity.PageData; +import java.util.List; + public interface FlowDetailMapper { void save(PageData flow); @@ -13,4 +15,6 @@ public interface FlowDetailMapper { PageData findById(PageData flow); PageData selectOne(PageData condition); + + List getList(PageData condition); } diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/FlowMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/FlowMapper.java index 160baf67..93e7faf0 100644 --- a/src/main/java/com/zcloud/mapper/datasource/xgf/FlowMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/FlowMapper.java @@ -2,6 +2,8 @@ package com.zcloud.mapper.datasource.xgf; import com.zcloud.entity.PageData; +import java.util.List; + public interface FlowMapper { void save(PageData flow); @@ -13,4 +15,6 @@ public interface FlowMapper { PageData findById(PageData flow); PageData findByCondition(PageData condition); + + List getList(PageData condition); } diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfFlowsMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfFlowsMapper.java new file mode 100644 index 00000000..4710f34d --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfFlowsMapper.java @@ -0,0 +1,24 @@ +package com.zcloud.mapper.datasource.xgf; + +import java.util.List; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +/** + * 相关方人员审批信息列表(XgfFlows)表数据库访问层 + * + * @author liu jun + * @since 2024-01-19 12:24:00 + */ +public interface XgfFlowsMapper { + int save(PageData entity); + + int delete(PageData entity); + + int edit(PageData pd); + + List datalistPage(Page page); + + PageData findById(PageData condition); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java index 63d2150e..87f11474 100644 --- a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java @@ -70,4 +70,6 @@ public interface XgfUserMapper { PageData getInfoById(PageData condition); List findRecordList(PageData condition); + + List appointlistPage(Page page); } diff --git a/src/main/java/com/zcloud/mapper/dsno2/bus/ClassInfoMapper.java b/src/main/java/com/zcloud/mapper/dsno2/bus/ClassInfoMapper.java new file mode 100644 index 00000000..3cbca053 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/bus/ClassInfoMapper.java @@ -0,0 +1,34 @@ +package com.zcloud.mapper.dsno2.bus; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：班级学员表 + * 作者：luoxiaobao + * 时间：2023-09-27 + * 官网：www.zcloudchina.com + */ +public interface ClassInfoMapper { + + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + + PageData getClassinfo(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + + + List findinfoByCondition(PageData pd); + + +} + diff --git a/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalinfoMapper.java b/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalinfoMapper.java index c51056b7..c85402d0 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalinfoMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalinfoMapper.java @@ -100,5 +100,8 @@ public interface MeteorologicalinfoMapper { * @return */ List tensList(PageData pd); + + PageData listbymeteorologicalByCodes(PageData pd); + } diff --git a/src/main/java/com/zcloud/service/bus/ClassInfoService.java b/src/main/java/com/zcloud/service/bus/ClassInfoService.java new file mode 100644 index 00000000..0ee34beb --- /dev/null +++ b/src/main/java/com/zcloud/service/bus/ClassInfoService.java @@ -0,0 +1,27 @@ +package com.zcloud.service.bus; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：班级学员表 + * 作者：luoxiaobao + * 时间：2023-09-27 + * 官网：www.zcloudchina.com + */ +public interface ClassInfoService { + + + + public PageData getClassinfo(PageData pd)throws Exception; + + + List findinfoByCondition(PageData condition) throws Exception; + + + + +} + diff --git a/src/main/java/com/zcloud/service/bus/NoticeCorpService.java b/src/main/java/com/zcloud/service/bus/NoticeCorpService.java index 8fe519c7..16cce0c0 100644 --- a/src/main/java/com/zcloud/service/bus/NoticeCorpService.java +++ b/src/main/java/com/zcloud/service/bus/NoticeCorpService.java @@ -82,5 +82,12 @@ public interface NoticeCorpService{ * @param pd */ void sendNotice(PageData pd)throws Exception; + + /** + * 向部门中所有人员发送站内信 + * @param mes + * @throws Exception + */ + void sendNoticeToDep(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/bus/NoticeCorpUserService.java b/src/main/java/com/zcloud/service/bus/NoticeCorpUserService.java index 6bbd972d..78751a8d 100644 --- a/src/main/java/com/zcloud/service/bus/NoticeCorpUserService.java +++ b/src/main/java/com/zcloud/service/bus/NoticeCorpUserService.java @@ -4,7 +4,7 @@ import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：企业公告人员关系表 * 作者：luoxiaobao * 时间：2021-01-22 @@ -17,43 +17,43 @@ public interface NoticeCorpUserService{ * @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 list(Page page)throws Exception; - + /**列表(全部) * @param pd * @throws Exception */ public List listAll(PageData pd)throws Exception; - + /**通过id获取数据 * @param pd * @throws Exception */ public PageData findById(PageData pd)throws Exception; - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ public void deleteAll(String[] ArrayDATA_IDS)throws Exception; - + public void saveAll (PageData pd) throws Exception; void deleteByNotId (PageData pd) throws Exception; List getTypeCountByNotId (Page page) throws Exception; @@ -64,5 +64,12 @@ public interface NoticeCorpUserService{ * @throws Exception */ List getUserReadLiser(Page page) throws Exception; + + /** + * 批量添加公告人员关系 + * @param noticeCorpUserList + * @throws Exception + */ + void batchSave(List noticeCorpUserList) throws Exception; } diff --git a/src/main/java/com/zcloud/service/bus/impl/ClassInfoServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/ClassInfoServiceImpl.java new file mode 100644 index 00000000..91b8e35c --- /dev/null +++ b/src/main/java/com/zcloud/service/bus/impl/ClassInfoServiceImpl.java @@ -0,0 +1,43 @@ +package com.zcloud.service.bus.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.bus.ClassInfoMapper; +import com.zcloud.service.bus.ClassInfoService; +import com.zcloud.util.Warden; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：班级学员表 + * 作者：luoxiaobao + * 时间：2023-09-27 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class ClassInfoServiceImpl implements ClassInfoService { + + @Autowired + private ClassInfoMapper classInfoMapper; + + + + + public PageData getClassinfo(PageData pd)throws Exception{ + return classInfoMapper.getClassinfo(pd); + } + + + @Override + public List findinfoByCondition(PageData condition) throws Exception { + return classInfoMapper.findinfoByCondition(condition); + } + + + +} + diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java index fadc0770..99d0b82d 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java @@ -82,7 +82,12 @@ public class CorpInfoServiceImpl implements CorpInfoService{ * @throws Exception */ public PageData findById(PageData pd)throws Exception{ - return corpinfoMapper.findById(pd); + PageData byId = corpinfoMapper.findById(pd); + if (byId.get("FOURTYPE") != null) { + String fourtype = byId.get("FOURTYPE").toString(); + byId.put("FOURTYPE", fourtype); + } + return byId; } /**批量删除 diff --git a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java index e5cea23f..05d46121 100644 --- a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java @@ -4,6 +4,7 @@ import java.util.*; import com.zcloud.service.bus.NoticeCorpUserService; import com.zcloud.service.bus.NoticeTemplateService; +import com.zcloud.service.system.UsersService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; @@ -34,6 +35,8 @@ public class NoticeCorpServiceImpl implements NoticeCorpService{ private NoticeCorpService noticeCorpService; @Autowired private NoticeCorpUserService noticeCorpUserService; + @Autowired + private UsersService usersService; /**新增 * @param pd @@ -165,5 +168,54 @@ public class NoticeCorpServiceImpl implements NoticeCorpService{ pd1.put("TYPE",0); noticeCorpUserService.save(pd1); } + + @Override + public void sendNoticeToDep(PageData pd) throws Exception { + PageData notice = noticeTemplateService.findByBianMa(pd); + String content = ""; + if(notice!=null){ + content = notice.getString("CONTENT"); + PageData contentPd = (PageData) pd.get("CONTENT"); + for(Object key : contentPd.keySet()){ //替换占位符 + if ("number".equals(key.toString()) && Tools.notEmpty(pd.getString("WORKURL"))) { + content = content.replace("${" + key.toString() + "}", ""+contentPd.get(key).toString()+""); + } else { + content = content.replace("${" + key.toString() + "}", contentPd.get(key).toString()); + } + } + }else { + content = "未维护模板,需要管理端-公告模板进行维护"; + } + + PageData pd1 = new PageData(); + pd1.put("NOTICECORP_ID", UuidUtil.get32UUID()); + pd1.put("USERNAME",pd.getString("SENDER_NAME")); + pd1.put("CREATOR", pd.getString("SENDER_ID")); //添加人 + pd1.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd1.put("SYNOPSIS",pd.getString("SYNOPSIS")); + pd1.put("WORKURL",pd.getString("WORKURL")); + pd1.put("CONTENT","

"+content+"

"); + pd1.put("ISALL","yes"); + pd1.put("ISREPLY",0); + pd1.put("ISDELETE",0); + pd1.put("ISTOP",0); + pd1.put("STATUS",1); + pd1.put("CORP_INFO_ID",pd.getString("CORPINFO_ID")); + noticeCorpService.save(pd1); + List userList = usersService.listUserByDepId(pd); + if (userList != null && userList.size() > 0) { + List noticeCorpUserList = new ArrayList<>(); + for (PageData user : userList) { + PageData noticeCorpUser = new PageData(); + pd1.put("NOTICECORPUSERID_ID",UuidUtil.get32UUID()); + pd1.put("USER_ID",user.getString("USER_ID")); + pd1.put("TYPE",0); + noticeCorpUser.putAll(pd1); + noticeCorpUserList.add(noticeCorpUser); + } + noticeCorpUserService.batchSave(noticeCorpUserList); + } +// noticeCorpUserService.save(pd1); + } } diff --git a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserServiceImpl.java index abed78e7..c73f63b2 100644 --- a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserServiceImpl.java @@ -9,7 +9,7 @@ import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.bus.NoticeCorpUserMapper; import com.zcloud.service.bus.NoticeCorpUserService; -/** +/** * 说明：企业公告人员关系表 * 作者：luoxiaobao * 时间：2021-01-22 @@ -21,7 +21,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ @Autowired private NoticeCorpUserMapper noticecorpuseridMapper; - + /**新增 * @param pd * @throws Exception @@ -29,7 +29,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public void save(PageData pd)throws Exception{ noticecorpuseridMapper.save(pd); } - + /**删除 * @param pd * @throws Exception @@ -37,7 +37,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public void delete(PageData pd)throws Exception{ noticecorpuseridMapper.delete(pd); } - + /**修改 * @param pd * @throws Exception @@ -45,7 +45,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public void edit(PageData pd)throws Exception{ noticecorpuseridMapper.edit(pd); } - + /**列表 * @param page * @throws Exception @@ -53,7 +53,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public List list(Page page)throws Exception{ return noticecorpuseridMapper.datalistPage(page); } - + /**列表(全部) * @param pd * @throws Exception @@ -61,7 +61,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public List listAll(PageData pd)throws Exception{ return noticecorpuseridMapper.listAll(pd); } - + /**通过id获取数据 * @param pd * @throws Exception @@ -69,7 +69,7 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ public PageData findById(PageData pd)throws Exception{ return noticecorpuseridMapper.findById(pd); } - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception @@ -106,6 +106,11 @@ public class NoticeCorpUserServiceImpl implements NoticeCorpUserService{ // TODO Auto-generated method stub return noticecorpuseridMapper.getReadUserlistPage(page); } - + + @Override + public void batchSave(List noticeCorpUserList) throws Exception { + noticecorpuseridMapper.batchSave(noticeCorpUserList); + } + } diff --git a/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java b/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java index ae0e4b44..488b0c1e 100644 --- a/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java +++ b/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java @@ -56,4 +56,6 @@ public interface FireDeviceService { void removeFireDeviceByIds(PageData pd); + + List exportDataList(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java index 4717e555..f8e544ba 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java @@ -263,5 +263,10 @@ public class FireDeviceServiceImpl implements FireDeviceService { } } + @Override + public List exportDataList(PageData pd) throws Exception { + return fireDeviceMapper.exportDataList(pd); + } + } diff --git a/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java b/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java index 8b80b9d2..35f71254 100644 --- a/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java +++ b/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java @@ -98,6 +98,9 @@ public interface MeteorologicalinfoService { * @throws Exception */ Integer updateMeteorologicalinfo(PageData pageData); - + /**列表 + * @throws Exception + */ + public PageData listbymeteorologicalByCorpinfoId(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java index bd1316c3..b2286731 100644 --- a/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java +++ b/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java @@ -3,6 +3,7 @@ package com.zcloud.service.map.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.map.MapEightMapper; +import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.map.MapEightService; import com.zcloud.util.Tools; import org.apache.commons.lang.StringUtils; @@ -12,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * 说明：实时地图八项工作 @@ -26,8 +28,8 @@ public class MapEightServiceImpl implements MapEightService { @Autowired private MapEightMapper mapEightMapper; - @Override - public List getCorpinfoIds(PageData pd) { + @Override + public List getCorpinfoIds(PageData pd) { String area = pd.getString("AREA"); if(StringUtils.isNotBlank(area)){ String[] ArrayDATA_IDS = area.split(","); @@ -39,12 +41,12 @@ public class MapEightServiceImpl implements MapEightService { return mapEightMapper.getCorpinfoIds(ArrayDATA_IDS); } return new ArrayList<>(); - } + } - @Override + @Override public Object getEcharts(PageData pd) { Map returnMap = new HashMap<>(); - String errInfo = "success"; + String errInfo = "success"; Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); @@ -108,28 +110,28 @@ public class MapEightServiceImpl implements MapEightService { @Override public List listAllHighRiskWorkLocation(PageData pd) throws Exception { - List r = new ArrayList<>(); - String typeStr = pd.getString("TYPE"); - //动火 - if(StringUtils.equals(typeStr,"HOTWORK")){ + List r = new ArrayList<>(); + String typeStr = pd.getString("TYPE"); + //动火 + if(StringUtils.equals(typeStr,"HOTWORK")){ // r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd); r = mapEightMapper.getHOTWORKHighRiskWorkLocationCfd(pd); - //临时用电 - }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ - r = mapEightMapper.getELECTRICITYHighRiskWorkLocation(pd); - //盲板 - }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ - r = mapEightMapper.getBLINDBOARDHighRiskWorkLocation(pd); - // 高处 - }else if(StringUtils.equals(typeStr,"HIGHWORK")){ - r = mapEightMapper.getHIGHWORKHighRiskWorkLocation(pd); - //有限空间 - }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ - r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocation(pd); - //吊装 - }else if(StringUtils.equals(typeStr,"HOISTING")){ - r = mapEightMapper.getHOISTINGHighRiskWorkLocation(pd); - } + //临时用电 + }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ + r = mapEightMapper.getELECTRICITYHighRiskWorkLocationOrder(pd); + //盲板 + }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ + r = mapEightMapper.getBLINDBOARDHighRiskWorkLocationOrder(pd); + // 高处 + }else if(StringUtils.equals(typeStr,"HIGHWORK")){ + r = mapEightMapper.getHIGHWORKHighRiskWorkLocationOrder(pd); + //有限空间 + }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ + r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocationOrder(pd); + //吊装 + }else if(StringUtils.equals(typeStr,"HOISTING")){ + r = mapEightMapper.getHOISTINGHighRiskWorkLocationOrder(pd); + } return r; } @@ -352,7 +354,7 @@ public class MapEightServiceImpl implements MapEightService { }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ pd.put("BLINDBOARD_ID",idStr); pd = mapEightMapper.findByIdBLINDBOARDOrder(pd); - map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd)); + map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd)); PageData Info = mapEightMapper.findByIdJWDOrder(pd); pd.put("TYPE",105);//盲板位置图 pd.put("FOREIGN_KEY",pd.getString("BLINDBOARD_ID")); @@ -368,12 +370,13 @@ public class MapEightServiceImpl implements MapEightService { map.put("imgList1",mapEightMapper.findByHIGHWORKAcceptuserId(pd)); map.put("imgList",mapEightMapper.findByHIGHWORKAcceptuserIds(pd)); }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ - //没有有限空间作业 - //pd.put("CONFINEDSPACE_ID",idStr); - //pd = mapEightMapper.findByIdCONFINEDSPACE(pd); - pd = new PageData(); - map.put("measuresList", null); - map.put("gasList", null); + pd.put("CONFINEDSPACE_ID",idStr); + pd = mapEightMapper.findByIdCONFINEDSPACEOrder(pd); //根据ID读取 + map.put("measuresList", mapEightMapper.listAllMeasuresCONFINEDSPACEOrder(pd)); + map.put("gasList", mapEightMapper.listAllCONFINEDSPACEOrder(pd)); + map.put("gas", mapEightMapper.findByIdCONFINEDSPACEGasWH(pd)); + map.put("imgList",mapEightMapper.findByIdCONFINEDSPACEAcceptusers(pd)); + map.put("imgList1",mapEightMapper.findByIdCONFINEDSPACEAcceptuser(pd)); }else if(StringUtils.equals(typeStr,"HOISTING")){ pd.put("HOISTING_ID",idStr); pd = mapEightMapper.findByIdHOISTINGOrder(pd); @@ -569,18 +572,18 @@ public class MapEightServiceImpl implements MapEightService { } } pd.put("specialUserList", specialUserList); - return pd; + return pd; } - private PageData dianhuo(PageData pd){ - if(StringUtils.isBlank(pd.getString("HOT_WORK_METHOD_NAME"))){ - String zidian = pd.getString("HOT_WORK_METHOD_ID"); - List shuzu = Arrays.asList(zidian.split(",")); + private PageData dianhuo(PageData pd){ + if(StringUtils.isBlank(pd.getString("HOT_WORK_METHOD_NAME"))){ + String zidian = pd.getString("HOT_WORK_METHOD_ID"); + List shuzu = Arrays.asList(zidian.split(",")); List wenzi = mapEightMapper.getListDongHuo(shuzu); String pinjie = String.join(",",wenzi); pd.put("HOT_WORK_METHOD_NAME",pinjie); } - return pd; - } + return pd; + } } diff --git a/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java index 42c149a5..df1a3c83 100644 --- a/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java @@ -2,6 +2,7 @@ package com.zcloud.service.map.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.map.MeteorologicalMapper; import com.zcloud.mapper.dsno2.map.MeteorologicalinfoMapper; import com.zcloud.service.map.DataDockingLogService; import com.zcloud.service.map.MeteorologicalinfoService; @@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -27,7 +29,8 @@ public class MeteorologicalinfoServiceImpl implements MeteorologicalinfoService @Autowired private MeteorologicalinfoMapper meteorologicalinfoMapper; - + @Autowired + private MeteorologicalMapper meteorologicalMapper; @Autowired private DataDockingLogService dataDockingLogService; @@ -218,5 +221,30 @@ public class MeteorologicalinfoServiceImpl implements MeteorologicalinfoService public Integer updateMeteorologicalinfo(PageData pageData) { return meteorologicalinfoMapper.updateMeteorologicalinfo(pageData); } + + /**列表 + * @throws Exception + */ + public PageData listbymeteorologicalByCorpinfoId(PageData pd)throws Exception{ + /** + * 暂时使用in优化速度 + * 1.获取这个企业下的所有天气站信息 + * 2.根据这些天气站的信息,获取最新的数据 + */ + pd.put("OUTSOURCED_ID",pd.getString("CORPINFO_ID")); + List getListByCorpinfoId = meteorologicalMapper.listAll(pd); + if(getListByCorpinfoId.size() > 0){ + String codes = ""; + for (PageData met : getListByCorpinfoId){ + codes += "'" + met.getString("CODE")+"',"; + } + System.out.println(); + codes = codes.substring(0,codes.length()-1); + pd.put("codes",codes); + return meteorologicalinfoMapper.listbymeteorologicalByCodes(pd); + } + + return null; + } } diff --git a/src/main/java/com/zcloud/service/mkmj/MkmjAreaGateService.java b/src/main/java/com/zcloud/service/mkmj/MkmjAreaGateService.java new file mode 100644 index 00000000..7606f241 --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/MkmjAreaGateService.java @@ -0,0 +1,66 @@ +package com.zcloud.service.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjAreaGateService { + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public Object deleteAll(String[] ArrayDATA_IDS)throws Exception; + + /** + * 定位 + * @param pd + * @return + */ + Object savePosition(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/mkmj/MkmjAreaService.java b/src/main/java/com/zcloud/service/mkmj/MkmjAreaService.java new file mode 100644 index 00000000..5814723b --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/MkmjAreaService.java @@ -0,0 +1,55 @@ +package com.zcloud.service.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjAreaService { + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + +} + diff --git a/src/main/java/com/zcloud/service/mkmj/MkmjGateLogService.java b/src/main/java/com/zcloud/service/mkmj/MkmjGateLogService.java new file mode 100644 index 00000000..a5146ec5 --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/MkmjGateLogService.java @@ -0,0 +1,60 @@ +package com.zcloud.service.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjGateLogService { + + /**新增 + * @param pd + * @throws Exception + */ + public ReturnMap save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public ReturnMap delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public ReturnMap edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public ReturnMap deleteAll(String[] ArrayDATA_IDS)throws Exception; + +} + diff --git a/src/main/java/com/zcloud/service/mkmj/MkmjGateVideoService.java b/src/main/java/com/zcloud/service/mkmj/MkmjGateVideoService.java new file mode 100644 index 00000000..105d2d78 --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/MkmjGateVideoService.java @@ -0,0 +1,66 @@ +package com.zcloud.service.mkmj; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjGateVideoService { + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public Object deleteAll(String[] ArrayDATA_IDS)throws Exception; + + /** + * 定位 + * @param pd + * @return + */ + Object savePosition(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaGateServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaGateServiceImpl.java new file mode 100644 index 00000000..71c86974 --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaGateServiceImpl.java @@ -0,0 +1,135 @@ +package com.zcloud.service.mkmj.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mkmj.MkmjAreaGateMapper; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaGateService; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MkmjAreaGateServiceImpl implements MkmjAreaGateService { + + @Autowired + private MkmjAreaGateMapper mkmjAreaGateMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + //保存校验名称不重复 + PageData pageData = mkmjAreaGateMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(ObjectUtils.isEmpty(pageData)){ + pd.put("AREA_GATE_ID", UuidUtil.get32UUID()); + }else { + map.put("result", "fail"); + map.put("msg", "名称已存在，请修改后重新提交"); + return map; + } + mkmjAreaGateMapper.save(pd); + map.put("result", errInfo); + map.put("msg", "保存成功"); + return map; + } + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + mkmjAreaGateMapper.delete(pd); + map.put("result", errInfo); + map.put("msg", "删除成功"); + return map; + } + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pageData = mkmjAreaGateMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(!ObjectUtils.isEmpty(pageData)){ + map.put("result", "fail"); + map.put("msg", "名称已存在，请修改后重新提交"); + return map; + } + mkmjAreaGateMapper.edit(pd); + map.put("result", errInfo); + map.put("msg", "编辑成功"); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return mkmjAreaGateMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return mkmjAreaGateMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return mkmjAreaGateMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public Object deleteAll(String[] ArrayDATA_IDS)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + mkmjAreaGateMapper.deleteAll(ArrayDATA_IDS); + map.put("result", errInfo); + map.put("msg", "删除成功"); + return map; + } + + @Override + public Object savePosition(PageData pd) { + Map map = new HashMap(); + String errInfo = "success"; + mkmjAreaGateMapper.savePosition(pd); + map.put("result", errInfo); + map.put("msg", "定位成功"); + return map; + } + +} + diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaServiceImpl.java new file mode 100644 index 00000000..9e88e3da --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaServiceImpl.java @@ -0,0 +1,132 @@ +package com.zcloud.service.mkmj.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mkmj.MkmjAreaGateMapper; +import com.zcloud.mapper.datasource.mkmj.MkmjAreaMapper; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaService; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MkmjAreaServiceImpl implements MkmjAreaService { + + @Autowired + private MkmjAreaMapper mkmjAreaMapper; + + @Autowired + private MkmjAreaGateMapper mkmjAreaGateMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + //保存校验名称不重复 + PageData pageData = mkmjAreaMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(ObjectUtils.isEmpty(pageData)){ + pd.put("AREA_ID", UuidUtil.get32UUID()); + }else { + map.put("result", "fail"); + map.put("msg", "名称已存在，请修改后重新提交"); + return map; + } + mkmjAreaMapper.save(pd); + map.put("result", errInfo); + map.put("msg", "保存成功"); + return map; + } + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + //校验区域下是否还存在区域 存在则不让删除 + List childList = mkmjAreaMapper.findByChild(pd); + if(childList.size()>0){ + map.put("result", "fail"); + map.put("msg", "当前区域还存在下级区域，请删除当前区域的所有下级区域后进行删除"); + return map; + } + //校验区域下是否存在闸机，存在则不让删除 + List gateList = mkmjAreaGateMapper.listAll(pd); + if(gateList.size()>0){ + map.put("result", "fail"); + map.put("msg", "当前区域还存在闸机，请删除当前区域的所有闸机后进行删除"); + return map; + } + //两个校验都不存在 则可以删除 + mkmjAreaMapper.delete(pd); + map.put("result", errInfo); + map.put("msg", "删除成功"); + return map; + } + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pageData = mkmjAreaMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(!ObjectUtils.isEmpty(pageData)){ + map.put("result", "fail"); + map.put("msg", "名称已存在，请修改后重新提交"); + return map; + } + mkmjAreaMapper.edit(pd); + map.put("result", errInfo); + map.put("msg", "编辑成功"); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return mkmjAreaMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return mkmjAreaMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return mkmjAreaMapper.findById(pd); + } + + +} + diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateLogServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateLogServiceImpl.java new file mode 100644 index 00000000..a71bbade --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateLogServiceImpl.java @@ -0,0 +1,92 @@ +package com.zcloud.service.mkmj.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mkmj.MkmjAreaGateMapper; +import com.zcloud.mapper.datasource.mkmj.MkmjGateLogMapper; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaGateService; +import com.zcloud.service.mkmj.MkmjGateLogService; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MkmjGateLogServiceImpl implements MkmjGateLogService { + + @Autowired + private MkmjGateLogMapper mkmjGateLogMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public ReturnMap save(PageData pd)throws Exception{ + mkmjGateLogMapper.save(pd); + return ReturnMap.ok("保存成功"); + } + + /**删除 + * @param pd + * @throws Exception + */ + public ReturnMap delete(PageData pd)throws Exception{ + mkmjGateLogMapper.delete(pd); + return ReturnMap.ok("删除成功"); + } + + /**修改 + * @param pd + * @throws Exception + */ + public ReturnMap edit(PageData pd)throws Exception{ + mkmjGateLogMapper.edit(pd); + return ReturnMap.ok("编辑成功"); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return mkmjGateLogMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return mkmjGateLogMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return mkmjGateLogMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public ReturnMap deleteAll(String[] ArrayDATA_IDS)throws Exception{ + mkmjGateLogMapper.deleteAll(ArrayDATA_IDS); + return ReturnMap.ok("删除成功"); + } + +} + diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java new file mode 100644 index 00000000..67f14f55 --- /dev/null +++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java @@ -0,0 +1,125 @@ +package com.zcloud.service.mkmj.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mkmj.MkmjAreaGateMapper; +import com.zcloud.mapper.datasource.mkmj.MkmjGateVideoMapper; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.mkmj.MkmjAreaGateService; +import com.zcloud.service.mkmj.MkmjGateVideoService; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MkmjGateVideServiceImpl implements MkmjGateVideoService { + + @Autowired + private MkmjGateVideoMapper mkmjGateVideoMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pageData = mkmjGateVideoMapper.findByOnly(pd); + if(ObjectUtils.isEmpty(pageData)){ + pd.put("GATE_VIDEO_ID",UuidUtil.get32UUID()); + }else { + map.put("result", "fail"); + map.put("msg", "当前闸机以绑定该摄像头，无法在此绑定"); + return map; + } + mkmjGateVideoMapper.save(pd); + map.put("result", errInfo); + map.put("msg", "保存成功"); + return map; + } + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + mkmjGateVideoMapper.delete(pd); + map.put("result", errInfo); + map.put("msg", "删除成功"); + return map; + } + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + mkmjGateVideoMapper.edit(pd); + map.put("result", errInfo); + map.put("msg", "编辑成功"); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return mkmjGateVideoMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return mkmjGateVideoMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return mkmjGateVideoMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public Object deleteAll(String[] ArrayDATA_IDS)throws Exception{ + ReturnMap ReturnMap = new ReturnMap(); + mkmjGateVideoMapper.deleteAll(ArrayDATA_IDS); + return ReturnMap.ok("删除成功"); + } + + @Override + public Object savePosition(PageData pd) { + Map map = new HashMap(); + String errInfo = "success"; + mkmjGateVideoMapper.savePosition(pd); + map.put("result", errInfo); + map.put("msg", "定位成功"); + return map; + } + +} + diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 93001988..5a3ae771 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -360,4 +360,6 @@ public interface UsersService { PageData getPersonByCardNo(PageData pd) throws Exception; PageData findByCardNo(PageData pd) throws Exception; + + List listUserByDepId(PageData pd) throws Exception; } 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 c432b75a..a9951e90 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -491,4 +491,9 @@ public class UsersServiceImpl implements UsersService { public PageData findByCardNo(PageData pd)throws Exception{ return usersMapper.findByCardNo(pd); } + + @Override + public List listUserByDepId(PageData pd) throws Exception { + return usersMapper.listUserByDepId(pd); + } } diff --git a/src/main/java/com/zcloud/service/xgf/XgfUserService.java b/src/main/java/com/zcloud/service/xgf/XgfUserService.java index 3397027c..75b28f95 100644 --- a/src/main/java/com/zcloud/service/xgf/XgfUserService.java +++ b/src/main/java/com/zcloud/service/xgf/XgfUserService.java @@ -2,6 +2,7 @@ package com.zcloud.service.xgf; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -24,4 +25,12 @@ public interface XgfUserService { PageData findInfo(PageData condition); List findRecordList(PageData condition) throws Exception; + + List getAppointApproveList(Page page); + + Object getApproveInfo(PageData request); + + Object getFlowInfo(PageData request); + + void approvePlus(PageData request, MultipartFile[] chengNuoShu) throws Exception; } diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 169722b4..1376e98e 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -2,10 +2,8 @@ package com.zcloud.service.xgf.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.xgf.TrainUsersMapper; -import com.zcloud.mapper.datasource.xgf.XgfUserDetailsMapper; -import com.zcloud.mapper.datasource.xgf.XgfUserMapper; -import com.zcloud.service.bus.CorpInfoService; +import com.zcloud.mapper.datasource.bus.CorpInfoMapper; +import com.zcloud.mapper.datasource.xgf.*; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.xgf.XgfUserService; import com.zcloud.util.*; @@ -13,8 +11,10 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -30,10 +30,19 @@ public class XgfUserServiceImpl implements XgfUserService { private XgfUserDetailsMapper xgfUserDetailsMapper; @Resource - private TrainUsersMapper trainUsersMapper; + private DepartmentService departmentService; @Resource - private DepartmentService departmentService; + private FlowMapper flowMapper; + + @Resource + private FlowDetailMapper flowDetailMapper; + + @Resource + private XgfFlowsMapper xgfFlowsMapper; + + @Resource + private CorpInfoMapper corpInfoMapper; @Value("${preventionxgf.api.url}") private String prevention_xgf_url; @@ -60,6 +69,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData condition = new PageData(); for (PageData x : list) { if (StringUtils.isNotBlank(x.getString("USER_ID"))) { + /* 1、 保存相关方用户信息 */ condition.put("XGF_USER_ID", x.getString("USER_ID")); PageData entity = xgfUserMapper.findById(condition); if (entity == null || entity.size() <= 0) { @@ -67,7 +77,9 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("XGF_USER_DETAILS_ID", x.get("USER_ID")); x.put("XGF_USER_NAME", x.get("NAME")); x.put("VALID_FLAG", "1"); - x.put("STATUS", "2"); + x.put("STATUS", "1"); + x.put("CHECK_STATUS", "1"); + x.put("CHECK_STEP", 0); x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("IS_DELETE", "0"); @@ -88,11 +100,14 @@ public class XgfUserServiceImpl implements XgfUserService { if (regDepartmentEntity.size() > 0) { x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME")); } + entity = new PageData(); + entity.putAll(x); xgfUserMapper.save(x); xgfUserDetailsMapper.save(x); } else { x.put("XGF_USER_ID", x.get("USER_ID")); x.put("XGF_USER_DETAILS_ID", x.get("USER_ID")); + x.put("XGF_USER_NAME", x.get("NAME")); x.put("IS_DELETE", "0"); x.put("CREATE_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); @@ -113,17 +128,116 @@ public class XgfUserServiceImpl implements XgfUserService { } x.put("IS_DELETE", "0"); x.put("VALID_FLAG", "1"); - x.put("STATUS", "2"); + x.put("STATUS", "1"); + x.put("CHECK_STATUS", "1"); + x.put("CHECK_STEP", 0); if ("2".equals(x.getString("STUDY_STATUS"))) { x.put("STUDY_STATUS", "2"); - }else { + } else { x.put("STUDY_STATUS", entity.getString("STUDY_STATUS")); } - x.put("STUDY_STATUS",entity.getString("STUDY_STATUS")); + x.put("STUDY_STATUS", entity.getString("STUDY_STATUS")); xgfUserMapper.edit(x); + // 2024-02-26 created by liu jun 清空上传文件信息 + x.put("ATTORNEY", ""); + x.put("COMMITMENT_LETTER", ""); xgfUserDetailsMapper.edit(x); } + + /* 2、保存相关方人员流程审批信息 */ + condition.clear(); + condition.put("FLOWS_ID", x.getString("USER_ID")); + PageData flows = xgfFlowsMapper.findById(condition); + if (flows == null || flows.size() <= 0) { + flows = new PageData(); + flows.put("FLOWS_TYPE", getType(x.getString("CORPINFO_ID"))); + flows.put("FLOWS_ID", x.getString("USER_ID")); + flows.put("FLOWS_STEP", 0); + flows.put("FOREIGN_KEY_ID", x.getString("USER_ID")); + flows.put("FOREIGN_KEY_NAME", "xgf_user=>XGF_USER_ID"); + flows.put("IS_DELETE", "0"); + flows.put("APPOINT_ZERO_CORP_TYPE", "0"); + flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_USER_ID")); + flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_USER_NAME")); + xgfFlowsMapper.save(flows); + } else { + flows.put("FLOWS_STEP", 0); + flows.put("FLOWS_TYPE", getType(x.getString("CORPINFO_ID"))); + flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_ZERO_CORP_TYPE", "0"); + flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_USER_ID")); + flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_USER_NAME")); + xgfFlowsMapper.edit(flows); + } + /* 3、流程记录 */ + condition.clear(); + condition.put("FOREIGN_KEY", x.getString("XGF_USER_ID")); + condition.put("TYPE", "1"); + condition.put("VALID_FLAG", "1"); + PageData flow = flowMapper.findByCondition(condition); + if (flow == null || flow.size() == 0) { + /* 保存审批流程信息 */ + flow = new PageData(); + flow.put("FLOW_ID", Warden.get32UUID()); + flow.put("TYPE", "1"); + flow.put("CREATOR", ""); + flow.put("CREATOR_NAME", ""); + flow.put("CREATOR_TIME", DateUtil.getTime()); + flow.put("VALID_FLAG", "1"); + flow.put("ISDELETE", "0"); + flow.put("END_FLAG","0"); + flow.put("FOREIGN_KEY", x.getString("XGF_USER_ID")); + flowMapper.save(flow); + /* 保存审批流程明细信息 */ + PageData flowDetail = new PageData(); + flowDetail.put("FLOW_DETAIL_ID", Warden.get32UUID()); + flowDetail.put("FLOW_ID", flow.getString("FLOW_ID")); + flowDetail.put("STEP_FLAG", "1"); + flowDetail.put("STEP_NAME", "相关方数据将人员信息发送给企业端"); + flowDetail.put("SORT", 0); + flowDetail.put("APPROVER_ID", ""); + flowDetail.put("APPROVER_NAME", ""); + flowDetail.put("APPROVER_TIME", DateUtil.getTime()); + flowDetail.put("APPROVER_CORPINFO_ID", entity.getString("BELONG_TO_CORP")); + flowDetail.put("APPROVER_CORPINFO_NAME", entity.getString("BELONG_TO_CORP_NAME")); + flowDetail.put("APPOINT_ANNEX", x.getString("ANNEX")); + flowDetail.put("PASS_FLAG", "1"); + flowDetail.put("END_FLAG", "0"); + flowDetail.put("ISDELETE", "0"); + flowDetail.put("PARENT_ID", "0"); + flowDetailMapper.save(flowDetail); + } else { + condition.clear(); + condition.put("FLOW_ID", flow.getString("FLOW_ID")); + condition.put("STEP_FLAG", "1"); + PageData currentNode = flowDetailMapper.selectOne(condition); + PageData nextNode = new PageData(); + nextNode.putAll(currentNode); + nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); + nextNode.put("SORT", Integer.parseInt(currentNode.get("SORT").toString()) + 1); + nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); + nextNode.put("STEP_NAME", "相关方数据将人员打回后重新发送给企业端"); + nextNode.put("PASS_FLAG", "1"); + nextNode.put("APPROVER_TIME", DateUtil.getTime()); + nextNode.put("APPROVER_ID", ""); + nextNode.put("APPROVER_NAME", ""); + nextNode.put("APPROVER_OPINION", ""); + nextNode.put("APPROVER_CORPINFO_ID", entity.getString("BELONG_TO_CORP")); + nextNode.put("APPROVER_CORPINFO_NAME", entity.getString("BELONG_TO_CORP_NAME")); + nextNode.put("APPOINT_ANNEX", x.getString("ANNEX")); + flowDetailMapper.save(nextNode); + currentNode.put("STEP_FLAG", "0"); + flowDetailMapper.edit(currentNode); + } + } } } @@ -131,7 +245,6 @@ public class XgfUserServiceImpl implements XgfUserService { @Override public void approvalApplication(PageData request) throws Exception { - List list = Arrays.asList(request.getString("xgf_user_ids").split(",")); PageData condition = new PageData(); @@ -139,7 +252,7 @@ public class XgfUserServiceImpl implements XgfUserService { List entities = xgfUserMapper.listByIds(condition); /* 校验所有数据是否都是正常状态 */ if (entities.stream().anyMatch(n -> !"2".equals(n.getString("STATUS")))) { - String name = entities.stream().filter(n -> !"2".equals(n.getString("STATUS"))).map( n -> n.getString("NAME")).collect(Collectors.joining(",")); + String name = entities.stream().filter(n -> !"2".equals(n.getString("STATUS"))).map(n -> n.getString("NAME")).collect(Collectors.joining(",")); throw new RuntimeException("用户[" + name + "]在系统流程中无法被打回"); } @@ -166,24 +279,29 @@ public class XgfUserServiceImpl implements XgfUserService { PageData condition = new PageData(); for (String x : list) { condition.put("XGF_USER_ID", x); - PageData entity = xgfUserMapper.findById(condition); - if (entity == null || entity.size() == 0) { - throw new RuntimeException("未找到该用户"); + /* 保存审批信息 */ + condition.clear(); + condition.put("FLOWS_ID", x); + PageData flows = xgfFlowsMapper.findById(condition); + if (flows == null || flows.size() == 0) { + throw new RuntimeException("未找到该用户详细信息"); } - if ("1".equals(request.getString("STATUS"))) { - entity.put("STATUS", "0"); - } else { - entity.put("STATUS", "2"); - entity.put("VALID_FLAG", "1"); + condition.clear(); + condition.put("STATUS", request.getString("STATUS")); + condition.put("OPINION", request.getString("OPINION")); + condition.put("APPOINT_CORP_ID", request.getString("APPOINT_CORP_ID")); + condition.put("APPOINT_CORP_NAME", request.getString("APPOINT_CORP_NAME")); + condition.put("APPOINT_DEPARTMENT_ID", request.getString("APPOINT_DEPARTMENT_ID")); + condition.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); + condition.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); + condition.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); + if (request.get("APPOINT_ANNEX") != null) { + condition.put("APPOINT_ANNEX", request.getString("APPOINT_ANNEX")); } - xgfUserMapper.edit(entity); + condition.put("FLOWS_ID", x); - entity.put("USER_ID", condition.get("XGF_USER_ID")); - entity.put("STATUS", request.getString("STATUS")); - Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", entity); - if (result == null || !"succeed".equals(result.get("result"))) { - throw new RuntimeException("请求失败"); - } + // 保存审批记录 + this.saveLog(condition, request.getString("STATUS"), this.handle(condition, flows)); } } @@ -196,4 +314,631 @@ public class XgfUserServiceImpl implements XgfUserService { public List findRecordList(PageData condition) throws Exception { return xgfUserMapper.findRecordList(condition); } + + @Override + public List getAppointApproveList(Page page) { + List list = xgfUserMapper.appointlistPage(page); + for (PageData x : list) { + x.put("power_flag", getPower(x)); + } + return list; + } + + @Override + public Object getApproveInfo(PageData request) { + PageData condition = new PageData(); + condition.put("FOREIGN_KEY", request.getString("XGF_USER_ID")); + condition.put("TYPE", "1"); + List list = flowMapper.getList(condition); + for(PageData x : list){ + condition.clear(); + condition.put("FLOW_ID", x.getString("FLOW_ID")); + x.put("flow",flowDetailMapper.getList(condition)); + } + return list; + } + + @Override + public Object getFlowInfo(PageData request) { + PageData condition = new PageData(); + condition.put("FLOWS_ID", request.getString("XGF_USER_ID")); + + PageData entity = xgfFlowsMapper.findById(condition); + + List list = new ArrayList<>(); + + PageData zero = new PageData(); + int index = Integer.parseInt(entity.getString("FLOWS_STEP")); + if (index >= 0){ + zero.put("INDEX", "0"); + zero.put("APPOINT_CORP_ID", entity.getString("APPOINT_ZERO_CORP_ID")); + zero.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ZERO_CORP_NAME")); + zero.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ZERO_DEPARTMENT_ID")); + zero.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ZERO_DEPARTMENT_NAME")); + zero.put("APPOINT_USER_ID", entity.getString("APPOINT_ZERO_USER_ID")); + zero.put("APPOINT_USER_NAME", entity.getString("APPOINT_ZERO_USER_NAME")); + zero.put("APPOINT_STATUS", entity.getString("APPOINT_ZERO_STATUS")); + zero.put("APPOINT_OPINION", entity.getString("APPOINT_ZERO_OPINION")); + zero.put("APPOINT_TIME", entity.getString("APPOINT_ZERO_TIME")); + list.add(zero); + } + if (index >= 1) { + PageData one = new PageData(); + one.put("INDEX", "1"); + one.put("APPOINT_CORP_ID", entity.getString("APPOINT_ONE_CORP_ID")); + one.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ONE_CORP_NAME")); + one.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ONE_DEPARTMENT_ID")); + one.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ONE_DEPARTMENT_NAME")); + one.put("APPOINT_USER_ID", entity.getString("APPOINT_ONE_USER_ID")); + one.put("APPOINT_USER_NAME", entity.getString("APPOINT_ONE_USER_NAME")); + one.put("APPOINT_STATUS", entity.getString("APPOINT_ONE_STATUS")); + one.put("APPOINT_OPINION", entity.getString("APPOINT_ONE_OPINION")); + one.put("APPOINT_TIME", entity.getString("APPOINT_ONE_TIME")); + list.add(one); + } + if (index >= 2) { + PageData two = new PageData(); + two.put("INDEX", "2"); + two.put("APPOINT_CORP_ID", entity.getString("APPOINT_TWO_CORP_ID")); + two.put("APPOINT_CORP_NAME", entity.getString("APPOINT_TWO_CORP_NAME")); + two.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_TWO_DEPARTMENT_ID")); + two.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_TWO_DEPARTMENT_NAME")); + two.put("APPOINT_USER_ID", entity.getString("APPOINT_TWO_USER_ID")); + two.put("APPOINT_USER_NAME", entity.getString("APPOINT_TWO_USER_NAME")); + two.put("APPOINT_STATUS", entity.getString("APPOINT_TWO_STATUS")); + two.put("APPOINT_OPINION", entity.getString("APPOINT_TWO_OPINION")); + two.put("APPOINT_TIME", entity.getString("APPOINT_TWO_TIME")); + list.add(two); + } + if (index >= 3) { + PageData three = new PageData(); + three.put("INDEX", "3"); + three.put("APPOINT_CORP_ID", entity.getString("APPOINT_THREE_CORP_ID")); + three.put("APPOINT_CORP_NAME", entity.getString("APPOINT_THREE_CORP_NAME")); + three.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_THREE_DEPARTMENT_ID")); + three.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_THREE_DEPARTMENT_NAME")); + three.put("APPOINT_USER_ID", entity.getString("APPOINT_THREE_USER_ID")); + three.put("APPOINT_USER_NAME", entity.getString("APPOINT_THREE_USER_NAME")); + three.put("APPOINT_STATUS", entity.getString("APPOINT_THREE_STATUS")); + three.put("APPOINT_OPINION", entity.getString("APPOINT_THREE_OPINION")); + three.put("APPOINT_TIME", entity.getString("APPOINT_THREE_TIME")); + list.add(three); + } + if (index >= 4) { + PageData four = new PageData(); + four.put("INDEX", "4"); + four.put("APPOINT_CORP_ID", entity.getString("APPOINT_FOUR_CORP_ID")); + four.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FOUR_CORP_NAME")); + four.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FOUR_DEPARTMENT_ID")); + four.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FOUR_DEPARTMENT_NAME")); + four.put("APPOINT_USER_ID", entity.getString("APPOINT_FOUR_USER_ID")); + four.put("APPOINT_USER_NAME", entity.getString("APPOINT_FOUR_USER_NAME")); + four.put("APPOINT_STATUS", entity.getString("APPOINT_FOUR_STATUS")); + four.put("APPOINT_OPINION", entity.getString("APPOINT_FOUR_OPINION")); + four.put("APPOINT_TIME", entity.getString("APPOINT_FOUR_TIME")); + list.add(four); + } + if (index >= 5) { + PageData five = new PageData(); + five.put("INDEX", "5"); + five.put("APPOINT_CORP_ID", entity.getString("APPOINT_FIVE_CORP_ID")); + five.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FIVE_CORP_NAME")); + five.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FIVE_DEPARTMENT_ID")); + five.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FIVE_DEPARTMENT_NAME")); + five.put("APPOINT_USER_ID", entity.getString("APPOINT_FIVE_USER_ID")); + five.put("APPOINT_USER_NAME", entity.getString("APPOINT_FIVE_USER_NAME")); + five.put("APPOINT_STATUS", entity.getString("APPOINT_FIVE_STATUS")); + five.put("APPOINT_OPINION", entity.getString("APPOINT_FIVE_OPINION")); + five.put("APPOINT_TIME", entity.getString("APPOINT_FIVE_TIME")); + list.add(five); + } + if (index >= 6) { + PageData six = new PageData(); + six.put("INDEX", "6"); + six.put("APPOINT_CORP_ID", entity.getString("APPOINT_SIX_CORP_ID")); + six.put("APPOINT_CORP_NAME", entity.getString("APPOINT_SIX_CORP_NAME")); + six.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_SIX_DEPARTMENT_ID")); + six.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_SIX_DEPARTMENT_NAME")); + six.put("APPOINT_USER_ID", entity.getString("APPOINT_SIX_USER_ID")); + six.put("APPOINT_USER_NAME", entity.getString("APPOINT_SIX_USER_NAME")); + six.put("APPOINT_STATUS", entity.getString("APPOINT_SIX_STATUS")); + six.put("APPOINT_OPINION", entity.getString("APPOINT_SIX_OPINION")); + six.put("APPOINT_TIME", entity.getString("APPOINT_SIX_TIME")); + list.add(six); + } + PageData info = new PageData(); + info.put("info", list); + info.put("STEP", entity.getString("FLOWS_STEP")); + + condition.clear(); + condition.put("XGF_USER_ID", request.getString("XGF_USER_ID")); + PageData userInfo = xgfUserMapper.findById(condition); + if (userInfo == null || userInfo.size() == 0) { + throw new RuntimeException("未找到该用户详细信息"); + } + info.put("endFlag", userInfo.getString("CHECK_STATUS")); + return info; + } + + @Override + @Transactional + public void approvePlus(PageData request, MultipartFile[] chengNuoShu) throws Exception { + if (chengNuoShu != null && chengNuoShu.length > 0) { + request.put("APPOINT_ANNEX", Warden.saveFile(Warden.createZip(chengNuoShu),Jurisdiction.getCORPINFO_ID())); + } + this.approve(request); + } + + /* 获取当前用户是否有权限审批 */ + private String getPower(PageData x) { + switch (Integer.parseInt(x.get("CHECK_STEP").toString())) { + case 0: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ZERO_USER_ID"))) { + return "1"; + } else { + return "0"; + } + case 1: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ONE_USER_ID"))) { + return "1"; + } else { + return "0"; + } + case 2: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_TWO_USER_ID"))) { + return "1"; + } else { + return "0"; + } + case 3: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_THREE_USER_ID"))) { + return "1"; + } else { + return "0"; + } + case 4: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_FOUR_USER_ID"))) { + return "1"; + } else { + return "0"; + } + case 5: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_FIVE_USER_ID"))) { + return "1"; + } else { + return "0"; + } + case 6: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_SIX_USER_ID"))) { + return "1"; + } else { + return "0"; + } + case 7: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_SEVEN_USER_ID"))) { + return "1"; + } else { + return "0"; + } + default: + return "0"; + } + } + + private String handle(PageData info, PageData flows) throws Exception { + PageData condition = new PageData(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData corpEntity = corpInfoMapper.findById(condition); + switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { + case 0: {// 相关方端推送数据至企业端 + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); + flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", "1"); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + xgfUserMapper.edit(entity); + this.clearInfo(flows); + xgfFlowsMapper.edit(flows); + return "0"; + } else { + flows.put("APPOINT_ONE_CORP_TYPE", "0"); + flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_ONE_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_ONE_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("FLOWS_STEP", 1); + xgfFlowsMapper.edit(flows); + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData user = xgfUserMapper.findById(condition); + user.put("CHECK_STEP", 1); + // created by liu jun 2024-02-26 如果有委托书则保存委托书 + if (StringUtils.isNotBlank(info.getString("APPOINT_ANNEX"))) { + condition.clear(); + condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID")); + PageData userInfo = xgfUserDetailsMapper.findById(condition); + userInfo.put("COMMITMENT_LETTER", info.getString("APPOINT_ANNEX")); + xgfUserDetailsMapper.edit(userInfo); + } + xgfUserMapper.edit(user); + return "0"; + } + + } // 相关方选择的审批人审批，并指定下一位监管部门审批人，不过打回相关方端 + case 1: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getUSER_ID()); + flows.put("APPOINT_ONE_CORP_NAME", corpEntity.getString("CORP_NAME")); + flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); + flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", "1"); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + xgfUserMapper.edit(entity); + this.clearInfo(flows); + xgfFlowsMapper.edit(flows); + return "0"; + } else { + if ("1".equals(flows.getString("FLOWS_TYPE"))) { + entity.put("CHECK_STATUS", 1); + entity.put("VALID_FLAG", "2"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + + flows.put("APPOINT_TWO_CORP_TYPE", "0"); + flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_TWO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_TWO_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_TWO_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("FLOWS_STEP", 2); + xgfFlowsMapper.edit(flows); + return "0"; + } else { + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("STATUS", "2"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + flows.put("FLOWS_STEP", 2); + xgfFlowsMapper.edit(flows); + return "1"; + } + } + } + //监管部门审批人审批，并根据不同类型的审批规则进行处理 + case 2: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID()); + flows.put("APPOINT_TWO_CORP_NAME", corpEntity.getString("CORP_NAME")); + flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); + flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); + // 1、判断是否通过审核 + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + xgfUserMapper.edit(entity); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", "1"); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + this.clearInfo(flows); + xgfFlowsMapper.edit(flows); + return "0"; + } else { + // 2、通过审核后，根据不同的流程进行不同的处理 + switch (flows.getString("FLOWS_TYPE")) { + case "0":// 辖区单位审批 + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + entity.put("STATUS", "2"); + xgfUserMapper.edit(entity); + xgfFlowsMapper.edit(flows); + return "1"; + case "1":// 集团单位审批，需要指定下一位人员进行审批 + entity.put("CHECK_STATUS", 1); + entity.put("VALID_FLAG", "2"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + + flows.put("APPOINT_THREE_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_THREE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_THREE_CORP_TYPE", "0"); + flows.put("APPOINT_THREE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_THREE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_THREE_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_THREE_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("FLOWS_STEP", 3); + xgfFlowsMapper.edit(flows); + return "0"; + default: + throw new RuntimeException("未知的审批类型"); + } + } + } + case 3: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_THREE_CORP_ID", Jurisdiction.getCORPINFO_ID()); + flows.put("APPOINT_THREE_CORP_NAME", corpEntity.getString("CORP_NAME")); + flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); + flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); + // 1、判断是否通过审核 + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + xgfUserMapper.edit(entity); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", "1"); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + this.clearInfo(flows); + xgfFlowsMapper.edit(flows); + return "0"; + } else { + // TODO 根据是否委托辖区单位进行处理(前端传回来) + switch (flows.getString("FLOWS_TYPE")) { + case "1":// 由股份端审批 + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + entity.put("STATUS", "2"); + xgfUserMapper.edit(entity); + return "1"; + case "0":// 辖区单位审批，需要指定审批人 + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + + flows.put("APPOINT_FOUR_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_FOUR_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_FOUR_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_FOUR_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_FOUR_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_FOUR_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("FLOWS_STEP", 4); + xgfFlowsMapper.edit(flows); + return "0"; + default: + throw new RuntimeException("未知的审批类型"); + } + + } + } + // 委托先去单位审批 + case 4: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_FOUR_CORP_ID", Jurisdiction.getCORPINFO_ID()); + flows.put("APPOINT_FOUR_CORP_NAME", corpEntity.getString("CORP_NAME")); + flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); + flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); + // 1、判断是否通过审核 + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + xgfUserMapper.edit(entity); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", "1"); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + this.clearInfo(flows); + xgfFlowsMapper.edit(flows); + return "0"; + } else { + // TODO 根据是否委托辖区单位进行处理(前端传回来) + switch (flows.getString("FLOWS_TYPE")) { + case "0":// 由股份端审批 + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + entity.put("STATUS", "2"); + xgfUserMapper.edit(entity); + xgfFlowsMapper.edit(flows); + return "1"; + case "1":// 辖区单位审批，需要指定审批人 + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("STATUS", "2"); + xgfUserMapper.edit(entity); + flows.put("FLOWS_STEP", 5); + xgfFlowsMapper.edit(flows); + return "1"; + default: + throw new RuntimeException("未知的审批类型"); + } + } + + } + // 委托辖区单位监管部门审批 + case 5: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + flows.put("APPOINT_FIVE_CORP_ID", "1"); + flows.put("APPOINT_FIVE_CORP_NAME", "秦港股份有限公司"); + flows.put("APPOINT_FIVE_TIME", DateUtil.getTime()); + flows.put("APPOINT_FIVE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FIVE_OPINION", info.getString("OPINION")); + PageData entity = xgfUserMapper.findById(condition); + // 1、判断是否通过审核 + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", "1"); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + xgfUserMapper.edit(entity); + flows.put("APPOINT_FIVE_TIME", DateUtil.getTime()); + flows.put("APPOINT_FIVE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FIVE_OPINION", info.getString("OPINION")); + xgfFlowsMapper.edit(flows); + return "0"; + } else { + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + entity.put("STATUS", "2"); + xgfUserMapper.edit(entity); + return "1"; + } + } + // 6往后是备用流程 + case 6: { + flows.put("APPOINT_SIX_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_SIX_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_SIX_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_SIX_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_SIX_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_SIX_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_SIX_TIME", DateUtil.getTime()); + flows.put("APPOINT_SIX_STATUS", info.getString("STATUS")); + flows.put("APPOINT_SIX_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 7); + xgfFlowsMapper.edit(flows); + return "0"; + } + case 7: { + flows.put("APPOINT_SEVEN_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_SEVEN_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_SEVEN_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_SEVEN_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_SEVEN_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_SEVEN_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_SEVEN_TIME", DateUtil.getTime()); + flows.put("APPOINT_SEVEN_STATUS", info.getString("STATUS")); + flows.put("APPOINT_SEVEN_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 8); + xgfFlowsMapper.edit(flows); + return "0"; + } + default: + return "1"; + } + } + + private void clearInfo(PageData flow){ + flow.put("APPOINT_ONE_USER_ID", ""); + flow.put("APPOINT_TWO_USER_ID", ""); + flow.put("APPOINT_THREE_USER_ID", ""); + flow.put("APPOINT_FOUR_USER_ID", ""); + flow.put("APPOINT_FIVE_USER_ID", ""); + flow.put("APPOINT_SIX_USER_ID", ""); + flow.put("APPOINT_SEVEN_USER_ID", ""); + } + private void saveLog(PageData info, String status, String endFlag) throws Exception { + /* 保存审批记录 */ + PageData condition = new PageData(); + condition.clear(); + condition.put("FOREIGN_KEY", info.getString("FLOWS_ID")); + condition.put("TYPE", "1"); + condition.put("VALID_FLAG", "1"); + condition.put("END_FLAG", "0"); + PageData flow = flowMapper.findByCondition(condition); + if (flow == null || flow.size() == 0) { + throw new RuntimeException("流程已被暂停，请联系管理员"); + } + condition.clear(); + condition.put("FLOW_ID", flow.getString("FLOW_ID")); + condition.put("STEP_FLAG", "1"); + PageData currentNode = flowDetailMapper.selectOne(condition); + PageData nextNode = new PageData(); + nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); + nextNode.put("FLOW_ID", flow.getString("FLOW_ID")); + nextNode.put("STEP_FLAG", "1"); + nextNode.put("STEP_NAME", "企业端审批"); + nextNode.put("SORT", Integer.parseInt(currentNode.get("SORT").toString()) + 1); + nextNode.put("APPROVER_ID", Jurisdiction.getUSER_ID()); + nextNode.put("APPROVER_NAME", Jurisdiction.getName()); + nextNode.put("APPROVER_TIME", DateUtil.getTime()); + nextNode.put("APPROVER_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + nextNode.put("APPROVER_OPINION", info.get("OPINION")); + nextNode.put("APPOINT_ANNEX", info.getString("APPOINT_ANNEX")); + if ("1".equals(Jurisdiction.getCORPINFO_ID())) { + nextNode.put("APPROVER_CORPINFO_NAME", "秦皇岛股份有限公司"); + } else { + condition.clear(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData corpInfo = corpInfoMapper.findById(condition); + if (corpInfo != null && corpInfo.size() > 0) { + nextNode.put("APPROVER_CORPINFO_NAME", corpInfo.getString("CORP_NAME")); + } + } + nextNode.put("PASS_FLAG", status); + nextNode.put("END_FLAG", endFlag); + nextNode.put("ISDELETE", "0"); + nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); + + flowDetailMapper.save(nextNode); + currentNode.put("STEP_FLAG", "0"); + flowDetailMapper.edit(currentNode); + flow.put("END_FLAG", endFlag); + flowMapper.edit(flow); + } + + private String getType(String corpInfoId) { + // 集团单位id + // （河港机械 jtdw002 1e6dbbe16004402f8d2c0e52afd9a676）， + // （河港港工 jtdw003 3a854eefa7894e06aaa1a2611bca80f6）， + // （河港检测 jtdw004 020578a4c1f04bc692ee25145c2efbe5）， + // （方宇物业 jtdw005 90966974de3c4b83aca6f8fd6432d5c2） + String jituandanwei = "1e6dbbe16004402f8d2c0e52afd9a676，3a854eefa7894e06aaa1a2611bca80f6，020578a4c1f04bc692ee25145c2efbe5，90966974de3c4b83aca6f8fd6432d5c2"; + if (jituandanwei.contains(corpInfoId)) { + return "1"; + } else { + return "0"; + } + } } diff --git a/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java b/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java index 2366abae..15b510fd 100644 --- a/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java +++ b/src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java @@ -19,6 +19,7 @@ import org.apache.poi.ss.usermodel.VerticalAlignment; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.session.Session; import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; import org.springframework.web.servlet.view.document.AbstractXlsView; import com.zcloud.entity.PageData; @@ -30,11 +31,10 @@ import net.coobird.thumbnailator.Thumbnails; * 作者：luoxiaobao * 官网：www.qdkjchina.com */ +@Component public class HiddenExcelImgToSessionView extends AbstractXlsView{ - @Value("${http.file.url}") - private String fileUrl; - + private String fileUrl = "http://192.168.192.201:8991/file/"; @Override protected void buildExcelDocument(Map model, Workbook workbook, HttpServletRequest request, diff --git a/src/main/java/com/zcloud/util/HiddenExcelImgView.java b/src/main/java/com/zcloud/util/HiddenExcelImgView.java index a447a4bf..8b788f4b 100644 --- a/src/main/java/com/zcloud/util/HiddenExcelImgView.java +++ b/src/main/java/com/zcloud/util/HiddenExcelImgView.java @@ -38,8 +38,8 @@ import com.zcloud.entity.PageData; */ public class HiddenExcelImgView extends AbstractXlsView{ - @Value("${http.file.url}") - private String fileUrl; + + private String fileUrl = "http://192.168.192.201:8991/file/"; @Override protected void buildExcelDocument(Map model, diff --git a/src/main/java/com/zcloud/util/Warden.java b/src/main/java/com/zcloud/util/Warden.java index bf830fd4..3efb31ee 100644 --- a/src/main/java/com/zcloud/util/Warden.java +++ b/src/main/java/com/zcloud/util/Warden.java @@ -5,22 +5,32 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileItemFactory; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.util.EntityUtils; +import org.springframework.http.MediaType; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.servlet.http.HttpServletRequest; import java.io.*; import java.net.URL; import java.net.URLConnection; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; public class Warden { @@ -347,5 +357,118 @@ public class Warden { return list; } + public static String saveFile(MultipartFile[] files, String number) throws Exception{ + if (files.length == 0) throw new RuntimeException("文件为空"); + MultipartFile file = files[0]; + String ffile = DateUtil.getDays(); + String fileName = get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + number + "/" + ffile); + return Const.FILEPATHFILE + number + "/" + ffile + "/" + fileName; + } + + public static String saveFile(MultipartFile file, String CORPINFO_ID) throws Exception{ + MultipartFile[] files = new MultipartFile[1]; + files[0] = file; + return saveFile(files, CORPINFO_ID); + } + + /** + * 压缩文件 + */ + public static MultipartFile createZip(MultipartFile[] chenNuoShu) throws Exception{ + return zipFiles(convertToFile(chenNuoShu)); + } + + public static List convertToFile(MultipartFile[] files) throws Exception { + List lstFile = new ArrayList<>(); + if (files.length == 0) { + throw new RuntimeException("文件为空"); + } + for (MultipartFile file : files) { + if (file.equals("") || file.getSize() <= 0) { + continue; + } else { + InputStream ins; + ins = file.getInputStream(); + File toFile = new File(file.getOriginalFilename()); + inputStreamToFile(ins, toFile); + lstFile.add(toFile); + ins.close(); + } + } + return lstFile; + } + + /** + * 获取流文件 + * + * @param ins + * @param file + */ + public static void inputStreamToFile(InputStream ins, File file) { + try { + OutputStream os = Files.newOutputStream(file.toPath()); + int bytesRead = 0; + byte[] buffer = new byte[8192]; + while ((bytesRead = ins.read(buffer, 0, 8192)) != -1) { + os.write(buffer, 0, bytesRead); + } + os.close(); + ins.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static MultipartFile zipFiles(List srcFiles) throws IOException { + Date date = new Date(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String dxfFileName = formatter.format(date).replace(" ", "_").replace(":", "-"); + + FileInputStream fileInputStream; + ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream(); + try (ZipOutputStream zipOut = new ZipOutputStream(byteOutStream)) { + String fileNames = ""; + Random random = new Random(); + for (File file : srcFiles) { + fileInputStream = new FileInputStream(file); + String fileName = file.getName(); + if (fileNames.contains(fileName)){ + fileName = (random.nextInt(90000) + 10000) + fileName; + } else { + fileNames = fileNames + fileName + ","; + } + ZipEntry zipEntry = new ZipEntry(fileName); + zipOut.putNextEntry(zipEntry); + int len; + byte[] buffer = new byte[1024]; + while ((len = fileInputStream.read(buffer)) > 0) { + zipOut.write(buffer, 0, len); + } + fileInputStream.close(); + // 删除文件 + boolean isDelete = file.delete(); + if (isDelete){ + System.out.println("删除文件成功"); + } + } + zipOut.flush(); + zipOut.closeEntry(); + zipOut.close(); + + + InputStream inputStream = new ByteArrayInputStream(byteOutStream.toByteArray()); + + FileItemFactory factory = new DiskFileItemFactory(16, null); + FileItem item = factory.createItem("file", MediaType.MULTIPART_FORM_DATA_VALUE, true, LocalDateTime.now() + ".zip"); + OutputStream os = item.getOutputStream(); + IOUtils.copy(inputStream, os); + + return new CommonsMultipartFile(item); + } catch (IOException e) { + e.printStackTrace(); + } + throw new IOException("压缩文件失败"); + } } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 1bf34f5d..659d118a 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,5 +1,3 @@ - - datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root @@ -60,22 +58,21 @@ spring.main.banner-mode=off #preventionxgf.api.url=http://192.168.0.79:8088 # #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 - -preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/ -qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ +preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ +qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/ #????? -smb.host=39.103.224.166 +smb.host=39.101.130.96 smb.port=22 smb.user=root smb.password=Zcloud@zcloud88888 -smb.basePath=/mnt/qgfile/file/ +smb.basePath=/mnt/wwag/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.0.31:9876 +rocketmq.name-server=192.168.0.70:9876 +#rocketmq.name-server=172.24.151.16:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 @@ -91,8 +88,37 @@ mq.group.info=scheduled_tasks mq.group.eightWork=scheduled_tasks_eightWork -#数据同步topic -mq.gwj.data.topic=czks_qy_docking -mq.gwj.file.topic=czks_qy_dockingPicture -#港务局文件服务器前缀 -baseimgpath=https://qgqy.qhdsafety.com/file/ +corp.default.pic-path=https://qgqy.qhdsafety.com/ +corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ + + +#用户标识 +# 沧州矿石 +czks-useridentity=CZKS +czks-baseimgpath=https://wwag.qhdsafety.com/file/ +czks-backendaddr=http://192.168.0.79:8091/ +# 港务局 +gwj-useridentity=GWJ +gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ +gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ +# ?????? +http.file.url=https://qgqy.qhdsafety.com/file/ +perLoc.url=http://192.168.210.32:8084 +perLoc.userName=qaaqadmin +perLoc.pwd=Cfd2023@ +baseimgpath =http://192.168.192.201:8991/file/ + +mq.csy.data.topic=csy_docking +mq.csy.data.group=scheduled_tasks_csy_docking +mq.csy.file.topic=csy_dockingPicture +mq.csy.file.group=scheduled_tasks_csy_dockingPicture + +mq.cmt.data.topic=cmt_docking +mq.cmt.data.group=scheduled_tasks_cmt_docking +mq.cmt.file.topic=cmt_dockingPicture +mq.cmt.file.group=scheduled_tasks_cmt_dockingPicture + +mq.czks.data.topic=czks_docking +mq.czks.data.group=scheduled_tasks_czks_docking +mq.czks.file.topic=czks_dockingPicture +mq.czks.file.group=scheduled_tasks_czks_dockingPicture diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index b0929eb4..023e9b32 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -91,16 +91,19 @@ mq.group.eightWork=scheduled_tasks_eightWork corp.default.pic-path=https://qgqy.qhdsafety.com/ + corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ http.file.url=https://qgqy.qhdsafety.com/file/ -#ûʶ -# ݿʯ +#�û���ʶ +# ���ݿ�ʯ czks-useridentity=CZKS czks-baseimgpath=https://wwag.qhdsafety.com/file/ czks-backendaddr=http://192.168.0.79:8091/ -# +# ����� gwj-useridentity=GWJ gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ + +cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index d4811098..bc29f57c 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -85,10 +85,14 @@ mq.group.info=scheduled_tasks mq.group.eightWork=scheduled_tasks_eightWork -corp.default.pic-path=https://qgqy.qhdsafety.com/file/ +corp.default.pic-path=http://192.168.192.201:8991/file/ corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/ #数据同步topic mq.gwj.data.topic=czks_docking mq.gwj.file.topic=czks_dockingPicture #港务局文件服务器前缀 -baseimgpath=https://qgqy.qhdsafety.com/file/ +baseimgpath=http://192.168.192.201:8991/file/ + +cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd + +http.file.url=http://192.168.192.201:8991/file/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 25c549c5..dd259ac5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,9 +4,9 @@ server.port=8091 #?? #spring.profiles.active=local #����31ʱʹ�� -spring.profiles.active=dev +#spring.profiles.active=dev #?? -#spring.profiles.active=master +spring.profiles.active=master diff --git a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml index 757644a5..fe62fdf6 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml @@ -222,6 +222,7 @@ CODE = #{CODE}, COMPANY_AREA = #{COMPANY_AREA}, ADDRESS = #{ADDRESS}, + ADDRESS_BUSINESS = #{ADDRESS_BUSINESS}, CREATE_DATE = #{CREATE_DATE}, SCALE = #{SCALE}, LONGITUDE = #{LONGITUDE}, diff --git a/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml index 039a12bc..be998e9e 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml @@ -187,7 +187,7 @@ f.PROMISE_ID,f.PROMISE_NAME,f.TEXT,f.TYPE from `qa-gwj-regulatory`.BUS_PROMISE f - where 1=1 and f.ISDELETE = 0 + where 1=1 and f.ISDELETE = 0 and f.TYPE = '0' and f.PROMISE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') diff --git a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml index 08c0fcfe..9f333adc 100644 --- a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml @@ -875,11 +875,11 @@ (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME from f - left join qa-gwj-prevention.`vi_user_all` cr on cr.USER_ID = f.CREATOR - left join qa-gwj-prevention.`vi_user_all` re on re.USER_ID = f.RECTIFICATIONOR - left join qa-gwj-prevention.`vi_user_all` ch on ch.USER_ID = f.CHECKOR - left join qa-gwj-prevention.`vi_user_all` rev on rev.USER_ID = f.REVIEWOR - left join qa-gwj-prevention.`vi_user_all` conUser on conUser.USER_ID = f.CONFIRM_USER + left join `qa-gwj-prevention`.`vi_user_all` cr on cr.USER_ID = f.CREATOR + left join `qa-gwj-prevention`.`vi_user_all` re on re.USER_ID = f.RECTIFICATIONOR + left join `qa-gwj-prevention`.`vi_user_all` ch on ch.USER_ID = f.CHECKOR + left join `qa-gwj-prevention`.`vi_user_all` rev on rev.USER_ID = f.REVIEWOR + left join `qa-gwj-prevention`.`vi_user_all` conUser on conUser.USER_ID = f.CONFIRM_USER left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT diff --git a/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml b/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml index 608fec45..389aa646 100644 --- a/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml @@ -147,7 +147,18 @@ - + + + insert into + ( + + ) values + + ( #{item.NOTICECORP_ID}, #{item.USER_ID},0, #{item.NOTICECORPUSERID_ID} ) + + + + delete from where NOTICECORP_ID = #{NOTICECORP_ID} diff --git a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml index 4d6bfc1d..0ac65962 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml @@ -301,4 +301,56 @@ + + diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml index 6af6dad9..abbca825 100644 --- a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml @@ -427,8 +427,11 @@ and f.STATE = #{pd.state} - - and f.HIDDENTYPE = #{pd.hiddenType} + + and f.HIDDENTYPE in + + #{pd.hiddenTypeList[${index}]} + and ( diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml index a87579fb..038b8435 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml @@ -275,6 +275,9 @@ and (f.JOB_NUMBER LIKE CONCAT(CONCAT('%', #{pd.keyJobNumber}),'%')) + + and (u.NAME LIKE CONCAT(CONCAT('%', #{pd.applicantName}),'%')) + @@ -291,10 +294,10 @@ and f.STATE = #{pd.keyState} - and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN sus_user u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApplyUserName}),'%') and STATE = '11') + and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN vi_user_all u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApplyUserName}),'%') and STATE = '11') - and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN sus_user u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApproveUserName}),'%') and STATE = '12') + and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN vi_user_all u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApproveUserName}),'%') and STATE = '12') diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 022c4347..7121f2de 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -374,6 +374,9 @@ and f.STATE = 4 + + + and f.SOURCE = #{pd.SOURCE} and f.HIDDENLEVEL = #{pd.HIDDENLEVEL} diff --git a/src/main/resources/mybatis/datasource/map/MapEightMapper.xml b/src/main/resources/mybatis/datasource/map/MapEightMapper.xml index 4d0f9ebc..fadc2b02 100644 --- a/src/main/resources/mybatis/datasource/map/MapEightMapper.xml +++ b/src/main/resources/mybatis/datasource/map/MapEightMapper.xml @@ -67,24 +67,26 @@ AND CORPINFO_ID IN - #{item} + #{item} GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' AS cutroadCount, + '0' AS hotworkapplicationCount, count( 1 ) blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, '0' highworkCount, '0' hoistingCount, '0' electricityCount FROM - bus_blindboard + gf_blindboard WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -96,19 +98,21 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, '0' cutroadCount, '0' blindboardCount, - count( 1 ) breakgroundCount, + count( 1 ) confinedspaceCount, '0' highworkCount, '0' hoistingCount, '0' electricityCount FROM - bus_confinedspace + gf_confinedspace WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -120,19 +124,21 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' cutroadCount, + '0' hotworkapplicationCount, '0' blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, count( 1 ) highworkCount, '0' hoistingCount, '0' electricityCount FROM - bus_highwork + gf_highwork WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -144,19 +150,22 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' cutroadCount, + '0' hotworkapplicationCount, '0' blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, '0' highworkCount, count( 1 ) hoistingCount, '0' electricityCount FROM - bus_hoisting + gf_hoisting WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -168,49 +177,53 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' cutroadCount, + '0' hotworkapplicationCount, '0' blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, '0' highworkCount, '0' hoistingCount, count( 1 ) electricityCount FROM - bus_electricity + gf_electricity WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} - + AND CORPINFO_ID IN - + #{item} GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) + ) s GROUP BY s.CREATTIME ) h ON h.CREATTIME = t.click_date order by t.click_date - + SELECT * FROM - (SELECT + (SELECT f.HOTWORK_ID ID, f.CHECK_NO WORK_NUMBER, '动火作业' WORK_TYPE, @@ -504,31 +409,38 @@ GROUP BY f.HOTWORK_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.electricity_ID ID, - f.CHECK_NO WORK_NUMBER, - '临时用电作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '待确认' - when '2' then '待审批' - when '3' then '已归档' - when '4' then '已验收' - when '-1' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.APPLY_USER_ID - when '1' then f.ASSURE_USER_ID - when '2' then f.APPROVE_USER_ID - when '3' then f.ACCEPT_USER_ID - when '-1' then f.APPLY_USER_ID - END NEXT_USER_ID, + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.electricity_ID ID, + f.CHECK_NO WORK_NUMBER, + '临时用电作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '用电单位待审核' + when '3' then '配送电单位待审核' + when '4' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.APPLY_USER_ID + when '1' then f.CONFIRM_USER_ID + when '2' then f.AUDIT_USER_ID + when '3' then f.APPROVE_USER_ID + when '4' then f.ACCEPT_USER_ID + when '-1' then f.APPLY_USER_ID + when '-2' then f.APPLY_USER_ID + when '-3' then f.APPLY_USER_ID + when '-4' then f.APPLY_USER_ID + when '-5' then f.APPLY_USER_ID + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('3','4') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '5' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -538,32 +450,37 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.blindboard_ID ID, - f.CHECK_NO WORK_NUMBER, - '盲板作业' WORK_TYPE, - case f.APPLY_STATUS - when '1' then '待确认' - when '2' then '待审批' - when '3' then '已归档' - when '4' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then bb.OPERATION_UNIT_PERSONCHARGE - when '2' then bb.CORPINFO_APPROVER - when '3' then f.APPLY_USER_ID - when '4' then f.APPLY_USER_ID - END NEXT_USER_ID, + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.blindboard_ID ID, + f.CHECK_NO WORK_NUMBER, + '盲板作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.APPLY_USER_ID + when '1' then f.CONSTRUCTION_USER_ID + when '4' then f.LEADER_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then APPLY_USER_ID + when '-5' then APPLY_USER_ID + when '-6' then APPLY_USER_ID + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_blindboard f - LEFT JOIN bus_blindboardinfo bb ON bb.BLINDBOARD_ID = f.BLINDBOARD_ID - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('3','4') - AND date_format(now(),'%Y-%m-%d %H:%i') >= bb.BOARD_INSTALL_TIME AND bb.BOARD_DISASSEMBLE_TIME >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_blindboard f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -573,39 +490,44 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.HIGHWORK_ID ID, - f.CHECK_NO WORK_NUMBER, - '高处作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '待确认' - when '2' then '待审核' - when '3' then '待审批' - when '4' then '已归档' - when '5' then '已验收' - when '-2' then '确认打回' - when '-3' then '审核打回' - when '-4' then '审批打回' - when '55' then '待验收' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then f.CONSTRUCTION_USER_ID - when '2' then f.AUDIT_USER_ID - when '3' then f.APPROVE_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '55' then f.ACCEPT_USER_ID - END NEXT_USER_ID, + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.HIGHWORK_ID ID, + f.CHECK_NO WORK_NUMBER, + '高处作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.CONSTRUCTION_USER_ID + when '2' then f.LEADER_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('4','5','55','-5') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -615,44 +537,34 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.confinedspace_ID ID, - f.WORK_PERMIT_NUMBER WORK_NUMBER, - '有限空间作业' WORK_TYPE, - case f.APPLY_STATUS - when '1' then '待采样' - when '2' then '作业单位责任人确认' - when '3' then '作业现场责任人审核' - when '4' then '管理单位责任人审批' - when '5' then '作业单位责任人验收' - when '6' then '管理单位责任人验收' - when '-2' then '作业单位责任人确认打回' - when '-3' then '作业现场责任人审核打回' - when '-4' then '管理单位责任人审批打回' - when '-5' then '作业单位责任人验收打回' - when '-6' then '管理单位责任人验收打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then f.SAMPLING_ANALYST_ID - when '2' then f.WORK_UNIT_MANAGER_ID - when '3' then f.JOB_SITE_MANAGER_ID - when '4' then f.MANAGEMENT_UNIT_ID - when '5' then f.WORK_UNIT_MANAGER_ID - when '6' then f.MANAGEMENT_UNIT_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.confinedspace_ID ID, + f.CHECK_NO WORK_NUMBER, + '有限空间作业' WORK_TYPE, + case f.APPLY_STATUS + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-4' then '作业负责人审核打回' + when '-5' then '所在单位审核打回' + when '-6' then '验收打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '1' then f.CONFIRM_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '7' - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -662,40 +574,44 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.hoisting_ID ID, - f.NUMBERING WORK_NUMBER, - '吊装作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '待确认' - when '2' then '待审核' - when '3' then '待审批' - when '4' then '已归档' - when '5' then '已验收' - when '-2' then '确认打回' - when '-3' then '审核打回' - when '-4' then '审批打回' - when '55' then '待验收' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then f.CONSTRUCTION_JOB_MANAGER_ID - when '2' then f.WORK_UNIT_MANAGER_ID - when '3' then f.BRANCH_APPROVER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '55' then f.ACCEPTOR_ID - END NEXT_USER_ID, + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.hoisting_ID ID, + f.CHECK_NO WORK_NUMBER, + '吊装作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业指挥待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.LEADER_USER_ID + when '2' then f.CONSTRUCTION_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_hoisting f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('4','5','55','-5') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.JOB_START_TIME AND f.JOB_END_TIME >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_hoisting f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -705,9 +621,9 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - ) f + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + ) f ORDER BY f.OPERATTIME DESC @@ -715,17 +631,17 @@ SELECT - 'ELECTRICITY' TYPE, - f.ELECTRICITY_ID id, - CONCAT_WS("", '临时用电作业 编号：', f.CHECK_NO) NAME, - f.WORK_LONGITUDE LONGITUDE, - f.WORK_LATITUDE LATITUDE, - './bi/images/map/electricity.png' IMAGE_FILE, + 'ELECTRICITY' TYPE, + f.ELECTRICITY_ID id, + CONCAT_WS("", '临时用电作业 编号：', f.CHECK_NO) NAME, + f.WORK_LONGITUDE LONGITUDE, + f.WORK_LATITUDE LATITUDE, + './bi/images/map/electricity.png' IMAGE_FILE, f.CORPINFO_ID, f.CHECK_NO as MAP_POINT_NAME FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL - AND f.APPLY_STATUS NOT IN ('3','4') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + AND f.APPLY_STATUS NOT IN ('3','4') + AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') and f.CORPINFO_ID = #{CORPINFO_ID} @@ -764,7 +680,7 @@ SELECT - 'HIGHWORK' TYPE, - f.HIGHWORK_ID id, - CONCAT_WS("", '高处作业 编号：', f.CHECK_NO) NAME, - f.WORK_LONGITUDE LONGITUDE, - f.WORK_LATITUDE LATITUDE, - './bi/images/map/highwork.png' IMAGE_FILE, - f.CORPINFO_ID, - f.CHECK_NO as MAP_POINT_NAME - FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL - AND f.APPLY_STATUS NOT IN ('4','5','55','-5') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + 'HIGHWORK' TYPE, + f.HIGHWORK_ID id, + CONCAT_WS("", '高处作业 编号：', f.CHECK_NO) NAME, + f.WORK_LONGITUDE LONGITUDE, + f.WORK_LATITUDE LATITUDE, + './bi/images/map/highwork.png' IMAGE_FILE, + f.CORPINFO_ID, + f.CHECK_NO as MAP_POINT_NAME + FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + AND f.APPLY_STATUS NOT IN ('4','5','55','-5') + AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') and f.CORPINFO_ID = #{CORPINFO_ID} @@ -814,57 +730,6 @@ - - - - - - - SELECT * FROM - (SELECT - f.HOTWORKAPPLICATION_ID ID, - f.JOB_NUMBER WORK_NUMBER, - '动火作业' WORK_TYPE, - case f.STATE - when 1 then '动火单位负责人确认' - when 2 then '项目发包单位签发' - when 3 then '现场管辖单位负责人' - when 4 then '动火许可签发单位' - when 5 then '安全总监审批' - when 6 then '现场负责人' - when 7 then '动火前' - when 8 then '现场负责人确认' - when 9 then '动火后' - when 10 then '延时监火' - when 11 then '归档' - when 21 then '动火操作人' - when 22 then '监护人' - when 24 then '气体检测人' - when -1 then '审核不通过' - when -2 then '特级动火不通过' - when -3 then '未完成 关闭归档' - when -4 then '延期' - when -5 then '已打回' - when -6 then '超期' - when 30 then '动火负责人确认' - when 31 then '项目主管初审' - when 32 then '项目监管部门负责人' - when 33 then '分公司安全总监审批' - when 34 then '分公司主要负责人' - when 35 then '安全监督部初审' - when 36 then '安委会办公室' - when 37 then '安全总监审批' - END STATUS_NAME, - IF(f.STATE = 10,IFNULL(od.`NAME`,IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))),IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))) USER_NAME, - - DATE_FORMAT(ifnull(f.OPERATTIME,f.CREATTIME),'%Y-%m-%d %H:%i:%s') OPERATTIME - FROM bus_hotworkapplication f - LEFT JOIN bus_hotworkapplicationuser hu ON hu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID AND hu.STATE = f.STATE - LEFT JOIN sys_user u ON u.USER_ID = hu.USER_ID - LEFT JOIN oa_department od ON od.DEPARTMENT_ID = hu.USER_ID - LEFT JOIN `qa-gwj-regulatory`.sys_user qu on qu.USER_ID = hu.USER_ID - WHERE f.ISDELETE = '0' AND f.STATE >= 0 and f.STATE != 11 + (SELECT + f.HOTWORKAPPLICATION_ID ID, + f.JOB_NUMBER WORK_NUMBER, + '动火作业' WORK_TYPE, + case f.STATE + when 1 then '动火单位负责人确认' + when 2 then '项目发包单位签发' + when 3 then '现场管辖单位负责人' + when 4 then '动火许可签发单位' + when 5 then '安全总监审批' + when 6 then '现场负责人' + when 7 then '动火前' + when 8 then '现场负责人确认' + when 9 then '动火后' + when 10 then '延时监火' + when 11 then '归档' + when 21 then '动火操作人' + when 22 then '监护人' + when 24 then '气体检测人' + when -1 then '审核不通过' + when -2 then '特级动火不通过' + when -3 then '未完成 关闭归档' + when -4 then '延期' + when -5 then '已打回' + when -6 then '超期' + when 30 then '动火负责人确认' + when 31 then '项目主管初审' + when 32 then '项目监管部门负责人' + when 33 then '分公司安全总监审批' + when 34 then '分公司主要负责人' + when 35 then '安全监督部初审' + when 36 then '安委会办公室' + when 37 then '安全总监审批' + END STATUS_NAME, + IF(f.STATE = 10,IFNULL(od.`NAME`,IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))),IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))) USER_NAME, + + DATE_FORMAT(ifnull(f.OPERATTIME,f.CREATTIME),'%Y-%m-%d %H:%i:%s') OPERATTIME + FROM bus_hotworkapplication f + LEFT JOIN bus_hotworkapplicationuser hu ON hu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID AND hu.STATE = f.STATE + LEFT JOIN sys_user u ON u.USER_ID = hu.USER_ID + LEFT JOIN oa_department od ON od.DEPARTMENT_ID = hu.USER_ID + LEFT JOIN `qa-gwj-regulatory`.sys_user qu on qu.USER_ID = hu.USER_ID + WHERE f.ISDELETE = '0' AND f.STATE >= 0 and f.STATE != 11 and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2126,165 +1972,118 @@ - GROUP BY f.HOTWORKAPPLICATION_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.electricity_ID ID, - f.CHECK_NO WORK_NUMBER, - '临时用电作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '2' then '用电单位待审核' - when '3' then '配送电单位待审核' - when '4' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.APPLY_USER_ID - when '1' then f.CONFIRM_USER_ID - when '2' then f.AUDIT_USER_ID - when '3' then f.APPROVE_USER_ID - when '4' then f.ACCEPT_USER_ID - when '-1' then f.APPLY_USER_ID - when '-2' then f.APPLY_USER_ID - when '-3' then f.APPLY_USER_ID - when '-4' then f.APPLY_USER_ID - when '-5' then f.APPLY_USER_ID - END NEXT_USER_ID, - ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '5' - - and f.CORPINFO_ID = #{pd.CORPINFO_ID} - - - AND f.CORPINFO_ID IN - - #{pd.ids[${index}]} - - - - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.blindboard_ID ID, - f.CHECK_NO WORK_NUMBER, - '盲板作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '4' then '所在单位待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.APPLY_USER_ID - when '1' then f.CONSTRUCTION_USER_ID - when '4' then f.LEADER_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then APPLY_USER_ID - when '-5' then APPLY_USER_ID - when '-6' then APPLY_USER_ID - END NEXT_USER_ID, - ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_blindboard f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' - - and f.CORPINFO_ID = #{pd.CORPINFO_ID} - - - AND f.CORPINFO_ID IN - - #{pd.ids[${index}]} - - - - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.HIGHWORK_ID ID, - f.CHECK_NO WORK_NUMBER, - '高处作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '2' then '所在单位待审核' - when '3' then '审核部门待审核' - when '4' then '审批部门待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.CREATOR - when '1' then f.CONSTRUCTION_USER_ID - when '2' then f.LEADER_USER_ID - when '3' then f.AUDIT_USER_ID - when '4' then f.APPROVE_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, - ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' - - and f.CORPINFO_ID = #{pd.CORPINFO_ID} - - - AND f.CORPINFO_ID IN - - #{pd.ids[${index}]} - - - - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL + GROUP BY f.HOTWORKAPPLICATION_ID + UNION ALL SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME FROM (SELECT - f.confinedspace_ID ID, - f.WORK_PERMIT_NUMBER WORK_NUMBER, - '有限空间作业' WORK_TYPE, + f.electricity_ID ID, + f.CHECK_NO WORK_NUMBER, + '临时用电作业' WORK_TYPE, case f.APPLY_STATUS - when '1' then '待采样' - when '2' then '作业单位责任人确认' - when '3' then '作业现场责任人审核' - when '4' then '管理单位责任人审批' - when '5' then '作业单位责任人验收' - when '6' then '管理单位责任人验收' - when '-2' then '作业单位责任人确认打回' - when '-3' then '作业现场责任人审核打回' - when '-4' then '管理单位责任人审批打回' - when '-5' then '作业单位责任人验收打回' - when '-6' then '管理单位责任人验收打回' + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '用电单位待审核' + when '3' then '配送电单位待审核' + when '4' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' END STATUS_NAME, case f.APPLY_STATUS - when '1' then f.SAMPLING_ANALYST_ID - when '2' then f.WORK_UNIT_MANAGER_ID - when '3' then f.JOB_SITE_MANAGER_ID - when '4' then f.MANAGEMENT_UNIT_ID - when '5' then f.WORK_UNIT_MANAGER_ID - when '6' then f.MANAGEMENT_UNIT_ID + when '0' then f.APPLY_USER_ID + when '1' then f.CONFIRM_USER_ID + when '2' then f.AUDIT_USER_ID + when '3' then f.APPROVE_USER_ID + when '4' then f.ACCEPT_USER_ID + when '-1' then f.APPLY_USER_ID + when '-2' then f.APPLY_USER_ID + when '-3' then f.APPLY_USER_ID + when '-4' then f.APPLY_USER_ID + when '-5' then f.APPLY_USER_ID + END NEXT_USER_ID, + ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME + FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '5' + + and f.CORPINFO_ID = #{pd.CORPINFO_ID} + + + AND f.CORPINFO_ID IN + + #{pd.ids[${index}]} + + + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.blindboard_ID ID, + f.CHECK_NO WORK_NUMBER, + '盲板作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.APPLY_USER_ID + when '1' then f.CONSTRUCTION_USER_ID + when '4' then f.LEADER_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then APPLY_USER_ID + when '-5' then APPLY_USER_ID + when '-6' then APPLY_USER_ID + END NEXT_USER_ID, + ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME + FROM gf_blindboard f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' + + and f.CORPINFO_ID = #{pd.CORPINFO_ID} + + + AND f.CORPINFO_ID IN + + #{pd.ids[${index}]} + + + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.HIGHWORK_ID ID, + f.CHECK_NO WORK_NUMBER, + '高处作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.CONSTRUCTION_USER_ID + when '2' then f.LEADER_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID when '-2' then f.CREATOR when '-3' then f.CREATOR when '-4' then f.CREATOR @@ -2292,8 +2091,44 @@ when '-6' then f.CREATOR END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '7' - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' + + and f.CORPINFO_ID = #{pd.CORPINFO_ID} + + + AND f.CORPINFO_ID IN + + #{pd.ids[${index}]} + + + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.confinedspace_ID ID, + f.CHECK_NO WORK_NUMBER, + '有限空间作业' WORK_TYPE, + case f.APPLY_STATUS + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-4' then '作业负责人审核打回' + when '-5' then '所在单位审核打回' + when '-6' then '验收打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '1' then f.CONFIRM_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, + ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME + FROM gf_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2305,42 +2140,42 @@ ) f LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.hoisting_ID ID, - f.CHECK_NO WORK_NUMBER, - '吊装作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业指挥待审核' - when '2' then '所在单位待审核' - when '3' then '审核部门待审核' - when '4' then '审批部门待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.CREATOR - when '1' then f.LEADER_USER_ID - when '2' then f.CONSTRUCTION_USER_ID - when '3' then f.AUDIT_USER_ID - when '4' then f.APPROVE_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.hoisting_ID ID, + f.CHECK_NO WORK_NUMBER, + '吊装作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业指挥待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.LEADER_USER_ID + when '2' then f.CONSTRUCTION_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_hoisting f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' + FROM gf_hoisting f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2351,45 +2186,45 @@ - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.BREAKGROUND_ID ID, - f.CHECK_NO WORK_NUMBER, - '动土作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '2' then '所在单位待审核' - when '3' then '有关部门待审核' - when '4' then '审批部门待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.CREATOR - when '1' then f.CONSTRUCTION_USER_ID - when '2' then f.PRODUCTION_USER_ID - when '3' then f.SAFETY_USER_ID - when '4' then f.LEADER_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.BREAKGROUND_ID ID, + f.CHECK_NO WORK_NUMBER, + '动土作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '所在单位待审核' + when '3' then '有关部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.CONSTRUCTION_USER_ID + when '2' then f.PRODUCTION_USER_ID + when '3' then f.SAFETY_USER_ID + when '4' then f.LEADER_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_breakground f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' + FROM gf_breakground f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2400,45 +2235,45 @@ - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.CUTROAD_ID ID, - f.CHECK_NO WORK_NUMBER, - '断路作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '2' then '所在单位待审核' - when '3' then '消防、安全管理部门待审核' - when '4' then '审批部门待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.CREATOR - when '1' then f.CONSTRUCTION_USER_ID - when '2' then f.PRODUCTION_USER_ID - when '3' then f.SAFETY_USER_ID - when '4' then f.LEADER_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.CUTROAD_ID ID, + f.CHECK_NO WORK_NUMBER, + '断路作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '所在单位待审核' + when '3' then '消防、安全管理部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.CONSTRUCTION_USER_ID + when '2' then f.PRODUCTION_USER_ID + when '3' then f.SAFETY_USER_ID + when '4' then f.LEADER_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_cutroad f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' + FROM gf_cutroad f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2449,9 +2284,9 @@ - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - ) f + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + ) f ORDER BY f.OPERATTIME DESC @@ -2479,9 +2314,9 @@ - + select - `NAME` + `NAME` from - sys_dictionaries + sys_dictionaries where - DICTIONARIES_ID in + DICTIONARIES_ID in #{item} @@ -3704,4 +3538,228 @@ f.HOISTING_ID = #{HOISTING_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID} order by f.ACCEPT_CONFESS_USER_SIGNER_TIME asc + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml new file mode 100644 index 00000000..826d278d --- /dev/null +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml @@ -0,0 +1,222 @@ + + + + + + + MKMJ_AREA_GATE + + + + + SYS_DICTIONARIES + + + + + f.AREA_GATE_ID, + f.GATE_NUMBER, + f.AREA_ID, + f.GATE_NAME, + f.GATE_TYPE, + f.GATE_CATEGORY, + f.GATE_MODEL, + f.GATE_POSITION, + f.IS_ADJACENT, + f.ADJACENT_AREA_ID, + f.LONGITUDE, + f.LATITUDE, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + AREA_GATE_ID, + GATE_NUMBER, + AREA_ID, + GATE_NAME, + GATE_TYPE, + GATE_CATEGORY, + GATE_MODEL, + GATE_POSITION, + IS_ADJACENT, + ADJACENT_AREA_ID, + LONGITUDE, + LATITUDE, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{AREA_GATE_ID}, + #{GATE_NUMBER}, + #{AREA_ID}, + #{GATE_NAME}, + #{GATE_TYPE}, + #{GATE_CATEGORY}, + #{GATE_MODEL}, + #{GATE_POSITION}, + #{IS_ADJACENT}, + #{ADJACENT_AREA_ID}, + #{LONGITUDE}, + #{LATITUDE}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + AREA_GATE_ID = #{AREA_GATE_ID} + + + + + update + + set + AREA_GATE_ID= AREA_GATE_ID, + GATE_NUMBER=#{GATE_NUMBER}, + AREA_ID=#{AREA_ID}, + GATE_NAME=#{GATE_NAME}, + GATE_TYPE=#{GATE_TYPE}, + GATE_CATEGORY=#{GATE_CATEGORY}, + GATE_MODEL=#{GATE_MODEL}, + GATE_POSITION=#{GATE_POSITION}, + IS_ADJACENT=#{IS_ADJACENT}, + ADJACENT_AREA_ID=#{ADJACENT_AREA_ID}, + LONGITUDE=#{LONGITUDE}, + LATITUDE=#{LATITUDE}, + CORPINFO_ID=#{CORPINFO_ID}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE} + where + AREA_GATE_ID=#{AREA_GATE_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + AREA_GATE_ID in + + #{item} + + + + + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + AREA_GATE_ID = #{AREA_GATE_ID} + + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml new file mode 100644 index 00000000..a71e15c0 --- /dev/null +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml @@ -0,0 +1,188 @@ + + + + + + + MKMJ_AREA + + + + + SYS_DICTIONARIES + + + + + f.AREA_ID, + f.AREA_NAME, + f.AREA_RANGE, + f.AREA_LEAVE, + f.AREA_PARENT_ID, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + AREA_ID, + AREA_NAME, + AREA_RANGE, + AREA_LEAVE, + AREA_PARENT_ID, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{AREA_ID}, + #{AREA_NAME}, + #{AREA_RANGE}, + #{AREA_LEAVE}, + #{AREA_PARENT_ID}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + AREA_ID = #{AREA_ID} + + + + + update + + set + AREA_ID=AREA_ID, + AREA_NAME=#{AREA_NAME}, + AREA_RANGE=#{AREA_RANGE}, + AREA_LEAVE=#{AREA_LEAVE}, + AREA_PARENT_ID=#{AREA_PARENT_ID}, + CORPINFO_ID=#{CORPINFO_ID}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE} + where + AREA_ID=#{AREA_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + AREA_ID in + + #{item} + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml new file mode 100644 index 00000000..4b5d0bdd --- /dev/null +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml @@ -0,0 +1,197 @@ + + + + + + + MKMJ_GATE_LOG + + + + + SYS_DICTIONARIES + + + + + f.AREA_LOG_ID, + f.AREA_GATE_ID, + f.STATE, + f.LOG_TIME, + f.USER_ID, + f.USER_NAME, + f.GATE_TYPE, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE, + f.EX1, + f.EX2, + f.EX3, + f.EX4, + f.EX5 + + + + + AREA_LOG_ID, + AREA_GATE_ID, + STATE, + LOG_TIME, + USER_ID, + USER_NAME, + GATE_TYPE, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE, + EX1, + EX2, + EX3, + EX4, + EX5 + + + + + #{AREA_LOG_ID}, + #{AREA_GATE_ID}, + #{STATE}, + #{LOG_TIME}, + #{USER_ID}, + #{USER_NAME} + #{GATE_TYPE}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE}, + #{EX1}, + #{EX2}, + #{EX3}, + #{EX4}, + #{EX5} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + AREA_LOG_ID = #{AREA_LOG_ID} + + + + + update + + set + AREA_LOG_ID= AREA_LOG_ID, + AREA_GATE_ID=#{AREA_GATE_ID}, + STATE=#{STATE}, + LOG_TIME=#{LOG_TIME}, + USER_CARD=#{USER_CARD}, + GATE_TYPE=#{GATE_TYPE}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE}, + EX1=#{EX1}, + EX2=#{EX2}, + EX3=#{EX3}, + EX4=#{EX4}, + EX5=#{EX5} + where + AREA_LOG_ID=#{AREA_LOG_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + AREA_LOG_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml new file mode 100644 index 00000000..cef4d84c --- /dev/null +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml @@ -0,0 +1,183 @@ + + + + + + + MKMJ_GATE_VIDEO + + + + + SYS_DICTIONARIES + + + + + f.GATE_VIDEO_ID, + f.AREA_GATE_ID, + f.PLATFORMVIDEOMANAGEMENT_ID, + f.LONGITUDE, + f.LATITUDE, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + GATE_VIDEO_ID, + AREA_GATE_ID, + PLATFORMVIDEOMANAGEMENT_ID, + LONGITUDE, + LATITUDE, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{GATE_VIDEO_ID}, + #{AREA_GATE_ID}, + #{PLATFORMVIDEOMANAGEMENT_ID}, + #{LONGITUDE}, + #{LATITUDE}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + GATE_VIDEO_ID = #{GATE_VIDEO_ID} + + + + + update + + set + GATE_VIDEO_ID= GATE_VIDEO_ID, + AREA_GATE_ID=#{AREA_GATE_ID}, + PLATFORMVIDEOMANAGEMENT_ID=#{PLATFORMVIDEOMANAGEMENT_ID}, + LONGITUDE=#{LONGITUDE}, + LATITUDE=#{LATITUDE}, + CORPINFO_ID=#{CORPINFO_ID}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE} + where + GATE_VIDEO_ID=#{GATE_VIDEO_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + GATE_VIDEO_ID in + + #{item} + + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + GATE_VIDEO_ID = #{GATE_VIDEO_ID} + + + + + + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 514370b1..e931bf02 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -91,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" JCR, CORPINFO_ID, CARDNO, + MKMJCARD, ISDELETE @@ -131,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" f.JCR, f.CORPINFO_ID, f.CARDNO, + f.MKMJCARD, f.ISDELETE @@ -168,6 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{JCR}, #{CORPINFO_ID}, #{CARDNO}, + #{MKMJCARD}, #{ISDELETE} @@ -387,6 +390,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ,CARDNO = #{CARDNO} + + ,MKMJCARD = #{MKMJCARD} + ,DURATION = #{DURATION} @@ -1432,4 +1438,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where u.CARDNO = #{CARDNO} + + diff --git a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml index 4a663f1e..5801dc27 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml @@ -28,7 +28,9 @@ f.END_FLAG, f.ISDELETE, f.PARENT_ID, - f.FOREIGN_KEY + f.FOREIGN_KEY, + f.SORT, + f.APPOINT_ANNEX @@ -47,7 +49,9 @@ END_FLAG, ISDELETE, PARENT_ID, - FOREIGN_KEY + FOREIGN_KEY, + SORT, + APPOINT_ANNEX @@ -66,7 +70,9 @@ #{END_FLAG}, #{ISDELETE}, #{PARENT_ID}, - #{FOREIGN_KEY} + #{FOREIGN_KEY}, + #{SORT}, + #{APPOINT_ANNEX} @@ -104,8 +110,10 @@ END_FLAG = #{END_FLAG}, ISDELETE = #{ISDELETE}, PARENT_ID = #{PARENT_ID}, - FOREIGN_ID = #{FOREIGN_ID}, + FOREIGN_KEY = #{FOREIGN_KEY}, STEP_NAME = #{STEP_NAME}, + SORT = #{SORT}, + APPOINT_ANNEX = #{APPOINT_ANNEX} where FLOW_DETAIL_ID = #{FLOW_DETAIL_ID} @@ -125,8 +133,25 @@ and a.PARENT_ID = #{PARENT_ID} - - and a.FOREIGN_ID = #{FOREIGN_ID} + + and a.FOREIGN_KEY = #{FOREIGN_KEY} + + + diff --git a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml index 978c5797..1c1b56e7 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml @@ -20,7 +20,9 @@ f.CREATOR_NAME, f.CREATOR_TIME, f.VALID_FLAG, - f.FOREIGN_KEY + f.FOREIGN_KEY, + f.ISDELETE, + f.END_FLAG @@ -31,7 +33,9 @@ CREATOR_NAME, CREATOR_TIME, VALID_FLAG, - FOREIGN_KEY + FOREIGN_KEY, + ISDELETE, + END_FLAG @@ -42,7 +46,9 @@ #{CREATOR_NAME}, #{CREATOR_TIME}, #{VALID_FLAG}, - #{FOREIGN_KEY} + #{FOREIGN_KEY}, + #{ISDELETE}, + #{END_FLAG} @@ -74,6 +80,8 @@ CREATOR_NAME = #{CREATOR_NAME}, CREATOR_TIME = #{CREATOR_TIME}, VALID_FLAG = #{VALID_FLAG}, + ISDELETE = #{ISDELETE}, + END_FLAG = #{END_FLAG}, FOREIGN_KEY = FOREIGN_KEY where FLOW_ID = #{FLOW_ID} @@ -87,5 +95,27 @@ and a.FOREIGN_KEY = #{FOREIGN_KEY} + + and a.TYPE = #{TYPE} + + + and a.VALID_FLAG = #{VALID_FLAG} + + + diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml new file mode 100644 index 00000000..5b7725af --- /dev/null +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -0,0 +1,372 @@ + + + + + + xgf_flows + + + + f.FLOWS_ID, + f.FOREIGN_KEY_ID, + f.FOREIGN_KEY_NAME, + f.FLOWS_STEP, + f.FLOWS_TYPE, + f.IS_DELETE, + f.APPOINT_ZERO_CORP_ID, + f.APPOINT_ZERO_CORP_TYPE, + f.APPOINT_ZERO_CORP_NAME, + f.APPOINT_ZERO_DEPARTMENT_ID, + f.APPOINT_ZERO_DEPARTMENT_NAME, + f.APPOINT_ZERO_USER_ID, + f.APPOINT_ZERO_USER_NAME, + f.APPOINT_ZERO_STATUS, + f.APPOINT_ZERO_OPINION, + f.APPOINT_ZERO_TIME, + f.APPOINT_ONE_CORP_ID, + f.APPOINT_ONE_CORP_NAME, + f.APPOINT_ONE_CORP_TYPE, + f.APPOINT_ONE_DEPARTMENT_ID, + f.APPOINT_ONE_DEPARTMENT_NAME, + f.APPOINT_ONE_USER_ID, + f.APPOINT_ONE_USER_NAME, + f.APPOINT_ONE_STATUS, + f.APPOINT_ONE_OPINION, + f.APPOINT_ONE_TIME, + f.APPOINT_TWO_CORP_ID, + f.APPOINT_TWO_CORP_NAME, + f.APPOINT_TWO_CORP_TYPE, + f.APPOINT_TWO_DEPARTMENT_ID, + f.APPOINT_TWO_DEPARTMENT_NAME, + f.APPOINT_TWO_USER_ID, + f.APPOINT_TWO_USER_NAME, + f.APPOINT_TWO_STATUS, + f.APPOINT_TWO_OPINION, + f.APPOINT_TWO_TIME, + f.APPOINT_THREE_CORP_ID, + f.APPOINT_THREE_CORP_NAME, + f.APPOINT_THREE_CORP_TYPE, + f.APPOINT_THREE_DEPARTMENT_ID, + f.APPOINT_THREE_DEPARTMENT_NAME, + f.APPOINT_THREE_USER_ID, + f.APPOINT_THREE_USER_NAME, + f.APPOINT_THREE_STATUS, + f.APPOINT_THREE_OPINION, + f.APPOINT_THREE_TIME, + f.APPOINT_FOUR_CORP_ID, + f.APPOINT_FOUR_CORP_NAME, + f.APPOINT_FOUR_CORP_TYPE, + f.APPOINT_FOUR_DEPARTMENT_ID, + f.APPOINT_FOUR_DEPARTMENT_NAME, + f.APPOINT_FOUR_USER_ID, + f.APPOINT_FOUR_USER_NAME, + f.APPOINT_FOUR_STATUS, + f.APPOINT_FOUR_OPINION, + f.APPOINT_FIVE_CORP_ID, + f.APPOINT_FIVE_CORP_NAME, + f.APPOINT_FIVE_CORP_TYPE, + f.APPOINT_FIVE_DEPARTMENT_ID, + f.APPOINT_FIVE_DEPARTMENT_NAME, + f.APPOINT_FIVE_USER_ID, + f.APPOINT_FIVE_USER_NAME, + f.APPOINT_FIVE_STATUS, + f.APPOINT_FIVE_OPINION, + f.APPOINT_SIX_CORP_ID, + f.APPOINT_SIX_CORP_NAME, + f.APPOINT_SIX_CORP_TYPE, + f.APPOINT_SIX_DEPARTMENT_ID, + f.APPOINT_SIX_DEPARTMENT_NAME, + f.APPOINT_SIX_USER_ID, + f.APPOINT_SIX_USER_NAME, + f.APPOINT_SIX_STATUS, + f.APPOINT_SIX_OPINION, + f.APPOINT_SEVEN_CORP_ID, + f.APPOINT_SEVEN_CORP_NAME, + f.APPOINT_SEVEN_CORP_TYPE, + f.APPOINT_SEVEN_DEPARTMENT_ID, + f.APPOINT_SEVEN_DEPARTMENT_NAME, + f.APPOINT_SEVEN_USER_ID, + f.APPOINT_SEVEN_USER_NAME, + f.APPOINT_SEVEN_STATUS, + f.APPOINT_SEVEN_OPINION + + + + FLOWS_ID, + FOREIGN_KEY_ID, + FOREIGN_KEY_NAME, + FLOWS_STEP, + FLOWS_TYPE, + IS_DELETE, + APPOINT_ZERO_CORP_ID, + APPOINT_ZERO_CORP_TYPE, + APPOINT_ZERO_CORP_NAME, + APPOINT_ZERO_DEPARTMENT_ID, + APPOINT_ZERO_DEPARTMENT_NAME, + APPOINT_ZERO_USER_ID, + APPOINT_ZERO_USER_NAME, + APPOINT_ZERO_STATUS, + APPOINT_ZERO_OPINION, + APPOINT_ZERO_TIME, + APPOINT_ONE_CORP_ID, + APPOINT_ONE_CORP_NAME, + APPOINT_ONE_CORP_TYPE, + APPOINT_ONE_DEPARTMENT_ID, + APPOINT_ONE_DEPARTMENT_NAME, + APPOINT_ONE_USER_ID, + APPOINT_ONE_USER_NAME, + APPOINT_ONE_STATUS, + APPOINT_ONE_OPINION, + APPOINT_ONE_TIME, + APPOINT_TWO_CORP_ID, + APPOINT_TWO_CORP_NAME, + APPOINT_TWO_CORP_TYPE, + APPOINT_TWO_DEPARTMENT_ID, + APPOINT_TWO_DEPARTMENT_NAME, + APPOINT_TWO_USER_ID, + APPOINT_TWO_USER_NAME, + APPOINT_TWO_STATUS, + APPOINT_TWO_OPINION, + APPOINT_TWO_TIME, + APPOINT_THREE_CORP_ID, + APPOINT_THREE_CORP_NAME, + APPOINT_THREE_CORP_TYPE, + APPOINT_THREE_DEPARTMENT_ID, + APPOINT_THREE_DEPARTMENT_NAME, + APPOINT_THREE_USER_ID, + APPOINT_THREE_USER_NAME, + APPOINT_THREE_STATUS, + APPOINT_THREE_OPINION, + APPOINT_THREE_TIME, + APPOINT_FOUR_CORP_ID, + APPOINT_FOUR_CORP_NAME, + APPOINT_FOUR_CORP_TYPE, + APPOINT_FOUR_DEPARTMENT_ID, + APPOINT_FOUR_DEPARTMENT_NAME, + APPOINT_FOUR_USER_ID, + APPOINT_FOUR_USER_NAME, + APPOINT_FOUR_STATUS, + APPOINT_FOUR_OPINION, + APPOINT_FIVE_CORP_ID, + APPOINT_FIVE_CORP_NAME, + APPOINT_FIVE_CORP_TYPE, + APPOINT_FIVE_DEPARTMENT_ID, + APPOINT_FIVE_DEPARTMENT_NAME, + APPOINT_FIVE_USER_ID, + APPOINT_FIVE_USER_NAME, + APPOINT_FIVE_STATUS, + APPOINT_FIVE_OPINION, + APPOINT_SIX_CORP_ID, + APPOINT_SIX_CORP_NAME, + APPOINT_SIX_CORP_TYPE, + APPOINT_SIX_DEPARTMENT_ID, + APPOINT_SIX_DEPARTMENT_NAME, + APPOINT_SIX_USER_ID, + APPOINT_SIX_USER_NAME, + APPOINT_SIX_STATUS, + APPOINT_SIX_OPINION, + APPOINT_SEVEN_CORP_ID, + APPOINT_SEVEN_CORP_NAME, + APPOINT_SEVEN_CORP_TYPE, + APPOINT_SEVEN_DEPARTMENT_ID, + APPOINT_SEVEN_DEPARTMENT_NAME, + APPOINT_SEVEN_USER_ID, + APPOINT_SEVEN_USER_NAME, + APPOINT_SEVEN_STATUS, + APPOINT_SEVEN_OPINION + + + + #{FLOWS_ID}, + #{FOREIGN_KEY_ID}, + #{FOREIGN_KEY_NAME}, + #{FLOWS_STEP}, + #{FLOWS_TYPE}, + #{IS_DELETE}, + #{APPOINT_ZERO_CORP_ID}, + #{APPOINT_ZERO_CORP_TYPE}, + #{APPOINT_ZERO_CORP_NAME}, + #{APPOINT_ZERO_DEPARTMENT_ID}, + #{APPOINT_ZERO_DEPARTMENT_NAME}, + #{APPOINT_ZERO_USER_ID}, + #{APPOINT_ZERO_USER_NAME}, + #{APPOINT_ZERO_STATUS}, + #{APPOINT_ZERO_OPINION}, + #{APPOINT_ZERO_TIME}, + #{APPOINT_ONE_CORP_ID}, + #{APPOINT_ONE_CORP_NAME}, + #{APPOINT_ONE_CORP_TYPE}, + #{APPOINT_ONE_DEPARTMENT_ID}, + #{APPOINT_ONE_DEPARTMENT_NAME}, + #{APPOINT_ONE_USER_ID}, + #{APPOINT_ONE_USER_NAME}, + #{APPOINT_ONE_STATUS}, + #{APPOINT_ONE_OPINION}, + #{APPOINT_ONE_TIME}, + #{APPOINT_TWO_CORP_ID}, + #{APPOINT_TWO_CORP_NAME}, + #{APPOINT_TWO_CORP_TYPE}, + #{APPOINT_TWO_DEPARTMENT_ID}, + #{APPOINT_TWO_DEPARTMENT_NAME}, + #{APPOINT_TWO_USER_ID}, + #{APPOINT_TWO_USER_NAME}, + #{APPOINT_TWO_STATUS}, + #{APPOINT_TWO_OPINION}, + #{APPOINT_TWO_TIME}, + #{APPOINT_THREE_CORP_ID}, + #{APPOINT_THREE_CORP_NAME}, + #{APPOINT_THREE_CORP_TYPE}, + #{APPOINT_THREE_DEPARTMENT_ID}, + #{APPOINT_THREE_DEPARTMENT_NAME}, + #{APPOINT_THREE_USER_ID}, + #{APPOINT_THREE_USER_NAME}, + #{APPOINT_THREE_STATUS}, + #{APPOINT_THREE_OPINION}, + #{APPOINT_THREE_TIME}, + #{APPOINT_FOUR_CORP_ID}, + #{APPOINT_FOUR_CORP_NAME}, + #{APPOINT_FOUR_CORP_TYPE}, + #{APPOINT_FOUR_DEPARTMENT_ID}, + #{APPOINT_FOUR_DEPARTMENT_NAME}, + #{APPOINT_FOUR_USER_ID}, + #{APPOINT_FOUR_USER_NAME}, + #{APPOINT_FOUR_STATUS}, + #{APPOINT_FOUR_OPINION}, + #{APPOINT_FIVE_CORP_ID}, + #{APPOINT_FIVE_CORP_NAME}, + #{APPOINT_FIVE_CORP_TYPE}, + #{APPOINT_FIVE_DEPARTMENT_ID}, + #{APPOINT_FIVE_DEPARTMENT_NAME}, + #{APPOINT_FIVE_USER_ID}, + #{APPOINT_FIVE_USER_NAME}, + #{APPOINT_FIVE_STATUS}, + #{APPOINT_FIVE_OPINION}, + #{APPOINT_SIX_CORP_ID}, + #{APPOINT_SIX_CORP_NAME}, + #{APPOINT_SIX_CORP_TYPE}, + #{APPOINT_SIX_DEPARTMENT_ID}, + #{APPOINT_SIX_DEPARTMENT_NAME}, + #{APPOINT_SIX_USER_ID}, + #{APPOINT_SIX_USER_NAME}, + #{APPOINT_SIX_STATUS}, + #{APPOINT_SIX_OPINION}, + #{APPOINT_SEVEN_CORP_ID}, + #{APPOINT_SEVEN_CORP_NAME}, + #{APPOINT_SEVEN_CORP_TYPE}, + #{APPOINT_SEVEN_DEPARTMENT_ID}, + #{APPOINT_SEVEN_DEPARTMENT_NAME}, + #{APPOINT_SEVEN_USER_ID}, + #{APPOINT_SEVEN_USER_NAME}, + #{APPOINT_SEVEN_STATUS}, + #{APPOINT_SEVEN_OPINION} + + + + + insert into xgf_flows () values () + + + + + delete from xgf_flows where FLOWS_ID = #{FLOWS_ID} + + + + + update xgf_flows set + FLOWS_ID = #{FLOWS_ID}, + FOREIGN_KEY_ID = #{FOREIGN_KEY_ID}, + FOREIGN_KEY_NAME = #{FOREIGN_KEY_NAME}, + FLOWS_STEP = #{FLOWS_STEP}, + FLOWS_TYPE = #{FLOWS_TYPE}, + IS_DELETE = #{IS_DELETE}, + APPOINT_ZERO_CORP_ID = #{APPOINT_ZERO_CORP_ID}, + APPOINT_ZERO_CORP_TYPE = #{APPOINT_ZERO_CORP_TYPE}, + APPOINT_ZERO_CORP_NAME = #{APPOINT_ZERO_CORP_NAME}, + APPOINT_ZERO_DEPARTMENT_ID = #{APPOINT_ZERO_DEPARTMENT_ID}, + APPOINT_ZERO_DEPARTMENT_NAME = #{APPOINT_ZERO_DEPARTMENT_NAME}, + APPOINT_ZERO_USER_ID = #{APPOINT_ZERO_USER_ID}, + APPOINT_ZERO_USER_NAME = #{APPOINT_ZERO_USER_NAME}, + APPOINT_ZERO_STATUS = #{APPOINT_ZERO_STATUS}, + APPOINT_ZERO_OPINION = #{APPOINT_ZERO_OPINION}, + APPOINT_ZERO_TIME = #{APPOINT_ZERO_TIME}, + APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID}, + APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME}, + APPOINT_ONE_CORP_TYPE = #{APPOINT_ONE_CORP_TYPE}, + APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID}, + APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME}, + APPOINT_ONE_USER_ID = #{APPOINT_ONE_USER_ID}, + APPOINT_ONE_USER_NAME = #{APPOINT_ONE_USER_NAME}, + APPOINT_ONE_STATUS = #{APPOINT_ONE_STATUS}, + APPOINT_ONE_OPINION = #{APPOINT_ONE_OPINION}, + APPOINT_ONE_TIME = #{APPOINT_ONE_TIME}, + APPOINT_TWO_CORP_ID = #{APPOINT_TWO_CORP_ID}, + APPOINT_TWO_CORP_NAME = #{APPOINT_TWO_CORP_NAME}, + APPOINT_TWO_CORP_TYPE = #{APPOINT_TWO_CORP_TYPE}, + APPOINT_TWO_DEPARTMENT_ID = #{APPOINT_TWO_DEPARTMENT_ID}, + APPOINT_TWO_DEPARTMENT_NAME = #{APPOINT_TWO_DEPARTMENT_NAME}, + APPOINT_TWO_USER_ID = #{APPOINT_TWO_USER_ID}, + APPOINT_TWO_USER_NAME = #{APPOINT_TWO_USER_NAME}, + APPOINT_TWO_STATUS = #{APPOINT_TWO_STATUS}, + APPOINT_TWO_OPINION = #{APPOINT_TWO_OPINION}, + APPOINT_TWO_TIME = #{APPOINT_TWO_TIME}, + APPOINT_THREE_CORP_ID = #{APPOINT_THREE_CORP_ID}, + APPOINT_THREE_CORP_NAME = #{APPOINT_THREE_CORP_NAME}, + APPOINT_THREE_CORP_TYPE = #{APPOINT_THREE_CORP_TYPE}, + APPOINT_THREE_DEPARTMENT_ID = #{APPOINT_THREE_DEPARTMENT_ID}, + APPOINT_THREE_DEPARTMENT_NAME = #{APPOINT_THREE_DEPARTMENT_NAME}, + APPOINT_THREE_USER_ID = #{APPOINT_THREE_USER_ID}, + APPOINT_THREE_USER_NAME = #{APPOINT_THREE_USER_NAME}, + APPOINT_THREE_STATUS = #{APPOINT_THREE_STATUS}, + APPOINT_THREE_OPINION = #{APPOINT_THREE_OPINION}, + APPOINT_THREE_TIME = #{APPOINT_THREE_TIME}, + APPOINT_FOUR_CORP_ID = #{APPOINT_FOUR_CORP_ID}, + APPOINT_FOUR_CORP_NAME = #{APPOINT_FOUR_CORP_NAME}, + APPOINT_FOUR_CORP_TYPE = #{APPOINT_FOUR_CORP_TYPE}, + APPOINT_FOUR_DEPARTMENT_ID = #{APPOINT_FOUR_DEPARTMENT_ID}, + APPOINT_FOUR_DEPARTMENT_NAME = #{APPOINT_FOUR_DEPARTMENT_NAME}, + APPOINT_FOUR_USER_ID = #{APPOINT_FOUR_USER_ID}, + APPOINT_FOUR_USER_NAME = #{APPOINT_FOUR_USER_NAME}, + APPOINT_FOUR_STATUS = #{APPOINT_FOUR_STATUS}, + APPOINT_FOUR_OPINION = #{APPOINT_FOUR_OPINION}, + APPOINT_FIVE_CORP_ID = #{APPOINT_FIVE_CORP_ID}, + APPOINT_FIVE_CORP_NAME = #{APPOINT_FIVE_CORP_NAME}, + APPOINT_FIVE_CORP_TYPE = #{APPOINT_FIVE_CORP_TYPE}, + APPOINT_FIVE_DEPARTMENT_ID = #{APPOINT_FIVE_DEPARTMENT_ID}, + APPOINT_FIVE_DEPARTMENT_NAME = #{APPOINT_FIVE_DEPARTMENT_NAME}, + APPOINT_FIVE_USER_ID = #{APPOINT_FIVE_USER_ID}, + APPOINT_FIVE_USER_NAME = #{APPOINT_FIVE_USER_NAME}, + APPOINT_FIVE_STATUS = #{APPOINT_FIVE_STATUS}, + APPOINT_FIVE_OPINION = #{APPOINT_FIVE_OPINION}, + APPOINT_SIX_CORP_ID = #{APPOINT_SIX_CORP_ID}, + APPOINT_SIX_CORP_NAME = #{APPOINT_SIX_CORP_NAME}, + APPOINT_SIX_CORP_TYPE = #{APPOINT_SIX_CORP_TYPE}, + APPOINT_SIX_DEPARTMENT_ID = #{APPOINT_SIX_DEPARTMENT_ID}, + APPOINT_SIX_DEPARTMENT_NAME = #{APPOINT_SIX_DEPARTMENT_NAME}, + APPOINT_SIX_USER_ID = #{APPOINT_SIX_USER_ID}, + APPOINT_SIX_USER_NAME = #{APPOINT_SIX_USER_NAME}, + APPOINT_SIX_STATUS = #{APPOINT_SIX_STATUS}, + APPOINT_SIX_OPINION = #{APPOINT_SIX_OPINION}, + APPOINT_SEVEN_CORP_ID = #{APPOINT_SEVEN_CORP_ID}, + APPOINT_SEVEN_CORP_NAME = #{APPOINT_SEVEN_CORP_NAME}, + APPOINT_SEVEN_CORP_TYPE = #{APPOINT_SEVEN_CORP_TYPE}, + APPOINT_SEVEN_DEPARTMENT_ID = #{APPOINT_SEVEN_DEPARTMENT_ID}, + APPOINT_SEVEN_DEPARTMENT_NAME = #{APPOINT_SEVEN_DEPARTMENT_NAME}, + APPOINT_SEVEN_USER_ID = #{APPOINT_SEVEN_USER_ID}, + APPOINT_SEVEN_USER_NAME = #{APPOINT_SEVEN_USER_NAME}, + APPOINT_SEVEN_STATUS = #{APPOINT_SEVEN_STATUS}, + APPOINT_SEVEN_OPINION = #{APPOINT_SEVEN_OPINION} + where FLOWS_ID = #{FLOWS_ID} + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml index 0c1343c9..ed640710 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml @@ -63,7 +63,10 @@ f.IS_BF, f.IS_SOCIAL, f.SOCIAL_NUMBER, - f.zzName + f.zzName, + f.ANNEX, + f.ATTORNEY, + f.COMMITMENT_LETTER @@ -122,7 +125,10 @@ IS_BF, IS_SOCIAL, SOCIAL_NUMBER, - zzName + zzName, + ANNEX, + ATTORNEY, + COMMITMENT_LETTER @@ -181,7 +187,10 @@ #{IS_BF}, #{IS_SOCIAL}, #{SOCIAL_NUMBER}, - #{zzName} + #{zzName}, + #{ANNEX}, + #{ATTORNEY}, + #{COMMITMENT_LETTER} @@ -264,7 +273,10 @@ IS_BF = #{IS_BF}, IS_SOCIAL = #{IS_SOCIAL}, SOCIAL_NUMBER = #{SOCIAL_NUMBER}, - zzName = #{zzName} + zzName = #{zzName}, + ANNEX = #{ANNEX}, + ATTORNEY = #{ATTORNEY}, + COMMITMENT_LETTER = #{COMMITMENT_LETTER} where XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} @@ -277,7 +289,7 @@ f where - f.XFG_USER_DETAILS_ID = #{XFG_USER_DETAILS_ID} + f.XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml index ddbff968..2de37005 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -21,7 +21,9 @@ f.STATUS, f.OPERATOR_TIME, f.ISFLOW, - f.STUDY_STATUS + f.STUDY_STATUS, + f.CHECK_STATUS, + f.CHECK_STEP @@ -38,7 +40,9 @@ STATUS, OPERATOR_TIME, ISFLOW, - STUDY_STATUS + STUDY_STATUS, + CHECK_STATUS, + CHECK_STEP @@ -55,7 +59,9 @@ #{STATUS}, #{OPERATOR_TIME}, #{ISFLOW}, - #{STUDY_STATUS} + #{STUDY_STATUS}, + #{CHECK_STATUS}, + #{CHECK_STEP} @@ -95,7 +101,9 @@ STATUS = #{STATUS}, OPERATOR_TIME = #{OPERATOR_TIME}, ISFLOW = #{ISFLOW}, - STUDY_STATUS = #{STUDY_STATUS} + STUDY_STATUS = #{STUDY_STATUS}, + CHECK_STATUS = #{CHECK_STATUS}, + CHECK_STEP = #{CHECK_STEP} where XGF_USER_ID = #{XGF_USER_ID} @@ -229,6 +237,9 @@ and a.VALID_FLAG = #{pd.VALID_FLAG} + + and a.CHECK_STATUS = #{pd.CHECK_STATUS} + + diff --git a/src/main/resources/mybatis/dsno2/bus/ClassInfoMapper.xml b/src/main/resources/mybatis/dsno2/bus/ClassInfoMapper.xml new file mode 100644 index 00000000..8a25c2a4 --- /dev/null +++ b/src/main/resources/mybatis/dsno2/bus/ClassInfoMapper.xml @@ -0,0 +1,143 @@ + + + + + + + BUS_CLASS_INFO + + + + + SYS_DICTIONARIES + + + + + f.CREATE_TIME, + f.CREATOR, + f.OPERATE_TIME, + f.OPERATOR, + f.ISDELETE, + f.CORPINFO_ID, + f.USER_ID, + f.STATUS, + f.CLASS_MESSAGE_ID, + f.CLASS_INFO_ID, + f.USERNAME, + f.NAME, + f.SEX, + f.CARD_ID, + f.RELEVANT_UNIT_NAME, + f.DEPARTMENT_NAME, + f.PHOTO, + f.PHONE, + f.PERSON_WORK_TYPE, + f.CERTIFICATE, + f.CLASS_NO, + f.TRAINUSERS_ID + + + + + CREATE_TIME, + CREATOR, + OPERATE_TIME, + OPERATOR, + ISDELETE, + CORPINFO_ID, + USER_ID, + STATUS, + CLASS_MESSAGE_ID, + CLASS_INFO_ID, + USERNAME, + NAME, + SEX, + CARD_ID, + RELEVANT_UNIT_NAME, + DEPARTMENT_NAME, + PHOTO, + PHONE, + PERSON_WORK_TYPE, + CERTIFICATE, + CLASS_NO, + TRAINUSERS_ID + + + + + #{CREATE_TIME}, + #{CREATOR}, + #{OPERATE_TIME}, + #{OPERATOR}, + #{ISDELETE}, + #{CORPINFO_ID}, + #{USER_ID}, + #{STATUS}, + #{CLASS_MESSAGE_ID}, + #{CLASS_INFO_ID}, + #{USERNAME}, + #{NAME}, + #{SEX}, + #{CARD_ID}, + #{RELEVANT_UNIT_NAME}, + #{DEPARTMENT_NAME}, + #{PHOTO}, + #{PHONE}, + #{PERSON_WORK_TYPE}, + #{CERTIFICATE}, + #{CLASS_NO}, + #{TRAINUSERS_ID} + + + + + + + + + + + diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 963cb222..b282d600 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -301,7 +301,8 @@ (SELECT count( 1 ) FROM `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-gwj-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE kjc.OUTSOURCED_ID =f.OUTSOURCED_ID AND k.ISDELETE = '0' ) as KEY_COUNT, vua.NAME OUTSOURCED_CREATOR_NAME, ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME, - p.`NAME` as UNITS_PIC_NAME + p.`NAME` as UNITS_PIC_NAME, + ifnull(h.HIDDEN_COUNT,0) HIDDEN_COUNT from f left join bus_units b using (UNITS_ID) @@ -313,6 +314,9 @@ LEFT JOIN `qa-gwj-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID left join `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC LEFT JOIN ( select count(c.KEYPROJECTCHECK_ID) co, c.OUTSOURCED_ID from `qa-gwj-prevention`.BUS_KEYPROJECTCHECK c where c.ISDELETE = '0' group by c.OUTSOURCED_ID ) cc on cc.OUTSOURCED_ID = f.OUTSOURCED_ID + left join ( SELECT t.OUTSOURCED_ID, COUNT( t.HIDDEN_ID ) HIDDEN_COUNT + FROM + ( SELECT IFNULL( k.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID, h.* FROM `qa-gwj-prevention`.bus_keyproject_hidden h LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON h.FOREIGN_ID = k.KEYPROJECTCHECK_ID ) t GROUP BY t.OUTSOURCED_ID ) h on h.OUTSOURCED_ID = f.OUTSOURCED_ID where f.ISDELETE = '0' and diff --git a/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml b/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml index 3a2e2c88..a2b3204c 100644 --- a/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml +++ b/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml @@ -510,5 +510,24 @@ where f.CODE = #{CODE} and ABS(TIMESTAMPDIFF(SECOND, f.OPERATTIME, #{OPERATTIME})) < 10; - + diff --git a/src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_PUBLICMETER.sql b/src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_PUBLICMETER.sql deleted file mode 100644 index d435c996..00000000 --- a/src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_PUBLICMETER.sql +++ /dev/null @@ -1,23 +0,0 @@ - -SET FOREIGN_KEY_CHECKS=0; - --- ---------------------------- --- Table structure for `BUS_PUBLICMETER` --- ---------------------------- -DROP TABLE IF EXISTS `BUS_PUBLICMETER`; -CREATE TABLE `BUS_PUBLICMETER` ( - `PUBLICMETER_ID` varchar(100) NOT NULL, - `PRECINCT_ID` varchar(255) DEFAULT NULL COMMENT '管理区', - `NAME` varchar(255) DEFAULT NULL COMMENT '巡更点名称', - `CODE` varchar(255) DEFAULT NULL COMMENT '编号', - `DESCR` varchar(255) DEFAULT NULL COMMENT '备注', - `ISDELETE` int(1) NOT NULL COMMENT '是否删除', - `CREATOR` varchar(255) DEFAULT NULL COMMENT '创建人', - `CREATTIME` varchar(32) DEFAULT NULL COMMENT '创建时间', - `OPERATOR` varchar(255) DEFAULT NULL COMMENT '操作人', - `OPERATTIME` varchar(32) DEFAULT NULL COMMENT '操作时间', - `TYPE` int(1) NOT NULL COMMENT '仪表类型', - `METERINDEX` varchar(255) DEFAULT NULL COMMENT '仪表指数', - `CYCLE` int(1) NOT NULL COMMENT '抄表周期', - PRIMARY KEY (`PUBLICMETER_ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_SMSMANAGEMENT.sql b/src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_SMSMANAGEMENT.sql deleted file mode 100644 index dcab4c42..00000000 --- a/src/main/webapp/admin/createcode/code/mysql数据库脚本/BUS_SMSMANAGEMENT.sql +++ /dev/null @@ -1,22 +0,0 @@ - -SET FOREIGN_KEY_CHECKS=0; - --- ---------------------------- --- Table structure for `BUS_SMSMANAGEMENT` --- ---------------------------- -DROP TABLE IF EXISTS `BUS_SMSMANAGEMENT`; -CREATE TABLE `BUS_SMSMANAGEMENT` ( - `SMSMANAGEMENT_ID` varchar(100) NOT NULL, - `SMSNAME` varchar(255) DEFAULT NULL COMMENT '名称', - `SMSCODE` varchar(255) DEFAULT NULL COMMENT '编码', - `SMSTYPE` varchar(255) DEFAULT NULL COMMENT '类型', - `ADDRESSEE` varchar(255) DEFAULT NULL COMMENT '收信人', - `ISENABLE` varchar(255) DEFAULT NULL COMMENT '是否启用', - `CORPINFO_ID` varchar(255) DEFAULT NULL COMMENT '企业ID', - `OPDATE` varchar(32) DEFAULT NULL COMMENT '操作日期', - `OPUSER` varchar(255) DEFAULT NULL COMMENT '操作人', - `ISDELETE` varchar(255) DEFAULT NULL COMMENT '是否删除', - `OPERATOR` varchar(255) DEFAULT NULL COMMENT '修改人', - `OPERATTIME` varchar(32) DEFAULT NULL COMMENT '修改日期', - PRIMARY KEY (`SMSMANAGEMENT_ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_PUBLICMETER.sql b/src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_PUBLICMETER.sql deleted file mode 100644 index 8b034ff8..00000000 --- a/src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_PUBLICMETER.sql +++ /dev/null @@ -1,53 +0,0 @@ --- ---------------------------- --- Table structure for "C##FHBOOT"."BUS_PUBLICMETER" --- ---------------------------- --- DROP TABLE "C##FHBOOT"."BUS_PUBLICMETER"; -CREATE TABLE "C##FHBOOT"."BUS_PUBLICMETER" ( - "PRECINCT_ID" VARCHAR2(255 BYTE) NULL , - "NAME" VARCHAR2(255 BYTE) NULL , - "CODE" VARCHAR2(255 BYTE) NULL , - "DESCR" VARCHAR2(255 BYTE) NULL , - "ISDELETE" NUMBER(1) NULL , - "CREATOR" VARCHAR2(255 BYTE) NULL , - "CREATTIME" VARCHAR2(32 BYTE) NULL , - "OPERATOR" VARCHAR2(255 BYTE) NULL , - "OPERATTIME" VARCHAR2(32 BYTE) NULL , - "TYPE" NUMBER(1) NULL , - "METERINDEX" VARCHAR2(255 BYTE) NULL , - "CYCLE" NUMBER(1) NULL , - "PUBLICMETER_ID" VARCHAR2(100 BYTE) NOT NULL -) -LOGGING -NOCOMPRESS -NOCACHE -; - -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."PRECINCT_ID" IS '管理区'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."NAME" IS '巡更点名称'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."CODE" IS '编号'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."DESCR" IS '备注'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."ISDELETE" IS '是否删除'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."CREATOR" IS '创建人'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."CREATTIME" IS '创建时间'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."OPERATOR" IS '操作人'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."OPERATTIME" IS '操作时间'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."TYPE" IS '仪表类型'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."METERINDEX" IS '仪表指数'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."CYCLE" IS '抄表周期'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_PUBLICMETER"."PUBLICMETER_ID" IS 'ID'; - --- ---------------------------- --- Indexes structure for table BUS_PUBLICMETER --- ---------------------------- - --- ---------------------------- --- Checks structure for table "C##FHBOOT"."BUS_PUBLICMETER" - --- ---------------------------- - -ALTER TABLE "C##FHBOOT"."BUS_PUBLICMETER" ADD CHECK ("PUBLICMETER_ID" IS NOT NULL); - --- ---------------------------- --- Primary Key structure for table "C##FHBOOT"."BUS_PUBLICMETER" --- ---------------------------- -ALTER TABLE "C##FHBOOT"."BUS_PUBLICMETER" ADD PRIMARY KEY ("PUBLICMETER_ID"); diff --git a/src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_SMSMANAGEMENT.sql b/src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_SMSMANAGEMENT.sql deleted file mode 100644 index 58d451db..00000000 --- a/src/main/webapp/admin/createcode/code/oracle数据库脚本/BUS_SMSMANAGEMENT.sql +++ /dev/null @@ -1,51 +0,0 @@ --- ---------------------------- --- Table structure for "C##FHBOOT"."BUS_SMSMANAGEMENT" --- ---------------------------- --- DROP TABLE "C##FHBOOT"."BUS_SMSMANAGEMENT"; -CREATE TABLE "C##FHBOOT"."BUS_SMSMANAGEMENT" ( - "SMSNAME" VARCHAR2(255 BYTE) NULL , - "SMSCODE" VARCHAR2(255 BYTE) NULL , - "SMSTYPE" VARCHAR2(255 BYTE) NULL , - "ADDRESSEE" VARCHAR2(255 BYTE) NULL , - "ISENABLE" VARCHAR2(255 BYTE) NULL , - "CORPINFO_ID" VARCHAR2(255 BYTE) NULL , - "OPDATE" VARCHAR2(32 BYTE) NULL , - "OPUSER" VARCHAR2(255 BYTE) NULL , - "ISDELETE" VARCHAR2(255 BYTE) NULL , - "OPERATOR" VARCHAR2(255 BYTE) NULL , - "OPERATTIME" VARCHAR2(32 BYTE) NULL , - "SMSMANAGEMENT_ID" VARCHAR2(100 BYTE) NOT NULL -) -LOGGING -NOCOMPRESS -NOCACHE -; - -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."SMSNAME" IS '名称'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."SMSCODE" IS '编码'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."SMSTYPE" IS '类型'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."ADDRESSEE" IS '收信人'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."ISENABLE" IS '是否启用'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."CORPINFO_ID" IS '企业ID'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."OPDATE" IS '操作日期'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."OPUSER" IS '操作人'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."ISDELETE" IS '是否删除'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."OPERATOR" IS '修改人'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."OPERATTIME" IS '修改日期'; -COMMENT ON COLUMN "C##FHBOOT"."BUS_SMSMANAGEMENT"."SMSMANAGEMENT_ID" IS 'ID'; - --- ---------------------------- --- Indexes structure for table BUS_SMSMANAGEMENT --- ---------------------------- - --- ---------------------------- --- Checks structure for table "C##FHBOOT"."BUS_SMSMANAGEMENT" - --- ---------------------------- - -ALTER TABLE "C##FHBOOT"."BUS_SMSMANAGEMENT" ADD CHECK ("SMSMANAGEMENT_ID" IS NOT NULL); - --- ---------------------------- --- Primary Key structure for table "C##FHBOOT"."BUS_SMSMANAGEMENT" --- ---------------------------- -ALTER TABLE "C##FHBOOT"."BUS_SMSMANAGEMENT" ADD PRIMARY KEY ("SMSMANAGEMENT_ID"); diff --git a/src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_PUBLICMETER.sql b/src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_PUBLICMETER.sql deleted file mode 100644 index b65fd1f9..00000000 --- a/src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_PUBLICMETER.sql +++ /dev/null @@ -1,25 +0,0 @@ -GO -/****** FHQQ313596790 ******/ -SET ANSI_NULLS ON -GO -SET QUOTED_IDENTIFIER ON -GO -CREATE TABLE BUS_PUBLICMETER ( - PUBLICMETER_ID nvarchar(100) NOT NULL, - PRECINCT_ID nvarchar(255) DEFAULT NULL, - NAME nvarchar(255) DEFAULT NULL, - CODE nvarchar(255) DEFAULT NULL, - DESCR nvarchar(255) DEFAULT NULL, - ISDELETE int NOT NULL, - CREATOR nvarchar(255) DEFAULT NULL, - CREATTIME nvarchar(32) DEFAULT NULL, - OPERATOR nvarchar(255) DEFAULT NULL, - OPERATTIME nvarchar(32) DEFAULT NULL, - TYPE int NOT NULL, - METERINDEX nvarchar(255) DEFAULT NULL, - CYCLE int NOT NULL, -PRIMARY KEY CLUSTERED -( - [PUBLICMETER_ID] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] diff --git a/src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_SMSMANAGEMENT.sql b/src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_SMSMANAGEMENT.sql deleted file mode 100644 index a8c7acd3..00000000 --- a/src/main/webapp/admin/createcode/code/sqlserver数据库脚本/BUS_SMSMANAGEMENT.sql +++ /dev/null @@ -1,24 +0,0 @@ -GO -/****** FHQQ313596790 ******/ -SET ANSI_NULLS ON -GO -SET QUOTED_IDENTIFIER ON -GO -CREATE TABLE BUS_SMSMANAGEMENT ( - SMSMANAGEMENT_ID nvarchar(100) NOT NULL, - SMSNAME nvarchar(255) DEFAULT NULL, - SMSCODE nvarchar(255) DEFAULT NULL, - SMSTYPE nvarchar(255) DEFAULT NULL, - ADDRESSEE nvarchar(255) DEFAULT NULL, - ISENABLE nvarchar(255) DEFAULT NULL, - CORPINFO_ID nvarchar(255) DEFAULT NULL, - OPDATE nvarchar(32) DEFAULT NULL, - OPUSER nvarchar(255) DEFAULT NULL, - ISDELETE nvarchar(255) DEFAULT NULL, - OPERATOR nvarchar(255) DEFAULT NULL, - OPERATTIME nvarchar(32) DEFAULT NULL, -PRIMARY KEY CLUSTERED -( - [SMSMANAGEMENT_ID] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] diff --git a/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls b/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls index 707f36eb..8b884d31 100644 Binary files a/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls and b/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls differ diff --git a/更新.md b/更新.md new file mode 100644 index 00000000..f6c918f8 --- /dev/null +++ b/更新.md @@ -0,0 +1 @@ +升级内容： 企业端PC： 1、新增-三人以上风险分布图菜单-分公司进行上传维护 2、新增-人员聚集分布图菜单-分公司进行上传维护 3、新增-人员培训申请-分公司进行申请培训 4、新增-相关方人员撤场申请审批-分公司审批相关方人员撤回申请 监管端PC： 1、新增-三人以上风险分布图菜单，查看分公司数据 2、新增-人员聚集分布图菜单，查看分公司数据 3、优化-重点工程菜单-搜索条件可以手动输入,主管部门和监管部门可以选择全部企业 4、优化-入场告知培训管理-优化审核流程 相关方PC： 1、新增-人员推送申请-相关方对分公司推送人员 2、新增-人员撤回申请-相关方对分公司申请撤回人员 企业端APP： 1、优化-动火作业-监火改为选择部门 2、新增-查看重点工程监控视频 3、新增-重点工程创建人审核开工申请和结束申请 监管端APP： 1、新增-查看重点工程监控视频 2、新增-重点工程创建人审核开工申请和结束申请 一公司app： 1、新增-原来动火作业改为国标新动火作业审批流程 \ No newline at end of file