tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、修复bug

Browse Source
beetlsql3-dev
wgf 2 years ago
parent 221be5894d
commit 62d3df6162
5 changed files with 49 additions and 73 deletions
Show Stats Download Patch File Download Diff File

12
web/src/main/java/com/ibeetl/jlw/service/StudentAccountCrowdfundingSystemService.java
Unescape Escape View File

@ -4,11 +4,7 @@ import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.dao.StudentAccountCrowdfundingSystemDao; import com.ibeetl.jlw.dao.StudentAccountCrowdfundingSystemDao;
import com.ibeetl.jlw.entity.StudentAccountCrowdfundingSystem; 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.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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -30,16 +26,16 @@ public class StudentAccountCrowdfundingSystemService extends CoreBaseService<Stu
private StudentAccountCrowdfundingSystemDao studentAccountCrowdfundingSystemDao; private StudentAccountCrowdfundingSystemDao studentAccountCrowdfundingSystemDao;
public JsonResult<List<StudentAccountCrowdfundingSystem>> getList(StudentAccountCrowdfundingSystemQuery query){ public JsonResult<List<StudentAccountCrowdfundingSystem>> getList(StudentAccountCrowdfundingSystemQuery query) {
return JsonResult.success(studentAccountCrowdfundingSystemDao.getValuesByQueryNotWithPermission(query)); return JsonResult.success(studentAccountCrowdfundingSystemDao.getValuesByQueryNotWithPermission(query));
} }
/** /**
*对接智云子系统 * 对接智云子系统
*/ */
private void getSubsystemData(){ private void getSubsystemData() {
//TODO 对接智云子系统 //TODO 对接智云子系统
StudentAccountCrowdfundingSystem crowdfundingSystem = new StudentAccountCrowdfundingSystem(); StudentAccountCrowdfundingSystem crowdfundingSystem = new StudentAccountCrowdfundingSystem();
studentAccountCrowdfundingSystemDao.insert(crowdfundingSystem); studentAccountCrowdfundingSystemDao.insert(crowdfundingSystem);

9
web/src/main/java/com/ibeetl/jlw/service/StudentAccountEquityInvestmentSystemService.java
Unescape Escape View File

@ -4,7 +4,6 @@ import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.dao.StudentAccountEquityInvestmentSystemDao; import com.ibeetl.jlw.dao.StudentAccountEquityInvestmentSystemDao;
import com.ibeetl.jlw.entity.StudentAccountEquityInvestmentSystem; 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.StudentAccountEquityInvestmentSystemQuery;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -27,14 +26,14 @@ public class StudentAccountEquityInvestmentSystemService extends CoreBaseService
private StudentAccountEquityInvestmentSystemDao studentAccountEquityInvestmentSystemDao; private StudentAccountEquityInvestmentSystemDao studentAccountEquityInvestmentSystemDao;
public JsonResult<List<StudentAccountEquityInvestmentSystem>> getList(StudentAccountEquityInvestmentSystemQuery query){ public JsonResult<List<StudentAccountEquityInvestmentSystem>> getList(StudentAccountEquityInvestmentSystemQuery query) {
return JsonResult.success(studentAccountEquityInvestmentSystemDao.getValuesByQueryNotWithPermission(query)); return JsonResult.success(studentAccountEquityInvestmentSystemDao.getValuesByQueryNotWithPermission(query));
} }
/** /**
*对接智云子系统 * 对接智云子系统
*/ */
public void getSubsystemData(){ public void getSubsystemData() {
//TODO 对接智云子系统 //TODO 对接智云子系统
StudentAccountEquityInvestmentSystem investmentSystem = new StudentAccountEquityInvestmentSystem(); StudentAccountEquityInvestmentSystem investmentSystem = new StudentAccountEquityInvestmentSystem();

9
web/src/main/java/com/ibeetl/jlw/service/StudentAccountP2pSystemService.java
Unescape Escape View File

@ -3,10 +3,7 @@ package com.ibeetl.jlw.service;
import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.dao.StudentAccountP2pSystemDao; 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.entity.StudentAccountP2pSystem;
import com.ibeetl.jlw.web.query.StudentAccountEquityInvestmentSystemQuery;
import com.ibeetl.jlw.web.query.StudentAccountP2pSystemQuery; import com.ibeetl.jlw.web.query.StudentAccountP2pSystemQuery;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -29,15 +26,15 @@ public class StudentAccountP2pSystemService extends CoreBaseService<StudentAccou
private StudentAccountP2pSystemDao studentAccountP2pSystemDao; private StudentAccountP2pSystemDao studentAccountP2pSystemDao;
public JsonResult<List<StudentAccountP2pSystem>> getList(StudentAccountP2pSystemQuery query){ public JsonResult<List<StudentAccountP2pSystem>> getList(StudentAccountP2pSystemQuery query) {
return JsonResult.success(studentAccountP2pSystemDao.getValuesByQueryNotWithPermission(query)); return JsonResult.success(studentAccountP2pSystemDao.getValuesByQueryNotWithPermission(query));
} }
/** /**
*对接智云子系统 * 对接智云子系统
*/ */
private void getSubsystemData(){ private void getSubsystemData() {
//TODO 对接智云子系统 //TODO 对接智云子系统
StudentAccountP2pSystem p2pSystem = new StudentAccountP2pSystem(); StudentAccountP2pSystem p2pSystem = new StudentAccountP2pSystem();

90
web/src/main/java/com/ibeetl/jlw/service/StudentAccountTradingRecordSheetService.java
Unescape Escape View File

@ -1,43 +1,25 @@
package com.ibeetl.jlw.service; 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 cn.jlw.util.ToolUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode; import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.StudentAccountTradingRecordSheetDao; import com.ibeetl.jlw.dao.StudentAccountTradingRecordSheetDao;
import com.ibeetl.jlw.entity.StudentAccountTradingRecordSheet; import com.ibeetl.jlw.entity.StudentAccountTradingRecordSheet;
import com.ibeetl.jlw.web.query.StudentAccountTradingRecordSheetQuery; 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.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.SqlId;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList;
import java.util.List;
import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
/** /**
* 资产账户转账记录 Service * 资产账户转账记录 Service
@ -47,34 +29,35 @@ import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
@Service @Service
@Transactional @Transactional
@Validated @Validated
public class StudentAccountTradingRecordSheetService extends CoreBaseService<StudentAccountTradingRecordSheet>{ public class StudentAccountTradingRecordSheetService extends CoreBaseService<StudentAccountTradingRecordSheet> {
@Autowired private StudentAccountTradingRecordSheetDao studentAccountTradingRecordSheetDao; @Autowired
private StudentAccountTradingRecordSheetDao studentAccountTradingRecordSheetDao;
public PageQuery<StudentAccountTradingRecordSheet>queryByCondition(PageQuery query){ public PageQuery<StudentAccountTradingRecordSheet> queryByCondition(PageQuery query) {
PageQuery ret = studentAccountTradingRecordSheetDao.queryByCondition(query); PageQuery ret = studentAccountTradingRecordSheetDao.queryByCondition(query);
queryListAfter(ret.getList()); queryListAfter(ret.getList());
return ret; return ret;
} }
public PageQuery<StudentAccountTradingRecordSheet>queryByConditionQuery(PageQuery query){ public PageQuery<StudentAccountTradingRecordSheet> queryByConditionQuery(PageQuery query) {
PageQuery ret = studentAccountTradingRecordSheetDao.queryByConditionQuery(query); PageQuery ret = studentAccountTradingRecordSheetDao.queryByConditionQuery(query);
queryListAfter(ret.getList()); queryListAfter(ret.getList());
return ret; return ret;
} }
public void deleteByList(List list){ public void deleteByList(List list) {
String ids = ""; String ids = "";
ToolUtils.deleteNullList(list); ToolUtils.deleteNullList(list);
for(int i=0;null != list && i<list.size();i++){ for (int i = 0; null != list && i < list.size(); i++) {
ids += list.get(i).toString()+(i==list.size()-1?"":","); ids += list.get(i).toString() + (i == list.size() - 1 ? "" : ",");
} }
if(StringUtils.isNotBlank(ids)){ if (StringUtils.isNotBlank(ids)) {
studentAccountTradingRecordSheetDao.deleteStudentAccountTradingRecordSheetByIds(ids); studentAccountTradingRecordSheetDao.deleteStudentAccountTradingRecordSheetByIds(ids);
} }
} }
public void deleteStudentAccountTradingRecordSheet(String ids){ public void deleteStudentAccountTradingRecordSheet(String ids) {
try { try {
studentAccountTradingRecordSheetDao.deleteStudentAccountTradingRecordSheetByIds(ids); studentAccountTradingRecordSheetDao.deleteStudentAccountTradingRecordSheetByIds(ids);
} catch (Exception e) { } catch (Exception e) {
@ -82,7 +65,7 @@ public class StudentAccountTradingRecordSheetService extends CoreBaseService<Stu
} }
} }
public String addAll(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery){ public String addAll(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery) {
String msg = ""; String msg = "";
List<StudentAccountTradingRecordSheet> studentAccountTradingRecordSheetList = new ArrayList<>(); List<StudentAccountTradingRecordSheet> studentAccountTradingRecordSheetList = new ArrayList<>();
try { try {
@ -90,11 +73,12 @@ public class StudentAccountTradingRecordSheetService extends CoreBaseService<Stu
} catch (Exception e) { } catch (Exception e) {
try { try {
studentAccountTradingRecordSheetList.add(JSONObject.parseObject(studentAccountTradingRecordSheetQuery.getStudentAccountTradingRecordSheetJsonStr(), StudentAccountTradingRecordSheet.class)); studentAccountTradingRecordSheetList.add(JSONObject.parseObject(studentAccountTradingRecordSheetQuery.getStudentAccountTradingRecordSheetJsonStr(), StudentAccountTradingRecordSheet.class));
} catch (Exception e1) {} } catch (Exception e1) {
}
} }
ToolUtils.deleteNullList(studentAccountTradingRecordSheetList); ToolUtils.deleteNullList(studentAccountTradingRecordSheetList);
if(null != studentAccountTradingRecordSheetList && studentAccountTradingRecordSheetList.size()>0){ if (null != studentAccountTradingRecordSheetList && studentAccountTradingRecordSheetList.size() > 0) {
for(int i=0;i<studentAccountTradingRecordSheetList.size();i++){ for (int i = 0; i < studentAccountTradingRecordSheetList.size(); i++) {
StudentAccountTradingRecordSheet studentAccountTradingRecordSheet = studentAccountTradingRecordSheetList.get(i); StudentAccountTradingRecordSheet studentAccountTradingRecordSheet = studentAccountTradingRecordSheetList.get(i);
studentAccountTradingRecordSheet.setOrgId(studentAccountTradingRecordSheetQuery.getOrgId()); studentAccountTradingRecordSheet.setOrgId(studentAccountTradingRecordSheetQuery.getOrgId());
} }
@ -103,7 +87,7 @@ public class StudentAccountTradingRecordSheetService extends CoreBaseService<Stu
return msg; return msg;
} }
public JsonResult add(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery){ public JsonResult add(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery) {
String msg = ""; String msg = "";
StudentAccountTradingRecordSheet studentAccountTradingRecordSheet = studentAccountTradingRecordSheetQuery.pojo(); StudentAccountTradingRecordSheet studentAccountTradingRecordSheet = studentAccountTradingRecordSheetQuery.pojo();
studentAccountTradingRecordSheetDao.insert(studentAccountTradingRecordSheet); studentAccountTradingRecordSheetDao.insert(studentAccountTradingRecordSheet);
@ -115,54 +99,54 @@ public class StudentAccountTradingRecordSheetService extends CoreBaseService<Stu
return jsonResult; return jsonResult;
} }
public String edit(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery){ public String edit(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery) {
String msg = ""; String msg = "";
StudentAccountTradingRecordSheet studentAccountTradingRecordSheet = studentAccountTradingRecordSheetQuery.pojo(); StudentAccountTradingRecordSheet studentAccountTradingRecordSheet = studentAccountTradingRecordSheetQuery.pojo();
studentAccountTradingRecordSheetDao.updateTemplateById(studentAccountTradingRecordSheet); studentAccountTradingRecordSheetDao.updateTemplateById(studentAccountTradingRecordSheet);
return msg; return msg;
} }
public String updateGivenByIds(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery){ public String updateGivenByIds(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery) {
String msg = ""; String msg = "";
if(StringUtils.isNotBlank(studentAccountTradingRecordSheetQuery.get_given())){ if (StringUtils.isNotBlank(studentAccountTradingRecordSheetQuery.get_given())) {
boolean flag = studentAccountTradingRecordSheetDao.updateGivenByIds(studentAccountTradingRecordSheetQuery) > 0; boolean flag = studentAccountTradingRecordSheetDao.updateGivenByIds(studentAccountTradingRecordSheetQuery) > 0;
if(!flag){ if (!flag) {
msg = "更新指定参数失败"; msg = "更新指定参数失败";
} }
}else{ } else {
msg = "指定参数为空"; msg = "指定参数为空";
} }
return msg; return msg;
} }
public List<StudentAccountTradingRecordSheet> getValues (Object paras){ public List<StudentAccountTradingRecordSheet> getValues(Object paras) {
return sqlManager.select(SqlId.of("jlw.studentAccountTradingRecordSheet.getStudentAccountTradingRecordSheetValues"), StudentAccountTradingRecordSheet.class, paras); return sqlManager.select(SqlId.of("jlw.studentAccountTradingRecordSheet.getStudentAccountTradingRecordSheetValues"), StudentAccountTradingRecordSheet.class, paras);
} }
public List<StudentAccountTradingRecordSheet> getValuesByQuery (StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery){ public List<StudentAccountTradingRecordSheet> getValuesByQuery(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery) {
return studentAccountTradingRecordSheetDao.getValuesByQuery(studentAccountTradingRecordSheetQuery); return studentAccountTradingRecordSheetDao.getValuesByQuery(studentAccountTradingRecordSheetQuery);
} }
public List<StudentAccountTradingRecordSheet> getValuesByQueryNotWithPermission (StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery){ public List<StudentAccountTradingRecordSheet> getValuesByQueryNotWithPermission(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery) {
return studentAccountTradingRecordSheetDao.getValuesByQueryNotWithPermission(studentAccountTradingRecordSheetQuery); return studentAccountTradingRecordSheetDao.getValuesByQueryNotWithPermission(studentAccountTradingRecordSheetQuery);
} }
public StudentAccountTradingRecordSheet getInfo (Long id){ public StudentAccountTradingRecordSheet getInfo(Long id) {
StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery = new StudentAccountTradingRecordSheetQuery(); StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery = new StudentAccountTradingRecordSheetQuery();
studentAccountTradingRecordSheetQuery.setId(id); studentAccountTradingRecordSheetQuery.setId(id);
List<StudentAccountTradingRecordSheet> list = studentAccountTradingRecordSheetDao.getValuesByQuery(studentAccountTradingRecordSheetQuery); List<StudentAccountTradingRecordSheet> list = studentAccountTradingRecordSheetDao.getValuesByQuery(studentAccountTradingRecordSheetQuery);
if(null != list && list.size()>0){ if (null != list && list.size() > 0) {
return list.get(0); return list.get(0);
}else{ } else {
return null; return null;
} }
} }
public StudentAccountTradingRecordSheet getInfo (StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery){ public StudentAccountTradingRecordSheet getInfo(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery) {
List<StudentAccountTradingRecordSheet> list = studentAccountTradingRecordSheetDao.getValuesByQuery(studentAccountTradingRecordSheetQuery); List<StudentAccountTradingRecordSheet> list = studentAccountTradingRecordSheetDao.getValuesByQuery(studentAccountTradingRecordSheetQuery);
if(null != list && list.size()>0){ if (null != list && list.size() > 0) {
return list.get(0); return list.get(0);
}else{ } else {
return null; return null;
} }
} }

2
web/src/main/java/com/ibeetl/jlw/service/StudentChapterQuestionLogService.java
Unescape Escape View File

@ -19,7 +19,6 @@ import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.entity.StudentChapterQuestionLog; import com.ibeetl.jlw.entity.StudentChapterQuestionLog;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion;
import com.ibeetl.jlw.entity.dto.QuestionLogAddDTO; import com.ibeetl.jlw.entity.dto.QuestionLogAddDTO;
import com.ibeetl.jlw.enums.QuestionLogAddTypeEnum;
import com.ibeetl.jlw.enums.ResourcesQuestionTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionTypeEnum;
import com.ibeetl.jlw.web.query.ResourcesQuestionQuery; import com.ibeetl.jlw.web.query.ResourcesQuestionQuery;
import com.ibeetl.jlw.web.query.StudentChapterQuestionLogQuery; import com.ibeetl.jlw.web.query.StudentChapterQuestionLogQuery;
@ -479,6 +478,7 @@ public class StudentChapterQuestionLogService extends CoreBaseService<StudentCha
/** /**
* 课程中心章节练习-学生答题统计 * 课程中心章节练习-学生答题统计
*
* @param courseInfoId * @param courseInfoId
* @param courseType * @param courseType
* @return * @return

Write Preview
Loading…
Cancel
Save