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

Makefile

@@ -2,7 +2,7 @@ merge:
 	git checkout master;git merge dev;git push;git checkout dev;
 
 create-tag:
-	git checkout master;git tag v1.3.1;git push origin --tags;git checkout dev;
+	git checkout master;git tag v1.4.0;git push origin --tags;git checkout dev;
 
 remove-tag:
 	git tag -d v1.2.0;git push origin :refs/tags/v1.1.8;

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateResultController.java

@@ -1,6 +1,8 @@
 package com.xjrsoft.module.evaluate.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
@@ -10,18 +12,20 @@ import com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateResultIndexPageDto;
 import com.xjrsoft.module.evaluate.dto.ResultViewingPageDto;
 import com.xjrsoft.module.evaluate.service.IEvaluateResultService;
-import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageDetailVo;
-import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageVo;
-import com.xjrsoft.module.evaluate.vo.EvaluateResultIndexPageVo;
-import com.xjrsoft.module.evaluate.vo.ResultViewingPageVo;
+import com.xjrsoft.module.evaluate.vo.*;
+import com.xjrsoft.module.textbook.vo.TextbookIssueRecordExcelVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
 * @title: 评价结果
@@ -72,4 +76,23 @@ public class EvaluateResultController {
         PageOutput<ResultViewingPageVo> pageOutput = ConventPage.getPageOutput(page, ResultViewingPageVo.class);
         return RT.ok(pageOutput);
     }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData() {
+        List<ResultViewingExportVo> customerList = evaluateResultService.getList();
+        List<TextbookIssueRecordExcelVo> dataList = new ArrayList<>();
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
+//        for (TextbookIssueRecordPageVo textbookIssueRecordPageVo : customerList) {
+//            if(textbookIssueRecordPageVo.getCreateDate() == null){
+//                continue;
+//            }
+//            textbookIssueRecordPageVo.setCreateDateStr(sdf.format(textbookIssueRecordPageVo.getCreateDate()));
+//            dataList.add(BeanUtil.toBean(textbookIssueRecordPageVo, TextbookIssueRecordExcelVo.class));
+//        }
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, TextbookIssueRecordExcelVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(dataList);
+
+        return RT.fileStream(bot.toByteArray(), "TextbookIssueRecord" + ExcelTypeEnum.XLSX.getValue());
+    }
 }

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateTemplateController.java

