20220909_sun模块分离

ruoyi-modules/mz-business-btgl/pom.xml

@@ -53,6 +53,11 @@
             <artifactId>ruoyi-common-swagger</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-modules-system-ext</artifactId>
+            <version>${ruoyi.version}</version>
+        </dependency>
     </dependencies>
 
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBtglJewhServiceImpl.java

@@ -2,13 +2,13 @@ package com.ruoyi.business.service.impl;
 
 import com.ruoyi.business.domain.ZwywBtglJewh;
 import com.ruoyi.business.domain.ZwywBtglLrqdmx;
-import com.ruoyi.business.mapper.SysDeptJlMapper;
 import com.ruoyi.business.mapper.ZwywBtglJewhMapper;
 import com.ruoyi.business.mapper.ZwywBtglLrqdmxMapper;
 import com.ruoyi.business.service.IZwywBtglJewhService;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.ext.api.enums.SysDeptJlStatus;
+import com.ruoyi.system.mapper.SysDeptJlMapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBtglJgbtServiceImpl.java

@@ -3,7 +3,6 @@ package com.ruoyi.business.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.business.domain.ZwywBtglJgbt;
 import com.ruoyi.business.domain.ZwywBtglXmgl;
-import com.ruoyi.business.mapper.SysDeptJlMapper;
 import com.ruoyi.business.mapper.ZwywBtglJgbtMapper;
 import com.ruoyi.business.mapper.ZwywBtglXmglMapper;
 import com.ruoyi.business.service.IZwywBtglJgbtService;
@@ -13,6 +12,7 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.AmountUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.ext.api.enums.StateStatus;
+import com.ruoyi.system.mapper.SysDeptJlMapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBtglJgbthpServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.business.domain.ZwywBtglJgbthp;
 import com.ruoyi.business.domain.ZwywBtglJgjewh;
 import com.ruoyi.business.domain.ZwywBtglJgqdmx;
-import com.ruoyi.business.mapper.SysDeptJlMapper;
 import com.ruoyi.business.mapper.ZwywBtglJgbthpMapper;
 import com.ruoyi.business.mapper.ZwywBtglJgjewhMapper;
 import com.ruoyi.business.mapper.ZwywBtglJgqdmxMapper;
@@ -15,6 +14,7 @@ import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.ext.api.enums.StateStatus;
+import com.ruoyi.system.mapper.SysDeptJlMapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBtglJgjewhServiceImpl.java

@@ -5,12 +5,12 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.business.domain.ZwywBtglJgjewh;
 import com.ruoyi.business.domain.ZwywBtglJgqdmx;
-import com.ruoyi.business.mapper.SysDeptJlMapper;
 import com.ruoyi.business.mapper.ZwywBtglJgjewhMapper;
 import com.ruoyi.business.mapper.ZwywBtglJgqdmxMapper;
 import com.ruoyi.business.service.IZwywBtglJgjewhService;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.mapper.SysDeptJlMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBtglJgqdServiceImpl.java

@@ -7,7 +7,10 @@ import com.ruoyi.business.domain.ZwywBtglJgbt;
 import com.ruoyi.business.domain.ZwywBtglJgqd;
 import com.ruoyi.business.domain.ZwywBtglJgqdmx;
 import com.ruoyi.business.domain.ZwywBtglXmgl;
-import com.ruoyi.business.mapper.*;
+import com.ruoyi.business.mapper.ZwywBtglJgbtMapper;
+import com.ruoyi.business.mapper.ZwywBtglJgqdMapper;
+import com.ruoyi.business.mapper.ZwywBtglJgqdmxMapper;
+import com.ruoyi.business.mapper.ZwywBtglXmglMapper;
 import com.ruoyi.business.service.IZwywBtglJgqdService;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
@@ -15,6 +18,7 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.ext.api.enums.ExamineStatus;
 import com.ruoyi.ext.api.enums.StateStatus;
 import com.ruoyi.ext.api.utils.SubCodeUtil;
