Browse Source

问题类型兵饼状图分布

tags/v1.0.0^2
chengwang 1 year ago
parent
commit
1db741b31d
3 changed files with 13 additions and 18 deletions
  1. +13
    -10
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/InspectionFileServiceImpl.java
  2. +0
    -5
      tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionServiceImpl.java
  3. +0
    -3
      tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

+ 13
- 10
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/InspectionFileServiceImpl.java View File

@@ -37,6 +37,7 @@ import org.springframework.stereotype.Service;


import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;

@@ -243,11 +244,12 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
vo3.setNum(massiveCrack);
vo4.setType(QuestionTypeEnum.PON_DING_NAME.getCode());
vo4.setNum(ponDingNum);
list.add(vo);
list.add(vo1);
list.add(vo2);
list.add(vo3);
list.add(vo4);
Collections.addAll(list,vo,vo1,vo2,vo3,vo4);
// list.add(vo);
// list.add(vo1);
// list.add(vo2);
// list.add(vo3);
// list.add(vo4);
}
//若角色为部门管理员或普通用户
if(UserTypeEnum.ADMIN.getCode()== user.getType() || UserTypeEnum.ORDINARY_USER.getCode()== user.getType()){
@@ -312,11 +314,12 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
vo3.setNum(massiveCrack);
vo4.setType(QuestionTypeEnum.PON_DING_NAME.getCode());
vo4.setNum(ponDingNum);
list.add(vo);
list.add(vo1);
list.add(vo2);
list.add(vo3);
list.add(vo4);
Collections.addAll(list,vo,vo1,vo2,vo3,vo4);
// list.add(vo);
// list.add(vo1);
// list.add(vo2);
// list.add(vo3);
// list.add(vo4);

}


+ 0
- 5
tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionServiceImpl.java View File

@@ -1,10 +1,7 @@
package com.tuoheng.miniprogram.service.impl;

import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,12 +14,10 @@ import com.tuoheng.miniprogram.entity.*;
import com.tuoheng.miniprogram.entity.query.InspectionQuery;
import com.tuoheng.miniprogram.enums.UserTypeEnum;
import com.tuoheng.miniprogram.service.IInspectionService;
import com.tuoheng.miniprogram.utils.ShiroUtils;
import com.tuoheng.miniprogram.vo.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;



+ 0
- 3
tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java View File

@@ -140,9 +140,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
*/
@Override
public JsonResult getTodoList(WorkOrderQuery query) {
// if(query.getOrderEndTime()==null && query.getOrderStartTime()==null){
// throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
// }
if(query.getLimit()==null && query.getPage()==null){
throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
}

Loading…
Cancel
Save