@@ -20,14 +20,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
@@ -74,6 +67,9 @@ public class EvaluateTemplateController {
     @ApiOperation(value = "新增评价模版")
     @SaCheckPermission("evaluatetemplate:add")
     public RT<Boolean> add(@Valid @RequestBody AddEvaluateTemplateDto dto){
+        //处理入参中的deptIds
+        String deptIds = "[" + dto.getDeptIds() + "]";
+        dto.setDeptIds(deptIds);
         EvaluateTemplate evaluateTemplate = BeanUtil.toBean(dto, EvaluateTemplate.class);
         boolean isSuccess = evaluateTemplateService.save(evaluateTemplate);
         return RT.ok(isSuccess);
@@ -83,7 +79,8 @@ public class EvaluateTemplateController {
     @ApiOperation(value = "修改评价模版")
     @SaCheckPermission("evaluatetemplate:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateEvaluateTemplateDto dto){
-
+        String deptIds = "[" + dto.getDeptIds() + "]";
+        dto.setDeptIds(deptIds);
         EvaluateTemplate evaluateTemplate = BeanUtil.toBean(dto, EvaluateTemplate.class);
         return RT.ok(evaluateTemplateService.updateById(evaluateTemplate));
 

src/main/java/com/xjrsoft/module/evaluate/service/IEvaluateResultService.java

@@ -2,16 +2,11 @@ package com.xjrsoft.module.evaluate.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDetailDto;
-import com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDto;
-import com.xjrsoft.module.evaluate.dto.EvaluateResultIndexPageDto;
-import com.xjrsoft.module.evaluate.dto.EvaluateResultSaveDto;
-import com.xjrsoft.module.evaluate.dto.ResultViewingPageDto;
+import com.xjrsoft.module.evaluate.dto.*;
 import com.xjrsoft.module.evaluate.entity.EvaluateResult;
-import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageDetailVo;
-import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageVo;
-import com.xjrsoft.module.evaluate.vo.EvaluateResultIndexPageVo;
-import com.xjrsoft.module.evaluate.vo.ResultViewingPageVo;
+import com.xjrsoft.module.evaluate.vo.*;
+
+import java.util.List;
 
 /**
 * @title: 评价结果
@@ -30,4 +25,6 @@ public interface IEvaluateResultService extends MPJBaseService<EvaluateResult> {
     IPage<ResultViewingPageVo> pageResultViewing(ResultViewingPageDto dto);
 
     String saveBatch(EvaluateResultSaveDto dto);
+
+    List<ResultViewingExportVo> getList();
 }

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateItemServiceImpl.java

@@ -60,13 +60,13 @@ public class EvaluateItemServiceImpl extends MPJBaseServiceImpl<EvaluateItemMapp
             return makeEvaluateItemVo;
         }
 
-        Map<String, String> deptIdList = new HashMap<>();
+        List<String> deptIdList = new ArrayList<>();
         try {
             ObjectMapper objectMapper = new ObjectMapper();
-            deptIdList = objectMapper.readValue(makeEvaluateItemVo.getDeptIds(), new TypeReference<Map<String,String>>() {});
+            deptIdList = objectMapper.readValue(makeEvaluateItemVo.getDeptIds(), new TypeReference<List<String>>() {});
         }catch (Exception e){
         }
-        if(deptIdList != null && deptIdList.size() > 0){
+        if(deptIdList != null && deptIdList.size() > 0 && !deptIdList.get(0).equals("0")){
             LambdaQueryWrapper<Department> departmentLambdaQueryWrapper = new LambdaQueryWrapper<>();
             departmentLambdaQueryWrapper
                     .in(Department::getId, deptIdList);
@@ -83,6 +83,10 @@ public class EvaluateItemServiceImpl extends MPJBaseServiceImpl<EvaluateItemMapp
             makeEvaluateItemVo.setDeptIdsCN(deptStr.toString());
         }
 
+        if(deptIdList != null && deptIdList.size() > 0 && deptIdList.get(0).equals("0")){
+            makeEvaluateItemVo.setDeptIdsCN("通用");
+        }
+
         //获取模板下的所有评价子项集合
         MPJLambdaWrapper<EvaluateItem> evaluateItemWrapper = new MPJLambdaWrapper<>();
         evaluateItemWrapper

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateResultServiceImpl.java

@@ -21,10 +21,7 @@ import com.xjrsoft.module.evaluate.mapper.EvaluateManageItemMapper;
 import com.xjrsoft.module.evaluate.mapper.EvaluateObjectMapper;
 import com.xjrsoft.module.evaluate.mapper.EvaluateResultMapper;
 import com.xjrsoft.module.evaluate.service.IEvaluateResultService;
-import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageDetailVo;
-import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageVo;
-import com.xjrsoft.module.evaluate.vo.EvaluateResultIndexPageVo;
-import com.xjrsoft.module.evaluate.vo.ResultViewingPageVo;
+import com.xjrsoft.module.evaluate.vo.*;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -216,4 +213,9 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
 
         return "ok";
     }
+
+    @Override
+    public List<ResultViewingExportVo> getList() {
+        return null;
+    }
 }

src/main/java/com/xjrsoft/module/evaluate/vo/ResultViewingExportVo.java

@@ -0,0 +1,55 @@
+package com.xjrsoft.module.evaluate.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 评价项表单出参
+* @Author szs
+* @Date: 2024-01-15
+* @Version 1.0
+*/
+@Data
+public class ResultViewingExportVo {
+
+    /**
+    * 具体被评的那个对象的id
+    */
+    @ApiModelProperty("具体被评的那个对象的id")
+    private Long objectId;
+    /**
+     * 具体被评的那个对象的id
+     */
+    @ApiModelProperty("具体被评的那个对象的id")
+    private String objectIdCN;
+    /**
+     * 题目项的id
+     */
+    @ApiModelProperty("题目项的id")
+    private Long evaluateManageItemId;
+    /**
+     * 题目名称
+     */
+    @ApiModelProperty("题目名称")
+    private String problem;
+    /**
+     * 标题名称
+     */
+    @ApiModelProperty("标题名称")
+    private String topic;
+    /**
+     * 应打分人数
+     */
+    @ApiModelProperty("应打分人数")
+    private Integer planExecuterNum;
+    /**
+     * 实际打分人数
+     */
+    @ApiModelProperty("实际打分人数")
+    private Integer actualExecuterNum;
+    /**
+     * 单个被评对象的每一道题的总得分
+     */
+    @ApiModelProperty("单个被评对象的每一道题的总得分")
+    private Integer sumScore;
+}

src/main/java/com/xjrsoft/module/oa/dto/AddProclamationDto.java

@@ -71,9 +71,9 @@ public class AddProclamationDto {
     private Integer openReply;
 
     /**
-     * 发送范围 1=所有人 2=根据权限
+     * 发送范围 1=全校师生 2=全校教职工 3=指定人员
      */
-    @ApiModelProperty("发送范围 1=全校教职工 2=全校师生 3=指定人员")
+    @ApiModelProperty("发送范围 1=全校师生 2=全校教职工 3=指定人员")
     private Integer sendRange;
 
     /**

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -232,7 +232,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                 new MPJLambdaWrapper<NewsAppendix>().eq(NewsAppendix::getNewsId, id)
                         .select(NewsRelation::getId)
                         .select(NewsAppendix.class, x -> VoToColumnUtil.fieldsToColumns(NewsAppendixVo.class).contains(x.getProperty()))
-                        .leftJoin(File.class, File::getId, NewsAppendix::getFileId, ext -> ext.selectAs(File::getFileName, NewsAppendixVo::getFileName)
+                        .leftJoin(File.class, File::getFolderId, NewsAppendix::getFileId, ext -> ext.selectAs(File::getFileName, NewsAppendixVo::getFileName)
                                 .selectAs(File::getFolderId, NewsAppendixVo::getFolderId)
                                 .selectAs(File::getFileUrl, NewsAppendixVo::getFileUrl))
         );
@@ -846,7 +846,8 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                         JSONObject data = new JSONObject();
 
                         JSONObject data1 = new JSONObject();
-                        data1.put("value", news.getFullHead());
+                        String hValue = news.getFullHead().replace("“", "").replace("”", "").replace("\"", "").replace("\n", "").replace("\r", "").replace("\t", "");
+                        data1.put("value", hValue);
                         data.put("thing23", data1);
 
                         JSONObject data2 = new JSONObject();

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImpl.java

@@ -525,7 +525,8 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                 .leftJoin(XjrUser.class, XjrUser::getId, TextbookStudentClaim::getStudentUserId)
                 .leftJoin(BaseSemester.class, BaseSemester::getId, TextbookStudentClaim::getBaseSemesterId)
                 .leftJoin(BaseClass.class, BaseClass::getId, TextbookStudentClaim::getClassId)
-                .eq(TextbookStudentClaim::getTextbookId, id);
+                .eq(TextbookStudentClaim::getTextbookId, id)
+                .eq(TextbookStudentClaim::getIsClaim, 1);
         List<WfTextbookClaimListVo> wfTextbookClaimListVoList = textbookStudentClaimMapper.selectJoinList(WfTextbookClaimListVo.class, queryStuClaimVo);
 
         result.addAll(wfTextbookClaimListVoList);

src/test/java/com/xjrsoft/xjrsoftboot/StrTest.java

@@ -21,14 +21,14 @@ public class StrTest {
     public void formatTest() {
         String f = "《{}》等待{}审批。";
 
-        System.out.println(StrUtil.format(f, "sdfsdf","bbbbbb"));
+        System.out.println(StrUtil.format(f, "sdfsdf", "bbbbbb"));
     }
 
     @Test
     public void arrayTest() {
         String f = "《{}》等待{}审批。";
 
-        System.out.println(StrUtil.format(f, "sdfsdf","bbbbbb"));
+        System.out.println(StrUtil.format(f, "sdfsdf", "bbbbbb"));
     }
 
     @Test
@@ -168,8 +168,15 @@ public class StrTest {
     }
 
     @Test
-    void test22(){
+    void test22() {
         String name = "2023年秋季";
         System.out.println(name.contains("秋季"));
     }
+
+    @Test
+    public void StringTest() {
+        String str = "电子“1+x”集成电路检测技术应用（初级）考试";
+        str = str.replace("“", "").replace("”", "").replace("\"", "").replace("\n", "").replace("\r", "").replace("\t", "");
+        System.out.println(str);
+    }
 }