提交 2c54005b authored 作者: zhouzhigang's avatar zhouzhigang

--no commit message

上级 cdfa1ed0
......@@ -26,7 +26,6 @@ import com.zrqx.core.vo.member.department.DepartmentMemberVo;
import com.zrqx.core.vo.member.department.ImportDepartmentMemberVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import tk.mybatis.mapper.entity.Example;
@RestController
@RequestMapping(MemberRequestPath.BG + MemberRequestPath.DEPARTMENT)
......
package com.zrqx.bg.member.controller.samplebookapply;
import java.util.Comparator;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -19,32 +16,24 @@ import com.zrqx.bg.member.service.department.DepartmentService;
import com.zrqx.bg.member.service.member.MemberService;
import com.zrqx.bg.member.service.samplebookapply.SampleBookApplyService;
import com.zrqx.core.constant.member.MemberRequestPath;
import com.zrqx.core.enums.BooleanStatusEnum;
import com.zrqx.core.enums.member.member.MemberSexEnum;
import com.zrqx.core.enums.member.samplebookapply.SampleBookApplyApplyStatusEnum;
import com.zrqx.core.form.member.bg.member.samplebookapply.QuerySampleBookApplyForm;
import com.zrqx.core.form.member.bg.member.samplebookapply.SaveApplyFailForm;
import com.zrqx.core.form.member.bg.member.samplebookapply.UpdateApplyStatus;
import com.zrqx.core.form.member.bg.member.samplebookapply.UpdateSampleBookApplyStatusForm;
import com.zrqx.core.form.member.bg.school.QuerySchoolForm;
import com.zrqx.core.model.member.departmentmember.DepartmentMember;
import com.zrqx.core.model.member.member.Member;
import com.zrqx.core.model.member.samplebookapply.SampleBookApply;
import com.zrqx.core.model.member.school.School;
import com.zrqx.core.util.bean.BeanUtils;
import com.zrqx.core.util.excelutil.ExcelUtil;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.member.press.ExcelPressVo;
import com.zrqx.core.vo.member.samplebookapply.ExcelSampleBookApplyVo;
import com.zrqx.core.vo.member.samplebookapply.SampleBookApplyVo;
import com.zrqx.core.vo.member.school.ExcelSchoolVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import tk.mybatis.mapper.entity.Example;
import tk.mybatis.mapper.entity.Example.Criteria;
@RestController
@RequestMapping(MemberRequestPath.BG + MemberRequestPath.SAMPLE_BOOK_APPLY)
......
package com.zrqx.bg.member.controller.samplebookvoucher;
import java.util.Comparator;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
......@@ -19,7 +18,6 @@ import com.zrqx.core.util.excelutil.ExcelUtil;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.member.samplebookapply.ExcelSampleBookApplyVo;
import com.zrqx.core.vo.member.samplebookvoucher.ExcelSampleBookVoucherVo;
import com.zrqx.core.vo.member.samplebookvoucher.SampleBookVoucherVo;
import io.swagger.annotations.Api;
......
......@@ -2,15 +2,9 @@ package com.zrqx.bg.member.controller.school;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import tk.mybatis.mapper.entity.Example.Criteria;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -21,23 +15,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.zrqx.bg.member.service.member.MemberService;
import com.zrqx.bg.member.service.school.SchoolService;
import com.zrqx.core.constant.member.MemberRequestPath;
import com.zrqx.core.enums.AuditStatusEnum;
import com.zrqx.core.enums.BooleanStatusEnum;
import com.zrqx.core.enums.MemberTypeEnum;
import com.zrqx.core.enums.StatusEnum;
import com.zrqx.core.exception.BusinessValidateException;
import com.zrqx.core.form.member.bg.member.member.UpdatePasswordForm;
import com.zrqx.core.form.member.bg.school.QuerySchoolForm;
import com.zrqx.core.form.member.bg.school.UpdateSchoolForm;
import com.zrqx.core.model.member.member.Member;
import com.zrqx.core.model.member.school.School;
import com.zrqx.core.util.bean.BeanUtils;
import com.zrqx.core.util.datatype.ArrayUtils;
import com.zrqx.core.util.encry.MD5Util;
import com.zrqx.core.util.excelutil.ExcelUtil;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
......@@ -45,10 +31,8 @@ import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.member.school.ExcelSchoolVo;
import com.zrqx.core.vo.member.school.ImportVo;
import com.zrqx.core.vo.member.school.SchoolVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import tk.mybatis.mapper.entity.Example;
@RestController
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论