From 3ed8e7a76fb99aa0d3ffd874308cf7ca461ba901 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Sun, 9 Apr 2023 21:55:22 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B44=E6=9C=889=E6=97=A5=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=97=AE=E5=8D=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/KcEvaluationServiceImpl.java | 42 ---- .../controller/KcEvaluationController.java | 117 ++++++++--- .../controller/KcEvaluationansController.java | 193 ++++++++++++++++++ .../controller/KcEvaluationqueController.java | 178 ++++++++++++++++ .../controller/KcEvaluationsController.java | 178 ++++++++++++++++ .../kc/{pktj => qa}/entity/KcEvaluation.java | 21 +- .../modules/kc/qa/entity/KcEvaluationans.java | 61 ++++++ .../modules/kc/qa/entity/KcEvaluationque.java | 67 ++++++ .../modules/kc/qa/entity/KcEvaluations.java | 83 ++++++++ .../mapper/KcEvaluationMapper.java | 18 +- .../kc/qa/mapper/KcEvaluationansMapper.java | 17 ++ .../kc/qa/mapper/KcEvaluationqueMapper.java | 17 ++ .../kc/qa/mapper/KcEvaluationsMapper.java | 17 ++ .../mapper/xml/KcEvaluationMapper.xml | 11 +- .../qa/mapper/xml/KcEvaluationansMapper.xml | 5 + .../qa/mapper/xml/KcEvaluationqueMapper.xml | 5 + .../kc/qa/mapper/xml/KcEvaluationsMapper.xml | 5 + .../service/IKcEvaluationService.java | 10 +- .../qa/service/IKcEvaluationansService.java | 14 ++ .../qa/service/IKcEvaluationqueService.java | 14 ++ .../kc/qa/service/IKcEvaluationsService.java | 14 ++ .../service/impl/KcEvaluationServiceImpl.java | 74 +++++++ .../impl/KcEvaluationansServiceImpl.java | 19 ++ .../impl/KcEvaluationqueServiceImpl.java | 19 ++ .../impl/KcEvaluationsServiceImpl.java | 19 ++ 25 files changed, 1119 insertions(+), 99 deletions(-) delete mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/service/impl/KcEvaluationServiceImpl.java rename jeecg-module-main/src/main/java/org/jeecg/modules/kc/{pktj => qa}/controller/KcEvaluationController.java (61%) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationansController.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationqueController.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationsController.java rename jeecg-module-main/src/main/java/org/jeecg/modules/kc/{pktj => qa}/entity/KcEvaluation.java (91%) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationans.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationque.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluations.java rename jeecg-module-main/src/main/java/org/jeecg/modules/kc/{pktj => qa}/mapper/KcEvaluationMapper.java (75%) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationansMapper.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationqueMapper.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationsMapper.java rename jeecg-module-main/src/main/java/org/jeecg/modules/kc/{pktj => qa}/mapper/xml/KcEvaluationMapper.xml (95%) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationansMapper.xml create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationqueMapper.xml create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationsMapper.xml rename jeecg-module-main/src/main/java/org/jeecg/modules/kc/{pktj => qa}/service/IKcEvaluationService.java (75%) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationansService.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationqueService.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationsService.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationansServiceImpl.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationqueServiceImpl.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationsServiceImpl.java diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/service/impl/KcEvaluationServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/service/impl/KcEvaluationServiceImpl.java deleted file mode 100644 index 429f16b3..00000000 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/service/impl/KcEvaluationServiceImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.jeecg.modules.kc.pktj.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.jeecg.modules.kc.pktj.entity.KcEvaluation; -import org.jeecg.modules.kc.pktj.mapper.KcEvaluationMapper; -import org.jeecg.modules.kc.pktj.service.IKcEvaluationService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import java.util.List; - -/** - * @Description: kc_evaluation - * @Author: jeecg-boot - * @Date: 2023-04-02 - * @Version: V1.0 - */ -@Service -public class KcEvaluationServiceImpl extends ServiceImpl implements IKcEvaluationService { - - @Override - public IPage getPktjbList(Page page, KcEvaluation kcEvaluation) { - return baseMapper.getPktjbList(page,kcEvaluation); - } - - @Override - public IPage getPkmxbList(Page page, KcEvaluation kcEvaluation) { - return baseMapper.getPkmxbList(page,kcEvaluation); - } - - @Override - public List getPkztjTjt(KcEvaluation kcEvaluation) { - return baseMapper.getPkztjTjt(kcEvaluation); - } - - @Override - public List getPkfglTjt(KcEvaluation kcEvaluation) { - return baseMapper.getPkfglTjt(kcEvaluation); - } -} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/controller/KcEvaluationController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java similarity index 61% rename from jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/controller/KcEvaluationController.java rename to jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java index 93ee9f54..8948bb61 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/controller/KcEvaluationController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.kc.pktj.controller; +package org.jeecg.modules.kc.qa.controller; import java.util.Arrays; import java.util.List; @@ -6,8 +6,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.modules.kc.pktj.entity.KcEvaluation; -import org.jeecg.modules.kc.pktj.service.IKcEvaluationService; +import org.jeecg.modules.kc.qa.entity.KcEvaluation; +import org.jeecg.modules.kc.qa.entity.KcEvaluations; +import org.jeecg.modules.kc.qa.service.IKcEvaluationService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,6 +16,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.modules.kc.qa.service.IKcEvaluationsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -24,19 +26,22 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; /** - * @Description: kc_evaluation + * @Description: 调查问卷-回答主表 * @Author: jeecg-boot - * @Date: 2023-04-02 + * @Date: 2023-04-09 * @Version: V1.0 */ -@Api(tags="kc_evaluation") +@Api(tags="调查问卷-回答主表") @RestController -@RequestMapping("/kcEvaluation/kcEvaluation") +@RequestMapping("/qa/kcEvaluation") @Slf4j public class KcEvaluationController extends JeecgController { @Autowired private IKcEvaluationService kcEvaluationService; - + + @Autowired + private IKcEvaluationsService kcEvaluationsService; + /** * 分页列表查询 * @@ -46,8 +51,8 @@ public class KcEvaluationController extends JeecgController> queryPageList(KcEvaluation kcEvaluation, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -58,89 +63,123 @@ public class KcEvaluationController extends JeecgController pageList = kcEvaluationService.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * * @param kcEvaluation * @return */ - @AutoLog(value = "kc_evaluation-添加") - @ApiOperation(value="kc_evaluation-添加", notes="kc_evaluation-添加") + @AutoLog(value = "调查问卷-回答主表-添加") + @ApiOperation(value="调查问卷-回答主表-添加", notes="调查问卷-回答主表-添加") + @RequiresPermissions("qa:kc_evaluation:add") @PostMapping(value = "/add") public Result add(@RequestBody KcEvaluation kcEvaluation) { kcEvaluationService.save(kcEvaluation); return Result.OK("添加成功！"); } - + /** * 编辑 * * @param kcEvaluation * @return */ - @AutoLog(value = "kc_evaluation-编辑") - @ApiOperation(value="kc_evaluation-编辑", notes="kc_evaluation-编辑") + @AutoLog(value = "调查问卷-回答主表-编辑") + @ApiOperation(value="调查问卷-回答主表-编辑", notes="调查问卷-回答主表-编辑") + @RequiresPermissions("qa:kc_evaluation:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody KcEvaluation kcEvaluation) { kcEvaluationService.updateById(kcEvaluation); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * * @param id * @return */ - @AutoLog(value = "kc_evaluation-通过id删除") - @ApiOperation(value="kc_evaluation-通过id删除", notes="kc_evaluation-通过id删除") + @AutoLog(value = "调查问卷-回答主表-通过id删除") + @ApiOperation(value="调查问卷-回答主表-通过id删除", notes="调查问卷-回答主表-通过id删除") + @RequiresPermissions("qa:kc_evaluation:delete") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { kcEvaluationService.removeById(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * * @param ids * @return */ - @AutoLog(value = "kc_evaluation-批量删除") - @ApiOperation(value="kc_evaluation-批量删除", notes="kc_evaluation-批量删除") + @AutoLog(value = "调查问卷-回答主表-批量删除") + @ApiOperation(value="调查问卷-回答主表-批量删除", notes="调查问卷-回答主表-批量删除") + @RequiresPermissions("qa:kc_evaluation:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.kcEvaluationService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } - + /** * 通过id查询 * * @param id * @return */ - //@AutoLog(value = "kc_evaluation-通过id查询") - @ApiOperation(value="kc_evaluation-通过id查询", notes="kc_evaluation-通过id查询") + //@AutoLog(value = "调查问卷-回答主表-通过id查询") + @ApiOperation(value="调查问卷-回答主表-通过id查询", notes="调查问卷-回答主表-通过id查询") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { KcEvaluation kcEvaluation = kcEvaluationService.getById(id); if(kcEvaluation==null) { return Result.error("未找到对应数据"); } + //查询子表 + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("",id); + kcEvaluationsService.list(qw); return Result.OK(kcEvaluation); } + /** + * 通过id查询 + * + * @return + */ + //@AutoLog(value = "调查问卷-回答主表-通过id查询") + @ApiOperation(value="调查问卷-回答主表-通过id查询", notes="调查问卷-回答主表-通过id查询") + @GetMapping(value = "/queryByParam") + public Result queryById(KcEvaluation kcEvaluation) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("upuserid",kcEvaluation.getUserid()); + qw.eq("minkcid",kcEvaluation.getMinkcid()); + qw.eq("evaluationver",kcEvaluation.getEvaluationver()); + qw.last("limit 1"); + KcEvaluation data = kcEvaluationService.getOne(qw); + if(data==null) { + return Result.error("未找到对应数据"); + } + //查询子表 + QueryWrapper qaw = new QueryWrapper<>(); + qaw.eq("evaluationid",data.getId()); + data.setAnsList(kcEvaluationsService.list(qaw)); + return Result.OK(data); + } + /** * 导出excel * * @param request * @param kcEvaluation */ + @RequiresPermissions("qa:kc_evaluation:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, KcEvaluation kcEvaluation) { - return super.exportXls(request, kcEvaluation, KcEvaluation.class, "kc_evaluation"); + return super.exportXls(request, kcEvaluation, KcEvaluation.class, "调查问卷-回答主表"); } /** @@ -150,7 +189,7 @@ public class KcEvaluationController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, KcEvaluation.class); @@ -159,9 +198,9 @@ public class KcEvaluationController extends JeecgController> getPktjbList(KcEvaluation kcEvaluation, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { Page page = new Page(pageNo, pageSize); IPage pageList = kcEvaluationService.getPktjbList(page, kcEvaluation); return Result.OK(pageList); @@ -193,4 +232,20 @@ public class KcEvaluationController extends JeecgController addQaAll(@RequestBody KcEvaluation kcEvaluation) { + kcEvaluationService.addQaAll(kcEvaluation); + return Result.OK("添加成功！"); + } + + + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationansController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationansController.java new file mode 100644 index 00000000..9506f21c --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationansController.java @@ -0,0 +1,193 @@ +package org.jeecg.modules.kc.qa.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.kc.qa.entity.KcEvaluationans; +import org.jeecg.modules.kc.qa.service.IKcEvaluationansService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 调查问卷-答案表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +@Api(tags="调查问卷-答案表") +@RestController +@RequestMapping("/qa/kcEvaluationans") +@Slf4j +public class KcEvaluationansController extends JeecgController { + @Autowired + private IKcEvaluationansService kcEvaluationansService; + + /** + * 分页列表查询 + * + * @param kcEvaluationans + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "调查问卷-答案表-分页列表查询") + @ApiOperation(value="调查问卷-答案表-分页列表查询", notes="调查问卷-答案表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(KcEvaluationans kcEvaluationans, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcEvaluationans, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcEvaluationansService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param kcEvaluationans + * @return + */ + @AutoLog(value = "调查问卷-答案表-添加") + @ApiOperation(value="调查问卷-答案表-添加", notes="调查问卷-答案表-添加") + @RequiresPermissions("qa:kc_evaluationans:add") + @PostMapping(value = "/add") + public Result add(@RequestBody KcEvaluationans kcEvaluationans) { + kcEvaluationansService.save(kcEvaluationans); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param kcEvaluationans + * @return + */ + @AutoLog(value = "调查问卷-答案表-编辑") + @ApiOperation(value="调查问卷-答案表-编辑", notes="调查问卷-答案表-编辑") + @RequiresPermissions("qa:kc_evaluationans:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody KcEvaluationans kcEvaluationans) { + kcEvaluationansService.updateById(kcEvaluationans); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "调查问卷-答案表-通过id删除") + @ApiOperation(value="调查问卷-答案表-通过id删除", notes="调查问卷-答案表-通过id删除") + @RequiresPermissions("qa:kc_evaluationans:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + kcEvaluationansService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "调查问卷-答案表-批量删除") + @ApiOperation(value="调查问卷-答案表-批量删除", notes="调查问卷-答案表-批量删除") + @RequiresPermissions("qa:kc_evaluationans:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.kcEvaluationansService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "调查问卷-答案表-通过id查询") + @ApiOperation(value="调查问卷-答案表-通过id查询", notes="调查问卷-答案表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + KcEvaluationans kcEvaluationans = kcEvaluationansService.getById(id); + if(kcEvaluationans==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(kcEvaluationans); + } + + /** + * 导出excel + * + * @param request + * @param kcEvaluationans + */ + @RequiresPermissions("qa:kc_evaluationans:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, KcEvaluationans kcEvaluationans) { + return super.exportXls(request, kcEvaluationans, KcEvaluationans.class, "调查问卷-答案表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("qa:kc_evaluationans:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, KcEvaluationans.class); + } + + /** + * 添加 + * + * @param kcEvaluationans + * @return + */ + @AutoLog(value = "调查问卷-答案表-添加") + @ApiOperation(value="调查问卷-答案表-添加", notes="调查问卷-答案表-添加") +// @RequiresPermissions("qa:kc_evaluationans:add") + @PostMapping(value = "/addQaAll") + public Result addQaAll(@RequestBody KcEvaluationans kcEvaluationans) { + kcEvaluationansService.save(kcEvaluationans); + return Result.OK("添加成功！"); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationqueController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationqueController.java new file mode 100644 index 00000000..302f4b6a --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationqueController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.kc.qa.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.kc.qa.entity.KcEvaluationque; +import org.jeecg.modules.kc.qa.service.IKcEvaluationqueService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 调查问卷-题目表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +@Api(tags="调查问卷-题目表") +@RestController +@RequestMapping("/qa/kcEvaluationque") +@Slf4j +public class KcEvaluationqueController extends JeecgController { + @Autowired + private IKcEvaluationqueService kcEvaluationqueService; + + /** + * 分页列表查询 + * + * @param kcEvaluationque + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "调查问卷-题目表-分页列表查询") + @ApiOperation(value="调查问卷-题目表-分页列表查询", notes="调查问卷-题目表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(KcEvaluationque kcEvaluationque, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcEvaluationque, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcEvaluationqueService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param kcEvaluationque + * @return + */ + @AutoLog(value = "调查问卷-题目表-添加") + @ApiOperation(value="调查问卷-题目表-添加", notes="调查问卷-题目表-添加") + @RequiresPermissions("qa:kc_evaluationque:add") + @PostMapping(value = "/add") + public Result add(@RequestBody KcEvaluationque kcEvaluationque) { + kcEvaluationqueService.save(kcEvaluationque); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param kcEvaluationque + * @return + */ + @AutoLog(value = "调查问卷-题目表-编辑") + @ApiOperation(value="调查问卷-题目表-编辑", notes="调查问卷-题目表-编辑") + @RequiresPermissions("qa:kc_evaluationque:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody KcEvaluationque kcEvaluationque) { + kcEvaluationqueService.updateById(kcEvaluationque); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "调查问卷-题目表-通过id删除") + @ApiOperation(value="调查问卷-题目表-通过id删除", notes="调查问卷-题目表-通过id删除") + @RequiresPermissions("qa:kc_evaluationque:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + kcEvaluationqueService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "调查问卷-题目表-批量删除") + @ApiOperation(value="调查问卷-题目表-批量删除", notes="调查问卷-题目表-批量删除") + @RequiresPermissions("qa:kc_evaluationque:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.kcEvaluationqueService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "调查问卷-题目表-通过id查询") + @ApiOperation(value="调查问卷-题目表-通过id查询", notes="调查问卷-题目表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + KcEvaluationque kcEvaluationque = kcEvaluationqueService.getById(id); + if(kcEvaluationque==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(kcEvaluationque); + } + + /** + * 导出excel + * + * @param request + * @param kcEvaluationque + */ + @RequiresPermissions("qa:kc_evaluationque:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, KcEvaluationque kcEvaluationque) { + return super.exportXls(request, kcEvaluationque, KcEvaluationque.class, "调查问卷-题目表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("qa:kc_evaluationque:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, KcEvaluationque.class); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationsController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationsController.java new file mode 100644 index 00000000..d9dc3412 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationsController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.kc.qa.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.kc.qa.entity.KcEvaluations; +import org.jeecg.modules.kc.qa.service.IKcEvaluationsService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 调查问卷-回答子表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +@Api(tags="调查问卷-回答子表") +@RestController +@RequestMapping("/qa/kcEvaluations") +@Slf4j +public class KcEvaluationsController extends JeecgController { + @Autowired + private IKcEvaluationsService kcEvaluationsService; + + /** + * 分页列表查询 + * + * @param kcEvaluations + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "调查问卷-回答子表-分页列表查询") + @ApiOperation(value="调查问卷-回答子表-分页列表查询", notes="调查问卷-回答子表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(KcEvaluations kcEvaluations, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcEvaluations, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcEvaluationsService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param kcEvaluations + * @return + */ + @AutoLog(value = "调查问卷-回答子表-添加") + @ApiOperation(value="调查问卷-回答子表-添加", notes="调查问卷-回答子表-添加") + @RequiresPermissions("qa:kc_evaluations:add") + @PostMapping(value = "/add") + public Result add(@RequestBody KcEvaluations kcEvaluations) { + kcEvaluationsService.save(kcEvaluations); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param kcEvaluations + * @return + */ + @AutoLog(value = "调查问卷-回答子表-编辑") + @ApiOperation(value="调查问卷-回答子表-编辑", notes="调查问卷-回答子表-编辑") + @RequiresPermissions("qa:kc_evaluations:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody KcEvaluations kcEvaluations) { + kcEvaluationsService.updateById(kcEvaluations); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "调查问卷-回答子表-通过id删除") + @ApiOperation(value="调查问卷-回答子表-通过id删除", notes="调查问卷-回答子表-通过id删除") + @RequiresPermissions("qa:kc_evaluations:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + kcEvaluationsService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "调查问卷-回答子表-批量删除") + @ApiOperation(value="调查问卷-回答子表-批量删除", notes="调查问卷-回答子表-批量删除") + @RequiresPermissions("qa:kc_evaluations:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.kcEvaluationsService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "调查问卷-回答子表-通过id查询") + @ApiOperation(value="调查问卷-回答子表-通过id查询", notes="调查问卷-回答子表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + KcEvaluations kcEvaluations = kcEvaluationsService.getById(id); + if(kcEvaluations==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(kcEvaluations); + } + + /** + * 导出excel + * + * @param request + * @param kcEvaluations + */ + @RequiresPermissions("qa:kc_evaluations:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, KcEvaluations kcEvaluations) { + return super.exportXls(request, kcEvaluations, KcEvaluations.class, "调查问卷-回答子表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("qa:kc_evaluations:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, KcEvaluations.class); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/entity/KcEvaluation.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java similarity index 91% rename from jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/entity/KcEvaluation.java rename to jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java index 8380be66..bb2df7cc 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/entity/KcEvaluation.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java @@ -1,31 +1,33 @@ -package org.jeecg.modules.kc.pktj.entity; +package org.jeecg.modules.kc.qa.entity; import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import java.util.List; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * @Description: kc_evaluation + * @Description: 调查问卷-回答主表 * @Author: jeecg-boot - * @Date: 2023-04-02 + * @Date: 2023-04-09 * @Version: V1.0 */ @Data @TableName("kc_evaluation") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="kc_evaluation对象", description="kc_evaluation") +@ApiModel(value="kc_evaluation对象", description="调查问卷-回答主表") public class KcEvaluation implements Serializable { private static final long serialVersionUID = 1L; @@ -171,4 +173,7 @@ public class KcEvaluation implements Serializable { @TableField(exist = false) private java.lang.String xsid; + @TableField(exist = false) + private List ansList; + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationans.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationans.java new file mode 100644 index 00000000..14535416 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationans.java @@ -0,0 +1,61 @@ +package org.jeecg.modules.kc.qa.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 调查问卷-答案表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +@Data +@TableName("kc_evaluationans") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="kc_evaluationans对象", description="调查问卷-答案表") +public class KcEvaluationans implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Integer id; + /**问题ID*/ + @Excel(name = "问题ID", width = 15) + @ApiModelProperty(value = "问题ID") + private java.lang.Integer queid; + /**内容*/ + @Excel(name = "内容", width = 15) + @ApiModelProperty(value = "内容") + private java.lang.String content; + /**分数*/ + @Excel(name = "分数", width = 15) + @ApiModelProperty(value = "分数") + private java.lang.Integer score; + /**排序*/ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private java.lang.Integer ordernum; + /**状态 0：可用 1：停用*/ + @Excel(name = "状态 0：可用 1：停用", width = 15) + @ApiModelProperty(value = "状态 0：可用 1：停用") + private java.lang.Integer status; + /**是否参与评分 0：参与 1：不参与*/ + @Excel(name = "是否参与评分 0：参与 1：不参与", width = 15) + @ApiModelProperty(value = "是否参与评分 0：参与 1：不参与") + private java.lang.Integer inavg; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationque.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationque.java new file mode 100644 index 00000000..0a0fecdd --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationque.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.kc.qa.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 调查问卷-题目表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +@Data +@TableName("kc_evaluationque") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="kc_evaluationque对象", description="调查问卷-题目表") +public class KcEvaluationque implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Integer id; + /**内容*/ + @Excel(name = "内容", width = 15) + @ApiModelProperty(value = "内容") + private java.lang.String content; + /**状态 0：可用 1：不可用*/ + @Excel(name = "状态 0：可用 1：不可用", width = 15) + @ApiModelProperty(value = "状态 0：可用 1：不可用") + private java.lang.Integer status; + /**分类 0:总评 1：教学准备 2：教师情况 3：学生情况 4：教学效果 5：其他*/ + @Excel(name = "分类 0:总评 1：教学准备 2：教师情况 3：学生情况 4：教学效果 5：其他", width = 15) + @ApiModelProperty(value = "分类 0:总评 1：教学准备 2：教师情况 3：学生情况 4：教学效果 5：其他") + private java.lang.Integer genre; + /**排序*/ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private java.lang.Integer ordernum; + /**问题形式 1：单选 2：多选 3：多行文本*/ + @Excel(name = "问题形式 1：单选 2：多选 3：多行文本", width = 15) + @ApiModelProperty(value = "问题形式 1：单选 2：多选 3：多行文本") + private java.lang.Integer quetype; + /**是否必填 0：是 1：否*/ + @Excel(name = "是否必填 0：是 1：否", width = 15) + @ApiModelProperty(value = "是否必填 0：是 1：否") + private java.lang.Integer isrequire; + /**问题版本*/ + @Excel(name = "问题版本", width = 15) + @ApiModelProperty(value = "问题版本") + private java.lang.Integer evaluationver; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluations.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluations.java new file mode 100644 index 00000000..a10d61b1 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluations.java @@ -0,0 +1,83 @@ +package org.jeecg.modules.kc.qa.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 调查问卷-回答子表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +@Data +@TableName("kc_evaluations") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="kc_evaluations对象", description="调查问卷-回答子表") +public class KcEvaluations implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Integer id; + /**上传日期*/ + @Excel(name = "上传日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "上传日期") + private java.util.Date upDate; + /**上传时间*/ + @Excel(name = "上传时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "上传时间") + private java.util.Date upTime; + /**上传人*/ + @Excel(name = "上传人", width = 15) + @ApiModelProperty(value = "上传人") + private java.lang.String upuser; + /**上传人id*/ + @Excel(name = "上传人id", width = 15) + @ApiModelProperty(value = "上传人id") + private java.lang.Integer upuserid; + /**上传时间戳*/ + @Excel(name = "上传时间戳", width = 15) + @ApiModelProperty(value = "上传时间戳") + private java.lang.String upTimestamp; + /**课堂表id*/ + @Excel(name = "课堂表id", width = 15) + @ApiModelProperty(value = "课堂表id") + private java.lang.Integer ketangbiaoid; + /**问题id*/ + @Excel(name = "问题id", width = 15) + @ApiModelProperty(value = "问题id") + private java.lang.Integer queid; + /**答案id*/ + @Excel(name = "答案id", width = 15) + @ApiModelProperty(value = "答案id") + private java.lang.Integer ansid; + /**多行文本型答案内容*/ + @Excel(name = "多行文本型答案内容", width = 15) + @ApiModelProperty(value = "多行文本型答案内容") + private java.lang.String textanscontent; + /**问卷版本*/ + @Excel(name = "问卷版本", width = 15) + @ApiModelProperty(value = "问卷版本") + private java.lang.Integer evaluationid; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/mapper/KcEvaluationMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java similarity index 75% rename from jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/mapper/KcEvaluationMapper.java rename to jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java index 8468fb9c..44fab9f4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/mapper/KcEvaluationMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java @@ -1,16 +1,17 @@ -package org.jeecg.modules.kc.pktj.mapper; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.jeecg.modules.kc.pktj.entity.KcEvaluation; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +package org.jeecg.modules.kc.qa.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.kc.qa.entity.KcEvaluation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + /** - * @Description: kc_evaluation + * @Description: 调查问卷-回答主表 * @Author: jeecg-boot - * @Date: 2023-04-02 + * @Date: 2023-04-09 * @Version: V1.0 */ public interface KcEvaluationMapper extends BaseMapper { @@ -22,4 +23,5 @@ public interface KcEvaluationMapper extends BaseMapper { List getPkztjTjt(KcEvaluation kcEvaluation); List getPkfglTjt(KcEvaluation kcEvaluation); + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationansMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationansMapper.java new file mode 100644 index 00000000..405e316a --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationansMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.kc.qa.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.kc.qa.entity.KcEvaluationans; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 调查问卷-答案表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +public interface KcEvaluationansMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationqueMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationqueMapper.java new file mode 100644 index 00000000..b324603a --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationqueMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.kc.qa.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.kc.qa.entity.KcEvaluationque; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 调查问卷-题目表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +public interface KcEvaluationqueMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationsMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationsMapper.java new file mode 100644 index 00000000..f59a2972 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationsMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.kc.qa.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.kc.qa.entity.KcEvaluations; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 调查问卷-回答子表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +public interface KcEvaluationsMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/mapper/xml/KcEvaluationMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml similarity index 95% rename from jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/mapper/xml/KcEvaluationMapper.xml rename to jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml index a4c2de53..b797330e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/mapper/xml/KcEvaluationMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml @@ -1,8 +1,7 @@ - - - SELECT tk.upuserid AS userid, tk.upuser AS username, tksf1, tkyq, sjtksl, mltksl, tkdw FROM ( @@ -40,7 +39,7 @@ ORDER BY sjtksl DESC - SELECT k.id, c.user as userid, c.cn as username, c.college, a.assess1 as tksf , k.kkdw, k.kcmc, k.kcxz, k.skjs, k.week as zc, k.hh as jc,p.evaluationver , p.up_date, p.up_time, p.id AS evaId @@ -75,7 +74,7 @@ - SELECT t2.skrq, t2.kssl, @@ -146,7 +145,7 @@ ORDER BY t2.skrq - SELECT xsmc AS dwjc,ljtkv, avgtkv, jrtkv, jravgtkv, xsid FROM ( diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationansMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationansMapper.xml new file mode 100644 index 00000000..3332494d --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationansMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationqueMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationqueMapper.xml new file mode 100644 index 00000000..e6337530 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationqueMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationsMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationsMapper.xml new file mode 100644 index 00000000..af6346bd --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationsMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/service/IKcEvaluationService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java similarity index 75% rename from jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/service/IKcEvaluationService.java rename to jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java index 899dfa27..81eb40ed 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/pktj/service/IKcEvaluationService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java @@ -1,16 +1,16 @@ -package org.jeecg.modules.kc.pktj.service; +package org.jeecg.modules.kc.qa.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.jeecg.modules.kc.pktj.entity.KcEvaluation; +import org.jeecg.modules.kc.qa.entity.KcEvaluation; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * @Description: kc_evaluation + * @Description: 调查问卷-回答主表 * @Author: jeecg-boot - * @Date: 2023-04-02 + * @Date: 2023-04-09 * @Version: V1.0 */ public interface IKcEvaluationService extends IService { @@ -22,4 +22,6 @@ public interface IKcEvaluationService extends IService { List getPkztjTjt(KcEvaluation kcEvaluation); List getPkfglTjt(KcEvaluation kcEvaluation); + + void addQaAll(KcEvaluation kcEvaluation); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationansService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationansService.java new file mode 100644 index 00000000..d3f76d42 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationansService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.qa.service; + +import org.jeecg.modules.kc.qa.entity.KcEvaluationans; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 调查问卷-答案表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +public interface IKcEvaluationansService extends IService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationqueService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationqueService.java new file mode 100644 index 00000000..0e61d265 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationqueService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.qa.service; + +import org.jeecg.modules.kc.qa.entity.KcEvaluationque; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 调查问卷-题目表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +public interface IKcEvaluationqueService extends IService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationsService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationsService.java new file mode 100644 index 00000000..773b4937 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationsService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.qa.service; + +import org.jeecg.modules.kc.qa.entity.KcEvaluations; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 调查问卷-回答子表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +public interface IKcEvaluationsService extends IService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java new file mode 100644 index 00000000..c45a5c61 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java @@ -0,0 +1,74 @@ +package org.jeecg.modules.kc.qa.service.impl; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.common.util.DateUtils; +import org.jeecg.modules.kc.qa.entity.KcEvaluation; +import org.jeecg.modules.kc.qa.mapper.KcEvaluationMapper; +import org.jeecg.modules.kc.qa.service.IKcEvaluationService; +import org.jeecg.modules.kc.qa.service.IKcEvaluationsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +/** + * @Description: 调查问卷-回答主表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +@Service +public class KcEvaluationServiceImpl extends ServiceImpl implements IKcEvaluationService { + + @Autowired + private IKcEvaluationsService kcEvaluationsService; + + public IPage getPktjbList(Page page, KcEvaluation kcEvaluation) { + return baseMapper.getPktjbList(page,kcEvaluation); + } + + @Override + public IPage getPkmxbList(Page page, KcEvaluation kcEvaluation) { + return baseMapper.getPkmxbList(page,kcEvaluation); + } + + @Override + public List getPkztjTjt(KcEvaluation kcEvaluation) { + return baseMapper.getPkztjTjt(kcEvaluation); + } + + @Override + public List getPkfglTjt(KcEvaluation kcEvaluation) { + return baseMapper.getPkfglTjt(kcEvaluation); + } + + @Transactional(rollbackFor = JeecgBootException.class) + @Override + public void addQaAll(KcEvaluation kcEvaluation) { + DateTime now = DateUtil.date(); +// DateUtil.format(now,"yyyyMMddHHmmssSSS"); + kcEvaluation.setUpDate(now); + kcEvaluation.setUpTime(now); + kcEvaluation.setUpTimestamp(now.toString("yyyy-MM-dd HH:mm:ss")); +// DateUtil.format(now,"yyyy-MM-dd"); + save(kcEvaluation); + if(kcEvaluation.getAnsList() != null && !kcEvaluation.getAnsList().isEmpty()){ + kcEvaluation.getAnsList().forEach(x -> { + x.setEvaluationid(kcEvaluation.getId()); + x.setUpDate(kcEvaluation.getUpDate()); + x.setUpTime(kcEvaluation.getUpTime()); + x.setUpTimestamp(kcEvaluation.getUpTimestamp()); + }); + kcEvaluationsService.saveBatch(kcEvaluation.getAnsList()); + } + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationansServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationansServiceImpl.java new file mode 100644 index 00000000..0b548d9e --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationansServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.kc.qa.service.impl; + +import org.jeecg.modules.kc.qa.entity.KcEvaluationans; +import org.jeecg.modules.kc.qa.mapper.KcEvaluationansMapper; +import org.jeecg.modules.kc.qa.service.IKcEvaluationansService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 调查问卷-答案表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +@Service +public class KcEvaluationansServiceImpl extends ServiceImpl implements IKcEvaluationansService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationqueServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationqueServiceImpl.java new file mode 100644 index 00000000..aeb63d9c --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationqueServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.kc.qa.service.impl; + +import org.jeecg.modules.kc.qa.entity.KcEvaluationque; +import org.jeecg.modules.kc.qa.mapper.KcEvaluationqueMapper; +import org.jeecg.modules.kc.qa.service.IKcEvaluationqueService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 调查问卷-题目表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +@Service +public class KcEvaluationqueServiceImpl extends ServiceImpl implements IKcEvaluationqueService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationsServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationsServiceImpl.java new file mode 100644 index 00000000..8c87a660 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationsServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.kc.qa.service.impl; + +import org.jeecg.modules.kc.qa.entity.KcEvaluations; +import org.jeecg.modules.kc.qa.mapper.KcEvaluationsMapper; +import org.jeecg.modules.kc.qa.service.IKcEvaluationsService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 调查问卷-回答子表 + * @Author: jeecg-boot + * @Date: 2023-04-09 + * @Version: V1.0 + */ +@Service +public class KcEvaluationsServiceImpl extends ServiceImpl implements IKcEvaluationsService { + +}