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

feat(REQ-3488): 创建单位历史调整到foundation

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

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/foundation/UnitRegisterHistoryFoundationService.java

@@ -0,0 +1,10 @@
+package cn.axzo.orgmanax.server.unit.foundation;
+
+import cn.axzo.orgmanax.dto.unit.register.dto.OrgUnitRegisterHistoryDTO;
+import cn.axzo.orgmanax.server.unit.foundation.dto.UnitRegisterHistoryCreator;
+
+public interface UnitRegisterHistoryFoundationService {
+
+    OrgUnitRegisterHistoryDTO create(UnitRegisterHistoryCreator creator);
+
+}

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/foundation/dto/UnitCreator.java

@@ -203,8 +203,7 @@ public class UnitCreator {
      * @return
      */
     public OrganizationalUnit toEntity() {
-        OrganizationalUnit organizationalUnit = BeanUtil.copyProperties(this, OrganizationalUnit.class);
+        return BeanUtil.copyProperties(this, OrganizationalUnit.class);
-        return organizationalUnit;
     }
 
 }

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/foundation/dto/UnitRegisterHistoryCreator.java

@@ -0,0 +1,54 @@
+package cn.axzo.orgmanax.server.unit.foundation.dto;
+
+import cn.axzo.orgmanax.infra.dao.register.entity.OuRegisterHistory;
+import cn.hutool.core.bean.BeanUtil;
+
+/**
+ * @author : zhanghonghao@axzo.cn
+ * @since : 2025/2/10
+ */
+public class UnitRegisterHistoryCreator {
+
+    /**
+     * 单位注册记录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;
+
+    /**
+     * 转换实体
+     */
+    public OuRegisterHistory toEntity() {
+        return BeanUtil.copyProperties(this, OuRegisterHistory.class);
+    }
+
+}

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/foundation/impl/UnitRegisterHistoryFoundationServiceImpl.java

@@ -0,0 +1,37 @@
+package cn.axzo.orgmanax.server.unit.foundation.impl;
+
+import cn.axzo.orgmanax.dto.unit.register.dto.OrgUnitRegisterHistoryDTO;
+import cn.axzo.orgmanax.infra.dao.register.entity.OuRegisterHistory;
+import cn.axzo.orgmanax.infra.dao.register.repository.OuRegisterHistoryUpsertRepository;
+import cn.axzo.orgmanax.server.unit.foundation.UnitRegisterHistoryFoundationService;
+import cn.axzo.orgmanax.server.unit.foundation.dto.UnitRegisterHistoryCreator;
+import cn.hutool.core.bean.BeanUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * @author : zhanghonghao@axzo.cn
+ * @since : 2025/2/10
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class UnitRegisterHistoryFoundationServiceImpl implements UnitRegisterHistoryFoundationService {
+
+    private final OuRegisterHistoryUpsertRepository historyUpsertRepository;
+
+    @Override
+    public OrgUnitRegisterHistoryDTO create(UnitRegisterHistoryCreator creator) {
+        OuRegisterHistory registerHistory = creator.toEntity();
+        Date now = new Date();
+        Long id = historyUpsertRepository.save(registerHistory);
+        OrgUnitRegisterHistoryDTO dto = BeanUtil.copyProperties(registerHistory, OrgUnitRegisterHistoryDTO.class);
+        dto.setId(id);
+        dto.setCreateAt(now);
+        return dto;
+    }
+
+}

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

@@ -3,12 +3,12 @@ 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.*;
-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.UnitRegisterHistoryFoundationService;
 import cn.axzo.orgmanax.server.unit.foundation.dto.UnitRegisterCreator;
+import cn.axzo.orgmanax.server.unit.foundation.dto.UnitRegisterHistoryCreator;
 import cn.axzo.orgmanax.server.unit.service.UnitRegisterService;
 import cn.axzo.orgmanax.server.util.mapstruct.UnitRegisterContactMapStruct;
 import cn.hutool.core.bean.BeanUtil;
@@ -18,7 +18,6 @@ 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,7 +34,7 @@ public class UnitRegisterServiceImpl implements UnitRegisterService {
     private final UnitRegisterQueryRepository unitRegisterQueryRepository;
     private final OuRegisterHistoryQueryRepository ouRegisterHistoryQueryRepository;
     private final UnitRegisterFoundationService unitRegisterFoundationService;
-    private final OuRegisterHistoryUpsertRepository historyUpsertRepository;
+    private final UnitRegisterHistoryFoundationService unitRegisterHistoryFoundationService;
 
     @Override
     public PageResp<OrgUnitRegisterDTO> list(ListUnitRegisterReq req) {
@@ -75,13 +74,8 @@ public class UnitRegisterServiceImpl implements UnitRegisterService {
 
     @Override
     public OrgUnitRegisterHistoryDTO createHistory(CreateUnitRegisterHistoryReq req) {
-        OuRegisterHistory registerHistory = BeanUtil.copyProperties(req, OuRegisterHistory.class);
+        UnitRegisterHistoryCreator creator = BeanUtil.copyProperties(req, UnitRegisterHistoryCreator.class);
-        Date now = new Date();
+        return unitRegisterHistoryFoundationService.create(creator);
-        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) {