lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改目录结构

localizer
lzq 2025-09-10 13:18:33 +08:00
parent cbf20f09b7
commit 29f6dc18a8
111 changed files with 219 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizCompanyController.java
View File

@ -3,7 +3,11 @@ package com.njzscloud.supervisory.biz.controller;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.pojo.*;
import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
import com.njzscloud.supervisory.biz.pojo.param.ModifyBizCompanyParam;
import com.njzscloud.supervisory.biz.pojo.param.SearchCompanyParam;
import com.njzscloud.supervisory.biz.pojo.result.MatchingBizCompanyResult;
import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
import com.njzscloud.supervisory.biz.service.BizCompanyService;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.RequiredArgsConstructor;

6
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizContractController.java
View File

@ -3,9 +3,9 @@ package com.njzscloud.supervisory.biz.controller;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.pojo.BizContractEntity;
import com.njzscloud.supervisory.biz.pojo.SearchContractParam;
import com.njzscloud.supervisory.biz.pojo.SearchContractResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizContractEntity;
import com.njzscloud.supervisory.biz.pojo.param.SearchContractParam;
import com.njzscloud.supervisory.biz.pojo.result.SearchContractResult;
import com.njzscloud.supervisory.biz.service.BizContractService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

4
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizDriverController.java
View File

@ -3,8 +3,8 @@ package com.njzscloud.supervisory.biz.controller;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.pojo.AddDriverParam;
import com.njzscloud.supervisory.biz.pojo.BizDriverEntity;
import com.njzscloud.supervisory.biz.pojo.entity.BizDriverEntity;
import com.njzscloud.supervisory.biz.pojo.param.AddDriverParam;
import com.njzscloud.supervisory.biz.service.BizDriverService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizInformController.java
View File

@ -3,7 +3,7 @@ package com.njzscloud.supervisory.biz.controller;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.pojo.BizInformEntity;
import com.njzscloud.supervisory.biz.pojo.entity.BizInformEntity;
import com.njzscloud.supervisory.biz.service.BizInformService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

4
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizScopeController.java
View File

@ -3,8 +3,8 @@ package com.njzscloud.supervisory.biz.controller;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.pojo.BizScopeEntity;
import com.njzscloud.supervisory.biz.pojo.SearchBizScopeResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizScopeEntity;
import com.njzscloud.supervisory.biz.pojo.result.SearchBizScopeResult;
import com.njzscloud.supervisory.biz.service.BizScopeService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

6
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizTruckController.java
View File

@ -3,9 +3,9 @@ package com.njzscloud.supervisory.biz.controller;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.pojo.BizTruckEntity;
import com.njzscloud.supervisory.biz.pojo.SearchTruckParam;
import com.njzscloud.supervisory.biz.pojo.SearchTruckResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizTruckEntity;
import com.njzscloud.supervisory.biz.pojo.param.SearchTruckParam;
import com.njzscloud.supervisory.biz.pojo.result.SearchTruckResult;
import com.njzscloud.supervisory.biz.service.BizTruckService;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.RequiredArgsConstructor;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizViolateRuleStrategyController.java
View File

@ -3,7 +3,7 @@ package com.njzscloud.supervisory.biz.controller;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.pojo.BizViolateRuleStrategyEntity;
import com.njzscloud.supervisory.biz.pojo.entity.BizViolateRuleStrategyEntity;
import com.njzscloud.supervisory.biz.service.BizViolateRuleStrategyService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

4
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizViolateRuleTruckController.java
View File

@ -3,8 +3,8 @@ package com.njzscloud.supervisory.biz.controller;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.pojo.BizViolateRuleTruckEntity;
import com.njzscloud.supervisory.biz.pojo.ProcessViolateRuleTruckParam;
import com.njzscloud.supervisory.biz.pojo.entity.BizViolateRuleTruckEntity;
import com.njzscloud.supervisory.biz.pojo.param.ProcessViolateRuleTruckParam;
import com.njzscloud.supervisory.biz.service.BizViolateRuleTruckService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

4
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizCompanyMapper.java
View File

@ -1,8 +1,8 @@
package com.njzscloud.supervisory.biz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.biz.pojo.BizCompanyEntity;
import com.njzscloud.supervisory.biz.pojo.MatchingBizCompanyResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
import com.njzscloud.supervisory.biz.pojo.result.MatchingBizCompanyResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

