chenrui
/
zdxtLawEnforcementCode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

新增外部调用部门的相关接口

master
ganhao 7 months ago
parent
46aca29707
commit
daa248f635
3 changed files with 425 additions and 447 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 847
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnforcementRegistrationController.java
  2. 3
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseComplaintController.java
  3. 20
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseLawEnforcementController.java

847
lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnforcementRegistrationController.java
View File

@ -30,7 +30,7 @@ import java.util.*;
/** /**
* 执法端-执法登记Controller * 执法端-历史执法信息
* *
* @author chenrui * @author chenrui
* @date 2024-02-23 * @date 2024-02-23
@ -74,162 +74,162 @@ public class OutEnforcementRegistrationController extends BaseController
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
return getDataTable(list); return getDataTable(list);
} }
// /** /**
// * 查询执法端-执法登记列表 * 查询执法端-执法登记列表
// */ */
// @GetMapping("/selectList") @GetMapping("/selectList")
// @ResponseBody @ResponseBody
// public ZDResponse selectList(EnforcementRegistration enforcementRegistration) public ZDResponse selectList(EnforcementRegistration enforcementRegistration)
// { {
// List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
// DictDataBean dictParams = new DictDataBean(); DictDataBean dictParams = new DictDataBean();
// dictParams.setDictType("check_category"); dictParams.setDictType("check_category");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams); List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (EnforcementRegistration ee : list) { for (EnforcementRegistration ee : list) {
// // 判断是否投诉 // 判断是否投诉
// EnterpriseComplaint params = new EnterpriseComplaint(); EnterpriseComplaint params = new EnterpriseComplaint();
// params.setRelId(ee.getId()); params.setRelId(ee.getId());
// params.setComOrOpi(1); params.setComOrOpi(1);
// List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params); List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params);
// if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) { if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) {
// ee.setComOrOpi(1); ee.setComOrOpi(1);
// } else { } else {
// ee.setComOrOpi(0); ee.setComOrOpi(0);
// } }
//
// // 执法类别 // 执法类别
// for (DictDataBean dict : dicts) { for (DictDataBean dict : dicts) {
// if (dict.getDictValue().equals(ee.getCheckCategory())) { if (dict.getDictValue().equals(ee.getCheckCategory())) {
// ee.setCheckCategoryText(dict.getDictLabel()); ee.setCheckCategoryText(dict.getDictLabel());
// } }
// } }
//
// // 执法人员1需要展示用户名+执法码 // 执法人员1需要展示用户名+执法码
// UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId()); UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId());
// String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum(); String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum();
// ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN); ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN);
// // 执法人员2需要展示用户名+执法码 // 执法人员2需要展示用户名+执法码
// List<String> lawTwoList = new ArrayList<>(); List<String> lawTwoList = new ArrayList<>();
// List<UserBean> userBeans = new ArrayList<>(); List<UserBean> userBeans = new ArrayList<>();
// if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) { if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) {
// userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo()); userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo());
// } }
// for (UserBean ub : userBeans) { for (UserBean ub : userBeans) {
// String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
// lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum); lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum);
// } }
// ee.setLawEnforcer2List(lawTwoList); ee.setLawEnforcer2List(lawTwoList);
// } }
//
// return ZDResponse.success("获取执法登录信息",list); return ZDResponse.success("获取执法登录信息",list);
// } }
//
//
// /** /**
// * 查询执法端-执法登记列表 * 查询执法端-执法登记列表queryEnterpriseList'
// */ */
//// @RequiresPermissions("code:registration:list") // @RequiresPermissions("code:registration:list")
// @PostMapping("/queryList") @PostMapping("/queryList")
// @ResponseBody @ResponseBody
// public TableDataInfo queryList(@RequestBody EnforcementRegistration enforcementRegistration) public TableDataInfo queryList(@RequestBody EnforcementRegistration enforcementRegistration)
// { {
//// startPage();
// int totalNum = enforcementRegistrationService.countEnforcementRegistrationList(enforcementRegistration);
// List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
// DictDataBean dictParams = new DictDataBean();
// dictParams.setDictType("check_category");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (EnforcementRegistration ee : list) {
// // 判断是否投诉
// EnterpriseComplaint params = new EnterpriseComplaint();
// params.setRelId(ee.getId());
// params.setComOrOpi(1);
// List<EnterpriseComplaint> 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<String> lawTwoList = new ArrayList<>();
// List<UserBean> 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<EnforcementRegistration> 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(); // startPage();
// List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration); int totalNum = enforcementRegistrationService.countEnforcementRegistrationList(enforcementRegistration);
// TableDataInfo dataTable = getDataTable(list); List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
// dataTable.setMsg(count); DictDataBean dictParams = new DictDataBean();
// return dataTable; dictParams.setDictType("check_category");
List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
for (EnforcementRegistration ee : list) {
// 判断是否投诉
EnterpriseComplaint params = new EnterpriseComplaint();
params.setRelId(ee.getId());
params.setComOrOpi(1);
List<EnterpriseComplaint> 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<String> lawTwoList = new ArrayList<>();
List<UserBean> 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<EnforcementRegistration> 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<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration);
TableDataInfo dataTable = getDataTable(list);
dataTable.setMsg(count);
return dataTable;
}
@GetMapping("/queryByEpId") @GetMapping("/queryByEpId")
@ResponseBody @ResponseBody
@ -342,211 +342,211 @@ public class OutEnforcementRegistrationController extends BaseController
} }
return ZDResponse.success("查询成功",res); return ZDResponse.success("查询成功",res);
} }
//
// /** 剔除执法日期距离今天超过5天的执法数据 */ /** 剔除执法日期距离今天超过5天的执法数据 */
// @GetMapping("/queryListWithFiveDay") @GetMapping("/queryListWithFiveDay")
// @ResponseBody @ResponseBody
// public TableDataInfo queryListWithFiveDay(EnforcementRegistration enforcementRegistration) public TableDataInfo queryListWithFiveDay(EnforcementRegistration enforcementRegistration)
// { {
//
// startPage(); startPage();
// List<EnforcementRegistration> res = new ArrayList<>(); List<EnforcementRegistration> res = new ArrayList<>();
// List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
// for (EnforcementRegistration ee : list) { for (EnforcementRegistration ee : list) {
// // 判断是否投诉 // 判断是否投诉
// EnterpriseComplaint params = new EnterpriseComplaint(); EnterpriseComplaint params = new EnterpriseComplaint();
// params.setRelId(ee.getId()); params.setRelId(ee.getId());
// params.setComOrOpi(1); params.setComOrOpi(1);
// List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params); List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params);
// if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) { if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) {
// ee.setComOrOpi(1); ee.setComOrOpi(1);
// } else { } else {
// ee.setComOrOpi(0); ee.setComOrOpi(0);
// } }
// // 执法人员1需要展示用户名+执法码 // 执法人员1需要展示用户名+执法码
// UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId()); UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId());
// String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum(); String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum();
// ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN); ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN);
//
// // 执法人员2需要展示用户名+执法码 // 执法人员2需要展示用户名+执法码
// List<String> lawTwoList = new ArrayList<>(); List<String> lawTwoList = new ArrayList<>();
// List<UserBean> userBeans = new ArrayList<>(); List<UserBean> userBeans = new ArrayList<>();
// if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) { if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) {
// userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo()); userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo());
// } }
// for (UserBean ub : userBeans) { for (UserBean ub : userBeans) {
// String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
// lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum); lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum);
// } }
// ee.setLawEnforcer2List(lawTwoList); ee.setLawEnforcer2List(lawTwoList);
// // 判断超时多少天 // 判断超时多少天
// Instant instant = ee.getEnforcementTime().toInstant(); Instant instant = ee.getEnforcementTime().toInstant();
// ZoneId zoneId = ZoneId.systemDefault(); ZoneId zoneId = ZoneId.systemDefault();
// LocalDate startDate = instant.atZone(zoneId).toLocalDate(); LocalDate startDate = instant.atZone(zoneId).toLocalDate();
// // 今天距离执法时间所差天数 // 今天距离执法时间所差天数
// long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now()); long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now());
// ee.setOutTimeDayNum(daysBetween); ee.setOutTimeDayNum(daysBetween);
// if (daysBetween <= 4) { if (daysBetween <= 4) {
// res.add(ee); res.add(ee);
// } }
// } }
// return getDataTable(res); return getDataTable(res);
// } }
//
// /** /**
// * 新增执法端-执法登记 * 新增执法端-执法登记
// */ */
// @GetMapping("/add") @GetMapping("/add")
// public String add() public String add()
// { {
// return prefix + "/add"; return prefix + "/add";
// } }
//
// /** /**
// * 新增保存执法端-执法登记 * 新增保存执法端-执法登记
// */ */
//// @RequiresPermissions("code:registration:add") // @RequiresPermissions("code:registration:add")
// @PostMapping("/add") @PostMapping("/add")
// @ResponseBody @ResponseBody
// public ZDResponse addSave(@RequestBody EnforcementRegistration enforcementRegistration) public ZDResponse addSave(@RequestBody EnforcementRegistration enforcementRegistration)
// { {
// String district = ""; String district = "";
// String street = ""; String street = "";
// if (StringUtils.isNotEmpty(enforcementRegistration.getEnterpriseAddress())) { if (StringUtils.isNotEmpty(enforcementRegistration.getEnterpriseAddress())) {
// district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)"); district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)");
// street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)"); street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)");
// } }
// enforcementRegistration.setDistrict(district); enforcementRegistration.setDistrict(district);
// enforcementRegistration.setStreet(street); enforcementRegistration.setStreet(street);
// return enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration) > 0 return enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration) > 0
// ? ZDResponse.success("保存成功") : ZDResponse.error("保存失败"); ? ZDResponse.success("保存成功") : ZDResponse.error("保存失败");
// } }
//
// /** /**
// * 根据企业统一信用号, 搜索出该企业前推一小时内的联合执法. * 根据企业统一信用号, 搜索出该企业前推一小时内的联合执法.
// * 用于用户自行进行关联 * 用于用户自行进行关联
// * @param enterpriseNumber * @param enterpriseNumber
// * @return * @return
// */ */
// @GetMapping("/queryUnionByHour/{enterpriseNumber}/{checkCss}/{enforcementTime}/{unionNo}") @GetMapping("/queryUnionByHour/{enterpriseNumber}/{checkCss}/{enforcementTime}/{unionNo}")
// @ResponseBody @ResponseBody
// public ZDResponse queryUnionByHour(@PathVariable String enterpriseNumber, @PathVariable String checkCss, @PathVariable String enforcementTime, @PathVariable String unionNo) public ZDResponse queryUnionByHour(@PathVariable String enterpriseNumber, @PathVariable String checkCss, @PathVariable String enforcementTime, @PathVariable String unionNo)
// { {
// return ZDResponse.success("操作成功", enforcementRegistrationService.queryUnionByHour(enterpriseNumber, checkCss, enforcementTime, unionNo)); return ZDResponse.success("操作成功", enforcementRegistrationService.queryUnionByHour(enterpriseNumber, checkCss, enforcementTime, unionNo));
// } }
//
// /** /**
// * 修改执法端-执法登记 * 修改执法端-执法登记
// */ */
// @GetMapping("/edit/{id}") @GetMapping("/edit/{id}")
// public String edit(@PathVariable("id") String id, ModelMap mmap) public String edit(@PathVariable("id") String id, ModelMap mmap)
// { {
// EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id); EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id);
// mmap.put("enforcementRegistration", enforcementRegistration); mmap.put("enforcementRegistration", enforcementRegistration);
// return prefix + "/edit"; return prefix + "/edit";
// } }
//
// /** /**
// * 修改保存执法端-执法登记 * 修改保存执法端-执法登记
// */ */
//// @RequiresPermissions("code:registration:edit") // @RequiresPermissions("code:registration:edit")
// @PostMapping("/edit") @PostMapping("/edit")
// @ResponseBody @ResponseBody
// public ZDResponse editSave(@RequestBody EnforcementRegistration enforcementRegistration) public ZDResponse editSave(@RequestBody EnforcementRegistration enforcementRegistration)
// { {
// int resNum = 0; int resNum = 0;
// enforcementRegistration.setIsSubmit(1); enforcementRegistration.setIsSubmit(1);
// String district = ""; String district = "";
// String street = ""; String street = "";
// if (StringUtils.isNotEmpty(enforcementRegistration.getEnterpriseAddress())) { if (StringUtils.isNotEmpty(enforcementRegistration.getEnterpriseAddress())) {
// district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)"); district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)");
// street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)"); street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)");
// } }
// enforcementRegistration.setDistrict(district); enforcementRegistration.setDistrict(district);
// enforcementRegistration.setStreet(street); enforcementRegistration.setStreet(street);
// if (StringUtils.isNotEmpty(enforcementRegistration.getId())) { if (StringUtils.isNotEmpty(enforcementRegistration.getId())) {
// resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration); resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration);
// } else { } else {
// resNum = enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration); resNum = enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration);
// if (resNum > 0 && StringUtils.isNotEmpty(enforcementRegistration.getLawId())) { if (resNum > 0 && StringUtils.isNotEmpty(enforcementRegistration.getLawId())) {
// enforcementRegistration.setId(null); enforcementRegistration.setId(null);
// } }
// } }
// if (StringUtils.isNotEmpty(enforcementRegistration.getLawId())) { if (StringUtils.isNotEmpty(enforcementRegistration.getLawId())) {
// EnterpriseLawEnforcement law = new EnterpriseLawEnforcement(); EnterpriseLawEnforcement law = new EnterpriseLawEnforcement();
// law.setId(enforcementRegistration.getLawId()); law.setId(enforcementRegistration.getLawId());
// law.setIsReg(1); law.setIsReg(1);
// resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(law); resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(law);
// } }
// return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败");
// } }
//
// @PostMapping("/edit2") @PostMapping("/edit2")
// @ResponseBody @ResponseBody
// public ZDResponse editSave2(@RequestBody EnforcementRegistration enforcementRegistration) public ZDResponse editSave2(@RequestBody EnforcementRegistration enforcementRegistration)
// { {
// enforcementRegistration.setIsSubmit(0); enforcementRegistration.setIsSubmit(0);
// String district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)"); String district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)");
// String street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)"); String street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)");
// enforcementRegistration.setDistrict(district); enforcementRegistration.setDistrict(district);
// enforcementRegistration.setStreet(street); enforcementRegistration.setStreet(street);
// int resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration); int resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration);
// if (StringUtils.isNotEmpty(enforcementRegistration.getLawId())) { if (StringUtils.isNotEmpty(enforcementRegistration.getLawId())) {
// EnterpriseLawEnforcement law = new EnterpriseLawEnforcement(); EnterpriseLawEnforcement law = new EnterpriseLawEnforcement();
// law.setId(enforcementRegistration.getLawId()); law.setId(enforcementRegistration.getLawId());
// law.setIsReg(1); law.setIsReg(1);
// resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(law); resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(law);
// } }
// return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败");
// } }
//
//
// /** /**
// * 修改执法端-执法登记 * 修改执法端-执法登记
// */ */
// @GetMapping("/detail/{id}") @GetMapping("/detail/{id}")
// public String detail(@PathVariable("id") String id, ModelMap mmap) public String detail(@PathVariable("id") String id, ModelMap mmap)
// { {
// EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id); EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id);
// mmap.put("enforcementRegistration", enforcementRegistration); mmap.put("enforcementRegistration", enforcementRegistration);
// return prefix + "/detail"; return prefix + "/detail";
// } }
//
// /** /**
// * 修改保存执法端-执法登记提交 * 修改保存执法端-执法登记提交
// */ */
// @RequiresPermissions("code:registration:submit") @RequiresPermissions("code:registration:submit")
// @PostMapping("/submit") @PostMapping("/submit")
// @ResponseBody @ResponseBody
// public ZDResponse submit(@RequestBody EnforcementRegistration enforcementRegistration) public ZDResponse submit(@RequestBody EnforcementRegistration enforcementRegistration)
// { {
// return enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration) > 0 ? return enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration) > 0 ?
// ZDResponse.success("提交成功") : ZDResponse.error("提交失败"); ZDResponse.success("提交成功") : ZDResponse.error("提交失败");
// } }
//
// /** /**
// * 删除执法端-执法登记 * 删除执法端-执法登记
// */ */
// @RequiresPermissions("code:registration:remove") @RequiresPermissions("code:registration:remove")
// @PostMapping( "/remove") @PostMapping( "/remove")
// @ResponseBody @ResponseBody
// public ZDResponse remove(String ids) public ZDResponse remove(String ids)
// { {
// return enforcementRegistrationService.deleteEnforcementRegistrationByIds(ids) > 0 ? return enforcementRegistrationService.deleteEnforcementRegistrationByIds(ids) > 0 ?
// ZDResponse.success("删除成功") : ZDResponse.error("删除失败"); ZDResponse.success("删除成功") : ZDResponse.error("删除失败");
// } }
//
// /** /**
// * 获取预警信息 * 获取预警信息
// */ */
//// @RequiresPermissions("code:registration:list") // @RequiresPermissions("code:registration:list")
// @GetMapping("/queryEarlyWarning") @GetMapping("/queryEarlyWarning")
// @ResponseBody @ResponseBody
// public ZDResponse queryEarlyWarning(EnforcementRegistration enforcementRegistration) public ZDResponse queryEarlyWarning(EnforcementRegistration enforcementRegistration)
// { {
// List<EnforceRegCount> list = enforcementRegistrationService.queryEarlyWarning(enforcementRegistration.getSearchValue()); List<EnforceRegCount> list = enforcementRegistrationService.queryEarlyWarning(enforcementRegistration.getSearchValue());
// return ZDResponse.success("查询成功",list); return ZDResponse.success("查询成功",list);
// } }
/** /**
* 执法登记详情 * 执法登记详情
@ -826,69 +826,69 @@ public class OutEnforcementRegistrationController extends BaseController
// registration.setParams(params); // registration.setParams(params);
// return ZDResponse.success("查询成功", registration); // return ZDResponse.success("查询成功", registration);
// } // }
// @GetMapping( "/getByUserIdAndEnterpriseNumber/{modth}/{userId}/{enterpriseNumber}") @GetMapping( "/getByUserIdAndEnterpriseNumber/{modth}/{userId}/{enterpriseNumber}")
// @ResponseBody @ResponseBody
// public ZDResponse getByUserIdAndEnterpriseNumber(@PathVariable String modth, @PathVariable Long userId, @PathVariable String enterpriseNumber) public ZDResponse getByUserIdAndEnterpriseNumber(@PathVariable String modth, @PathVariable Long userId, @PathVariable String enterpriseNumber)
// { {
// // 拿到的企业编码是加密盐的, 和登记表对不上 // 拿到的企业编码是加密盐的, 和登记表对不上
// EnterpriseInformation enterpriseInformation = null; EnterpriseInformation enterpriseInformation = null;
// if ("add".equals(modth)) { if ("add".equals(modth)) {
// enterpriseInformation = iEnterpriseInformationService.selectEnterpriseInformationBySalt(enterpriseNumber); enterpriseInformation = iEnterpriseInformationService.selectEnterpriseInformationBySalt(enterpriseNumber);
// } else { } else {
// enterpriseInformation = iEnterpriseInformationService.selectEnterpriseInformationByNum(enterpriseNumber); enterpriseInformation = iEnterpriseInformationService.selectEnterpriseInformationByNum(enterpriseNumber);
// } }
// // 前端似乎没保存部门id, 所以弄个userId上来 通过userId获取其部门id // 前端似乎没保存部门id, 所以弄个userId上来 通过userId获取其部门id
// UserBean userBean = userApi.getUserByUserId(userId); UserBean userBean = userApi.getUserByUserId(userId);
// EnforcementRegistration registration = enforcementRegistrationService.getByDeptIdAndEnterpriseNumber(userBean.getDeptId(), enterpriseInformation.getEnterpriseNumber()); EnforcementRegistration registration = enforcementRegistrationService.getByDeptIdAndEnterpriseNumber(userBean.getDeptId(), enterpriseInformation.getEnterpriseNumber());
// // 执法人员需要展示用户名+执法码 // 执法人员需要展示用户名+执法码
// List<UserBean> userBeans = new ArrayList<>(); List<UserBean> userBeans = new ArrayList<>();
// if (StringUtils.isNotEmpty(registration.getLawEnforcerIdTwo())) { if (StringUtils.isNotEmpty(registration.getLawEnforcerIdTwo())) {
// userBeans = userApi.getUserByUserIds(registration.getLawEnforcerIdTwo()); userBeans = userApi.getUserByUserIds(registration.getLawEnforcerIdTwo());
// } }
// String tmpUserShow = ""; String tmpUserShow = "";
// for (UserBean ub : userBeans) { for (UserBean ub : userBeans) {
// String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
// tmpUserShow += ub.getUserName() +" "+ lawCertificateNum + ","; tmpUserShow += ub.getUserName() +" "+ lawCertificateNum + ",";
// } }
// if (tmpUserShow.length() > 0) { if (tmpUserShow.length() > 0) {
// tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1); tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1);
// } }
// registration.setLawEnforcer2Show(tmpUserShow); registration.setLawEnforcer2Show(tmpUserShow);
//
// // 字典回显 // 字典回显
// DictDataBean dictParams = new DictDataBean(); DictDataBean dictParams = new DictDataBean();
// // 执法领域 // 执法领域
// if (StringUtils.isNotEmpty(registration.getLawField())) { if (StringUtils.isNotEmpty(registration.getLawField())) {
// dictParams.setDictType("law_field"); dictParams.setDictType("law_field");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams); List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (DictDataBean d : dicts) { for (DictDataBean d : dicts) {
// if (d.getDictValue().equals(registration.getLawField())) { if (d.getDictValue().equals(registration.getLawField())) {
// registration.setLawFieldText(d.getDictLabel()); registration.setLawFieldText(d.getDictLabel());
// break; break;
// } }
// } }
// } }
// // 执法类别 // 执法类别
// if (StringUtils.isNotEmpty(registration.getCheckCategory())) { if (StringUtils.isNotEmpty(registration.getCheckCategory())) {
// dictParams.setDictType("check_category"); dictParams.setDictType("check_category");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams); List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (DictDataBean d : dicts) { for (DictDataBean d : dicts) {
// if (d.getDictValue().equals(registration.getCheckCategory())) { if (d.getDictValue().equals(registration.getCheckCategory())) {
// registration.setCheckCategoryText(d.getDictLabel()); registration.setCheckCategoryText(d.getDictLabel());
// break; break;
// } }
// } }
// } }
//
// if (null!=registration && StringUtils.isNotEmpty(registration.getId())) { if (null!=registration && StringUtils.isNotEmpty(registration.getId())) {
// Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
// LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem()); LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem());
// params.put("lawEnforcementItemText", null != tmp ? tmp.getTitle() : ""); params.put("lawEnforcementItemText", null != tmp ? tmp.getTitle() : "");
// registration.setParams(params); registration.setParams(params);
// return ZDResponse.success("查询成功", registration); return ZDResponse.success("查询成功", registration);
// } }
// return ZDResponse.error("查询失败"); return ZDResponse.error("查询失败");
// } }
/** /**
* 查看预约记录详情 * 查看预约记录详情
@ -933,6 +933,7 @@ public class OutEnforcementRegistrationController extends BaseController
return matcher.group(1); return matcher.group(1);
} }
return ""; return "";
} }
} }

3
lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseComplaintController.java
View File

@ -15,12 +15,9 @@ import com.zdxt.common.controller.BaseController;
import com.zdxt.common.util.StringUtils; import com.zdxt.common.util.StringUtils;
import com.zdxt.common.util.TableDataInfo; import com.zdxt.common.util.TableDataInfo;
import com.zdxt.common.zdxtFile.ZdxtFileCommon; import com.zdxt.common.zdxtFile.ZdxtFileCommon;
import io.swagger.annotations.Api;
import io.swagger.v3.oas.annotations.tags.Tag; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.*; import java.util.*;

20
lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseLawEnforcementController.java
View File

@ -1,42 +1,22 @@
package com.zdxt.app.controller.external.company; 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.auth.feign.UserApi;
import com.zdxt.code.domain.EnterpriseInformation;
import com.zdxt.code.domain.EnterpriseLawEnforcement; import com.zdxt.code.domain.EnterpriseLawEnforcement;
import com.zdxt.code.domain.LinkageDict;
import com.zdxt.code.mapper.EnterpriseInformationMapper; import com.zdxt.code.mapper.EnterpriseInformationMapper;
import com.zdxt.code.service.IEnterpriseComplaintService;
import com.zdxt.code.service.IEnterpriseLawEnforcementService; 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.ZDResponse;
import com.zdxt.common.controller.BaseController; 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 com.zdxt.common.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 企业端-执法部门预约记录Controller * 企业端-执法部门预约记录Controller

Write Preview
Loading…
Cancel
Save