diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java index 63840c7..eafb17f 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java @@ -54,21 +54,21 @@ public class UserQualificationInfoController { @ApiOperation("详情") @GetMapping("/getInfoById") - public SingleResponse getInfoById(@RequestParam(value = "id", required = false) String id) { + public SingleResponse getInfoById(@RequestParam(value = "id") String id) { Long idLong = Long.parseLong(id); - return SingleResponse.of(new UserQualificationInfoCO()); + return userQualificationInfoService.getInfoById(idLong); } @ApiOperation("删除") - @GetMapping("/remove") - public Response remove(@RequestParam(value = "id", required = false) String id) { + @PutMapping("/remove") + public Response remove(@RequestParam(value = "id") String id) { Long idLong = Long.parseLong(id); userQualificationInfoService.remove(idLong); return SingleResponse.buildSuccess(); } @ApiOperation("删除多个") - @GetMapping("/removeBatch") + @PutMapping("/removeBatch") public Response removeBatch(@Validated @RequestBody UserQualificationInfoRemoveCmd cmd) { userQualificationInfoService.removeBatch(cmd.getIds()); return SingleResponse.buildSuccess(); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java index 2c566c8..1bd7eaa 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java @@ -7,7 +7,9 @@ import com.zcloud.basic.info.persistence.dataobject.UserQualificationInfoDO; import com.zcloud.basic.info.persistence.repository.UserQualificationInfoRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import java.util.List; @@ -35,8 +37,19 @@ public class UserQualificationInfoQueryExe { public PageResponse execute(UserQualificationInfoPageQry userQualificationInfoPageQry) { Map params = PageQueryHelper.toHashMap(userQualificationInfoPageQry); PageResponse pageResponse = userQualificationInfoRepository.listPage(params); - List examCenterCOS = userQualificationInfoCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + List examCenterCOS = userQualificationInfoCoConvertor.converDOsToCOs(pageResponse.getData()); + //TODO 获取图片url信息 + + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public SingleResponse execute(Long id) { + SingleResponse userQualificationInfoDO = userQualificationInfoRepository.getInfoById(id); + SingleResponse userQualificationInfoCO = new SingleResponse<>(); + BeanUtils.copyProperties(userQualificationInfoDO,userQualificationInfoCO); + //TODO 获取图片url信息 + + return userQualificationInfoCO; } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/UserQualificationInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/UserQualificationInfoServiceImpl.java index 2c98409..1be261d 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/UserQualificationInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/UserQualificationInfoServiceImpl.java @@ -34,6 +34,11 @@ public class UserQualificationInfoServiceImpl implements UserQualificationInfoSe return userQualificationInfoQueryExe.execute(qry); } + @Override + public SingleResponse getInfoById(Long id) { + return userQualificationInfoQueryExe.execute(id); + } + @Override public SingleResponse add(UserQualificationInfoAddCmd cmd) { diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/UserQualificationInfoServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/UserQualificationInfoServiceI.java index 76378a7..7f56b85 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/UserQualificationInfoServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/UserQualificationInfoServiceI.java @@ -16,6 +16,8 @@ import com.alibaba.cola.dto.SingleResponse; public interface UserQualificationInfoServiceI { PageResponse listPage(UserQualificationInfoPageQry qry); + SingleResponse getInfoById(Long id); + SingleResponse add(UserQualificationInfoAddCmd cmd); void edit(UserQualificationInfoUpdateCmd cmd); diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoAddCmd.java index f7e4c85..99537c9 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoAddCmd.java @@ -20,6 +20,11 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor public class UserQualificationInfoAddCmd extends Command { + + @ApiModelProperty(value = "人员资质id", name = "userQualificationinfoId", required = true) + @NotEmpty(message = "人员资质id") + private String userQualificationinfoId; + @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) @NotNull(message = "企业id不能为空") private Long corpinfoId; @@ -34,7 +39,7 @@ public class UserQualificationInfoAddCmd extends Command { @ApiModelProperty(value = "人员资质证书有效期", name = "validityTime", required = true) @NotNull(message = "人员资质证书有效期不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date validityTime; @ApiModelProperty(value = "证书编号", name = "certificateNo", required = true) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java index 6fa6285..e69e26e 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java @@ -1,6 +1,7 @@ package com.zcloud.basic.info.dto; import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,6 +24,19 @@ public class UserQualificationInfoPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private String likeUserQualificationinfoId; + @ApiModelProperty(value = "企业id", name = "eqCorpinfoId") + private Long eqCorpinfoId; + + @ApiModelProperty(value = "用户id", name = "eqUserId") + private Long eqUserId; + + @ApiModelProperty(value = "证书名称编号模糊查询", name = "keyWords") + private String keyWords; + + @ApiModelProperty(value = "结束时间", name = "startDate") + private String leValidityTime; + + @ApiModelProperty(value = "开始时间", name = "endDate") + private String geValidityTime; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoUpdateCmd.java index 6855dcb..f481959 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoUpdateCmd.java @@ -37,7 +37,7 @@ public class UserQualificationInfoUpdateCmd extends Command { private String qualificationName; @ApiModelProperty(value = "人员资质证书有效期", name = "validityTime", required = true) @NotNull(message = "人员资质证书有效期不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date validityTime; @ApiModelProperty(value = "证书编号", name = "certificateNo", required = true) @NotEmpty(message = "证书编号不能为空") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserQualificationInfoCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserQualificationInfoCO.java index de7b9d2..f9a48d6 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserQualificationInfoCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserQualificationInfoCO.java @@ -1,6 +1,7 @@ package com.zcloud.basic.info.dto.clientobject; import com.alibaba.cola.dto.ClientObject; +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java index 7c50413..6428f12 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java @@ -1,7 +1,9 @@ package com.zcloud.basic.info.domain.model; +import com.alibaba.cola.domain.Entity; import com.jjb.saas.framework.domain.model.BaseE; import lombok.Data; +import lombok.EqualsAndHashCode; import java.time.LocalDateTime; import java.util.Date; @@ -12,6 +14,8 @@ import java.util.Date; * @Date 2025-10-31 09:50:29 */ @Data +@Entity +@EqualsAndHashCode(callSuper = true) public class UserQualificationInfoE extends BaseE { //主键 private Long id; @@ -27,6 +31,8 @@ public class UserQualificationInfoE extends BaseE { private Date validityTime; //证书编号 private String certificateNo; + + //是否删除 private String deleteEnum; //租户id diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserQualificationInfoGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserQualificationInfoGatewayImpl.java index 50c1c49..59149ba 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserQualificationInfoGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserQualificationInfoGatewayImpl.java @@ -4,7 +4,9 @@ import com.zcloud.basic.info.domain.gateway.UserQualificationInfoGateway; import com.zcloud.basic.info.domain.model.UserQualificationInfoE; import com.zcloud.basic.info.persistence.dataobject.UserQualificationInfoDO; import com.zcloud.basic.info.persistence.repository.UserQualificationInfoRepository; +import com.zcloud.gbscommon.utils.UuidUtil; import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -24,6 +26,9 @@ public class UserQualificationInfoGatewayImpl implements UserQualificationInfoGa public Boolean add(UserQualificationInfoE userQualificationInfoE) { UserQualificationInfoDO d = new UserQualificationInfoDO(); BeanUtils.copyProperties(userQualificationInfoE, d); + if(StringUtils.isEmpty(d.getUserQualificationinfoId())){ + d.setUserQualificationinfoId(UuidUtil.get32UUID()); + } userQualificationInfoRepository.save(d); return true; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserQualificationInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserQualificationInfoRepository.java index 57d851f..ef3afd3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserQualificationInfoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserQualificationInfoRepository.java @@ -1,5 +1,6 @@ package com.zcloud.basic.info.persistence.repository; +import com.alibaba.cola.dto.SingleResponse; import com.zcloud.basic.info.persistence.dataobject.UserQualificationInfoDO; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; @@ -12,5 +13,7 @@ import java.util.Map; */ public interface UserQualificationInfoRepository extends BaseRepository { PageResponse listPage(Map params); + + SingleResponse getInfoById(Long id); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java index 4c76f0e..2f8d41c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java @@ -1,5 +1,6 @@ package com.zcloud.basic.info.persistence.repository.impl; +import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.repository.common.PageHelper; import com.zcloud.basic.info.persistence.dataobject.UserQualificationInfoDO; import com.zcloud.basic.info.persistence.mapper.UserQualificationInfoMapper; @@ -10,6 +11,7 @@ import com.zcloud.gbscommon.utils.Query; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.gbscommon.utils.Tools; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.Map; @@ -26,12 +28,21 @@ public class UserQualificationInfoRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { - IPage iPage = new Query().getPage(params); + Object keyWords = params.get("keyWords"); + IPage iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + if (keyWords != null && !Tools.isEmpty(keyWords.toString())) { + queryWrapper.and(i -> i.like("qualification_name", keyWords).or().like("certificate_no", keyWords)); + } queryWrapper.orderByDesc("create_time"); IPage result = userQualificationInfoMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public SingleResponse getInfoById(Long id) { + return SingleResponse.of(userQualificationInfoMapper.selectById(id)); + } }