diff --git a/src/main/java/com/sqx/modules/app/controller/UserController.java b/src/main/java/com/sqx/modules/app/controller/UserController.java index f5da807..7f78a81 100644 --- a/src/main/java/com/sqx/modules/app/controller/UserController.java +++ b/src/main/java/com/sqx/modules/app/controller/UserController.java @@ -493,7 +493,8 @@ public class UserController { artificer.setLifePhoto(certification.getImagePhoto()); artificer.setCertificate(certification.getCertification()); artificer.setContent(certification.getIndividualResume()); - artificer.setClassifyId(certification.getClassifyId()); + //需要修改1111111111111 +// artificer.setClassifyId(certification.getClassifyId()); if(artificer.getArtificerId()!=null){ artificerService.updateById(artificer); }else{ diff --git a/src/main/java/com/sqx/modules/artificer/controller/RealNameController.java b/src/main/java/com/sqx/modules/artificer/controller/RealNameController.java index 7a1456d..f6513c8 100644 --- a/src/main/java/com/sqx/modules/artificer/controller/RealNameController.java +++ b/src/main/java/com/sqx/modules/artificer/controller/RealNameController.java @@ -28,7 +28,7 @@ public class RealNameController { @ApiOperation("查看实名认证列表") @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); } diff --git a/src/main/java/com/sqx/modules/artificer/dao/ArtificerClassifyDao.java b/src/main/java/com/sqx/modules/artificer/dao/ArtificerClassifyDao.java new file mode 100644 index 0000000..8a3f568 --- /dev/null +++ b/src/main/java/com/sqx/modules/artificer/dao/ArtificerClassifyDao.java @@ -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 { +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/entity/ArtificerClassify.java b/src/main/java/com/sqx/modules/artificer/entity/ArtificerClassify.java new file mode 100644 index 0000000..8a8012b --- /dev/null +++ b/src/main/java/com/sqx/modules/artificer/entity/ArtificerClassify.java @@ -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() {} +} diff --git a/src/main/java/com/sqx/modules/artificer/entity/Certification.java b/src/main/java/com/sqx/modules/artificer/entity/Certification.java index 0ae8d06..45df8e6 100644 --- a/src/main/java/com/sqx/modules/artificer/entity/Certification.java +++ b/src/main/java/com/sqx/modules/artificer/entity/Certification.java @@ -9,6 +9,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; +import java.util.List; @Data public class Certification implements Serializable { @@ -84,7 +85,7 @@ public class Certification implements Serializable { @ApiModelProperty("头像") private String avatar; - private Long classifyId; + private String classifyId; @TableField(exist = false) private String classifyName; @@ -94,5 +95,9 @@ public class Certification implements Serializable { @TableField(exist = false) private Long agencyId; + + @TableField(exist = false) + private List artificerClassifyList; + public Certification() {} } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/service/ArtificerClassifyService.java b/src/main/java/com/sqx/modules/artificer/service/ArtificerClassifyService.java new file mode 100644 index 0000000..bb6825b --- /dev/null +++ b/src/main/java/com/sqx/modules/artificer/service/ArtificerClassifyService.java @@ -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 { + +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/service/RealNameService.java b/src/main/java/com/sqx/modules/artificer/service/RealNameService.java index 99e2fd3..61e10e2 100644 --- a/src/main/java/com/sqx/modules/artificer/service/RealNameService.java +++ b/src/main/java/com/sqx/modules/artificer/service/RealNameService.java @@ -10,7 +10,7 @@ public interface RealNameService extends IService { 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); diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerClassifyServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerClassifyServiceImpl.java new file mode 100644 index 0000000..0ec8226 --- /dev/null +++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerClassifyServiceImpl.java @@ -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 implements ArtificerClassifyService { + +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/RealNameServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/RealNameServiceImpl.java index d4610e4..45c44ba 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/RealNameServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/RealNameServiceImpl.java @@ -15,7 +15,9 @@ import com.sqx.modules.app.service.UserService; import com.sqx.modules.artificer.dao.OrdersDao; import com.sqx.modules.artificer.dao.RealNameDao; 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.service.ArtificerClassifyService; import com.sqx.modules.artificer.service.ArtificerService; import com.sqx.modules.artificer.service.RealNameService; import com.sqx.modules.common.service.CommonInfoService; @@ -27,6 +29,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -49,6 +52,8 @@ public class RealNameServiceImpl extends ServiceImpl private UserMoneyDetailsService userMoneyDetailsService; @Autowired private SysDictService sysDictService; + @Autowired + private ArtificerClassifyService artificerClassifyService; private ReentrantReadWriteLock reentrantReadWriteLock=new ReentrantReadWriteLock(true); @@ -97,23 +102,49 @@ public class RealNameServiceImpl extends ServiceImpl baseMapper.delete(new QueryWrapper().eq("user_id",certification.getUserId())); baseMapper.insert(certification); } + //入技师认证类型关联表 + String classifyIds = certification.getClassifyId(); + String[] classifyArr = classifyIds.split(","); + if(classifyArr.length>0){ + for(int i=0;i pages = new Page<>(page, limit); IPage certificationIPage = baseMapper.selectPage(pages, new QueryWrapper() .eq(status != null, "status", status) .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")); List records = certificationIPage.getRecords(); for (Certification certification:records){ - if(certification.getClassifyId()!=null){ - SysDictEntity sysDictEntity = sysDictService.getById(certification.getClassifyId()); - if(sysDictEntity!=null){ - certification.setClassifyName(sysDictEntity.getValue()); + if(certification.getClassifyId()!=null&&!certification.equals("")){ + String classifyIds = certification.getClassifyId(); + String[] classifyArr = classifyIds.split(","); + if(classifyArr.length>0){ + List artificerClassifyList = new ArrayList(); + for(int i=0;i artificer.setLifePhoto(certification1.getImagePhoto()); artificer.setCertificate(certification1.getCertification()); artificer.setContent(certification1.getIndividualResume()); - artificer.setClassifyId(certification1.getClassifyId()); +// artificer.setClassifyId(certification1.getClassifyId()); artificer.setCreditScore(BigDecimal.valueOf(100)); artificer.setTripWay(1); if(artificer.getArtificerId()!=null){ diff --git a/src/main/resources/mapper/artificer/ArtificerDao.xml b/src/main/resources/mapper/artificer/ArtificerDao.xml index 1a5408b..45ee423 100644 --- a/src/main/resources/mapper/artificer/ArtificerDao.xml +++ b/src/main/resources/mapper/artificer/ArtificerDao.xml @@ -103,7 +103,7 @@ 5.00) as ordersScore from artificer a left join tb_user u on a.user_id = u.user_id - where a.user_id = #{artificerId} + where a.user_id = #{userId}