From b34919b6365132a8be7830708da99cba7dcef011 Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Tue, 30 Sep 2025 14:52:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=A6=82=E6=9E=9C=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=B8=8D=E5=88=B0=E7=9B=B4=E6=8E=A5=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E5=AE=8C=E6=95=B4=E7=9A=84=E5=90=8C=E6=84=8F=E4=BF=A1=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=99=E5=8E=BB=E5=B8=82=E7=9B=91=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=AD=98=E5=85=A5=E5=A6=82=E4=B8=9A=E5=8A=A1=E8=A1=A8?= =?UTF-8?q?=E5=86=8D=E8=BF=94=E5=9B=9E,=20=E6=8A=95=E8=AF=89=E6=B6=89?= =?UTF-8?q?=E4=BA=8B=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=BA=A7?= =?UTF-8?q?=E8=81=94=E6=93=8D=E4=BD=9C,=20=E6=96=B0=E5=A2=9E=E5=B8=82?= =?UTF-8?q?=E5=A4=96=E6=B3=A8=E5=86=8C=E4=BC=81=E4=B8=9A=E7=9A=84=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=9F=E8=83=BD.=20(=E8=BF=98=E6=9C=89=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E9=9B=B6=E6=95=A3=E7=9A=84=E5=B0=8Fbug)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppComplaintItemController.java | 41 +++++ .../AppEnterpriseInformationController.java | 22 +++ .../com/zdxt/app/task/SynDeptInfoTask.java | 171 ++++++++++++++++++ .../java/com/zdxt/app/task/SynDeptTask.java | 2 +- .../com/zdxt/auth/feign/DictDataApiImpl.java | 11 ++ .../system/dept/service/DeptServiceImpl.java | 44 ++--- .../system/dict/mapper/DictDataMapper.java | 1 + .../mapper/system/DictDataMapper.xml | 8 + .../project/code/statistical/home.html | 49 ++++- .../nonRegistration/nonRegistrationView.html | 26 +-- .../code/domain/ComprehensiveAnalysis.java | 30 +++ .../mapper/ComprehensiveAnalysisMapper.java | 1 + .../com/zdxt/code/mapper/SrzDeptMapper.java | 2 + .../IEnterpriseInformationService.java | 1 + .../zdxt/code/service/ISrzDeptService.java | 3 + .../ComprehensiveAnalysisServiceImpl.java | 10 + .../EnterpriseInformationServiceImpl.java | 5 + ...NonEnforcementRegistrationServiceImpl.java | 11 +- .../code/service/impl/SrzDeptServiceImpl.java | 7 +- .../code/service/impl/SrzUserServiceImpl.java | 2 +- .../impl/SsztJbxx110497ServiceImpl.java | 45 ++--- .../impl/StatisticalPaneServiceImpl.java | 2 +- .../code/task/SrzUserOriginalDataTask.java | 2 +- .../mapper/ComprehensiveAnalysisMapper.xml | 26 +++ .../NonEnforcementRegistrationMapper.xml | 27 +-- .../main/resources/mapper/SrzDeptMapper.xml | 9 +- .../java/com/zdxt/auth/feign/DictDataApi.java | 4 + 27 files changed, 474 insertions(+), 88 deletions(-) create mode 100644 lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptInfoTask.java diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppComplaintItemController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppComplaintItemController.java index 7aaa31aa..41bfc3b0 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppComplaintItemController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppComplaintItemController.java @@ -1,5 +1,7 @@ package com.zdxt.app.controller; +import com.zdxt.auth.dto.DictDataBean; +import com.zdxt.auth.feign.DictDataApi; import com.zdxt.code.domain.ComplaintItem; import com.zdxt.code.service.IComplaintItemService; import com.zdxt.common.ZDResponse; @@ -7,6 +9,7 @@ import com.zdxt.common.controller.BaseController; import com.zdxt.common.util.TableDataInfo; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; @@ -14,7 +17,11 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** @@ -30,6 +37,8 @@ public class AppComplaintItemController extends BaseController { @Autowired private IComplaintItemService complaintItemService; + @Autowired + private DictDataApi dictDataApi; @GetMapping() public String item() { @@ -139,4 +148,36 @@ public class AppComplaintItemController extends BaseController { } return file; } + + /** + * 获取区/街道数据用来做级联 + * @return + */ + @GetMapping("/getRegionCascade") + @ResponseBody + public ZDResponse getRegionCascade() { + List> result = new ArrayList<>(); + DictDataBean dictParams = new DictDataBean(); + dictParams.setDictType("address_type"); + List dictDatas = dictDataApi.getDictData(dictParams); + String[] areaKey = dictDatas.stream().map(DictDataBean::getDictValue).toArray(String[]::new); + List streams = dictDataApi.getDatasByTypeIn(areaKey); + for (DictDataBean dictData : dictDatas) { + Map areaMap = new HashMap<>(); + areaMap.put("text", dictData.getDictLabel()); + areaMap.put("value", dictData.getDictValue()); + List> tmps = new ArrayList<>(); + for (DictDataBean stream : streams) { + if (dictData.getDictValue().equals(stream.getDictType())) { + Map streamMap = new HashMap<>(); + streamMap.put("text", stream.getDictLabel()); + streamMap.put("value", stream.getDictValue()); + tmps.add(streamMap); + } + } + areaMap.put("children", tmps); + result.add(areaMap); + } + return ZDResponse.success("街道获取成功", result); + } } diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java index 21b2f454..53d9c4fe 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; +import javax.websocket.server.PathParam; import java.util.List; /** @@ -79,6 +80,17 @@ public class AppEnterpriseInformationController extends BaseController // startPage(); List list = enterpriseInformationService.selectEnterpriseInformationAndQrInfo(enterpriseInformation); int count = enterpriseInformationService.selectEnterpriseInformationAndQrInfoCount(enterpriseInformation); + // 本地环境未搜索到相关企业, 通过执法证件号去市监同步表获取 + if (count == 0) { + EnterpriseInformation res = enterpriseInformationService.searchEnterpriseByNumber(enterpriseInformation.getSearchValue()); + if (res != null) { + int add_ress = enterpriseInformationService.insertEnterpriseInformation(res); + if (add_ress > 0) { + list = enterpriseInformationService.selectEnterpriseInformationAndQrInfo(enterpriseInformation); + count = enterpriseInformationService.selectEnterpriseInformationAndQrInfoCount(enterpriseInformation); + } + } + } // return getDataTable(list); long total = Math.min(count, 60); TableDataInfo rspData = new TableDataInfo(); @@ -335,4 +347,14 @@ public class AppEnterpriseInformationController extends BaseController enterpriseInformationService.paresEnterpriseCode(url); return ZDResponse.success("市监二维码扫描成功",enterpriseInformation); } + + @GetMapping("/searchEnterpriseByNumber/{enterpriseNumber}") + @ResponseBody + public ZDResponse searchEnterpriseByNumber(@PathVariable("enterpriseNumber") String enterpriseNumber){ + EnterpriseInformation res = enterpriseInformationService.searchEnterpriseByNumber(enterpriseNumber); + if (null != res) { + return ZDResponse.success("查询成功", res); + } + return ZDResponse.error("该企业未在深圳市注册"); + } } diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptInfoTask.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptInfoTask.java new file mode 100644 index 00000000..38af41e5 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptInfoTask.java @@ -0,0 +1,171 @@ +package com.zdxt.app.task; + +import com.zdxt.auth.common.utils.StringUtils; +import com.zdxt.auth.project.system.dept.service.IDeptService; +import com.zdxt.code.domain.SrzDept; +import com.zdxt.code.service.ISrzDeptService; +import com.zdxt.domain.auth.Dept; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +/** + * @Author: kylin + * @Date: 2024/5/9 2:58 下午 + * @Version: 1.0 + * @Desc: TODO + */ +@Component("synDeptInfoTask") +public class SynDeptInfoTask { + + @Value("${srnwg.secretKey}") + private String secretKey; + + @Autowired private ISrzDeptService iSrzDeptService; + @Autowired private IDeptService iDeptService; + + public static Map params = new HashMap<>(); + + private static final Logger log = LoggerFactory.getLogger(SynDeptInfoTask.class); + + + public void run(){ + this.deptInfo(); + } + + /** 同步部门数据 */ + public void deptInfo(){ + log.info("====================> 市认证原始表 -> 业务表 同步开始"); + int insertNum = 0; + int updateNum = 0; + int rowNom_srz = 0; + try { + // 做个死循环, 一直到查寻不到数据了再break + while (true) { + List srzDeptList = iSrzDeptService.selectDeptByNeedUpdate(); + // 如果查出结果为空 或 长度为0 则跳出循环 + if (srzDeptList == null || srzDeptList.isEmpty() || srzDeptList.size() == 0) break; + + // 开始同步更新数据到用户表 + for(SrzDept srzDept : srzDeptList){ + log.info("====> 获取数据: {}", srzDept.getName()); + Dept dept = new Dept(); + BeanUtils.copyProperties(srzDept,dept); + /* 机构ID organizationId */ + dept.setDeptId(srzDept.getOrganizationId()); +// dept.setOrganizationId(srzDept.getOrganizationId()); + /* 机构父节点 parentId */ + dept.setParentId(srzDept.getParentId()); + dept.setOrganizationParentId(srzDept.getParentId()); + /* 机构名称 name */ + dept.setDeptName(srzDept.getName()); +// /* 机构代码 code */ +// dept.setCode(srzDept.getCode()); +// /* 作用点 effectOn */ +// dept.setEffectOn(srzDept.getEffectOn()); +// /* 任务ID taskId */ +// dept.setTaskId(srzDept.getTaskId()); +// /* 机构全路径 zzDisplayPath */ +// dept.setZzDisplayPath(srzDept.getZzDisplayPath()); +// /* 是否叶子节点 zzIsLeaf */ +// dept.setZzIsLeaf(srzDept.getZzIsLeaf()); +// /* 机构层级 zzLevel */ +// dept.setZzLevel(Integer.valueOf(srzDept.getZzLevel())); +// /* 是否删除 isDeleted */ +// dept.setIsDeleted(srzDept.getIsDeleted()); +// /* 是否禁用 isDisabled */ +// dept.setIsDisabled(srzDept.getIsDisabled()); +// /* 系统ID systemId */ +// dept.setSystemId(srzDept.getSystemId()); +// /* 排序 sequence */ +// dept.setSequence(srzDept.getSequence()); +// /* 创建时间 createAt */ +// dept.setCreateAt(srzDept.getCreateAt()); +// /* 更新时间 updateAt */ +// dept.setUpdateAt(srzDept.getUpdateAt()); +// /* 下游唯一标识 guid */ +// dept.setGuid(srzDept.getGuid()); +// /* 是否驻区机构 isMappingUnit */ +// dept.setIsMappingUnit(srzDept.getIsMappingUnit()); +// /* 驻区机构上级机构id mappingUnitParentId */ +// dept.setMappingUnitParentId(srzDept.getMappingUnitParentId()); +// /* 省认证机构id srzUnitId */ +// dept.setSrzUnitId(srzDept.getSrzUnitId()); +// /* 机构简称 simpleName */ +// dept.setSimpleName(dept.getSimpleName()); +// /* 是否法定机构 isStatutoryOrg */ +// dept.setIsStatutoryOrg(srzDept.getIsStatutoryOrg()); +// /* 是否生效 isActive */ +// dept.setIsActive(srzDept.getIsActive()); +// /* 机构状态代码 unitStatusCode */ +// dept.setUnitStatusCode(srzDept.getUnitStatusCode()); +// /* 机构状态 unitStatus */ +// dept.setUnitStatus(srzDept.getUnitStatus()); +// /* 机构类型 unitType */ +// dept.setUnitType(srzDept.getUnitType()); +// /* 行政区划代码 xzqhCode */ +// dept.setXzqhCode(srzDept.getXzqhCode()); +// /* 行政区划 xzqh */ +// dept.setXzqh(srzDept.getXzqh()); +// /* 是否参公管理 isCGManager */ +// dept.setIsCGManager(srzDept.getIsCGManager()); +// /* 是否局（委）办 isBureauOffice */ +// dept.setIsBureauOffice(srzDept.getIsBureauOffice()); +// /* 机构类型代码 unitTypeCode */ +// dept.setUnitTypeCode(srzDept.getUnitTypeCode()); +// /* 单位性质代码 dwxzCode */ +// dept.setDwxzCode(srzDept.getDwxzCode()); +// /* 单位性质 dwxz */ +// dept.setDwxz(srzDept.getDwxz()); +// /* 系统单位类型编码 unitSysTypeCode */ +// dept.setUnitTypeCode(srzDept.getUnitTypeCode()); +// /* 系统单位类型 unitSysType */ +// dept.setUnitSysType(srzDept.getUnitSysType()); +// /* 单位系统类别描述 dwxtlbms */ +// dept.setDwxtlbms(srzDept.getDwxtlbms()); +// /* 机构规格代码 unitLevelCode */ +// dept.setUnitLevelCode(srzDept.getUnitLevelCode()); +// /* 机构规格 unitLevel */ +// dept.setUnitLevel(srzDept.getUnitLevel()); +// /* 统一社会信用代码 creditcode */ +// dept.setCreditcode(srzDept.getCreditcode()); +// /* 描述 description */ +// dept.setDescription(srzDept.getDescription()); + + //限制唯一部门id + String organizationId = srzDept.getOrganizationId(); + if(StringUtils.isNotEmpty(organizationId)){ + Dept uniqueDept = iDeptService.selectDeptById(organizationId); + if (null != uniqueDept && uniqueDept.getDeptId() != null) { + // 更新数据库 + dept.setDeptId(uniqueDept.getDeptId()); + log.info("====> 更新数据: {}: {}", uniqueDept.getDeptId(), uniqueDept.getDeptName()); + int rowNum = iDeptService.updateDept(dept); + updateNum += rowNum; + } else { + // 插入数据库 + log.info("====> 新增数据: {}: {}", dept.getDeptId(), dept.getDeptName()); + int rowNum = iDeptService.insertDept(dept); + insertNum += rowNum; + } + srzDept.setNeedUpdate(1); + int srz_num = iSrzDeptService.updateSrzDept(srzDept); + rowNom_srz += srz_num; + } + } + } + log.info("新增部门数量 : {} / 更新用户数量 : {} / 更新原始表数 : {}", insertNum, updateNum, rowNom_srz); + } catch (Exception e) { + System.out.println(e); + e.printStackTrace(); + } + } +} diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptTask.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptTask.java index 6537465c..6e26bc15 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptTask.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptTask.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; * @Version: 1.0 * @Desc: TODO */ -@Component("synDeptTask") +//@Component("synDeptTask") public class SynDeptTask { @Value("${srnwg.systemCode}") diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DictDataApiImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DictDataApiImpl.java index 4bccaf41..e0ced844 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DictDataApiImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DictDataApiImpl.java @@ -49,4 +49,15 @@ public class DictDataApiImpl implements DictDataApi { } return BeanList; } + + public List getDatasByTypeIn(String[] type) { + List list = dictDataMapper.selectDictDataListToIn(type); + List BeanList = new ArrayList<>(); + for(DictData dict : list ){ + DictDataBean dictBean = new DictDataBean(); + BeanUtil.copyProperties(dict, dictBean); + BeanList.add(dictBean); + } + return BeanList; + } } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java index 652024e7..309291b0 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java @@ -346,12 +346,13 @@ public class DeptServiceImpl implements IDeptService public int insertDept(Dept dept) { Dept info = deptMapper.selectDeptById(dept.getParentId()); + if (null == info) { return 0; } // 如果父节点不为"正常"状态,则不允许新增子节点 if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) { throw new BusinessException("部门停用，不允许新增"); } - dept.setCreateBy(ShiroUtils.getLoginName()); +// dept.setCreateBy(ShiroUtils.getLoginName()); dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); return deptMapper.insertDept(dept); } @@ -365,27 +366,28 @@ public class DeptServiceImpl implements IDeptService @Transactional public int updateDept(Dept dept) { - Dept newParentDept = deptMapper.selectDeptById(dept.getParentId()); - Dept oldDept = selectDeptById(dept.getDeptId()); - if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) - { - String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId(); - String oldAncestors = oldDept.getAncestors(); - dept.setAncestors(newAncestors); - updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); - } - dept.setUpdateBy(ShiroUtils.getLoginName()); - int result = deptMapper.updateDept(dept); - - // 判断是否有对应的企业信息, 如果有的话. 需要同时更新企业那边的信息 - +// Dept newParentDept = deptMapper.selectDeptById(dept.getParentId()); +// Dept oldDept = selectDeptById(dept.getDeptId()); +// if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) +// { +// String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId(); +// String oldAncestors = oldDept.getAncestors(); +// dept.setAncestors(newAncestors); +// updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); +// } +// int result = deptMapper.updateDept(dept); +// // 判断是否有对应的企业信息, 如果有的话. 需要同时更新企业那边的信息 +// if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) +// { +// // 如果该部门是启用状态，则启用该部门的所有上级部门 +// updateParentDeptStatus(dept); +// } +// return result; - if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) - { - // 如果该部门是启用状态，则启用该部门的所有上级部门 - updateParentDeptStatus(dept); - } - return result; + Dept info = deptMapper.selectDeptById(dept.getParentId()); + if (null == info) { return 0; } + dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); + return deptMapper.updateDept(dept); } @Override diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dict/mapper/DictDataMapper.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dict/mapper/DictDataMapper.java index cca0bcb5..f4956b49 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dict/mapper/DictDataMapper.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dict/mapper/DictDataMapper.java @@ -19,6 +19,7 @@ public interface DictDataMapper * @return 字典数据集合信息 */ public List selectDictDataList(DictData dictData); + public List selectDictDataListToIn(String[] dictType); public DictData selectDictData(DictData dictData); /** diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictDataMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictDataMapper.xml index fd60e605..eb67847c 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictDataMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictDataMapper.xml @@ -39,6 +39,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by dict_sort + + +
  • -

    执法人员：

    +

    入企人员：

  • @@ -28,7 +28,7 @@
  • -

    入企类别：

    +

    入企事由：

  • -

    执法时间：

    +

    入企时间：

    - @@ -150,9 +150,14 @@ showHeader: true, height:$(window).height()-$(".search-collapse").height()-$("#toolbar").height()-50, columns: [ + { + field : 'bureauDeptName', + title : '单位名称', + align :'center' + }, { field : 'enterpriseName', - title : '被执法企业名称', + title : '企业名称', align :'center' }, { @@ -165,24 +170,19 @@ title : '企业所属街道', align :'center' }, - { - field : 'bureauDeptName', - title : '执法单位', - align :'center' - }, { field : 'lawEnforcer', - title : '执法人员', + title : '入企人员', align :'center' }, { field : 'enforcementTime', - title : '执法时间', + title : '入企时间', align :'center' }, { field : 'lawEnforcementTypeText', - title : '入企类别', + title : '入企事由', align :'center' }, { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComprehensiveAnalysis.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComprehensiveAnalysis.java index 8323c49f..63d05b9f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComprehensiveAnalysis.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComprehensiveAnalysis.java @@ -82,6 +82,8 @@ public class ComprehensiveAnalysis { /** * 时间类型：year,quarter,month,day */ + private String entrustDeptId; + private Integer hasAuth; private String dateType; private Integer year; private Integer quarter; @@ -100,6 +102,10 @@ public class ComprehensiveAnalysis { * 联合检查数量 */ private Integer uniteTotal; + /** + * 委托检查数量 + */ + private Integer authTotal; /** * 执法检查预告数量 */ @@ -113,6 +119,14 @@ public class ComprehensiveAnalysis { */ private Integer enterpriseTotal; + public Integer getHasAuth() { + return hasAuth; + } + + public void setHasAuth(Integer hasAuth) { + this.hasAuth = hasAuth; + } + public List getLawEnforceCategoryList() { return lawEnforceCategoryList; } @@ -145,6 +159,14 @@ public class ComprehensiveAnalysis { this.lawEnforceCategoryNumber = lawEnforceCategoryNumber; } + public String getEntrustDeptId() { + return entrustDeptId; + } + + public void setEntrustDeptId(String entrustDeptId) { + this.entrustDeptId = entrustDeptId; + } + public String getCompanyOrgType() { return companyOrgType; } @@ -497,4 +519,12 @@ public class ComprehensiveAnalysis { public void setBureauDeptName(String bureauDeptName) { this.bureauDeptName = bureauDeptName; } + + public Integer getAuthTotal() { + return authTotal; + } + + public void setAuthTotal(Integer authTotal) { + this.authTotal = authTotal; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComprehensiveAnalysisMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComprehensiveAnalysisMapper.java index 562649a6..20c8bdcb 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComprehensiveAnalysisMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComprehensiveAnalysisMapper.java @@ -12,6 +12,7 @@ public interface ComprehensiveAnalysisMapper { * 注：企业名称使用的执法表内非企业表 */ List primarySectionA(ComprehensiveAnalysis comprehensiveAnalysis); + Integer countCurrentEntrust(ComprehensiveAnalysis comprehensiveAnalysis); /** * 获取执法记录，关联企业信息（环比时段） diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/SrzDeptMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/SrzDeptMapper.java index eb4eb70d..0f6ba516 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/SrzDeptMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/SrzDeptMapper.java @@ -38,4 +38,6 @@ public interface SrzDeptMapper * @return 市认证对接---组织机构信息 */ public SrzDept selectSrzDeptById(String organizationId); + + public List selectDeptByNeedUpdate(); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java index 2ce54fab..208b2f1d 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java @@ -138,4 +138,5 @@ public interface IEnterpriseInformationService List enterpriseInformationJDDetails(EnterpriseInformation enterpriseInformation); int addEnterprise(String enterpriseNumber,String companyOrgType); + EnterpriseInformation searchEnterpriseByNumber(String enterpriseNumber); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ISrzDeptService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ISrzDeptService.java index f9fa58b0..24c0b3af 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ISrzDeptService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ISrzDeptService.java @@ -3,6 +3,7 @@ package com.zdxt.code.service; import com.alibaba.fastjson.JSONArray; import com.zdxt.code.domain.SrzDept; +import java.util.List; import java.util.Map; /** @@ -32,5 +33,7 @@ public interface ISrzDeptService public Map saveSrzDept(JSONArray dataArr, String token); + public List selectDeptByNeedUpdate(); + } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComprehensiveAnalysisServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComprehensiveAnalysisServiceImpl.java index da7654d9..ff2e3a76 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComprehensiveAnalysisServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComprehensiveAnalysisServiceImpl.java @@ -1,5 +1,7 @@ package com.zdxt.code.service.impl; +import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.project.system.dept.mapper.DeptMapper; import com.zdxt.auth.project.system.dict.mapper.DictDataMapper; import com.zdxt.auth.project.system.user.mapper.UserMapper; @@ -10,6 +12,7 @@ import com.zdxt.domain.auth.Dept; import com.zdxt.domain.auth.DictData; import com.zdxt.domain.auth.User; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import java.util.*; @@ -26,6 +29,8 @@ public class ComprehensiveAnalysisServiceImpl implements ComprehensiveAnalysisSe private DeptMapper deptMapper; @Autowired private DictDataMapper dictDataMapper; + @Autowired + private UserApi userApi; @Override public ComprehensiveAnalysis whole(ComprehensiveAnalysis c) { @@ -59,6 +64,11 @@ public class ComprehensiveAnalysisServiceImpl implements ComprehensiveAnalysisSe comprehensiveAnalysis.setLawEnforceCategoryList(getLawEnforceCategoryList(primaryRegistrationList)); //企业类型列表（文字+数量+占比） comprehensiveAnalysis.setCompanyOrgTypeList(getCompanyOrgTypeList(primaryRegistrationList)); + // 受委托执法 + c.setHasAuth(1); + c.setEntrustDeptId(c.getBureauDeptId()); + Integer authNum = comprehensiveAnalysisMapper.countCurrentEntrust(c); + comprehensiveAnalysis.setAuthTotal(authNum); return comprehensiveAnalysis; } 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 927dd810..ef2e2551 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 @@ -940,5 +940,10 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS } + @Override + public EnterpriseInformation searchEnterpriseByNumber(String enterpriseNumber) { + return ssztJbxx110497Service.selectSsztJbxx110497ByCode(enterpriseNumber); + } + } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java index be510e9e..a6c14fb5 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java @@ -251,7 +251,8 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg styleRow2.setBorderLeft(BorderStyle.THIN); styleRow2.setFont(font2); HSSFRow headerRow = sheet.createRow(0); - String[] header = {"被执法企业名称","企业所属区域", "企业所属街道", "执法单位", "执法人员","执法时间","入企事由","入企事项","活动依据"}; +// String[] header = {"被执法企业名称","企业所属区域", "企业所属街道", "执法单位", "执法人员","执法时间","入企事由","入企事项","活动依据"}; + String[] header = {"单位名称", "企业名称","企业注册地", "企业所属街道", "入企人员","入企时间","入企事由","入企事项","活动依据"}; for (int i = 0; i < header.length; i++) { HSSFCell cell = headerRow.createCell(i); HSSFRichTextString text = new HSSFRichTextString(header[i]); @@ -282,10 +283,10 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg final int[] i = {1}; list.forEach(li->{ HSSFRow row = sheet.createRow(i[0]); - row.createCell(0).setCellValue(li.getEnterpriseName()); - row.createCell(1).setCellValue(li.getArea()); - row.createCell(2).setCellValue(li.getStreet()); - row.createCell(3).setCellValue(li.getBureauDeptName()); + row.createCell(0).setCellValue(li.getBureauDeptName()); + row.createCell(1).setCellValue(li.getEnterpriseName()); + row.createCell(2).setCellValue(li.getArea()); + row.createCell(3).setCellValue(li.getStreet()); row.createCell(4).setCellValue(li.getLawEnforcer()); row.createCell(5).setCellValue(DateUtils.parseDateToStr("YYYY-MM-dd HH:mm:ss",li.getEnforcementTime())); row.createCell(6).setCellValue(li.getLawEnforcementTypeText()); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SrzDeptServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SrzDeptServiceImpl.java index 44f3d023..ba72fb4d 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SrzDeptServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SrzDeptServiceImpl.java @@ -21,6 +21,7 @@ import org.springframework.stereotype.Service; import java.security.MessageDigest; import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -83,7 +84,7 @@ public class SrzDeptServiceImpl implements ISrzDeptService String doneStr = connect("/ebus/sfrzhqxglmk/sysDoneTorg", params); JSONObject doneObj = JSONObject.parseObject(doneStr); String done = doneObj.getString("success"); - log.info("部门拉取完成结果 ========> ：{}", done); + log.info("部门拉取完成结果 ========> {} ：{}", taskId, done); } catch (Exception e) { log.info("部门数据下拉完成异常，异常任务id：{}",jsonObject.getString("taskId")); e.printStackTrace(); @@ -109,6 +110,10 @@ public class SrzDeptServiceImpl implements ISrzDeptService return resMap; } + public List selectDeptByNeedUpdate() { + return srzDeptMapper.selectDeptByNeedUpdate(); + } + private String connect(String apiPath, String params) { //各种参数 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SrzUserServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SrzUserServiceImpl.java index df31ba76..189dfe61 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SrzUserServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SrzUserServiceImpl.java @@ -84,7 +84,7 @@ public class SrzUserServiceImpl implements ISrzUserService String doneStr = connect("/ebus/sfrzhqxglmk/sysDoneTacc", params); JSONObject doneObj = JSONObject.parseObject(doneStr); String done = doneObj.getString("success"); - log.info("用户拉取完成结果 ========> ：{}", done); + log.info("用户拉取完成结果 ========> {} ：{}", taskId, done); } catch (Exception e) { log.info("用户数据下拉完成异常，异常任务id：{}", jsonObject.getString("taskId")); e.printStackTrace(); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SsztJbxx110497ServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SsztJbxx110497ServiceImpl.java index e460b66e..fd4692fc 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SsztJbxx110497ServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SsztJbxx110497ServiceImpl.java @@ -32,28 +32,31 @@ public class SsztJbxx110497ServiceImpl implements ISsztJbxx110497Service public EnterpriseInformation selectSsztJbxx110497ByCode(String code) { SsztJbxx110497 ssztJbxx110497 = ssztJbxx110497Mapper.selectSsztJbxx110497ByCode(code); - EnterpriseInformation enterpriseInformation = new EnterpriseInformation(); - //企业名称 - enterpriseInformation.setEnterpriseName(ssztJbxx110497.getQymc()); - //统一信用代码 - enterpriseInformation.setEnterpriseNumber(ssztJbxx110497.getTyshxydm()); - //法定代表人 - enterpriseInformation.setLegalPerson(ssztJbxx110497.getFddbr()); - //成立日期 - enterpriseInformation.setEstablishmentTime(ssztJbxx110497.getClrq()); - //经营期限-开始 - enterpriseInformation.setOperatingTerm(ssztJbxx110497.getJyqxq()); - //经营期限-结束 - enterpriseInformation.setOperatingTerm(ssztJbxx110497.getJyqxz()); - //注册资本 - enterpriseInformation.setRegisteredCapital(String.valueOf(ssztJbxx110497.getZczb())); - //经营范围 - enterpriseInformation.setBusinessScope(ssztJbxx110497.getJyfw()); - //注册地址 - enterpriseInformation.setEnterpriseAddress(ssztJbxx110497.getJycs()); - //TODO 企业类型 + if (null != ssztJbxx110497) { + EnterpriseInformation enterpriseInformation = new EnterpriseInformation(); + //企业名称 + enterpriseInformation.setEnterpriseName(ssztJbxx110497.getQymc()); + //统一信用代码 + enterpriseInformation.setEnterpriseNumber(ssztJbxx110497.getTyshxydm()); + //法定代表人 + enterpriseInformation.setLegalPerson(ssztJbxx110497.getFddbr()); + //成立日期 + enterpriseInformation.setEstablishmentTime(ssztJbxx110497.getClrq()); + //经营期限-开始 + enterpriseInformation.setOperatingTerm(ssztJbxx110497.getJyqxq()); + //经营期限-结束 + enterpriseInformation.setOperatingTerm(ssztJbxx110497.getJyqxz()); + //注册资本 + enterpriseInformation.setRegisteredCapital(String.valueOf(ssztJbxx110497.getZczb())); + //经营范围 + enterpriseInformation.setBusinessScope(ssztJbxx110497.getJyfw()); + //注册地址 + enterpriseInformation.setEnterpriseAddress(ssztJbxx110497.getJycs()); + //TODO 企业类型 - return enterpriseInformation; + return enterpriseInformation; + } + return null; } /** diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java index ff597fb0..8ffc73c0 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java @@ -1602,7 +1602,7 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService { return statisticalPanelMapper.analysis_enterprises_countAll(params); } @Override - @DataScope(deptAlias = "nr",userAlias = "nr",deptField = "bureau_dept_id") + @DataScope(deptAlias = "r",userAlias = "nr",deptField = "bureau_dept_id") public List> analysisNonRegistrationType(SixAnalysisParams params) { return statisticalPanelMapper.analysis_non_registration_type(params); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/SrzUserOriginalDataTask.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/SrzUserOriginalDataTask.java index 1d8b885e..fc69e082 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/SrzUserOriginalDataTask.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/SrzUserOriginalDataTask.java @@ -54,7 +54,7 @@ public class SrzUserOriginalDataTask { this.getData(); } - /** 同步部门数据 */ + /** 同步用户数据 */ public void getData(){ List srz_item = iDictDataService.selectDictDataByType("srz_item"); Map map = srz_item.stream().collect(Collectors.toMap(DictData::getDictLabel,DictData::getDictValue)); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml index 118a8c06..0a4eb019 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml @@ -14,6 +14,32 @@ + @@ -343,7 +344,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and user_id = #{userId} and dept_id = #{deptId} - and (law_enforcement_item_text like concat('%',#{searchValue},'%') + and (law_enforcement_type_text like concat('%',#{searchValue},'%') or bureau_dept_name like concat('%',#{searchValue},'%') or law_enforcer like concat('%',#{searchValue},'%') or law_enforcer_other like concat('%',#{searchValue},'%') diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/SrzDeptMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/SrzDeptMapper.xml index 4310c044..6e652d71 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/SrzDeptMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/SrzDeptMapper.xml @@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -51,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" zzLevel, parentId, sequence, createAt, updateAt, guid, isMappingUnit, mappingUnitParentId, srzUnitId, simpleName, isStatutoryOrg, isActive, unitStatusCode, unitStatus, unitType, xzqhCode, xzqh, isCGManager, isBureauOffice, unitTypeCode, dwxzCode, dwxz, unitSysTypeCode, unitSysType, dwxtlbms, unitLevelCode, - unitLevel, creditcode,description + unitLevel, creditcode,description, need_update from srz_dept @@ -104,6 +105,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where organizationId = #{organizationId} + + + insert into srz_dept diff --git a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DictDataApi.java b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DictDataApi.java index 0015ba3e..eeb43bbd 100644 --- a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DictDataApi.java +++ b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DictDataApi.java @@ -24,4 +24,8 @@ public interface DictDataApi { @ApiOperation(value = "获取数据字典") @GetMapping("/getDictData") public List getDictData(DictDataBean dictDataBean); + + @ApiOperation(value = "获取数据字典") + @GetMapping("/getDatasByTypeIn") + public List getDatasByTypeIn(String[] type); }