web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java

@@ -54,21 +54,21 @@ public class UserQualificationInfoController {
 
     @ApiOperation("详情")
     @GetMapping("/getInfoById")
-    public SingleResponse<UserQualificationInfoCO> getInfoById(@RequestParam(value = "id") String id) {
+    public SingleResponse<UserQualificationInfoCO> getInfoById(@RequestParam(value = "id", required = false) String id) {
         Long idLong = Long.parseLong(id);
-        return userQualificationInfoService.getInfoById(idLong);
+        return SingleResponse.of(new UserQualificationInfoCO());
     }
 
     @ApiOperation("删除")
-    @PutMapping("/remove")
+    @GetMapping("/remove")
-    public Response remove(@RequestParam(value = "id") String id) {
+    public Response remove(@RequestParam(value = "id", required = false) String id) {
         Long idLong = Long.parseLong(id);
         userQualificationInfoService.remove(idLong);
         return SingleResponse.buildSuccess();
     }
 
     @ApiOperation("删除多个")
-    @PutMapping("/removeBatch")
+    @GetMapping("/removeBatch")
         public Response removeBatch(@Validated @RequestBody UserQualificationInfoRemoveCmd cmd) {
         userQualificationInfoService.removeBatch(cmd.getIds());
         return SingleResponse.buildSuccess();

web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java

@@ -7,9 +7,7 @@ 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;
@@ -37,19 +35,8 @@ public class UserQualificationInfoQueryExe {
     public PageResponse<UserQualificationInfoCO> execute(UserQualificationInfoPageQry userQualificationInfoPageQry) {
         Map<String,Object> params = PageQueryHelper.toHashMap(userQualificationInfoPageQry);
         PageResponse<UserQualificationInfoDO> pageResponse = userQualificationInfoRepository.listPage(params);
-        List<UserQualificationInfoCO> examCenterCOS = userQualificationInfoCoConvertor.converDOsToCOs(pageResponse.getData());
+            List<UserQualificationInfoCO> examCenterCOS = userQualificationInfoCoConvertor.converDOsToCOs(pageResponse.getData());
-        //TODO 获取图片url信息
+                return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
-
-        return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
-    }
-
-    public SingleResponse<UserQualificationInfoCO> execute(Long id) {
-        SingleResponse<UserQualificationInfoDO> userQualificationInfoDO = userQualificationInfoRepository.getInfoById(id);
-        SingleResponse<UserQualificationInfoCO> userQualificationInfoCO = new SingleResponse<>();
-        BeanUtils.copyProperties(userQualificationInfoDO,userQualificationInfoCO);
-        //TODO 获取图片url信息
-
-        return userQualificationInfoCO;
     }
 }
 

web-app/src/main/java/com/zcloud/basic/info/service/UserQualificationInfoServiceImpl.java

@@ -34,11 +34,6 @@ public class UserQualificationInfoServiceImpl implements UserQualificationInfoSe
         return userQualificationInfoQueryExe.execute(qry);
     }
 
-    @Override
-    public SingleResponse<UserQualificationInfoCO> getInfoById(Long id) {
-        return userQualificationInfoQueryExe.execute(id);
-    }
-
     @Override
     public SingleResponse add(UserQualificationInfoAddCmd cmd) {
 

web-client/src/main/java/com/zcloud/basic/info/api/UserQualificationInfoServiceI.java

@@ -16,8 +16,6 @@ import com.alibaba.cola.dto.SingleResponse;
 public interface UserQualificationInfoServiceI {
     PageResponse<UserQualificationInfoCO> listPage(UserQualificationInfoPageQry qry);
 
-    SingleResponse<UserQualificationInfoCO> getInfoById(Long id);
-
     SingleResponse<UserQualificationInfoCO> add(UserQualificationInfoAddCmd cmd);
 
     void edit(UserQualificationInfoUpdateCmd cmd);

web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoAddCmd.java

@@ -20,11 +20,6 @@ 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;
@@ -39,7 +34,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)

web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java

@@ -1,7 +1,6 @@
 package com.zcloud.basic.info.dto;
 
 import com.alibaba.cola.dto.PageQuery;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
@@ -24,19 +23,6 @@ public class UserQualificationInfoPageQry extends PageQuery {
 * - `le`: 小于等于比较查询
 * - `ne`: 不等比较查询，对应SQL的!=操作符
 */
-    @ApiModelProperty(value = "企业id", name = "eqCorpinfoId")
+    private String likeUserQualificationinfoId;
-    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;
 }
 

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 = "证书编号不能为空")

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserQualificationInfoCO.java

@@ -1,7 +1,6 @@
 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;

web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java

@@ -1,9 +1,7 @@
 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;
@@ -14,8 +12,6 @@ import java.util.Date;
 * @Date 2025-10-31 09:50:29
 */
 @Data
-@Entity
-@EqualsAndHashCode(callSuper = true)
 public class UserQualificationInfoE extends BaseE {
     //主键
     private Long id;
@@ -31,8 +27,6 @@ public class UserQualificationInfoE extends BaseE {
     private Date validityTime;
     //证书编号
     private String certificateNo;
-
-
     //是否删除
     private String deleteEnum;
     //租户id

web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserQualificationInfoGatewayImpl.java

@@ -4,9 +4,7 @@ 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;
 
@@ -26,9 +24,6 @@ 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;
     }

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserQualificationInfoRepository.java

@@ -1,6 +1,5 @@
 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;
@@ -13,7 +12,5 @@ import java.util.Map;
 */
 public interface UserQualificationInfoRepository extends BaseRepository<UserQualificationInfoDO> {
     PageResponse<UserQualificationInfoDO> listPage(Map<String,Object> params);
-
-    SingleResponse<UserQualificationInfoDO> getInfoById(Long id);
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java

@@ -1,6 +1,5 @@
 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;
@@ -11,7 +10,6 @@ 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;
@@ -28,21 +26,12 @@ public class UserQualificationInfoRepositoryImpl extends BaseRepositoryImpl<User
 
     @Override
     public  PageResponse<UserQualificationInfoDO> listPage(Map<String,Object> params) {
-        Object keyWords = params.get("keyWords");
+    IPage<UserQualificationInfoDO> iPage = new Query<UserQualificationInfoDO>().getPage(params);
-        IPage<UserQualificationInfoDO> iPage = new Query<UserQualificationInfoDO>().getPage(params);
         QueryWrapper<UserQualificationInfoDO> 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<UserQualificationInfoDO> result = userQualificationInfoMapper.selectPage(iPage, queryWrapper);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
-
-    @Override
-    public SingleResponse<UserQualificationInfoDO> getInfoById(Long id) {
-        return SingleResponse.of(userQualificationInfoMapper.selectById(id));
-    }
 }