wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2023-01-16 16:04:08 +08:00
parent e6adffab53 427d0312cc
commit 02f28b100e
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/common/controller/CensusController.java
View File

@ -416,6 +416,8 @@ public class CensusController {
Integer.valueOf(index.getOrDefault("ywzy", "0").toString()),
Integer.valueOf(index.getOrDefault("yyzy", "0").toString()),
Integer.valueOf(index.getOrDefault("hys", "0").toString()),
Integer.valueOf(index.getOrDefault("yzy", "0").toString()),
Integer.valueOf(index.getOrDefault("ysp", "0").toString()),
Integer.valueOf(index.getOrDefault("count", "0").toString()));
return temp;
}).collect(Collectors.toList());

30
renren-admin/src/main/java/io/renren/modules/resource/excel/census/SelectApplyDeptDetailTypeCountListExcel.java
View File

@ -19,10 +19,16 @@ public class SelectApplyDeptDetailTypeCountListExcel {
private Integer yyzy;
@ExcelProperty({"会客厅"})
private Integer hys;
@ExcelProperty({"云资源"})
private Integer yzy;
@ExcelProperty({"云视频"})
private Integer ysp;
@ExcelProperty({"总计"})
private Integer count;
public SelectApplyDeptDetailTypeCountListExcel(String name, Integer znsf, Integer tcfw, Integer kfzj, Integer ywzj, Integer yyzy, Integer hys, Integer count) {
public SelectApplyDeptDetailTypeCountListExcel(String name, Integer znsf, Integer tcfw, Integer kfzj, Integer ywzj, Integer yyzy, Integer hys, Integer yzy, Integer ysp, Integer count) {
this.name = name;
this.znsf = znsf;
this.tcfw = tcfw;
@ -30,6 +36,8 @@ public class SelectApplyDeptDetailTypeCountListExcel {
this.ywzj = ywzj;
this.yyzy = yyzy;
this.hys = hys;
this.yzy = yzy;
this.ysp = ysp;
this.count = count;
}
@ -97,16 +105,32 @@ public class SelectApplyDeptDetailTypeCountListExcel {
this.count = count;
}
public Integer getYzy() {
return yzy;
}
public void setYzy(Integer yzy) {
this.yzy = yzy;
}
public Integer getYsp() {
return ysp;
}
public void setYsp(Integer ysp) {
this.ysp = ysp;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
SelectApplyDeptDetailTypeCountListExcel that = (SelectApplyDeptDetailTypeCountListExcel) o;
return name.equals(that.name) && znsf.equals(that.znsf) && tcfw.equals(that.tcfw) && kfzj.equals(that.kfzj) && ywzj.equals(that.ywzj) && yyzy.equals(that.yyzy) && hys.equals(that.hys) && count.equals(that.count);
return Objects.equals(name, that.name) && Objects.equals(znsf, that.znsf) && Objects.equals(tcfw, that.tcfw) && Objects.equals(kfzj, that.kfzj) && Objects.equals(ywzj, that.ywzj) && Objects.equals(yyzy, that.yyzy) && Objects.equals(hys, that.hys) && Objects.equals(yzy, that.yzy) && Objects.equals(ysp, that.ysp) && Objects.equals(count, that.count);
}
@Override
public int hashCode() {
return Objects.hash(name, znsf, tcfw, kfzj, ywzj, yyzy, hys, count);
return Objects.hash(name, znsf, tcfw, kfzj, ywzj, yyzy, hys, yzy, ysp, count);
}
}