+import com.ruoyi.system.mapper.SysDeptJlMapper;
 import io.seata.common.util.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBtglLrbthpServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.business.domain.ZwywBtglJewh;
 import com.ruoyi.business.domain.ZwywBtglLrbthp;
 import com.ruoyi.business.domain.ZwywBtglLrqdmx;
-import com.ruoyi.business.mapper.SysDeptJlMapper;
 import com.ruoyi.business.mapper.ZwywBtglJewhMapper;
 import com.ruoyi.business.mapper.ZwywBtglLrbthpMapper;
 import com.ruoyi.business.mapper.ZwywBtglLrqdmxMapper;
@@ -16,6 +15,7 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.ext.api.enums.StateStatus;
 import com.ruoyi.ext.api.enums.SysDeptJlStatus;
+import com.ruoyi.system.mapper.SysDeptJlMapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBtglLrqdServiceImpl.java

@@ -7,7 +7,10 @@ import com.ruoyi.business.domain.ZwywBtglLrbtgl;
 import com.ruoyi.business.domain.ZwywBtglLrqd;
 import com.ruoyi.business.domain.ZwywBtglLrqdmx;
 import com.ruoyi.business.domain.ZwywBtglXmgl;
-import com.ruoyi.business.mapper.*;
+import com.ruoyi.business.mapper.ZwywBtglLrbtglMapper;
+import com.ruoyi.business.mapper.ZwywBtglLrqdMapper;
+import com.ruoyi.business.mapper.ZwywBtglLrqdmxMapper;
+import com.ruoyi.business.mapper.ZwywBtglXmglMapper;
 import com.ruoyi.business.service.IZwywBtglLrqdService;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
@@ -15,6 +18,7 @@ import com.ruoyi.ext.api.enums.ExamineStatus;
 import com.ruoyi.ext.api.enums.StateStatus;
 import com.ruoyi.ext.api.enums.SysDeptJlStatus;
 import com.ruoyi.ext.api.utils.SubCodeUtil;
+import com.ruoyi.system.mapper.SysDeptJlMapper;
 import io.seata.common.util.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBtglLrqdmxServiceImpl.java

@@ -3,11 +3,11 @@ package com.ruoyi.business.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.business.domain.ZwywBtglLrhc;
 import com.ruoyi.business.domain.ZwywBtglLrqdmx;
-import com.ruoyi.business.mapper.SysDeptJlMapper;
 import com.ruoyi.business.mapper.ZwywBtglLrhcMapper;
 import com.ruoyi.business.mapper.ZwywBtglLrqdmxMapper;
 import com.ruoyi.business.service.IZwywBtglLrqdmxService;
 import com.ruoyi.ext.api.enums.SysDeptJlStatus;
+import com.ruoyi.system.mapper.SysDeptJlMapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywBtglXmglServiceImpl.java

@@ -2,13 +2,13 @@ package com.ruoyi.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.business.domain.ZwywBtglXmgl;
-import com.ruoyi.business.mapper.SysDeptJlMapper;
 import com.ruoyi.business.mapper.ZwywBtglXmglMapper;
 import com.ruoyi.business.service.IZwywBtglXmglService;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.ext.api.enums.StateStatus;
+import com.ruoyi.system.mapper.SysDeptJlMapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

ruoyi-modules/mz-business-djpd/pom.xml

@@ -59,6 +59,11 @@
             <artifactId>ruoyi-common-activiti</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-modules-system-ext</artifactId>
+            <version>${ruoyi.version}</version>
+        </dependency>
     </dependencies>
 
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/domain/TreeSelect.java

@@ -1,6 +1,7 @@
 package com.ruoyi.business.domain;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.system.domain.SysDjpdzbXzpz;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/domain/ZwywXzpdJg.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.ext.api.validate.DictV;
 import com.ruoyi.ext.api.validate.group.AddGroup;
+import com.ruoyi.system.domain.SysDjpdzbXzpz;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;