Merge branch '20210223' of http://114.135.61.188:53000/UIMS/Code into 20210223

operation_manager/src/main/java/com/huaxu/client/UserCenterClient.java

@@ -45,7 +45,7 @@ public interface UserCenterClient {
     List<Org> getAllByTenantId();
 
     @PostMapping(value = "/org/get")
-    AjaxMessage<Org> selectOne(@RequestParam Integer id);
+    AjaxMessage<Org> selectOne(@RequestParam(value = "id") Integer id);
     /**
      * 通过父配置id查询数据
      */

operation_manager/src/main/java/com/huaxu/evaluation/controller/EvaluationCycleController.java

@@ -11,6 +11,7 @@ import com.huaxu.util.UserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
@@ -68,17 +69,19 @@ public class EvaluationCycleController {
         boolean isOk = true;
         List<EvaluationCycleEntity> evaluationCycleEntities = new ArrayList<>();
         for (Integer companyOrgId : evaluationCycle.getCompanyOrgIds()) {
-            evaluationCycle.setCompanyOrgId(companyOrgId);
+            EvaluationCycleEntity item= new EvaluationCycleEntity();
+            BeanUtils.copyProperties(evaluationCycle,item);
+            item.setCompanyOrgId(companyOrgId);
             if (currentUser != null) {
-                evaluationCycle.setUpdateBy(currentUser.getUsername());
-                evaluationCycle.setCreateBy(currentUser.getUsername());
-                evaluationCycle.setDateCreate(new Date());
-                evaluationCycle.setDateUpdate(new Date());
-                evaluationCycle.setTenantId(currentUser.getTenantId());
+                item.setUpdateBy(currentUser.getUsername());
+                item.setCreateBy(currentUser.getUsername());
+                item.setDateCreate(new Date());
+                item.setDateUpdate(new Date());
+                item.setTenantId(currentUser.getTenantId());
             }
-            evaluationCycle.setStatus(1);
-            evaluationCycleEntities.add(evaluationCycle);
-            List<EvaluationCycleEntity> list = evaluationCycleService.findList(evaluationCycle);
+            item.setStatus(1);
+            evaluationCycleEntities.add(item);
+            List<EvaluationCycleEntity> list = evaluationCycleService.findList(item);
             if (list.size() > 0) {
                 isOk = false;
                 break;
@@ -111,9 +114,10 @@ public class EvaluationCycleController {
             evaluationCycle.setUpdateBy(currentUser.getUsername());
             evaluationCycle.setDateUpdate(new Date());
         }
+        EvaluationCycleEntity itemCycle = evaluationCycleService.findEvaluationCycleById(evaluationCycle.getId());
         EvaluationCycleEntity evaluationCycleEntity = new EvaluationCycleEntity();
         evaluationCycleEntity.setType(evaluationCycle.getType());
-        evaluationCycleEntity.setCompanyOrgId(evaluationCycle.getCompanyOrgId());
+        evaluationCycleEntity.setCompanyOrgId(itemCycle.getCompanyOrgId());
         evaluationCycleEntity.setTenantId(currentUser.getTenantId());
         evaluationCycleEntity.setId(evaluationCycle.getId());
         List<EvaluationCycleEntity> list = evaluationCycleService.findList(evaluationCycleEntity);

operation_manager/src/main/java/com/huaxu/evaluation/controller/EvaluationGradeController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.models.auth.In;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
@@ -69,17 +70,20 @@ public class EvaluationGradeController {
         List<EvaluationGradeEntity> evaluationGradeEntities = new ArrayList<>();
         boolean isOk = true;
         for (Integer companyOrgId : evaluationGrade.getCompanyOrgIds()) {
-            evaluationGrade.setCompanyOrgId(companyOrgId);
+
+            EvaluationGradeEntity item = new EvaluationGradeEntity();
+            BeanUtils.copyProperties(evaluationGrade, item);
+            item.setCompanyOrgId(companyOrgId);
             if (currentUser != null) {
-                evaluationGrade.setUpdateBy(currentUser.getUsername());
-                evaluationGrade.setCreateBy(currentUser.getUsername());
-                evaluationGrade.setDateCreate(new Date());
-                evaluationGrade.setDateUpdate(new Date());
-                evaluationGrade.setTenantId(currentUser.getTenantId());
+                item.setUpdateBy(currentUser.getUsername());
+                item.setCreateBy(currentUser.getUsername());
+                item.setDateCreate(new Date());
+                item.setDateUpdate(new Date());
+                item.setTenantId(currentUser.getTenantId());
             }
-            evaluationGrade.setStatus(1);
-            evaluationGradeEntities.add(evaluationGrade);
-            List<EvaluationGradeEntity> list = evaluationGradeService.findList(evaluationGrade);
+            item.setStatus(1);
+            evaluationGradeEntities.add(item);
+            List<EvaluationGradeEntity> list = evaluationGradeService.findList(item);
             if (list.size() > 0) {
                 isOk = false;
                 break;
@@ -112,9 +116,10 @@ public class EvaluationGradeController {
             evaluationGrade.setUpdateBy(currentUser.getUsername());
             evaluationGrade.setDateUpdate(new Date());
         }
+        EvaluationGradeEntity orgGrade = evaluationGradeService.findEvaluationGradeById(evaluationGrade.getId());
         EvaluationGradeEntity evaluationGradeEntity = new EvaluationGradeEntity();
         evaluationGradeEntity.setEvaluationGrade(evaluationGrade.getEvaluationGrade());
-        evaluationGradeEntity.setCompanyOrgId(evaluationGrade.getCompanyOrgId());
+        evaluationGradeEntity.setCompanyOrgId(orgGrade.getCompanyOrgId());
         evaluationGradeEntity.setTenantId(currentUser.getTenantId());
         evaluationGradeEntity.setId(evaluationGrade.getId());
         List<EvaluationGradeEntity> list = evaluationGradeService.findList(evaluationGradeEntity);

operation_manager/src/main/java/com/huaxu/evaluation/controller/EvaluationItemController.java

@@ -39,7 +39,6 @@ public class EvaluationItemController{
     @RequestMapping(value = "/selectPage", method = RequestMethod.GET)
     public AjaxMessage<Pagination<EvaluationItemEntity>> list(
             @RequestParam(required = false) String name,
-            @RequestParam(required = false) Long companyOrgId,
             @RequestParam(required = false) Long deptOrgId,
             @RequestParam Integer pageNum,
             @RequestParam Integer pageSize) {

operation_manager/src/main/java/com/huaxu/evaluation/entity/EvaluationItemValueEntity.java

@@ -11,6 +11,7 @@ import com.huaxu.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 
 /**
  * sc_evaluation_item_value
@@ -27,6 +28,14 @@ public class EvaluationItemValueEntity extends BaseEntity {
     @ApiModelProperty(value = "名称")
     private Long evaluationItemId;
 
+    @ApiModelProperty(value = "所属公司ID")
+    @TableField(exist = false)
+    private Integer companyOrgId;
+
+    @ApiModelProperty(value = "所属部门ID")
+    @TableField(exist = false)
+    private Integer deptOrgId;
+
     /** 类型(0大于等于 2小于 1介于) */
     @ApiModelProperty(value = "类型(0大于等于 2小于 1介于)")
     private Long type;

operation_manager/src/main/java/com/huaxu/evaluation/service/EvaluationItemValueService.java

@@ -55,4 +55,6 @@ public interface EvaluationItemValueService {
      */
     public EvaluationItemValueEntity findEvaluationItemValueById(Long id);
 
+    public boolean saveOrUpdate(EvaluationItemValueEntity evaluationItemValue);
+
 }

operation_manager/src/main/java/com/huaxu/evaluation/service/impl/EvaluationCycleServiceImpl.java

@@ -78,6 +78,7 @@ public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMappe
     /**
      * 批量删除
      */
+    @Override
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean delEvaluationCycleByIds(Long[] ids) {

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -261,6 +261,8 @@ public class WorkOrderManageController {
                     order.setInProcessStatus(1);
                 }else if(actionId==1){
                     order.setInProcessStatus(3);
+                }else if(actionId==7){
+                    order.setInProcessStatus(null);
                 }
                 if(handleResult.size()==0||handleResult==null) {
                     order.setOrderStatus(2);

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderStatisticsController.java

@@ -1,6 +1,5 @@
 package com.huaxu.order.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.huaxu.client.SmsWaterClient;
 import com.huaxu.client.UserCenterClient;
 import com.huaxu.entity.Message;
@@ -10,7 +9,6 @@ import com.huaxu.model.ResultStatus;
 import com.huaxu.order.dto.StatisticsDto;
 import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.order.service.WorkOrderManageService;
-import com.huaxu.process.dto.TaskUserDTO;
 import com.huaxu.util.MessageSendUtil;
 import com.huaxu.util.UserUtil;
 import io.swagger.annotations.Api;
@@ -48,14 +46,14 @@ public class WorkOrderStatisticsController {
     @RequestMapping(value = "completionStatistics", method = RequestMethod.GET)
     @ApiOperation(value = "工单完成情况统计")
     public AjaxMessage<Map<String, Object>> completionStatistics(
-            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int type,
+            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int statsType,
             @ApiParam(value = "统计时间:月格式(yyyy-MM),年格式(yyyy),自定义统计开始日期", required = true) @RequestParam(required = true) String startDate,
             @ApiParam(value = "统计时间:年月统计不用传入此参数,自定义统计截至日期", required = false) @RequestParam(required = false) String endDate) throws ParseException {
         //同比日期
         String sameStartDate = null, sameEndDate = null;
         //环比日期
         String chainStartDate = null, chainEndDate = null;
-        if (type == 0) {
+        if (statsType == 0) {
             startDate = String.format("%s-01", startDate);
             endDate = subMonth(startDate, 1);
 
@@ -64,7 +62,7 @@ public class WorkOrderStatisticsController {
 
             chainStartDate = subMonth(startDate, -1);
             chainEndDate = subMonth(chainStartDate, 1);
-        } else if (type == 1) {
+        } else if (statsType == 1) {
             startDate = String.format("%s-01-01", startDate);
             endDate = subMonth(startDate, 1);
 
@@ -73,7 +71,7 @@ public class WorkOrderStatisticsController {
 
             chainStartDate = subYear(startDate, -1);
             chainEndDate = subYear(chainStartDate, 1);
-        } else if (type == 2) {
+        } else if (statsType == 2) {
             startDate = String.format("%s-01", startDate);
             endDate = String.format("%s-01", endDate);
         }
@@ -152,7 +150,7 @@ public class WorkOrderStatisticsController {
     @RequestMapping(value = "eventStatistics", method = RequestMethod.GET)
     @ApiOperation(value = "事件曲线数据统计展示、人均工单数据统计展示")
     public AjaxMessage<Map<String,Object>> eventStatistics(
-            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int type,
+            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int statsType,
             @ApiParam(value = "统计时间:月格式(yyyy-MM),年格式(yyyy),自定义统计时间开始日期", required = true) @RequestParam(required = true) String startDate,
             @ApiParam(value = "统计时间:年月统计不用传入此参数,自定义统计截至日期", required = false) @RequestParam(required = false) String endDate) throws ParseException {
         int maintainerCount = 0;
@@ -165,7 +163,7 @@ public class WorkOrderStatisticsController {
         workOrderManageDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         workOrderManageDto.setPermissonType(loginUser.getPermissonType());
-        switch (type) {
+        switch (statsType) {
             case 0:
                 maintainerCount = userCenterClient.findMaintainerCount(startDate);
                 startDate = String.format("%s-01", startDate);
@@ -185,9 +183,9 @@ public class WorkOrderStatisticsController {
         workOrderManageDto.setStartDate(startDate);
         workOrderManageDto.setEndDate(endDate);
 
-        if (type == 0 || type == 2) {
+        if (statsType == 0 || statsType == 2) {
             statistics = workOrderManageService.eventMonthStatistics(workOrderManageDto);
-        } else if (type == 1) {
+        } else if (statsType == 1) {
             statistics = workOrderManageService.eventYearStatistics(workOrderManageDto);
         }
         int seq=0;
@@ -212,7 +210,7 @@ public class WorkOrderStatisticsController {
     @RequestMapping(value = "orderDurationStatistics", method = RequestMethod.GET)
     @ApiOperation(value = "工单时长统计展示")
     public AjaxMessage<List<StatisticsDto>> orderDurationStatistics(
-            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int type,
+            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int statsType,
             @ApiParam(value = "统计时间:月格式(yyyy-MM),年格式(yyyy),自定义统计时间开始日期", required = true) @RequestParam(required = true) String startDate,
             @ApiParam(value = "统计时间:年月统计不用传入此参数,自定义统计截至日期", required = false) @RequestParam(required = false) String endDate) throws ParseException {
         //根据用户编号，获取用户的权限
@@ -223,7 +221,7 @@ public class WorkOrderStatisticsController {
         workOrderManageDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         workOrderManageDto.setPermissonType(loginUser.getPermissonType());
-        switch (type) {
+        switch (statsType) {
             case 0:
                 startDate = String.format("%s-01", startDate);
                 endDate = subMonth(startDate, 1);
@@ -248,7 +246,7 @@ public class WorkOrderStatisticsController {
     public AjaxMessage<List<Map<String,Object>>> dispatchTimesStatistics(
             @ApiParam(value = "设备或场景ID", required = true) @RequestParam(required = true) int id,
             @ApiParam(value = "设备或场景标识(1:设备;2:场景)", required = true) @RequestParam(required = true) int sort,
-            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int type,
+            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int statsType,
             @ApiParam(value = "统计时间:月格式(yyyy-MM),年格式(yyyy),自定义统计时间开始日期", required = true) @RequestParam(required = true) String startDate,
             @ApiParam(value = "统计时间:年月统计不用传入此参数,自定义统计截至日期", required = false) @RequestParam(required = false) String endDate) throws ParseException {
 
@@ -256,7 +254,7 @@ public class WorkOrderStatisticsController {
         List<Map<String,Object>> statistics = new ArrayList<Map<String, Object>>();
 
         WorkOrderManageDto workOrderManageDto = new WorkOrderManageDto();
-        switch (type) {
+        switch (statsType) {
             case 0:
                 startDate = String.format("%s-01", startDate);
                 endDate = subMonth(startDate, 1);
@@ -281,10 +279,10 @@ public class WorkOrderStatisticsController {
         }else if(sort==1){
             idList.add(id);
         }
-        if(type ==0 || type ==2){
+        if(statsType ==0 || statsType ==2){
             statistics =  workOrderManageService.dispatchTimesMonthStatistics(workOrderManageDto,idList);
         }
-        else if(type == 1){
+        else if(statsType == 1){
             statistics =  workOrderManageService.dispatchTimesYearStatistics(workOrderManageDto,idList);
         }
         return new AjaxMessage<>(ResultStatus.OK, statistics);
@@ -293,26 +291,25 @@ public class WorkOrderStatisticsController {
     @RequestMapping(value = "distributionStatistics", method = RequestMethod.GET)
     @ApiOperation(value = "上报类型、工单类型、工单状态统计")
     public AjaxMessage<Map<String, Object>> distributionStatistics(
-            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int type,
+            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int statsType,
             @ApiParam(value = "统计时间:月格式(yyyy-MM),年格式(yyyy),自定义统计时间开始日期", required = true) @RequestParam(required = true) String startDate,
             @ApiParam(value = "统计时间:年月统计不用传入此参数,自定义统计截至日期", required = false) @RequestParam(required = false) String endDate) throws ParseException {
         Map<String, Object> result = new HashMap<>();
         //根据用户编号，获取用户的权限
         LoginUser loginUser = UserUtil.getCurrentUser();
         WorkOrderManageDto workOrderManageDto = new WorkOrderManageDto();
-        workOrderManageDto.setOrderStatus(type);
         workOrderManageDto.setProgramItems(loginUser.getProgramItemList());
         workOrderManageDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         workOrderManageDto.setPermissonType(loginUser.getPermissonType());
-        if (type == 0) {
+        if (statsType == 0) {
             startDate = String.format("%s-01", startDate);
             endDate = subMonth(startDate, 1);
 
-        } else if (type == 1) {
+        } else if (statsType == 1) {
             startDate = String.format("%s-01-01", startDate);
             endDate = subYear(startDate, 1);
-        } else if (type == 2) {
+        } else if (statsType == 2) {
             startDate = String.format("%s-01", startDate);
             endDate = String.format("%s-01", endDate);
         }

operation_manager/src/main/java/com/huaxu/org/OrgInfoUtil.java

@@ -3,6 +3,8 @@ package com.huaxu.org;
 import com.huaxu.client.UserCenterClient;
 import com.huaxu.util.RedisUtil;
 import com.huaxu.util.UserUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -60,11 +62,18 @@ public class OrgInfoUtil {
         Integer parentId = null;
         Org org = userCenterClient.selectOne(id).getData();
         Org parentOrg = new Org();
-        parentOrg.setOrgType(org.getOrgType());
-        while (!parentOrg.getOrgType().equals("company")) {
-            if (org.getParentOrgId().equals(0)) break;
-            Org temp = userCenterClient.selectOne(org.getParentOrgId()).getData();
+        BeanUtils.copyProperties(org,parentOrg);
+        while ("department".equals(parentOrg.getOrgType())) {
+            if (parentOrg.getParentOrgId().equals(0)|| parentOrg.getParentOrgId()==null) {
+                break;
+            }
+            Org temp = userCenterClient.selectOne(parentOrg.getParentOrgId()).getData();
             parentOrg.setOrgType(temp.getOrgType());
+            parentOrg.setId(temp.getId());
+            parentOrg.setParentOrgId(temp.getParentOrgId());
+            if ("company".equals(temp.getOrgType())) {
+                parentId = temp.getId();
+            }
         }
         return parentId;
     }

operation_manager/src/main/resources/mapper/evaluation/EvaluationItemValueMapper.xml

@@ -56,6 +56,7 @@
             <if test="evaluationItemId != null ">and a.evaluation_item_id = #{evaluationItemId}</if>
             <if test="tenantId != null ">and a.TENANT_ID = #{tenantId}</if>
         </where>
+        and a.status=1
     </select>
 
     <!--  根据获取实体 page   -->

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -871,7 +871,7 @@
 
   <!--工单完成情况统计-->
   <select id="workOrderStatistics" resultType="map">
-    select  total 工单总数, finished 工单完成数, finished/total 工单完成率 from
+    select  total 工单总数, finished 工单完成数, ROUND(finished*100/total,2) 工单完成率 from
     (
       select count(1) total,sum(case when order_status=2 then 1 when order_status =3 then 1 else 0 end) finished
       from sc_work_order_manage t1

operation_manager/src/main/resources/mapper/task/PlanManageMapper.xml

@@ -391,7 +391,8 @@
       company_org_id = #{companyOrgId,jdbcType=VARCHAR},
       department_org_id = #{departmentOrgId,jdbcType=VARCHAR},
       task_checked = #{taskChecked,jdbcType=LONGVARCHAR},
-      in_process_status = #{inProcessStatus,jdbcType=INTEGER}
+      in_process_status = #{inProcessStatus,jdbcType=INTEGER},
+      finish_date=#{finishDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

sms_water/src/main/java/com/huaxu/controller/SceneController.java

@@ -222,7 +222,7 @@ public class SceneController {
     @ResponseBody
     @ApiOperation(value = "场景及设备故障率")
     public  AjaxMessage<Object> selectAlarmSceneAndDevice(
-            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int type,
+            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int statsType,
             @ApiParam(value = "统计时间:月格式(yyyy-MM),年格式(yyyy),自定义统计时间开始日期", required = true) @RequestParam(required = true) String startDate,
             @ApiParam(value = "统计时间:年月统计不用传入此参数,自定义统计截至日期", required = false) @RequestParam(required = false) String endDate) throws ParseException {
         LoginUser loginUser = UserUtil.getCurrentUser();
@@ -233,7 +233,7 @@ public class SceneController {
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         sceneEntity.setPermissonType(loginUser.getPermissonType());
         int days = 1;
-        switch (type) {
+        switch (statsType) {
             case 0:
                 startDate = String.format("%s-01", startDate);
                 endDate = subMonth(startDate, 1);
@@ -298,13 +298,13 @@ public class SceneController {
     public  AjaxMessage<List<Map<String,Object>>> alarmTimesStatistics(
             @ApiParam(value = "设备或场景ID", required = true) @RequestParam(required = true) int id,
             @ApiParam(value = "设备或场景标识(1:设备;2:场景)", required = true) @RequestParam(required = true) int sort,
-            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int type,
+            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int statsType,
             @ApiParam(value = "统计时间:月格式(yyyy-MM),年格式(yyyy),自定义统计时间开始日期", required = true) @RequestParam(required = true) String startDate,
             @ApiParam(value = "统计时间:年月统计不用传入此参数,自定义统计截至日期", required = false) @RequestParam(required = false) String endDate) throws ParseException {
         LoginUser loginUser = UserUtil.getCurrentUser();
         SceneEntity sceneEntity = new SceneEntity();
         sceneEntity.setId(Long.parseLong(String.valueOf(id)));
-        switch (type) {
+        switch (statsType) {
             case 0:
                 startDate = String.format("%s-01", startDate);
                 endDate = subMonth(startDate, 1);
@@ -320,10 +320,10 @@ public class SceneController {
         }
         List<Map<String,Object>> list = new ArrayList<>();
 
-        if(type == 0 || type== 2){
+        if(statsType == 0 || statsType== 2){
             list = sceneService.selectMonthAlarmTimes(sceneEntity, startDate, endDate,sort);
         }
-        else if(type == 1){
+        else if(statsType == 1){
             list = sceneService.selectYearAlarmTimes(sceneEntity, startDate, endDate,sort);
         }
         return new AjaxMessage<>(ResultStatus.OK, list);
@@ -345,12 +345,12 @@ public class SceneController {
     public AjaxMessage<List<Map<String,Object>>> selectAlarmLable(
             @ApiParam(value = "设备或场景ID", required = true) @RequestParam(required = true) int id,
             @ApiParam(value = "设备或场景标识(1:设备;2:场景)", required = true) @RequestParam(required = true) int sort,
-            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int type,
+            @ApiParam(value = "统计类型:0-按月统计,1-按年统计,2-自定义统计", required = true) @RequestParam(required = true) int statsType,
             @ApiParam(value = "统计时间:月格式(yyyy-MM),年格式(yyyy),自定义统计时间开始日期", required = true) @RequestParam(required = true) String startDate,
             @ApiParam(value = "统计时间:年月统计不用传入此参数,自定义统计截至日期", required = false) @RequestParam(required = false) String endDate) throws ParseException {
         SceneEntity sceneEntity = new SceneEntity();
         sceneEntity.setId(Long.parseLong(String.valueOf(id)));
-        switch (type) {
+        switch (statsType) {
             case 0:
                 startDate = String.format("%s-01", startDate);
                 endDate = subMonth(startDate, 1);

user_center/src/main/resources/mapper/UserMapper.xml

@@ -353,7 +353,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 or a.COMPANY_ORG_ID = #{user.companyOrgId}
                 )
             </if>
-            <if test="user.userType!=null and user.userType!=-999 and user.userType!=-9999 and  user.programItems != null and user.programItems.size() > 0">
+            <if test="user.userType!=-999 and user.userType!=-9999 and  user.programItems != null and user.programItems.size() > 0">
                 <if test="user.permissonType == 5 or user.permissonType == 2">
                     and ( a.DEPT_ORG_ID in
                     <foreach collection="user.programItems" item="item" open="(" close=")" separator=",">