Merge remote-tracking branch 'origin/master' into master

张雷
sk-module-biz/src/main/java/com/skua/modules/edu/controller/UserPaperController.java
sk-module-datafill/src/main/java/com/skua/modules/report/service/IOperationReportService.java
sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/OperationReportServiceImpl.java
sk-module-system/src/main/java/com/skua/config/mybatis/MybatisInterceptor.java
--- a/sk-module-biz/src/main/java/com/skua/modules/edu/controller/UserPaperController.java
查看文件 @f04534b
+++ b/sk-module-biz/src/main/java/com/skua/modules/edu/controller/UserPaperController.java
查看文件 @f04534b
 package com.skua.modules.edu.controller;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.skua.common.constant.BusinessConstant;
 import com.skua.core.api.vo.Result;
 import com.skua.core.aspect.annotation.AutoLog;
 import com.skua.core.context.BaseContextHandler;
 import com.skua.core.util.DateUtils;
+import com.skua.modules.base.service.IBaseService;
+import com.skua.modules.biz.IBusinessService;
 import com.skua.modules.edu.entity.*;
 import com.skua.modules.edu.service.IPaperService;
 import com.skua.modules.edu.service.IUserPaperService;
@@ -30,6 +36,8 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.net.URLEncoder;
+import java.util.*;
+import java.util.stream.Collectors;
 @Slf4j
 @Api(tags="在线考试-用户考试")
