Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-06-06 77946261ec663aa1fe7f6f97e550532ed879f982

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java

@@ -20,6 +20,7 @@
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberCard;
import com.doumee.dao.business.model.MemberRole;
import com.doumee.dao.business.vo.MemberExcelVO;
import com.doumee.dao.system.dto.UpdatePwdDto;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.ext.ERPSyncService;
@@ -27,6 +28,7 @@
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromSelfServiceImpl;
import io.swagger.annotations.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -44,7 +46,7 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/member")
public class MemberCloudController extends BaseController {
    @Autowired
//    @Autowired
    private ERPSyncService erpSyncService;
    @Autowired
    private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
@@ -412,4 +414,18 @@
        return ApiResponse.success(memberService.ywFindPage(pageWrap));
    }


    @ApiOperation("阜宁 - 导出Excel")
    @PostMapping("/ywExportExcel")
    @CloudRequiredPermission("business:member:exportExcel")
    public void ywExportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        List<Member> memberList =  memberService.ywFindPage(pageWrap).getRecords();
        List<MemberExcelVO> memberExcelVOList = new ArrayList<MemberExcelVO>();
        for (Member member:memberList) {
            MemberExcelVO memberExcelVO = new MemberExcelVO();
            BeanUtils.copyProperties(member,memberExcelVO);
            memberExcelVOList.add(memberExcelVO);
        }
        ExcelExporter.build(MemberExcelVO.class).export(memberExcelVOList, "人员信息表", response);
    }
}