1、修复bug

beetlsql3-dev
wgf 2 years ago
parent 221be5894d
commit 62d3df6162

@ -4,11 +4,7 @@ import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.dao.StudentAccountCrowdfundingSystemDao;
import com.ibeetl.jlw.entity.StudentAccountCrowdfundingSystem;
import com.ibeetl.jlw.entity.StudentAccountP2pSystem;
import com.ibeetl.jlw.web.query.StudentAccountCrowdfundingSystemQuery;
import com.ibeetl.jlw.web.query.StudentAccountP2pSystemQuery;
import com.sun.xml.internal.bind.v2.TODO;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@ -4,7 +4,6 @@ import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.dao.StudentAccountEquityInvestmentSystemDao;
import com.ibeetl.jlw.entity.StudentAccountEquityInvestmentSystem;
import com.ibeetl.jlw.entity.StudentAccountP2pSystem;
import com.ibeetl.jlw.web.query.StudentAccountEquityInvestmentSystemQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@ -3,10 +3,7 @@ package com.ibeetl.jlw.service;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.dao.StudentAccountP2pSystemDao;
import com.ibeetl.jlw.entity.StudentAccountCrowdfundingSystem;
import com.ibeetl.jlw.entity.StudentAccountEquityInvestmentSystem;
import com.ibeetl.jlw.entity.StudentAccountP2pSystem;
import com.ibeetl.jlw.web.query.StudentAccountEquityInvestmentSystemQuery;
import com.ibeetl.jlw.web.query.StudentAccountP2pSystemQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@ -1,43 +1,25 @@
package com.ibeetl.jlw.service;
import java.io.*;
import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.math.BigDecimal;
import cn.jlw.util.ToolUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.util.TimeTool;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.StudentAccountTradingRecordSheetDao;
import com.ibeetl.jlw.entity.StudentAccountTradingRecordSheet;
import com.ibeetl.jlw.web.query.StudentAccountTradingRecordSheetQuery;
import com.ibeetl.jlw.entity.FileEntity;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.util.PlatformException;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.SqlId;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.beans.factory.annotation.Autowired;
import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
import java.util.ArrayList;
import java.util.List;
/**
* Service
@ -49,7 +31,8 @@ import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
@Validated
public class StudentAccountTradingRecordSheetService extends CoreBaseService<StudentAccountTradingRecordSheet> {
@Autowired private StudentAccountTradingRecordSheetDao studentAccountTradingRecordSheetDao;
@Autowired
private StudentAccountTradingRecordSheetDao studentAccountTradingRecordSheetDao;
public PageQuery<StudentAccountTradingRecordSheet> queryByCondition(PageQuery query) {
PageQuery ret = studentAccountTradingRecordSheetDao.queryByCondition(query);
@ -90,7 +73,8 @@ public class StudentAccountTradingRecordSheetService extends CoreBaseService<Stu
} catch (Exception e) {
try {
studentAccountTradingRecordSheetList.add(JSONObject.parseObject(studentAccountTradingRecordSheetQuery.getStudentAccountTradingRecordSheetJsonStr(), StudentAccountTradingRecordSheet.class));
} catch (Exception e1) {}
} catch (Exception e1) {
}
}
ToolUtils.deleteNullList(studentAccountTradingRecordSheetList);
if (null != studentAccountTradingRecordSheetList && studentAccountTradingRecordSheetList.size() > 0) {

@ -19,7 +19,6 @@ import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.entity.StudentChapterQuestionLog;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion;
import com.ibeetl.jlw.entity.dto.QuestionLogAddDTO;
import com.ibeetl.jlw.enums.QuestionLogAddTypeEnum;
import com.ibeetl.jlw.enums.ResourcesQuestionTypeEnum;
import com.ibeetl.jlw.web.query.ResourcesQuestionQuery;
import com.ibeetl.jlw.web.query.StudentChapterQuestionLogQuery;
@ -479,6 +478,7 @@ public class StudentChapterQuestionLogService extends CoreBaseService<StudentCha
/**
* -
*
* @param courseInfoId
* @param courseType
* @return

Loading…
Cancel
Save