Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java into zhangtao

ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BAdministrativeDivisionController.java

@@ -1,31 +1,21 @@
 package com.ruoyi.programManagement.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.programManagement.entity.request.BAdministrativeDistrictRequest;
-import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.programManagement.domain.BAdministrativeDivision;
+import com.ruoyi.programManagement.entity.request.BAdministrativeDistrictRequest;
+import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest;
 import com.ruoyi.programManagement.service.IBAdministrativeDivisionService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import io.swagger.annotations.Api;
-import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 行政区划Controller

ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java

@@ -4,7 +4,6 @@ package com.ruoyi.programManagement.controller;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.programManagement.entity.BPlanEnterprise;
 import com.ruoyi.programManagement.entity.request.BPlanEnterprisePageRequest;
@@ -15,13 +14,9 @@ import com.ruoyi.programManagement.entity.response.BPlanEnterPriseTreeResponse;
 import com.ruoyi.programManagement.entity.response.BPlanEnterpriseResponse;
 import com.ruoyi.programManagement.entity.response.BPlanEnterpriseZhifaResponse;
 import com.ruoyi.programManagement.mapper.BPlanEnterpriseMapper;
-import com.ruoyi.programManagement.service.BKeyEnterpriseService;
 import com.ruoyi.programManagement.service.BPlanEnterpriseService;
-import com.ruoyi.programManagement.service.IBAdministrativeDivisionService;
-import com.ruoyi.programManagement.service.IBAdministrativeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 

ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/SzsAdministrativeDivisionController.java

@@ -5,15 +5,12 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.programManagement.entity.SzsAdministrativeDivision;
-import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest;
 import com.ruoyi.programManagement.service.ISzsAdministrativeDivisionService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/SzsEnterpriseInformationController.java

@@ -1,29 +1,18 @@
 package com.ruoyi.programManagement.controller;
 
-import java.util.List;
+import com.ruoyi.common.core.controller.BaseController;
-import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.core.domain.AjaxResult;
-
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.programManagement.entity.SzsEnterpriseInformation;
+import com.ruoyi.programManagement.service.ISzsEnterpriseInformationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
 
-import com.ruoyi.programManagement.service.ISzsEnterpriseInformationService;
+import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import java.util.List;
-import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 省-企业基本信息Controller
@@ -34,8 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @Api(tags = "省-企业基本信息")
 @RestController
 @RequestMapping("/pharmaceuticals/info")
