Browse Source

企业如果搜索不到直接输入完整的同意信用代码则去市监获取存入如业务表再返回,

投诉涉事地址修改为级联操作,
新增市外注册企业的新增功能.
(还有一些零散的小bug)
v6
蟑螂恶霸 11 months ago
parent
commit
b34919b636
  1. 41
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppComplaintItemController.java
  2. 22
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
  3. 171
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptInfoTask.java
  4. 2
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptTask.java
  5. 11
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DictDataApiImpl.java
  6. 44
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java
  7. 1
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dict/mapper/DictDataMapper.java
  8. 8
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictDataMapper.xml
  9. 49
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html
  10. 26
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/nonRegistration/nonRegistrationView.html
  11. 30
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComprehensiveAnalysis.java
  12. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComprehensiveAnalysisMapper.java
  13. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/SrzDeptMapper.java
  14. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java
  15. 3
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ISrzDeptService.java
  16. 10
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComprehensiveAnalysisServiceImpl.java
  17. 5
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
  18. 11
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java
  19. 7
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SrzDeptServiceImpl.java
  20. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SrzUserServiceImpl.java
  21. 45
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/SsztJbxx110497ServiceImpl.java
  22. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
  23. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/SrzUserOriginalDataTask.java
  24. 26
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml
  25. 27
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml
  26. 9
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/SrzDeptMapper.xml
  27. 4
      lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DictDataApi.java

41
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<Map<String, Object>> result = new ArrayList<>();
DictDataBean dictParams = new DictDataBean();
dictParams.setDictType("address_type");
List<DictDataBean> dictDatas = dictDataApi.getDictData(dictParams);
String[] areaKey = dictDatas.stream().map(DictDataBean::getDictValue).toArray(String[]::new);
List<DictDataBean> streams = dictDataApi.getDatasByTypeIn(areaKey);
for (DictDataBean dictData : dictDatas) {
Map<String, Object> areaMap = new HashMap<>();
areaMap.put("text", dictData.getDictLabel());
areaMap.put("value", dictData.getDictValue());
List<Map<String, Object>> tmps = new ArrayList<>();
for (DictDataBean stream : streams) {
if (dictData.getDictValue().equals(stream.getDictType())) {
Map<String, Object> 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);
}
}

22
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<EnterpriseInformation> 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("该企业未在深圳市注册");
}
}

171
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<String,String> 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<SrzDept> 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();
}
}
}

2
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}")

11
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<DictDataBean> getDatasByTypeIn(String[] type) {
List<DictData> list = dictDataMapper.selectDictDataListToIn(type);
List<DictDataBean> BeanList = new ArrayList<>();
for(DictData dict : list ){
DictDataBean dictBean = new DictDataBean();
BeanUtil.copyProperties(dict, dictBean);
BeanList.add(dictBean);
}
return BeanList;
}
}

44
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

1
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<DictData> selectDictDataList(DictData dictData);
public List<DictData> selectDictDataListToIn(String[] dictType);
public DictData selectDictData(DictData dictData);
/**

8
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
</select>
<select id="selectDictDataListToIn" parameterType="String" resultMap="DictDataResult">
<include refid="selectDictDataVo"/> where dict_type in
<foreach collection="array" item="dictType" open="(" separator="," close=")">
#{dictType}
</foreach>
</select>
<select id="selectDictData" parameterType="DictData" resultMap="DictDataResult">
<include refid="selectDictDataVo"/>
<where>

49
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html

@ -211,7 +211,6 @@
area_registration(beginTime, endTime);
}
/** 各区的数据统计 */
function area_registration(beginTime, endTime) {
var areas = ['光明区', '宝安区', '南山区', '龙华区', '福田区', '罗湖区', '龙岗区', '盐田区', '坪山区', '大鹏新区', '深汕特别合作区']
var base_html = '';
@ -227,8 +226,6 @@
base_html += ' <li><label>单独执法</label><span>{single_num}</span><span>{single_per}%</span></li>';
base_html += ' <li><label>联合执法</label><span>{nuite_num}</span><span>{nuite_per}%</span></li>';
base_html += ' <li><label>入企压减率</label><span>{cut_num}</span><span>{cut_per}%</span></li>';
// base_html += ' <li><label>被执法企业</label><span>{ent_num}</span><span>{ent_per}%</span></li>';
// base_html += ' <li><label>涉企投诉</label><span>{com_num}</span><span>{com_per}%</span></li>';
base_html += ' <li><label>被执法企业</label><span>{ent_num}</span><span></span></li>';
base_html += ' <li><label>涉企投诉</label><span>{com_num}</span><span></span></li>';
base_html += ' </ul>';
@ -1012,10 +1009,40 @@
});
}
/** 自动上浮最大值 (为左右两边都有数值的折线图弄得) */
function getSmartMaxAndInterval(data1, data2, maxSplits = 5) {
const maxVal = Math.max(...data1, ...data2);
const roughInterval = maxVal / maxSplits;
const magnitude = Math.pow(10, Math.floor(Math.log10(roughInterval)));
const residual = roughInterval / magnitude;
let niceInterval;
if (residual <= 1) niceInterval = 1;
else if (residual <= 2) niceInterval = 2;
else if (residual <= 5) niceInterval = 5;
else niceInterval = 10;
const interval = niceInterval * magnitude;
const max = interval * maxSplits; // ✅ 保证只分 maxSplits 格
return { max, interval };
}
function getNiceMaxValue(arr1, arr2, step = 30) {
const rawMax = Math.max(Math.max(...arr1), Math.max(...arr2));
return Math.ceil(rawMax / step) * step;
}
var linechart1 = echarts.init(document.getElementById("echartInspect"));
var linechart2 = echarts.init(document.getElementById("echartNonInspect"));
/** 行政检查趋势 */
function timesCharts(times, ins, ent) {
// 使用更大的最大值作为 yAxis 的最大值
const { max, interval } = getSmartMaxAndInterval(ins, ent, 5);
// var linechart1 = echarts.init(document.getElementById("echartInspect"));
// 指定相关的配置项和数据
var option = {
@ -1093,7 +1120,8 @@
lineStyle: {
color: 'rgba(255,255,255,.1)'
}
}
},
max, interval
},
{
type: 'value',
@ -1112,7 +1140,8 @@
lineStyle: {
color: 'rgba(255,255,255,.1)'
}
}
},
max, interval
}
],
series: [
@ -1216,6 +1245,8 @@
/** 非行政检查趋势 */
function timesCharts2(times, ins, ent) {
// 使用更大的最大值作为 yAxis 的最大值
const { max, interval } = getSmartMaxAndInterval(ins, ent, 5);
// var linechart2 = echarts.init(document.getElementById("echartNonInspect"));
// 指定相关的配置项和数据
var option = {
@ -1294,7 +1325,8 @@
lineStyle: {
color: 'rgba(255,255,255,.1)'
}
}
},
max, interval
},
{
type: 'value',
@ -1313,7 +1345,8 @@
lineStyle: {
color: 'rgba(255,255,255,.1)'
}
}
},
max, interval
}
],
series: [
@ -1541,8 +1574,6 @@
});
</script>
</body>
</html>

