格式化代码

zhangtao
dongdingding 1 year ago
parent 0a85eb9a64
commit 0b87584eb9

@ -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 com.ruoyi.common.core.page.TableDataInfo;
import io.swagger.annotations.Api;
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
@ -40,11 +30,11 @@ public class BAdministrativeDivisionController extends BaseController {
@Resource
private IBAdministrativeDivisionService bAdministrativeDivisionService;
/**
*
*/
@ApiOperation(value = "查询行政区划列表", response = BAdministrativeDivision.class)
@GetMapping("/list")
/**
*
*/
@ApiOperation(value = "查询行政区划列表", response = BAdministrativeDivision.class)
@GetMapping("/list")
public TableDataInfo list(BAdministrativeDivision bAdministrativeDivision) {
startPage();
List<BAdministrativeDivision> list = bAdministrativeDivisionService.selectBAdministrativeDivisionList(bAdministrativeDivision);
@ -58,7 +48,7 @@ public class BAdministrativeDivisionController extends BaseController {
@PostMapping("/export")
public void export(HttpServletResponse response, BAdministrativeDivision bAdministrativeDivision) {
List<BAdministrativeDivision> list = bAdministrativeDivisionService.selectBAdministrativeDivisionList(bAdministrativeDivision);
ExcelUtil<BAdministrativeDivision> util = new ExcelUtil<BAdministrativeDivision>(BAdministrativeDivision. class);
ExcelUtil<BAdministrativeDivision> util = new ExcelUtil<BAdministrativeDivision>(BAdministrativeDivision.class);
util.exportExcel(response, list, "行政区划数据");
}
@ -110,12 +100,12 @@ public class BAdministrativeDivisionController extends BaseController {
List<BAdministrativeTreeRequest> listsub = bAdministrativeDivisionService.selectByDistctList();
List<BAdministrativeDistrictRequest> cascadingSelectData = new ArrayList<>();
for (BAdministrativeDistrictRequest item1 : list) {
BAdministrativeDistrictRequest parentDto = new BAdministrativeDistrictRequest(item1.getDistrictCode(),item1.getDistrict());
BAdministrativeDistrictRequest parentDto = new BAdministrativeDistrictRequest(item1.getDistrictCode(), item1.getDistrict());
for (BAdministrativeTreeRequest item2 : listsub) {
if (item2.getCountyCode() != null && !item2.getCountyCode().equals("")) {
if (item2.getCountyCode().substring(0,6).equals(item1.getDistrictCode())) {
BAdministrativeTreeRequest childDto = new BAdministrativeTreeRequest(item2.getCounty(), item2.getCountyCode(),item2.getSort());
parentDto.addChild(childDto);
if (item2.getCountyCode().substring(0, 6).equals(item1.getDistrictCode())) {
BAdministrativeTreeRequest childDto = new BAdministrativeTreeRequest(item2.getCounty(), item2.getCountyCode(), item2.getSort());
parentDto.addChild(childDto);
}
}

@ -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.*;
@ -162,7 +157,7 @@ public class BPlanEnterpriseController extends BaseController {
public void export(HttpServletResponse response, checkResultRequest req) {
List<BPlanEnterpriseZhifaResponse> list = bPlanEnterpriseMapper.getZhifa(req);
ExcelUtil<BPlanEnterpriseZhifaResponse> util = new ExcelUtil<BPlanEnterpriseZhifaResponse>(BPlanEnterpriseZhifaResponse.class);
util.exportExcel( list, "导出执法结果");
util.exportExcel(list, "导出执法结果");
}
/**

@ -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;
/**

@ -1,29 +1,18 @@
package com.ruoyi.programManagement.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
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.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.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 org.springframework.web.bind.annotation.*;
import com.ruoyi.programManagement.service.ISzsEnterpriseInformationService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* -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));
}
@ -97,9 +80,8 @@ public class SzsEnterpriseInformationController extends BaseController
* -
*/
@DeleteMapping("/{IDs}")
public AjaxResult remove(@PathVariable String[] IDs)
{
@DeleteMapping("/{IDs}")
public AjaxResult remove(@PathVariable String[] IDs) {
return toAjax(szsEnterpriseInformationService.deleteSzsEnterpriseInformationByIDs(IDs));
}
}

@ -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
@ -28,7 +27,7 @@ public class UserController {
@ApiOperation(value = "获取用户信息", notes = "根据code获取用户信息")
@GetMapping("/getUserInfo")
public AjaxResult getAllGeoLayers(@RequestParam String code) {
public AjaxResult getAllGeoLayers(@RequestParam String code) {
return AjaxResult.success(userService.getUserByCode(code));

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

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

@ -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;
@ -26,7 +23,7 @@ import java.util.Date;
@Data
@ApiModel("计划企业表实体类")
@TableName("b_plan_enterprise")
public class BPlanEnterprise {
public class BPlanEnterprise {
private static final long serialVersionUID = -98531345456142440L;
/**
@ -169,7 +166,7 @@ public class BPlanEnterprise {
/**
* 0稿 1
*/
@Excel(name = "状态",readConverterExp = "0=草稿,1=正式")
@Excel(name = "状态", readConverterExp = "0=草稿,1=正式")
@ApiModelProperty(value = "0草稿 1正式")
private Integer status;
@ -188,7 +185,6 @@ public class BPlanEnterprise {
private Long lawSort;
/**
* 0 1
*/

@ -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;
@ -61,5 +78,5 @@ public class DictData
/**
*
*/
private String[] dictTypes;
private String[] dictTypes;
}

@ -25,7 +25,7 @@ import java.math.BigDecimal;
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("ent_geo_layer")
@ApiModel(value="GeoLayer对象", description="")
@ApiModel(value = "GeoLayer对象", description = "")
public class GeoLayer implements Serializable {
private static final long serialVersionUID = 1L;
@ -109,6 +109,6 @@ public class GeoLayer implements Serializable {
private String shape;
@ApiModelProperty(value = "空间字符串")
@TableField(value = "shape_str",exist = false)
@TableField(value = "shape_str", exist = false)
private String shapeStr;
}

@ -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;
/**
*
*/

@ -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;

@ -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地市级以此类推 */
/**
* 12
*/
@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;

@ -19,7 +19,7 @@ public class BAdministrativeDistrictRequest {
private String district;
private List<BAdministrativeTreeRequest> children;
public BAdministrativeDistrictRequest(String districtCode,String district) {
public BAdministrativeDistrictRequest(String districtCode, String district) {
this.districtCode = districtCode;
this.district = district;
this.children = new ArrayList<>();

@ -2,9 +2,6 @@ package com.ruoyi.programManagement.entity.request;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
*
*/
@ -34,13 +31,11 @@ public class BAdministrativeTreeRequest {
private String sort;
public BAdministrativeTreeRequest(String county, String countyCode,String sort) {
public BAdministrativeTreeRequest(String county, String countyCode, String sort) {
this.county = county;
this.countyCode = countyCode;
this.sort = sort;
}
}

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

@ -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 {
/**
*
*/

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

@ -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;
@ -18,7 +17,7 @@ import java.util.Date;
*/
@Data
@ApiModel("计划企业新增请求类")
public class BPlanEnterpriseRequest {
public class BPlanEnterpriseRequest {
private static final long serialVersionUID = -98531345456142440L;
/**
*
@ -157,7 +156,7 @@ public class BPlanEnterpriseRequest {
/**
* 0稿 1
*/
@Excel(name = "状态",readConverterExp = "0=草稿,1=正式")
@Excel(name = "状态", readConverterExp = "0=草稿,1=正式")
@ApiModelProperty(value = "0草稿 1正式")
private Integer status;
@ -176,10 +175,6 @@ public class BPlanEnterpriseRequest {
private Long lawSort;
/**
* 0 1
*/
@ -191,7 +186,7 @@ public class BPlanEnterpriseRequest {
* id
*/
@ApiModelProperty(value = "检查id")
private String checkId;
private String checkId;
/**

@ -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;

@ -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;
/**
@ -15,20 +14,20 @@ public class checkResultRequest {
*
*/
@ApiModelProperty(value = "计划年份")
private String plannedYear;
private String plannedYear;
/**
*
*/
@ApiModelProperty(value = "计划月份")
private String[] plannedMonth;
private String[] plannedMonth;
/**
*
*/
@ApiModelProperty(value = "行政区划")
private String district;
private String district;
/**
*
@ -48,8 +47,7 @@ public class checkResultRequest {
* 0稿 1
*/
@ApiModelProperty(value = "0草稿 1正式")
private Integer status ;
private Integer status;
}

@ -16,14 +16,14 @@ public class zhifaRequest {
*
*/
@ApiModelProperty(value = "计划年份")
private String plannedYear;
private String plannedYear;
/**
* id
*/
@ApiModelProperty(value = "区县id")
private String deptName;
private String deptName;
/**

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

@ -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;
@ -162,7 +160,7 @@ public class BPlanEnterpriseResponse extends BaseEntity {
/**
* 0稿 1
*/
@Excel(name = "状态",readConverterExp = "0=草稿,1=正式")
@Excel(name = "状态", readConverterExp = "0=草稿,1=正式")
@ApiModelProperty(value = "0草稿 1正式")
private Integer status;
@ -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;
}

@ -106,8 +106,6 @@ public class BPlanEnterpriseZhifaResponse {
private String plannedYear;
/**
* 12
*/
@ -169,7 +167,7 @@ public class BPlanEnterpriseZhifaResponse {
* 0稿 1
*/
@ApiModelProperty(value = "0草稿 1正式")
private Integer status ;
private Integer status;
/**
@ -200,7 +198,6 @@ public class BPlanEnterpriseZhifaResponse {
private Integer RISK_LEVEL;
/**
*
*/
@ -215,7 +212,6 @@ public class BPlanEnterpriseZhifaResponse {
private String standLevel;
/**
*
*/

@ -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;
/**
* 12
*/

@ -595,8 +595,6 @@ public class SzEntBasicInfoPageResponse {
private String sourceData;
/**
* 1 2
*/

@ -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;
/**
*
*/

@ -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;
/**
*
*/

@ -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();
}

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

@ -73,6 +73,7 @@ public interface BEnterpriseNewMapper extends BaseMapper<BEnterpriseNew> {
/**
*
*
* @return
*/
List<BEnterpriseNew> seletAll();

@ -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;
@ -23,14 +22,14 @@ public interface BKeyEnterpriseMapper extends BaseMapper<BKeyEnterprise> {
* @param bKeyEnterprise
* @return
*/
public int bKeyEnterpriseAdd(BKeyEnterprise bKeyEnterprise );
public int bKeyEnterpriseAdd(BKeyEnterprise bKeyEnterprise);
/**
*
*
* @param
* @param req
* @param req
* @return
*/
public List<BKeyEnterprise> page(@Param("req") BKeyEnterprisePageRequest req);
@ -46,6 +45,7 @@ public interface BKeyEnterpriseMapper extends BaseMapper<BKeyEnterprise> {
/**
*
*
* @param req
* @return
*/

@ -26,6 +26,7 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterprise> {
/**
*
*
* @param req
* @return
*/
@ -85,30 +86,33 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterprise> {
/**
*
*
* @param req
* @return
*/
List<BPlanEnterPriseTreeResponse> getShouyeList(@Param("req")BPlanEnterprisePageRequest req);
List<BPlanEnterPriseTreeResponse> getShouyeList(@Param("req") BPlanEnterprisePageRequest req);
/**
*
*
* @param req
* @return
*/
List<BPlanEnterPriseTreeResponse>getShouYeMxList(@Param("req") BPlanEnterprisePageRequest req);
List<BPlanEnterPriseTreeResponse> getShouYeMxList(@Param("req") BPlanEnterprisePageRequest req);
/**
*
*
* @param idList
*/
void updateIdList(List<String> idList);
void updateIdList(List<String> idList);
/**
*
*
* @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();

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

@ -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;
@ -14,7 +13,7 @@ import java.util.Map;
/**
* <p>
* Mapper
* Mapper
* </p>
*
* @author Jason
@ -24,10 +23,10 @@ public interface GeoLayerMapper extends BaseMapper<GeoLayer> {
@Select("SELECT t.id,t.origin_id,t.origin_table,t.name,t.address,t.type1,t.type2,t.type3,t.county,t.town,t.lng,t.lat,ST_AsGeoJson( t.shape) as shape_str FROM ent_geo_layer t ${ew.customSqlSegment} ")
List<GeoLayer> getGeoLayerById( @Param(Constants.WRAPPER) Wrapper wrapper);
List<GeoLayer> getGeoLayerById(@Param(Constants.WRAPPER) Wrapper wrapper);
@Select("SELECT t.id,t.origin_id,t.origin_table,t.name,t.address,t.type1,t.type2,t.type3,t.county,t.town,t.lng,t.lat,ST_AsGeoJson( t.shape) as shape_str FROM ent_geo_layer t ${ew.customSqlSegment} ")
List<GeoLayer> getGeoLayerByCondition( @Param(Constants.WRAPPER) Wrapper wrapper);
List<GeoLayer> getGeoLayerByCondition(@Param(Constants.WRAPPER) Wrapper wrapper);
@Select("SELECT t.id,t.origin_id,t.origin_table,t.name,t.address,t.type1,t.type2,t.type3,t.type4,t.type5,t.type6,t.type7,t.type8,t.type9,t.type10,t.county,t.town,t.lng,t.lat,ST_AsGeoJson( t.shape) as shape_str FROM ent_geo_layer t ${ew.customSqlSegment} ")
List<GeoLayer> getGeoLayerByPage(Page<GeoLayer> page, @Param(Constants.WRAPPER) Wrapper wrapper);

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

@ -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);
}
}
Loading…
Cancel
Save