@@ -41,16 +49,20 @@ public class UserPaperController {
    @Autowired
    private IUserPaperService userPaperService;
+    @Autowired
+    private IBaseService baseService;
+    @Autowired
+    private IBusinessService businessService;
    // 我的 考试
    @AutoLog(value = "在线考试--试卷列表")
    @ApiOperation(value="在线考试--试卷列表", notes="在线考试--试卷列表")
    @GetMapping(value = "/paperList")
-    public Result<IPage<Paper>> queryPageList(Paper paper,
+    public Result<Object> queryPageList(Paper paper,
                                              @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                              @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                              HttpServletRequest req) throws Exception{
-        Result<IPage<Paper>> result = new Result<IPage<Paper>>();
+//        Result<IPage<Paper>> result = new Result<IPage<Paper>>();
        //QueryWrapper<Paper> queryWrapper = new QueryWrapper<>() ;// QueryGenerator.initQueryWrapper(paperAnswer, req.getParameterMap());
        Page<Paper> page = new Page<Paper>(pageNo, pageSize);
      /*  queryWrapper.like("exam_user_ids", BaseContextHandler.getUserId());
@@ -58,14 +70,42 @@ public class UserPaperController {
        queryWrapper.le("start_time",currentDate);//  当前时间  > 开始结束时间
        queryWrapper.ge("end_time",currentDate);
        IPage<Paper> pageList = paperService.page(page, queryWrapper);*/
-        paper.setUserId(BaseContextHandler.getUserId());
+        String nowStr = DateUtils.now();
-        paper.setStartTime(DateUtils.now());
+        paper.setStartTime(nowStr);
-        paper.setEndTime( DateUtils.now() );
+        paper.setEndTime(nowStr);
-        paper.setExamStatus(0);//考试状态是未考试的
+        // paper.setExamStatus(0);//考试状态是未考试的
-        IPage<Paper> pageList = paperService.queryMyPaperByList(page ,paper);
+        // IPage<Paper> pageList = paperService.queryMyPaperByList(page ,paper);
-        result.setSuccess(true);
+        QueryWrapper<?> queryWrapper0 = new QueryWrapper<>();
-        result.setResult(pageList);
+        queryWrapper0.eq(StringUtils.isNotEmpty(paper.getUserId()), "edu_paper_task.user_id", paper.getUserId())
-        return result;
+                .like(StringUtils.isNotEmpty(paper.getPaperTitle()), "edu_paper.paper_title", paper.getPaperTitle())
+                .ge("edu_paper.end_time", nowStr)
+                .le("edu_paper.start_time", nowStr)
+                .in("edu_paper_task.depart_id", Arrays.asList(BaseContextHandler.getDeparts().split(",")))
+                .orderByDesc("edu_paper_task.create_time", "edu_paper_task.user_id");
+        List<String> columnList0 = new ArrayList<String>(){{
+            add("edu_paper_task.depart_id");
+            add("edu_paper_task.status as exam_status");
+            add("edu_paper_task.user_id");
+            add("edu_paper.*");
+        }};
+        IPage<Map<String, Object>> mapIPage0 = baseService.queryForPage(new Page<>(pageNo, pageSize), "select " + String.join(",", columnList0) + " from edu_paper_task left join edu_paper on edu_paper_task.paper_id = edu_paper.id", queryWrapper0);
+        // 翻译
+        Map<String, String> sysDepartDictMap = businessService.dictMap("sys_depart", null);
+        Map<String, String> sysUserDictMap = businessService.dictMap("sys_user", null);
+        // 封装结果集
+        IPage<Map<String, Object>> mapIPage = new Page<>(pageNo, pageSize);
+        mapIPage.setTotal(mapIPage0.getTotal());
+        mapIPage.setRecords(mapIPage0.getRecords().stream().map(item -> {
+            Paper tmpPaper =  BeanUtil.toBean(item, Paper.class);
+            Map<String, Object> tmpMap = BeanUtil.beanToMap(tmpPaper);
+            tmpMap.put("userId" + BusinessConstant.dictText, sysUserDictMap.get(tmpMap.get("userId")));
+            tmpMap.put("departId" + BusinessConstant.dictText, sysDepartDictMap.get(tmpMap.get("departId")));
+            if (tmpPaper.getSendTime() != null) {
+                tmpMap.put("sendTime", com.skua.tool.util.DateUtils.date2Str(tmpPaper.getSendTime(), BusinessConstant.dateFormat));
+            }
+            return tmpMap;
+        }).collect(Collectors.toList()));
+        return Result.ok(mapIPage);
    }
@@ -148,12 +188,11 @@ public class UserPaperController {
    @AutoLog(value = "在线考试--历史试卷列表")
    @ApiOperation(value="在线考试--历史试卷列表", notes="在线考试--历史试卷列表")
    @GetMapping(value = "/historyList")
-    public Result<IPage<Paper>> historyList(
+    public Result<Object> historyList(
            Paper paper,
            @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
            @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
            HttpServletRequest req) throws Exception {
-        Result<IPage<Paper>> result = new Result<IPage<Paper>>();
       /* StringBuffer sql = new StringBuffer();
        sql.append("select  up.score, p.* from edu_user_paper up ");
        sql.append("  left join edu_paper p on   p.id = up.paper_id        ");
@@ -164,16 +203,35 @@ public class UserPaperController {
        Page<Map<String, Object>> pageList = iCommonSqlService.queryForPage(page, sql.toString());
        List<Paper> paperList = JoinSqlUtils.multiMaps2Beans(pageList.getRecords(), Paper.class);
        */
+        String departIds = BaseContextHandler.getDeparts();
-        Page<Paper> page = new Page<Paper>(pageNo, pageSize);
+        QueryWrapper<?> queryWrapper0 = new QueryWrapper<>();
-        if(StringUtils.isEmpty(paper.getUserId())){
+        queryWrapper0.eq(StringUtils.isNotEmpty(paper.getUserId()),"edu_user_paper.user_id", paper.getUserId())
-            paper.setUserId(BaseContextHandler.getUserId());//获取当前用户编号
+                .like(StringUtils.isNotEmpty(paper.getPaperTitle()), "edu_paper.paper_title", paper.getPaperTitle())
-        }
+                .in("edu_user_paper.depart_id", Arrays.asList(departIds.split(",")))
-        IPage<Paper> paperList = paperService.queryMyPaperRecoredByList(page,paper);
+                .orderByDesc("edu_user_paper.start_time", "edu_user_paper.score");
+        List<String> columnList = new ArrayList<String>(){{
-        result.setResult(paperList);
+            add("edu_user_paper.id as eduUserPaperId");
-        result.setSuccess(true);
+            add("edu_user_paper.score");
-        return result;
+            add("edu_user_paper.user_id");
+            add("edu_user_paper.rank");
+            add("edu_user_paper.depart_id");
+            add("edu_user_paper.id as 'user_paper_id'");
+            add("edu_paper.*");
+        }};
+        IPage<Map<String, Object>> mapIPage = baseService.queryForPage(new Page<>(pageNo, pageSize), "select " + String.join(",", columnList) + " from edu_user_paper left join edu_paper on edu_user_paper.paper_id = edu_paper.id", queryWrapper0);
+        // 翻译
+        Map<String, String> sysDepartDictMap = businessService.dictMap("sys_depart", null);
+        Map<String, String> sysUserDictMap = businessService.dictMap("sys_user", null);
+        // 封装结果集
+        IPage<Map<String, Object>> paperIPage = new Page<>(pageNo, pageSize);
+        paperIPage.setTotal(mapIPage.getTotal());
+        paperIPage.setRecords(mapIPage.getRecords().stream().map(item -> {
+            Map<String, Object> tmpMap = item.keySet().stream().collect(Collectors.toMap(StrUtil::toCamelCase, key -> item.get(key) == null ? "" : item.get(key)));
+            tmpMap.put("userId" + BusinessConstant.dictText, sysUserDictMap.get(tmpMap.get("userId")));
+            tmpMap.put("departId" + BusinessConstant.dictText, sysDepartDictMap.get(tmpMap.get("departId")));
+            return tmpMap;
+        }).collect(Collectors.toList()));
+        return Result.ok(paperIPage);
    }
    //历史试卷详情 history_detail
    @AutoLog(value = "在线考试--历史试卷详情(复习)")
@@ -285,4 +343,17 @@ public class UserPaperController {
        spacing.setLineRule(STLineSpacingRule.EXACT);
    }
+    @AutoLog(value = "设备维修流程-通过id删除")
+    @ApiOperation(value = "设备维修流程-通过id删除", notes = "设备维修流程-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            boolean flag = userPaperService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败: {}", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
 }
--- a/sk-module-datafill/src/main/java/com/skua/modules/report/service/IOperationReportService.java
查看文件 @f04534b
+++ b/sk-module-datafill/src/main/java/com/skua/modules/report/service/IOperationReportService.java
查看文件 @f04534b
@@ -2,6 +2,8 @@ package com.skua.modules.report.service;
 import com.skua.modules.report.vo.ProductDataVO;
+import java.util.Map;
 /**
 * @auther kangwei
 * @create 2024-10-14-9:11
@@ -14,4 +16,6 @@ public interface IOperationReportService {
     * @return
     */
    ProductDataVO handeReportMonthData(String departIds,Integer year, Integer season,String startDate,String endDate);
+    Map<String, String> dataAnalysisOfMonth(Map<String, Object> paramMap);
 }
--- a/sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/OperationReportServiceImpl.java
查看文件 @f04534b
+++ b/sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/OperationReportServiceImpl.java
查看文件 @f04534b
@@ -27,10 +27,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 /***
@@ -222,6 +219,29 @@ public class OperationReportServiceImpl implements  IOperationReportService {
        return productDataVO;
    }
+    @Override
+    public Map<String, String> dataAnalysisOfMonth(Map<String, Object> paramMap) {
+        // 请求参数
+        String startTime = ConvertUtils.getString(paramMap.get("startTime"));
+        String endTime = ConvertUtils.getString(paramMap.get("endTime"));
+        List<String> timeList = DateUtils.intervalByDay(startTime, endTime, BusinessConstant.dateFormat.split("-")[0]);
+        String departId = ConvertUtils.getString(paramMap.get("departId"));
+        List<String> departIdList = Arrays.asList(departId.split(","));
+        List<String> codeList = new ArrayList<String>(){{
+            // 污水(万吨) 水质水量日数据报表-出水量
+            add("");
+        }};
+        QueryWrapper<?> queryWrapper0 = new QueryWrapper<>();
+        queryWrapper0.in("", codeList)
+                .ge("", startTime)
+                .le("", endTime)
+                .groupBy("f_report_itemv.depart_id");
+        List<Map<String, Object>> queryMapList0 = baseService.queryForList("", queryWrapper0);
+        // 封装结果集
+        Map<String, String> resMap = new LinkedHashMap<>();
+        return resMap;
+    }
    public  Double formatDouble(Object obj  ){
        Double  value  = ConvertUtils.getDouble(obj,0d);
        BigDecimal bd = BigDecimal.valueOf(value);
--- a/sk-module-system/src/main/java/com/skua/config/mybatis/MybatisInterceptor.java
查看文件 @f04534b
+++ b/sk-module-system/src/main/java/com/skua/config/mybatis/MybatisInterceptor.java
查看文件 @f04534b
@@ -87,6 +87,7 @@ public class MybatisInterceptor implements Interceptor {
        add("inspection_point_trigger_config");
        //在线考试
+        add("edu_paper");//用户的试卷
        add("edu_user_paper");//用户的试卷
        add("edu_question");//试题
        add("edu_question_db");//题库