dev
This commit is contained in:
parent
11036f83c8
commit
e6f9eab4f8
|
|
@ -33,8 +33,15 @@ public class SocialDiagnoseService extends BaseService {
|
||||||
DateTimeFormatter dateTimeFormatter = DateUtil.getDateTimeFormatter(DateUtil.DATE_TIME_FORMAT);
|
DateTimeFormatter dateTimeFormatter = DateUtil.getDateTimeFormatter(DateUtil.DATE_TIME_FORMAT);
|
||||||
List<SocialDiagnose> list = new ArrayList<>();
|
List<SocialDiagnose> list = new ArrayList<>();
|
||||||
List<String> codeList = new ArrayList<>();
|
List<String> codeList = new ArrayList<>();
|
||||||
for (String[] line_array : tab_list) {
|
String next_version_name="";
|
||||||
|
for (int i=0;i<tab_list.size();i++) {
|
||||||
|
String[] line_array =tab_list.get(i);
|
||||||
String flag = line_array[18];
|
String flag = line_array[18];
|
||||||
|
if(i==0){
|
||||||
|
next_version_name = line_array[22];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!flag.equals("1")) {
|
if (!flag.equals("1")) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -42,6 +49,7 @@ public class SocialDiagnoseService extends BaseService {
|
||||||
SocialDiagnose socialDiagnose = new SocialDiagnose();
|
SocialDiagnose socialDiagnose = new SocialDiagnose();
|
||||||
String code = line_array[10];
|
String code = line_array[10];
|
||||||
String name = line_array[11];
|
String name = line_array[11];
|
||||||
|
|
||||||
if (code==null || code.isEmpty() || name == null || name.isEmpty()){
|
if (code==null || code.isEmpty() || name == null || name.isEmpty()){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -53,12 +61,19 @@ public class SocialDiagnoseService extends BaseService {
|
||||||
list.add(socialDiagnose);
|
list.add(socialDiagnose);
|
||||||
codeList.add(code);
|
codeList.add(code);
|
||||||
}
|
}
|
||||||
|
if(next_version_name.isEmpty()){
|
||||||
|
return next_version_name;
|
||||||
|
}
|
||||||
|
socialDirectoryVersionService.saveVersion(1307, version_name, next_version_name, list.size());
|
||||||
|
if(codeList.isEmpty()){
|
||||||
|
return null;
|
||||||
|
}
|
||||||
QueryWrapper<SocialDiagnose> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<SocialDiagnose> queryWrapper = new QueryWrapper<>();
|
||||||
queryWrapper.in("code", codeList);
|
queryWrapper.in("code", codeList);
|
||||||
socialDiagnoseMapper.delete(queryWrapper);
|
socialDiagnoseMapper.delete(queryWrapper);
|
||||||
socialDiagnoseMapper.insert(list, 100);
|
socialDiagnoseMapper.insert(list, 100);
|
||||||
socialDirectoryVersionService.saveVersion(1307, version_name, list.get(0).getVersionName(), list.size());
|
|
||||||
return list.get(0).getVersionName();
|
return next_version_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue