公告选人

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

@@ -1,102 +1,102 @@
-package com.xjrsoft.module.evaluate.controller;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xjrsoft.common.page.ConventPage;
-import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
-import com.xjrsoft.module.evaluate.dto.AddEvaluateTemplateDto;
-import com.xjrsoft.module.evaluate.dto.UpdateEvaluateTemplateDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.support.ExcelTypeEnum;
-import org.springframework.http.ResponseEntity;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-
-import com.xjrsoft.module.evaluate.dto.EvaluateTemplatePageDto;
-import com.xjrsoft.module.evaluate.entity.EvaluateTemplate;
-import com.xjrsoft.module.evaluate.service.IEvaluateTemplateService;
-import com.xjrsoft.module.evaluate.vo.EvaluateTemplatePageVo;
-
-import com.xjrsoft.module.evaluate.vo.EvaluateTemplateVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
-* @title: 评价模版
-* @Author szs
-* @Date: 2024-01-15
-* @Version 1.0
-*/
-@RestController
-@RequestMapping("/evaluationmanagemen" + "/evaluateTemplate")
-@Api(value = "/evaluationmanagemen"  + "/evaluateTemplate",tags = "评价模版代码")
-@AllArgsConstructor
-public class EvaluateTemplateController {
-
-
-    private final IEvaluateTemplateService evaluateTemplateService;
-
-    @GetMapping(value = "/page")
-    @ApiOperation(value="评价模版列表(分页)")
-    @SaCheckPermission("evaluatetemplate:detail")
-    public RT<PageOutput<EvaluateTemplatePageVo>> page(@Valid EvaluateTemplatePageDto dto){
-        Page<EvaluateTemplatePageVo> page = evaluateTemplateService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
-        PageOutput<EvaluateTemplatePageVo> pageOutput = ConventPage.getPageOutput(page, EvaluateTemplatePageVo.class);
-        return RT.ok(pageOutput);
-    }
-
-    @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询评价模版信息")
-    @SaCheckPermission("evaluatetemplate:detail")
-    public RT<EvaluateTemplateVo> info(@RequestParam Long id){
-        EvaluateTemplate evaluateTemplate = evaluateTemplateService.getById(id);
-        if (evaluateTemplate == null) {
-           return RT.error("找不到此数据！");
-        }
-        return RT.ok(BeanUtil.toBean(evaluateTemplate, EvaluateTemplateVo.class));
-    }
-
-
-    @PostMapping
-    @ApiOperation(value = "新增评价模版")
-    @SaCheckPermission("evaluatetemplate:add")
-    public RT<Boolean> add(@Valid @RequestBody AddEvaluateTemplateDto dto){
-        boolean isSuccess = evaluateTemplateService.saveCustom(dto);
-        return RT.ok(isSuccess);
-    }
-
-    @PutMapping
-    @ApiOperation(value = "修改评价模版")
-    @SaCheckPermission("evaluatetemplate:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateEvaluateTemplateDto dto){
-
-        EvaluateTemplate evaluateTemplate = BeanUtil.toBean(dto, EvaluateTemplate.class);
-        return RT.ok(evaluateTemplateService.updateById(evaluateTemplate));
-
-    }
-
-    @DeleteMapping
-    @ApiOperation(value = "删除评价模版")
-    @SaCheckPermission("evaluatetemplate:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
-        return RT.ok(evaluateTemplateService.removeBatchByIds(ids));
-
-    }
-
-    @GetMapping("/export")
-    @ApiOperation(value = "导出")
-    public ResponseEntity<byte[]> exportData(@Valid EvaluateTemplatePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
-        List<EvaluateTemplatePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<EvaluateTemplatePageVo>) page(dto).getData()).getList();
-        ByteArrayOutputStream bot = new ByteArrayOutputStream();
-        EasyExcel.write(bot, EvaluateTemplatePageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
-
-        return RT.fileStream(bot.toByteArray(), "EvaluateTemplate" + ExcelTypeEnum.XLSX.getValue());
-    }
+package com.xjrsoft.module.evaluate.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.module.evaluate.dto.AddEvaluateTemplateDto;
+import com.xjrsoft.module.evaluate.dto.UpdateEvaluateTemplateDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import org.springframework.http.ResponseEntity;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+
+import com.xjrsoft.module.evaluate.dto.EvaluateTemplatePageDto;
+import com.xjrsoft.module.evaluate.entity.EvaluateTemplate;
+import com.xjrsoft.module.evaluate.service.IEvaluateTemplateService;
+import com.xjrsoft.module.evaluate.vo.EvaluateTemplatePageVo;
+
+import com.xjrsoft.module.evaluate.vo.EvaluateTemplateVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 评价模版
+* @Author szs
+* @Date: 2024-01-15
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/evaluationmanagemen" + "/evaluateTemplate")
+@Api(value = "/evaluationmanagemen"  + "/evaluateTemplate",tags = "评价模版代码")
+@AllArgsConstructor
+public class EvaluateTemplateController {
+
+
+    private final IEvaluateTemplateService evaluateTemplateService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="评价模版列表(分页)")
+    @SaCheckPermission("evaluatetemplate:detail")
+    public RT<PageOutput<EvaluateTemplatePageVo>> page(@Valid EvaluateTemplatePageDto dto){
+        Page<EvaluateTemplatePageVo> page = evaluateTemplateService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<EvaluateTemplatePageVo> pageOutput = ConventPage.getPageOutput(page, EvaluateTemplatePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询评价模版信息")
+    @SaCheckPermission("evaluatetemplate:detail")
+    public RT<EvaluateTemplateVo> info(@RequestParam Long id){
+        EvaluateTemplate evaluateTemplate = evaluateTemplateService.getById(id);
+        if (evaluateTemplate == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(evaluateTemplate, EvaluateTemplateVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增评价模版")
+    @SaCheckPermission("evaluatetemplate:add")
+    public RT<Boolean> add(@Valid @RequestBody AddEvaluateTemplateDto dto){
+        boolean isSuccess = evaluateTemplateService.saveCustom(dto);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改评价模版")
+    @SaCheckPermission("evaluatetemplate:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateEvaluateTemplateDto dto){
+
+        EvaluateTemplate evaluateTemplate = BeanUtil.toBean(dto, EvaluateTemplate.class);
+        return RT.ok(evaluateTemplateService.updateById(evaluateTemplate));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除评价模版")
+    @SaCheckPermission("evaluatetemplate:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(evaluateTemplateService.removeBatchByIds(ids));
+
+    }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid EvaluateTemplatePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<EvaluateTemplatePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<EvaluateTemplatePageVo>) page(dto).getData()).getList();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, EvaluateTemplatePageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+
+        return RT.fileStream(bot.toByteArray(), "EvaluateTemplate" + ExcelTypeEnum.XLSX.getValue());
+    }
 }

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

@@ -457,7 +457,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
 
             //对人员进行筛选,避免重复添加
             List<Long> userIdList = new ArrayList<>();
-            if (personalIdList != null) {
+            if (personalIdList.size() > 0) {
                 //获取人员的班级或者部门
                 List<DeptIdOrClassIdVo> deptIdOrClassIdVoList = newsMapper.getDeptIdOrClassId(personalIdList);
                 for (DeptIdOrClassIdVo deptIdOrClassIdVo : deptIdOrClassIdVoList) {
@@ -824,9 +824,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean delete(List<Long> ids) {
-
         newsMapper.deleteBatchIds(ids);
-
         return true;
     }
 

src/test/java/com/xjrsoft/module/oa/service/impl/NewsServiceImplTest.java

@@ -0,0 +1,28 @@
+package com.xjrsoft.module.oa.service.impl;
+
+import com.xjrsoft.module.oa.dto.ChangeNewsDto;
+import com.xjrsoft.module.oa.service.INewsService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+/**
+ * @description：TODO
+ * @author： phoenix
+ * @create： 2024/1/18 10:11
+ * @Version 1.0
+ */
+@SpringBootTest
+class NewsServiceImplTest {
+
+    @Autowired
+    private INewsService newsService;
+
+    @Test
+    void changeStatus() {
+        newsService.changeStatus(new ChangeNewsDto(){{
+            setId(1747799025202032641L);
+            setStatus(2);
+        }});
+    }
+}