diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/IProcessPortalService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/IProcessPortalService.java deleted file mode 100644 index 07040b0..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/IProcessPortalService.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jeecg.modules.dashboard.service; - -import org.jeecg.modules.dashboard.dto.ProcessPortalStatsDTO; - -public interface IProcessPortalService { - - ProcessPortalStatsDTO getStats(String userId); -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/constant/BgPartymatterConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/constant/BgPartymatterConstant.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/constant/BgPartymatterConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/constant/BgPartymatterConstant.java index a58ef96..31fdaff 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/constant/BgPartymatterConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/constant/BgPartymatterConstant.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bgpartymatter.constant; +package org.jeecg.modules.supervision.bgpartymatter.constant; /** * 党委/所务会事项模块常量类 diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/controller/BgPartymatterController.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/controller/BgPartymatterController.java index 2343cfc..4189b0f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/controller/BgPartymatterController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bgpartymatter.controller; +package org.jeecg.modules.supervision.bgpartymatter.controller; import com.alibaba.fastjson.JSONObject; import org.flowable.engine.RuntimeService; @@ -11,10 +11,10 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.excel.ExcelAnnotationUtils; -import org.jeecg.modules.bg.constant.BpmStatus; -import org.jeecg.modules.bg.constant.SupervisionConstant; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.common.BpmStatus; +import org.jeecg.modules.supervision.common.SupervisionConstant; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,12 +29,12 @@ import java.util.List; import java.util.Map; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.bgpartymatter.dto.BgPartymatterBpmSaveDTO; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter; -import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterService; -import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterFeedbackService; -import org.jeecg.modules.demo.bgpartymatter.constant.BgPartymatterConstant; +import org.jeecg.modules.supervision.bgpartymatter.dto.BgPartymatterBpmSaveDTO; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter; +import org.jeecg.modules.supervision.bgpartymatter.service.IBgPartymatterService; +import org.jeecg.modules.supervision.bgpartymatter.service.IBgPartymatterFeedbackService; +import org.jeecg.modules.supervision.bgpartymatter.constant.BgPartymatterConstant; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.jeecg.common.aspect.annotation.AutoLog; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java similarity index 80% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java index 6100af2..d6ac58f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.bgpartymatter.dto; +package org.jeecg.modules.supervision.bgpartymatter.dto; import java.io.Serializable; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatter.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatter.java index 83addc2..02ad88a 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatter.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bgpartymatter.entity; +package org.jeecg.modules.supervision.bgpartymatter.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatterFeedback.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatterFeedback.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatterFeedback.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatterFeedback.java index 84bae2c..8ab8764 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatterFeedback.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatterFeedback.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bgpartymatter.entity; +package org.jeecg.modules.supervision.bgpartymatter.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java index f6eddc6..32cbfad 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.bgpartymatter.mapper; +package org.jeecg.modules.supervision.bgpartymatter.mapper; import java.util.List; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterMapper.java similarity index 69% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterMapper.java index 8c29acf..66fbcc4 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.demo.bgpartymatter.mapper; +package org.jeecg.modules.supervision.bgpartymatter.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml similarity index 71% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml index 9c8919a..df4c29c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -9,7 +9,7 @@ main_id = #{mainId} - SELECT * FROM bg_partymatter_feedback WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterMapper.xml similarity index 63% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterMapper.xml index 1ebc8f7..946a122 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterFeedbackService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterFeedbackService.java similarity index 76% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterFeedbackService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterFeedbackService.java index e4ec491..2270f41 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterFeedbackService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterFeedbackService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.demo.bgpartymatter.service; +package org.jeecg.modules.supervision.bgpartymatter.service; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterService.java similarity index 73% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterService.java index fc86bd6..4ca822f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterService.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.bgpartymatter.service; +package org.jeecg.modules.supervision.bgpartymatter.service; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.beans.factory.annotation.Autowired; import java.io.Serializable; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java similarity index 68% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java index 9e55e26..bd54108 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.bgpartymatter.service.impl; +package org.jeecg.modules.supervision.bgpartymatter.service.impl; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback; -import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterFeedbackMapper; -import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterFeedbackService; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback; +import org.jeecg.modules.supervision.bgpartymatter.mapper.BgPartymatterFeedbackMapper; +import org.jeecg.modules.supervision.bgpartymatter.service.IBgPartymatterFeedbackService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterServiceImpl.java similarity index 75% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterServiceImpl.java index e3d78b6..9f78a6d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterServiceImpl.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.demo.bgpartymatter.service.impl; +package org.jeecg.modules.supervision.bgpartymatter.service.impl; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter; -import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterFeedbackMapper; -import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterMapper; -import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterService; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter; +import org.jeecg.modules.supervision.bgpartymatter.mapper.BgPartymatterFeedbackMapper; +import org.jeecg.modules.supervision.bgpartymatter.mapper.BgPartymatterMapper; +import org.jeecg.modules.supervision.bgpartymatter.service.IBgPartymatterService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/controller/BgTakepulseController.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/controller/BgTakepulseController.java index 87489cc..ef67c12 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/controller/BgTakepulseController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bqtakepulse.controller; +package org.jeecg.modules.supervision.bqtakepulse.controller; import java.io.IOException; import java.util.ArrayList; @@ -13,9 +13,9 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import org.flowable.engine.RuntimeService; -import org.jeecg.modules.bg.constant.BpmStatus; -import org.jeecg.modules.bg.constant.SupervisionConstant; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.common.BpmStatus; +import org.jeecg.modules.supervision.common.SupervisionConstant; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -29,12 +29,12 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.util.excel.ExcelAnnotationUtils; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.bqtakepulse.dto.BgTakepulseBpmSaveDTO; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; -import org.jeecg.modules.demo.bqtakepulse.vo.BgTakepulsePage; -import org.jeecg.modules.demo.bqtakepulse.service.IBgTakepulseService; -import org.jeecg.modules.demo.bqtakepulse.service.IBgTakepulseFeedbackService; +import org.jeecg.modules.supervision.bqtakepulse.dto.BgTakepulseBpmSaveDTO; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.bqtakepulse.vo.BgTakepulsePage; +import org.jeecg.modules.supervision.bqtakepulse.service.IBgTakepulseService; +import org.jeecg.modules.supervision.bqtakepulse.service.IBgTakepulseFeedbackService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java similarity index 81% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java index 971bcbc..739b852 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.bqtakepulse.dto; +package org.jeecg.modules.supervision.bqtakepulse.dto; import java.io.Serializable; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulse.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulse.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulse.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulse.java index 5ec7fbc..8d4f665 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulse.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulse.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bqtakepulse.entity; +package org.jeecg.modules.supervision.bqtakepulse.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulseFeedback.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulseFeedback.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulseFeedback.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulseFeedback.java index 8c0d17a..710cef8 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulseFeedback.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulseFeedback.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bqtakepulse.entity; +package org.jeecg.modules.supervision.bqtakepulse.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java index 2b5a35e..de485cc 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.bqtakepulse.mapper; +package org.jeecg.modules.supervision.bqtakepulse.mapper; import java.util.List; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseMapper.java similarity index 70% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseMapper.java index d43cd35..81520e5 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.demo.bqtakepulse.mapper; +package org.jeecg.modules.supervision.bqtakepulse.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml similarity index 72% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml index bd9affb..cb0b2aa 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -8,7 +8,7 @@ WHERE main_id = #{mainId} - SELECT * FROM bg_takepulse_feedback WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseMapper.xml similarity index 64% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseMapper.xml index 7e7f6a9..f2273b8 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseFeedbackService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseFeedbackService.java similarity index 77% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseFeedbackService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseFeedbackService.java index 20f0c08..9908e20 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseFeedbackService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseFeedbackService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.demo.bqtakepulse.service; +package org.jeecg.modules.supervision.bqtakepulse.service; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseService.java similarity index 81% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseService.java index ea72925..a3188d7 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseService.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.bqtakepulse.service; +package org.jeecg.modules.supervision.bqtakepulse.service; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; import com.baomidou.mybatisplus.extension.service.IService; import java.io.Serializable; import java.util.Collection; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java similarity index 69% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java index 8351666..2a0574e 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.bqtakepulse.service.impl; +package org.jeecg.modules.supervision.bqtakepulse.service.impl; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; -import org.jeecg.modules.demo.bqtakepulse.mapper.BgTakepulseFeedbackMapper; -import org.jeecg.modules.demo.bqtakepulse.service.IBgTakepulseFeedbackService; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.mapper.BgTakepulseFeedbackMapper; +import org.jeecg.modules.supervision.bqtakepulse.service.IBgTakepulseFeedbackService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseServiceImpl.java similarity index 86% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseServiceImpl.java index 4d9012a..b0ee2ce 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseServiceImpl.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.demo.bqtakepulse.service.impl; +package org.jeecg.modules.supervision.bqtakepulse.service.impl; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; -import org.jeecg.modules.demo.bqtakepulse.mapper.BgTakepulseFeedbackMapper; -import org.jeecg.modules.demo.bqtakepulse.mapper.BgTakepulseMapper; -import org.jeecg.modules.demo.bqtakepulse.service.IBgTakepulseService; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.mapper.BgTakepulseFeedbackMapper; +import org.jeecg.modules.supervision.bqtakepulse.mapper.BgTakepulseMapper; +import org.jeecg.modules.supervision.bqtakepulse.service.IBgTakepulseService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/vo/BgTakepulsePage.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/vo/BgTakepulsePage.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/vo/BgTakepulsePage.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/vo/BgTakepulsePage.java index 44cb6ad..09c2fbc 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/vo/BgTakepulsePage.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/vo/BgTakepulsePage.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.bqtakepulse.vo; +package org.jeecg.modules.supervision.bqtakepulse.vo; import java.util.List; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelEntity; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/BpmStatus.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/BpmStatus.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/BpmStatus.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/BpmStatus.java index adfdbe8..6e8198c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/BpmStatus.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/BpmStatus.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.constant; +package org.jeecg.modules.supervision.common; import java.util.Arrays; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/SupervisionConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/SupervisionConstant.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/SupervisionConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/SupervisionConstant.java index b4d77ee..190469e 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/SupervisionConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/SupervisionConstant.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.constant; +package org.jeecg.modules.supervision.common; /** * 监督模块通用常量 diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/controller/ProcessPortalController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/controller/ProcessPortalController.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/controller/ProcessPortalController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/controller/ProcessPortalController.java index b8d7622..6b959a2 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/controller/ProcessPortalController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/controller/ProcessPortalController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.dashboard.controller; +package org.jeecg.modules.supervision.dashboard.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -6,8 +6,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.modules.dashboard.dto.ProcessPortalStatsDTO; -import org.jeecg.modules.dashboard.service.IProcessPortalService; +import org.jeecg.modules.supervision.dashboard.dto.ProcessPortalStatsDTO; +import org.jeecg.modules.supervision.dashboard.service.IProcessPortalService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/dto/ProcessPortalStatsDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/dto/ProcessPortalStatsDTO.java similarity index 86% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/dto/ProcessPortalStatsDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/dto/ProcessPortalStatsDTO.java index 8987030..d9dc205 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/dto/ProcessPortalStatsDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/dto/ProcessPortalStatsDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.dashboard.dto; +package org.jeecg.modules.supervision.dashboard.dto; import lombok.Data; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/mapper/ProcessPortalMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/mapper/ProcessPortalMapper.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/mapper/ProcessPortalMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/mapper/ProcessPortalMapper.java index c53b4ac..349156c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/mapper/ProcessPortalMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/mapper/ProcessPortalMapper.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.dashboard.mapper; +package org.jeecg.modules.supervision.dashboard.mapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/IProcessPortalService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/IProcessPortalService.java new file mode 100644 index 0000000..8136874 --- /dev/null +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/IProcessPortalService.java @@ -0,0 +1,8 @@ +package org.jeecg.modules.supervision.dashboard.service; + +import org.jeecg.modules.supervision.dashboard.dto.ProcessPortalStatsDTO; + +public interface IProcessPortalService { + + ProcessPortalStatsDTO getStats(String userId); +} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/impl/ProcessPortalServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/impl/ProcessPortalServiceImpl.java similarity index 85% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/impl/ProcessPortalServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/impl/ProcessPortalServiceImpl.java index 04a7872..f65722d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/impl/ProcessPortalServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/impl/ProcessPortalServiceImpl.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.dashboard.service.impl; +package org.jeecg.modules.supervision.dashboard.service.impl; import lombok.extern.slf4j.Slf4j; -import org.jeecg.modules.dashboard.dto.ProcessPortalStatsDTO; -import org.jeecg.modules.dashboard.mapper.ProcessPortalMapper; -import org.jeecg.modules.dashboard.service.IProcessPortalService; +import org.jeecg.modules.supervision.dashboard.dto.ProcessPortalStatsDTO; +import org.jeecg.modules.supervision.dashboard.mapper.ProcessPortalMapper; +import org.jeecg.modules.supervision.dashboard.service.IProcessPortalService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/controller/DqInspectProblemController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/controller/DqInspectProblemController.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/controller/DqInspectProblemController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/controller/DqInspectProblemController.java index cec3add..c6beed9 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/controller/DqInspectProblemController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/controller/DqInspectProblemController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspectproblem.controller; +package org.jeecg.modules.supervision.dqinspectproblem.controller; import java.util.Arrays; import java.util.List; @@ -13,8 +13,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem; -import org.jeecg.modules.demo.dqinspectproblem.service.IDqInspectProblemService; +import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem; +import org.jeecg.modules.supervision.dqinspectproblem.service.IDqInspectProblemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/entity/DqInspectProblem.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/entity/DqInspectProblem.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/entity/DqInspectProblem.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/entity/DqInspectProblem.java index 0573b06..decfd34 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/entity/DqInspectProblem.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/entity/DqInspectProblem.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspectproblem.entity; +package org.jeecg.modules.supervision.dqinspectproblem.entity; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/DqInspectProblemMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/DqInspectProblemMapper.java similarity index 84% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/DqInspectProblemMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/DqInspectProblemMapper.java index 00c805d..c0a96dc 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/DqInspectProblemMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/DqInspectProblemMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.demo.dqinspectproblem.mapper; +package org.jeecg.modules.supervision.dqinspectproblem.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem; +import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem; import java.util.List; import java.util.Map; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml similarity index 89% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml index ae65e21..65ce2a5 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml @@ -1,6 +1,6 @@ - + update dq_inspect_problem set has_child = #{status} where id = #{id} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/IDqInspectProblemService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/IDqInspectProblemService.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/IDqInspectProblemService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/IDqInspectProblemService.java index 3acd86b..4fc2ce5 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/IDqInspectProblemService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/IDqInspectProblemService.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.dqinspectproblem.service; +package org.jeecg.modules.supervision.dqinspectproblem.service; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem; +import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.exception.JeecgBootException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java index d61643e..c7dc66e 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java @@ -1,12 +1,12 @@ -package org.jeecg.modules.demo.dqinspectproblem.service.impl; +package org.jeecg.modules.supervision.dqinspectproblem.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem; -import org.jeecg.modules.demo.dqinspectproblem.mapper.DqInspectProblemMapper; -import org.jeecg.modules.demo.dqinspectproblem.service.IDqInspectProblemService; +import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem; +import org.jeecg.modules.supervision.dqinspectproblem.mapper.DqInspectProblemMapper; +import org.jeecg.modules.supervision.dqinspectproblem.service.IDqInspectProblemService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectProgressController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectProgressController.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectProgressController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectProgressController.java index d6c4f90..b018ddd 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectProgressController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectProgressController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspecttask.controller; +package org.jeecg.modules.supervision.dqinspecttask.controller; import java.util.Arrays; import java.io.IOException; @@ -9,8 +9,8 @@ import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectProgressService; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectProgressService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectTaskController.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectTaskController.java index e5d22e0..0d279ac 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectTaskController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspecttask.controller; +package org.jeecg.modules.supervision.dqinspecttask.controller; import java.io.UnsupportedEncodingException; import java.io.IOException; @@ -26,12 +26,12 @@ import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.util.excel.ExcelAnnotationUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.base.controller.JeecgController; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo; -import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskPage; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectProgressService; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo; +import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskPage; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectProgressService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectProgress.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectProgress.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectProgress.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectProgress.java index 37b85e8..6e75028 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectProgress.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectProgress.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspecttask.entity; +package org.jeecg.modules.supervision.dqinspecttask.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectTask.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectTask.java index 847a94b..d7d4baa 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectTask.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspecttask.entity; +package org.jeecg.modules.supervision.dqinspecttask.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectProgressMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectProgressMapper.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectProgressMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectProgressMapper.java index 41ec189..23893f6 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectProgressMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectProgressMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.dqinspecttask.mapper; +package org.jeecg.modules.supervision.dqinspecttask.mapper; import java.util.List; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectTaskMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectTaskMapper.java similarity index 78% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectTaskMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectTaskMapper.java index a54d3fc..b99fbb7 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectTaskMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectTaskMapper.java @@ -1,13 +1,13 @@ -package org.jeecg.modules.demo.dqinspecttask.mapper; +package org.jeecg.modules.supervision.dqinspecttask.mapper; import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo; +import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo; /** * @Description: dq_inspect_task diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml similarity index 71% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml index dc6c9ba..3b73b15 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -8,7 +8,7 @@ WHERE main_id = #{mainId} - SELECT * FROM dq_inspect_progress WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml similarity index 94% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml index 84f8a70..7df7e2c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml @@ -1,8 +1,8 @@ - + - select t.id, p_category.id as categoryId, diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectProgressService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectProgressService.java similarity index 76% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectProgressService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectProgressService.java index e5706d0..6e04302 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectProgressService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectProgressService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.demo.dqinspecttask.service; +package org.jeecg.modules.supervision.dqinspecttask.service; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectTaskService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectTaskService.java similarity index 81% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectTaskService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectTaskService.java index 4c2b977..4144e82 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectTaskService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectTaskService.java @@ -1,11 +1,11 @@ -package org.jeecg.modules.demo.dqinspecttask.service; +package org.jeecg.modules.supervision.dqinspecttask.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo; +import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo; import java.io.Serializable; import java.util.Collection; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java similarity index 68% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java index 2c9fea1..612e0d6 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.dqinspecttask.service.impl; +package org.jeecg.modules.supervision.dqinspecttask.service.impl; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; -import org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectProgressMapper; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectProgressService; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.mapper.DqInspectProgressMapper; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectProgressService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java index a386dd2..1535cc5 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java @@ -1,15 +1,15 @@ -package org.jeecg.modules.demo.dqinspecttask.service.impl; +package org.jeecg.modules.supervision.dqinspecttask.service.impl; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem; -import org.jeecg.modules.demo.dqinspectproblem.service.IDqInspectProblemService; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; -import org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectProgressMapper; -import org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectTaskMapper; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; -import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo; +import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem; +import org.jeecg.modules.supervision.dqinspectproblem.service.IDqInspectProblemService; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.mapper.DqInspectProgressMapper; +import org.jeecg.modules.supervision.dqinspecttask.mapper.DqInspectTaskMapper; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskLedgerVo.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskLedgerVo.java index e555250c..8fa9dcb 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskLedgerVo.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspecttask.vo; +package org.jeecg.modules.supervision.dqinspecttask.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskPage.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskPage.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskPage.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskPage.java index 95af033..a6edb35 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskPage.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskPage.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.dqinspecttask.vo; +package org.jeecg.modules.supervision.dqinspecttask.vo; import java.util.List; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelEntity; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/constant/FixContactConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/constant/FixContactConstant.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/constant/FixContactConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/constant/FixContactConstant.java index fce2931..73d8d84 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/constant/FixContactConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/constant/FixContactConstant.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.constant; +package org.jeecg.modules.supervision.fixcontact.constant; /** * 定点联系模块常量 diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/controller/FixedContact20260730Controller.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/controller/FixedContact20260730Controller.java index 567ff94..b8fe9b0 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/controller/FixedContact20260730Controller.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.controller; +package org.jeecg.modules.supervision.fixcontact.controller; import java.util.*; import java.io.IOException; @@ -16,14 +16,14 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.excel.ExcelAnnotationUtils; -import org.jeecg.modules.bg.constant.BpmStatus; -import org.jeecg.modules.bg.constant.SupervisionConstant; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; -import org.jeecg.modules.bg.fixcontact.service.IFixedContact20260730Service; -import org.jeecg.modules.bg.fixcontact.service.IFixedContactFeedback20260730Service; -import org.jeecg.modules.bg.fixcontact.dto.FixedContact20260730BpmSaveDTO; -import org.jeecg.modules.bg.fixcontact.vo.FixedContact20260730Page; +import org.jeecg.modules.supervision.common.BpmStatus; +import org.jeecg.modules.supervision.common.SupervisionConstant; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContact20260730Service; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContactFeedback20260730Service; +import org.jeecg.modules.supervision.fixcontact.dto.FixedContact20260730BpmSaveDTO; +import org.jeecg.modules.supervision.fixcontact.vo.FixedContact20260730Page; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.flowable.engine.RuntimeService; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/dto/FixedContact20260730BpmSaveDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/dto/FixedContact20260730BpmSaveDTO.java similarity index 81% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/dto/FixedContact20260730BpmSaveDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/dto/FixedContact20260730BpmSaveDTO.java index 026d51e..fa9f938 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/dto/FixedContact20260730BpmSaveDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/dto/FixedContact20260730BpmSaveDTO.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.bg.fixcontact.dto; +package org.jeecg.modules.supervision.fixcontact.dto; import java.io.Serializable; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContact20260730.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContact20260730.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContact20260730.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContact20260730.java index 2777e73..d70868b 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContact20260730.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContact20260730.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.entity; +package org.jeecg.modules.supervision.fixcontact.entity; import java.io.Serializable; import java.util.Date; @@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.AutoLogIgnore; import org.jeecg.common.aspect.annotation.Dict; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; @Data @TableName(value = "fixed_contact_20260730", autoResultMap = true) diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContactFeedback20260730.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContactFeedback20260730.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContactFeedback20260730.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContactFeedback20260730.java index 682ac5a..83a003c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContactFeedback20260730.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContactFeedback20260730.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.entity; +package org.jeecg.modules.supervision.fixcontact.entity; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/flow/FixContactFlow.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/flow/FixContactFlow.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/flow/FixContactFlow.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/flow/FixContactFlow.java index c45c7c8..97e43b9 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/flow/FixContactFlow.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/flow/FixContactFlow.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.flow; +package org.jeecg.modules.supervision.fixcontact.flow; import com.alibaba.fastjson.JSONObject; import com.jeecg.weibo.exception.BusinessException; @@ -8,13 +8,13 @@ import org.apache.commons.lang.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.modules.bg.fixcontact.constant.FixContactConstant; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; -import org.jeecg.modules.bg.fixcontact.service.IFixedContact20260730Service; -import org.jeecg.modules.bg.fixcontact.service.IFixedContactFeedback20260730Service; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.fixcontact.constant.FixContactConstant; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContact20260730Service; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContactFeedback20260730Service; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactDeptLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactDeptLeaderApproveListener.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactDeptLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactDeptLeaderApproveListener.java index a05da36..66a8fe9 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactDeptLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactDeptLeaderApproveListener.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.listener; +package org.jeecg.modules.supervision.fixcontact.listener; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -7,7 +7,7 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.runtime.Execution; import org.flowable.task.service.delegate.DelegateTask; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.modules.bg.fixcontact.constant.FixContactConstant; +import org.jeecg.modules.supervision.fixcontact.constant.FixContactConstant; import org.springframework.stereotype.Component; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactWorkerApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactWorkerApproveListener.java similarity index 92% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactWorkerApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactWorkerApproveListener.java index 95ab59a..c0a87c1 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactWorkerApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactWorkerApproveListener.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.listener; +package org.jeecg.modules.supervision.fixcontact.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -6,11 +6,11 @@ import org.apache.commons.lang.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.bg.fixcontact.constant.FixContactConstant; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; -import org.jeecg.modules.bg.fixcontact.service.IFixedContact20260730Service; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.fixcontact.constant.FixContactConstant; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContact20260730Service; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContact20260730Mapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContact20260730Mapper.java similarity index 52% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContact20260730Mapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContact20260730Mapper.java index 80ddcae..c6a81e6 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContact20260730Mapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContact20260730Mapper.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.bg.fixcontact.mapper; +package org.jeecg.modules.supervision.fixcontact.mapper; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface FixedContact20260730Mapper extends BaseMapper { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContactFeedback20260730Mapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContactFeedback20260730Mapper.java similarity index 88% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContactFeedback20260730Mapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContactFeedback20260730Mapper.java index de91302..ce15dd7 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContactFeedback20260730Mapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContactFeedback20260730Mapper.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.bg.fixcontact.mapper; +package org.jeecg.modules.supervision.fixcontact.mapper; import java.util.List; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface FixedContactFeedback20260730Mapper extends BaseMapper { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContact20260730Service.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContact20260730Service.java similarity index 77% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContact20260730Service.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContact20260730Service.java index 187a4ef..b8cba34 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContact20260730Service.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContact20260730Service.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.bg.fixcontact.service; +package org.jeecg.modules.supervision.fixcontact.service; import java.io.Serializable; import java.util.Collection; import java.util.List; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; import com.baomidou.mybatisplus.extension.service.IService; public interface IFixedContact20260730Service extends IService { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContactFeedback20260730Service.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContactFeedback20260730Service.java similarity index 64% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContactFeedback20260730Service.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContactFeedback20260730Service.java index a852d02..463ab99 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContactFeedback20260730Service.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContactFeedback20260730Service.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.bg.fixcontact.service; +package org.jeecg.modules.supervision.fixcontact.service; import java.util.List; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; import com.baomidou.mybatisplus.extension.service.IService; public interface IFixedContactFeedback20260730Service extends IService { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContact20260730ServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContact20260730ServiceImpl.java similarity index 86% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContact20260730ServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContact20260730ServiceImpl.java index 7d57e29..d09c691 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContact20260730ServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContact20260730ServiceImpl.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.service.impl; +package org.jeecg.modules.supervision.fixcontact.service.impl; import java.io.Serializable; import java.util.ArrayList; @@ -6,13 +6,13 @@ import java.util.Collection; import java.util.List; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; -import org.jeecg.modules.bg.fixcontact.mapper.FixedContact20260730Mapper; -import org.jeecg.modules.bg.fixcontact.mapper.FixedContactFeedback20260730Mapper; -import org.jeecg.modules.bg.fixcontact.service.IFixedContact20260730Service; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.mapper.FixedContact20260730Mapper; +import org.jeecg.modules.supervision.fixcontact.mapper.FixedContactFeedback20260730Mapper; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContact20260730Service; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java similarity index 59% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java index 4fdb6cc..4561faf 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.bg.fixcontact.service.impl; +package org.jeecg.modules.supervision.fixcontact.service.impl; import java.util.List; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; -import org.jeecg.modules.bg.fixcontact.mapper.FixedContactFeedback20260730Mapper; -import org.jeecg.modules.bg.fixcontact.service.IFixedContactFeedback20260730Service; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.mapper.FixedContactFeedback20260730Mapper; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContactFeedback20260730Service; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/vo/FixedContact20260730Page.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/vo/FixedContact20260730Page.java similarity index 63% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/vo/FixedContact20260730Page.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/vo/FixedContact20260730Page.java index d1e2703..53ed7a2 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/vo/FixedContact20260730Page.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/vo/FixedContact20260730Page.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.bg.fixcontact.vo; +package org.jeecg.modules.supervision.fixcontact.vo; import java.util.List; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; import lombok.Data; import lombok.EqualsAndHashCode; import org.jeecgframework.poi.excel.annotation.ExcelCollection; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/controller/ImprovementProposalController.java similarity index 95% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/controller/ImprovementProposalController.java index acd4714..8dbceb8 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/controller/ImprovementProposalController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.controller; +package org.jeecg.modules.supervision.improvementproposal.controller; import java.io.UnsupportedEncodingException; import java.io.IOException; @@ -25,17 +25,17 @@ import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; -import org.jeecg.modules.improvementproposal.entity.ImprovementProposal; -import org.jeecg.modules.improvementproposal.dto.ImprovementDeptScoreBpmDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementProposalBpmActionDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementProposalDepartmentDTO; -import org.jeecg.modules.improvementproposal.vo.ImprovementProposalPage; -import org.jeecg.modules.improvementproposal.service.IImprovementProposalService; -import org.jeecg.modules.improvementproposal.service.IImprovementDeptScoreService; -import org.jeecg.modules.improvementproposal.service.IImprovementInstituteVoteService; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementDeptScoreBpmDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalBpmActionDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalDepartmentDTO; +import org.jeecg.modules.supervision.improvementproposal.vo.ImprovementProposalPage; +import org.jeecg.modules.supervision.improvementproposal.service.IImprovementProposalService; +import org.jeecg.modules.supervision.improvementproposal.service.IImprovementDeptScoreService; +import org.jeecg.modules.supervision.improvementproposal.service.IImprovementInstituteVoteService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java similarity index 94% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java index a65feb2..ba680b0 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.dto; +package org.jeecg.modules.supervision.improvementproposal.dto; import java.math.BigDecimal; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java similarity index 90% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java index 3b777c5..4fbbfde 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.dto; +package org.jeecg.modules.supervision.improvementproposal.dto; import java.io.Serializable; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalBpmActionDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalBpmActionDTO.java similarity index 95% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalBpmActionDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalBpmActionDTO.java index 15373a5..8174f19 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalBpmActionDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalBpmActionDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.dto; +package org.jeecg.modules.supervision.improvementproposal.dto; import java.io.Serializable; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalDepartmentDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalDepartmentDTO.java similarity index 90% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalDepartmentDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalDepartmentDTO.java index 9117aee..7f6ada8 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalDepartmentDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalDepartmentDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.dto; +package org.jeecg.modules.supervision.improvementproposal.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementDeptScore.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementDeptScore.java index 2edf323..41bcc55 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementDeptScore.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.entity; +package org.jeecg.modules.supervision.improvementproposal.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementInstituteVote.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementInstituteVote.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementInstituteVote.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementInstituteVote.java index c1a671a..7e8fcfc 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementInstituteVote.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementInstituteVote.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.entity; +package org.jeecg.modules.supervision.improvementproposal.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementProposal.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementProposal.java index 27d93dd..4cd72aa 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementProposal.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.entity; +package org.jeecg.modules.supervision.improvementproposal.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementDeptScoreMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementDeptScoreMapper.java similarity index 82% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementDeptScoreMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementDeptScoreMapper.java index fb36f00..0ec953d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementDeptScoreMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementDeptScoreMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.improvementproposal.mapper; +package org.jeecg.modules.supervision.improvementproposal.mapper; import java.util.List; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementInstituteVoteMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementInstituteVoteMapper.java similarity index 84% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementInstituteVoteMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementInstituteVoteMapper.java index 93fc97d..597ad79 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementInstituteVoteMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementInstituteVoteMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.improvementproposal.mapper; +package org.jeecg.modules.supervision.improvementproposal.mapper; import java.util.List; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementProposalMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementProposalMapper.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementProposalMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementProposalMapper.java index 8206aeb..3c27579 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementProposalMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementProposalMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.improvementproposal.mapper; +package org.jeecg.modules.supervision.improvementproposal.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; -import org.jeecg.modules.improvementproposal.entity.ImprovementProposal; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml similarity index 70% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml index c326705..26187cf 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -8,7 +8,7 @@ WHERE main_id = #{mainId} - SELECT * FROM improvement_dept_score WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml similarity index 79% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml index 4335c78..c6bf72c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -8,7 +8,7 @@ WHERE main_id = #{mainId} - SELECT * FROM improvement_institute_vote WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementProposalMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementProposalMapper.xml similarity index 88% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementProposalMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementProposalMapper.xml index 985aacc..eb71488 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementProposalMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementProposalMapper.xml @@ -1,6 +1,6 @@ - + - SELECT DISTINCT u.id, u.username, u.realname FROM sys_role r INNER JOIN sys_user_role ur ON ur.role_id = r.id diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementDeptScoreService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementDeptScoreService.java similarity index 75% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementDeptScoreService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementDeptScoreService.java index bfa5a22..5d46a55 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementDeptScoreService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementDeptScoreService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.improvementproposal.service; +package org.jeecg.modules.supervision.improvementproposal.service; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementInstituteVoteService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementInstituteVoteService.java similarity index 75% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementInstituteVoteService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementInstituteVoteService.java index 1555499..7ebbc42 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementInstituteVoteService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementInstituteVoteService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.improvementproposal.service; +package org.jeecg.modules.supervision.improvementproposal.service; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementProposalService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementProposalService.java similarity index 86% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementProposalService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementProposalService.java index bf720fc..828084f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementProposalService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementProposalService.java @@ -1,12 +1,12 @@ -package org.jeecg.modules.improvementproposal.service; +package org.jeecg.modules.supervision.improvementproposal.service; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; -import org.jeecg.modules.improvementproposal.entity.ImprovementProposal; -import org.jeecg.modules.improvementproposal.dto.ImprovementDeptScoreBpmDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementProposalBpmActionDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementProposalDepartmentDTO; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementDeptScoreBpmDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalBpmActionDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalDepartmentDTO; import org.jeecg.common.system.vo.LoginUser; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletRequest; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java similarity index 67% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java index dd257ea..fac0349 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.improvementproposal.service.impl; +package org.jeecg.modules.supervision.improvementproposal.service.impl; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; -import org.jeecg.modules.improvementproposal.mapper.ImprovementDeptScoreMapper; -import org.jeecg.modules.improvementproposal.service.IImprovementDeptScoreService; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementDeptScoreMapper; +import org.jeecg.modules.supervision.improvementproposal.service.IImprovementDeptScoreService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java similarity index 67% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java index 2e81dca..3b92c40 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.improvementproposal.service.impl; +package org.jeecg.modules.supervision.improvementproposal.service.impl; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; -import org.jeecg.modules.improvementproposal.mapper.ImprovementInstituteVoteMapper; -import org.jeecg.modules.improvementproposal.service.IImprovementInstituteVoteService; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementInstituteVoteMapper; +import org.jeecg.modules.supervision.improvementproposal.service.IImprovementInstituteVoteService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementProposalServiceImpl.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementProposalServiceImpl.java index 0e4a9dd..66dc74f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementProposalServiceImpl.java @@ -1,16 +1,16 @@ -package org.jeecg.modules.improvementproposal.service.impl; +package org.jeecg.modules.supervision.improvementproposal.service.impl; -import org.jeecg.modules.improvementproposal.entity.ImprovementProposal; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; -import org.jeecg.modules.improvementproposal.dto.ImprovementDeptScoreBpmDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementProposalBpmActionDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementProposalDepartmentDTO; -import org.jeecg.modules.improvementproposal.mapper.ImprovementDeptScoreMapper; -import org.jeecg.modules.improvementproposal.mapper.ImprovementInstituteVoteMapper; -import org.jeecg.modules.improvementproposal.mapper.ImprovementProposalMapper; -import org.jeecg.modules.improvementproposal.service.IImprovementProposalService; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementDeptScoreBpmDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalBpmActionDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalDepartmentDTO; +import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementDeptScoreMapper; +import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementInstituteVoteMapper; +import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementProposalMapper; +import org.jeecg.modules.supervision.improvementproposal.service.IImprovementProposalService; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.LoginUser; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/vo/ImprovementProposalPage.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/vo/ImprovementProposalPage.java similarity index 95% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/vo/ImprovementProposalPage.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/vo/ImprovementProposalPage.java index 47c01a5..e70931e 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/vo/ImprovementProposalPage.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/vo/ImprovementProposalPage.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.improvementproposal.vo; +package org.jeecg.modules.supervision.improvementproposal.vo; import java.util.List; -import org.jeecg.modules.improvementproposal.entity.ImprovementProposal; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelEntity; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/controller/DjInspectImproveController.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/controller/DjInspectImproveController.java index 780c35d..c810df4 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/controller/DjInspectImproveController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.dj.inspectimprove.controller; +package org.jeecg.modules.supervision.inspectimprove.controller; import java.util.Arrays; import java.util.List; @@ -13,11 +13,11 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.bg.constant.BpmStatus; -import org.jeecg.modules.bg.constant.SupervisionConstant; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.common.BpmStatus; +import org.jeecg.modules.supervision.common.SupervisionConstant; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/entity/DjInspectImprove.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/entity/DjInspectImprove.java index ad820c1..c17fbf7 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/entity/DjInspectImprove.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.dj.inspectimprove.entity; +package org.jeecg.modules.supervision.inspectimprove.entity; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/DjInspectImproveMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/DjInspectImproveMapper.java similarity index 84% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/DjInspectImproveMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/DjInspectImproveMapper.java index 0bf2e1e..eeb45c2 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/DjInspectImproveMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/DjInspectImproveMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.dj.inspectimprove.mapper; +package org.jeecg.modules.supervision.inspectimprove.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; import java.util.List; import java.util.Map; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/xml/DjInspectImproveMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/xml/DjInspectImproveMapper.xml similarity index 89% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/xml/DjInspectImproveMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/xml/DjInspectImproveMapper.xml index 8f46221..d7a48a0 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/xml/DjInspectImproveMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/xml/DjInspectImproveMapper.xml @@ -1,6 +1,6 @@ - + update dj_inspect_improve set has_child = #{status} where id = #{id} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/IDjInspectImproveService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/IDjInspectImproveService.java similarity index 92% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/IDjInspectImproveService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/IDjInspectImproveService.java index 8d0825b..7efbd09 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/IDjInspectImproveService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/IDjInspectImproveService.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.dj.inspectimprove.service; +package org.jeecg.modules.supervision.inspectimprove.service; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.exception.JeecgBootException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/impl/DjInspectImproveServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/impl/DjInspectImproveServiceImpl.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/impl/DjInspectImproveServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/impl/DjInspectImproveServiceImpl.java index 726820a..bf16181 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/impl/DjInspectImproveServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/impl/DjInspectImproveServiceImpl.java @@ -1,12 +1,12 @@ -package org.jeecg.modules.dj.inspectimprove.service.impl; +package org.jeecg.modules.supervision.inspectimprove.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; -import org.jeecg.modules.dj.inspectimprove.mapper.DjInspectImproveMapper; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.mapper.DjInspectImproveMapper; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/controller/DjOfficialdocDistributeController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/controller/DjOfficialdocDistributeController.java similarity index 92% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/controller/DjOfficialdocDistributeController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/controller/DjOfficialdocDistributeController.java index 0e42f19..06f2ea3 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/controller/DjOfficialdocDistributeController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/controller/DjOfficialdocDistributeController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.officialdocDistribute.controller; +package org.jeecg.modules.supervision.officialdoc.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -6,8 +6,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.modules.officialdocDistribute.entity.DjOfficialdocDistribute; -import org.jeecg.modules.officialdocDistribute.service.IDjOfficialdocDistributeService; +import org.jeecg.modules.supervision.officialdoc.entity.DjOfficialdocDistribute; +import org.jeecg.modules.supervision.officialdoc.service.IDjOfficialdocDistributeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/entity/DjOfficialdocDistribute.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/entity/DjOfficialdocDistribute.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/entity/DjOfficialdocDistribute.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/entity/DjOfficialdocDistribute.java index 97e6009..738f50c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/entity/DjOfficialdocDistribute.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/entity/DjOfficialdocDistribute.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.officialdocDistribute.entity; +package org.jeecg.modules.supervision.officialdoc.entity; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/DjOfficialdocDistributeMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/DjOfficialdocDistributeMapper.java similarity index 70% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/DjOfficialdocDistributeMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/DjOfficialdocDistributeMapper.java index c66787a..e5340ec 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/DjOfficialdocDistributeMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/DjOfficialdocDistributeMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.officialdocDistribute.mapper; +package org.jeecg.modules.supervision.officialdoc.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.officialdocDistribute.entity.DjOfficialdocDistribute; +import org.jeecg.modules.supervision.officialdoc.entity.DjOfficialdocDistribute; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/xml/DjOfficialdocDistributeMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/xml/DjOfficialdocDistributeMapper.xml similarity index 61% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/xml/DjOfficialdocDistributeMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/xml/DjOfficialdocDistributeMapper.xml index 69d16c0..1b9baf5 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/xml/DjOfficialdocDistributeMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/xml/DjOfficialdocDistributeMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/service/IDjOfficialdocDistributeService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/service/IDjOfficialdocDistributeService.java similarity index 66% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/service/IDjOfficialdocDistributeService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/service/IDjOfficialdocDistributeService.java index d838fb9..c8d30e3 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/service/IDjOfficialdocDistributeService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/service/IDjOfficialdocDistributeService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.officialdocDistribute.service; +package org.jeecg.modules.supervision.officialdoc.service; -import org.jeecg.modules.officialdocDistribute.entity.DjOfficialdocDistribute; +import org.jeecg.modules.supervision.officialdoc.entity.DjOfficialdocDistribute; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/service/impl/DjOfficialdocDistributeServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/service/impl/DjOfficialdocDistributeServiceImpl.java similarity index 56% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/service/impl/DjOfficialdocDistributeServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/service/impl/DjOfficialdocDistributeServiceImpl.java index ca53244..28ca3b0 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/service/impl/DjOfficialdocDistributeServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/service/impl/DjOfficialdocDistributeServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.officialdocDistribute.service.impl; +package org.jeecg.modules.supervision.officialdoc.service.impl; -import org.jeecg.modules.officialdocDistribute.entity.DjOfficialdocDistribute; -import org.jeecg.modules.officialdocDistribute.mapper.DjOfficialdocDistributeMapper; -import org.jeecg.modules.officialdocDistribute.service.IDjOfficialdocDistributeService; +import org.jeecg.modules.supervision.officialdoc.entity.DjOfficialdocDistribute; +import org.jeecg.modules.supervision.officialdoc.mapper.DjOfficialdocDistributeMapper; +import org.jeecg.modules.supervision.officialdoc.service.IDjOfficialdocDistributeService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/controller/TaskListController.java similarity index 95% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/controller/TaskListController.java index 913dce3..0672d06 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/controller/TaskListController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.controller; +package org.jeecg.modules.supervision.tasklist.controller; import java.io.UnsupportedEncodingException; import java.io.IOException; @@ -24,20 +24,20 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; -import org.jeecg.modules.demo.tasklist.entity.TaskList; -import org.jeecg.modules.demo.tasklist.vo.TaskListPage; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskListReq; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskListGroupReq; -import org.jeecg.modules.demo.tasklist.vo.MoveTaskListReq; -import org.jeecg.modules.demo.tasklist.vo.AddCollaboratorReq; -import org.jeecg.modules.demo.tasklist.vo.CollaboratorVO; -import org.jeecg.modules.demo.tasklist.service.ITaskListService; -import org.jeecg.modules.demo.tasklist.service.ITaskListDetialService; -import org.jeecg.modules.demo.tasklist.service.ITaskListPermissionService; -import org.jeecg.modules.demo.tasklist.service.ITaskListFavoriteService; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.entity.TaskList; +import org.jeecg.modules.supervision.tasklist.vo.TaskListPage; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskListReq; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskListGroupReq; +import org.jeecg.modules.supervision.tasklist.vo.MoveTaskListReq; +import org.jeecg.modules.supervision.tasklist.vo.AddCollaboratorReq; +import org.jeecg.modules.supervision.tasklist.vo.CollaboratorVO; +import org.jeecg.modules.supervision.tasklist.service.ITaskListService; +import org.jeecg.modules.supervision.tasklist.service.ITaskListDetialService; +import org.jeecg.modules.supervision.tasklist.service.ITaskListPermissionService; +import org.jeecg.modules.supervision.tasklist.service.ITaskListFavoriteService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListDetialController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/controller/TaskListDetialController.java similarity index 94% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListDetialController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/controller/TaskListDetialController.java index 136cf4a..6bef3e8 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListDetialController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/controller/TaskListDetialController.java @@ -1,12 +1,12 @@ -package org.jeecg.modules.demo.tasklist.controller; +package org.jeecg.modules.supervision.tasklist.controller; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.constant.CommonConstant; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; -import org.jeecg.modules.demo.tasklist.service.ITaskListDetialService; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskReq; -import org.jeecg.modules.demo.tasklist.vo.MoveTaskReq; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.service.ITaskListDetialService; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskReq; +import org.jeecg.modules.supervision.tasklist.vo.MoveTaskReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import lombok.extern.slf4j.Slf4j; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskList.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskList.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskList.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskList.java index 767014f..ad4c86f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskList.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskList.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.entity; +package org.jeecg.modules.supervision.tasklist.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListDetial.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListDetial.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListDetial.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListDetial.java index 22c0933..1bcf87d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListDetial.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListDetial.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.entity; +package org.jeecg.modules.supervision.tasklist.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListFavorite.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListFavorite.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListFavorite.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListFavorite.java index 6ecd951..b70a76f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListFavorite.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListFavorite.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.entity; +package org.jeecg.modules.supervision.tasklist.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListPermission.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListPermission.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListPermission.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListPermission.java index 5a0959d..3b761ed 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListPermission.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListPermission.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.entity; +package org.jeecg.modules.supervision.tasklist.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListDetialMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListDetialMapper.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListDetialMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListDetialMapper.java index 703a07c..debb87d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListDetialMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListDetialMapper.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.tasklist.mapper; +package org.jeecg.modules.supervision.tasklist.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface TaskListDetialMapper extends BaseMapper { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListFavoriteMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListFavoriteMapper.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListFavoriteMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListFavoriteMapper.java index c305012..bbea2ce 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListFavoriteMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListFavoriteMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.tasklist.mapper; +package org.jeecg.modules.supervision.tasklist.mapper; import java.util.List; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListMapper.java similarity index 91% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListMapper.java index 80e7619..bc7eeed 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.demo.tasklist.mapper; +package org.jeecg.modules.supervision.tasklist.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.tasklist.entity.TaskList; +import org.jeecg.modules.supervision.tasklist.entity.TaskList; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListPermissionMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListPermissionMapper.java similarity index 84% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListPermissionMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListPermissionMapper.java index 65a6d86..ecaced2 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListPermissionMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListPermissionMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.tasklist.mapper; +package org.jeecg.modules.supervision.tasklist.mapper; import java.util.List; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListDetialMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListDetialMapper.xml similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListDetialMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListDetialMapper.xml index 6566b9b..0411605 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListDetialMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListDetialMapper.xml @@ -1,12 +1,12 @@ - + DELETE FROM task_list_detial WHERE main_id = #{mainId} - SELECT * FROM task_list_detial WHERE main_id = #{mainId} @@ -56,13 +56,13 @@ WHERE id = #{taskId} AND del_flag = '0' - SELECT * FROM task_list_detial WHERE main_id = #{mainId} AND del_flag = '0' ORDER BY sort_order ASC - SELECT * FROM task_list_detial WHERE main_id = #{mainId} AND del_flag = '0' AND ( @@ -74,7 +74,7 @@ ORDER BY sort_order ASC - SELECT * FROM task_list_detial WHERE pid = #{parentId} AND type = '1' AND del_flag = '0' ORDER BY sort_order ASC @@ -87,7 +87,7 @@ WHERE id = #{id} - SELECT * FROM task_list_detial WHERE pid = #{pid} AND del_flag = '0' @@ -157,7 +157,7 @@ WHERE pid = #{pid} AND del_flag = '0' - SELECT d.*, t.tasklist_name AS listName, p.permission AS myPermission @@ -169,7 +169,7 @@ AND d.assignee_id LIKE CONCAT('%', #{assigneeId}, '%') - SELECT d.*, t.tasklist_name AS listName, p.permission AS myPermission @@ -189,7 +189,7 @@ AND (assign_id IS NULL OR assign_id NOT LIKE CONCAT('%', #{userId}, '%')) - SELECT * FROM task_list_detial WHERE main_id = #{mainId} AND del_flag = '0' ORDER BY sort_order ASC @@ -201,7 +201,7 @@ WHERE main_id = #{mainId} AND type = '1' AND del_flag = '0' - SELECT d.*, t.tasklist_name AS listName, p.permission AS myPermission FROM task_list_detial d LEFT JOIN task_list t ON d.main_id = t.id AND t.del_flag = '0' @@ -219,7 +219,7 @@ AND d.assignee_id LIKE CONCAT('%', #{assigneeId}, '%') - SELECT d.*, t.tasklist_name AS listName, p.permission AS myPermission FROM task_list_detial d LEFT JOIN task_list t ON d.main_id = t.id AND t.del_flag = '0' diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListFavoriteMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListFavoriteMapper.xml similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListFavoriteMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListFavoriteMapper.xml index 3cdcd29..b5b8710 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListFavoriteMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListFavoriteMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -8,7 +8,7 @@ WHERE main_id = #{mainId} - SELECT * FROM task_list_favorite WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListMapper.xml similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListMapper.xml index bddc655..2f84226 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListMapper.xml @@ -1,8 +1,8 @@ - + - SELECT DISTINCT t.* FROM task_list t WHERE t.del_flag = '0' @@ -42,7 +42,7 @@ ORDER BY t.create_time ASC - SELECT DISTINCT t.* FROM task_list t WHERE t.del_flag = '0' diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListPermissionMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListPermissionMapper.xml similarity index 72% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListPermissionMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListPermissionMapper.xml index e620060..3e84bdb 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListPermissionMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListPermissionMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -8,7 +8,7 @@ WHERE main_id = #{mainId} - SELECT * FROM task_list_permission WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListDetialService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListDetialService.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListDetialService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListDetialService.java index b355492..3a22285 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListDetialService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListDetialService.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.demo.tasklist.service; +package org.jeecg.modules.supervision.tasklist.service; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskReq; -import org.jeecg.modules.demo.tasklist.vo.MoveTaskReq; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskReq; +import org.jeecg.modules.supervision.tasklist.vo.MoveTaskReq; public interface ITaskListDetialService extends IService { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListFavoriteService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListFavoriteService.java similarity index 91% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListFavoriteService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListFavoriteService.java index 154c7e6..884020d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListFavoriteService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListFavoriteService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.demo.tasklist.service; +package org.jeecg.modules.supervision.tasklist.service; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListPermissionService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListPermissionService.java similarity index 78% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListPermissionService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListPermissionService.java index 35895f0..5fc451c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListPermissionService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListPermissionService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.demo.tasklist.service; +package org.jeecg.modules.supervision.tasklist.service; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListService.java similarity index 80% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListService.java index 61aa8ae..c209c98 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListService.java @@ -1,14 +1,14 @@ -package org.jeecg.modules.demo.tasklist.service; +package org.jeecg.modules.supervision.tasklist.service; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; -import org.jeecg.modules.demo.tasklist.entity.TaskList; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskListReq; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskListGroupReq; -import org.jeecg.modules.demo.tasklist.vo.MoveTaskListReq; -import org.jeecg.modules.demo.tasklist.vo.AddCollaboratorReq; -import org.jeecg.modules.demo.tasklist.vo.CollaboratorVO; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.entity.TaskList; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskListReq; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskListGroupReq; +import org.jeecg.modules.supervision.tasklist.vo.MoveTaskListReq; +import org.jeecg.modules.supervision.tasklist.vo.AddCollaboratorReq; +import org.jeecg.modules.supervision.tasklist.vo.CollaboratorVO; import com.baomidou.mybatisplus.extension.service.IService; import java.io.Serializable; import java.util.Collection; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListDetialServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListDetialServiceImpl.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListDetialServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListDetialServiceImpl.java index f3d63db..52f1b44 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListDetialServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListDetialServiceImpl.java @@ -1,14 +1,14 @@ -package org.jeecg.modules.demo.tasklist.service.impl; +package org.jeecg.modules.supervision.tasklist.service.impl; -import org.jeecg.modules.demo.tasklist.entity.TaskList; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; -import org.jeecg.modules.demo.tasklist.mapper.TaskListDetialMapper; -import org.jeecg.modules.demo.tasklist.mapper.TaskListMapper; -import org.jeecg.modules.demo.tasklist.mapper.TaskListPermissionMapper; -import org.jeecg.modules.demo.tasklist.service.ITaskListDetialService; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskReq; -import org.jeecg.modules.demo.tasklist.vo.MoveTaskReq; +import org.jeecg.modules.supervision.tasklist.entity.TaskList; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListDetialMapper; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListMapper; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListPermissionMapper; +import org.jeecg.modules.supervision.tasklist.service.ITaskListDetialService; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskReq; +import org.jeecg.modules.supervision.tasklist.vo.MoveTaskReq; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListFavoriteServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListFavoriteServiceImpl.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListFavoriteServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListFavoriteServiceImpl.java index c758fbd..4266f40 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListFavoriteServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListFavoriteServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.tasklist.service.impl; +package org.jeecg.modules.supervision.tasklist.service.impl; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; -import org.jeecg.modules.demo.tasklist.mapper.TaskListFavoriteMapper; -import org.jeecg.modules.demo.tasklist.service.ITaskListFavoriteService; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListFavoriteMapper; +import org.jeecg.modules.supervision.tasklist.service.ITaskListFavoriteService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListPermissionServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListPermissionServiceImpl.java similarity index 69% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListPermissionServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListPermissionServiceImpl.java index fc6a148..cc0608c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListPermissionServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListPermissionServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.tasklist.service.impl; +package org.jeecg.modules.supervision.tasklist.service.impl; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; -import org.jeecg.modules.demo.tasklist.mapper.TaskListPermissionMapper; -import org.jeecg.modules.demo.tasklist.service.ITaskListPermissionService; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListPermissionMapper; +import org.jeecg.modules.supervision.tasklist.service.ITaskListPermissionService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListServiceImpl.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListServiceImpl.java index bebe8d7..ea43daf 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListServiceImpl.java @@ -1,20 +1,20 @@ -package org.jeecg.modules.demo.tasklist.service.impl; +package org.jeecg.modules.supervision.tasklist.service.impl; -import org.jeecg.modules.demo.tasklist.entity.TaskList; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; -import org.jeecg.modules.demo.tasklist.mapper.TaskListDetialMapper; -import org.jeecg.modules.demo.tasklist.mapper.TaskListPermissionMapper; -import org.jeecg.modules.demo.tasklist.mapper.TaskListFavoriteMapper; -import org.jeecg.modules.demo.tasklist.mapper.TaskListMapper; -import org.jeecg.modules.demo.tasklist.service.ITaskListService; -import org.jeecg.modules.demo.tasklist.service.ITaskListFavoriteService; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskListReq; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskListGroupReq; -import org.jeecg.modules.demo.tasklist.vo.MoveTaskListReq; -import org.jeecg.modules.demo.tasklist.vo.AddCollaboratorReq; -import org.jeecg.modules.demo.tasklist.vo.CollaboratorVO; +import org.jeecg.modules.supervision.tasklist.entity.TaskList; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListDetialMapper; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListPermissionMapper; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListFavoriteMapper; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListMapper; +import org.jeecg.modules.supervision.tasklist.service.ITaskListService; +import org.jeecg.modules.supervision.tasklist.service.ITaskListFavoriteService; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskListReq; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskListGroupReq; +import org.jeecg.modules.supervision.tasklist.vo.MoveTaskListReq; +import org.jeecg.modules.supervision.tasklist.vo.AddCollaboratorReq; +import org.jeecg.modules.supervision.tasklist.vo.CollaboratorVO; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.vo.LoginUser; import org.apache.shiro.SecurityUtils; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/AddCollaboratorReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/AddCollaboratorReq.java similarity index 88% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/AddCollaboratorReq.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/AddCollaboratorReq.java index abf7262..b722dbe 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/AddCollaboratorReq.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/AddCollaboratorReq.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CollaboratorVO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CollaboratorVO.java similarity index 90% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CollaboratorVO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CollaboratorVO.java index 58f5d83..9937e6d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CollaboratorVO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CollaboratorVO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskListGroupReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskListGroupReq.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskListGroupReq.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskListGroupReq.java index cd0f242..4417105 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskListGroupReq.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskListGroupReq.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskListReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskListReq.java similarity index 91% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskListReq.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskListReq.java index d59e601..23f8a18 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskListReq.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskListReq.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskReq.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskReq.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskReq.java index c735048..c59496f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskReq.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskReq.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/MoveTaskListReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/MoveTaskListReq.java similarity index 91% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/MoveTaskListReq.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/MoveTaskListReq.java index 2316e76..b2a83ee 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/MoveTaskListReq.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/MoveTaskListReq.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/MoveTaskReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/MoveTaskReq.java similarity index 90% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/MoveTaskReq.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/MoveTaskReq.java index a842689..267495b 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/MoveTaskReq.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/MoveTaskReq.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/TaskListPage.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/TaskListPage.java similarity index 88% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/TaskListPage.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/TaskListPage.java index 16f911a..432481f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/TaskListPage.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/TaskListPage.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import java.util.List; -import org.jeecg.modules.demo.tasklist.entity.TaskList; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.entity.TaskList; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelEntity; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/constant/XiSpeakConstant.java similarity index 90% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/constant/XiSpeakConstant.java index 9d4d5ee..78a9017 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/constant/XiSpeakConstant.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.constant; +package org.jeecg.modules.supervision.xispeak.constant; /** * 语音/演讲模块常量类 diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/controller/BgXiSpeakController.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/controller/BgXiSpeakController.java index ed084c8..59d93d2 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/controller/BgXiSpeakController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.controller; +package org.jeecg.modules.supervision.xispeak.controller; import java.util.*; import java.util.stream.Collectors; @@ -21,19 +21,19 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.excel.ExcelAnnotationUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.bg.constant.BpmStatus; -import org.jeecg.modules.bg.constant.SupervisionConstant; +import org.jeecg.modules.supervision.common.BpmStatus; +import org.jeecg.modules.supervision.common.SupervisionConstant; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakFeedbackService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeakFeedback; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakFeedbackService; -import org.jeecg.modules.bg.xispeak.dto.BgXiSpeakBpmSaveDTO; +import org.jeecg.modules.supervision.xispeak.dto.BgXiSpeakBpmSaveDTO; import org.flowable.engine.RuntimeService; import com.alibaba.fastjson.JSONObject; -import org.jeecg.modules.demo.bgpartymatter.constant.BgPartymatterConstant; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter; +import org.jeecg.modules.supervision.bgpartymatter.constant.BgPartymatterConstant; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/feedback/BgXiSpeakFeedbackController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/controller/BgXiSpeakFeedbackController.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/feedback/BgXiSpeakFeedbackController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/controller/BgXiSpeakFeedbackController.java index de56c41..afc9f60 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/feedback/BgXiSpeakFeedbackController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/controller/BgXiSpeakFeedbackController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.controller.feedback; +package org.jeecg.modules.supervision.xispeak.controller; import java.util.Arrays; import java.util.List; @@ -13,8 +13,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakFeedbackService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeakFeedback; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakFeedbackService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/dto/BgXiSpeakBpmSaveDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/dto/BgXiSpeakBpmSaveDTO.java similarity index 82% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/dto/BgXiSpeakBpmSaveDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/dto/BgXiSpeakBpmSaveDTO.java index 2ed5d85..fe164d9 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/dto/BgXiSpeakBpmSaveDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/dto/BgXiSpeakBpmSaveDTO.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.bg.xispeak.dto; +package org.jeecg.modules.supervision.xispeak.dto; import java.io.Serializable; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/BgXiSpeak.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/BgXiSpeak.java index acc8a50..8e01b5f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/BgXiSpeak.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.entity; +package org.jeecg.modules.supervision.xispeak.entity; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/BgXiSpeakFeedback.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/BgXiSpeakFeedback.java index 74bfffe..036d8c5 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/BgXiSpeakFeedback.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.entity; +package org.jeecg.modules.supervision.xispeak.entity; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetail.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/DeptApproveDetail.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetail.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/DeptApproveDetail.java index e067a2a..7fbe70f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetail.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/DeptApproveDetail.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.entity; +package org.jeecg.modules.supervision.xispeak.entity; import com.fasterxml.jackson.annotation.JsonAlias; import lombok.AllArgsConstructor; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetailMap.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/DeptApproveDetailMap.java similarity index 69% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetailMap.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/DeptApproveDetailMap.java index 8448794..72b512e 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetailMap.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/DeptApproveDetailMap.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.entity; +package org.jeecg.modules.supervision.xispeak.entity; import java.util.LinkedHashMap; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/BgXiSpeakFeedbackMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/BgXiSpeakFeedbackMapper.java similarity index 71% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/BgXiSpeakFeedbackMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/BgXiSpeakFeedbackMapper.java index 93d2b74..f45dc3d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/BgXiSpeakFeedbackMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/BgXiSpeakFeedbackMapper.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.bg.xispeak.mapper; +package org.jeecg.modules.supervision.xispeak.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeakFeedback; /** * @Description: 习总书记重要讲话反馈表 diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/BgXiSpeakMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/BgXiSpeakMapper.java similarity index 86% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/BgXiSpeakMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/BgXiSpeakMapper.java index e7c2c3c..975722d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/BgXiSpeakMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/BgXiSpeakMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.bg.xispeak.mapper; +package org.jeecg.modules.supervision.xispeak.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; import java.util.List; import java.util.Map; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/xml/BgXiSpeakMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/xml/BgXiSpeakMapper.xml similarity index 90% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/xml/BgXiSpeakMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/xml/BgXiSpeakMapper.xml index a0d44f1..78cccc0 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/xml/BgXiSpeakMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/xml/BgXiSpeakMapper.xml @@ -1,6 +1,6 @@ - + update bg_xi_speak set has_child = #{status} where id = #{id} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/IBgXiSpeakFeedbackService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/IBgXiSpeakFeedbackService.java similarity index 77% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/IBgXiSpeakFeedbackService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/IBgXiSpeakFeedbackService.java index 2d04b0f..c4685d0 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/IBgXiSpeakFeedbackService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/IBgXiSpeakFeedbackService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.bg.xispeak.service; +package org.jeecg.modules.supervision.xispeak.service; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeakFeedback; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/IBgXiSpeakService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/IBgXiSpeakService.java similarity index 95% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/IBgXiSpeakService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/IBgXiSpeakService.java index ffb6894..2a39d8d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/IBgXiSpeakService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/IBgXiSpeakService.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.bg.xispeak.service; +package org.jeecg.modules.supervision.xispeak.service; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.exception.JeecgBootException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakFeedbackServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/impl/BgXiSpeakFeedbackServiceImpl.java similarity index 71% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakFeedbackServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/impl/BgXiSpeakFeedbackServiceImpl.java index 4531f2d..c3178ab 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakFeedbackServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/impl/BgXiSpeakFeedbackServiceImpl.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.bg.xispeak.service.impl; +package org.jeecg.modules.supervision.xispeak.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback; -import org.jeecg.modules.bg.xispeak.mapper.BgXiSpeakFeedbackMapper; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakFeedbackService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeakFeedback; +import org.jeecg.modules.supervision.xispeak.mapper.BgXiSpeakFeedbackMapper; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakFeedbackService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/impl/BgXiSpeakServiceImpl.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/impl/BgXiSpeakServiceImpl.java index b25ddf0..97ce878 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/impl/BgXiSpeakServiceImpl.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.service.impl; +package org.jeecg.modules.supervision.xispeak.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; @@ -9,14 +9,14 @@ import java.util.Objects; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.bg.constant.BpmStatus; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.common.BpmStatus; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; import org.jeecg.modules.extbpm.process.entity.ExtActTaskCc; import org.jeecg.modules.extbpm.process.service.IExtActTaskCcService; -import org.jeecg.modules.bg.xispeak.mapper.BgXiSpeakMapper; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.mapper.BgXiSpeakMapper; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.taskapprovalopinion.entity.TaskApprovalOpinion; import org.jeecg.modules.taskapprovalopinion.service.ITaskApprovalOpinionService; import org.jeecg.modules.tasktask.entity.TaskTask; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/SubTaskPageReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/SubTaskPageReq.java deleted file mode 100644 index 4a32552..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/SubTaskPageReq.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.jeecg.modules.demo.tasklist.vo; - -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; - -@Data -@Schema(description = "子任务分页请求") -public class SubTaskPageReq { - - @Schema(description = "父任务ID") - private String parentTaskId; - - @Schema(description = "页码，默认1") - private Integer pageNo = 1; - - @Schema(description = "每页条数，默认20") - private Integer pageSize = 20; -}