git ch

k94314517

2025-07-04 50fb58286ed3b718c39a97e0987ee7561a295651

git ch

 server/platform/src/main/java/com/doumee/api/business/MemberController.java

@@ -8,17 +8,21 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dto.MemberImport;
import com.doumee.dao.business.dto.MemberQueryDTO;
import com.doumee.dao.business.dto.MemberReduceImport;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.MemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.*;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;

import java.io.File;
import java.util.ArrayList;
import java.util.List;

@@ -110,6 +114,23 @@
        return ApiResponse.success(memberService.findListByDTO(memberQueryDTO));
    }

    @ApiOperation(value = "人员信息导入" ,notes = "保单申请")
    @PostMapping("/importExcel")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
    })
    public ApiResponse<List<MemberImport>> importExcel (@ApiParam(value = "file") MultipartFile file, Integer  solutionId) {
        return ApiResponse.success(memberService.importBatch(file,solutionId));
    }


    @ApiOperation(value = "人员减保信息导入" ,notes = "保单申请")
    @PostMapping("/importReuduceExcel")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
    })
    public ApiResponse<List<MemberReduceImport>> importReuduceExcel (@ApiParam(value = "file") MultipartFile file, Integer  applyId) {
        return ApiResponse.success(memberService.importReduceBatch(file,applyId));
    }

}

 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -414,9 +414,9 @@
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请选择有效的方案再进行操作！");
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业人员无法进行该操作");
        }
//        if(!loginUserInfo.getType().equals(Constants.ONE)){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业人员无法进行该操作");
//        }
        ExcelImporter ie = null;
        List<MemberReduceImport> dataList =null;
        try {
@@ -430,9 +430,9 @@
        }

        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyId);
        if (Objects.isNull(insuranceApply) || !Constants.equalsInteger(insuranceApply.getCompanyId(),loginUserInfo.getCompanyId())) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，保单信息不存在，请刷新页面重试！");
        }
//        if (Objects.isNull(insuranceApply) || !Constants.equalsInteger(insuranceApply.getCompanyId(),loginUserInfo.getCompanyId())) {
//            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，保单信息不存在，请刷新页面重试！");
//        }
        if (!(Constants.equalsInteger(insuranceApply.getStatus(), Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
                ||Constants.equalsInteger(insuranceApply.getStatus(), Constants.InsuranceApplyStatus.WTB_DONE.getKey())
        )) {
@@ -533,9 +533,9 @@
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请选择有效的方案再进行操作！");
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业人员无法进行该操作");
        }
//        if(!loginUserInfo.getType().equals(Constants.ONE)){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业人员无法进行该操作");
//        }
        if(Objects.isNull(solutionId)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"参数错误 - 方案信息");
        }