26
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/nonRegistration/nonRegistrationView.html

@ -12,11 +12,11 @@
<div class="select-list">
<ul>
<li>
<p>执法单位:</p>
<p>单位名称</p>
<input type="text" name="bureauDeptName"/>
</li>
<li>
<p>执法人员:</p>
<p>入企人员:</p>
<input type="text" name="lawEnforcer"/>
</li>
<li>
@ -28,7 +28,7 @@
<input type="text" name="lawEnforcementItemText"/>
</li>
<li>
<p>入企类别</p>
<p>入企事由</p>
<select id="checkCategory" name="lawEnforcementType" th:with="type=${@dict.getType('no_check_category')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@ -82,7 +82,7 @@
</select>
</li>
<li id="selectTime" class="select-time">
<p>执法时间:</p>
<p>入企时间:</p>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="startTime"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
@ -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'
},
{

30
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<ComprehensiveAnalysis> 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;
}
}

1
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComprehensiveAnalysisMapper.java

@ -12,6 +12,7 @@ public interface ComprehensiveAnalysisMapper {
* 企业名称使用的执法表内非企业表
*/
List<ComprehensiveAnalysis> primarySectionA(ComprehensiveAnalysis comprehensiveAnalysis);
Integer countCurrentEntrust(ComprehensiveAnalysis comprehensiveAnalysis);
/**
* 获取执法记录关联企业信息环比时段

2
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<SrzDept> selectDeptByNeedUpdate();
}

1
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java

@ -138,4 +138,5 @@ public interface IEnterpriseInformationService
List<EnterpriseInformation> enterpriseInformationJDDetails(EnterpriseInformation enterpriseInformation);
int addEnterprise(String enterpriseNumber,String companyOrgType);
EnterpriseInformation searchEnterpriseByNumber(String enterpriseNumber);
}

3
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<String, Integer> saveSrzDept(JSONArray dataArr, String token);
public List<SrzDept> selectDeptByNeedUpdate();
}

10
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;
}

5
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);
}
}

11
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());

7
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<SrzDept> selectDeptByNeedUpdate() {
return srzDeptMapper.selectDeptByNeedUpdate();
}
private String connect(String apiPath, String params) {
//各种参数

2
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();

45
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;
}
/**

2
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<Map<String, Object>> analysisNonRegistrationType(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_non_registration_type(params);
}

2
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<DictData> srz_item = iDictDataService.selectDictDataByType("srz_item");
Map<String,String> map = srz_item.stream().collect(Collectors.toMap(DictData::getDictLabel,DictData::getDictValue));

26
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml

@ -14,6 +14,32 @@
<result property="bureauDeptId" column="bureau_dept_id" />
<result property="bureauDeptName" column="bureau_dept_name" />
</resultMap>
<select id="countCurrentEntrust" parameterType="ComprehensiveAnalysis" resultType="int">
select count(1) from enforcement_registration r
<where>
<if test="hasAuth != null and hasAuth != ''">
and r.has_auto=#{hasAuth}
</if>
<if test="entrustDeptId != null and entrustDeptId != ''">
and r.entrust_dept_id=#{entrustDeptId}
</if>
<if test="dateType != null and dateType != '' and dateType == 'year' ">
and YEAR(r.create_time)=#{year}
</if>
<if test="dateType != null and dateType != '' and dateType == 'quarter' ">
and YEAR(r.create_time)=#{year}
and QUARTER(r.create_time)=#{quarter}
</if>
<if test="dateType != null and dateType != '' and dateType == 'month' ">
and YEAR(r.create_time)=#{year}
and MONTH(r.create_time)=#{month}
</if>
<if test="dateType != null and dateType != '' and dateType == 'day' ">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.create_time,'%Y-%m-%d')
</if>
</where>
</select>
<select id="primarySectionA" parameterType="ComprehensiveAnalysis" resultMap="ComprehensiveAnalysisResult">
select r.check_category,r.law_enforce_category, e.company_org_type,r.enterprise_number,r.enterprise_name,e.enterprise_address,r.bureau_dept_id,r.bureau_dept_name
from enforcement_registration r

27
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml

@ -152,42 +152,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</choose>
where n.has_delete= 0
<if test="enterpriseAddress != null and enterpriseAddress != ''">
and enterprise_address like concat('%', #{enterpriseAddress}, '%')
and n.enterprise_address like concat('%', #{enterpriseAddress}, '%')
</if>
<if test="bureauDeptName != null and bureauDeptName != ''">
and bureau_dept_name like concat('%', #{bureauDeptName}, '%')
and n.bureau_dept_name like concat('%', #{bureauDeptName}, '%')
</if>
<if test="lawEnforcer != null and lawEnforcer != ''">
and ( law_enforcer like concat('%', #{lawEnforcer}, '%')
and ( n.law_enforcer like concat('%', #{lawEnforcer}, '%')
or
law_enforcer_other like concat('%', #{lawEnforcer}, '%')
n.law_enforcer_other like concat('%', #{lawEnforcer}, '%')
)
</if>
<if test="lawEnforcementItemText != null and lawEnforcementItemText != ''">
and law_enforcement_item_text like concat('%', #{lawEnforcementItemText}, '%')
and n.law_enforcement_item_text like concat('%', #{lawEnforcementItemText}, '%')
</if>
<if test="enterpriseName != null and enterpriseName != ''">
and enterprise_name like concat('%', #{enterpriseName}, '%')
and n.enterprise_name like concat('%', #{enterpriseName}, '%')
</if>
<if test="lawEnforcementType !=null">
and law_enforcement_type =#{lawEnforcementType}
and n.law_enforcement_type =#{lawEnforcementType}
</if>
<if test="year != null and year != ''">
AND YEAR(enforcement_time) = #{year}
AND YEAR(n.enforcement_time) = #{year}
</if>
<if test="quarter != null and quarter != '' ">
AND QUARTER(enforcement_time) = #{quarter}
AND QUARTER(n.enforcement_time) = #{quarter}
</if>
<if test="month != null and month != '' ">
AND MONTH(enforcement_time) = #{month}
AND MONTH(n.enforcement_time) = #{month}
</if>
<if test="startTime != null and startTime != '' ">
and DATE_FORMAT(enforcement_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d')
and DATE_FORMAT(n.enforcement_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d')
</if>
<if test="endTime != null and endTime != '' ">
and DATE_FORMAT(enforcement_time,'%Y-%m-%d') <![CDATA[<=]]> STR_TO_DATE(#{endTime},'%Y-%m-%d')
and DATE_FORMAT(n.enforcement_time,'%Y-%m-%d') <![CDATA[<=]]> STR_TO_DATE(#{endTime},'%Y-%m-%d')
</if>
order by n.enforcement_time desc
</select>
<insert id="insertNonEnforcementRegistration" parameterType="NonEnforcementRegistration">
@ -343,7 +344,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
<if test="searchValue != null and searchValue != ''">
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},'%')

9
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/SrzDeptMapper.xml

@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="unitLevel" column="unitLevel" />
<result property="creditcode" column="creditcode" />
<result property="description" column="description" />
<result column="need_update" property="needUpdate"/>
</resultMap>
<sql id="selectSrzDeptVo">
@ -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
</sql>
@ -105,6 +106,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where organizationId = #{organizationId}
</select>
<!-- 需要更新的数据查出前500条(need_update=0) -->
<select id="selectDeptByNeedUpdate" resultMap="SrzDeptResult">
<include refid="selectSrzDeptVo"/>
WHERE need_update = 0 limit 500
</select>
<insert id="insertSrzDept" parameterType="SrzDept">
insert into srz_dept
<trim prefix="(" suffix=")" suffixOverrides=",">

4
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<DictDataBean> getDictData(DictDataBean dictDataBean);
@ApiOperation(value = "获取数据字典")
@GetMapping("/getDatasByTypeIn")
public List<DictDataBean> getDatasByTypeIn(String[] type);
}

Loading…
Cancel
Save