bug

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/vo/MonitoringAccessVO.java

@@ -36,7 +36,7 @@ public class MonitoringAccessVO {
     @ExcelProperty("调阅次数")
     @ApiModelProperty(value = "实际调阅次数")
     private Integer realityAccessNumber;
-    @ExcelProperty("平均调阅时长")
+    @ExcelProperty("平均调阅时长(小时)")
     @ApiModelProperty(value = "平均调阅时长(小时)")
     private String duration;
     @ExcelProperty("完成率")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/service/impl/SafetyInspectServiceImpl.java

@@ -126,7 +126,7 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
             SafetyInspectVO safetyInspectVOS = safetyInspectMapper.selectSelfByPath(safetyInspectDTO.getCycle(),s.getPath(),safetyInspectDTO.getYear(),safetyInspectDTO.getOrgType());
             //机构维度
             Map map = safetyInspectMapper.orgDimension(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),3);
-            safetyInspectVO.setPlanInspectOrg(Integer.valueOf(map.get("planInspectOrg").toString()));
+          //  safetyInspectVO.setPlanInspectOrg(Integer.valueOf(map.get("planInspectOrg").toString()));
             safetyInspectVO.setRealityInspectOrg(Integer.valueOf(map.get("realityInspectOrg").toString()));
             safetyInspectVO.setInspectCoverRate(map.get("inspectCoverRate").toString());
             safetyInspectVO.setOrgName(s.getShortName());

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -136,8 +136,9 @@
   <select id="getContentByTaskId" resultType="java.util.Map">
       SELECT
           b.content,
-          IF
-              ( b.content_type = 1, 0, SUM( b.score ) ) score
+             ifnull(  IF
+                 ( b.content_type = 1, 0, SUM( b.score ) ),0) as
+         score
       FROM
       core_evaluate_task_user_content b
       LEFT JOIN core_evaluate_task_user a ON a.id = b.task_user_id

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/DeviceExport.java

@@ -21,7 +21,7 @@ import java.util.Date;
 public class DeviceExport {
     @ExcelProperty(value = "设备名称", index = 0)
     private String deviceName;
-    @ExcelProperty(value = "机构名称", index = 1)
+    @ExcelProperty(value = "所属机构", index = 1)
     private String orgName;
     @ExcelProperty(value = "设备类别", index = 2)
     private String assetType;