Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

quality-review/src/main/java/com/ruoyi/service/impl/PdfTemplateManagementServiceImpl.java

@@ -229,13 +229,15 @@ public class PdfTemplateManagementServiceImpl implements PdfTemplateManagementSe
         // 查询数据
         List<ReviewEnterpriseArchiveViewVO> viewList = reviewEnterpriseArchiveService.view(taskId);
         for (ReviewEnterpriseArchiveViewVO view : viewList) {
-            document.writeCell(view.getFileName(), Element.ALIGN_LEFT, 1, view.getItems().size(), table);
-            view.getItems().forEach(item -> {
-                document.writeCell(item.getCatalogue(), Element.ALIGN_LEFT, 1, 1, table);
-                document.writeCell(item.getChapter(), Element.ALIGN_LEFT, 1, 1, table);
-                document.writeCell(item.getStandard(), Element.ALIGN_LEFT, 1, 1, table);
-                document.writeCell(item.getKeyPoint(), Element.ALIGN_LEFT, 1, 1, table);
-            });
+            if (view.getItems().size() > 0) {
+                document.writeCell(view.getFileName(), Element.ALIGN_LEFT, 1, view.getItems().size(), table);
+                view.getItems().forEach(item -> {
+                    document.writeCell(item.getCatalogue(), Element.ALIGN_LEFT, 1, 1, table);
+                    document.writeCell(item.getChapter(), Element.ALIGN_LEFT, 1, 1, table);
+                    document.writeCell(item.getStandard(), Element.ALIGN_LEFT, 1, 1, table);
+                    document.writeCell(item.getKeyPoint(), Element.ALIGN_LEFT, 1, 1, table);
+                });
+            }
         }
         document.addContent(table);
         // 最后结尾签字

quality-review/src/main/java/com/ruoyi/service/impl/StrategyModelTestTaskNew.java

 package com.ruoyi.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.exception.ServiceException;
