Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0

Pu Zhibing

2025-03-16 6aa6dc075078cca11be048a267911bd7f74dadcd

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/PartyMemberController.java

@@ -6,11 +6,11 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.sangeshenbian.model.entity.PartyMember;
import com.panzhihua.sangeshenbian.warpper.PartyMemberImportFailedVO;
import com.panzhihua.sangeshenbian.service.IPartyMemberService;
import com.panzhihua.sangeshenbian.warpper.PartyMemberDTO;
import com.panzhihua.sangeshenbian.warpper.PartyMemberQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
@@ -29,6 +29,7 @@

import javax.validation.Valid;
import java.io.IOException;
import java.util.List;

/**
 * <p>
@@ -97,10 +98,13 @@
    }
    @ApiOperation("导入")
    @PostMapping("/import")
    public R<?> importExcel(@RequestPart("file") MultipartFile file) {
    public R<List<PartyMemberImportFailedVO> > importExcel(@RequestPart("file") MultipartFile file) {
        SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian();
        partyMemberService.importExcel(loginUserInfo);
        return R.ok();
        try {
            return R.ok(partyMemberService.importExcel(file,loginUserInfo));
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
    }
    @ApiOperation("审核")
    @GetMapping("/audit/{id}")