From 853d981286b60702e05ed8be499e733cef76f98e Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Thu, 22 Aug 2024 09:22:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9F=A5=E8=AF=A2=E6=89=A7?= =?UTF-8?q?=E6=B3=95=E8=AE=A1=E5=88=92=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 34 +++++++++++++++++++ .../zdxt/code/domain/EnterpriseComplaint.java | 13 +++++++ .../EnforcementRegistrationServiceImpl.java | 20 +++++------ .../impl/EnterpriseComplaintServiceImpl.java | 17 ++++++++-- .../mapper/EnforcementRegistrationMapper.xml | 6 ++-- 5 files changed, 76 insertions(+), 14 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java index 3b822dfd..d238dbfe 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java @@ -152,6 +152,40 @@ public class AppEnforcementRegistrationController 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); + } + // 判断超时多少天 + 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); + } + /** * 新增执法端-执法登记 */ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java index 9559b244..6470f21f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java @@ -57,6 +57,7 @@ public class EnterpriseComplaint extends BaseDomain */ private String evaluateTime; + public String getProWoCode() { return proWoCode; } @@ -78,9 +79,21 @@ public class EnterpriseComplaint extends BaseDomain */ private List fileList; + /** + * 统一信用代码 + */ public String enterpriseNumber; + /** + * 检查事项 + */ public String lawEnforcementIncident; + /** + * 投诉类型 + */ public String enforceTypeText; + /** + * 企业名称 + */ public String enterpriseName; private List fileListObj; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index e2e8c16b..4b1bfe1f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -126,16 +126,16 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat { List enforcementRegistrations = enforcementRegistrationMapper.selectEnforcementRegistrationList(enforcementRegistration); - for (EnforcementRegistration registration : enforcementRegistrations) { - LinkageDict linkageDict = linkageDictMapper.selectLinkageDictById(registration.getLawEnforcementItem()); - if(BeanUtil.isNotEmpty(linkageDict) && StrUtil.isNotEmpty(linkageDict.getId())){ - registration.setLawEnforcementItemText(linkageDict.getTitle()); - } - LinkageDict linkageBasic = linkageDictMapper.selectLinkageDictById(registration.getLawEnforcementBasis()); - if(BeanUtil.isNotEmpty(linkageBasic) && StrUtil.isNotEmpty(linkageBasic.getId())){ - registration.setLawEnforcementBasisText(linkageBasic.getTitle()); - } - } +// for (EnforcementRegistration registration : enforcementRegistrations) { +// LinkageDict linkageDict = linkageDictMapper.selectLinkageDictById(registration.getLawEnforcementItem()); +// if(BeanUtil.isNotEmpty(linkageDict) && StrUtil.isNotEmpty(linkageDict.getId())){ +// registration.setLawEnforcementItemText(linkageDict.getTitle()); +// } +// LinkageDict linkageBasic = linkageDictMapper.selectLinkageDictById(registration.getLawEnforcementBasis()); +// if(BeanUtil.isNotEmpty(linkageBasic) && StrUtil.isNotEmpty(linkageBasic.getId())){ +// registration.setLawEnforcementBasisText(linkageBasic.getTitle()); +// } +// } return enforcementRegistrations; } 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 9467dc75..71dfd5e6 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 @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONObject; @@ -70,7 +71,19 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi @Override public List selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint) { - return enterpriseComplaintMapper.selectEnterpriseComplaintList(enterpriseComplaint); + List enterpriseComplaints = + enterpriseComplaintMapper.selectEnterpriseComplaintList(enterpriseComplaint); + for (int i = 0; i < enterpriseComplaints.size(); i++) { + if(StringUtils.isNotEmpty(enterpriseComplaints.get(i).getRelId())){ + EnforcementRegistration enforcementRegistration = + enforcementRegistrationMapper.selectEnforcementRegistrationById(enterpriseComplaints.get(i).getRelId()); + //判断检查事件是否为空 + if(BeanUtil.isNotEmpty(enforcementRegistration) && StringUtils.isNotEmpty(enforcementRegistration.getLawEnforcementItemText())){ + enterpriseComplaints.get(i).setLawEnforcementIncident(enforcementRegistration.getLawEnforcementItemText()); + } + } + } + return enterpriseComplaints; } /** @@ -124,7 +137,7 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi for (int z=0; z and law_enforcement like concat('%', #{lawEnforcement}, '%') + and bureau_dept_name like concat('%', #{bureauDeptName}, '%') and law_enforcement_id = #{lawEnforcementId} and enterprise_id = #{enterpriseId} and enterprise_name like concat('%', #{enterpriseName}, '%') @@ -92,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and user_id = #{userId} and dept_id = #{deptId} and is_delete = #{isDelete} + and is_complaint = #{isComplaint} and status = #{status} and law_enforcement_code = #{lawEnforcementCode} @@ -126,10 +128,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(enforcement_time, '%Y-%m') = #{dateSearch} - and DATE_FORMAT(enforcement_time,'%Y-%m') >= #{beginTime} + and DATE_FORMAT(enforcement_time,'%Y-%m-%d') >= #{beginTime} - and DATE_FORMAT(enforcement_time,'%Y-%m') <= #{endTime} + and DATE_FORMAT(enforcement_time,'%Y-%m-%d') <= #{endTime}