3.19优化
This commit is contained in:
		@ -12,4 +12,5 @@ import lombok.experimental.Accessors;
 | 
			
		||||
@Accessors(chain = true)
 | 
			
		||||
@ApiModel("请假·历史请假记录请求对象")
 | 
			
		||||
public class WgzAppLeaveHistoryListPageReq extends PageReq {
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -70,8 +70,8 @@ public class WgzAppRealNameAuthenticationReq implements Serializable {
 | 
			
		||||
	@NotBlank(message = "银行卡号不能为空")
 | 
			
		||||
	private String cardNo;
 | 
			
		||||
 | 
			
		||||
	@ApiModelProperty("附件实体数据")
 | 
			
		||||
	private List<Annex> annex;
 | 
			
		||||
//	@ApiModelProperty("附件实体数据")
 | 
			
		||||
//	private List<Annex> annex;
 | 
			
		||||
 | 
			
		||||
	@ApiModelProperty("工种,多个逗号分隔")
 | 
			
		||||
	private String typeOfWork;
 | 
			
		||||
 | 
			
		||||
@ -0,0 +1,20 @@
 | 
			
		||||
package com.ruoyi.wgz.bo.req;
 | 
			
		||||
 | 
			
		||||
import com.ruoyi.common.domain.Annex;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
import lombok.NoArgsConstructor;
 | 
			
		||||
import lombok.experimental.Accessors;
 | 
			
		||||
 | 
			
		||||
import java.io.Serializable;
 | 
			
		||||
import java.util.List;
 | 
			
		||||
 | 
			
		||||
@Data
 | 
			
		||||
@NoArgsConstructor
 | 
			
		||||
@Accessors(chain = true)
 | 
			
		||||
@ApiModel("附件新增请求对象")
 | 
			
		||||
public class WgzAppUserDeleteAttachmentAdd implements Serializable {
 | 
			
		||||
	@ApiModelProperty("附件实体数据")
 | 
			
		||||
	private List<Annex> annex;
 | 
			
		||||
}
 | 
			
		||||
@ -0,0 +1,20 @@
 | 
			
		||||
package com.ruoyi.wgz.bo.res;
 | 
			
		||||
 | 
			
		||||
import com.ruoyi.wgz.bo.rests.WgzAppUserAllRecruitmentTwo;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
import lombok.NoArgsConstructor;
 | 
			
		||||
import lombok.experimental.Accessors;
 | 
			
		||||
 | 
			
		||||
import java.io.Serializable;
 | 
			
		||||
import java.util.List;
 | 
			
		||||
 | 
			
		||||
@Data
 | 
			
		||||
@NoArgsConstructor
 | 
			
		||||
@Accessors(chain = true)
 | 
			
		||||
@ApiModel("项目进行中返回对象")
 | 
			
		||||
public class WgzAppUserAllRecruitmentRes implements Serializable {
 | 
			
		||||
	@ApiModelProperty("列表")
 | 
			
		||||
	private List<WgzAppUserAllRecruitmentTwo> list;
 | 
			
		||||
}
 | 
			
		||||
@ -0,0 +1,24 @@
 | 
			
		||||
package com.ruoyi.wgz.bo.rests;
 | 
			
		||||
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
import lombok.NoArgsConstructor;
 | 
			
		||||
import lombok.experimental.Accessors;
 | 
			
		||||
 | 
			
		||||
import java.io.Serializable;
 | 
			
		||||
 | 
			
		||||
@Data
 | 
			
		||||
@NoArgsConstructor
 | 
			
		||||
@Accessors(chain = true)
 | 
			
		||||
@ApiModel("获取当前用户的所有招工信息返回")
 | 
			
		||||
public class WgzAppUserAllRecruitmentTwo implements Serializable {
 | 
			
		||||
	@ApiModelProperty("主键ID")
 | 
			
		||||
	private Long recruitId;
 | 
			
		||||
 | 
			
		||||
	@ApiModelProperty("招工名称")
 | 
			
		||||
	private String recruitName;
 | 
			
		||||
 | 
			
		||||
	@ApiModelProperty("1当前招工 2历史招工")
 | 
			
		||||
	private String type;
 | 
			
		||||
}
 | 
			
		||||
@ -12,6 +12,7 @@ import com.ruoyi.common.domain.Annex;
 | 
			
		||||
import com.ruoyi.common.domain.dto.AnnexDTO;
 | 
			
		||||
import com.ruoyi.common.service.IAnnexService;
 | 
			
		||||
import com.ruoyi.common.util.DataUtil;
 | 
			
		||||
import com.ruoyi.common.util.ValidUtil;
 | 
			
		||||
import com.ruoyi.common.utils.PageUtils;
 | 
			
		||||
import com.ruoyi.common.utils.SecurityUtils;
 | 
			
		||||
import com.ruoyi.system.service.ISysDictTypeService;
 | 
			
		||||
@ -199,6 +200,13 @@ public class WgzUserServiceImpl extends ServicePlusImpl<WgzUserMapper, WgzUser>
 | 
			
		||||
	@Override
 | 
			
		||||
	@Transactional()
 | 
			
		||||
	public Boolean userRealNameAuthentication(WgzAppRealNameAuthenticationReq req) {
 | 
			
		||||
		if (!ValidUtil.isValidIdentityCard(req.getIdentityCard())){
 | 
			
		||||
			throw new RuntimeException("请检查身份证!");
 | 
			
		||||
		}
 | 
			
		||||
		if(!ValidUtil.isValidBankCard(req.getCardNo())){
 | 
			
		||||
			throw new RuntimeException("请检查银行卡!");
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		//1、对指定用户进行实名认证
 | 
			
		||||
		WgzUser user = new WgzUser();
 | 
			
		||||
		BeanUtils.copyProperties(req, user);
 | 
			
		||||
@ -206,20 +214,16 @@ public class WgzUserServiceImpl extends ServicePlusImpl<WgzUserMapper, WgzUser>
 | 
			
		||||
		if (update == 0){
 | 
			
		||||
			throw new RuntimeException("当前用户不存在!");
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		//2、新增附件
 | 
			
		||||
		List<Annex> annex = req.getAnnex();
 | 
			
		||||
		List<AnnexDTO> annexDTOS = new ArrayList<>();
 | 
			
		||||
		for (Annex data : annex) {
 | 
			
		||||
			AnnexDTO dto = new AnnexDTO();
 | 
			
		||||
			BeanUtils.copyProperties(data, dto);
 | 
			
		||||
			dto.setUserId(req.getUserId()).setUserType(WGZ);
 | 
			
		||||
//				setAnnexType(data.getAnnexType()).
 | 
			
		||||
//				setAnnexName(data.getAnnexName()).
 | 
			
		||||
//				setAnnexUrl(data.getAnnexUrl());
 | 
			
		||||
			annexDTOS.add(dto);
 | 
			
		||||
		}
 | 
			
		||||
		iAnnexService.insertBatch(annexDTOS);
 | 
			
		||||
//		//2、新增附件
 | 
			
		||||
//		List<Annex> annex = req.getAnnex();
 | 
			
		||||
//		List<AnnexDTO> annexDTOS = new ArrayList<>();
 | 
			
		||||
//		for (Annex data : annex) {
 | 
			
		||||
//			AnnexDTO dto = new AnnexDTO();
 | 
			
		||||
//			BeanUtils.copyProperties(data, dto);
 | 
			
		||||
//			dto.setUserId(req.getUserId()).setUserType(WGZ);
 | 
			
		||||
//			annexDTOS.add(dto);
 | 
			
		||||
//		}
 | 
			
		||||
//		iAnnexService.insertBatch(annexDTOS);
 | 
			
		||||
		return true;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user