Merge branch 'dev' of...

Merge branch 'dev' of ssh://gitlab.91isoft.com:10022/wangfei/vehicle-quality-review into gaixiankang

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

@@ -50,15 +50,15 @@ public class StatisticsHomeServiceImpl implements StatisticsHomeService {
        InspectionItemPassedNumVO inspectionItemPassedNumVO =  statisticsHomeMapper.selectInspectionItemPassedNum();
        List<AverageInspectionRateVO> list = new ArrayList<>();
        AverageInspectionRateVO averageInspectionRateOne = new AverageInspectionRateVO();
-       averageInspectionRateOne.setInspectionItems("汽车信息安全管理体系要求");
+       averageInspectionRateOne.setInspectionItems("信息安全管理体系要求");
        averageInspectionRateOne.setPassingRate(proportionCalculation(inspectionItemPassedNumVO.getSysReviewPassedNum(), inspectionItemPassedNumVO.getSysReviewcompletedNum()));
         list.add(averageInspectionRateOne);
        AverageInspectionRateVO averageInspectionRateTwo = new AverageInspectionRateVO();
-       averageInspectionRateTwo.setInspectionItems("汽车信息安全一般要求");
+       averageInspectionRateTwo.setInspectionItems("信息安全一般要求");
        averageInspectionRateTwo.setPassingRate(proportionCalculation(inspectionItemPassedNumVO.getCarReviewPassedNum(),inspectionItemPassedNumVO.getCarReviewcompletedNum()));
         list.add(averageInspectionRateTwo);
        AverageInspectionRateVO averageInspectionRateThree = new AverageInspectionRateVO();
-       averageInspectionRateThree.setInspectionItems("汽车信息安全技术要求");
+       averageInspectionRateThree.setInspectionItems("信息安全技术要求");
        averageInspectionRateThree.setPassingRate(proportionCalculation(inspectionItemPassedNumVO.getModelTestPassedNum(),inspectionItemPassedNumVO.getModelTestCompletedNum()));
         list.add(averageInspectionRateThree);
         for(AverageInspectionRateVO averageInspectionRate:list){

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

@@ -636,6 +636,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
 
         if (task.getSystemReviewTaskId() != null) {
 
+            response.setSystemExist(true);
+
             systemReviewTaskService.view(task.getSystemReviewTaskId());
 
             SystemReviewTask systemReviewTask = systemReviewTaskMapper.selectById(task.getSystemReviewTaskId());
@@ -648,10 +650,14 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
             // 体系审查
             setSystemDataStatistics(standardTree,results,response,systemReviewTask);
 
+        } else {
+            response.setSystemExist(false);
         }
 
         if (task.getCarReviewTaskId() != null) {
 
+            response.setCarExist(true);
+
             carReviewTaskService.viewReviewTask(task.getCarReviewTaskId());
 
             CarReviewTask carReviewTask = carReviewTaskMapper.selectById(task.getCarReviewTaskId());
@@ -665,6 +671,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
             // 车型审查
             setCarDataStatistics(carStandardTree,carResults,response,carReviewTask);
 
+        } else {
+            response.setCarExist(false);
         }
 
         return response;

quality-review/src/main/java/com/ruoyi/web/response/DataStatisticsResponse.java

@@ -8,6 +8,9 @@ import lombok.Data;
 @Data
 public class DataStatisticsResponse {
 
+    @ApiModelProperty("是否存在体系审查")
+    private Boolean systemExist;
+
     @ApiModelProperty("体系用例审查通过率")
     private Double systemDetailsPass;
 
@@ -38,6 +41,9 @@ public class DataStatisticsResponse {
     @ApiModelProperty("体系标准审查中")
     private Integer systemStandardsUnderNum;
 
+    @ApiModelProperty("是否存在车型审查")
+    private Boolean carExist;
+
     @ApiModelProperty(" 车型审查用例审查通过率")
     private Double carDetailsPass;
 
@@ -68,6 +74,9 @@ public class DataStatisticsResponse {
     @ApiModelProperty(" 车型审查标准审查中")
     private Integer carStandardsUnderNum;
 
+    @ApiModelProperty("是否存在车型试验")
+    private Boolean testExist;
+
     @ApiModelProperty(" 车型试验用例审查通过率")
     private Double testDetailsPass;
 

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
-			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
+			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name, d.address, d.postcode
 		from sys_dept d
 		where d.dept_id = #{deptId}
 	</select>