diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java index 3b523932..0e462068 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java @@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.zdxt.auth.dto.DictDataBean; import com.zdxt.auth.feign.DictDataApi; import com.zdxt.auth.feign.ZdxtFileCommonApi; -import com.zdxt.code.domain.EnforcementRegistration; -import com.zdxt.code.domain.EnterpriseComplaint; -import com.zdxt.code.domain.EnterpriseLawEnforcement; -import com.zdxt.code.domain.MssqAddOrder; +import com.zdxt.code.domain.*; import com.zdxt.code.service.IEnforcementRegistrationService; import com.zdxt.code.service.IEnterpriseComplaintService; import com.zdxt.code.service.IEnterpriseLawEnforcementService; @@ -154,42 +151,55 @@ public class AppEnterpriseComplaintController extends BaseController { Map resMap = new HashMap<>(); - if (StringUtils.isNotEmpty(enterpriseComplaint.getProWoCode())) { - MssqAddOrder mparams = new MssqAddOrder(); - mparams.setProWoCode(enterpriseComplaint.getProWoCode()); - String resStr = null; - try { - resStr = mssqApiService.mssqQueryEndInfo(mparams); - JSONObject resObj = JSONObject.parseObject(resStr); - if ("0".equals(resObj.getString("resultCode"))) { - // 再判断是否超过5天 (超过5天也不让评价) - JSONObject endData = resObj.getJSONObject("endData"); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - Date date = format.parse(endData.getString("endTime")); - Instant instant = date.toInstant(); - ZoneId zoneId = ZoneId.systemDefault(); - LocalDate calDate = instant.atZone(zoneId).toLocalDate(); - long daysBetween = ChronoUnit.DAYS.between(calDate, LocalDate.now()); - if (daysBetween <= 4) { - resMap.put("res", endData); - } else { - resMap.put("res", "0"); - } - } else { - resMap.put("res", "0"); - } - enterpriseComplaint.setParams(resMap); - } catch (Exception e) { - e.printStackTrace(); - resMap.put("res", "0"); - } - } + //TODO 客户要求删除投诉的评价入口 2024年8月27日20:41:36 +// if (StringUtils.isNotEmpty(enterpriseComplaint.getProWoCode())) { +// MssqAddOrder mparams = new MssqAddOrder(); +// mparams.setProWoCode(enterpriseComplaint.getProWoCode()); +// String resStr = null; +// try { +// resStr = mssqApiService.mssqQueryEndInfo(mparams); +// JSONObject resObj = JSONObject.parseObject(resStr); +// if ("0".equals(resObj.getString("resultCode"))) { +// // 再判断是否超过5天 (超过5天也不让评价) +// JSONObject endData = resObj.getJSONObject("endData"); +// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); +// Date date = format.parse(endData.getString("endTime")); +// Instant instant = date.toInstant(); +// ZoneId zoneId = ZoneId.systemDefault(); +// LocalDate calDate = instant.atZone(zoneId).toLocalDate(); +// long daysBetween = ChronoUnit.DAYS.between(calDate, LocalDate.now()); +// if (daysBetween <= 4) { +// resMap.put("res", endData); +// } else { +// resMap.put("res", "0"); +// } +// } else { +// resMap.put("res", "0"); +// } +// enterpriseComplaint.setParams(resMap); +// } catch (Exception e) { +// e.printStackTrace(); +// resMap.put("res", "0"); +// } +// } // 获取图片 List files = zdxtFileCommonApi.selectZdxtFileById(id); resMap.put("file", files); return ZDResponse.success("投诉详情查询", enterpriseComplaint); } + /** + * 查询在线投诉详情 + */ + @GetMapping("/queryProcessById") + @ResponseBody + public ZDResponse queryProcessById(String id) { + + List mssqOrderFlows = + enterpriseComplaintService.selectEnterpriseComplaintProcess(id); + return ZDResponse.success("投诉进度查询", mssqOrderFlows); + } + /** * 删除企业执法-在线投诉 */ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java index e87b9ee4..56daf4cd 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java @@ -1,6 +1,8 @@ package com.zdxt.code.service; import com.zdxt.code.domain.EnterpriseComplaint; +import com.zdxt.code.domain.MssqOrderFlow; + import java.util.List; /** @@ -17,7 +19,14 @@ public interface IEnterpriseComplaintService * @param id 企业执法-在线投诉ID * @return 企业执法-在线投诉 */ - public EnterpriseComplaint selectEnterpriseComplaintById(String id); + EnterpriseComplaint selectEnterpriseComplaintById(String id); + /** + * 查询执法投诉处置进度 + * + * @param id 企业执法-在线投诉ID + * @return 企业执法-在线投诉 + */ + List selectEnterpriseComplaintProcess(String id); /** * 查询企业执法-在线投诉列表 @@ -25,7 +34,7 @@ public interface IEnterpriseComplaintService * @param enterpriseComplaint 企业执法-在线投诉 * @return 企业执法-在线投诉集合 */ - public List selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint); + List selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint); /** * 新增企业执法-在线投诉 @@ -33,7 +42,7 @@ public interface IEnterpriseComplaintService * @param enterpriseComplaint 企业执法-在线投诉 * @return 结果 */ - public int insertEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint); + int insertEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint); /** * 修改企业执法-在线投诉 @@ -41,7 +50,7 @@ public interface IEnterpriseComplaintService * @param enterpriseComplaint 企业执法-在线投诉 * @return 结果 */ - public int updateEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint); + int updateEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint); /** * 批量删除企业执法-在线投诉 @@ -49,7 +58,7 @@ public interface IEnterpriseComplaintService * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteEnterpriseComplaintByIds(String ids); + int deleteEnterpriseComplaintByIds(String ids); /** * 删除企业执法-在线投诉信息 @@ -57,5 +66,5 @@ public interface IEnterpriseComplaintService * @param id 企业执法-在线投诉ID * @return 结果 */ - public int deleteEnterpriseComplaintById(String id); + int deleteEnterpriseComplaintById(String id); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java index 2ca941c3..dd13a1aa 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java @@ -16,6 +16,7 @@ import com.zdxt.code.service.MssqApiService; import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.StringUtils; import com.zdxt.common.zdxtFile.ZdxtFileCommon; +import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zdxt.code.mapper.EnterpriseComplaintMapper; @@ -63,6 +64,39 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi enterpriseComplaint.setBureauDeptId(enforcementRegistration.getBureauDeptId()); } //查询民生诉求接口 获取处置进度,判断是否存在诉求工单编码 +// if(StringUtils.isNotEmpty(enterpriseComplaint.getProWoCode())){ +// +// //查询工单处置流程信息 +// MssqAddOrder mssqAddOrder = new MssqAddOrder(); +// mssqAddOrder.setProWoCode(enterpriseComplaint.getProWoCode()); +// String s = null; +// try { +// //查询进度详细信息 TODO 异常捕捉之后，前端超时 +// s = mssqApiService.queryMssq(mssqAddOrder, "/api/API_YX/proProcess/queryAppInfo"); +// JSONObject jsonObject = JSONObject.parseObject(s); +// //获取进度数据 +// List approveDatas1 = +// JSONArray.parseArray(jsonObject.getString("approveDatas"), MssqOrderFlow.class); +// //列表排序反转 +// Collections.reverse(approveDatas1); +// enterpriseComplaint.setMssqOrderFlows(approveDatas1); +// } catch (Exception e) { +// e.printStackTrace(); +// } +//// System.out.println(s); +// } + } + return enterpriseComplaint; + } + + @Override + public List selectEnterpriseComplaintProcess(String id) { + + EnterpriseComplaint enterpriseComplaint = enterpriseComplaintMapper.selectEnterpriseComplaintById(id); + if(StringUtils.isNotEmpty(enterpriseComplaint.getRelId())){ + EnforcementRegistration enforcementRegistration = + enforcementRegistrationMapper.selectEnforcementRegistrationById(enterpriseComplaint.getRelId()); + //查询民生诉求接口 获取处置进度,判断是否存在诉求工单编码 if(StringUtils.isNotEmpty(enterpriseComplaint.getProWoCode())){ //查询工单处置流程信息 @@ -70,7 +104,7 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi mssqAddOrder.setProWoCode(enterpriseComplaint.getProWoCode()); String s = null; try { - //查询进度详细信息 + //查询进度详细信息 TODO 异常捕捉之后，前端超时 s = mssqApiService.queryMssq(mssqAddOrder, "/api/API_YX/proProcess/queryAppInfo"); JSONObject jsonObject = JSONObject.parseObject(s); //获取进度数据 @@ -79,13 +113,13 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi //列表排序反转 Collections.reverse(approveDatas1); enterpriseComplaint.setMssqOrderFlows(approveDatas1); + return approveDatas1; } catch (Exception e) { e.printStackTrace(); } -// System.out.println(s); } } - return enterpriseComplaint; + return Lists.newArrayList(); } /**