Commit 48958ac7 authored by 霍传世's avatar 霍传世

Report

parent 57d6505c
Pipeline #240 canceled with stages
...@@ -15,9 +15,9 @@ import java.util.Map; ...@@ -15,9 +15,9 @@ import java.util.Map;
@Component @Component
public class DataCacheInit { public class DataCacheInit {
public static final Map<String,Integer> schoolMaps = new HashMap<>(); public static final Map<String,Long> schoolMaps = new HashMap<>();
public static final Map<String,Integer> provinceMaps = new HashMap<>(); public static final Map<String,Long> provinceMaps = new HashMap<>();
@Resource @Resource
private JdbcTemplate BaoMingJdbcTemplate; private JdbcTemplate BaoMingJdbcTemplate;
......
package com.example.studentworkgenerator.controller; package com.example.studentworkgenerator.controller;
import com.example.studentworkgenerator.config.DataCacheInit; import com.example.studentworkgenerator.config.DataCacheInit;
import com.qcloud.cos.COSClient; import com.qcloud.cos.COSClient;
import com.qcloud.cos.exception.CosClientException; import com.qcloud.cos.exception.CosClientException;
...@@ -48,10 +47,10 @@ public class studentPaperReportGeneratorController { ...@@ -48,10 +47,10 @@ public class studentPaperReportGeneratorController {
if(!(null==provinceName)&&null==schoolName){ if(!(null==provinceName)&&null==schoolName){
List<String> provinceList = Arrays.asList(provinceName.split("#")); List<String> provinceList = Arrays.asList(provinceName.split("#"));
List<Integer> provinceIds = provinceList.stream().map(x->(int)DataCacheInit.provinceMaps.get(x)).collect(Collectors.toList()); List<Long> provinceIds = provinceList.stream().map(x->(Long)DataCacheInit.provinceMaps.get(x)).collect(Collectors.toList());
String provinceStatement = " ( "; String provinceStatement = " ( ";
int i = 1; int i = 1;
for (Integer provinceId : provinceIds) { for (Long provinceId : provinceIds) {
if(i==provinceIds.size()){ if(i==provinceIds.size()){
provinceStatement = provinceStatement + " ) "; provinceStatement = provinceStatement + " ) ";
}else{ }else{
...@@ -64,10 +63,10 @@ public class studentPaperReportGeneratorController { ...@@ -64,10 +63,10 @@ public class studentPaperReportGeneratorController {
if(!(null==schoolName)&&null==provinceName){ if(!(null==schoolName)&&null==provinceName){
List<String> schoolList = Arrays.asList(schoolName.split("#")); List<String> schoolList = Arrays.asList(schoolName.split("#"));
List<Integer> schoolIds = schoolList.stream().map(x->(int)DataCacheInit.provinceMaps.get(x)).collect(Collectors.toList()); List<Long> schoolIds = schoolList.stream().map(x->(Long)DataCacheInit.provinceMaps.get(x)).collect(Collectors.toList());
String schoolStatement = " ( "; String schoolStatement = " ( ";
int i = 1; int i = 1;
for (Integer schoolId : schoolIds) { for (Long schoolId : schoolIds) {
if(i==schoolIds.size()){ if(i==schoolIds.size()){
schoolStatement = schoolStatement + " ) "; schoolStatement = schoolStatement + " ) ";
}else{ }else{
...@@ -80,10 +79,10 @@ public class studentPaperReportGeneratorController { ...@@ -80,10 +79,10 @@ public class studentPaperReportGeneratorController {
if(!(null==schoolName)&&!(null==provinceName)){ if(!(null==schoolName)&&!(null==provinceName)){
List<String> provinceList = Arrays.asList(provinceName.split("#")); List<String> provinceList = Arrays.asList(provinceName.split("#"));
List<Integer> provinceIds = provinceList.stream().map(x->(int)DataCacheInit.provinceMaps.get(x)).collect(Collectors.toList()); List<Long> provinceIds = provinceList.stream().map(x->(Long)DataCacheInit.provinceMaps.get(x)).collect(Collectors.toList());
String provinceStatement = " ( "; String provinceStatement = " ( ";
int i = 1; int i = 1;
for (Integer provinceId : provinceIds) { for (Long provinceId : provinceIds) {
if(i==provinceIds.size()){ if(i==provinceIds.size()){
provinceStatement = provinceStatement + " ) "; provinceStatement = provinceStatement + " ) ";
}else{ }else{
...@@ -93,10 +92,10 @@ public class studentPaperReportGeneratorController { ...@@ -93,10 +92,10 @@ public class studentPaperReportGeneratorController {
} }
appendStatement = appendStatement + " where province_id in "+ provinceStatement; appendStatement = appendStatement + " where province_id in "+ provinceStatement;
List<String> schoolList = Arrays.asList(schoolName.split("#")); List<String> schoolList = Arrays.asList(schoolName.split("#"));
List<Integer> schoolIds = schoolList.stream().map(x->(int)DataCacheInit.provinceMaps.get(x)).collect(Collectors.toList()); List<Long> schoolIds = schoolList.stream().map(x->(Long)DataCacheInit.provinceMaps.get(x)).collect(Collectors.toList());
String schoolStatement = " ( "; String schoolStatement = " ( ";
int j = 1; int j = 1;
for (Integer schoolId : schoolIds) { for (Long schoolId : schoolIds) {
if(j==schoolIds.size()){ if(j==schoolIds.size()){
schoolStatement = schoolStatement + " ) "; schoolStatement = schoolStatement + " ) ";
}else{ }else{
......
...@@ -12,7 +12,7 @@ import lombok.ToString; ...@@ -12,7 +12,7 @@ import lombok.ToString;
@ToString @ToString
public class Province { public class Province {
private Integer id; private Long id;
private String name; private String name;
......
...@@ -11,7 +11,7 @@ import lombok.ToString; ...@@ -11,7 +11,7 @@ import lombok.ToString;
@ToString @ToString
public class School { public class School {
private Integer id; private Long id;
private String name; private String name;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment