From daa248f63566a4f2ef762342edfde03f9cd88b3a Mon Sep 17 00:00:00 2001 From: ganhao Date: Mon, 13 Apr 2026 11:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=96=E9=83=A8=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E9=83=A8=E9=97=A8=E7=9A=84=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutEnforcementRegistrationController.java | 849 +++++++++--------- .../OutEnterpriseComplaintController.java | 3 - ...OutEnterpriseLawEnforcementController.java | 20 - 3 files changed, 425 insertions(+), 447 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnforcementRegistrationController.java index 7953b22b..6e7020ca 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnforcementRegistrationController.java @@ -30,7 +30,7 @@ import java.util.*; /** - * 执法端-执法登记Controller + * 执法端-历史执法信息 * * @author chenrui * @date 2024-02-23 @@ -74,162 +74,162 @@ public class OutEnforcementRegistrationController extends BaseController List list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); return getDataTable(list); } -// /** -// * 查询执法端-执法登记列表 -// */ -// @GetMapping("/selectList") -// @ResponseBody -// public ZDResponse selectList(EnforcementRegistration enforcementRegistration) -// { -// List list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); -// DictDataBean dictParams = new DictDataBean(); -// dictParams.setDictType("check_category"); -// List dicts = dictDataApi.getDictData(dictParams); -// for (EnforcementRegistration ee : list) { -// // 判断是否投诉 -// EnterpriseComplaint params = new EnterpriseComplaint(); -// params.setRelId(ee.getId()); -// params.setComOrOpi(1); -// List enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params); -// if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) { -// ee.setComOrOpi(1); -// } else { -// ee.setComOrOpi(0); -// } -// -// // 执法类别 -// for (DictDataBean dict : dicts) { -// if (dict.getDictValue().equals(ee.getCheckCategory())) { -// ee.setCheckCategoryText(dict.getDictLabel()); -// } -// } -// -// // 执法人员1需要展示用户名+执法码 -// UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId()); -// String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum(); -// ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN); -// // 执法人员2需要展示用户名+执法码 -// List lawTwoList = new ArrayList<>(); -// List userBeans = new ArrayList<>(); -// if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) { -// userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo()); -// } -// for (UserBean ub : userBeans) { -// String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); -// lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum); -// } -// ee.setLawEnforcer2List(lawTwoList); -// } -// -// return ZDResponse.success("获取执法登录信息",list); -// } -// -// -// /** -// * 查询执法端-执法登记列表 -// */ -//// @RequiresPermissions("code:registration:list") -// @PostMapping("/queryList") -// @ResponseBody -// public TableDataInfo queryList(@RequestBody EnforcementRegistration enforcementRegistration) -// { -//// startPage(); -// int totalNum = enforcementRegistrationService.countEnforcementRegistrationList(enforcementRegistration); -// List list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); -// DictDataBean dictParams = new DictDataBean(); -// dictParams.setDictType("check_category"); -// List dicts = dictDataApi.getDictData(dictParams); -// for (EnforcementRegistration ee : list) { -// // 判断是否投诉 -// EnterpriseComplaint params = new EnterpriseComplaint(); -// params.setRelId(ee.getId()); -// params.setComOrOpi(1); -// List enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params); -// if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) { -// ee.setComOrOpi(1); -// } else { -// ee.setComOrOpi(0); -// } -// -// // 执法类别 -// for (DictDataBean dict : dicts) { -// if (dict.getDictValue().equals(ee.getCheckCategory())) { -// ee.setCheckCategoryText(dict.getDictLabel()); -// } -// } -// -// // 执法人员1需要展示用户名+执法码 没有执法码展示加密手机号 -// UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId()); -// String lawCN =userBean.getUserName() +" "+userBean.getLawCertificateNum(); -// if(StringUtils.isEmpty(userBean.getLawCertificateNum())){ -// lawCN=userBean.getUserName() +" "+ CommonUtil.encryptPhone(userBean.getPhonenumber()); -// } -// ee.setLawEnforcer(lawCN); -// -// // 执法人员2需要展示用户名+执法码 没有执法码展示加密手机号 -// List lawTwoList = new ArrayList<>(); -// List userBeans = new ArrayList<>(); -// if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) { -// userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo()); -// } -//// String tmpUserShow = ""; -// for (UserBean ub : userBeans) { -// String temp=ub.getUserName() +" "+ub.getLawCertificateNum(); -// if(StringUtils.isEmpty(ub.getLawCertificateNum())){ -// temp=ub.getUserName() +" "+ CommonUtil.encryptPhone(ub.getPhonenumber()); -// } -// lawTwoList.add(temp); -// } -//// if (tmpUserShow.length() > 0) { -//// tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1); -//// } -// ee.setLawEnforcer2List(lawTwoList); -// -// // 判断超时多少天 -// Instant instant = ee.getEnforcementTime().toInstant(); -// ZoneId zoneId = ZoneId.systemDefault(); -// LocalDate startDate = instant.atZone(zoneId).toLocalDate(); -// // 今天距离执法时间所差天数 -// long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now()); -// ee.setOutTimeDayNum(daysBetween); -// } -// -// TableDataInfo rspData = getDataTable(list); -// rspData.setCode(0); -// rspData.setRows(list); -// rspData.setTotal(totalNum); -// return rspData; -// } -// -// -// /** -// * 查询执法端-执法登记列表 -// */ -//// @RequiresPermissions("code:registration:list") -// @GetMapping("/queryListNew") -// @ResponseBody -// public TableDataInfo queryListNew(EnforcementRegistration enforcementRegistration) -// { -// if (Objects.nonNull(enforcementRegistration.getUserId()) && enforcementRegistration.getDateType()==0) { -// UserBean userByUser = userApi.getUserByUserId(enforcementRegistration.getUserId()); -// enforcementRegistration.setDeptId(userByUser == null ? null : userByUser.getDeptId()); -// -// DeptBean bureauDept = deptApi.iterationDeptParentToBureau(userByUser.getDeptId()); -// enforcementRegistration.setBureauDeptId(bureauDept.getDeptId()); -// } -// //查询检查总次数 -// List registrations = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration); -// int count = 0; -// if (registrations.size() >0) { -// count = registrations.stream().map(item -> Integer.valueOf(item.getNum())).reduce(0, Integer::sum); -// } -// //查询列表 + /** + * 查询执法端-执法登记列表 + */ + @GetMapping("/selectList") + @ResponseBody + public ZDResponse selectList(EnforcementRegistration enforcementRegistration) + { + List list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); + DictDataBean dictParams = new DictDataBean(); + dictParams.setDictType("check_category"); + List dicts = dictDataApi.getDictData(dictParams); + for (EnforcementRegistration ee : list) { + // 判断是否投诉 + EnterpriseComplaint params = new EnterpriseComplaint(); + params.setRelId(ee.getId()); + params.setComOrOpi(1); + List enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params); + if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) { + ee.setComOrOpi(1); + } else { + ee.setComOrOpi(0); + } + + // 执法类别 + for (DictDataBean dict : dicts) { + if (dict.getDictValue().equals(ee.getCheckCategory())) { + ee.setCheckCategoryText(dict.getDictLabel()); + } + } + + // 执法人员1需要展示用户名+执法码 + UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId()); + String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum(); + ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN); + // 执法人员2需要展示用户名+执法码 + List lawTwoList = new ArrayList<>(); + List userBeans = new ArrayList<>(); + if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) { + userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo()); + } + for (UserBean ub : userBeans) { + String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); + lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum); + } + ee.setLawEnforcer2List(lawTwoList); + } + + return ZDResponse.success("获取执法登录信息",list); + } + + + /** + * 查询执法端-执法登记列表queryEnterpriseList' + */ +// @RequiresPermissions("code:registration:list") + @PostMapping("/queryList") + @ResponseBody + public TableDataInfo queryList(@RequestBody EnforcementRegistration enforcementRegistration) + { // startPage(); -// List list = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration); -// TableDataInfo dataTable = getDataTable(list); -// dataTable.setMsg(count); -// return dataTable; -// } + int totalNum = enforcementRegistrationService.countEnforcementRegistrationList(enforcementRegistration); + List list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); + DictDataBean dictParams = new DictDataBean(); + dictParams.setDictType("check_category"); + List dicts = dictDataApi.getDictData(dictParams); + for (EnforcementRegistration ee : list) { + // 判断是否投诉 + EnterpriseComplaint params = new EnterpriseComplaint(); + params.setRelId(ee.getId()); + params.setComOrOpi(1); + List enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params); + if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) { + ee.setComOrOpi(1); + } else { + ee.setComOrOpi(0); + } + + // 执法类别 + for (DictDataBean dict : dicts) { + if (dict.getDictValue().equals(ee.getCheckCategory())) { + ee.setCheckCategoryText(dict.getDictLabel()); + } + } + + // 执法人员1需要展示用户名+执法码 没有执法码展示加密手机号 + UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId()); + String lawCN =userBean.getUserName() +" "+userBean.getLawCertificateNum(); + if(StringUtils.isEmpty(userBean.getLawCertificateNum())){ + lawCN=userBean.getUserName() +" "+ CommonUtil.encryptPhone(userBean.getPhonenumber()); + } + ee.setLawEnforcer(lawCN); + + // 执法人员2需要展示用户名+执法码 没有执法码展示加密手机号 + List lawTwoList = new ArrayList<>(); + List userBeans = new ArrayList<>(); + if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) { + userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo()); + } +// String tmpUserShow = ""; + for (UserBean ub : userBeans) { + String temp=ub.getUserName() +" "+ub.getLawCertificateNum(); + if(StringUtils.isEmpty(ub.getLawCertificateNum())){ + temp=ub.getUserName() +" "+ CommonUtil.encryptPhone(ub.getPhonenumber()); + } + lawTwoList.add(temp); + } +// if (tmpUserShow.length() > 0) { +// tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1); +// } + ee.setLawEnforcer2List(lawTwoList); + + // 判断超时多少天 + Instant instant = ee.getEnforcementTime().toInstant(); + ZoneId zoneId = ZoneId.systemDefault(); + LocalDate startDate = instant.atZone(zoneId).toLocalDate(); + // 今天距离执法时间所差天数 + long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now()); + ee.setOutTimeDayNum(daysBetween); + } + + TableDataInfo rspData = getDataTable(list); + rspData.setCode(0); + rspData.setRows(list); + rspData.setTotal(totalNum); + return rspData; + } + + + /** + * 查询执法端-执法登记列表 + */ +// @RequiresPermissions("code:registration:list") + @GetMapping("/queryListNew") + @ResponseBody + public TableDataInfo queryListNew(EnforcementRegistration enforcementRegistration) + { + if (Objects.nonNull(enforcementRegistration.getUserId()) && enforcementRegistration.getDateType()==0) { + UserBean userByUser = userApi.getUserByUserId(enforcementRegistration.getUserId()); + enforcementRegistration.setDeptId(userByUser == null ? null : userByUser.getDeptId()); + + DeptBean bureauDept = deptApi.iterationDeptParentToBureau(userByUser.getDeptId()); + enforcementRegistration.setBureauDeptId(bureauDept.getDeptId()); + } + //查询检查总次数 + List registrations = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration); + int count = 0; + if (registrations.size() >0) { + count = registrations.stream().map(item -> Integer.valueOf(item.getNum())).reduce(0, Integer::sum); + } + //查询列表 + startPage(); + List list = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration); + TableDataInfo dataTable = getDataTable(list); + dataTable.setMsg(count); + return dataTable; + } @GetMapping("/queryByEpId") @ResponseBody @@ -342,211 +342,211 @@ public class OutEnforcementRegistrationController extends BaseController } return ZDResponse.success("查询成功",res); } -// -// /** 剔除执法日期距离今天超过5天的执法数据 */ -// @GetMapping("/queryListWithFiveDay") -// @ResponseBody -// public TableDataInfo queryListWithFiveDay(EnforcementRegistration enforcementRegistration) -// { -// -// startPage(); -// List res = new ArrayList<>(); -// List list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); -// for (EnforcementRegistration ee : list) { -// // 判断是否投诉 -// EnterpriseComplaint params = new EnterpriseComplaint(); -// params.setRelId(ee.getId()); -// params.setComOrOpi(1); -// List enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params); -// if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) { -// ee.setComOrOpi(1); -// } else { -// ee.setComOrOpi(0); -// } -// // 执法人员1需要展示用户名+执法码 -// UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId()); -// String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum(); -// ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN); -// -// // 执法人员2需要展示用户名+执法码 -// List lawTwoList = new ArrayList<>(); -// List userBeans = new ArrayList<>(); -// if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) { -// userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo()); -// } -// for (UserBean ub : userBeans) { -// String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); -// lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum); -// } -// ee.setLawEnforcer2List(lawTwoList); -// // 判断超时多少天 -// Instant instant = ee.getEnforcementTime().toInstant(); -// ZoneId zoneId = ZoneId.systemDefault(); -// LocalDate startDate = instant.atZone(zoneId).toLocalDate(); -// // 今天距离执法时间所差天数 -// long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now()); -// ee.setOutTimeDayNum(daysBetween); -// if (daysBetween <= 4) { -// res.add(ee); -// } -// } -// return getDataTable(res); -// } -// -// /** -// * 新增执法端-执法登记 -// */ -// @GetMapping("/add") -// public String add() -// { -// return prefix + "/add"; -// } -// -// /** -// * 新增保存执法端-执法登记 -// */ -//// @RequiresPermissions("code:registration:add") -// @PostMapping("/add") -// @ResponseBody -// public ZDResponse addSave(@RequestBody EnforcementRegistration enforcementRegistration) -// { -// String district = ""; -// String street = ""; -// if (StringUtils.isNotEmpty(enforcementRegistration.getEnterpriseAddress())) { -// district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)"); -// street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)"); -// } -// enforcementRegistration.setDistrict(district); -// enforcementRegistration.setStreet(street); -// return enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration) > 0 -// ? ZDResponse.success("保存成功") : ZDResponse.error("保存失败"); -// } -// -// /** -// * 根据企业统一信用号, 搜索出该企业前推一小时内的联合执法. -// * 用于用户自行进行关联 -// * @param enterpriseNumber -// * @return -// */ -// @GetMapping("/queryUnionByHour/{enterpriseNumber}/{checkCss}/{enforcementTime}/{unionNo}") -// @ResponseBody -// public ZDResponse queryUnionByHour(@PathVariable String enterpriseNumber, @PathVariable String checkCss, @PathVariable String enforcementTime, @PathVariable String unionNo) -// { -// return ZDResponse.success("操作成功", enforcementRegistrationService.queryUnionByHour(enterpriseNumber, checkCss, enforcementTime, unionNo)); -// } -// -// /** -// * 修改执法端-执法登记 -// */ -// @GetMapping("/edit/{id}") -// public String edit(@PathVariable("id") String id, ModelMap mmap) -// { -// EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id); -// mmap.put("enforcementRegistration", enforcementRegistration); -// return prefix + "/edit"; -// } -// -// /** -// * 修改保存执法端-执法登记 -// */ -//// @RequiresPermissions("code:registration:edit") -// @PostMapping("/edit") -// @ResponseBody -// public ZDResponse editSave(@RequestBody EnforcementRegistration enforcementRegistration) -// { -// int resNum = 0; -// enforcementRegistration.setIsSubmit(1); -// String district = ""; -// String street = ""; -// if (StringUtils.isNotEmpty(enforcementRegistration.getEnterpriseAddress())) { -// district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)"); -// street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)"); -// } -// enforcementRegistration.setDistrict(district); -// enforcementRegistration.setStreet(street); -// if (StringUtils.isNotEmpty(enforcementRegistration.getId())) { -// resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration); -// } else { -// resNum = enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration); -// if (resNum > 0 && StringUtils.isNotEmpty(enforcementRegistration.getLawId())) { -// enforcementRegistration.setId(null); -// } -// } -// if (StringUtils.isNotEmpty(enforcementRegistration.getLawId())) { -// EnterpriseLawEnforcement law = new EnterpriseLawEnforcement(); -// law.setId(enforcementRegistration.getLawId()); -// law.setIsReg(1); -// resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(law); -// } -// return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); -// } -// -// @PostMapping("/edit2") -// @ResponseBody -// public ZDResponse editSave2(@RequestBody EnforcementRegistration enforcementRegistration) -// { -// enforcementRegistration.setIsSubmit(0); -// String district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)"); -// String street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)"); -// enforcementRegistration.setDistrict(district); -// enforcementRegistration.setStreet(street); -// int resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration); -// if (StringUtils.isNotEmpty(enforcementRegistration.getLawId())) { -// EnterpriseLawEnforcement law = new EnterpriseLawEnforcement(); -// law.setId(enforcementRegistration.getLawId()); -// law.setIsReg(1); -// resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(law); -// } -// return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); -// } -// -// -// /** -// * 修改执法端-执法登记 -// */ -// @GetMapping("/detail/{id}") -// public String detail(@PathVariable("id") String id, ModelMap mmap) -// { -// EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id); -// mmap.put("enforcementRegistration", enforcementRegistration); -// return prefix + "/detail"; -// } -// -// /** -// * 修改保存执法端-执法登记提交 -// */ -// @RequiresPermissions("code:registration:submit") -// @PostMapping("/submit") -// @ResponseBody -// public ZDResponse submit(@RequestBody EnforcementRegistration enforcementRegistration) -// { -// return enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration) > 0 ? -// ZDResponse.success("提交成功") : ZDResponse.error("提交失败"); -// } -// -// /** -// * 删除执法端-执法登记 -// */ -// @RequiresPermissions("code:registration:remove") -// @PostMapping( "/remove") -// @ResponseBody -// public ZDResponse remove(String ids) -// { -// return enforcementRegistrationService.deleteEnforcementRegistrationByIds(ids) > 0 ? -// ZDResponse.success("删除成功") : ZDResponse.error("删除失败"); -// } -// -// /** -// * 获取预警信息 -// */ -//// @RequiresPermissions("code:registration:list") -// @GetMapping("/queryEarlyWarning") -// @ResponseBody -// public ZDResponse queryEarlyWarning(EnforcementRegistration enforcementRegistration) -// { -// List list = enforcementRegistrationService.queryEarlyWarning(enforcementRegistration.getSearchValue()); -// return ZDResponse.success("查询成功",list); -// } + + /** 剔除执法日期距离今天超过5天的执法数据 */ + @GetMapping("/queryListWithFiveDay") + @ResponseBody + public TableDataInfo queryListWithFiveDay(EnforcementRegistration enforcementRegistration) + { + + startPage(); + List res = new ArrayList<>(); + List list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); + for (EnforcementRegistration ee : list) { + // 判断是否投诉 + EnterpriseComplaint params = new EnterpriseComplaint(); + params.setRelId(ee.getId()); + params.setComOrOpi(1); + List enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params); + if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) { + ee.setComOrOpi(1); + } else { + ee.setComOrOpi(0); + } + // 执法人员1需要展示用户名+执法码 + UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId()); + String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum(); + ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN); + + // 执法人员2需要展示用户名+执法码 + List lawTwoList = new ArrayList<>(); + List userBeans = new ArrayList<>(); + if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) { + userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo()); + } + for (UserBean ub : userBeans) { + String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); + lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum); + } + ee.setLawEnforcer2List(lawTwoList); + // 判断超时多少天 + Instant instant = ee.getEnforcementTime().toInstant(); + ZoneId zoneId = ZoneId.systemDefault(); + LocalDate startDate = instant.atZone(zoneId).toLocalDate(); + // 今天距离执法时间所差天数 + long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now()); + ee.setOutTimeDayNum(daysBetween); + if (daysBetween <= 4) { + res.add(ee); + } + } + return getDataTable(res); + } + + /** + * 新增执法端-执法登记 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存执法端-执法登记 + */ +// @RequiresPermissions("code:registration:add") + @PostMapping("/add") + @ResponseBody + public ZDResponse addSave(@RequestBody EnforcementRegistration enforcementRegistration) + { + String district = ""; + String street = ""; + if (StringUtils.isNotEmpty(enforcementRegistration.getEnterpriseAddress())) { + district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)"); + street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)"); + } + enforcementRegistration.setDistrict(district); + enforcementRegistration.setStreet(street); + return enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration) > 0 + ? ZDResponse.success("保存成功") : ZDResponse.error("保存失败"); + } + + /** + * 根据企业统一信用号, 搜索出该企业前推一小时内的联合执法. + * 用于用户自行进行关联 + * @param enterpriseNumber + * @return + */ + @GetMapping("/queryUnionByHour/{enterpriseNumber}/{checkCss}/{enforcementTime}/{unionNo}") + @ResponseBody + public ZDResponse queryUnionByHour(@PathVariable String enterpriseNumber, @PathVariable String checkCss, @PathVariable String enforcementTime, @PathVariable String unionNo) + { + return ZDResponse.success("操作成功", enforcementRegistrationService.queryUnionByHour(enterpriseNumber, checkCss, enforcementTime, unionNo)); + } + + /** + * 修改执法端-执法登记 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) + { + EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id); + mmap.put("enforcementRegistration", enforcementRegistration); + return prefix + "/edit"; + } + + /** + * 修改保存执法端-执法登记 + */ +// @RequiresPermissions("code:registration:edit") + @PostMapping("/edit") + @ResponseBody + public ZDResponse editSave(@RequestBody EnforcementRegistration enforcementRegistration) + { + int resNum = 0; + enforcementRegistration.setIsSubmit(1); + String district = ""; + String street = ""; + if (StringUtils.isNotEmpty(enforcementRegistration.getEnterpriseAddress())) { + district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)"); + street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)"); + } + enforcementRegistration.setDistrict(district); + enforcementRegistration.setStreet(street); + if (StringUtils.isNotEmpty(enforcementRegistration.getId())) { + resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration); + } else { + resNum = enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration); + if (resNum > 0 && StringUtils.isNotEmpty(enforcementRegistration.getLawId())) { + enforcementRegistration.setId(null); + } + } + if (StringUtils.isNotEmpty(enforcementRegistration.getLawId())) { + EnterpriseLawEnforcement law = new EnterpriseLawEnforcement(); + law.setId(enforcementRegistration.getLawId()); + law.setIsReg(1); + resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(law); + } + return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); + } + + @PostMapping("/edit2") + @ResponseBody + public ZDResponse editSave2(@RequestBody EnforcementRegistration enforcementRegistration) + { + enforcementRegistration.setIsSubmit(0); + String district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)"); + String street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)"); + enforcementRegistration.setDistrict(district); + enforcementRegistration.setStreet(street); + int resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration); + if (StringUtils.isNotEmpty(enforcementRegistration.getLawId())) { + EnterpriseLawEnforcement law = new EnterpriseLawEnforcement(); + law.setId(enforcementRegistration.getLawId()); + law.setIsReg(1); + resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(law); + } + return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); + } + + + /** + * 修改执法端-执法登记 + */ + @GetMapping("/detail/{id}") + public String detail(@PathVariable("id") String id, ModelMap mmap) + { + EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id); + mmap.put("enforcementRegistration", enforcementRegistration); + return prefix + "/detail"; + } + + /** + * 修改保存执法端-执法登记提交 + */ + @RequiresPermissions("code:registration:submit") + @PostMapping("/submit") + @ResponseBody + public ZDResponse submit(@RequestBody EnforcementRegistration enforcementRegistration) + { + return enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration) > 0 ? + ZDResponse.success("提交成功") : ZDResponse.error("提交失败"); + } + + /** + * 删除执法端-执法登记 + */ + @RequiresPermissions("code:registration:remove") + @PostMapping( "/remove") + @ResponseBody + public ZDResponse remove(String ids) + { + return enforcementRegistrationService.deleteEnforcementRegistrationByIds(ids) > 0 ? + ZDResponse.success("删除成功") : ZDResponse.error("删除失败"); + } + + /** + * 获取预警信息 + */ +// @RequiresPermissions("code:registration:list") + @GetMapping("/queryEarlyWarning") + @ResponseBody + public ZDResponse queryEarlyWarning(EnforcementRegistration enforcementRegistration) + { + List list = enforcementRegistrationService.queryEarlyWarning(enforcementRegistration.getSearchValue()); + return ZDResponse.success("查询成功",list); + } /** * 执法登记详情 @@ -826,69 +826,69 @@ public class OutEnforcementRegistrationController extends BaseController // registration.setParams(params); // return ZDResponse.success("查询成功", registration); // } -// @GetMapping( "/getByUserIdAndEnterpriseNumber/{modth}/{userId}/{enterpriseNumber}") -// @ResponseBody -// public ZDResponse getByUserIdAndEnterpriseNumber(@PathVariable String modth, @PathVariable Long userId, @PathVariable String enterpriseNumber) -// { -// // 拿到的企业编码是加密盐的, 和登记表对不上 -// EnterpriseInformation enterpriseInformation = null; -// if ("add".equals(modth)) { -// enterpriseInformation = iEnterpriseInformationService.selectEnterpriseInformationBySalt(enterpriseNumber); -// } else { -// enterpriseInformation = iEnterpriseInformationService.selectEnterpriseInformationByNum(enterpriseNumber); -// } -// // 前端似乎没保存部门id, 所以弄个userId上来 通过userId获取其部门id -// UserBean userBean = userApi.getUserByUserId(userId); -// EnforcementRegistration registration = enforcementRegistrationService.getByDeptIdAndEnterpriseNumber(userBean.getDeptId(), enterpriseInformation.getEnterpriseNumber()); -// // 执法人员需要展示用户名+执法码 -// List userBeans = new ArrayList<>(); -// if (StringUtils.isNotEmpty(registration.getLawEnforcerIdTwo())) { -// userBeans = userApi.getUserByUserIds(registration.getLawEnforcerIdTwo()); -// } -// String tmpUserShow = ""; -// for (UserBean ub : userBeans) { -// String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); -// tmpUserShow += ub.getUserName() +" "+ lawCertificateNum + ","; -// } -// if (tmpUserShow.length() > 0) { -// tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1); -// } -// registration.setLawEnforcer2Show(tmpUserShow); -// -// // 字典回显 -// DictDataBean dictParams = new DictDataBean(); -// // 执法领域 -// if (StringUtils.isNotEmpty(registration.getLawField())) { -// dictParams.setDictType("law_field"); -// List dicts = dictDataApi.getDictData(dictParams); -// for (DictDataBean d : dicts) { -// if (d.getDictValue().equals(registration.getLawField())) { -// registration.setLawFieldText(d.getDictLabel()); -// break; -// } -// } -// } -// // 执法类别 -// if (StringUtils.isNotEmpty(registration.getCheckCategory())) { -// dictParams.setDictType("check_category"); -// List dicts = dictDataApi.getDictData(dictParams); -// for (DictDataBean d : dicts) { -// if (d.getDictValue().equals(registration.getCheckCategory())) { -// registration.setCheckCategoryText(d.getDictLabel()); -// break; -// } -// } -// } -// -// if (null!=registration && StringUtils.isNotEmpty(registration.getId())) { -// Map params = new HashMap<>(); -// LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem()); -// params.put("lawEnforcementItemText", null != tmp ? tmp.getTitle() : ""); -// registration.setParams(params); -// return ZDResponse.success("查询成功", registration); -// } -// return ZDResponse.error("查询失败"); -// } + @GetMapping( "/getByUserIdAndEnterpriseNumber/{modth}/{userId}/{enterpriseNumber}") + @ResponseBody + public ZDResponse getByUserIdAndEnterpriseNumber(@PathVariable String modth, @PathVariable Long userId, @PathVariable String enterpriseNumber) + { + // 拿到的企业编码是加密盐的, 和登记表对不上 + EnterpriseInformation enterpriseInformation = null; + if ("add".equals(modth)) { + enterpriseInformation = iEnterpriseInformationService.selectEnterpriseInformationBySalt(enterpriseNumber); + } else { + enterpriseInformation = iEnterpriseInformationService.selectEnterpriseInformationByNum(enterpriseNumber); + } + // 前端似乎没保存部门id, 所以弄个userId上来 通过userId获取其部门id + UserBean userBean = userApi.getUserByUserId(userId); + EnforcementRegistration registration = enforcementRegistrationService.getByDeptIdAndEnterpriseNumber(userBean.getDeptId(), enterpriseInformation.getEnterpriseNumber()); + // 执法人员需要展示用户名+执法码 + List userBeans = new ArrayList<>(); + if (StringUtils.isNotEmpty(registration.getLawEnforcerIdTwo())) { + userBeans = userApi.getUserByUserIds(registration.getLawEnforcerIdTwo()); + } + String tmpUserShow = ""; + for (UserBean ub : userBeans) { + String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); + tmpUserShow += ub.getUserName() +" "+ lawCertificateNum + ","; + } + if (tmpUserShow.length() > 0) { + tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1); + } + registration.setLawEnforcer2Show(tmpUserShow); + + // 字典回显 + DictDataBean dictParams = new DictDataBean(); + // 执法领域 + if (StringUtils.isNotEmpty(registration.getLawField())) { + dictParams.setDictType("law_field"); + List dicts = dictDataApi.getDictData(dictParams); + for (DictDataBean d : dicts) { + if (d.getDictValue().equals(registration.getLawField())) { + registration.setLawFieldText(d.getDictLabel()); + break; + } + } + } + // 执法类别 + if (StringUtils.isNotEmpty(registration.getCheckCategory())) { + dictParams.setDictType("check_category"); + List dicts = dictDataApi.getDictData(dictParams); + for (DictDataBean d : dicts) { + if (d.getDictValue().equals(registration.getCheckCategory())) { + registration.setCheckCategoryText(d.getDictLabel()); + break; + } + } + } + + if (null!=registration && StringUtils.isNotEmpty(registration.getId())) { + Map params = new HashMap<>(); + LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem()); + params.put("lawEnforcementItemText", null != tmp ? tmp.getTitle() : ""); + registration.setParams(params); + return ZDResponse.success("查询成功", registration); + } + return ZDResponse.error("查询失败"); + } /** * 查看预约记录详情 @@ -933,6 +933,7 @@ public class OutEnforcementRegistrationController extends BaseController return matcher.group(1); } return ""; + } } diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseComplaintController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseComplaintController.java index 06f9c93a..751deb4d 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseComplaintController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseComplaintController.java @@ -15,12 +15,9 @@ import com.zdxt.common.controller.BaseController; import com.zdxt.common.util.StringUtils; import com.zdxt.common.util.TableDataInfo; import com.zdxt.common.zdxtFile.ZdxtFileCommon; -import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.tags.Tag; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import java.util.*; diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseLawEnforcementController.java index ea9d2590..1f53b3c6 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseLawEnforcementController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseLawEnforcementController.java @@ -1,42 +1,22 @@ package com.zdxt.app.controller.external.company; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.zdxt.auth.dto.DeptBean; -import com.zdxt.auth.dto.DictDataBean; -import com.zdxt.auth.dto.UserBean; -import com.zdxt.auth.feign.DictDataApi; import com.zdxt.auth.feign.UserApi; -import com.zdxt.code.domain.EnterpriseInformation; import com.zdxt.code.domain.EnterpriseLawEnforcement; -import com.zdxt.code.domain.LinkageDict; import com.zdxt.code.mapper.EnterpriseInformationMapper; -import com.zdxt.code.service.IEnterpriseComplaintService; import com.zdxt.code.service.IEnterpriseLawEnforcementService; -import com.zdxt.code.service.ILinkageDictService; -import com.zdxt.code.utils.ZwSmsClient; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; -import com.zdxt.common.util.CommonUtil; -import com.zdxt.common.util.StringUtils; import com.zdxt.common.util.TableDataInfo; -import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * 企业端-执法部门预约记录Controller