Compare commits

..

1 Commits

3 changed files with 11 additions and 21 deletions

View File

@@ -122,19 +122,12 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
//这里应该是单独的线程去处理 //这里应该是单独的线程去处理
user.setId(getNodeText(result.get("userId")));//最新接口变化id改成userId user.setId(getNodeText(result.get("userId")));//最新接口变化id改成userId
String band=getNodeText(result.get("bandCode")); String band=getNodeText(result.get("bandCode"));
try { if(StringUtils.isNotBlank(band) && band.length()>4) {
if(StringUtils.isNotBlank(band) && band.length()>4 && band.contains("band")) {
String bandNum=band.substring(4); String bandNum=band.substring(4);
user.setBandLevel(Integer.valueOf(bandNum)); user.setBandLevel(Integer.valueOf(bandNum));
}else if (StringUtils.isNotBlank(band) && band.length()>4 && band.contains("Level")) {
String bandNum=band.substring(5);
user.setBandLevel(Integer.valueOf(bandNum));
}else { }else {
user.setBandLevel(0); user.setBandLevel(0);
} }
} catch (NumberFormatException e) {
user.setBandLevel(0);
}
user.setAvatar(getNodeText(result.get("avatar"))); user.setAvatar(getNodeText(result.get("avatar")));
user.setCode(getNodeText(result.get("userNo"))); user.setCode(getNodeText(result.get("userNo")));

View File

@@ -140,9 +140,6 @@ public class CasesApi extends ApiBaseController {
List<Cases> cases = views.getList(); List<Cases> cases = views.getList();
if (CollUtil.isNotEmpty(cases)) { if (CollUtil.isNotEmpty(cases)) {
for (Cases c : cases) { for (Cases c : cases) {
if ("null".equals(c.getSummary())) {
c.setSummary(null);
}
StringBuffer stringBuffer = new StringBuffer(); StringBuffer stringBuffer = new StringBuffer();
List<CasesMajorType> caseId = casesMajorTypeDao.findList(FieldFilters.eq("caseId", c.getId())); List<CasesMajorType> caseId = casesMajorTypeDao.findList(FieldFilters.eq("caseId", c.getId()));
if (caseId != null && !caseId.isEmpty()) { if (caseId != null && !caseId.isEmpty()) {

View File

@@ -480,7 +480,7 @@ public class CourseServiceImpl implements ICourseService {
String sql = "SELECT DISTINCT\n" + String sql = "SELECT DISTINCT\n" +
"rt.course_id\n" + "rt.course_id\n" +
"FROM\n" + "FROM\n" +
"boe_new.student s INNER JOIN boe_new.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" + "boe.student s INNER JOIN boe.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
"\n" + "\n" +
"WHERE\n" + "WHERE\n" +
"\n" + "\n" +
@@ -503,7 +503,7 @@ public class CourseServiceImpl implements ICourseService {
String sql = "SELECT DISTINCT\n" + String sql = "SELECT DISTINCT\n" +
"pt.course_id\n" + "pt.course_id\n" +
"FROM\n" + "FROM\n" +
"boe_new.student s INNER JOIN boe_new.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" + "boe.student s INNER JOIN boe.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
"\n" + "\n" +
"WHERE\n" + "WHERE\n" +
"\n" + "\n" +
@@ -560,8 +560,8 @@ public class CourseServiceImpl implements ICourseService {
String sql = "SELECT DISTINCT\n" + String sql = "SELECT DISTINCT\n" +
"\tc.id \n" + "\tc.id \n" +
"FROM\n" + "FROM\n" +
"\tboe_new.student s\n" + "\tboe.student s\n" +
"\tINNER JOIN boe_new.grow_task gt ON s.pid = gt.grow_id\n" + "\tINNER JOIN boe.grow_task gt ON s.pid = gt.grow_id\n" +
"\tINNER JOIN boe_course c ON gt.course_id = c.id \n" + "\tINNER JOIN boe_course c ON gt.course_id = c.id \n" +
"WHERE\n" + "WHERE\n" +
"\ts.type = 14 \n" + "\ts.type = 14 \n" +