射洪城投
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2 天以前 f6760448428b0a11aebab4ee281023532e4f61d7 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetHouseInspectionItemController.java


@@ -6,7 +6,6 @@


import cn.afterturn.easypoi.excel.entity.ExportParams;


import cn.afterturn.easypoi.excel.entity.ImportParams;


import cn.hutool.json.JSONObject;


import com.baomidou.mybatisplus.annotation.TableField;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.ruoyi.common.annotation.Log;


import com.ruoyi.common.basic.PageInfo;


@@ -19,27 +18,40 @@


import com.ruoyi.common.utils.WebUtils;


import com.ruoyi.framework.web.service.TokenService;


import com.ruoyi.system.dto.AddAssetHouseInspection;


import com.ruoyi.system.dto.AddAssetRepairRequestDTO;


import com.ruoyi.system.export.AssetHouseInspectionImport;


import com.ruoyi.system.model.*;


import com.ruoyi.system.model.AssetHouseInspectionDetail;


import com.ruoyi.system.model.AssetHouseInspectionItem;


import com.ruoyi.system.model.AssetHouseInspectionRecord;


import com.ruoyi.system.model.AssetMain;


import com.ruoyi.system.model.AssetPropertyExt;


import com.ruoyi.system.model.AssetType;


import com.ruoyi.system.query.AssetHouseInspectionRecordListQuery;


import com.ruoyi.system.query.AssetRepairRequestListQuery;


import com.ruoyi.system.service.*;


import com.ruoyi.system.service.AssetHouseInspectionDetailService;


import com.ruoyi.system.service.AssetHouseInspectionItemService;


import com.ruoyi.system.service.AssetHouseInspectionRecordService;


import com.ruoyi.system.service.AssetMainService;


import com.ruoyi.system.service.AssetPropertyExtService;


import com.ruoyi.system.service.AssetTypeService;


import com.ruoyi.system.service.ISysUserService;


import com.ruoyi.system.service.TDeptService;


import com.ruoyi.system.vo.AssetHouseInspectionVO;


import com.ruoyi.system.vo.AssetRepairRequestVO;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiModelProperty;


import io.swagger.annotations.ApiOperation;


import io.swagger.models.auth.In;


import lombok.extern.slf4j.Slf4j;


import org.apache.poi.ss.usermodel.Workbook;


import org.checkerframework.checker.units.qual.A;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.transaction.annotation.Propagation;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.CollectionUtils;


import org.springframework.util.StringUtils;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.bind.annotation.DeleteMapping;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RequestParam;


import org.springframework.web.bind.annotation.RequestPart;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.multipart.MultipartFile;




import javax.servlet.ServletOutputStream;


@@ -127,7 +139,8 @@


        Map<Integer, String> map = assetPropertyExtService.lambdaQuery().isNotNull(AssetPropertyExt::getRoomNumber).list()


                .stream().collect(Collectors.toMap(AssetPropertyExt::getAssetMainId, AssetPropertyExt::getRoomNumber));


        Long userId = tokenService.getLoginUser().getUserId();


        if (!SecurityUtils.isAdmin(userId)) {


        SysUser sysUser = sysUserService.selectUserById(userId);


        if (!SecurityUtils.isAdmin(userId) || sysUser.getRoleId() != 1) {


            if (dept.getDeptName().contains("资产管理") || dept.getDeptName().contains("董事长") || dept.getDeptName().contains("总经理")) {


                List<AssetMain> list = assetMainService.lambdaQuery()


                        .eq(AssetMain::getAssetTypeId, assetType.getId())