@@ -64,21 +65,23 @@ public class StrategyModelTestTaskNew implements StrategyModelTestTask, Initiali
         // 创建一个HashMap, 用于存放数据。用例条款ID作为key
         HashMap<Long, List<TestCaseVO>> map = new HashMap<>();
         for (TestUsecaseVO testUsecaseVO : testCaseList) {
-            // map不存在此key,添加; 则，存数据
-            if (!map.containsKey(testUsecaseVO.getReviewStandardId())) {
-                TestCaseVO caseVO = new TestCaseVO();
-                BeanUtils.copyProperties(testUsecaseVO, caseVO);
-                List<TestCaseVO> caseList = new ArrayList<>();
-                caseList.add(caseVO);
-                map.put(testUsecaseVO.getReviewStandardId(), caseList);
-            } else {
-                TestCaseVO caseVO = new TestCaseVO();
-                BeanUtils.copyProperties(testUsecaseVO, caseVO);
-                map.get(testUsecaseVO.getReviewStandardId()).add(caseVO);
+            if (ObjectUtil.isNotEmpty(testUsecaseVO.getReviewStandardId())) {
+                // map不存在此key,添加; 则，存数据
+                if (!map.containsKey(testUsecaseVO.getReviewStandardId())) {
+                    TestCaseVO caseVO = new TestCaseVO();
+                    BeanUtils.copyProperties(testUsecaseVO, caseVO);
+                    List<TestCaseVO> caseList = new ArrayList<>();
+                    caseList.add(caseVO);
+                    map.put(testUsecaseVO.getReviewStandardId(), caseList);
+                } else {
+                    TestCaseVO caseVO = new TestCaseVO();
+                    BeanUtils.copyProperties(testUsecaseVO, caseVO);
+                    map.get(testUsecaseVO.getReviewStandardId()).add(caseVO);
+                }
             }
         }
         // 循环map, 给list赋值
-        for (Map.Entry<Long, List<TestCaseVO>> entry : map.entrySet()) {
+         for (Map.Entry<Long, List<TestCaseVO>> entry : map.entrySet()) {
             List<TestUsecaseVO> collect = testCaseList.stream().filter(testCaseVO -> entry.getKey().equals(testCaseVO.getReviewStandardId())).collect(Collectors.toList());
             if (collect.size() > 0){
                 TestUsecaseVO testUsecaseVO = collect.get(0);

quality-review/src/main/java/com/ruoyi/web/request/ReviewStandardListByPageRequest.java

@@ -42,4 +42,7 @@ public class ReviewStandardListByPageRequest extends PageDomain {
      */
     @ApiModelProperty("文本内容")
     private String text;
+
+    @ApiModelProperty("测试方法")
+    private String testMethod;
 }

quality-review/src/main/resources/mapper/ReviewStandardMapper.xml

@@ -41,7 +41,10 @@
 
     <select id="selectReviewStandardList" parameterType="com.ruoyi.web.request.ReviewStandardListByPageRequest" resultType="com.ruoyi.web.response.ReviewStandardResponse">
         select
-            id, chapter, text
+            id,
+            chapter,
+            text,
+            test_method AS testMethod
         from
             t_review_standard
         <where>
@@ -49,6 +52,7 @@
             <if test="type != null and type != ''"> and `type` = #{type} </if>
             <if test="chapter != null and chapter != ''"> and chapter like concat('%', #{chapter}, '%') </if>
             <if test="text != null and text != ''"> and text like concat('%', #{text}, '%') </if>
+            <if test="testMethod != null and testMethod != ''"> and test_method like concat('%', #{testMethod}, '%') </if>
         </where>
         ORDER BY
             chapter

quality-review/src/main/resources/mapper/TestUseCaseMapper.xml

@@ -49,32 +49,31 @@
     </select>
 
     <select id="selectListByTaskId" resultType="com.ruoyi.domain.vo.TestUsecaseVO">
-        select
-            tu.id,
-            tu.case_id caseId,
-            ts.test_scenario testScenario,
-            tt.test_type testType,
-            tu.usecase_no usecaseNo,
-            tu.name,
-            tu.tools,
-            tu.input,
-            tu.description,
-            tu.review_standard_id,
-            rs.chapter,
-            rs.text,
-            rs.test_method testMethod,
-            tr.test_result testResult
-        from
-            t_test_usecase tu
-        left join t_test_scenario ts on tu.test_scenario_id = ts.id
-        left join t_test_type tt on tu.test_type_id = tt.id
-        left join t_review_standard rs on tu.review_standard_id = rs.id
-        left join t_task_scenario_relation tsr on tsr.test_scenario_id = ts.id
-        left join t_task t on tsr.task_id = t.id
-        left join t_model_test_task mtt on mtt.id = t.model_test_task_id
-        left join t_test_records tr on tu.case_id = tr.usecase_id
-        where
-            mtt.id = #{id}
+        select tu.id,
+               tu.case_id       caseId,
+               ts.test_scenario testScenario,
+               tt.test_type     testType,
+               tu.usecase_no    usecaseNo,
+               tu.name,
+               tu.tools,
+               tu.input,
+               tu.description,
+               tu.review_standard_id,
+               rs.chapter,
+               rs.text,
+               rs.test_method   testMethod,
+               tr.test_result   testResult
+        from t_test_usecase tu
+                 left join t_test_scenario ts on tu.test_scenario_id = ts.id
+                 left join t_test_type tt on tu.test_type_id = tt.id
+                 left join t_review_standard rs on tu.review_standard_id = rs.id
+                 left join t_task_scenario_relation tsr on tsr.test_scenario_id = ts.id
+                 left join t_task t on tsr.task_id = t.id
+                 left join t_model_test_task mtt on mtt.id = t.model_test_task_id
+                 left join t_test_records tr on tu.case_id = tr.usecase_id
+        where mtt.id = #{id}
+        group by tu.id, tu.case_id, ts.test_scenario, tt.test_type, tu.usecase_no, tu.name, tu.tools, tu.input,
+                 tu.description, tu.review_standard_id, rs.chapter, rs.text, rs.test_method, tr.test_result
     </select>
 
     <select id="selectOptionalUsecase" resultType="com.ruoyi.domain.vo.OptionalUseCasesVO">

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -22,7 +22,7 @@ import com.ruoyi.system.service.ISysLogininforService;
 
 /**
  * 系统访问记录
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -35,7 +35,6 @@ public class SysLogininforController extends BaseController
     @Autowired
     private SysPasswordService passwordService;
 
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysLogininfor logininfor)
     {
@@ -45,7 +44,6 @@ public class SysLogininforController extends BaseController
     }
 
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysLogininfor logininfor)
     {
@@ -54,7 +52,6 @@ public class SysLogininforController extends BaseController
         util.exportExcel(response, list, "登录日志");
     }
 
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
     public AjaxResult remove(@PathVariable Long[] infoIds)
@@ -62,7 +59,6 @@ public class SysLogininforController extends BaseController
         return toAjax(logininforService.deleteLogininforByIds(infoIds));
     }
 
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
     public AjaxResult clean()
@@ -71,7 +67,6 @@ public class SysLogininforController extends BaseController
         return success();
     }
 
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
     @Log(title = "账户解锁", businessType = BusinessType.OTHER)
     @GetMapping("/unlock/{userName}")
     public AjaxResult unlock(@PathVariable("userName") String userName)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

@@ -21,7 +21,7 @@ import com.ruoyi.system.service.ISysOperLogService;
 
 /**
  * 操作日志记录
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -31,7 +31,6 @@ public class SysOperlogController extends BaseController
     @Autowired
     private ISysOperLogService operLogService;
 
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysOperLog operLog)
     {
@@ -41,7 +40,6 @@ public class SysOperlogController extends BaseController
     }
 
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysOperLog operLog)
     {
@@ -51,7 +49,6 @@ public class SysOperlogController extends BaseController
     }
 
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @DeleteMapping("/{operIds}")
     public AjaxResult remove(@PathVariable Long[] operIds)
     {
@@ -59,7 +56,6 @@ public class SysOperlogController extends BaseController
     }
 
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @DeleteMapping("/clean")
     public AjaxResult clean()
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -22,7 +22,7 @@ import com.ruoyi.system.service.ISysNoticeService;
 
 /**
  * 公告 信息操作处理
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -35,7 +35,6 @@ public class SysNoticeController extends BaseController
     /**
      * 获取通知公告列表
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysNotice notice)
     {
@@ -47,7 +46,6 @@ public class SysNoticeController extends BaseController
     /**
      * 根据通知公告编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:query')")
     @GetMapping(value = "/{noticeId}")
     public AjaxResult getInfo(@PathVariable Long noticeId)
     {
@@ -57,7 +55,6 @@ public class SysNoticeController extends BaseController
     /**
      * 新增通知公告
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:add')")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysNotice notice)
@@ -69,7 +66,6 @@ public class SysNoticeController extends BaseController
     /**
      * 修改通知公告
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysNotice notice)
@@ -81,7 +77,6 @@ public class SysNoticeController extends BaseController
     /**
      * 删除通知公告
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
     public AjaxResult remove(@PathVariable Long[] noticeIds)