From 62d3df6162b69a16822803140cb894e05981797f Mon Sep 17 00:00:00 2001 From: wgf <121463602@qq.com> Date: Fri, 8 Sep 2023 00:03:12 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...udentAccountCrowdfundingSystemService.java | 12 +-- ...tAccountEquityInvestmentSystemService.java | 9 +- .../StudentAccountP2pSystemService.java | 9 +- ...udentAccountTradingRecordSheetService.java | 90 ++++++++----------- .../StudentChapterQuestionLogService.java | 2 +- 5 files changed, 49 insertions(+), 73 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountCrowdfundingSystemService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountCrowdfundingSystemService.java index ba9fe05e..c61392ad 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountCrowdfundingSystemService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountCrowdfundingSystemService.java @@ -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; @@ -30,16 +26,16 @@ public class StudentAccountCrowdfundingSystemService extends CoreBaseService> getList(StudentAccountCrowdfundingSystemQuery query){ + public JsonResult> getList(StudentAccountCrowdfundingSystemQuery query) { return JsonResult.success(studentAccountCrowdfundingSystemDao.getValuesByQueryNotWithPermission(query)); } /** - *对接智云子系统 + * 对接智云子系统 */ - private void getSubsystemData(){ - //TODO 对接智云子系统 + private void getSubsystemData() { + //TODO 对接智云子系统 StudentAccountCrowdfundingSystem crowdfundingSystem = new StudentAccountCrowdfundingSystem(); studentAccountCrowdfundingSystemDao.insert(crowdfundingSystem); diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountEquityInvestmentSystemService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountEquityInvestmentSystemService.java index f25720d3..64fe8308 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountEquityInvestmentSystemService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountEquityInvestmentSystemService.java @@ -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; @@ -27,14 +26,14 @@ public class StudentAccountEquityInvestmentSystemService extends CoreBaseService private StudentAccountEquityInvestmentSystemDao studentAccountEquityInvestmentSystemDao; - public JsonResult> getList(StudentAccountEquityInvestmentSystemQuery query){ - return JsonResult.success(studentAccountEquityInvestmentSystemDao.getValuesByQueryNotWithPermission(query)); + public JsonResult> getList(StudentAccountEquityInvestmentSystemQuery query) { + return JsonResult.success(studentAccountEquityInvestmentSystemDao.getValuesByQueryNotWithPermission(query)); } /** - *对接智云子系统 + * 对接智云子系统 */ - public void getSubsystemData(){ + public void getSubsystemData() { //TODO 对接智云子系统 StudentAccountEquityInvestmentSystem investmentSystem = new StudentAccountEquityInvestmentSystem(); diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountP2pSystemService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountP2pSystemService.java index 7b9fa0ab..c0b2dc7c 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountP2pSystemService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountP2pSystemService.java @@ -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; @@ -29,15 +26,15 @@ public class StudentAccountP2pSystemService extends CoreBaseService> getList(StudentAccountP2pSystemQuery query){ + public JsonResult> getList(StudentAccountP2pSystemQuery query) { return JsonResult.success(studentAccountP2pSystemDao.getValuesByQueryNotWithPermission(query)); } /** - *对接智云子系统 + * 对接智云子系统 */ - private void getSubsystemData(){ + private void getSubsystemData() { //TODO 对接智云子系统 StudentAccountP2pSystem p2pSystem = new StudentAccountP2pSystem(); diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountTradingRecordSheetService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountTradingRecordSheetService.java index b4f66061..4b29a7a5 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountTradingRecordSheetService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountTradingRecordSheetService.java @@ -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 @@ -47,34 +29,35 @@ import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue; @Service @Transactional @Validated -public class StudentAccountTradingRecordSheetService extends CoreBaseService{ +public class StudentAccountTradingRecordSheetService extends CoreBaseService { - @Autowired private StudentAccountTradingRecordSheetDao studentAccountTradingRecordSheetDao; + @Autowired + private StudentAccountTradingRecordSheetDao studentAccountTradingRecordSheetDao; - public PageQueryqueryByCondition(PageQuery query){ - PageQuery ret = studentAccountTradingRecordSheetDao.queryByCondition(query); + public PageQuery queryByCondition(PageQuery query) { + PageQuery ret = studentAccountTradingRecordSheetDao.queryByCondition(query); queryListAfter(ret.getList()); return ret; } - public PageQueryqueryByConditionQuery(PageQuery query){ - PageQuery ret = studentAccountTradingRecordSheetDao.queryByConditionQuery(query); + public PageQuery queryByConditionQuery(PageQuery query) { + PageQuery ret = studentAccountTradingRecordSheetDao.queryByConditionQuery(query); queryListAfter(ret.getList()); return ret; } - public void deleteByList(List list){ + public void deleteByList(List list) { String ids = ""; ToolUtils.deleteNullList(list); - for(int i=0;null != list && i studentAccountTradingRecordSheetList = new ArrayList<>(); try { @@ -90,11 +73,12 @@ public class StudentAccountTradingRecordSheetService extends CoreBaseService0){ - for(int i=0;i 0) { + for (int i = 0; i < studentAccountTradingRecordSheetList.size(); i++) { StudentAccountTradingRecordSheet studentAccountTradingRecordSheet = studentAccountTradingRecordSheetList.get(i); studentAccountTradingRecordSheet.setOrgId(studentAccountTradingRecordSheetQuery.getOrgId()); } @@ -103,7 +87,7 @@ public class StudentAccountTradingRecordSheetService extends CoreBaseService 0; - if(!flag){ + if (!flag) { msg = "更新指定参数失败"; } - }else{ + } else { msg = "指定参数为空"; } return msg; } - public List getValues (Object paras){ + public List getValues(Object paras) { return sqlManager.select(SqlId.of("jlw.studentAccountTradingRecordSheet.getStudentAccountTradingRecordSheetValues"), StudentAccountTradingRecordSheet.class, paras); } - public List getValuesByQuery (StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery){ + public List getValuesByQuery(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery) { return studentAccountTradingRecordSheetDao.getValuesByQuery(studentAccountTradingRecordSheetQuery); } - public List getValuesByQueryNotWithPermission (StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery){ + public List getValuesByQueryNotWithPermission(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery) { return studentAccountTradingRecordSheetDao.getValuesByQueryNotWithPermission(studentAccountTradingRecordSheetQuery); } - public StudentAccountTradingRecordSheet getInfo (Long id){ + public StudentAccountTradingRecordSheet getInfo(Long id) { StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery = new StudentAccountTradingRecordSheetQuery(); studentAccountTradingRecordSheetQuery.setId(id); List list = studentAccountTradingRecordSheetDao.getValuesByQuery(studentAccountTradingRecordSheetQuery); - if(null != list && list.size()>0){ + if (null != list && list.size() > 0) { return list.get(0); - }else{ + } else { return null; } } - public StudentAccountTradingRecordSheet getInfo (StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery){ + public StudentAccountTradingRecordSheet getInfo(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery) { List list = studentAccountTradingRecordSheetDao.getValuesByQuery(studentAccountTradingRecordSheetQuery); - if(null != list && list.size()>0){ + if (null != list && list.size() > 0) { return list.get(0); - }else{ + } else { return null; } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentChapterQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentChapterQuestionLogService.java index b8d7f409..bcabb5b0 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentChapterQuestionLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentChapterQuestionLogService.java @@ -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