4
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizContractMapper.java
View File

@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.supervisory.biz.pojo.BizContractEntity;
import com.njzscloud.supervisory.biz.pojo.SearchContractResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizContractEntity;
import com.njzscloud.supervisory.biz.pojo.result.SearchContractResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

4
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizDriverMapper.java
View File

@ -1,8 +1,8 @@
package com.njzscloud.supervisory.biz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.biz.pojo.BizDriverEntity;
import com.njzscloud.supervisory.biz.pojo.SearchCompanyResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizDriverEntity;
import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizInformMapper.java
View File

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.biz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.biz.pojo.BizInformEntity;
import com.njzscloud.supervisory.biz.pojo.entity.BizInformEntity;
import org.apache.ibatis.annotations.Mapper;
/**

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizScopeMapper.java
View File

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.biz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.biz.pojo.BizScopeEntity;
import com.njzscloud.supervisory.biz.pojo.entity.BizScopeEntity;
import org.apache.ibatis.annotations.Mapper;
/**

6
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizTruckMapper.java
View File

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.supervisory.biz.pojo.BizTruckEntity;
import com.njzscloud.supervisory.biz.pojo.SearchCompanyResult;
import com.njzscloud.supervisory.biz.pojo.SearchTruckResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizTruckEntity;
import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
import com.njzscloud.supervisory.biz.pojo.result.SearchTruckResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizViolateRuleStrategyMapper.java
View File

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.biz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.biz.pojo.BizViolateRuleStrategyEntity;
import com.njzscloud.supervisory.biz.pojo.entity.BizViolateRuleStrategyEntity;
import org.apache.ibatis.annotations.Mapper;
/**

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizViolateRuleTruckMapper.java
View File

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.biz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.biz.pojo.BizViolateRuleTruckEntity;
import com.njzscloud.supervisory.biz.pojo.entity.BizViolateRuleTruckEntity;
import org.apache.ibatis.annotations.Mapper;
/**

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/BizCompanyEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/BizContractEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizContractEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/BizDriverEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizDriverEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/BizInformEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizInformEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/BizScopeEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizScopeEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.supervisory.biz.contant.BizObj;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/BizTruckEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizTruckEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/BizViolateRuleStrategyEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizViolateRuleStrategyEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/BizViolateRuleTruckEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizViolateRuleTruckEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/AddBizCompanyParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/AddBizCompanyParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/AddBizScopeParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/AddBizScopeParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/AddDriverParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/AddDriverParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.sys.user.pojo.param.AddUserParam;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/ModifyBizCompanyParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ModifyBizCompanyParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.AuditStatus;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/ModifyScopeParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ModifyScopeParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/ProcessViolateRuleTruckParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ProcessViolateRuleTruckParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.param;
import lombok.Getter;
import lombok.Setter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/SearchCompanyParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SearchCompanyParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.AuditStatus;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/SearchContractParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SearchContractParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/SearchTruckParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SearchTruckParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/MatchingBizCompanyResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/MatchingBizCompanyResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.result;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.AuditStatus;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/SearchBizScopeResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/SearchBizScopeResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.result;
import com.njzscloud.supervisory.biz.contant.BizObj;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/SearchCompanyResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/SearchCompanyResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.result;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.AuditStatus;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/SearchContractResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/SearchContractResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.result;
import lombok.Getter;
import lombok.Setter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/SearchTruckResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/SearchTruckResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.pojo;
package com.njzscloud.supervisory.biz.pojo.result;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.Getter;

9
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java
View File

@ -13,7 +13,14 @@ import com.njzscloud.common.security.support.UserDetail;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.mapper.BizCompanyMapper;
import com.njzscloud.supervisory.biz.pojo.*;
import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
import com.njzscloud.supervisory.biz.pojo.param.AddBizCompanyParam;
import com.njzscloud.supervisory.biz.pojo.param.ModifyBizCompanyParam;
import com.njzscloud.supervisory.biz.pojo.param.ModifyScopeParam;
import com.njzscloud.supervisory.biz.pojo.param.SearchCompanyParam;
import com.njzscloud.supervisory.biz.pojo.result.MatchingBizCompanyResult;
import com.njzscloud.supervisory.biz.pojo.result.SearchBizScopeResult;
import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

6
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizContractService.java
View File

@ -10,9 +10,9 @@ import com.njzscloud.common.security.support.UserDetail;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.mapper.BizContractMapper;
import com.njzscloud.supervisory.biz.pojo.BizContractEntity;
import com.njzscloud.supervisory.biz.pojo.SearchContractParam;
import com.njzscloud.supervisory.biz.pojo.SearchContractResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizContractEntity;
import com.njzscloud.supervisory.biz.pojo.param.SearchContractParam;
import com.njzscloud.supervisory.biz.pojo.result.SearchContractResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

6
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizDriverService.java
View File

@ -11,9 +11,9 @@ import com.njzscloud.common.security.support.UserDetail;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.mapper.BizDriverMapper;
import com.njzscloud.supervisory.biz.pojo.AddDriverParam;
import com.njzscloud.supervisory.biz.pojo.BizDriverEntity;
import com.njzscloud.supervisory.biz.pojo.SearchCompanyResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizDriverEntity;
import com.njzscloud.supervisory.biz.pojo.param.AddDriverParam;
import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
import com.njzscloud.supervisory.sys.user.service.UserService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizInformService.java
View File

@ -8,7 +8,7 @@ import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.contant.InformCategory;
import com.njzscloud.supervisory.biz.mapper.BizInformMapper;
import com.njzscloud.supervisory.biz.pojo.BizInformEntity;
import com.njzscloud.supervisory.biz.pojo.entity.BizInformEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

8
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizScopeService.java
View File

@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.mapper.BizScopeMapper;
import com.njzscloud.supervisory.biz.pojo.AddBizScopeParam;
import com.njzscloud.supervisory.biz.pojo.BizScopeEntity;
import com.njzscloud.supervisory.biz.pojo.ModifyScopeParam;
import com.njzscloud.supervisory.biz.pojo.SearchBizScopeResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizScopeEntity;
import com.njzscloud.supervisory.biz.pojo.param.AddBizScopeParam;
import com.njzscloud.supervisory.biz.pojo.param.ModifyScopeParam;
import com.njzscloud.supervisory.biz.pojo.result.SearchBizScopeResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

8
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizTruckService.java
View File

@ -13,10 +13,10 @@ import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.common.security.support.UserDetail;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.biz.mapper.BizTruckMapper;
import com.njzscloud.supervisory.biz.pojo.BizTruckEntity;
import com.njzscloud.supervisory.biz.pojo.SearchCompanyResult;
import com.njzscloud.supervisory.biz.pojo.SearchTruckParam;
import com.njzscloud.supervisory.biz.pojo.SearchTruckResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizTruckEntity;
import com.njzscloud.supervisory.biz.pojo.param.SearchTruckParam;
import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
import com.njzscloud.supervisory.biz.pojo.result.SearchTruckResult;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizViolateRuleStrategyService.java
View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.mapper.BizViolateRuleStrategyMapper;
import com.njzscloud.supervisory.biz.pojo.BizViolateRuleStrategyEntity;
import com.njzscloud.supervisory.biz.pojo.entity.BizViolateRuleStrategyEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

4
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizViolateRuleTruckService.java
View File

@ -8,8 +8,8 @@ import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.contant.ProcessStatus;
import com.njzscloud.supervisory.biz.mapper.BizViolateRuleTruckMapper;
import com.njzscloud.supervisory.biz.pojo.BizViolateRuleTruckEntity;
import com.njzscloud.supervisory.biz.pojo.ProcessViolateRuleTruckParam;
import com.njzscloud.supervisory.biz.pojo.entity.BizViolateRuleTruckEntity;
import com.njzscloud.supervisory.biz.pojo.param.ProcessViolateRuleTruckParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

8
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/controller/ProjectBookingController.java
View File

@ -3,7 +3,13 @@ package com.njzscloud.supervisory.project.controller;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.project.pojo.*;
import com.njzscloud.supervisory.project.pojo.entity.ProjectBookingEntity;
import com.njzscloud.supervisory.project.pojo.param.AddProjectBookingParam;
import com.njzscloud.supervisory.project.pojo.param.ModifyProjectBookingParam;
import com.njzscloud.supervisory.project.pojo.param.ProjectDispatchingParam;
import com.njzscloud.supervisory.project.pojo.result.SearchBillResult;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectBookingResult;
import com.njzscloud.supervisory.project.pojo.result.StatisticsResult;
import com.njzscloud.supervisory.project.service.ProjectBookingService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

8
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/controller/ProjectClearanceDetailController.java
View File

@ -3,7 +3,13 @@ package com.njzscloud.supervisory.project.controller;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.project.pojo.*;
import com.njzscloud.supervisory.project.pojo.entity.ProjectClearanceDetailEntity;
import com.njzscloud.supervisory.project.pojo.param.AddProjectClearanceDetailParam;
import com.njzscloud.supervisory.project.pojo.param.ProjectClearanceDetailReportParam;
import com.njzscloud.supervisory.project.pojo.param.SearchProjectClearanceDetailParam;
import com.njzscloud.supervisory.project.pojo.result.SearchPermitResult;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectClearanceDetailResult;
import com.njzscloud.supervisory.project.pojo.result.SearchWaybillResult;
import com.njzscloud.supervisory.project.service.ProjectClearanceDetailService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

8
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/controller/ProjectFilingController.java
View File

@ -4,10 +4,10 @@ import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import com.njzscloud.supervisory.project.pojo.AddProjectFilingParam;
import com.njzscloud.supervisory.project.pojo.ModifyProjectFilingParam;
import com.njzscloud.supervisory.project.pojo.SearchProjectFilingParam;
import com.njzscloud.supervisory.project.pojo.SearchProjectFilingResult;
import com.njzscloud.supervisory.project.pojo.param.AddProjectFilingParam;
import com.njzscloud.supervisory.project.pojo.param.ModifyProjectFilingParam;
import com.njzscloud.supervisory.project.pojo.param.SearchProjectFilingParam;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectFilingResult;
import com.njzscloud.supervisory.project.service.ProjectFilingService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/controller/ProjectGpsDataController.java
View File

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.project.pojo.ProjectGpsDataEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectGpsDataEntity;
import com.njzscloud.supervisory.project.service.ProjectGpsDataService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

5
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/controller/ProjectInfoController.java
View File

@ -3,7 +3,10 @@ package com.njzscloud.supervisory.project.controller;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.project.pojo.*;
import com.njzscloud.supervisory.project.pojo.entity.ProjectInfoEntity;
import com.njzscloud.supervisory.project.pojo.param.AddProjectInfoParam;
import com.njzscloud.supervisory.project.pojo.param.ProjectDispatchingParam;
import com.njzscloud.supervisory.project.pojo.result.*;
import com.njzscloud.supervisory.project.service.ProjectInfoService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

8
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectBookingMapper.java
View File

@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.supervisory.biz.pojo.BizCompanyEntity;
import com.njzscloud.supervisory.project.pojo.ProjectBookingEntity;
import com.njzscloud.supervisory.project.pojo.SearchBillResult;
import com.njzscloud.supervisory.project.pojo.SearchProjectBookingResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectBookingEntity;
import com.njzscloud.supervisory.project.pojo.result.SearchBillResult;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectBookingResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

7
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectClearanceDetailMapper.java
View File

@ -4,7 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.supervisory.project.pojo.*;
import com.njzscloud.supervisory.project.pojo.entity.ProjectBookingEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectClearanceDetailEntity;
import com.njzscloud.supervisory.project.pojo.result.ClearanceTaskResult;
import com.njzscloud.supervisory.project.pojo.result.SearchPermitResult;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectClearanceDetailResult;
import com.njzscloud.supervisory.project.pojo.result.SearchWaybillResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

4
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectCompanyMapper.java
View File

@ -1,8 +1,8 @@
package com.njzscloud.supervisory.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.project.pojo.ProjectCompanyEntity;
import com.njzscloud.supervisory.project.pojo.SearchProjectCompanyResult;
import com.njzscloud.supervisory.project.pojo.entity.ProjectCompanyEntity;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectCompanyResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

4
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectFilingMapper.java
View File

@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.supervisory.project.pojo.ProjectFilingEntity;
import com.njzscloud.supervisory.project.pojo.SearchProjectFilingResult;
import com.njzscloud.supervisory.project.pojo.entity.ProjectFilingEntity;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectFilingResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectGpsDataMapper.java
View File

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.project.pojo.ProjectGpsDataEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectGpsDataEntity;
import org.apache.ibatis.annotations.Mapper;
/**

3
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectInfoMapper.java
View File

@ -3,7 +3,8 @@ package com.njzscloud.supervisory.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.supervisory.project.pojo.*;
import com.njzscloud.supervisory.project.pojo.entity.ProjectInfoEntity;
import com.njzscloud.supervisory.project.pojo.result.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectTruckChangeMapper.java
View File

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.project.pojo.ProjectTruckChangeEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectTruckChangeEntity;
import org.apache.ibatis.annotations.Mapper;
/**

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectTruckMapper.java
View File

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.project.pojo.ProjectTruckEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectTruckEntity;
import org.apache.ibatis.annotations.Mapper;
/**

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ProjectBookingEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectBookingEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ProjectClearanceDetailEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectClearanceDetailEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ProjectCompanyEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectCompanyEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ProjectFilingEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectFilingEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.supervisory.project.contant.AuditStatus;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ProjectGpsDataEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectGpsDataEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ProjectInfoEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectInfoEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ProjectTruckChangeEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectTruckChangeEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ProjectTruckEntity.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectTruckEntity.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/AddProjectBookingParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/AddProjectBookingParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/AddProjectClearanceDetailParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/AddProjectClearanceDetailParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.GarbageCategory;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/AddProjectCompanyParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/AddProjectCompanyParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.ProjectSource;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/AddProjectFilingParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/AddProjectFilingParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/AddProjectInfoParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/AddProjectInfoParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import com.njzscloud.supervisory.project.contant.ProgressStage;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/AddProjectTruckParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/AddProjectTruckParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import lombok.Getter;
import lombok.Setter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ModifyProjectBookingParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/ModifyProjectBookingParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ModifyProjectCompanyParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/ModifyProjectCompanyParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.ProjectSource;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ModifyProjectFilingParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/ModifyProjectFilingParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ProjectClearanceDetailReportParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/ProjectClearanceDetailReportParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import lombok.Getter;
import lombok.Setter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ProjectDispatchingParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/ProjectDispatchingParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import lombok.Getter;
import lombok.Setter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchClearanceTaskParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/SearchClearanceTaskParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import lombok.Getter;
import lombok.Setter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchProjectClearanceDetailParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/SearchProjectClearanceDetailParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.ClearanceStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchProjectFilingParam.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/SearchProjectFilingParam.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/ClearanceTaskResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/ClearanceTaskResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.project.contant.ClearanceStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchABillResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchABillResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchBBillResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchBBillResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchBillResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchBillResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.project.contant.ClearanceStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchCBillResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchCBillResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchPermitResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchPermitResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.result;
import lombok.Getter;
import lombok.Setter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchProjectBookingResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchProjectBookingResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.result;
import com.baomidou.mybatisplus.annotation.TableField;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchProjectClearanceDetailResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchProjectClearanceDetailResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.project.contant.ClearanceStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchProjectCompanyResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchProjectCompanyResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.biz.contant.BizObj;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchProjectFilingResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchProjectFilingResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchProjectInfoResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchProjectInfoResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.project.contant.DispatchingStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/SearchWaybillResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchWaybillResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.project.contant.ClearanceStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/StatisticsResult.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/StatisticsResult.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.pojo;
package com.njzscloud.supervisory.project.pojo.result;
import lombok.Getter;
import lombok.Setter;

12
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/service/ProjectBookingService.java
View File

@ -14,7 +14,7 @@ import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.common.security.support.UserDetail;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.pojo.BizCompanyEntity;
import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
import com.njzscloud.supervisory.biz.service.BizDriverService;
import com.njzscloud.supervisory.biz.service.BizTruckService;
import com.njzscloud.supervisory.project.contant.BookingStatus;
@ -22,7 +22,15 @@ import com.njzscloud.supervisory.project.contant.DispatchingStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import com.njzscloud.supervisory.project.contant.ProjectSource;
import com.njzscloud.supervisory.project.mapper.ProjectBookingMapper;
import com.njzscloud.supervisory.project.pojo.*;
import com.njzscloud.supervisory.project.pojo.entity.ProjectBookingEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectClearanceDetailEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectFilingEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectTruckChangeEntity;
import com.njzscloud.supervisory.project.pojo.param.*;
import com.njzscloud.supervisory.project.pojo.result.SearchBillResult;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectBookingResult;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectCompanyResult;
import com.njzscloud.supervisory.project.pojo.result.StatisticsResult;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

8
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/service/ProjectClearanceDetailService.java
View File

@ -21,7 +21,13 @@ import com.njzscloud.supervisory.project.contant.BookingStatus;
import com.njzscloud.supervisory.project.contant.ClearanceStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import com.njzscloud.supervisory.project.mapper.ProjectClearanceDetailMapper;
import com.njzscloud.supervisory.project.pojo.*;
import com.njzscloud.supervisory.project.pojo.entity.ProjectClearanceDetailEntity;
import com.njzscloud.supervisory.project.pojo.param.AddProjectClearanceDetailParam;
import com.njzscloud.supervisory.project.pojo.param.ProjectClearanceDetailReportParam;
import com.njzscloud.supervisory.project.pojo.param.SearchProjectClearanceDetailParam;
import com.njzscloud.supervisory.project.pojo.result.SearchPermitResult;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectClearanceDetailResult;
import com.njzscloud.supervisory.project.pojo.result.SearchWaybillResult;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

8
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/service/ProjectCompanyService.java
View File

@ -9,10 +9,10 @@ import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.project.contant.ProjectSource;
import com.njzscloud.supervisory.project.mapper.ProjectCompanyMapper;
import com.njzscloud.supervisory.project.pojo.AddProjectCompanyParam;
import com.njzscloud.supervisory.project.pojo.ModifyProjectCompanyParam;
import com.njzscloud.supervisory.project.pojo.ProjectCompanyEntity;
import com.njzscloud.supervisory.project.pojo.SearchProjectCompanyResult;
import com.njzscloud.supervisory.project.pojo.entity.ProjectCompanyEntity;
import com.njzscloud.supervisory.project.pojo.param.AddProjectCompanyParam;
import com.njzscloud.supervisory.project.pojo.param.ModifyProjectCompanyParam;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectCompanyResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

5
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/service/ProjectFilingService.java
View File

@ -14,7 +14,10 @@ import com.njzscloud.supervisory.project.contant.AuditStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import com.njzscloud.supervisory.project.contant.ProjectSource;
import com.njzscloud.supervisory.project.mapper.ProjectFilingMapper;
import com.njzscloud.supervisory.project.pojo.*;
import com.njzscloud.supervisory.project.pojo.entity.ProjectFilingEntity;
import com.njzscloud.supervisory.project.pojo.param.*;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectCompanyResult;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectFilingResult;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/service/ProjectGpsDataService.java
View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.project.mapper.ProjectGpsDataMapper;
import com.njzscloud.supervisory.project.pojo.ProjectGpsDataEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectGpsDataEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

8
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/service/ProjectInfoService.java
View File

@ -15,7 +15,13 @@ import com.njzscloud.supervisory.project.contant.DispatchingStatus;
import com.njzscloud.supervisory.project.contant.ProgressStage;
import com.njzscloud.supervisory.project.contant.ProjectSource;
import com.njzscloud.supervisory.project.mapper.ProjectInfoMapper;
import com.njzscloud.supervisory.project.pojo.*;
import com.njzscloud.supervisory.project.pojo.entity.ProjectCompanyEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectInfoEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectTruckEntity;
import com.njzscloud.supervisory.project.pojo.param.AddProjectInfoParam;
import com.njzscloud.supervisory.project.pojo.param.AddProjectTruckParam;
import com.njzscloud.supervisory.project.pojo.param.ProjectDispatchingParam;
import com.njzscloud.supervisory.project.pojo.result.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

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