From c765e4ae288883e6e070cfd972dfb194dc88f036 Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Mon, 15 Apr 2024 02:24:04 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zdxt/domain/auth/DictData.java | 2 +- .../java/com/zdxt/auth/feign/UserApiImpl.java | 3 +- .../resources/mapper/system/UserMapper.xml | 2 +- .../java/com/zdxt/log/aspectj/LogAspect.java | 2 +- .../controller/LinkageDictController.java | 16 +++---- .../controller/StatisticalController.java | 13 ++++++ .../com/zdxt/code/domain/StatisticalVo.java | 26 +++++++++++ .../zdxt/code/mapper/StatisticalMapper.java | 21 +++++++++ .../zdxt/code/service/StatisticalService.java | 8 ++++ .../EnforcementRegistrationServiceImpl.java | 43 ++++++++++++++++--- .../impl/EnterpriseComplaintServiceImpl.java | 16 ++++--- .../EnterpriseInformationServiceImpl.java | 18 ++++---- .../EnterpriseLawEnforcementServiceImpl.java | 15 ++++++- .../service/impl/StatisticalServiceImpl.java | 33 ++++++++++++++ .../com/zdxt/code/task/EarlyWarningTask.java | 13 +++++- .../mapper/EnforcementRegistrationMapper.xml | 6 ++- .../mapper/EnterpriseInformationMapper.xml | 5 ++- .../LawEnforcementWarningListMapper.xml | 1 + .../resources/mapper/StatisticalMapper.xml | 42 ++++++++++-------- .../main/java/com/zdxt/auth/dto/UserBean.java | 14 ++++++ 20 files changed, 243 insertions(+), 56 deletions(-) diff --git a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/DictData.java b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/DictData.java index 8ced9027..34a46a29 100644 --- a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/DictData.java +++ b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/DictData.java @@ -75,7 +75,7 @@ public class DictData extends BaseDomain } @NotBlank(message = "字典标签不能为空") - @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") + @Size(min = 0, max = 300, message = "字典标签长度不能超过100个字符") public String getDictLabel() { return dictLabel; diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java index 000d70d4..9704ec92 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java @@ -58,7 +58,8 @@ public class UserApiImpl implements UserApi { userBean.setSex(sysUser.getSex()); userBean.setUserId(sysUser.getUserId()); userBean.setUserName(sysUser.getUserName()); - + User user = userMapper.selectUserById(sysUser.getUserId()); + userBean.setLawCertificateNum(user.getLawCertificateNum()); String[] deptIdArr = new String[]{}; // 设置部门信息 Dept dept = deptMapper.selectDeptById(sysUser.getDeptId()); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml index 380829d8..0db93ab8 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml @@ -63,7 +63,7 @@ - select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.kingdee_org_id,u.kingdee_user_id, u.type, + select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password,u.law_certificate_num, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.kingdee_org_id,u.kingdee_user_id, u.type, d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.tenant_code, t.tenant_code, t.tenant_name, t.contact_man, t.contact_number, t.address diff --git a/lib/EmergencyService/zdxtEmergencyLogService/src/main/java/com/zdxt/log/aspectj/LogAspect.java b/lib/EmergencyService/zdxtEmergencyLogService/src/main/java/com/zdxt/log/aspectj/LogAspect.java index d70e7a3b..7c326f80 100644 --- a/lib/EmergencyService/zdxtEmergencyLogService/src/main/java/com/zdxt/log/aspectj/LogAspect.java +++ b/lib/EmergencyService/zdxtEmergencyLogService/src/main/java/com/zdxt/log/aspectj/LogAspect.java @@ -116,7 +116,7 @@ public class LogAspect // 处理设置注解上的参数 getControllerMethodDescription(controllerLog, operLog); // 保存数据库 - operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp())); +// operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp())); iOperLogService.insertOperlog(operLog); } catch (Exception exp) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LinkageDictController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LinkageDictController.java index 7e71bc3d..30746e8b 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LinkageDictController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LinkageDictController.java @@ -29,7 +29,7 @@ public class LinkageDictController extends BaseController @Autowired private ILinkageDictService linkageDictService; - @RequiresPermissions("code:linkage:view") +// @RequiresPermissions("code:linkage:view") @GetMapping() public String view() { @@ -39,7 +39,7 @@ public class LinkageDictController extends BaseController /** * 查询联动字典列表 */ - @RequiresPermissions("code:linkage:view") +// @RequiresPermissions("code:linkage:view") @PostMapping("/listToPC") @ResponseBody public List listToPC(LinkageDict linkageDict) @@ -51,7 +51,7 @@ public class LinkageDictController extends BaseController /** * 查询联动字典列表 */ - @RequiresPermissions("code:linkage:view") +// @RequiresPermissions("code:linkage:view") @PostMapping("/list") @ResponseBody public List list(@RequestBody LinkageDict linkageDict) @@ -63,7 +63,7 @@ public class LinkageDictController extends BaseController /** * 查询联动字典列表 */ - @RequiresPermissions("code:linkage:view") +// @RequiresPermissions("code:linkage:view") @PostMapping("/objById") @ResponseBody public LinkageDict objById(@RequestBody LinkageDict linkageDict) @@ -75,7 +75,7 @@ public class LinkageDictController extends BaseController /** * 查询联动字典列表 */ - @RequiresPermissions("code:linkage:view") +// @RequiresPermissions("code:linkage:view") @PostMapping("/selectLinkageDictByValueAndParentId") @ResponseBody public LinkageDict selectLinkageDictByValueAndParentId(@RequestBody LinkageDict linkageDict) @@ -97,7 +97,7 @@ public class LinkageDictController extends BaseController /** * 新增保存联动字典 */ - @RequiresPermissions("code:linkage:add") +// @RequiresPermissions("code:linkage:add") @PostMapping("/add") @ResponseBody public ZDResponse addSave(LinkageDict linkageDict) @@ -123,7 +123,7 @@ public class LinkageDictController extends BaseController /** * 修改保存联动字典 */ - @RequiresPermissions("code:linkage:edit") +// @RequiresPermissions("code:linkage:edit") @PostMapping("/edit") @ResponseBody public ZDResponse editSave(LinkageDict linkageDict) @@ -134,7 +134,7 @@ public class LinkageDictController extends BaseController /** * 删除联动字典 */ - @RequiresPermissions("code:linkage:remove") +// @RequiresPermissions("code:linkage:remove") @PostMapping( "/remove") @ResponseBody public ZDResponse remove(String ids) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalController.java index 8ac8a6f7..683ec364 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalController.java @@ -2,13 +2,16 @@ package com.zdxt.code.controller; import com.zdxt.code.domain.StatisticalVo; import com.zdxt.code.service.StatisticalService; +import com.zdxt.common.ZDResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; +import java.util.Map; @Controller @RequestMapping("/statistical") @@ -38,4 +41,14 @@ public class StatisticalController { mmp.put("statisticalVos",statisticalVos); return prefix2 + "/analysis"; } + /** + * 执法端H5统计 + * @return + */ + @GetMapping("/statisticalData") + @ResponseBody + public ZDResponse statisticalData(StatisticalVo statisticalVo){ + Map map = statisticalService.statisticalData(statisticalVo); + return ZDResponse.success("查询成功",map); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticalVo.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticalVo.java index 48f1cfa4..235e5208 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticalVo.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticalVo.java @@ -33,6 +33,16 @@ public class StatisticalVo extends BaseDomain { */ private Integer enterpriseType; + /** + * 执法人员 + */ + private String lawEnforcer; + + /** + * 投诉案件 + */ + private Integer complaintCount; + public String getLawEnforcement() { return lawEnforcement; } @@ -80,4 +90,20 @@ public class StatisticalVo extends BaseDomain { public void setEnterpriseType(Integer enterpriseType) { this.enterpriseType = enterpriseType; } + + public String getLawEnforcer() { + return lawEnforcer; + } + + public void setLawEnforcer(String lawEnforcer) { + this.lawEnforcer = lawEnforcer; + } + + public Integer getComplaintCount() { + return complaintCount; + } + + public void setComplaintCount(Integer complaintCount) { + this.complaintCount = complaintCount; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalMapper.java index f6a6ba3b..f9d5e308 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalMapper.java @@ -20,4 +20,25 @@ public interface StatisticalMapper { * @return */ List statisticalLawEnforcementItem(StatisticalVo statisticalVo); + + /** + * 统计执法人员 + * @param statisticalVo + * @return + */ + List statisticalLawEnforcer(StatisticalVo statisticalVo); + + /** + * 统计企业类型 + * @param statisticalVo + * @return + */ + List statisticalEnterpriseType(StatisticalVo statisticalVo); + + /** + * 统计本月案件总数 和 投诉案件 + * @param statisticalVo + * @return + */ + StatisticalVo statisticalToMouth(StatisticalVo statisticalVo); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalService.java index 94ba22a6..97ef3799 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalService.java @@ -3,6 +3,7 @@ package com.zdxt.code.service; import com.zdxt.code.domain.StatisticalVo; import java.util.List; +import java.util.Map; public interface StatisticalService { @@ -13,4 +14,11 @@ public interface StatisticalService { */ List StatisticalCaseload(StatisticalVo statisticalVo); + /** + * 执法端统计分析 + * @param statisticalVo + * @return + */ + Map statisticalData(StatisticalVo statisticalVo); + } 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 d1baf153..ad31bd5e 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 @@ -6,13 +6,13 @@ import java.util.stream.Collectors; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.dto.ZdxtFileBean; import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.feign.ZdxtFileCommonApi; -import com.zdxt.code.domain.EnforceRegCount; -import com.zdxt.code.domain.LawEnforcementWarningList; -import com.zdxt.code.domain.RuleItemList; +import com.zdxt.code.domain.*; +import com.zdxt.code.mapper.LinkageDictMapper; import com.zdxt.code.service.ILawEnforcementWarningListService; import com.zdxt.code.service.IRuleItemListService; import com.zdxt.common.util.DateUtils; @@ -20,11 +20,11 @@ import com.zdxt.common.util.StringUtils; import com.zdxt.common.zdxtFile.AttFileRespDTO; import com.zdxt.common.zdxtFile.FilePreviewUtilBean; import com.zdxt.common.zdxtFile.ZdxtFileCommon; +import com.zdxt.flow.mapper.IUserMapper; import org.dmg.pmml.association.Item; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zdxt.code.mapper.EnforcementRegistrationMapper; -import com.zdxt.code.domain.EnforcementRegistration; import com.zdxt.code.service.IEnforcementRegistrationService; /** @@ -48,6 +48,10 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat @Autowired private UserApi userApi; + @Autowired + private LinkageDictMapper linkageDictMapper; + + @Autowired private ILawEnforcementWarningListService lawEnforcementWarningListService; @@ -60,7 +64,24 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat @Override public EnforcementRegistration selectEnforcementRegistrationById(String id) { - return enforcementRegistrationMapper.selectEnforcementRegistrationById(id); + EnforcementRegistration enforcementRegistration = + enforcementRegistrationMapper.selectEnforcementRegistrationById(id); + if(enforcementRegistration.getLawEnforcerId() != null){ + UserBean user = + userApi.getUserByUserId(enforcementRegistration.getLawEnforcerId()); + enforcementRegistration.setLawEnforcer(enforcementRegistration.getLawEnforcer() + " " + user.getLawCertificateNum() ); + } + if(enforcementRegistration.getLawEnforcerIdTwo() != null){ + UserBean user = + userApi.getUserByUserId(enforcementRegistration.getLawEnforcerIdTwo()); + enforcementRegistration.setLawEnforcerTwo(enforcementRegistration.getLawEnforcerTwo() + " " + user.getLawCertificateNum() ); + } + if(enforcementRegistration.getSubsidiaryerId() != null){ + UserBean user = + userApi.getUserByUserId(enforcementRegistration.getSubsidiaryerId()); + enforcementRegistration.setSubsidiaryer(enforcementRegistration.getSubsidiaryer() + " " + user.getLawCertificateNum() ); + } + return enforcementRegistration; } /** @@ -72,7 +93,17 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat @Override public List selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration) { - return enforcementRegistrationMapper.selectEnforcementRegistrationList(enforcementRegistration); + List enforcementRegistrations = + enforcementRegistrationMapper.selectEnforcementRegistrationList(enforcementRegistration); + for (EnforcementRegistration registration : enforcementRegistrations) { + LinkageDict linkageDict = linkageDictMapper.selectLinkageDictById(registration.getLawEnforcementItem()); +// System.out.println(linkageDict); + if(BeanUtil.isNotEmpty(linkageDict) && StrUtil.isNotEmpty(linkageDict.getId())){ + registration.setLawEnforcementItem(linkageDict.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 62c46ff1..7334f439 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 @@ -86,13 +86,17 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi zdxtFileCommon.setUploadPersonId(user.getUserId().toString()); zdxtFileCommon.setUploadPersonName(user.getUserName()); zdxtFileCommonApi.addZdxtFileCommon(zdxtFileCommon); - //修改执法记录状态为已投诉 - EnforcementRegistration enforcementRegistration = new EnforcementRegistration(); - enforcementRegistration.setIsComplaint(1); - enforcementRegistration.setId(enterpriseComplaint.getRelId()); - enforcementRegistrationMapper.updateEnforcementRegistration(enforcementRegistration); + }); - } + + } + if(i > 0){ + //修改执法记录状态为已投诉 + EnforcementRegistration enforcementRegistration = new EnforcementRegistration(); + enforcementRegistration.setIsComplaint(1); + enforcementRegistration.setId(enterpriseComplaint.getRelId()); + enforcementRegistrationMapper.updateEnforcementRegistration(enforcementRegistration); + } return i; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java index 90ef7327..55c7fb5e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java @@ -109,11 +109,11 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS public int insertEnterpriseInformation(EnterpriseInformation enterpriseInformation) { enterpriseInformation.setCreateTime(DateUtils.getNowDate()); -// enterpriseInformation.setId(IdUtil.simpleUUID()); -// UserBean user = userApi.getCurrentUser(); -// enterpriseInformation.setCreateBy(user.getUserName()); -// enterpriseInformation.setUserId(user.getUserId()); -// enterpriseInformation.setDeptId(user.getDeptId()); + enterpriseInformation.setId(IdUtil.simpleUUID()); + UserBean user = userApi.getCurrentUser(); + enterpriseInformation.setCreateBy(user.getUserName()); + enterpriseInformation.setUserId(user.getUserId()); + enterpriseInformation.setDeptId(user.getDeptId()); //生成企业统一信用代码盐 String salt = PasswordTools.encrypt(enterpriseInformation.getEnterpriseNumber()); enterpriseInformation.setSalt(salt); @@ -121,7 +121,7 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS if(i > 0){ String text = salt; //这里设置自定义网站url - String logoPath = null; + String logoPath = qrCodeUrl; try { File encode = QRCodeUtil.encodeFile(text, logoPath, filePath, true); MultipartFile multipartFile = QRCodeUtil.getMultipartFile(encode); @@ -147,8 +147,8 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS enterpriseMerchantAuthorization.setEnterpriseName(enterpriseInformation.getEnterpriseName()); enterpriseMerchantAuthorization.setId(IdUtil.simpleUUID()); enterpriseMerchantAuthorization.setEnterpriseNumber(enterpriseInformation.getEnterpriseNumber()); - enterpriseMerchantAuthorization.setMerchantName(enterpriseInformation.getLegalPerson()); - enterpriseMerchantAuthorization.setMerchantTel(enterpriseInformation.getEnterpriseTel()); + enterpriseMerchantAuthorization.setMerchantName(user.getUserName()); + enterpriseMerchantAuthorization.setMerchantTel(user.getPhonenumber()); iEnterpriseMerchantAuthorizationService.insertEnterpriseMerchantAuthorization(enterpriseMerchantAuthorization); } @@ -234,6 +234,8 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS qrCodeGenerateHistory.setQrCodeUrl(upload); //统一信用代码 qrCodeGenerateHistory.setEnterpriseNumber(enterpriseInformation.getEnterpriseNumber()); + //变更原因 + qrCodeGenerateHistory.setReasonsChange("登记"); int i = iQrCodeGenerateHistoryService.insertQrCodeGenerateHistory(qrCodeGenerateHistory); //TODO 调用同步接口 同步企业工商信息 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java index 3cb523d1..85dc693c 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.feign.ZdxtFileCommonApi; @@ -47,7 +48,19 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc @Override public EnterpriseLawEnforcement selectEnterpriseLawEnforcementById(String id) { - return enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementById(id); + EnterpriseLawEnforcement enterpriseLawEnforcement = + enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementById(id); + if(enterpriseLawEnforcement.getLawEnforcerId() != null){ + UserBean user = + userApi.getUserByUserId(Long.valueOf(enterpriseLawEnforcement.getLawEnforcerId())); + enterpriseLawEnforcement.setLawEnforcer(enterpriseLawEnforcement.getLawEnforcer() + " " + user.getLawCertificateNum() ); + } + if(StrUtil.isNotEmpty(enterpriseLawEnforcement.getLawEnforcerTwoId())){ + UserBean user = + userApi.getUserByUserId(Long.valueOf(enterpriseLawEnforcement.getLawEnforcerTwoId())); + enterpriseLawEnforcement.setLawEnforcerTwo(enterpriseLawEnforcement.getLawEnforcerTwo() + " " + user.getLawCertificateNum() ); + } + return enterpriseLawEnforcement; } /** diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java index 2da5e546..1eb95965 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java @@ -1,12 +1,16 @@ package com.zdxt.code.service.impl; +import com.zdxt.code.domain.LinkageDict; import com.zdxt.code.domain.StatisticalVo; +import com.zdxt.code.mapper.LinkageDictMapper; import com.zdxt.code.mapper.StatisticalMapper; import com.zdxt.code.service.StatisticalService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class StatisticalServiceImpl implements StatisticalService @@ -14,6 +18,9 @@ public class StatisticalServiceImpl implements StatisticalService @Autowired private StatisticalMapper statisticalMapper; + + @Autowired + private LinkageDictMapper linkageDictMapper; @Override public List StatisticalCaseload(StatisticalVo statisticalVo) { @@ -21,4 +28,30 @@ public class StatisticalServiceImpl implements StatisticalService List statisticalVos = statisticalMapper.StatisticalCaseload(statisticalVo); return statisticalVos; } + + @Override + public Map statisticalData(StatisticalVo statisticalVo) { + //执法事项统计 + List statisticalVos = statisticalMapper.statisticalLawEnforcementItem(statisticalVo); + for (StatisticalVo vo : statisticalVos) { + LinkageDict linkageDict = linkageDictMapper.selectLinkageDictById(vo.getLawEnforcementItem()); + if(null != linkageDict){ + vo.setLawEnforcementItem(linkageDict.getTitle()); + } + } + + //企业类型数据 + List statisticalVos1 = statisticalMapper.statisticalEnterpriseType(statisticalVo); + //执法人员统计 + List statisticalVos2 = statisticalMapper.statisticalLawEnforcer(statisticalVo); + //本月案件总数统计 + StatisticalVo statisticalVos3 = statisticalMapper.statisticalToMouth(statisticalVo); + + Map dataList = new HashMap<>(); + dataList.put("item",statisticalVos); + dataList.put("enterpriseType",statisticalVos1); + dataList.put("lawEnforcer",statisticalVos2); + dataList.put("mouth",statisticalVos3); + return dataList; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java index 47f46bc0..f18d9e03 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java @@ -6,8 +6,10 @@ import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.UserApi; import com.zdxt.code.domain.EnforceRegCount; import com.zdxt.code.domain.EnforcementRegistration; +import com.zdxt.code.domain.EnterpriseInformation; import com.zdxt.code.domain.LawEnforcementWarningList; import com.zdxt.code.service.IEnforcementRegistrationService; +import com.zdxt.code.service.IEnterpriseInformationService; import com.zdxt.code.service.ILawEnforcementWarningListService; import com.zdxt.common.util.DateUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -23,6 +25,8 @@ public class EarlyWarningTask { @Autowired private IEnforcementRegistrationService iEnforcementRegistrationService; @Autowired private ILawEnforcementWarningListService lawEnforcementWarningListService; + @Autowired + private IEnterpriseInformationService iEnterpriseInformationService; @Autowired private UserApi userApi; @@ -47,7 +51,14 @@ public class EarlyWarningTask { warning.setWarningTime(DateUtils.getNowDate()); warning.setWarningCause("本月对该企业已检查" + warn.getNum() + "次"); warning.setWarningLevel(Integer.parseInt(warn.getLevel())); - warning.setEnterpriseName(warn.getLawEnforcement()); +// warning.setEnterpriseName(warn.get()); + EnterpriseInformation enterpriseInformation = new EnterpriseInformation(); + enterpriseInformation.setEnterpriseNumber(warn.getEnterpriseNumber()); + List enterpriseInformations = + iEnterpriseInformationService.selectEnterpriseInformationList(enterpriseInformation); + if(enterpriseInformations.size() > 0){ + warning.setEnterpriseName(enterpriseInformations.get(0).getEnterpriseName()); + } warning.setEnterpriseNumber(warn.getEnterpriseNumber()); warning.setEnforcementNumber(warn.getNum()); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 71fd38ac..762e3e82 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -41,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, law_enforcement, law_enforcement_id, enterprise_id, enterprise_name, enterprise_number, enforcement_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_tel, law_enforcer_two, law_enforcer_id_two, law_enforcer_tel_two, subsidiaryer, subsidiaryer_id, subsidiaryer_tel, law_enforcement_item, law_enforcement_basis, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code from enforcement_registration + select id, law_enforcement, law_enforcement_id, enterprise_id, enterprise_name, enterprise_number, enforcement_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_tel, law_enforcer_two, law_enforcer_id_two, law_enforcer_tel_two, subsidiaryer, subsidiaryer_id, subsidiaryer_tel, law_enforcement_item, law_enforcement_basis, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code,is_complaint from enforcement_registration select count(*) as total , - COUNT(CASE WHEN is_complaint = 1 THEN 1 END) AS complaintCount + COUNT(CASE WHEN is_complaint = 1 THEN 1 END) AS complaint_count from enforcement_registration WHERE DATE_FORMAT(create_time, '%Y%m' ) = DATE_FORMAT( CURDATE(), '%Y%m' ); diff --git a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java index 7ee85b4f..d84b3a90 100644 --- a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java +++ b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java @@ -69,6 +69,12 @@ public class UserBean implements Serializable { @ApiModelProperty("手机号码") private String phonenumber; + /** + * 手机号码 + */ + @ApiModelProperty("执法证件号") + private String lawCertificateNum; + /** * 用户性别 */ @@ -267,6 +273,14 @@ public class UserBean implements Serializable { this.password = password; } + public String getLawCertificateNum() { + return lawCertificateNum; + } + + public void setLawCertificateNum(String lawCertificateNum) { + this.lawCertificateNum = lawCertificateNum; + } + @Override public String toString() { return "UserBean{" +