Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/java/com/ots/project/exam/controller/EntTestPackageController.java

@@ -1,5 +1,4 @@
package com.ots.project.exam.controller;

import com.ots.common.enums.UserTypeEnum;
import com.ots.common.utils.MessageUtils;
import com.ots.common.utils.StringUtils;
@@ -12,6 +11,7 @@
import com.ots.framework.web.page.TableDataInfo;
import com.ots.project.exam.domain.EntDemographyParam;
import com.ots.project.exam.domain.EntEmailTemplate;
import com.ots.project.exam.domain.EntTestMember;
import com.ots.project.exam.domain.EntTestPackage;
import com.ots.project.exam.domain.SysUserExtend;
import com.ots.project.exam.service.*;
@@ -26,12 +26,11 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

import static com.ots.common.enums.UserTypeEnum.SYS_USER;

/**
@@ -124,7 +123,25 @@
    @PostMapping("/export")
    @ResponseBody
    public AjaxResult export(EntTestPackage entTestPackage) {
        User sysUser = ShiroUtils.getSysUser();
        String userType = sysUser.getUserType();
        List<Long> userIds = new ArrayList<>();
        userIds.add(sysUser.getUserId());

        if (UserTypeEnum.DIS_USER.getUserType().equals(userType)) {
            SysUserExtend sysUserExtend = new SysUserExtend();
            sysUserExtend.setParentUserId(sysUser.getUserId());
            List<SysUserExtend> sysUserExtends = sysUserExtendService.selectSysUserExtendList(sysUserExtend);
            for (int i = 0; i < sysUserExtends.size(); i++) {
                SysUserExtend extend = sysUserExtends.get(i);
                userIds.add(extend.getUserId());
            }
        }
        List<EntTestPackage> list = entTestPackageService.selectEntTestPackageList(entTestPackage);
        if (!SYS_USER.getUserType().equals(userType)) {

            list = list.stream().filter(p -> userIds.contains(p.getUserId())).collect(Collectors.toList());
        }
        ExcelUtil<EntTestPackage> util = new ExcelUtil<EntTestPackage>(EntTestPackage.class);
        return util.exportExcel(list, "test_package");
    }
@@ -188,10 +205,8 @@
    public String edit(@PathVariable("id") Long id, ModelMap mmap) {
        EntTestPackage entTestPackage = entTestPackageService.selectEntTestPackageById(id);
        mmap.put("entTestPackage", entTestPackage);

        EntDemographyParam entDemographyParam = new EntDemographyParam();
        List<EntDemographyParam> list = entDemographyParamService.selectEntDemographyParamList(entDemographyParam);

        String paramCodes = entTestPackage.getParamCodes();
        /**
         * 默认全部为false