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 0bb5982d..57159b73 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 @@ -1,6 +1,7 @@ package com.zdxt.app.controller; import com.alibaba.fastjson.JSONObject; +import com.zdxt.auth.feign.ZdxtFileCommonApi; import com.zdxt.code.domain.EnterpriseComplaint; import com.zdxt.code.domain.MssqAddOrder; import com.zdxt.code.service.IEnterpriseComplaintService; @@ -9,12 +10,16 @@ import com.zdxt.common.ZDResponse; 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 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.HashMap; import java.util.List; import java.util.Map; @@ -32,6 +37,7 @@ public class AppEnterpriseComplaintController extends BaseController { @Autowired private IEnterpriseComplaintService enterpriseComplaintService; + @Autowired private ZdxtFileCommonApi zdxtFileCommonApi; @Autowired private MssqApiService mssqApiService; @RequiresPermissions("code:complaint:view") @@ -109,6 +115,7 @@ public class AppEnterpriseComplaintController extends BaseController { public ZDResponse queryById(String id) { EnterpriseComplaint enterpriseComplaint = enterpriseComplaintService.selectEnterpriseComplaintById(id); + Map resMap = new HashMap<>(); if (StringUtils.isNotEmpty(enterpriseComplaint.getProWoCode())) { MssqAddOrder mparams = new MssqAddOrder(); mparams.setProWoCode(enterpriseComplaint.getProWoCode()); @@ -116,9 +123,15 @@ public class AppEnterpriseComplaintController extends BaseController { try { resStr = mssqApiService.mssqQueryEndInfo(mparams); JSONObject resObj = JSONObject.parseObject(resStr); - Map resMap = new HashMap<>(); if ("0".equals(resObj.getString("resultCode"))) { - resMap.put("res", resObj.getJSONObject("endData")); + // 再判断是否超过5天 (超过5天也不让评价) + LocalDate checkTime = LocalDate.parse(resObj.getString("endTime"), DateTimeFormatter.ofPattern("yyyy-MM-dd")); + long daysBetween = ChronoUnit.DAYS.between(LocalDate.now(), checkTime); + if (daysBetween <= 5) { + resMap.put("res", resObj.getJSONObject("endData")); + } else { + resMap.put("res", "0"); + } } else { resMap.put("res", "0"); } @@ -127,6 +140,9 @@ public class AppEnterpriseComplaintController extends BaseController { e.printStackTrace(); } } + // 获取图片 + List files = zdxtFileCommonApi.selectZdxtFileById(id); + resMap.put("file", files); return ZDResponse.success("投诉详情查询",enterpriseComplaint); } diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java index cd45ddd4..b39e3362 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java @@ -46,6 +46,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController private IEnterpriseLawEnforcementService enterpriseLawEnforcementService; @Autowired private ILinkageDictService iLinkageDictService; @Autowired private IEnterpriseComplaintService enterpriseComplaintService; + @Autowired private UserApi userApi; @Autowired private ZwSmsClient zwSmsClient; @@ -343,6 +344,18 @@ public class AppEnterpriseLawEnforcementController extends BaseController params.put("checkRequireText", null==tmp?enfrorcement.getCheckRequireText():tmp.getTitle()); enfrorcement.setParams(params); enfrorcement.setDeptObjs(objs); + + // 执法人员需要展示用户名+执法码 + List userBeans = userApi.getUserByUserIds(enfrorcement.getLawEnforcerTwoId()); + 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); + } + enfrorcement.setLawEnforcer2Show(tmpUserShow); return ZDResponse.success("查询成功", enfrorcement); } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java index f1a2bf06..a44a925d 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java @@ -61,7 +61,7 @@ public class CorsFilter implements Filter { public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { //配置可信域名 String[] authhosts = {"http://10.132.108.3:85","http://jdm.szssfj.cn","http://localhost:85","http://192.168.31.196:3301","http://192.168.31.196:85","http://127.0.0.1:85", - "http://localhost:3301","http://192.168.110.35:3301","http://localhost:86"}; + "http://localhost:3301","http://192.168.110.35:3301","http://localhost:86","http://192.168.110.41:3301"}; String authost = ""; HttpServletRequest httprequest = (HttpServletRequest) request; String origin = httprequest.getHeader("Origin"); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java index 6ce765b2..dd5bfd01 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java @@ -121,6 +121,16 @@ public class EnterpriseLawEnforcement extends BaseDomain private Integer comOrOpi; private Integer mainDeputyOrder; private String tmpDeptJson; + // 用来展示执法人员名称 - 执法编码的 + private String lawEnforcer2Show; + + public String getLawEnforcer2Show() { + return lawEnforcer2Show; + } + + public void setLawEnforcer2Show(String lawEnforcer2Show) { + this.lawEnforcer2Show = lawEnforcer2Show; + } public String getCheckItemText() { return checkItemText;