Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'

feat(REQ-3488): 创建企业注册历史接口实现

See merge request universal/infrastructure/backend/orgmanax!163

orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/feign/OrgUnitRegisterApi.java

@@ -5,10 +5,7 @@ import cn.axzo.foundation.page.PageResp;
 import cn.axzo.foundation.result.ApiResult;
 import cn.axzo.orgmanax.dto.unit.register.dto.OrgUnitRegisterDTO;
 import cn.axzo.orgmanax.dto.unit.register.dto.OrgUnitRegisterHistoryDTO;
-import cn.axzo.orgmanax.dto.unit.register.req.CreateUnitRegisterReq;
-import cn.axzo.orgmanax.dto.unit.register.req.ListUnitRegisterHistoryReq;
-import cn.axzo.orgmanax.dto.unit.register.req.ListUnitRegisterReq;
-import cn.axzo.orgmanax.dto.unit.register.req.UpdateUnitRegisterReq;
+import cn.axzo.orgmanax.dto.unit.register.req.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -42,6 +39,12 @@ public interface OrgUnitRegisterApi {
     @PostMapping("/api/org/unit/register/create")
     ApiResult<OrgUnitRegisterDTO> create(@RequestBody @Validated CreateUnitRegisterReq req);
 
+    /**
+     * 创建企业入驻历史信息
+     */
+    @PostMapping("/api/org/unit/register/history/create")
+    ApiResult<OrgUnitRegisterHistoryDTO> createHistory(@RequestBody @Validated CreateUnitRegisterHistoryReq req);
+
     /**
      * 更新单位注册信息
      */

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/register/req/CreateUnitRegisterHistoryReq.java

@@ -0,0 +1,49 @@
+package cn.axzo.orgmanax.dto.unit.register.req;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class CreateUnitRegisterHistoryReq {
+
+    /**
+     * 单位注册记录id
+     */
+    private String applyNum;
+
+    /**
+     * 企业统一社会信用代码
+     */
+    private String usccNumber;
+
+    /**
+     * 动作类型  1、提交申请  2、重新提交  3、审核通过  4、审核拒绝
+     */
+    private Integer activeType;
+
+    /**
+     * 操作人身份id
+     */
+    private Long actorId;
+
+    /**
+     * 操作人姓名
+     */
+    private String actorName;
+
+    /**
+     * 备注
+     */
+    private String comment;
+
+    /**
+     * 申请人手机号
+     */
+    private String applyPhone;
+
+}

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/register/repository/OuRegisterHistoryUpsertRepository.java

@@ -0,0 +1,8 @@
+package cn.axzo.orgmanax.infra.dao.register.repository;
+
+import cn.axzo.orgmanax.infra.dao.register.entity.OuRegisterHistory;
+
+public interface OuRegisterHistoryUpsertRepository {
+
+    Long save(OuRegisterHistory ouRegisterHistory);
+}

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/register/repository/impl/OuRegisterHistoryUpsertRepositoryImpl.java

@@ -0,0 +1,27 @@
+package cn.axzo.orgmanax.infra.dao.register.repository.impl;
+
+import cn.axzo.orgmanax.infra.dao.register.dao.OuRegisterHistoryDao;
+import cn.axzo.orgmanax.infra.dao.register.entity.OuRegisterHistory;
+import cn.axzo.orgmanax.infra.dao.register.repository.OuRegisterHistoryUpsertRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : zhanghonghao@axzo.cn
+ * @since : 2025/1/10
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class OuRegisterHistoryUpsertRepositoryImpl implements OuRegisterHistoryUpsertRepository {
+
+    private final OuRegisterHistoryDao ouRegisterHistoryDao;
+
+    @Override
+    public Long save(OuRegisterHistory ouRegisterHistory) {
+        ouRegisterHistoryDao.save(ouRegisterHistory);
+        return ouRegisterHistory.getId();
+    }
+
+}

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/controller/UnitRegisterController.java

@@ -5,10 +5,7 @@ import cn.axzo.foundation.result.ApiResult;
 import cn.axzo.orgmanax.api.unit.feign.OrgUnitRegisterApi;
 import cn.axzo.orgmanax.dto.unit.register.dto.OrgUnitRegisterDTO;
 import cn.axzo.orgmanax.dto.unit.register.dto.OrgUnitRegisterHistoryDTO;
-import cn.axzo.orgmanax.dto.unit.register.req.CreateUnitRegisterReq;
-import cn.axzo.orgmanax.dto.unit.register.req.ListUnitRegisterHistoryReq;
-import cn.axzo.orgmanax.dto.unit.register.req.ListUnitRegisterReq;
-import cn.axzo.orgmanax.dto.unit.register.req.UpdateUnitRegisterReq;
+import cn.axzo.orgmanax.dto.unit.register.req.*;
 import cn.axzo.orgmanax.server.unit.service.UnitRegisterService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,6 +37,11 @@ public class UnitRegisterController implements OrgUnitRegisterApi {
         return ApiResult.success(unitRegisterService.createRegister(req));
     }
 
+    @Override
+    public ApiResult<OrgUnitRegisterHistoryDTO> createHistory(CreateUnitRegisterHistoryReq req) {
+        return ApiResult.success(unitRegisterService.createHistory(req));
+    }
+
     @Override
     public ApiResult<OrgUnitRegisterDTO> update(UpdateUnitRegisterReq req) {
         return ApiResult.success(unitRegisterService.updateRegister(req));

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/UnitRegisterService.java

@@ -3,10 +3,7 @@ package cn.axzo.orgmanax.server.unit.service;
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.orgmanax.dto.unit.register.dto.OrgUnitRegisterDTO;
 import cn.axzo.orgmanax.dto.unit.register.dto.OrgUnitRegisterHistoryDTO;
-import cn.axzo.orgmanax.dto.unit.register.req.CreateUnitRegisterReq;
-import cn.axzo.orgmanax.dto.unit.register.req.ListUnitRegisterHistoryReq;
-import cn.axzo.orgmanax.dto.unit.register.req.ListUnitRegisterReq;
-import cn.axzo.orgmanax.dto.unit.register.req.UpdateUnitRegisterReq;
+import cn.axzo.orgmanax.dto.unit.register.req.*;
 
 public interface UnitRegisterService {
 
@@ -20,4 +17,6 @@ public interface UnitRegisterService {
     OrgUnitRegisterDTO createRegister(CreateUnitRegisterReq req);
 
     OrgUnitRegisterDTO updateRegister(UpdateUnitRegisterReq req);
+
+    OrgUnitRegisterHistoryDTO createHistory(CreateUnitRegisterHistoryReq req);
 }

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/impl/UnitRegisterServiceImpl.java

@@ -2,12 +2,11 @@ package cn.axzo.orgmanax.server.unit.service.impl;
 
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.orgmanax.dto.unit.register.dto.*;
-import cn.axzo.orgmanax.dto.unit.register.req.CreateUnitRegisterReq;
-import cn.axzo.orgmanax.dto.unit.register.req.ListUnitRegisterHistoryReq;
-import cn.axzo.orgmanax.dto.unit.register.req.ListUnitRegisterReq;
-import cn.axzo.orgmanax.dto.unit.register.req.UpdateUnitRegisterReq;
-import cn.axzo.orgmanax.infra.dao.register.repository.UnitRegisterQueryRepository;
+import cn.axzo.orgmanax.dto.unit.register.req.*;
+import cn.axzo.orgmanax.infra.dao.register.entity.OuRegisterHistory;
 import cn.axzo.orgmanax.infra.dao.register.repository.OuRegisterHistoryQueryRepository;
+import cn.axzo.orgmanax.infra.dao.register.repository.OuRegisterHistoryUpsertRepository;
+import cn.axzo.orgmanax.infra.dao.register.repository.UnitRegisterQueryRepository;
 import cn.axzo.orgmanax.server.unit.foundation.UnitRegisterFoundationService;
 import cn.axzo.orgmanax.server.unit.foundation.dto.UnitRegisterCreator;
 import cn.axzo.orgmanax.server.unit.service.UnitRegisterService;
@@ -19,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -35,6 +35,7 @@ public class UnitRegisterServiceImpl implements UnitRegisterService {
     private final UnitRegisterQueryRepository unitRegisterQueryRepository;
     private final OuRegisterHistoryQueryRepository ouRegisterHistoryQueryRepository;
     private final UnitRegisterFoundationService unitRegisterFoundationService;
+    private final OuRegisterHistoryUpsertRepository historyUpsertRepository;
 
     @Override
     public PageResp<OrgUnitRegisterDTO> list(ListUnitRegisterReq req) {
@@ -72,6 +73,17 @@ public class UnitRegisterServiceImpl implements UnitRegisterService {
         return unitRegisterFoundationService.update(creator);
     }
 
+    @Override
+    public OrgUnitRegisterHistoryDTO createHistory(CreateUnitRegisterHistoryReq req) {
+        OuRegisterHistory registerHistory = BeanUtil.copyProperties(req, OuRegisterHistory.class);
+        Date now = new Date();
+        Long id = historyUpsertRepository.save(registerHistory);
+        OrgUnitRegisterHistoryDTO dto = BeanUtil.copyProperties(registerHistory, OrgUnitRegisterHistoryDTO.class);
+        dto.setId(id);
+        dto.setCreateAt(now);
+        return dto;
+    }
+
     private OrgUnitRegisterDTO transformToRegisterDTO(UnitRegisterQueryRepository.OrganizationalUnitRegisterResp registerResp) {
         OrgUnitRegisterDTO registerDTO = BeanUtil.copyProperties(registerResp, OrgUnitRegisterDTO.class);
         if (StringUtils.isNotBlank(registerResp.getCorpsRealName())) {