认证类型
This commit is contained in:
parent
8f8443a81a
commit
25902ecc99
|
@ -493,7 +493,8 @@ public class UserController {
|
||||||
artificer.setLifePhoto(certification.getImagePhoto());
|
artificer.setLifePhoto(certification.getImagePhoto());
|
||||||
artificer.setCertificate(certification.getCertification());
|
artificer.setCertificate(certification.getCertification());
|
||||||
artificer.setContent(certification.getIndividualResume());
|
artificer.setContent(certification.getIndividualResume());
|
||||||
artificer.setClassifyId(certification.getClassifyId());
|
//需要修改1111111111111
|
||||||
|
// artificer.setClassifyId(certification.getClassifyId());
|
||||||
if(artificer.getArtificerId()!=null){
|
if(artificer.getArtificerId()!=null){
|
||||||
artificerService.updateById(artificer);
|
artificerService.updateById(artificer);
|
||||||
}else{
|
}else{
|
||||||
|
|
|
@ -28,7 +28,7 @@ public class RealNameController {
|
||||||
|
|
||||||
@ApiOperation("查看实名认证列表")
|
@ApiOperation("查看实名认证列表")
|
||||||
@GetMapping(value = "selectRealNameList")
|
@GetMapping(value = "selectRealNameList")
|
||||||
public Result selectRealNameList(Integer page, Integer limit, Integer status, String userName, String phone,Long classifyId){
|
public Result selectRealNameList(Integer page, Integer limit, Integer status, String userName, String phone,String classifyId){
|
||||||
return realNameService.selectRealNameList(page, limit, status, userName, phone,classifyId);
|
return realNameService.selectRealNameList(page, limit, status, userName, phone,classifyId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
package com.sqx.modules.artificer.dao;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
import com.sqx.modules.artificer.entity.ArtificerClassify;
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface ArtificerClassifyDao extends BaseMapper<ArtificerClassify> {
|
||||||
|
}
|
|
@ -0,0 +1,42 @@
|
||||||
|
package com.sqx.modules.artificer.entity;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @description 技师认证类型关联表
|
||||||
|
* @author coalei
|
||||||
|
* @date 2024-08-13
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@TableName("artificer_classify")
|
||||||
|
public class ArtificerClassify implements Serializable {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
@TableId(type = IdType.AUTO)
|
||||||
|
/**
|
||||||
|
* 用户id
|
||||||
|
*/
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 认证类型ID
|
||||||
|
*/
|
||||||
|
private Long classifyId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 认证类型
|
||||||
|
*/
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String classifyName;
|
||||||
|
|
||||||
|
public ArtificerClassify() {}
|
||||||
|
}
|
|
@ -9,6 +9,7 @@ import lombok.Data;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class Certification implements Serializable {
|
public class Certification implements Serializable {
|
||||||
|
@ -84,7 +85,7 @@ public class Certification implements Serializable {
|
||||||
@ApiModelProperty("头像")
|
@ApiModelProperty("头像")
|
||||||
private String avatar;
|
private String avatar;
|
||||||
|
|
||||||
private Long classifyId;
|
private String classifyId;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String classifyName;
|
private String classifyName;
|
||||||
|
@ -94,5 +95,9 @@ public class Certification implements Serializable {
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private Long agencyId;
|
private Long agencyId;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private List<ArtificerClassify> artificerClassifyList;
|
||||||
|
|
||||||
public Certification() {}
|
public Certification() {}
|
||||||
}
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
package com.sqx.modules.artificer.service;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
import com.sqx.modules.artificer.entity.ArtificerClassify;
|
||||||
|
|
||||||
|
public interface ArtificerClassifyService extends IService<ArtificerClassify> {
|
||||||
|
|
||||||
|
}
|
|
@ -10,7 +10,7 @@ public interface RealNameService extends IService<Certification> {
|
||||||
|
|
||||||
Result updateRealName(Certification certification);
|
Result updateRealName(Certification certification);
|
||||||
|
|
||||||
Result selectRealNameList(Integer page, Integer limit, Integer status, String userName, String phone,Long classifyId);
|
Result selectRealNameList(Integer page, Integer limit, Integer status, String userName, String phone,String classifyId);
|
||||||
|
|
||||||
Result auditRealName(Certification certification);
|
Result auditRealName(Certification certification);
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
package com.sqx.modules.artificer.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import com.sqx.modules.artificer.dao.ArtificerClassifyDao;
|
||||||
|
import com.sqx.modules.artificer.entity.ArtificerClassify;
|
||||||
|
import com.sqx.modules.artificer.service.ArtificerClassifyService;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class ArtificerClassifyServiceImpl extends ServiceImpl<ArtificerClassifyDao, ArtificerClassify> implements ArtificerClassifyService {
|
||||||
|
|
||||||
|
}
|
|
@ -15,7 +15,9 @@ import com.sqx.modules.app.service.UserService;
|
||||||
import com.sqx.modules.artificer.dao.OrdersDao;
|
import com.sqx.modules.artificer.dao.OrdersDao;
|
||||||
import com.sqx.modules.artificer.dao.RealNameDao;
|
import com.sqx.modules.artificer.dao.RealNameDao;
|
||||||
import com.sqx.modules.artificer.entity.Artificer;
|
import com.sqx.modules.artificer.entity.Artificer;
|
||||||
|
import com.sqx.modules.artificer.entity.ArtificerClassify;
|
||||||
import com.sqx.modules.artificer.entity.Certification;
|
import com.sqx.modules.artificer.entity.Certification;
|
||||||
|
import com.sqx.modules.artificer.service.ArtificerClassifyService;
|
||||||
import com.sqx.modules.artificer.service.ArtificerService;
|
import com.sqx.modules.artificer.service.ArtificerService;
|
||||||
import com.sqx.modules.artificer.service.RealNameService;
|
import com.sqx.modules.artificer.service.RealNameService;
|
||||||
import com.sqx.modules.common.service.CommonInfoService;
|
import com.sqx.modules.common.service.CommonInfoService;
|
||||||
|
@ -27,6 +29,7 @@ import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -49,6 +52,8 @@ public class RealNameServiceImpl extends ServiceImpl<RealNameDao, Certification>
|
||||||
private UserMoneyDetailsService userMoneyDetailsService;
|
private UserMoneyDetailsService userMoneyDetailsService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private SysDictService sysDictService;
|
private SysDictService sysDictService;
|
||||||
|
@Autowired
|
||||||
|
private ArtificerClassifyService artificerClassifyService;
|
||||||
|
|
||||||
private ReentrantReadWriteLock reentrantReadWriteLock=new ReentrantReadWriteLock(true);
|
private ReentrantReadWriteLock reentrantReadWriteLock=new ReentrantReadWriteLock(true);
|
||||||
|
|
||||||
|
@ -97,23 +102,49 @@ public class RealNameServiceImpl extends ServiceImpl<RealNameDao, Certification>
|
||||||
baseMapper.delete(new QueryWrapper<Certification>().eq("user_id",certification.getUserId()));
|
baseMapper.delete(new QueryWrapper<Certification>().eq("user_id",certification.getUserId()));
|
||||||
baseMapper.insert(certification);
|
baseMapper.insert(certification);
|
||||||
}
|
}
|
||||||
|
//入技师认证类型关联表
|
||||||
|
String classifyIds = certification.getClassifyId();
|
||||||
|
String[] classifyArr = classifyIds.split(",");
|
||||||
|
if(classifyArr.length>0){
|
||||||
|
for(int i=0;i<classifyArr.length;i++){
|
||||||
|
String classifyIdStr = classifyArr[i];
|
||||||
|
Long classifyId = Long.valueOf(classifyIdStr);
|
||||||
|
ArtificerClassify artificerClassify = new ArtificerClassify();
|
||||||
|
artificerClassify.setUserId(certification.getUserId());
|
||||||
|
artificerClassify.setClassifyId(classifyId);
|
||||||
|
artificerClassifyService.save(artificerClassify);
|
||||||
|
}
|
||||||
|
}
|
||||||
return Result.success();
|
return Result.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Result selectRealNameList(Integer page, Integer limit, Integer status, String userName, String phone,Long classifyId) {
|
public Result selectRealNameList(Integer page, Integer limit, Integer status, String userName, String phone,String classifyId) {
|
||||||
Page<Certification> pages = new Page<>(page, limit);
|
Page<Certification> pages = new Page<>(page, limit);
|
||||||
IPage<Certification> certificationIPage = baseMapper.selectPage(pages, new QueryWrapper<Certification>()
|
IPage<Certification> certificationIPage = baseMapper.selectPage(pages, new QueryWrapper<Certification>()
|
||||||
.eq(status != null, "status", status)
|
.eq(status != null, "status", status)
|
||||||
.eq(StringUtils.isNotEmpty(userName), "name", userName)
|
.eq(StringUtils.isNotEmpty(userName), "name", userName)
|
||||||
.eq(classifyId != null, "classify_id", classifyId)
|
.like(StringUtils.isNotEmpty(classifyId), "classify_id", classifyId)
|
||||||
.eq(StringUtils.isNotEmpty(phone), "phone", phone).orderByDesc("create_time"));
|
.eq(StringUtils.isNotEmpty(phone), "phone", phone).orderByDesc("create_time"));
|
||||||
List<Certification> records = certificationIPage.getRecords();
|
List<Certification> records = certificationIPage.getRecords();
|
||||||
for (Certification certification:records){
|
for (Certification certification:records){
|
||||||
if(certification.getClassifyId()!=null){
|
if(certification.getClassifyId()!=null&&!certification.equals("")){
|
||||||
SysDictEntity sysDictEntity = sysDictService.getById(certification.getClassifyId());
|
String classifyIds = certification.getClassifyId();
|
||||||
if(sysDictEntity!=null){
|
String[] classifyArr = classifyIds.split(",");
|
||||||
certification.setClassifyName(sysDictEntity.getValue());
|
if(classifyArr.length>0){
|
||||||
|
List<ArtificerClassify> artificerClassifyList = new ArrayList<ArtificerClassify>();
|
||||||
|
for(int i=0;i<classifyArr.length;i++){
|
||||||
|
String classifyIdStr = classifyArr[i];
|
||||||
|
Long cid = Long.valueOf(classifyIdStr);
|
||||||
|
SysDictEntity sysDictEntity = sysDictService.getById(cid);
|
||||||
|
if(sysDictEntity!=null){
|
||||||
|
ArtificerClassify artificerClassify = new ArtificerClassify();
|
||||||
|
artificerClassify.setClassifyId(cid);
|
||||||
|
artificerClassify.setClassifyName(sysDictEntity.getValue());
|
||||||
|
artificerClassifyList.add(artificerClassify);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
certification.setArtificerClassifyList(artificerClassifyList);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -142,7 +173,7 @@ public class RealNameServiceImpl extends ServiceImpl<RealNameDao, Certification>
|
||||||
artificer.setLifePhoto(certification1.getImagePhoto());
|
artificer.setLifePhoto(certification1.getImagePhoto());
|
||||||
artificer.setCertificate(certification1.getCertification());
|
artificer.setCertificate(certification1.getCertification());
|
||||||
artificer.setContent(certification1.getIndividualResume());
|
artificer.setContent(certification1.getIndividualResume());
|
||||||
artificer.setClassifyId(certification1.getClassifyId());
|
// artificer.setClassifyId(certification1.getClassifyId());
|
||||||
artificer.setCreditScore(BigDecimal.valueOf(100));
|
artificer.setCreditScore(BigDecimal.valueOf(100));
|
||||||
artificer.setTripWay(1);
|
artificer.setTripWay(1);
|
||||||
if(artificer.getArtificerId()!=null){
|
if(artificer.getArtificerId()!=null){
|
||||||
|
|
|
@ -103,7 +103,7 @@
|
||||||
5.00) as ordersScore
|
5.00) as ordersScore
|
||||||
from artificer a
|
from artificer a
|
||||||
left join tb_user u on a.user_id = u.user_id
|
left join tb_user u on a.user_id = u.user_id
|
||||||
where a.user_id = #{artificerId}
|
where a.user_id = #{userId}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectArtificerByStatus" resultType="int">
|
<select id="selectArtificerByStatus" resultType="int">
|
||||||
|
|
Loading…
Reference in New Issue