sz-team/supervision-test-repo
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(supervision): 统一业务模块到 supervision 根包

Browse Source
This commit is contained in:
wsm
2026-08-06 14:52:28 +08:00
parent 21a6394a51
commit f849a2f049
148 changed files with 458 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/IProcessPortalService.java
-8
View File
@@ -1,8 +0,0 @@
package org.jeecg.modules.dashboard.service;
import org.jeecg.modules.dashboard.dto.ProcessPortalStatsDTO;
public interface IProcessPortalService {
ProcessPortalStatsDTO getStats(String userId);
}
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/constant/BgPartymatterConstant.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/constant/BgPartymatterConstant.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.bgpartymatter.constant;
package org.jeecg.modules.supervision.bgpartymatter.constant;
/**
* 党委/所务会事项模块常量类
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/controller/BgPartymatterController.java
+11 -11
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatter.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatterFeedback.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatterFeedback.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterMapper.java
+2 -2
View File
@@ -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;
/**
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterFeedbackMapper">
<mapper namespace="org.jeecg.modules.supervision.bgpartymatter.mapper.BgPartymatterFeedbackMapper">
<delete id="deleteByMainId" parameterType="java.lang.String">
DELETE
@@ -9,7 +9,7 @@
main_id = #{mainId}
</delete>
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback">
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback">
SELECT *
FROM bg_partymatter_feedback
WHERE
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterMapper.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterMapper">
<mapper namespace="org.jeecg.modules.supervision.bgpartymatter.mapper.BgPartymatterMapper">
</mapper>
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterFeedbackService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterFeedbackService.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterService.java
+3 -3
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java
+4 -4
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterServiceImpl.java
+5 -5
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/controller/BgTakepulseController.java
+10 -10
View File
@@ -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.*;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulse.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulse.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulseFeedback.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulseFeedback.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseMapper.java
+2 -2
View File
@@ -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;
/**
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.bqtakepulse.mapper.BgTakepulseFeedbackMapper">
<mapper namespace="org.jeecg.modules.supervision.bqtakepulse.mapper.BgTakepulseFeedbackMapper">
<delete id="deleteByMainId" parameterType="java.lang.String">
DELETE
@@ -8,7 +8,7 @@
WHERE
main_id = #{mainId} </delete>
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback">
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback">
SELECT *
FROM bg_takepulse_feedback
WHERE
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseMapper.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.bqtakepulse.mapper.BgTakepulseMapper">
<mapper namespace="org.jeecg.modules.supervision.bqtakepulse.mapper.BgTakepulseMapper">
</mapper>
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseFeedbackService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseFeedbackService.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseService.java
+3 -3
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java
+4 -4
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseServiceImpl.java
+6 -6
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/vo/BgTakepulsePage.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/vo/BgTakepulsePage.java
+3 -3
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/BpmStatus.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/BpmStatus.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.bg.constant;
package org.jeecg.modules.supervision.common;
import java.util.Arrays;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/SupervisionConstant.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/SupervisionConstant.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.bg.constant;
package org.jeecg.modules.supervision.common;
/**
* 监督模块通用常量
jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/controller/ProcessPortalController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/controller/ProcessPortalController.java
+3 -3
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/dto/ProcessPortalStatsDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/dto/ProcessPortalStatsDTO.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.dashboard.dto;
package org.jeecg.modules.supervision.dashboard.dto;
import lombok.Data;
jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/mapper/ProcessPortalMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/mapper/ProcessPortalMapper.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/IProcessPortalService.java
+8
View File
@@ -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);
}
jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/impl/ProcessPortalServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/impl/ProcessPortalServiceImpl.java
+4 -4
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/controller/DqInspectProblemController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/controller/DqInspectProblemController.java
+3 -3
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/entity/DqInspectProblem.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/entity/DqInspectProblem.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/DqInspectProblemMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/DqInspectProblemMapper.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.dqinspectproblem.mapper.DqInspectProblemMapper">
<mapper namespace="org.jeecg.modules.supervision.dqinspectproblem.mapper.DqInspectProblemMapper">
<update id="updateTreeNodeStatus" parameterType="java.lang.String">
update dq_inspect_problem set has_child = #{status} where id = #{id}
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/IDqInspectProblemService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/IDqInspectProblemService.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java
+4 -4
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectProgressController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectProgressController.java
+3 -3
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectTaskController.java
+7 -7
View File
@@ -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.*;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectProgress.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectProgress.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectTask.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectProgressMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectProgressMapper.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectTaskMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectTaskMapper.java
+3 -3
View File
@@ -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
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectProgressMapper">
<mapper namespace="org.jeecg.modules.supervision.dqinspecttask.mapper.DqInspectProgressMapper">
<delete id="deleteByMainId" parameterType="java.lang.String">
DELETE
@@ -8,7 +8,7 @@
WHERE
main_id = #{mainId} </delete>
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress">
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress">
SELECT *
FROM dq_inspect_progress
WHERE
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml
+2 -2
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectTaskMapper">
<mapper namespace="org.jeecg.modules.supervision.dqinspecttask.mapper.DqInspectTaskMapper">
<select id="queryLedgerPage" resultType="org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo">
<select id="queryLedgerPage" resultType="org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo">
select
t.id,
p_category.id as categoryId,
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectProgressService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectProgressService.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectTaskService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectTaskService.java
+4 -4
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java
+4 -4
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java
+9 -9
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskLedgerVo.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskPage.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskPage.java
+3 -3
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/constant/FixContactConstant.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/constant/FixContactConstant.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.bg.fixcontact.constant;
package org.jeecg.modules.supervision.fixcontact.constant;
/**
* 定点联系模块常量
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/controller/FixedContact20260730Controller.java
+9 -9
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/dto/FixedContact20260730BpmSaveDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/dto/FixedContact20260730BpmSaveDTO.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContact20260730.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContact20260730.java
+2 -2
View File
@@ -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)
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContactFeedback20260730.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContactFeedback20260730.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/flow/FixContactFlow.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/flow/FixContactFlow.java
+8 -8
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactDeptLeaderApproveListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactDeptLeaderApproveListener.java
+2 -2
View File
@@ -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;
/**
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactWorkerApproveListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactWorkerApproveListener.java
+6 -6
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContact20260730Mapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContact20260730Mapper.java
+2 -2
View File
@@ -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<FixedContact20260730> {
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContactFeedback20260730Mapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContactFeedback20260730Mapper.java
+2 -2
View File
@@ -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<FixedContactFeedback20260730> {
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContact20260730Service.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContact20260730Service.java
+3 -3
View File
@@ -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<FixedContact20260730> {
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContactFeedback20260730Service.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContactFeedback20260730Service.java
+2 -2
View File
@@ -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<FixedContactFeedback20260730> {
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContact20260730ServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContact20260730ServiceImpl.java
+8 -8
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java
+4 -4
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/vo/FixedContact20260730Page.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/vo/FixedContact20260730Page.java
+3 -3
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/controller/ImprovementProposalController.java
+12 -12
View File
@@ -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.*;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.improvementproposal.dto;
package org.jeecg.modules.supervision.improvementproposal.dto;
import java.math.BigDecimal;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.improvementproposal.dto;
package org.jeecg.modules.supervision.improvementproposal.dto;
import java.io.Serializable;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalBpmActionDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalBpmActionDTO.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalDepartmentDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalDepartmentDTO.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementDeptScore.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementInstituteVote.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementInstituteVote.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementProposal.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementDeptScoreMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementDeptScoreMapper.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementInstituteVoteMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementInstituteVoteMapper.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementProposalMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementProposalMapper.java
+3 -3
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.improvementproposal.mapper.ImprovementDeptScoreMapper">
<mapper namespace="org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementDeptScoreMapper">
<delete id="deleteByMainId" parameterType="java.lang.String">
DELETE
@@ -8,7 +8,7 @@
WHERE
main_id = #{mainId} </delete>
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore">
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore">
SELECT *
FROM improvement_dept_score
WHERE
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.improvementproposal.mapper.ImprovementInstituteVoteMapper">
<mapper namespace="org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementInstituteVoteMapper">
<delete id="deleteByMainId" parameterType="java.lang.String">
DELETE
@@ -8,7 +8,7 @@
WHERE
main_id = #{mainId} </delete>
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote">
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote">
SELECT *
FROM improvement_institute_vote
WHERE
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementProposalMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementProposalMapper.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.improvementproposal.mapper.ImprovementProposalMapper">
<mapper namespace="org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementProposalMapper">
<select id="selectLatestProposalNoByYear" resultType="java.lang.String">
SELECT proposal_no FROM improvement_proposal
@@ -25,7 +25,7 @@
</select>
<!-- 角色名单由服务端查询，前端只能从该受控集合中选择。 -->
<select id="selectInstituteVoteCandidates" resultType="org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO">
<select id="selectInstituteVoteCandidates" resultType="org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO">
SELECT DISTINCT u.id, u.username, u.realname
FROM sys_role r
INNER JOIN sys_user_role ur ON ur.role_id = r.id
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementDeptScoreService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementDeptScoreService.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementInstituteVoteService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementInstituteVoteService.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementProposalService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementProposalService.java
+8 -8
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java
+4 -4
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java
+4 -4
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementProposalServiceImpl.java
+12 -12
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/vo/ImprovementProposalPage.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/vo/ImprovementProposalPage.java
+4 -4
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/controller/DjInspectImproveController.java
+6 -6
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/entity/DjInspectImprove.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/DjInspectImproveMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/DjInspectImproveMapper.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/xml/DjInspectImproveMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/xml/DjInspectImproveMapper.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.dj.inspectimprove.mapper.DjInspectImproveMapper">
<mapper namespace="org.jeecg.modules.supervision.inspectimprove.mapper.DjInspectImproveMapper">
<update id="updateTreeNodeStatus" parameterType="java.lang.String">
update dj_inspect_improve set has_child = #{status} where id = #{id}
jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/IDjInspectImproveService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/IDjInspectImproveService.java
+2 -2
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/impl/DjInspectImproveServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/impl/DjInspectImproveServiceImpl.java
+4 -4
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/controller/DjOfficialdocDistributeController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/controller/DjOfficialdocDistributeController.java
+3 -3
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/entity/DjOfficialdocDistribute.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/entity/DjOfficialdocDistribute.java
+1 -1
View File
@@ -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;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/DjOfficialdocDistributeMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/DjOfficialdocDistributeMapper.java
+2 -2
View File
@@ -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;
/**
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/xml/DjOfficialdocDistributeMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/xml/DjOfficialdocDistributeMapper.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.officialdocDistribute.mapper.DjOfficialdocDistributeMapper">
<mapper namespace="org.jeecg.modules.supervision.officialdoc.mapper.DjOfficialdocDistributeMapper">
</mapper>

Some files were not shown because too many files have changed in this diff Show More