-public class SzsEnterpriseInformationController extends BaseController
+public class SzsEnterpriseInformationController extends BaseController {
-{
     @Autowired
     private ISzsEnterpriseInformationService szsEnterpriseInformationService;
 
@@ -44,8 +32,7 @@ public class SzsEnterpriseInformationController extends BaseController
      */
     @ApiOperation("查询省-企业基本信息列表")
     @GetMapping("/list")
-    public TableDataInfo list(SzsEnterpriseInformation szsEnterpriseInformation)
+    public TableDataInfo list(SzsEnterpriseInformation szsEnterpriseInformation) {
-    {
         startPage();
         List<SzsEnterpriseInformation> list = szsEnterpriseInformationService.selectSzsEnterpriseInformationList(szsEnterpriseInformation);
         return getDataTable(list);
@@ -56,8 +43,7 @@ public class SzsEnterpriseInformationController extends BaseController
      */
 
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SzsEnterpriseInformation szsEnterpriseInformation)
+    public void export(HttpServletResponse response, SzsEnterpriseInformation szsEnterpriseInformation) {
-    {
         List<SzsEnterpriseInformation> list = szsEnterpriseInformationService.selectSzsEnterpriseInformationList(szsEnterpriseInformation);
         ExcelUtil<SzsEnterpriseInformation> util = new ExcelUtil<SzsEnterpriseInformation>(SzsEnterpriseInformation.class);
         util.exportExcel(response, list, "省-企业基本信息数据");
@@ -68,8 +54,7 @@ public class SzsEnterpriseInformationController extends BaseController
      */
 
     @GetMapping(value = "/{ID}")
-    public AjaxResult getInfo(@PathVariable("ID") String ID)
+    public AjaxResult getInfo(@PathVariable("ID") String ID) {
-    {
         return success(szsEnterpriseInformationService.selectSzsEnterpriseInformationByID(ID));
     }
 
@@ -78,8 +63,7 @@ public class SzsEnterpriseInformationController extends BaseController
      */
 
     @PostMapping
-    public AjaxResult add(@RequestBody SzsEnterpriseInformation szsEnterpriseInformation)
+    public AjaxResult add(@RequestBody SzsEnterpriseInformation szsEnterpriseInformation) {
-    {
         return toAjax(szsEnterpriseInformationService.insertSzsEnterpriseInformation(szsEnterpriseInformation));
     }
 
@@ -88,8 +72,7 @@ public class SzsEnterpriseInformationController extends BaseController
      */
 
     @PutMapping
-    public AjaxResult edit(@RequestBody SzsEnterpriseInformation szsEnterpriseInformation)
+    public AjaxResult edit(@RequestBody SzsEnterpriseInformation szsEnterpriseInformation) {
-    {
         return toAjax(szsEnterpriseInformationService.updateSzsEnterpriseInformation(szsEnterpriseInformation));
     }
 
@@ -98,8 +81,7 @@ public class SzsEnterpriseInformationController extends BaseController
      */
 
     @DeleteMapping("/{IDs}")
-    public AjaxResult remove(@PathVariable String[] IDs)
+    public AjaxResult remove(@PathVariable String[] IDs) {
-    {
         return toAjax(szsEnterpriseInformationService.deleteSzsEnterpriseInformationByIDs(IDs));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/UserController.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.service.ResponseMessage;
 
 /**
  * @Project: emergency-management2

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BEnterpriseNew.java

@@ -1,15 +1,11 @@
 package com.ruoyi.programManagement.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
 
@@ -109,5 +105,4 @@ public class BEnterpriseNew {
     private Long deptId;
 
 
-
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java

@@ -2,15 +2,11 @@ package com.ruoyi.programManagement.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.Valid;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -111,6 +107,5 @@ public class BKeyEnterprise implements Serializable {
     private String enterpriseName;
 
 
-
 }
 

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java

@@ -4,16 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.io.Serializable;
 import java.util.Date;
 
 
@@ -188,7 +185,6 @@ public class BPlanEnterprise  {
     private Long lawSort;
 
 
-
     /**
      * 0：未检查 1：已检查
      */

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/DictData.java

@@ -13,47 +13,64 @@ import lombok.Data;
  */
 @Data
 @ApiModel("字典数据实体类")
-public class DictData
+public class DictData {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 字典编码 */
+    /**
+     * 字典编码
+     */
     @ApiModelProperty(value = "字典编码")
     @Excel(name = "字典编码", cellType = Excel.ColumnType.NUMERIC)
     private Long dictCode;
 
-    /** 字典排序 */
+    /**
+     * 字典排序
+     */
     @ApiModelProperty(value = "字典排序")
     @Excel(name = "字典排序", cellType = Excel.ColumnType.NUMERIC)
     private Long dictSort;
 
-    /** 字典标签 */
+    /**
+     * 字典标签
+     */
     @ApiModelProperty(value = "字典标签")
     @Excel(name = "字典标签")
     private String dictLabel;
 
-    /** 字典键值 */
+    /**
+     * 字典键值
+     */
     @Excel(name = "字典键值")
     @ApiModelProperty(value = "字典键值")
     private String dictValue;
 
-    /** 字典类型 */
+    /**
+     * 字典类型
+     */
     @Excel(name = "字典类型")
     @ApiModelProperty(value = "字典类型")
     private String dictType;
 
-    /** 样式属性（其他样式扩展） */
+    /**
+     * 样式属性（其他样式扩展）
+     */
     private String cssClass;
 
 
-    /** 表格字典样式 */
+    /**
+     * 表格字典样式
+     */
     private String listClass;
 
-    /** 是否默认（Y是 N否） */
+    /**
+     * 是否默认（Y是 N否）
+     */
     @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
     private String isDefault;
 
-    /** 状态（0正常 1停用） */
+    /**
+     * 状态（0正常 1停用）
+     */
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzEnforExamine.java

@@ -1,6 +1,5 @@
 package com.ruoyi.programManagement.entity;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -9,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+
 /**
  * 现场检查记录对象 sz_enfor_examine
  *
@@ -17,127 +18,174 @@ import org.springframework.format.annotation.DateTimeFormat;
  */
 @Data
 @ApiModel("现场检查记录对象")
-public class SzEnforExamine extends BaseEntity
+public class SzEnforExamine extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
 
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Date dmsTimestamp;
 
-    /** ID */
+    /**
+     * ID
+     */
     @ApiModelProperty(value = "ID")
     private String ID;
 
-    /** 检查方案id */
+    /**
+     * 检查方案id
+     */
     @Excel(name = "检查方案id")
     @ApiModelProperty(value = "检查方案id")
     private String planExamineId;
 
-    /** 企业名称 */
+    /**
+     * 企业名称
+     */
     @Excel(name = "企业名称")
     @ApiModelProperty(value = "企业名称")
     private String entprName;
 
-    /** 统一社会信用代码 */
+    /**
+     * 统一社会信用代码
+     */
     @Excel(name = "统一社会信用代码")
     @ApiModelProperty(value = "统一社会信用代码")
     private String uscCode;
 
-    /** 检查场所 */
+    /**
+     * 检查场所
+     */
     @Excel(name = "检查场所")
     @ApiModelProperty(value = "检查场所")
     private String examineSite;
 
-    /** 检查来源 */
+    /**
+     * 检查来源
+     */
     @Excel(name = "检查来源")
     @ApiModelProperty(value = "检查来源")
     private String examineSource;
 
-    /** 检查开始时间 */
+    /**
+     * 检查开始时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "检查开始时间")
     @Excel(name = "检查开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date examineStartTime;
 
-    /** 检查结束时间 */
+    /**
+     * 检查结束时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "检查结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(value = "检查结束时间")
     private Date examineEndTime;
 
-    /** 检查人员id */
+    /**
+     * 检查人员id
+     */
     @ApiModelProperty(value = "检查人员id")
     @Excel(name = "检查人员id")
     private String executorId;
 
-    /** 检查情况 */
+    /**
+     * 检查情况
+     */
     @Excel(name = "检查情况")
     @ApiModelProperty(value = "检查情况")
     private String examineSituation;
 
-    /** 文书文号 */
+    /**
+     * 文书文号
+     */
     @Excel(name = "文书文号")
     @ApiModelProperty(value = "文书文号")
     private String writNo;
 
-    /** 文书类型 */
+    /**
+     * 文书类型
+     */
     @Excel(name = "文书类型")
     @ApiModelProperty(value = "文书类型")
     private String typeCode;
 
-    /** 现场证据附件 */
+    /**
+     * 现场证据附件
+     */
     @Excel(name = "现场证据附件")
     @ApiModelProperty(value = "现场证据附件")
     private String EVIDENCE;
 
-    /** 执法部门 */
+    /**
+     * 执法部门
+     */
     @Excel(name = "执法部门")
     @ApiModelProperty(value = "执法部门")
     private String executorDept;
 
-    /** 执法部门代码 */
+    /**
+     * 执法部门代码
+     */
     @ApiModelProperty(value = "执法部门代码")
     @Excel(name = "执法部门代码")
     private String executorDeptCode;
 
-    /** 检查方式 */
+    /**
+     * 检查方式
+     */
     @Excel(name = "检查方式")
     @ApiModelProperty(value = "检查方式")
     private String examineType;
 
-    /** 是否是三年专项 */
+    /**
+     * 是否是三年专项
+     */
     @ApiModelProperty(value = "是否是三年专项")
     @Excel(name = "是否是三年专项")
     private String threeSpecialType;
 
-    /** 钢铁三年专项时，企业设施的版本号 */
+    /**
+     * 钢铁三年专项时，企业设施的版本号
+     */
     @ApiModelProperty(value = "钢铁三年专项时，企业设施的版本号")
     @Excel(name = "钢铁三年专项时，企业设施的版本号")
     private String enterpriseUnitVersion;
 
-    /** 创建人 */
+    /**
+     * 创建人
+     */
     @ApiModelProperty(value = "创建人")
     @Excel(name = "创建人")
     private String CREATER;
 
-    /** 更新人 */
+    /**
+     * 更新人
+     */
     @ApiModelProperty(value = "更新人")
     @Excel(name = "更新人")
     private String UPDATER;
 
-    /** 数据来源 */
+    /**
+     * 数据来源
+     */
     @ApiModelProperty(value = "数据来源")
     @Excel(name = "数据来源")
     private String sourceData;
 
-    /** 是否专家参与 */
+    /**
+     * 是否专家参与
+     */
     @ApiModelProperty(value = "是否专家参与")
     @Excel(name = "是否专家参与")
     private Long expertsInFlag;
 
-    /** 专家姓名 */
+    /**
+     * 专家姓名
+     */
     @ApiModelProperty(value = "专家姓名")
     @Excel(name = "专家姓名")
     private String expertsName;
@@ -152,7 +200,6 @@ public class SzEnforExamine extends BaseEntity
     private Date CREATETIME;
 
 
-
     /**
      * 修改时间
      */

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzEntBasicInfo.java

@@ -3,7 +3,6 @@ package com.ruoyi.programManagement.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/SzsAdministrativeDivision.java

@@ -1,13 +1,11 @@
 package com.ruoyi.programManagement.entity;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 省-工业企业风险评估上报系统_行政区划字典对象 szs_administrative_division
@@ -17,66 +15,95 @@ import com.ruoyi.common.core.domain.BaseEntity;
  */
 @Data
 @ApiModel("省-工业企业风险评估上报系统_行政区划")
-public class SzsAdministrativeDivision extends BaseEntity
+public class SzsAdministrativeDivision extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Date jhptUpdateTime;
 
-    /** 纬度 */
+    /**
+     * 纬度
+     */
     @Excel(name = "纬度")
     private String LATITUDE;
 
-    /** 区划名称 */
+    /**
+     * 区划名称
+     */
     @Excel(name = "区划名称")
     private String districtName;
 
-    /** 1省级2地市级以此类推 */
+    /**
+     * 1省级2地市级以此类推
+     */
     @Excel(name = "1省级2地市级以此类推")
     private String distLevel;
 
-    /** 全称 */
+    /**
+     * 全称
+     */
     @Excel(name = "全称")
     private String fullName;
 
-    /** 区划编码 */
+    /**
+     * 区划编码
+     */
     @Excel(name = "区划编码")
     private String districtCode;
 
-    /** 上级编码 */
+    /**
+     * 上级编码
+     */
     @Excel(name = "上级编码")
     private String parentCode;
 
-    /** 简称 */
+    /**
+     * 简称
+     */
     @Excel(name = "简称")
     private String shortName;
 
-    /** 主键ID */
+    /**
+     * 主键ID
+     */
     private String ID;
 
-    /** 区划编码排序 */
+    /**
+     * 区划编码排序
+     */
     @Excel(name = "区划编码排序")
     private String districtCodeSort;
 
-    /** 经度 */
+    /**
+     * 经度
+     */
     @Excel(name = "经度")
     private Long LONGITUDE;
 
-    /** 创建人 */
+    /**
+     * 创建人
+     */
     @Excel(name = "创建人")
     private String CREATER;
 
-    /** 修改人 */
+    /**
+     * 修改人
+     */
     @Excel(name = "修改人")
     private String UPDATER;
 
-    /** 拼写 */
+    /**
+     * 拼写
+     */
     @Excel(name = "拼写")
     private String SPELLING;
 
-    /** 删除标识 */
+    /**
+     * 删除标识
+     */
     @Excel(name = "删除标识")
     private String isDelete;
 

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BAdministrativeTreeRequest.java

@@ -2,9 +2,6 @@ package com.ruoyi.programManagement.entity.request;
 
 import lombok.Data;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * 行政区划书请求类
  */
@@ -41,6 +38,4 @@ public class BAdministrativeTreeRequest {
     }
 
 
-
-
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BEnterpriseNewRequest.java

@@ -39,7 +39,7 @@ public class BEnterpriseNewRequest {
      */
     @Excel(name = "行政区划")
     @ApiModelProperty(value = "行政区划")
-    private String[] district;
+    private String district;
 
     /**
      * 行业监管大类编码

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BKeyEnterprisePageRequest.java

@@ -1,15 +1,10 @@
 package com.ruoyi.programManagement.entity.request;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 省重点企业表请求类
@@ -18,7 +13,6 @@ import java.util.Date;
 public class BKeyEnterprisePageRequest implements Serializable {
 
 
-
     /**
      * 年份
      */

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterprisePageRequest.java

@@ -1,6 +1,5 @@
 package com.ruoyi.programManagement.entity.request;
 
-import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -32,7 +31,4 @@ public class BPlanEnterprisePageRequest {
     private String lawAreas;
 
 
-
-
-
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -176,10 +175,6 @@ public class BPlanEnterpriseRequest  {
     private Long lawSort;
 
 
-
-
-
-
     /**
      * 0：未检查 1：已检查
      */

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/PlanMxRequest.java

@@ -1,6 +1,5 @@
 package com.ruoyi.programManagement.entity.request;
 
-import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java

@@ -2,7 +2,6 @@ package com.ruoyi.programManagement.entity.request;
 
 import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 /**
@@ -51,5 +50,4 @@ public class checkResultRequest {
     private Integer status;
 
 
-
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterPriseTreeResponse.java

@@ -48,5 +48,4 @@ public class BPlanEnterPriseTreeResponse {
     private double completionRate;
 
 
-
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java

@@ -3,13 +3,11 @@ package com.ruoyi.programManagement.entity.response;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -181,10 +179,6 @@ public class BPlanEnterpriseResponse extends BaseEntity {
     private Long lawSort;
 
 
-
-
-
-
     /**
      * 0：未检查 1：已检查
      */
@@ -234,6 +228,4 @@ public class BPlanEnterpriseResponse extends BaseEntity {
     private Date examineEndTime;
 
 
-
-
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java

@@ -106,8 +106,6 @@ public class BPlanEnterpriseZhifaResponse {
     private String plannedYear;
 
 
-
-
     /**
      * 是否重点企业1：是2：否
      */
@@ -200,7 +198,6 @@ public class BPlanEnterpriseZhifaResponse {
     private Integer RISK_LEVEL;
 
 
-
     /**
      * 安全风险等级
      */
@@ -215,7 +212,6 @@ public class BPlanEnterpriseZhifaResponse {
     private String standLevel;
 
 
-
     /**
      * 上次检查时间
      */

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/PlanMxResponse.java

@@ -3,7 +3,6 @@ package com.ruoyi.programManagement.entity.response;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -95,8 +94,6 @@ public class PlanMxResponse {
     private String district;
 
 
-
-
     /**
      * 计划年份
      */
@@ -110,7 +107,6 @@ public class PlanMxResponse {
     private String planName;
 
 
-
     /**
      * 计划内容
      */
@@ -118,7 +114,6 @@ public class PlanMxResponse {
     private String planContent;
 
 
-
     /**
      * 是否重点企业1：是2：否
      */

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/SzEntBasicInfoPageResponse.java

@@ -595,8 +595,6 @@ public class SzEntBasicInfoPageResponse {
     private String sourceData;
 
 
-
-
     /**
      * 是否重点企业1：是 2：否
      */

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/zhifaCountResponse.java

@@ -24,7 +24,6 @@ public class zhifaCountResponse {
     private String deptName;
 
 
-
     /**
      * 省重点企业数量
      */
@@ -32,8 +31,6 @@ public class zhifaCountResponse {
     private Integer keyPlan;
 
 
-
-
     /**
      * 非省重点企业数量
      */
@@ -48,7 +45,6 @@ public class zhifaCountResponse {
     private Integer keyCompleted;
 
 
-
     /**
      * 非省重点完成数
      */
@@ -56,7 +52,6 @@ public class zhifaCountResponse {
     private Integer nonKeyCompleted;
 
 
-
     /**
      * 省重点完成比
      */
@@ -64,7 +59,6 @@ public class zhifaCountResponse {
     private Integer percentageCompleted;
 
 
-
     /**
      * 非省重点完成比
      */

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/zhifaPlanResponse.java

@@ -2,7 +2,6 @@ package com.ruoyi.programManagement.entity.response;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 /**
@@ -19,7 +18,6 @@ public class zhifaPlanResponse {
     private Integer count;
 
 
-
     /**
      * 部门
      */

ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BAdministrativeDivisionMapper.java

@@ -1,11 +1,11 @@
 package com.ruoyi.programManagement.mapper;
 
-import java.util.List;
-
 import com.ruoyi.programManagement.domain.BAdministrativeDivision;
 import com.ruoyi.programManagement.entity.request.BAdministrativeDistrictRequest;
 import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest;
 
+import java.util.List;
+
 /**
  * 行政区划Mapper接口
  *
@@ -64,6 +64,7 @@ public interface BAdministrativeDivisionMapper {
 
     /**
      * 行政区划树结构
+     *
      * @return list
      */
     List<BAdministrativeTreeRequest> selectByDistctList();
@@ -77,11 +78,4 @@ public interface BAdministrativeDivisionMapper {
     List<BAdministrativeDistrictRequest> selectBycountyList();
 
 
-
-
-
-
-
-
-
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BAdministrativeMapper.java

@@ -1,86 +0,0 @@
-package com.ruoyi.programManagement.mapper;
-
-import com.ruoyi.programManagement.entity.BAdministrative;
-import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest;
-import com.ruoyi.programManagement.entity.response.BPlanEnterPriseTreeResponse;
-import com.ruoyi.programManagement.entity.request.BPlanEnterprisePageRequest;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 行政区划Mapper接口
- *
- * @author ruoyi
- * @date 2023-09-11
- */
-public interface BAdministrativeMapper {
-    /**
-     * 查询行政区划
-     *
-     * @param id 行政区划主键
-     * @return 行政区划
-     */
-    public BAdministrative selectBAdministrativeById(Long id);
-
-    /**
-     * 查询行政区划列表
-     *
-     * @param bAdministrative 行政区划
-     * @return 行政区划集合
-     */
-    public List<BAdministrative> selectBAdministrativeList(BAdministrative bAdministrative);
-
-    /**
-     * 新增行政区划
-     *
-     * @param bAdministrative 行政区划
-     * @return 结果
-     */
-    public int insertBAdministrative(BAdministrative bAdministrative);
-
-    /**
-     * 修改行政区划
-     *
-     * @param bAdministrative 行政区划
-     * @return 结果
-     */
-    public int updateBAdministrative(BAdministrative bAdministrative);
-
-    /**
-     * 删除行政区划
-     *
-     * @param id 行政区划主键
-     * @return 结果
-     */
-    public int deleteBAdministrativeById(Long id);
-
-    /**
-     * 批量删除行政区划
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteBAdministrativeByIds(Long[] ids);
-
-
-    /**
-     * 行政获取县区
-     *
-     * @return
-     */
-    List<BAdministrativeTreeRequest> selectBAdministrativeTreeRequestList();
-
-
-    /**
-     * 行政获取乡镇
-     *
-     * @return
-     */
-    List<BAdministrativeTreeRequest> selectcascadingSelectDataList();
-
-
-    List<BPlanEnterPriseTreeResponse> selectBPlanEnterPriseTreeRequestRequestList(@Param("req") BPlanEnterprisePageRequest req);
-
-
-}

ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BEnterpriseNewMapper.java

@@ -73,6 +73,7 @@ public interface BEnterpriseNewMapper extends BaseMapper<BEnterpriseNew> {
 
     /**
      * 定时任务三表关联查询数据
+     *
      * @return
      */
     List<BEnterpriseNew> seletAll();

ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java

@@ -1,7 +1,6 @@
 package com.ruoyi.programManagement.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.programManagement.entity.BKeyEnterprise;
 import com.ruoyi.programManagement.entity.request.BKeyEnterprisePageRequest;
 import org.apache.ibatis.annotations.Param;
@@ -46,6 +45,7 @@ public interface BKeyEnterpriseMapper extends BaseMapper<BKeyEnterprise> {
 
     /**
      * 根据企业代码和年份查询数据
+     *
      * @param req
      * @return
      */

ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java

@@ -26,6 +26,7 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterprise> {
 
     /**
      * 执法
+     *
      * @param req
      * @return
      */
@@ -85,6 +86,7 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterprise> {
 
     /**
      * 查询首页数据
+     *
      * @param req
      * @return
      */
@@ -93,15 +95,16 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterprise> {
 
     /**
      * 查询首页明细数据
+     *
      * @param req
      * @return
      */
     List<BPlanEnterPriseTreeResponse> getShouYeMxList(@Param("req") BPlanEnterprisePageRequest req);
 
 
-
     /**
      * 批量更新状态
+     *
      * @param idList
      */
     void updateIdList(List<String> idList);
@@ -109,6 +112,7 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterprise> {
 
     /**
      * 新增
+     *
      * @param bPlanEnterprise
      */
     void insertPlan(BPlanEnterpriseRequest bPlanEnterprise);
@@ -116,6 +120,7 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterprise> {
 
     /**
      * 新增
+     *
      * @param bPlanEnterprise
      */
     void updatePlan(BPlanEnterpriseRequest bPlanEnterprise);
@@ -123,6 +128,7 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterprise> {
 
     /**
      * 定时任务修改更新计划表的检查状态、检查id、检查时效字段
+     *
      * @return
      */
     List<BPlanEnterprise> selectUpdateAll();

ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/DictDataDao.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.programManagement.entity.DictData;
 import com.ruoyi.programManagement.entity.response.DictDataResponse;
 
-
 import java.util.List;
 
 public interface DictDataDao extends BaseMapper<DictData> {
@@ -18,9 +17,4 @@ public interface DictDataDao extends BaseMapper<DictData> {
     List<DictDataResponse> getDicttypeList(List<String> list);
 
 
-
-
-
-
-
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/GeoLayerMapper.java

@@ -3,7 +3,6 @@ package com.ruoyi.programManagement.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.programManagement.entity.GeoLayer;
 import org.apache.ibatis.annotations.Param;

ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/IBAdministrativeService.java

@@ -1,70 +0,0 @@
-package com.ruoyi.programManagement.service;
-
-import com.ruoyi.programManagement.entity.BAdministrative;
-import com.ruoyi.programManagement.entity.response.BPlanEnterPriseTreeResponse;
-import com.ruoyi.programManagement.entity.request.BPlanEnterprisePageRequest;
-
-import java.util.List;
-
-
-/**
- * 行政区划Service接口
- *
- * @author ruoyi
- * @date 2023-09-11
- */
-public interface IBAdministrativeService {
-    /**
-     * 查询行政区划
-     *
-     * @param id 行政区划主键
-     * @return 行政区划
-     */
-    public BAdministrative selectBAdministrativeById(Long id);
-
-    /**
-     * 查询行政区划列表
-     *
-     * @param bAdministrative 行政区划
-     * @return 行政区划集合
-     */
-    public List<BAdministrative> selectBAdministrativeList(BAdministrative bAdministrative);
-
-    /**
-     * 新增行政区划
-     *
-     * @param bAdministrative 行政区划
-     * @return 结果
-     */
-    public int insertBAdministrative(BAdministrative bAdministrative);
-
-    /**
-     * 修改行政区划
-     *
-     * @param bAdministrative 行政区划
-     * @return 结果
-     */
-    public int updateBAdministrative(BAdministrative bAdministrative);
-
-    /**
-     * 批量删除行政区划
-     *
-     * @param ids 需要删除的行政区划主键集合
-     * @return 结果
-     */
-    public int deleteBAdministrativeByIds(Long[] ids);
-
-    /**
-     * 删除行政区划信息
-     *
-     * @param id 行政区划主键
-     * @return 结果
-     */
-    public int deleteBAdministrativeById(Long id);
-
-
-    List<BPlanEnterPriseTreeResponse> selectBPlanEnterPriseTreeRequestRequestList(BPlanEnterprisePageRequest req);
-
-
-
-}

ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BAdministrativeServiceImpl.java

@@ -1,101 +0,0 @@
-package com.ruoyi.programManagement.service.impl;
-
-
-import com.ruoyi.programManagement.entity.BAdministrative;
-import com.ruoyi.programManagement.entity.response.BPlanEnterPriseTreeResponse;
-import com.ruoyi.programManagement.entity.request.BPlanEnterprisePageRequest;
-import com.ruoyi.programManagement.mapper.BAdministrativeMapper;
-import com.ruoyi.programManagement.service.IBAdministrativeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 行政区划Service业务层处理
- *
- * @author ruoyi
- * @date 2023-09-11
- */
-@Service
-public class BAdministrativeServiceImpl implements IBAdministrativeService {
-    @Autowired
-    private BAdministrativeMapper bAdministrativeMapper;
-
-    /**
-     * 查询行政区划
-     *
-     * @param id 行政区划主键
-     * @return 行政区划
-     */
-    @Override
-    public BAdministrative selectBAdministrativeById(Long id) {
-        return bAdministrativeMapper.selectBAdministrativeById(id);
-    }
-
-    /**
-     * 查询行政区划列表
-     *
-     * @param bAdministrative 行政区划
-     * @return 行政区划
-     */
-    @Override
-    public List<BAdministrative> selectBAdministrativeList(BAdministrative bAdministrative) {
-        return bAdministrativeMapper.selectBAdministrativeList(bAdministrative);
-    }
-
-    /**
-     * 新增行政区划
-     *
-     * @param bAdministrative 行政区划
-     * @return 结果
-     */
-    @Override
-    public int insertBAdministrative(BAdministrative bAdministrative) {
-        return bAdministrativeMapper.insertBAdministrative(bAdministrative);
-    }
-
-    /**
-     * 修改行政区划
-     *
-     * @param bAdministrative 行政区划
-     * @return 结果
-     */
-    @Override
-    public int updateBAdministrative(BAdministrative bAdministrative) {
-        return bAdministrativeMapper.updateBAdministrative(bAdministrative);
-    }
-
-    /**
-     * 批量删除行政区划
-     *
-     * @param ids 需要删除的行政区划主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBAdministrativeByIds(Long[] ids) {
-        return bAdministrativeMapper.deleteBAdministrativeByIds(ids);
-    }
-
-    /**
-     * 删除行政区划信息
-     *
-     * @param id 行政区划主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBAdministrativeById(Long id) {
-        return bAdministrativeMapper.deleteBAdministrativeById(id);
-    }
-
-
-
-    @Override
-    public List<BPlanEnterPriseTreeResponse> selectBPlanEnterPriseTreeRequestRequestList(BPlanEnterprisePageRequest req) {
-        return bAdministrativeMapper.selectBPlanEnterPriseTreeRequestRequestList(req);
-    }
-
-
-
-
-}