fix(jg):调整业务代码结构，解决依赖冲突

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/pom.xml

@@ -20,11 +20,7 @@
             <groupId>com.amosframework.boot</groupId>
             <artifactId>amos-boot-module-ymt-api</artifactId>
             <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-tcm-api</artifactId>
-            <version>1.0.0</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.amosframework.boot</groupId>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -11,13 +11,8 @@ import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgRelationEquipMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
-import com.yeejoin.amos.boot.module.tcm.api.enums.ApplicationFormTypeEnum;
-import com.yeejoin.amos.boot.module.tcm.api.service.ICreateCodeService;
-import com.yeejoin.amos.feign.workflow.Workflow;
-import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
-import com.yeejoin.amos.feign.workflow.model.AjaxResult;
-import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
@@ -26,12 +21,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -48,10 +41,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     public static final String PROCESS_DEFINITION_KEY = "installationNotification";
     public static final String TABLE_PAGE_ID = "1734141426742095873";
 
-
     @Autowired
     private JgInstallationNoticeMapper jgInstallationNoticeMapper;
 
+    @Autowired
+    ICreateCodeService iCreateCodeService;
+
     /**
      * 根据sequenceNbr查询
      *
@@ -130,8 +125,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     }
 
     @Autowired
-    private ICreateCodeService iCreateCodeService;
-    @Autowired
     JgRelationEquipMapper jgRelationEquipMapper;
 
     /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/pom.xml

@@ -18,8 +18,9 @@
         </dependency>
         <dependency>
             <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-tcm-api</artifactId>
+            <artifactId>amos-boot-module-ymt-api</artifactId>
             <version>1.0.0</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcBaseMapper.java

 package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto;
 import org.apache.ibatis.annotations.MapKey;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
 import java.util.List;
 import java.util.Map;
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

@@ -3,8 +3,8 @@ package com.yeejoin.amos.boot.module.jyjc.api.model;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcBaseMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper">
 
-    <select id="selectBaseUnitLicenceList" parameterType="map" resultType="com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto">
+    <select id="selectBaseUnitLicenceList" parameterType="map" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto">
         select * from tz_base_unit_licence
         where unit_code = #{unitCode}
         <if test="licenceType !=null and licenceType != ''">

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/pom.xml

@@ -15,6 +15,7 @@
             <groupId>com.amosframework.boot</groupId>
             <artifactId>amos-boot-module-jyjc-api</artifactId>
             <version>1.0.0</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.amosframework.boot</groupId>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/BaseException.java

 package com.yeejoin.amos.boot.module.jyjc.biz.config;
 
-import com.yeejoin.amos.boot.module.tcm.api.enums.BaseExceptionEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.BaseExceptionEnum;
 
 /**
  * @Author cpp

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/CommonException.java

 package com.yeejoin.amos.boot.module.jyjc.biz.config;
 
 
-import com.yeejoin.amos.boot.module.tcm.api.common.BaseException;
-import com.yeejoin.amos.boot.module.tcm.api.enums.CommonErrorEnum;
+import com.yeejoin.amos.boot.module.ymt.api.common.BaseException;
+import com.yeejoin.amos.boot.module.ymt.api.enums.CommonErrorEnum;
 
 /**
  * @description: 共同异常类

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -4,9 +4,7 @@ import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -16,44 +14,36 @@ import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcOpeningApplicationService;
-import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
-import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
-import com.yeejoin.amos.boot.module.jyjc.biz.config.CommonException;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.WorkflowFeignClient;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
-import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
-import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
-import com.yeejoin.amos.boot.module.tcm.api.enums.LicenceTypeEnum;
-import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
-import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseUnitLicenceMapper;
-import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseUnitLicenceMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
-import org.apache.commons.lang3.ObjectUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
-import org.bouncycastle.cert.ocsp.Req;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
-
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
+import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Value;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 /**
  * 服务实现类
@@ -71,7 +61,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Autowired
     JyjcOpeningApplicationMapper jyjcOpeningApplicationMapper;
 
-    @Resource (type = JyjcBaseMapper.class)
+    @Resource(type = JyjcBaseMapper.class)
     private JyjcBaseMapper baseMapper;
 
     @Value ("${process-definition-key.jyjc.openapplication:}")
@@ -90,7 +80,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Autowired
     private WorkflowFeignClient workflowFeignClient;
 
-    @Transactional (rollbackFor = {Exception.class, BaseException.class})
+    @Transactional(rollbackFor = {Exception.class, BaseException.class})
     public JyjcOpeningApplicationModel saveOrUpdateModel(JyjcOpeningApplicationModel model, Boolean enableStartFlow) {
         try {
             if (enableStartFlow) {

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/TzsUserInfoDto.java

@@ -32,6 +32,9 @@ public class TzsUserInfoDto extends BaseDto {
     @ApiModelProperty(value = "岗位")
     private String post;
 
+    @ApiModelProperty(value = "岗位名称")
+    private String postName;
+
     @ApiModelProperty(value = "联系电话")
     private String phone;
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/enums/ApplicationFormTypeEnum.java → amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

-package com.yeejoin.amos.boot.module.tcm.api.enums;
+package com.yeejoin.amos.boot.module.ymt.api.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ICreateCodeService.java → amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/service/ICreateCodeService.java

-package com.yeejoin.amos.boot.module.tcm.api.service;
+package com.yeejoin.amos.boot.module.ymt.api.service;
 
 import java.util.List;
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/CreateCodeServiceImpl.java → amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/CreateCodeServiceImpl.java

-package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
+package com.yeejoin.amos.boot.module.ymt.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.tcm.api.enums.ApplicationFormTypeEnum;
-import com.yeejoin.amos.boot.module.tcm.api.service.ICreateCodeService;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit;
  * @author LiuLin
  * @date 2023-12-14
  */
-@Service
+@Component
 public class CreateCodeServiceImpl implements ICreateCodeService {
 
     private static final String LOCK_VALUE = "locked";