Browse Source

加入非执法人员以来的修改提交

v6
蟑螂恶霸 1 year ago
parent
commit
8ef98176df
  1. 10
      lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java
  2. 85
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppNonEnforcementRegistrationController.java
  3. 29
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java
  4. 24
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java
  5. 2
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictDataMapper.xml
  6. 3
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
  7. 4
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
  8. 51
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/NonEnforcementRegistrationController.java
  9. 295
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/NonEnforcementRegistration.java
  10. 62
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/NonEnforcementRegistrationMapper.java
  11. 62
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/INonEnforcementRegistrationService.java
  12. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
  13. 148
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java
  14. 13
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java
  15. 10
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
  16. 5
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
  17. 52
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
  18. 205
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml
  19. 104
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml
  20. 3
      lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java

10
lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java

@ -212,6 +212,16 @@ public class User extends BaseDomain {
*/
private String secretName;
private String notUserId;
public String getNotUserId() {
return notUserId;
}
public void setNotUserId(String notUserId) {
this.notUserId = notUserId;
}
public String getStrUserId() {
return strUserId;
}

85
lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppNonEnforcementRegistrationController.java

@ -0,0 +1,85 @@
package com.zdxt.app.controller;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.zdxt.auth.dto.DeptBean;
import com.zdxt.auth.dto.DictDataBean;
import com.zdxt.auth.dto.UserBean;
import com.zdxt.auth.feign.DictDataApi;
import com.zdxt.auth.feign.UserApi;
import com.zdxt.auth.project.system.user.service.IUserService;
import com.zdxt.code.domain.*;
import com.zdxt.code.service.*;
import com.zdxt.common.ZDResponse;
import com.zdxt.common.controller.BaseController;
import com.zdxt.common.util.StringUtils;
import com.zdxt.common.util.TableDataInfo;
import com.zdxt.common.zdxtFile.ZdxtFileCommon;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import java.time.Instant;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.util.*;
/**
* 执法端-执法登记Controller
*
* @author chenrui
* @date 2024-02-23
*/
@Controller
@RequestMapping("/app/code/nonRegistration")
public class AppNonEnforcementRegistrationController extends BaseController
{
private String prefix = "project/code/registration";
@Autowired private INonEnforcementRegistrationService enforcementRegistrationService;
@RequiresPermissions("code:registration:view")
@GetMapping()
public String registration()
{
return prefix + "/registration";
}
/**
* 新增保存执法端-执法登记
*/
@PostMapping("/add")
@ResponseBody
public ZDResponse addSave(@RequestBody NonEnforcementRegistration enforcementRegistration)
{
return enforcementRegistrationService.insertNonEnforcementRegistration(enforcementRegistration) > 0
? ZDResponse.success("保存成功") : ZDResponse.error("保存失败");
}
/**
* 查询执法端-执法登记列表
*/
@GetMapping("/queryList")
@ResponseBody
public ZDResponse queryListNew(NonEnforcementRegistration enforcementRegistration)
{
//查询检查总次数
List<NonEnforcementRegistration> registrations = enforcementRegistrationService.selectNonEnforcementRegistrationList(enforcementRegistration);
return ZDResponse.success("操作成功", registrations);
}
/**
* 查询执法端-执法登记列表
*/
@GetMapping("/queryById/{id}")
@ResponseBody
public ZDResponse queryById(@PathVariable String id)
{
NonEnforcementRegistration registrations = enforcementRegistrationService.selectNonEnforcementRegistrationById(id);
return ZDResponse.success("操作成功", registrations);
}
}

29
lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java

@ -61,19 +61,32 @@ public class AppSystemController extends BaseController {
@GetMapping("/getUserInfo/{userId}")
@ResponseBody
public ZDResponse getUserInfo(@PathVariable Long userId){
// UserBean user = userApi.getCurrentUser();
UserBean user = userApi.getUserByUserId(userId);
/** 通过执法证件号->双系统(统一信用代码)->部门(统一信用代码) start 改成直接通过打标迭代的方式来获取用户部门信息 */
// //查询双系统执法人员信息
// Zfryjdm2405301 zfryjdm2405301 = iZfryjdm2405301Service.selectZfryByZfCode(user.getLawCertificateNum());
// //通过机构代码查询执法主体信息
// DeptBean bureauDept = deptApi.selectDeptByCreditcode(zfryjdm2405301.getZzjgdm());
/** 通过执法证件号->双系统(统一信用代码)->部门(统一信用代码) end 改成直接通过打标迭代的方式来获取用户部门信息 */
//查询本人所在部门
DeptBean dept = deptApi.getDeptById(user.getDeptId());
/** 迭代的的方式查执法主体 */
DeptBean bureauDept = deptApi.iterationDeptParentToBureau(user.getDeptId());
user.setDept(dept);
user.setBureauDept(bureauDept);
//查询双系统执法人员信息
Zfryjdm2405301 zfryjdm2405301 =
iZfryjdm2405301Service.selectZfryByZfCode(user.getLawCertificateNum());
//通过机构代码查询执法主体信息
DeptBean dept1 = deptApi.selectDeptByCreditcode(zfryjdm2405301.getZzjgdm());
return ZDResponse.success("查询成功",user);
}
//查询本人所在部门
@GetMapping("/getUserInfoAndDept/{userId}")
@ResponseBody
public ZDResponse getUserInfoAndDept(@PathVariable Long userId){
UserBean user = userApi.getUserByUserId(userId);
DeptBean dept = deptApi.getDeptById(user.getDeptId());
DeptBean bureauDept = deptApi.iterationDeptParentToBureau(user.getDeptId());
// 通过迭代获取用户的执法主体
user.setDept(dept);
user.setBureauDept(dept1);
user.setBureauDept(bureauDept);
return ZDResponse.success("查询成功",user);
}

24
lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java

@ -279,6 +279,30 @@ public class DeptApiImpl implements DeptApi {
return iterationDeptParent(dept.getParentId());
}
// 递归获取部门
public DeptBean iterationDeptParentToBureau(String deptId) {
DeptApi deptApi = SpringUtil.getBean(DeptApi.class);
DeptBean dept = deptApi.getDeptById(deptId);
Optional op =Optional.ofNullable(dept);
if(!op.isPresent() || deptId == null)return null; // 防止admin这种没有部门的进来后造成死循环
if (null != dept.getZone() && 0 != dept.getZone() && 2 != dept.getZone()) {
return dept;
}
return iterationDeptParentToBureau(dept.getParentId());
}
// 递归获取部门获取公安
public DeptBean iterationDeptParentToBureauGA(String deptId) {
DeptApi deptApi = SpringUtil.getBean(DeptApi.class);
DeptBean dept = deptApi.getDeptById(deptId);
Optional op =Optional.ofNullable(dept);
if(!op.isPresent() || deptId == null)return null; // 防止admin这种没有部门的进来后造成死循环
if (null != dept.getZone() && (5 == dept.getZone() || 1 == dept.getZone())) {
return dept;
}
return iterationDeptParentToBureauGA(dept.getParentId());
}
@Override
public DeptBean iterationDeptParentRegion(String deptId) {
DeptApi deptApi = SpringUtil.getBean(DeptApi.class);

2
lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictDataMapper.xml

@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
AND status = '0'
</where>
order by create_time desc
order by dict_sort
</select>
<select id="selectDictData" parameterType="DictData" resultMap="DictDataResult">

3
lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@ -199,6 +199,9 @@
<if test="tenantCode != @com.zdxt.auth.common.constant.Constants@DEFAULT_TENANT_CODE and tenantCode != null and tenantCode != ''">
AND u.tenant_code = #{tenantCode}
</if>
<if test="notUserId != null and notUserId != ''">
and u.user_id not in (#{notUserId})
</if>
AND u.law_certificate_num is not null
AND u.law_certificate_num !=""
<if test="params.dataScope != null and params.dataScope != ''">

4
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html

@ -384,7 +384,7 @@
}
},
{
field : 'createTime',
field : 'enforcementTime',
title : '检查时间'
},
{
@ -1202,7 +1202,9 @@
success:function (response){
$('#bootstrap-table').bootstrapTable('load', response);
data1=response;
console.log("--------------------->")
console.log(data1);
console.log("<---------------------")
},error:function (xhr,status,error){
console.error("请求失败:",status,error);
}

51
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/NonEnforcementRegistrationController.java

@ -0,0 +1,51 @@
package com.zdxt.code.controller;
import java.util.List;
import com.zdxt.code.domain.NonEnforcementRegistration;
import com.zdxt.code.service.INonEnforcementRegistrationService;
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.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
/**
* 非行政执法登记Controller
*
* @author kylin
* @date 2025-06-19
*/
@Controller
@RequestMapping("/system/registration")
public class NonEnforcementRegistrationController extends BaseController
{
private String prefix = "system/registration";
@Autowired
private INonEnforcementRegistrationService nonEnforcementRegistrationService;
@RequiresPermissions("system:registration:view")
@GetMapping()
public String registration()
{
return prefix + "/registration";
}
/**
* 查询非行政执法登记列表
*/
@RequiresPermissions("system:registration:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(NonEnforcementRegistration nonEnforcementRegistration)
{
startPage();
List<NonEnforcementRegistration> list = nonEnforcementRegistrationService.selectNonEnforcementRegistrationList(nonEnforcementRegistration);
return getDataTable(list);
}
}

295
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/NonEnforcementRegistration.java

@ -0,0 +1,295 @@
package com.zdxt.code.domain;
import com.zdxt.common.BaseDomain;
import java.util.Date;
import java.util.List;
/**
* 执法端-非行政执法登记对象 enforcement_registration
*
* @author kylin
* @date 2024-02-23
*/
public class NonEnforcementRegistration extends BaseDomain
{
private static final long serialVersionUID = 1L;
/** 主键ID */
private String id;
/** 被执法企业 */
private String enterpriseName;
/** 被执法企业统一社会信用代码 */
private String enterpriseNumber;
/** 执法时间 */
private Date enforcementTime;
/** 执法人员姓名 */
private String lawEnforcer;
/** 执法人员ID */
private String lawEnforcerId;
/** 其他执法人员姓名 */
private String lawEnforcerOther;
/** 其他执法人员ID */
private String lawEnforcerIdOther;
/** 执法(入企)类别 */
private Integer lawEnforcementType;
private String lawEnforcementTypeText;
/** 执法(入企)事项 */
private Integer lawEnforcementItem;
private String lawEnforcementItemText;
/** 执法(活动)依据 */
private String lawEnforcementBasis;
private String lawEnforcementBasisText;
/** 备注 */
private String remark;
/** 执法结果 0 合格 1 不合格 */
private Integer reslut;
/** 状态 0 正常 1 取消 */
private Integer status;
/** 是否删除 0 否 1 是 */
private Integer hasDelete;
/** 是否投诉 */
private Integer hasComplaint;
/** 数据保存或提交 0 保存 1提交 */
private Integer hasSubmit;
/** 是否评价 0 否 1 是 */
private Integer hasEvaluate;
/** 文件几个 */
private List<String> fileList;
/** 预约关联id */
private String lawId;
/** 预约关联文字 */
private String lawText;
/** 执法(入企)主体ID */
private String bureauDeptId;
/** 执法(入企)主体名称 */
private String bureauDeptName;
/** 执法(入企)主体部门统一信用代码 */
private String creditcode;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
public String getEnterpriseNumber() {
return enterpriseNumber;
}
public void setEnterpriseNumber(String enterpriseNumber) {
this.enterpriseNumber = enterpriseNumber;
}
public Date getEnforcementTime() {
return enforcementTime;
}
public void setEnforcementTime(Date enforcementTime) {
this.enforcementTime = enforcementTime;
}
public String getLawEnforcer() {
return lawEnforcer;
}
public void setLawEnforcer(String lawEnforcer) {
this.lawEnforcer = lawEnforcer;
}
public String getLawEnforcerId() {
return lawEnforcerId;
}
public void setLawEnforcerId(String lawEnforcerId) {
this.lawEnforcerId = lawEnforcerId;
}
public String getLawEnforcerOther() {
return lawEnforcerOther;
}
public void setLawEnforcerOther(String lawEnforcerOther) {
this.lawEnforcerOther = lawEnforcerOther;
}
public String getLawEnforcerIdOther() {
return lawEnforcerIdOther;
}
public void setLawEnforcerIdOther(String lawEnforcerIdOther) {
this.lawEnforcerIdOther = lawEnforcerIdOther;
}
public Integer getLawEnforcementType() {
return lawEnforcementType;
}
public void setLawEnforcementType(Integer lawEnforcementType) {
this.lawEnforcementType = lawEnforcementType;
}
public String getLawEnforcementTypeText() {
return lawEnforcementTypeText;
}
public void setLawEnforcementTypeText(String lawEnforcementTypeText) {
this.lawEnforcementTypeText = lawEnforcementTypeText;
}
public Integer getLawEnforcementItem() {
return lawEnforcementItem;
}
public void setLawEnforcementItem(Integer lawEnforcementItem) {
this.lawEnforcementItem = lawEnforcementItem;
}
public String getLawEnforcementItemText() {
return lawEnforcementItemText;
}
public void setLawEnforcementItemText(String lawEnforcementItemText) {
this.lawEnforcementItemText = lawEnforcementItemText;
}
public String getLawEnforcementBasis() {
return lawEnforcementBasis;
}
public void setLawEnforcementBasis(String lawEnforcementBasis) {
this.lawEnforcementBasis = lawEnforcementBasis;
}
public String getLawEnforcementBasisText() {
return lawEnforcementBasisText;
}
public void setLawEnforcementBasisText(String lawEnforcementBasisText) {
this.lawEnforcementBasisText = lawEnforcementBasisText;
}
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public Integer getReslut() {
return reslut;
}
public void setReslut(Integer reslut) {
this.reslut = reslut;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getHasDelete() {
return hasDelete;
}
public void setHasDelete(Integer hasDelete) {
this.hasDelete = hasDelete;
}
public Integer getHasComplaint() {
return hasComplaint;
}
public void setHasComplaint(Integer hasComplaint) {
this.hasComplaint = hasComplaint;
}
public Integer getHasSubmit() {
return hasSubmit;
}
public void setHasSubmit(Integer hasSubmit) {
this.hasSubmit = hasSubmit;
}
public Integer getHasEvaluate() {
return hasEvaluate;
}
public void setHasEvaluate(Integer hasEvaluate) {
this.hasEvaluate = hasEvaluate;
}
public List<String> getFileList() {
return fileList;
}
public void setFileList(List<String> fileList) {
this.fileList = fileList;
}
public String getLawId() {
return lawId;
}
public void setLawId(String lawId) {
this.lawId = lawId;
}
public String getLawText() {
return lawText;
}
public void setLawText(String lawText) {
this.lawText = lawText;
}
public String getBureauDeptId() {
return bureauDeptId;
}
public void setBureauDeptId(String bureauDeptId) {
this.bureauDeptId = bureauDeptId;
}
public String getBureauDeptName() {
return bureauDeptName;
}
public void setBureauDeptName(String bureauDeptName) {
this.bureauDeptName = bureauDeptName;
}
public String getCreditcode() {
return creditcode;
}
public void setCreditcode(String creditcode) {
this.creditcode = creditcode;
}
}

62
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/NonEnforcementRegistrationMapper.java

@ -0,0 +1,62 @@
package com.zdxt.code.mapper;
import com.zdxt.code.domain.NonEnforcementRegistration;
import java.util.List;
/**
* 非行政执法登记Mapper接口
*
* @author kylin
* @date 2025-06-19
*/
public interface NonEnforcementRegistrationMapper
{
/**
* 查询非行政执法登记
*
* @param id 非行政执法登记ID
* @return 非行政执法登记
*/
public NonEnforcementRegistration selectNonEnforcementRegistrationById(String id);
/**
* 查询非行政执法登记列表
*
* @param nonEnforcementRegistration 非行政执法登记
* @return 非行政执法登记集合
*/
public List<NonEnforcementRegistration> selectNonEnforcementRegistrationList(NonEnforcementRegistration nonEnforcementRegistration);
/**
* 新增非行政执法登记
*
* @param nonEnforcementRegistration 非行政执法登记
* @return 结果
*/
public int insertNonEnforcementRegistration(NonEnforcementRegistration nonEnforcementRegistration);
/**
* 修改非行政执法登记
*
* @param nonEnforcementRegistration 非行政执法登记
* @return 结果
*/
public int updateNonEnforcementRegistration(NonEnforcementRegistration nonEnforcementRegistration);
/**
* 删除非行政执法登记
*
* @param id 非行政执法登记ID
* @return 结果
*/
public int deleteNonEnforcementRegistrationById(String id);
/**
* 批量删除非行政执法登记
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteNonEnforcementRegistrationByIds(String[] ids);
}

62
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/INonEnforcementRegistrationService.java

@ -0,0 +1,62 @@
package com.zdxt.code.service;
import com.zdxt.code.domain.NonEnforcementRegistration;
import java.util.List;
/**
* 非行政执法登记Service接口
*
* @author kylin
* @date 2025-06-19
*/
public interface INonEnforcementRegistrationService
{
/**
* 查询非行政执法登记
*
* @param id 非行政执法登记ID
* @return 非行政执法登记
*/
public NonEnforcementRegistration selectNonEnforcementRegistrationById(String id);
/**
* 查询非行政执法登记列表
*
* @param nonEnforcementRegistration 非行政执法登记
* @return 非行政执法登记集合
*/
public List<NonEnforcementRegistration> selectNonEnforcementRegistrationList(NonEnforcementRegistration nonEnforcementRegistration);
/**
* 新增非行政执法登记
*
* @param nonEnforcementRegistration 非行政执法登记
* @return 结果
*/
public int insertNonEnforcementRegistration(NonEnforcementRegistration nonEnforcementRegistration);
/**
* 修改非行政执法登记
*
* @param nonEnforcementRegistration 非行政执法登记
* @return 结果
*/
public int updateNonEnforcementRegistration(NonEnforcementRegistration nonEnforcementRegistration);
/**
* 批量删除非行政执法登记
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteNonEnforcementRegistrationByIds(String ids);
/**
* 删除非行政执法登记信息
*
* @param id 非行政执法登记ID
* @return 结果
*/
public int deleteNonEnforcementRegistrationById(String id);
}

2
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@ -190,7 +190,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
* @return 执法端-执法登记
*/
@Override
@DataScope
// @DataScope
public List<EnforcementRegistration> selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration)
{
List<EnforcementRegistration> enforcementRegistrations =

148
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java

@ -0,0 +1,148 @@
package com.zdxt.code.service.impl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.zdxt.auth.dto.DeptBean;
import com.zdxt.auth.dto.UserBean;
import com.zdxt.auth.feign.DeptApi;
import com.zdxt.auth.feign.UserApi;
import com.zdxt.auth.feign.ZdxtFileCommonApi;
import com.zdxt.code.domain.NonEnforcementRegistration;
import com.zdxt.code.mapper.NonEnforcementRegistrationMapper;
import com.zdxt.code.service.INonEnforcementRegistrationService;
import com.zdxt.common.util.Convert;
import com.zdxt.common.util.DateUtils;
import com.zdxt.common.zdxtFile.ZdxtFileCommon;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 非行政执法登记Service业务层处理
*
* @author kylin
* @date 2025-06-19
*/
@Service
public class NonEnforcementRegistrationServiceImpl implements INonEnforcementRegistrationService
{
@Autowired private NonEnforcementRegistrationMapper nonEnforcementRegistrationMapper;
@Autowired private ZdxtFileCommonApi zdxtFileCommonApi;
@Autowired private DeptApi deptApi;
@Autowired private UserApi userApi;
/**
* 查询非行政执法登记
*
* @param id 非行政执法登记ID
* @return 非行政执法登记
*/
@Override
public NonEnforcementRegistration selectNonEnforcementRegistrationById(String id)
{
NonEnforcementRegistration nonReg = nonEnforcementRegistrationMapper.selectNonEnforcementRegistrationById(id);
if (nonReg.getId() != null) {
List<ZdxtFileCommon> zdxtFileCommons = zdxtFileCommonApi.selectZdxtFileById(nonReg.getId());
if (zdxtFileCommons.size() > 0) {
Map<String, Object> params = new HashMap<String, Object>();
params.put("fileList", zdxtFileCommons);
nonReg.setParams(params);
}
}
return nonReg;
}
/**
* 查询非行政执法登记列表
*
* @param nonEnforcementRegistration 非行政执法登记
* @return 非行政执法登记
*/
@Override
public List<NonEnforcementRegistration> selectNonEnforcementRegistrationList(NonEnforcementRegistration nonEnforcementRegistration)
{
return nonEnforcementRegistrationMapper.selectNonEnforcementRegistrationList(nonEnforcementRegistration);
}
/**
* 新增非行政执法登记
*
* @param nonEnforcementRegistration 非行政执法登记
* @return 结果
*/
@Override
public int insertNonEnforcementRegistration(NonEnforcementRegistration nonEnforcementRegistration)
{
UserBean user = userApi.getUserByUserId(nonEnforcementRegistration.getUserId());
nonEnforcementRegistration.setId(IdUtil.simpleUUID());
nonEnforcementRegistration.setCreateBy(user.getUserName());
// enforcementRegistration.setCreateTime(DateUtils.getNowDate());
nonEnforcementRegistration.setUserId(user.getUserId());
nonEnforcementRegistration.setDeptId(user.getDeptId());
nonEnforcementRegistration.setCreditcode("9527-还没想好咋拿");
int resNum = nonEnforcementRegistrationMapper.insertNonEnforcementRegistration(nonEnforcementRegistration);
if(StrUtil.isNotEmpty(nonEnforcementRegistration.getBureauDeptId())){
//查询人员所在区
DeptBean deptBean = deptApi.iterationDeptParentRegion(nonEnforcementRegistration.getBureauDeptId());
//存储数据产生的所在行政区
// nonEnforcementRegistration.setRegion(null!=deptBean?deptBean.getDeptName():"");
// nonEnforcementRegistration.setRegionId(null!=deptBean?deptBean.getDeptId():"");
}
// 重新加入附件
if (resNum > 0 && nonEnforcementRegistration.getFileList().size() > 0) {
zdxtFileCommonApi.deleteZdxtFileByIds(nonEnforcementRegistration.getId());
nonEnforcementRegistration.getFileList().forEach(res -> {
ZdxtFileCommon zdxtFileCommon = new ZdxtFileCommon();
zdxtFileCommon.setBusinessId(nonEnforcementRegistration.getId());
zdxtFileCommon.setGuid(IdUtil.simpleUUID());
//文件后缀
// zdxtFileCommon.setFileSuffix("JPG");
zdxtFileCommon.setUploadPath(res);
zdxtFileCommon.setUploadPersonId(user.getUserId().toString());
zdxtFileCommon.setUploadPersonName(user.getUserName());
zdxtFileCommonApi.addZdxtFileCommon(zdxtFileCommon);
});
}
return resNum;
}
/**
* 修改非行政执法登记
*
* @param nonEnforcementRegistration 非行政执法登记
* @return 结果
*/
@Override
public int updateNonEnforcementRegistration(NonEnforcementRegistration nonEnforcementRegistration)
{
return nonEnforcementRegistrationMapper.updateNonEnforcementRegistration(nonEnforcementRegistration);
}
/**
* 删除非行政执法登记对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteNonEnforcementRegistrationByIds(String ids)
{
return nonEnforcementRegistrationMapper.deleteNonEnforcementRegistrationByIds(Convert.toStrArray(ids));
}
/**
* 删除非行政执法登记信息
*
* @param id 非行政执法登记ID
* @return 结果
*/
@Override
public int deleteNonEnforcementRegistrationById(String id)
{
return nonEnforcementRegistrationMapper.deleteNonEnforcementRegistrationById(id);
}
}

13
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java

@ -189,8 +189,19 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
user.setLawOfficer(false);
}
} else {
// 身份证都没有! 啥人啊? 先按非执法人员算
user.setLawOfficer(false);
}
// 如果没有执法证件号, 则再次判断是否为公安
if (!user.getLawOfficer()) {
// 根据执法部门判断如果是公安, 则为执法人员权限 true
DeptBean bureauDept = deptApi.iterationDeptParentToBureauGA(user_source.getDeptId());
if (null != bureauDept && (5 == bureauDept.getZone() || 15 == bureauDept.getZone())) {
user.setLawOfficer(true);
} else {
user.setLawOfficer(false);
}
}
Map<String,Object> payload = new HashMap<>();
payload.put("id", user.getUserId());
payload.put("name", user.getLoginName());
@ -375,7 +386,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
System.out.println(zfryjdm2405301s);
System.out.println("==============");
if(zfryjdm2405301s.size() > 0 ){
if(BeanUtil.isNotEmpty(zfryjdm2405301s.get(0))){
if(BeanUtil.isNotEmpty(zfryjdm2405301s.get(0).getZfcode())){
return Boolean.TRUE;
}else{
return Boolean.FALSE;

10
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml

@ -85,19 +85,19 @@
AND e.law_enforcement_item_text like concat(concat('%',#{lawEnforcementItemText}),'%')
</if>
<if test="year != null and year != ''">
AND YEAR(e.create_time) = #{year}
AND YEAR(e.enforcement_time) = #{year}
</if>
<if test="quarter != null and quarter != '' ">
AND QUARTER(e.create_time) = #{quarter}
AND QUARTER(e.enforcement_time) = #{quarter}
</if>
<if test="month != null and month != '' ">
AND DATE_FORMAT(e.create_time, '%m') = #{month}
AND DATE_FORMAT(e.enforcement_time, '%m') = #{month}
</if>
<if test="startTime != null and startTime != ''"><!-- 开始时间检索 -->
and DATE_FORMAT(e.create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d')
and DATE_FORMAT(e.enforcement_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d')
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
and DATE_FORMAT(e.create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
and DATE_FORMAT(e.enforcement_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
</if>
</where>
order by e.enterprise_name

5
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml

@ -82,9 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dateSearch != null and dateSearch != ''">
and DATE_FORMAT(create_time, '%Y-%m') = #{dateSearch}
</if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
<if test="dataScopeId != null and dataScopeId != ''">
and user_id = #{dataScopeId}
</if>
</where>
order by create_time desc

52
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@ -154,6 +154,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and enforcement_time &lt;= #{params.endTime}
</if>
<if test="dataScopeId != null and dataScopeId != ''">
and (law_enforcer_id = #{dataScopeId} or FIND_IN_SET(#{dataScopeId}, law_enforcer_id_two))
</if>
</where>
order by enforcement_time desc
<if test="params.pageNum != null and params.pageSize != null"><!-- 开始时间检索 -->
@ -242,6 +245,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and enforcement_time &lt;= #{params.endTime}
</if>
<if test="dataScopeId != null and dataScopeId != ''">
and (law_enforcer_id = #{dataScopeId} or FIND_IN_SET(#{dataScopeId}, law_enforcer_id_two))
</if>
</where>
order by enforcement_time desc
</select>
@ -449,19 +455,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="checkCategory != null and checkCategory != ''"> and check_category = #{checkCategory}</if>
<if test="checkCss != null and checkCss != ''"> and check_css = #{checkCss}</if>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
and DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
and DATE_FORMAT(enforcement_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
and DATE_FORMAT(enforcement_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
</if>
<if test="year != null and year != ''">
AND YEAR(create_time) = #{year}
AND YEAR(enforcement_time) = #{year}
</if>
<if test="quarter != null and quarter != '' ">
AND QUARTER(create_time) = #{quarter}
AND QUARTER(enforcement_time) = #{quarter}
</if>
<if test="month != null and month != '' ">
AND DATE_FORMAT(create_time, '%m') = #{month}
AND DATE_FORMAT(enforcement_time, '%m') = #{month}
</if>
<choose>
<when test="params.dataScope != null and params.dataScope != ''">
@ -478,7 +484,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectEnforcementRegistrationAndAddressList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,i.enterprise_address,r.law_enforcement_item_text,r.unite_check,
r.check_category,r.check_css,r.is_complaint,r.create_time,r.law_id from enforcement_registration r
r.check_category,r.check_css,r.is_complaint,r.create_time,r.law_id, r.enforcement_time from enforcement_registration r
left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on r.enterprise_number=i.enterprise_number
<where>
and r.bureau_dept_name is not null
@ -514,25 +520,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="checkCss != null and checkCss != ''"> and r.check_css = #{checkCss}</if>
<if test="lawEnforcementItemText != null and lawEnforcementItemText != ''"> and law_enforcement_item_text like concat('%', #{lawEnforcementItemText,jdbcType=VARCHAR}, '%')</if>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
</if>
<if test="beginEnforcementTime != null and beginEnforcementTime != ''"><!-- 开始时间检索用于预警搜索 -->
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginEnforcementTime},'%Y-%m-%d')
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginEnforcementTime},'%Y-%m-%d')
</if>
<if test="endEnforcementTime != null and endEnforcementTime != ''"><!-- 结束时间检索用于预警搜索 -->
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endEnforcementTime},'%Y-%m-%d')
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endEnforcementTime},'%Y-%m-%d')
</if>
<if test="year != null and year != ''">
AND YEAR(r.create_time) = #{year}
AND YEAR(r.enforcement_time) = #{year}
</if>
<if test="quarter != null and quarter != '' ">
AND QUARTER(r.create_time) = #{quarter}
AND QUARTER(r.enforcement_time) = #{quarter}
</if>
<if test="month != null and month != '' ">
AND DATE_FORMAT(r.create_time, '%m') = #{month}
AND DATE_FORMAT(r.enforcement_time, '%m') = #{month}
</if>
<!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope != ''">
@ -540,7 +546,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
${params.dataScope}
</if>
</where>
order by r.create_time desc
order by r.enforcement_time desc
</select>
<select id="selectEnterpriseRegistrationList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
@ -976,35 +982,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND r.law_enforcement_item_text like concat(concat('%',#{lawEnforcementItemText}),'%')
</if>
<if test="year != null and year != ''">
AND YEAR(r.create_time) = #{year}
AND YEAR(r.enforcement_time) = #{year}
</if>
<if test="quarter != null and quarter != '' ">
AND QUARTER(r.create_time) = #{quarter}
AND QUARTER(r.enforcement_time) = #{quarter}
</if>
<if test="month != null and month != '' ">
AND DATE_FORMAT(r.create_time, '%m') = #{month}
AND DATE_FORMAT(r.enforcement_time, '%m') = #{month}
</if>
<if test="params.beginTime != null and params.beginTime != ''">
AND <![CDATA[ r.create_time >= #{params.beginTime} ]]>
AND <![CDATA[ r.enforcement_time >= #{params.beginTime} ]]>
</if>
<if test="params.endTime != null and params.endTime != ''">
AND <![CDATA[ r.create_time <= #{params.endTime} ]]>
AND <![CDATA[ r.enforcement_time <= #{params.endTime} ]]>
</if>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
</if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</where>
ORDER BY r.create_time DESC LIMIT 1000000000 ) t
ORDER BY r.enforcement_time DESC LIMIT 1000000000 ) t
GROUP BY
t.enterprise_number
order by t.create_time
order by t.enforcement_time
</select>
<select id="staticEnforcementRegistrationDetail" resultType="com.zdxt.code.domain.dto.EnforcementRegistrationDto" parameterType="EnforcementRegistrationDto">

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

@ -0,0 +1,205 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zdxt.code.mapper.NonEnforcementRegistrationMapper">
<resultMap type="com.zdxt.code.domain.NonEnforcementRegistration" id="NonEnforcementRegistrationResult">
<result property="id" column="id" />
<result property="enterpriseName" column="enterprise_name" />
<result property="enterpriseNumber" column="enterprise_number" />
<result property="enforcementTime" column="enforcement_time" />
<result property="lawEnforcer" column="law_enforcer" />
<result property="lawEnforcerId" column="law_enforcer_id" />
<result property="lawEnforcerOther" column="law_enforcer_other" />
<result property="lawEnforcerIdOther" column="law_enforcer_id_other" />
<result property="lawEnforcementType" column="law_enforcement_type" />
<result property="lawEnforcementTypeText" column="law_enforcement_type_text" />
<result property="lawEnforcementItem" column="law_enforcement_item" />
<result property="lawEnforcementItemText" column="law_enforcement_item_text" />
<result property="lawEnforcementBasis" column="law_enforcement_basis" />
<result property="lawEnforcementBasisText" column="law_enforcement_basis_text" />
<result property="remark" column="remark" />
<result property="reslut" column="reslut" />
<result property="status" column="status" />
<result property="hasDelete" column="has_delete" />
<result property="hasComplaint" column="has_complaint" />
<result property="hasSubmit" column="has_submit" />
<result property="hasEvaluate" column="has_evaluate" />
<result property="lawId" column="law_id" />
<result property="lawText" column="law_text" />
<result property="bureauDeptId" column="bureau_dept_id" />
<result property="bureauDeptName" column="bureau_dept_name" />
<result property="creditcode" column="creditcode" />
<result property="userId" column="user_id" />
<result property="deptId" column="dept_id" />
<result property="createBy" column="create_by" />
<result property="updateBy" column="update_by" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectNonEnforcementRegistrationVo">
select id, enterprise_name, enterprise_number, enforcement_time, law_enforcer, law_enforcer_id, law_enforcer_other, law_enforcer_id_other, law_enforcement_type, law_enforcement_type_text, law_enforcement_item, law_enforcement_item_text, law_enforcement_basis, law_enforcement_basis_text, remark, reslut, status, has_delete, has_complaint, has_submit, has_evaluate, law_id, law_text, bureau_dept_id, bureau_dept_name, creditcode, user_id, dept_id, create_by, update_by, create_time, update_time from non_enforcement_registration
</sql>
<select id="selectNonEnforcementRegistrationList" parameterType="NonEnforcementRegistration" resultMap="NonEnforcementRegistrationResult">
<include refid="selectNonEnforcementRegistrationVo"/>
<where>
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="enterpriseNumber != null and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if>
<if test="enforcementTime != null "> and enforcement_time = #{enforcementTime}</if>
<if test="lawEnforcer != null and lawEnforcer != ''"> and law_enforcer = #{lawEnforcer}</if>
<if test="lawEnforcerId != null and lawEnforcerId != ''"> and law_enforcer_id = #{lawEnforcerId}</if>
<if test="lawEnforcerOther != null and lawEnforcerOther != ''"> and law_enforcer_other = #{lawEnforcerOther}</if>
<if test="lawEnforcerIdOther != null and lawEnforcerIdOther != ''"> and law_enforcer_id_other = #{lawEnforcerIdOther}</if>
<if test="lawEnforcementType != null "> and law_enforcement_type = #{lawEnforcementType}</if>
<if test="lawEnforcementTypeText != null and lawEnforcementTypeText != ''"> and law_enforcement_type_text = #{lawEnforcementTypeText}</if>
<if test="lawEnforcementItem != null "> and law_enforcement_item = #{lawEnforcementItem}</if>
<if test="lawEnforcementItemText != null and lawEnforcementItemText != ''"> and law_enforcement_item_text = #{lawEnforcementItemText}</if>
<if test="lawEnforcementBasis != null and lawEnforcementBasis != ''"> and law_enforcement_basis = #{lawEnforcementBasis}</if>
<if test="lawEnforcementBasisText != null and lawEnforcementBasisText != ''"> and law_enforcement_basis_text = #{lawEnforcementBasisText}</if>
<if test="reslut != null and reslut != ''"> and reslut = #{reslut}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="hasDelete != null and hasDelete != ''"> and has_delete = #{hasDelete}</if>
<if test="hasComplaint != null and hasComplaint != ''"> and has_complaint = #{hasComplaint}</if>
<if test="hasSubmit != null and hasSubmit != ''"> and has_submit = #{hasSubmit}</if>
<if test="hasEvaluate != null and hasEvaluate != ''"> and has_evaluate = #{hasEvaluate}</if>
<if test="lawId != null and lawId != ''"> and law_id = #{lawId}</if>
<if test="lawText != null and lawText != ''"> and law_text = #{lawText}</if>
<if test="bureauDeptId != null and bureauDeptId != ''"> and bureau_dept_id = #{bureauDeptId}</if>
<if test="bureauDeptName != null and bureauDeptName != ''"> and bureau_dept_name like concat('%', #{bureauDeptName}, '%')</if>
<if test="creditcode != null and creditcode != ''"> and creditcode = #{creditcode}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
</where>
order by create_time desc
</select>
<select id="selectNonEnforcementRegistrationById" parameterType="String" resultMap="NonEnforcementRegistrationResult">
<include refid="selectNonEnforcementRegistrationVo"/>
where id = #{id}
</select>
<insert id="insertNonEnforcementRegistration" parameterType="NonEnforcementRegistration">
insert into non_enforcement_registration
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">id,</if>
<if test="enterpriseName != null and enterpriseName != ''">enterprise_name,</if>
<if test="enterpriseNumber != null and enterpriseNumber != ''">enterprise_number,</if>
<if test="enforcementTime != null ">enforcement_time,</if>
<if test="lawEnforcer != null and lawEnforcer != ''">law_enforcer,</if>
<if test="lawEnforcerId != null and lawEnforcerId != ''">law_enforcer_id,</if>
<if test="lawEnforcerOther != null and lawEnforcerOther != ''">law_enforcer_other,</if>
<if test="lawEnforcerIdOther != null and lawEnforcerIdOther != ''">law_enforcer_id_other,</if>
<if test="lawEnforcementType != null ">law_enforcement_type,</if>
<if test="lawEnforcementTypeText != null and lawEnforcementTypeText != ''">law_enforcement_type_text,</if>
<if test="lawEnforcementItem != null ">law_enforcement_item,</if>
<if test="lawEnforcementItemText != null and lawEnforcementItemText != ''">law_enforcement_item_text,</if>
<if test="lawEnforcementBasis != null and lawEnforcementBasis != ''">law_enforcement_basis,</if>
<if test="lawEnforcementBasisText != null and lawEnforcementBasisText != ''">law_enforcement_basis_text,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="reslut != null ">reslut,</if>
<if test="status != null ">status,</if>
<if test="hasDelete != null ">has_delete,</if>
<if test="hasComplaint != null ">has_complaint,</if>
<if test="hasSubmit != null ">has_submit,</if>
<if test="hasEvaluate != null ">has_evaluate,</if>
<if test="lawId != null and lawId != ''">law_id,</if>
<if test="lawText != null and lawText != ''">law_text,</if>
<if test="bureauDeptId != null and bureauDeptId != ''">bureau_dept_id,</if>
<if test="bureauDeptName != null and bureauDeptName != ''">bureau_dept_name,</if>
<if test="creditcode != null and creditcode != ''">creditcode,</if>
<if test="userId != null and userId != ''">user_id,</if>
<if test="deptId != null and deptId != ''">dept_id,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="createTime != null ">create_time,</if>
<if test="updateTime != null ">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
<if test="enterpriseName != null and enterpriseName != ''">#{enterpriseName},</if>
<if test="enterpriseNumber != null and enterpriseNumber != ''">#{enterpriseNumber},</if>
<if test="enforcementTime != null ">#{enforcementTime},</if>
<if test="lawEnforcer != null and lawEnforcer != ''">#{lawEnforcer},</if>
<if test="lawEnforcerId != null and lawEnforcerId != ''">#{lawEnforcerId},</if>
<if test="lawEnforcerOther != null and lawEnforcerOther != ''">#{lawEnforcerOther},</if>
<if test="lawEnforcerIdOther != null and lawEnforcerIdOther != ''">#{lawEnforcerIdOther},</if>
<if test="lawEnforcementType != null ">#{lawEnforcementType},</if>
<if test="lawEnforcementTypeText != null and lawEnforcementTypeText != ''">#{lawEnforcementTypeText},</if>
<if test="lawEnforcementItem != null ">#{lawEnforcementItem},</if>
<if test="lawEnforcementItemText != null and lawEnforcementItemText != ''">#{lawEnforcementItemText},</if>
<if test="lawEnforcementBasis != null and lawEnforcementBasis != ''">#{lawEnforcementBasis},</if>
<if test="lawEnforcementBasisText != null and lawEnforcementBasisText != ''">#{lawEnforcementBasisText},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="reslut != null ">#{reslut},</if>
<if test="status != null ">#{status},</if>
<if test="hasDelete != null ">#{hasDelete},</if>
<if test="hasComplaint != null ">#{hasComplaint},</if>
<if test="hasSubmit != null ">#{hasSubmit},</if>
<if test="hasEvaluate != null ">#{hasEvaluate},</if>
<if test="lawId != null and lawId != ''">#{lawId},</if>
<if test="lawText != null and lawText != ''">#{lawText},</if>
<if test="bureauDeptId != null and bureauDeptId != ''">#{bureauDeptId},</if>
<if test="bureauDeptName != null and bureauDeptName != ''">#{bureauDeptName},</if>
<if test="creditcode != null and creditcode != ''">#{creditcode},</if>
<if test="userId != null and userId != ''">#{userId},</if>
<if test="deptId != null and deptId != ''">#{deptId},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="createTime != null ">#{createTime},</if>
<if test="updateTime != null ">#{updateTime},</if>
</trim>
</insert>
<update id="updateNonEnforcementRegistration" parameterType="NonEnforcementRegistration">
update non_enforcement_registration
<trim prefix="SET" suffixOverrides=",">
<if test="enterpriseName != null and enterpriseName != ''">enterprise_name = #{enterpriseName},</if>
<if test="enterpriseNumber != null and enterpriseNumber != ''">enterprise_number = #{enterpriseNumber},</if>
<if test="enforcementTime != null ">enforcement_time = #{enforcementTime},</if>
<if test="lawEnforcer != null and lawEnforcer != ''">law_enforcer = #{lawEnforcer},</if>
<if test="lawEnforcerId != null and lawEnforcerId != ''">law_enforcer_id = #{lawEnforcerId},</if>
<if test="lawEnforcerOther != null and lawEnforcerOther != ''">law_enforcer_other = #{lawEnforcerOther},</if>
<if test="lawEnforcerIdOther != null and lawEnforcerIdOther != ''">law_enforcer_id_other = #{lawEnforcerIdOther},</if>
<if test="lawEnforcementType != null ">law_enforcement_type = #{lawEnforcementType},</if>
<if test="lawEnforcementTypeText != null and lawEnforcementTypeText != ''">law_enforcement_type_text = #{lawEnforcementTypeText},</if>
<if test="lawEnforcementItem != null ">law_enforcement_item = #{lawEnforcementItem},</if>
<if test="lawEnforcementItemText != null and lawEnforcementItemText != ''">law_enforcement_item_text = #{lawEnforcementItemText},</if>
<if test="lawEnforcementBasis != null and lawEnforcementBasis != ''">law_enforcement_basis = #{lawEnforcementBasis},</if>
<if test="lawEnforcementBasisText != null and lawEnforcementBasisText != ''">law_enforcement_basis_text = #{lawEnforcementBasisText},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="reslut != null ">reslut = #{reslut},</if>
<if test="status != null ">status = #{status},</if>
<if test="hasDelete != null ">has_delete = #{hasDelete},</if>
<if test="hasComplaint != null ">has_complaint = #{hasComplaint},</if>
<if test="hasSubmit != null ">has_submit = #{hasSubmit},</if>
<if test="hasEvaluate != null ">has_evaluate = #{hasEvaluate},</if>
<if test="lawId != null and lawId != ''">law_id = #{lawId},</if>
<if test="lawText != null and lawText != ''">law_text = #{lawText},</if>
<if test="bureauDeptId != null and bureauDeptId != ''">bureau_dept_id = #{bureauDeptId},</if>
<if test="bureauDeptName != null and bureauDeptName != ''">bureau_dept_name = #{bureauDeptName},</if>
<if test="creditcode != null and creditcode != ''">creditcode = #{creditcode},</if>
<if test="userId != null and userId != ''">user_id = #{userId},</if>
<if test="deptId != null and deptId != ''">dept_id = #{deptId},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="createTime != null ">create_time = #{createTime},</if>
<if test="updateTime != null ">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteNonEnforcementRegistrationById" parameterType="String">
delete from non_enforcement_registration where id = #{id}
</delete>
<delete id="deleteNonEnforcementRegistrationByIds" parameterType="String">
delete from non_enforcement_registration where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

104
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml

@ -152,19 +152,19 @@
<!-- </if>-->
<!-- </if>-->
<if test="dateType != null and dateType != '' and dateType == 'year' ">
and YEAR(r.create_time)=#{year}
and YEAR(r.enforcement_time)=#{year}
</if>
<if test="dateType != null and dateType != '' and dateType == 'quarter' ">
and YEAR(r.create_time)=#{year}
and QUARTER(r.create_time)=#{quarter}
and YEAR(r.enforcement_time)=#{year}
and QUARTER(r.enforcement_time)=#{quarter}
</if>
<if test="dateType != null and dateType != '' and dateType == 'month' ">
and YEAR(r.create_time)=#{year}
and MONTH(r.create_time)=#{month}
and YEAR(r.enforcement_time)=#{year}
and MONTH(r.enforcement_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')
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')
</if>
<!-- 数据范围过滤 -->
<!-- <if test="params.dataScope != null and params.dataScope != ''">-->
@ -204,19 +204,19 @@
<!-- </if>-->
<!-- </if>-->
<if test="dateType != null and dateType != '' and dateType == 'year' ">
and YEAR(r.create_time)+1=#{year}
and YEAR(r.enforcement_time)+1=#{year}
</if>
<if test="dateType != null and dateType != '' and dateType == 'quarter' ">
and YEAR(DATE_SUB(r.create_time,INTERVAL -1 quarter))=#{year}
and QUARTER(DATE_SUB(r.create_time,INTERVAL -1 quarter))=#{quarter}
and YEAR(DATE_SUB(r.enforcement_time,INTERVAL -1 quarter))=#{year}
and QUARTER(DATE_SUB(r.enforcement_time,INTERVAL -1 quarter))=#{quarter}
</if>
<if test="dateType != null and dateType != '' and dateType == 'month' ">
and YEAR(DATE_SUB(r.create_time,INTERVAL -1 month))=#{year}
and MONTH(DATE_SUB(r.create_time,INTERVAL -1 month))=#{month}
and YEAR(DATE_SUB(r.enforcement_time,INTERVAL -1 month))=#{year}
and MONTH(DATE_SUB(r.enforcement_time,INTERVAL -1 month))=#{month}
</if>
<if test="dateType != null and dateType != '' and dateType == 'day' ">
and DATE_FORMAT(r.create_time,'%Y-%m-%d')>=DATE_SUB(STR_TO_DATE(#{beginTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)
and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(r.create_time,'%Y-%m-%d')
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')>=DATE_SUB(STR_TO_DATE(#{beginTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)
and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')
</if>
<!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope != ''">
@ -256,19 +256,19 @@
<!-- </if>-->
<!-- </if>-->
<if test="dateType != null and dateType != '' and dateType == 'year' ">
and YEAR(r.create_time)+1=#{year}
and YEAR(r.enforcement_time)+1=#{year}
</if>
<if test="dateType != null and dateType != '' and dateType == 'quarter' ">
and YEAR(DATE_SUB(r.create_time,INTERVAL -1 year))=#{year}
and QUARTER(DATE_SUB(r.create_time,INTERVAL -1 year))=#{quarter}
and YEAR(DATE_SUB(r.enforcement_time,INTERVAL -1 year))=#{year}
and QUARTER(DATE_SUB(r.enforcement_time,INTERVAL -1 year))=#{quarter}
</if>
<if test="dateType != null and dateType != '' and dateType == 'month' ">
and YEAR(DATE_SUB(r.create_time,INTERVAL -1 year))=#{year}
and MONTH(DATE_SUB(r.create_time,INTERVAL -1 year))=#{month}
and YEAR(DATE_SUB(r.enforcement_time,INTERVAL -1 year))=#{year}
and MONTH(DATE_SUB(r.enforcement_time,INTERVAL -1 year))=#{month}
</if>
<if test="dateType != null and dateType != '' and dateType == 'day' ">
and DATE_FORMAT(DATE_SUB(r.create_time,INTERVAL -1 year),'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(r.create_time,INTERVAL -1 year),'%Y-%m-%d')
and DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d')
</if>
<!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope != ''">
@ -299,19 +299,19 @@
<!-- </if>-->
<!-- </if>-->
<if test="dateType != null and dateType != '' and dateType == 'year' ">
and YEAR(n.create_time)=#{year}
and YEAR(n.check_time)=#{year}
</if>
<if test="dateType != null and dateType != '' and dateType == 'quarter' ">
and YEAR(n.create_time)=#{year}
and QUARTER(n.create_time)=#{quarter}
and YEAR(n.check_time)=#{year}
and QUARTER(n.check_time)=#{quarter}
</if>
<if test="dateType != null and dateType != '' and dateType == 'month' ">
and YEAR(n.create_time)=#{year}
and MONTH(n.create_time)=#{month}
and YEAR(n.check_time)=#{year}
and MONTH(n.check_time)=#{month}
</if>
<if test="dateType != null and dateType != '' and dateType == 'day' ">
and DATE_FORMAT(n.create_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(n.create_time,'%Y-%m-%d')
and DATE_FORMAT(n.check_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(n.check_time,'%Y-%m-%d')
</if>
<!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope != ''">
@ -341,19 +341,19 @@
<!-- </if>-->
<!-- </if>-->
<if test="dateType != null and dateType != '' and dateType == 'year' ">
and YEAR(n.create_time)+1=#{year}
and YEAR(n.check_time)+1=#{year}
</if>
<if test="dateType != null and dateType != '' and dateType == 'quarter' ">
and YEAR(DATE_SUB(n.create_time,INTERVAL -1 quarter))=#{year}
and QUARTER(DATE_SUB(n.create_time,INTERVAL -1 quarter))=#{quarter}
and YEAR(DATE_SUB(n.check_time,INTERVAL -1 quarter))=#{year}
and QUARTER(DATE_SUB(n.check_time,INTERVAL -1 quarter))=#{quarter}
</if>
<if test="dateType != null and dateType != '' and dateType == 'month' ">
and YEAR(DATE_SUB(n.create_time,INTERVAL -1 month))=#{year}
and MONTH(DATE_SUB(n.create_time,INTERVAL -1 month))=#{month}
and YEAR(DATE_SUB(n.check_time,INTERVAL -1 month))=#{year}
and MONTH(DATE_SUB(n.check_time,INTERVAL -1 month))=#{month}
</if>
<if test="dateType != null and dateType != '' and dateType == 'day' ">
and DATE_FORMAT(n.create_time,'%Y-%m-%d')>=DATE_SUB(STR_TO_DATE(#{beginTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)
and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(n.create_time,'%Y-%m-%d')
and DATE_FORMAT(n.check_time,'%Y-%m-%d')>=DATE_SUB(STR_TO_DATE(#{beginTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)
and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(n.check_time,'%Y-%m-%d')
</if>
<!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope != ''">
@ -383,19 +383,19 @@
<!-- </if>-->
<!-- </if>-->
<if test="dateType != null and dateType != '' and dateType == 'year' ">
and YEAR(n.create_time)+1=#{year}
and YEAR(n.check_time)+1=#{year}
</if>
<if test="dateType != null and dateType != '' and dateType == 'quarter' ">
and YEAR(DATE_SUB(n.create_time,INTERVAL -1 year))=#{year}
and QUARTER(DATE_SUB(n.create_time,INTERVAL -1 year))=#{quarter}
and YEAR(DATE_SUB(n.check_time,INTERVAL -1 year))=#{year}
and QUARTER(DATE_SUB(n.check_time,INTERVAL -1 year))=#{quarter}
</if>
<if test="dateType != null and dateType != '' and dateType == 'month' ">
and YEAR(DATE_SUB(n.create_time,INTERVAL -1 year))=#{year}
and MONTH(DATE_SUB(n.create_time,INTERVAL -1 year))=#{month}
and YEAR(DATE_SUB(n.check_time,INTERVAL -1 year))=#{year}
and MONTH(DATE_SUB(n.check_time,INTERVAL -1 year))=#{month}
</if>
<if test="dateType != null and dateType != '' and dateType == 'day' ">
and DATE_FORMAT(DATE_SUB(n.create_time,INTERVAL -1 year),'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(n.create_time,INTERVAL -1 year),'%Y-%m-%d')
and DATE_FORMAT(DATE_SUB(n.check_time,INTERVAL -1 year),'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d')
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(n.check_time,INTERVAL -1 year),'%Y-%m-%d')
</if>
<!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope != ''">
@ -790,10 +790,10 @@
<!-- </if>-->
<!-- </if>-->
<if test="beginTime != null and beginTime != ''">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') >=#{beginTime}
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >=#{beginTime}
</if>
<if test="endTime != null and endTime != ''">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
</if>
<!-- <if test="dateType != null and dateType != '' and dateType == 'year' ">-->
<!-- and YEAR(r.create_time)=#{year}-->
@ -895,10 +895,10 @@
<!-- </if>-->
<!-- </if>-->
<if test="beginTime != null and beginTime != ''">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') >=#{beginTime}
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >=#{beginTime}
</if>
<if test="endTime != null and endTime != ''">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
</if>
<!-- <if test="dateType != null and dateType != '' and dateType == 'year' ">-->
<!-- and YEAR(r.create_time)=#{year}-->
@ -956,10 +956,10 @@
</if>
</if>
<if test="beginTime != null and beginTime != ''">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') >=#{beginTime}
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >=#{beginTime}
</if>
<if test="endTime != null and endTime != ''">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
</if>
<!-- <if test="dateType != null and dateType != '' and dateType == 'year' ">-->
<!-- and YEAR(r.create_time)=#{year}-->
@ -1032,10 +1032,10 @@
<!-- and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.create_time,'%Y-%m-%d')-->
<!-- </if>-->
<if test="beginTime != null and beginTime != ''">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') >=#{beginTime}
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >=#{beginTime}
</if>
<if test="endTime != null and endTime != ''">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
</if>
<!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope != ''">
@ -1107,10 +1107,10 @@
and e.bureau_dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if>
<if test="beginTime != null and beginTime != ''">
and DATE_FORMAT(c.create_time,'%Y-%m-%d') >=#{beginTime}
and DATE_FORMAT(c.enforcement_time,'%Y-%m-%d') >=#{beginTime}
</if>
<if test="endTime != null and endTime != ''">
and DATE_FORMAT(c.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
and DATE_FORMAT(c.enforcement_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
</if>
<!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope != ''">

3
lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java

@ -127,6 +127,9 @@ public interface DeptApi {
*/
DeptBean iterationDeptParent(String deptId);
DeptBean iterationDeptParentToBureau(String deptId);
DeptBean iterationDeptParentToBureauGA(String deptId);
/**
* 查询当前人所在区
* @param deptId

Loading…
Cancel
Save