模块名称错误修正

hx-admin/pom.xml

@@ -95,7 +95,7 @@
         </dependency>
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-from</artifactId>
+            <artifactId>hx-form</artifactId>
         </dependency>
 
         <dependency>

hx-from/pom.xml → hx-form/pom.xml

@@ -10,7 +10,7 @@
         <version>1.0</version>
     </parent>
 
-    <artifactId>hx-from</artifactId>
+    <artifactId>hx-form</artifactId>
 
     <dependencies>
 

hx-from/src/main/java/com/fjhx/from/controller/EmployeeProductivityController.java → hx-form/src/main/java/com/fjhx/form/controller/EmployeeProductivityController.java

@@ -1,7 +1,7 @@
-package com.fjhx.from.controller;
+package com.fjhx.form.controller;
 
-import com.fjhx.from.entity.EmployeeProductivity;
-import com.fjhx.from.service.EmployeeProductivityService;
+import com.fjhx.form.entity.EmployeeProductivity;
+import com.fjhx.form.service.EmployeeProductivityService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-from/src/main/java/com/fjhx/from/controller/StatisticsController.java → hx-form/src/main/java/com/fjhx/form/controller/StatisticsController.java

@@ -1,6 +1,6 @@
-package com.fjhx.from.controller;
+package com.fjhx.form.controller;
 
-import com.fjhx.from.service.StatisticsService;
+import com.fjhx.form.service.StatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

hx-from/src/main/java/com/fjhx/from/entity/EmailCount.java → hx-form/src/main/java/com/fjhx/form/entity/EmailCount.java

@@ -1,4 +1,4 @@
-package com.fjhx.from.entity;
+package com.fjhx.form.entity;
 
 import lombok.Getter;
 import lombok.Setter;

hx-from/src/main/java/com/fjhx/from/entity/EmployeeProductivity.java → hx-form/src/main/java/com/fjhx/form/entity/EmployeeProductivity.java

@@ -1,4 +1,4 @@
-package com.fjhx.from.entity;
+package com.fjhx.form.entity;
 
 import lombok.Getter;
 import lombok.Setter;

hx-from/src/main/java/com/fjhx/from/mapper/EmployeeProductivityMapper.java → hx-form/src/main/java/com/fjhx/form/mapper/EmployeeProductivityMapper.java

@@ -1,7 +1,7 @@
-package com.fjhx.from.mapper;
+package com.fjhx.form.mapper;
 
-import com.fjhx.from.entity.EmailCount;
-import com.fjhx.from.entity.EmployeeProductivity;
+import com.fjhx.form.entity.EmailCount;
+import com.fjhx.form.entity.EmployeeProductivity;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Mapper;

hx-from/src/main/java/com/fjhx/from/service/EmployeeProductivityService.java → hx-form/src/main/java/com/fjhx/form/service/EmployeeProductivityService.java

@@ -1,6 +1,6 @@
-package com.fjhx.from.service;
+package com.fjhx.form.service;
 
-import com.fjhx.from.entity.EmployeeProductivity;
+import com.fjhx.form.entity.EmployeeProductivity;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 
 import java.util.List;

hx-from/src/main/java/com/fjhx/from/service/StatisticsService.java → hx-form/src/main/java/com/fjhx/form/service/StatisticsService.java

@@ -1,4 +1,4 @@
-package com.fjhx.from.service;
+package com.fjhx.form.service;
 
 import java.util.Map;
 

hx-from/src/main/java/com/fjhx/from/service/impl/EmployeeProductivityServiceImpl.java → hx-form/src/main/java/com/fjhx/form/service/impl/EmployeeProductivityServiceImpl.java

@@ -1,13 +1,13 @@
-package com.fjhx.from.service.impl;
+package com.fjhx.form.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.customer.service.customer.CustomerService;
-import com.fjhx.from.entity.EmailCount;
-import com.fjhx.from.entity.EmployeeProductivity;
-import com.fjhx.from.mapper.EmployeeProductivityMapper;
-import com.fjhx.from.service.EmployeeProductivityService;
+import com.fjhx.form.entity.EmailCount;
+import com.fjhx.form.entity.EmployeeProductivity;
+import com.fjhx.form.mapper.EmployeeProductivityMapper;
+import com.fjhx.form.service.EmployeeProductivityService;
 import com.fjhx.sale.service.contract.ContractService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;

hx-from/src/main/java/com/fjhx/from/service/impl/StatisticsServiceImpl.java → hx-form/src/main/java/com/fjhx/form/service/impl/StatisticsServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.from.service.impl;
+package com.fjhx.form.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
@@ -10,7 +10,7 @@ import com.fjhx.account.service.account.AccountRunningWaterService;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.service.flow.FlowExampleService;
-import com.fjhx.from.service.StatisticsService;
+import com.fjhx.form.service.StatisticsService;
 import com.fjhx.mail.entity.enterprise.po.EnterpriseMailbox;
 import com.fjhx.mail.entity.enterprise.po.EnterpriseMessage;
 import com.fjhx.mail.entity.personal.po.PersonalMailbox;

hx-from/src/main/resources/mapper/EmployeeProductivityMapperMapper.xml → hx-form/src/main/resources/mapper/EmployeeProductivityMapperMapper.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.fjhx.from.mapper.EmployeeProductivityMapper">
 
-    <select id="getList" resultType="com.fjhx.from.entity.EmployeeProductivity">
+    <select id="getList" resultType="com.fjhx.form.entity.EmployeeProductivity">
         SELECT
         su.user_id,
         su.nick_name as userName,
@@ -188,7 +188,7 @@
         JOIN sys_role sr ON sr.role_id = sur.role_id
         ${ew.customSqlSegment}
     </select>
-    <select id="getUserEmailCount" resultType="com.fjhx.from.entity.EmailCount">
+    <select id="getUserEmailCount" resultType="com.fjhx.form.entity.EmailCount">
         SELECT count(1) count,
 	t1.user_id
         FROM

pom.xml

@@ -28,7 +28,7 @@
         <module>hx-sale</module>
         <module>hx-victoriatourist</module>
         <module>hx-dingding</module>
-        <module>hx-from</module>
+        <module>hx-form</module>
         <module>hx-jxst</module>
     </modules>