Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java into zhangtao
Conflicts: ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xmlzhangtao
laozt
1 year ago
commit
21184a93e8
@ -1,67 +0,0 @@
|
||||
package com.ruoyi.programManagement.entity.request;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@ApiModel
|
||||
@Data
|
||||
@Builder(toBuilder = true)
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class BPlanEnterPrisetDistrictRequest {
|
||||
/**
|
||||
* 区划代码
|
||||
*/
|
||||
@ApiModelProperty("区划代码")
|
||||
private String districtCode;
|
||||
/**
|
||||
* 区划
|
||||
*/
|
||||
@ApiModelProperty("区划")
|
||||
private String district;
|
||||
|
||||
/**
|
||||
* 计划企业数量
|
||||
*/
|
||||
@ApiModelProperty("计划企业数量")
|
||||
private Integer enterPriseCounty;
|
||||
|
||||
/**
|
||||
* 计划企业完成数量
|
||||
*/
|
||||
@ApiModelProperty("计划企业完成数量")
|
||||
private Integer enterPriseFinsh;
|
||||
|
||||
|
||||
/**
|
||||
* 完成率
|
||||
*/
|
||||
@ApiModelProperty("完成率")
|
||||
private String result;
|
||||
|
||||
|
||||
private List<BPlanEnterPriseTreeRequest> children;
|
||||
|
||||
public BPlanEnterPrisetDistrictRequest(String districtCode, String district, Integer enterPriseCounty, Integer enterPriseFinsh,String result) {
|
||||
this.districtCode = districtCode;
|
||||
this.enterPriseCounty = enterPriseCounty;
|
||||
this.enterPriseFinsh = enterPriseFinsh;
|
||||
this.district = district;
|
||||
this.result=result;
|
||||
this.children = new ArrayList<>();
|
||||
}
|
||||
|
||||
public void addChild(BPlanEnterPriseTreeRequest childDto) {
|
||||
this.children.add(childDto);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
package com.ruoyi.programManagement.entity.response;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 行政区划书请求类
|
||||
*/
|
||||
@Data
|
||||
@ApiModel("首页请求类")
|
||||
public class BPlanEnterPriseTreeResponse {
|
||||
|
||||
/**
|
||||
* 执法地区
|
||||
*/
|
||||
@ApiModelProperty(value = "执法地区")
|
||||
private String lawAreas;
|
||||
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
@ApiModelProperty(value = "排序")
|
||||
private String sort;
|
||||
/**
|
||||
* 执法计划数量
|
||||
*/
|
||||
@ApiModelProperty("执法计划数量")
|
||||
private Integer count;
|
||||
|
||||
/**
|
||||
* 完成执法数量
|
||||
*/
|
||||
@ApiModelProperty("完成执法数量")
|
||||
private Integer completed;
|
||||
|
||||
/**
|
||||
* 百分比
|
||||
*/
|
||||
@ApiModelProperty("百分比")
|
||||
private double completionRate;
|
||||
|
||||
|
||||
|
||||
}
|
||||
Loading…
Reference in new issue