From b757013382ffae6d8951efa22484e1456c79e289 Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Fri, 11 Mar 2022 17:33:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xkrs/controller/QcItemController.java | 8 ++++---- .../xkrs/controller/QcSourceController.java | 6 +++--- .../com/xkrs/controller/QcSpecController.java | 8 ++++---- src/main/java/com/xkrs/dao/QcItemDao.java | 2 +- src/main/java/com/xkrs/dao/QcSourceDao.java | 2 +- src/main/java/com/xkrs/dao/QcSpecDao.java | 2 +- .../model/entity/QcItemEntity.java | 2 +- .../model/entity/QcSourceEntity.java | 2 +- .../model/entity/QcSpecEntity.java | 2 +- src/main/java/com/xkrs/model/qo/FileQo.java | 2 +- .../{newpro => }/model/qo/QcItemQoDelete.java | 2 +- .../{newpro => }/model/qo/QcItemQoInsert.java | 2 +- .../{newpro => }/model/qo/QcItemQoUpdate.java | 2 +- .../model/qo/QcSourceQoDelete.java | 2 +- .../model/qo/QcSourceQoInsert.java | 2 +- .../{newpro => }/model/qo/QcSpecQoDelete.java | 2 +- .../{newpro => }/model/qo/QcSpecQoInsert.java | 2 +- .../{newpro => }/model/qo/QcSpecQoUpdate.java | 2 +- .../model/{validation => va}/FileQoInsert.java | 2 +- .../model/va/QcItemQoDeleteVa.java | 2 +- .../model/va/QcItemQoInsertVa.java | 2 +- .../{newpro => }/model/va/QcItemQoQueryVa.java | 2 +- .../model/va/QcItemQoUpdateVa.java | 2 +- .../model/va/QcSourceQoDeleteVa.java | 2 +- .../model/va/QcSourceQoInsertVa.java | 2 +- .../model/va/QcSourceQoQueryVa.java | 2 +- .../model/va/QcSpecQoDeleteVa.java | 2 +- .../model/va/QcSpecQoInsertVa.java | 2 +- .../{newpro => }/model/va/QcSpecQoQueryVa.java | 2 +- .../model/va/QcSpecQoUpdateVa.java | 2 +- .../{newpro => }/service/QcItemService.java | 8 ++++---- .../{newpro => }/service/QcSourceService.java | 6 +++--- .../{newpro => }/service/QcSpecService.java | 8 ++++---- .../service/impl/QcItemServiceImpl.java | 16 ++++++++-------- .../service/impl/QcSourceServiceImpl.java | 18 +++++++++--------- .../service/impl/QcSpecServiceImpl.java | 18 +++++++++--------- .../xkrs/{newpro/utils => util}/Constant.java | 2 +- .../{newpro/utils => util}/LocalDateUtils.java | 2 +- .../utils => util}/LocalStringUtils.java | 2 +- 39 files changed, 78 insertions(+), 78 deletions(-) rename src/main/java/com/xkrs/{newpro => }/model/entity/QcItemEntity.java (98%) rename src/main/java/com/xkrs/{newpro => }/model/entity/QcSourceEntity.java (98%) rename src/main/java/com/xkrs/{newpro => }/model/entity/QcSpecEntity.java (99%) rename src/main/java/com/xkrs/{newpro => }/model/qo/QcItemQoDelete.java (91%) rename src/main/java/com/xkrs/{newpro => }/model/qo/QcItemQoInsert.java (96%) rename src/main/java/com/xkrs/{newpro => }/model/qo/QcItemQoUpdate.java (94%) rename src/main/java/com/xkrs/{newpro => }/model/qo/QcSourceQoDelete.java (92%) rename src/main/java/com/xkrs/{newpro => }/model/qo/QcSourceQoInsert.java (98%) rename src/main/java/com/xkrs/{newpro => }/model/qo/QcSpecQoDelete.java (92%) rename src/main/java/com/xkrs/{newpro => }/model/qo/QcSpecQoInsert.java (98%) rename src/main/java/com/xkrs/{newpro => }/model/qo/QcSpecQoUpdate.java (98%) rename src/main/java/com/xkrs/model/{validation => va}/FileQoInsert.java (72%) rename src/main/java/com/xkrs/{newpro => }/model/va/QcItemQoDeleteVa.java (53%) rename src/main/java/com/xkrs/{newpro => }/model/va/QcItemQoInsertVa.java (53%) rename src/main/java/com/xkrs/{newpro => }/model/va/QcItemQoQueryVa.java (52%) rename src/main/java/com/xkrs/{newpro => }/model/va/QcItemQoUpdateVa.java (53%) rename src/main/java/com/xkrs/{newpro => }/model/va/QcSourceQoDeleteVa.java (54%) rename src/main/java/com/xkrs/{newpro => }/model/va/QcSourceQoInsertVa.java (54%) rename src/main/java/com/xkrs/{newpro => }/model/va/QcSourceQoQueryVa.java (54%) rename src/main/java/com/xkrs/{newpro => }/model/va/QcSpecQoDeleteVa.java (53%) rename src/main/java/com/xkrs/{newpro => }/model/va/QcSpecQoInsertVa.java (53%) rename src/main/java/com/xkrs/{newpro => }/model/va/QcSpecQoQueryVa.java (52%) rename src/main/java/com/xkrs/{newpro => }/model/va/QcSpecQoUpdateVa.java (53%) rename src/main/java/com/xkrs/{newpro => }/service/QcItemService.java (70%) rename src/main/java/com/xkrs/{newpro => }/service/QcSourceService.java (77%) rename src/main/java/com/xkrs/{newpro => }/service/QcSpecService.java (70%) rename src/main/java/com/xkrs/{newpro => }/service/impl/QcItemServiceImpl.java (90%) rename src/main/java/com/xkrs/{newpro => }/service/impl/QcSourceServiceImpl.java (92%) rename src/main/java/com/xkrs/{newpro => }/service/impl/QcSpecServiceImpl.java (92%) rename src/main/java/com/xkrs/{newpro/utils => util}/Constant.java (87%) rename src/main/java/com/xkrs/{newpro/utils => util}/LocalDateUtils.java (90%) rename src/main/java/com/xkrs/{newpro/utils => util}/LocalStringUtils.java (85%) diff --git a/src/main/java/com/xkrs/controller/QcItemController.java b/src/main/java/com/xkrs/controller/QcItemController.java index b15d602..e3ff8f9 100644 --- a/src/main/java/com/xkrs/controller/QcItemController.java +++ b/src/main/java/com/xkrs/controller/QcItemController.java @@ -1,9 +1,9 @@ package com.xkrs.controller; -import com.xkrs.newpro.model.qo.QcItemQoDelete; -import com.xkrs.newpro.model.qo.QcItemQoInsert; -import com.xkrs.newpro.model.qo.QcItemQoUpdate; -import com.xkrs.newpro.service.QcItemService; +import com.xkrs.model.qo.QcItemQoDelete; +import com.xkrs.model.qo.QcItemQoInsert; +import com.xkrs.model.qo.QcItemQoUpdate; +import com.xkrs.service.QcItemService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/src/main/java/com/xkrs/controller/QcSourceController.java b/src/main/java/com/xkrs/controller/QcSourceController.java index edae14e..20410e8 100644 --- a/src/main/java/com/xkrs/controller/QcSourceController.java +++ b/src/main/java/com/xkrs/controller/QcSourceController.java @@ -1,8 +1,8 @@ package com.xkrs.controller; -import com.xkrs.newpro.model.qo.QcSourceQoDelete; -import com.xkrs.newpro.model.qo.QcSourceQoInsert; -import com.xkrs.newpro.service.QcSourceService; +import com.xkrs.model.qo.QcSourceQoDelete; +import com.xkrs.model.qo.QcSourceQoInsert; +import com.xkrs.service.QcSourceService; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/xkrs/controller/QcSpecController.java b/src/main/java/com/xkrs/controller/QcSpecController.java index a6882a1..8e96c25 100644 --- a/src/main/java/com/xkrs/controller/QcSpecController.java +++ b/src/main/java/com/xkrs/controller/QcSpecController.java @@ -1,9 +1,9 @@ package com.xkrs.controller; -import com.xkrs.newpro.model.qo.QcSpecQoDelete; -import com.xkrs.newpro.model.qo.QcSpecQoInsert; -import com.xkrs.newpro.model.qo.QcSpecQoUpdate; -import com.xkrs.newpro.service.QcSpecService; +import com.xkrs.model.qo.QcSpecQoDelete; +import com.xkrs.model.qo.QcSpecQoInsert; +import com.xkrs.model.qo.QcSpecQoUpdate; +import com.xkrs.service.QcSpecService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/src/main/java/com/xkrs/dao/QcItemDao.java b/src/main/java/com/xkrs/dao/QcItemDao.java index 01c7656..9f7503a 100644 --- a/src/main/java/com/xkrs/dao/QcItemDao.java +++ b/src/main/java/com/xkrs/dao/QcItemDao.java @@ -1,6 +1,6 @@ package com.xkrs.dao; -import com.xkrs.newpro.model.entity.QcItemEntity; +import com.xkrs.model.entity.QcItemEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; diff --git a/src/main/java/com/xkrs/dao/QcSourceDao.java b/src/main/java/com/xkrs/dao/QcSourceDao.java index 7d7047a..7164f63 100644 --- a/src/main/java/com/xkrs/dao/QcSourceDao.java +++ b/src/main/java/com/xkrs/dao/QcSourceDao.java @@ -1,6 +1,6 @@ package com.xkrs.dao; -import com.xkrs.newpro.model.entity.QcSourceEntity; +import com.xkrs.model.entity.QcSourceEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/xkrs/dao/QcSpecDao.java b/src/main/java/com/xkrs/dao/QcSpecDao.java index 5f37881..eb19f74 100644 --- a/src/main/java/com/xkrs/dao/QcSpecDao.java +++ b/src/main/java/com/xkrs/dao/QcSpecDao.java @@ -1,6 +1,6 @@ package com.xkrs.dao; -import com.xkrs.newpro.model.entity.QcSpecEntity; +import com.xkrs.model.entity.QcSpecEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; diff --git a/src/main/java/com/xkrs/newpro/model/entity/QcItemEntity.java b/src/main/java/com/xkrs/model/entity/QcItemEntity.java similarity index 98% rename from src/main/java/com/xkrs/newpro/model/entity/QcItemEntity.java rename to src/main/java/com/xkrs/model/entity/QcItemEntity.java index c3ef773..98c1729 100644 --- a/src/main/java/com/xkrs/newpro/model/entity/QcItemEntity.java +++ b/src/main/java/com/xkrs/model/entity/QcItemEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; diff --git a/src/main/java/com/xkrs/newpro/model/entity/QcSourceEntity.java b/src/main/java/com/xkrs/model/entity/QcSourceEntity.java similarity index 98% rename from src/main/java/com/xkrs/newpro/model/entity/QcSourceEntity.java rename to src/main/java/com/xkrs/model/entity/QcSourceEntity.java index 0dc3890..a3107e7 100644 --- a/src/main/java/com/xkrs/newpro/model/entity/QcSourceEntity.java +++ b/src/main/java/com/xkrs/model/entity/QcSourceEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; diff --git a/src/main/java/com/xkrs/newpro/model/entity/QcSpecEntity.java b/src/main/java/com/xkrs/model/entity/QcSpecEntity.java similarity index 99% rename from src/main/java/com/xkrs/newpro/model/entity/QcSpecEntity.java rename to src/main/java/com/xkrs/model/entity/QcSpecEntity.java index ba1bdb7..f212b24 100644 --- a/src/main/java/com/xkrs/newpro/model/entity/QcSpecEntity.java +++ b/src/main/java/com/xkrs/model/entity/QcSpecEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; diff --git a/src/main/java/com/xkrs/model/qo/FileQo.java b/src/main/java/com/xkrs/model/qo/FileQo.java index 08acc61..3a8d128 100644 --- a/src/main/java/com/xkrs/model/qo/FileQo.java +++ b/src/main/java/com/xkrs/model/qo/FileQo.java @@ -1,6 +1,6 @@ package com.xkrs.model.qo; -import com.xkrs.model.validation.FileQoInsert; +import com.xkrs.model.va.FileQoInsert; import javax.validation.constraints.NotBlank; diff --git a/src/main/java/com/xkrs/newpro/model/qo/QcItemQoDelete.java b/src/main/java/com/xkrs/model/qo/QcItemQoDelete.java similarity index 91% rename from src/main/java/com/xkrs/newpro/model/qo/QcItemQoDelete.java rename to src/main/java/com/xkrs/model/qo/QcItemQoDelete.java index adf64d1..7bbe38b 100644 --- a/src/main/java/com/xkrs/newpro/model/qo/QcItemQoDelete.java +++ b/src/main/java/com/xkrs/model/qo/QcItemQoDelete.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.qo; +package com.xkrs.model.qo; /** * 删除检验项目接收类 diff --git a/src/main/java/com/xkrs/newpro/model/qo/QcItemQoInsert.java b/src/main/java/com/xkrs/model/qo/QcItemQoInsert.java similarity index 96% rename from src/main/java/com/xkrs/newpro/model/qo/QcItemQoInsert.java rename to src/main/java/com/xkrs/model/qo/QcItemQoInsert.java index 00b16b6..2195ee0 100644 --- a/src/main/java/com/xkrs/newpro/model/qo/QcItemQoInsert.java +++ b/src/main/java/com/xkrs/model/qo/QcItemQoInsert.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.qo; +package com.xkrs.model.qo; /** * 新增检验项目接收类 diff --git a/src/main/java/com/xkrs/newpro/model/qo/QcItemQoUpdate.java b/src/main/java/com/xkrs/model/qo/QcItemQoUpdate.java similarity index 94% rename from src/main/java/com/xkrs/newpro/model/qo/QcItemQoUpdate.java rename to src/main/java/com/xkrs/model/qo/QcItemQoUpdate.java index 046dfa4..fbe0142 100644 --- a/src/main/java/com/xkrs/newpro/model/qo/QcItemQoUpdate.java +++ b/src/main/java/com/xkrs/model/qo/QcItemQoUpdate.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.qo; +package com.xkrs.model.qo; /** * 更新检验项目接收类 diff --git a/src/main/java/com/xkrs/newpro/model/qo/QcSourceQoDelete.java b/src/main/java/com/xkrs/model/qo/QcSourceQoDelete.java similarity index 92% rename from src/main/java/com/xkrs/newpro/model/qo/QcSourceQoDelete.java rename to src/main/java/com/xkrs/model/qo/QcSourceQoDelete.java index b749189..8bd47b3 100644 --- a/src/main/java/com/xkrs/newpro/model/qo/QcSourceQoDelete.java +++ b/src/main/java/com/xkrs/model/qo/QcSourceQoDelete.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.qo; +package com.xkrs.model.qo; /** * 删除检验数据接收类 diff --git a/src/main/java/com/xkrs/newpro/model/qo/QcSourceQoInsert.java b/src/main/java/com/xkrs/model/qo/QcSourceQoInsert.java similarity index 98% rename from src/main/java/com/xkrs/newpro/model/qo/QcSourceQoInsert.java rename to src/main/java/com/xkrs/model/qo/QcSourceQoInsert.java index d92f66c..f4eff09 100644 --- a/src/main/java/com/xkrs/newpro/model/qo/QcSourceQoInsert.java +++ b/src/main/java/com/xkrs/model/qo/QcSourceQoInsert.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.qo; +package com.xkrs.model.qo; /** * 新增检验数据接收类 diff --git a/src/main/java/com/xkrs/newpro/model/qo/QcSpecQoDelete.java b/src/main/java/com/xkrs/model/qo/QcSpecQoDelete.java similarity index 92% rename from src/main/java/com/xkrs/newpro/model/qo/QcSpecQoDelete.java rename to src/main/java/com/xkrs/model/qo/QcSpecQoDelete.java index 7106ea2..a6931c2 100644 --- a/src/main/java/com/xkrs/newpro/model/qo/QcSpecQoDelete.java +++ b/src/main/java/com/xkrs/model/qo/QcSpecQoDelete.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.qo; +package com.xkrs.model.qo; /** * 删除检验规格接收类 diff --git a/src/main/java/com/xkrs/newpro/model/qo/QcSpecQoInsert.java b/src/main/java/com/xkrs/model/qo/QcSpecQoInsert.java similarity index 98% rename from src/main/java/com/xkrs/newpro/model/qo/QcSpecQoInsert.java rename to src/main/java/com/xkrs/model/qo/QcSpecQoInsert.java index 676ba7c..4a27626 100644 --- a/src/main/java/com/xkrs/newpro/model/qo/QcSpecQoInsert.java +++ b/src/main/java/com/xkrs/model/qo/QcSpecQoInsert.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.qo; +package com.xkrs.model.qo; /** * 新增检验规格接收类 diff --git a/src/main/java/com/xkrs/newpro/model/qo/QcSpecQoUpdate.java b/src/main/java/com/xkrs/model/qo/QcSpecQoUpdate.java similarity index 98% rename from src/main/java/com/xkrs/newpro/model/qo/QcSpecQoUpdate.java rename to src/main/java/com/xkrs/model/qo/QcSpecQoUpdate.java index 24f011e..af6f451 100644 --- a/src/main/java/com/xkrs/newpro/model/qo/QcSpecQoUpdate.java +++ b/src/main/java/com/xkrs/model/qo/QcSpecQoUpdate.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.qo; +package com.xkrs.model.qo; /** * 更新检验规格接收类 diff --git a/src/main/java/com/xkrs/model/validation/FileQoInsert.java b/src/main/java/com/xkrs/model/va/FileQoInsert.java similarity index 72% rename from src/main/java/com/xkrs/model/validation/FileQoInsert.java rename to src/main/java/com/xkrs/model/va/FileQoInsert.java index ec99981..5398ff8 100644 --- a/src/main/java/com/xkrs/model/validation/FileQoInsert.java +++ b/src/main/java/com/xkrs/model/va/FileQoInsert.java @@ -1,4 +1,4 @@ -package com.xkrs.model.validation; +package com.xkrs.model.va; /** * @Author: XinYi Song diff --git a/src/main/java/com/xkrs/newpro/model/va/QcItemQoDeleteVa.java b/src/main/java/com/xkrs/model/va/QcItemQoDeleteVa.java similarity index 53% rename from src/main/java/com/xkrs/newpro/model/va/QcItemQoDeleteVa.java rename to src/main/java/com/xkrs/model/va/QcItemQoDeleteVa.java index 974bc06..3193efe 100644 --- a/src/main/java/com/xkrs/newpro/model/va/QcItemQoDeleteVa.java +++ b/src/main/java/com/xkrs/model/va/QcItemQoDeleteVa.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.va; +package com.xkrs.model.va; public interface QcItemQoDeleteVa { } diff --git a/src/main/java/com/xkrs/newpro/model/va/QcItemQoInsertVa.java b/src/main/java/com/xkrs/model/va/QcItemQoInsertVa.java similarity index 53% rename from src/main/java/com/xkrs/newpro/model/va/QcItemQoInsertVa.java rename to src/main/java/com/xkrs/model/va/QcItemQoInsertVa.java index 92cd3a8..2b6d255 100644 --- a/src/main/java/com/xkrs/newpro/model/va/QcItemQoInsertVa.java +++ b/src/main/java/com/xkrs/model/va/QcItemQoInsertVa.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.va; +package com.xkrs.model.va; public interface QcItemQoInsertVa { } diff --git a/src/main/java/com/xkrs/newpro/model/va/QcItemQoQueryVa.java b/src/main/java/com/xkrs/model/va/QcItemQoQueryVa.java similarity index 52% rename from src/main/java/com/xkrs/newpro/model/va/QcItemQoQueryVa.java rename to src/main/java/com/xkrs/model/va/QcItemQoQueryVa.java index b915805..5cba403 100644 --- a/src/main/java/com/xkrs/newpro/model/va/QcItemQoQueryVa.java +++ b/src/main/java/com/xkrs/model/va/QcItemQoQueryVa.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.va; +package com.xkrs.model.va; public interface QcItemQoQueryVa { } diff --git a/src/main/java/com/xkrs/newpro/model/va/QcItemQoUpdateVa.java b/src/main/java/com/xkrs/model/va/QcItemQoUpdateVa.java similarity index 53% rename from src/main/java/com/xkrs/newpro/model/va/QcItemQoUpdateVa.java rename to src/main/java/com/xkrs/model/va/QcItemQoUpdateVa.java index b96ddeb..739984e 100644 --- a/src/main/java/com/xkrs/newpro/model/va/QcItemQoUpdateVa.java +++ b/src/main/java/com/xkrs/model/va/QcItemQoUpdateVa.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.va; +package com.xkrs.model.va; public interface QcItemQoUpdateVa { } diff --git a/src/main/java/com/xkrs/newpro/model/va/QcSourceQoDeleteVa.java b/src/main/java/com/xkrs/model/va/QcSourceQoDeleteVa.java similarity index 54% rename from src/main/java/com/xkrs/newpro/model/va/QcSourceQoDeleteVa.java rename to src/main/java/com/xkrs/model/va/QcSourceQoDeleteVa.java index 98009da..0b0e719 100644 --- a/src/main/java/com/xkrs/newpro/model/va/QcSourceQoDeleteVa.java +++ b/src/main/java/com/xkrs/model/va/QcSourceQoDeleteVa.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.va; +package com.xkrs.model.va; public interface QcSourceQoDeleteVa { } diff --git a/src/main/java/com/xkrs/newpro/model/va/QcSourceQoInsertVa.java b/src/main/java/com/xkrs/model/va/QcSourceQoInsertVa.java similarity index 54% rename from src/main/java/com/xkrs/newpro/model/va/QcSourceQoInsertVa.java rename to src/main/java/com/xkrs/model/va/QcSourceQoInsertVa.java index 6db355c..d7819bc 100644 --- a/src/main/java/com/xkrs/newpro/model/va/QcSourceQoInsertVa.java +++ b/src/main/java/com/xkrs/model/va/QcSourceQoInsertVa.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.va; +package com.xkrs.model.va; public interface QcSourceQoInsertVa { } diff --git a/src/main/java/com/xkrs/newpro/model/va/QcSourceQoQueryVa.java b/src/main/java/com/xkrs/model/va/QcSourceQoQueryVa.java similarity index 54% rename from src/main/java/com/xkrs/newpro/model/va/QcSourceQoQueryVa.java rename to src/main/java/com/xkrs/model/va/QcSourceQoQueryVa.java index 3f3e86d..0939456 100644 --- a/src/main/java/com/xkrs/newpro/model/va/QcSourceQoQueryVa.java +++ b/src/main/java/com/xkrs/model/va/QcSourceQoQueryVa.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.va; +package com.xkrs.model.va; public interface QcSourceQoQueryVa { } diff --git a/src/main/java/com/xkrs/newpro/model/va/QcSpecQoDeleteVa.java b/src/main/java/com/xkrs/model/va/QcSpecQoDeleteVa.java similarity index 53% rename from src/main/java/com/xkrs/newpro/model/va/QcSpecQoDeleteVa.java rename to src/main/java/com/xkrs/model/va/QcSpecQoDeleteVa.java index 08472b3..f3c4d24 100644 --- a/src/main/java/com/xkrs/newpro/model/va/QcSpecQoDeleteVa.java +++ b/src/main/java/com/xkrs/model/va/QcSpecQoDeleteVa.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.va; +package com.xkrs.model.va; public interface QcSpecQoDeleteVa { } diff --git a/src/main/java/com/xkrs/newpro/model/va/QcSpecQoInsertVa.java b/src/main/java/com/xkrs/model/va/QcSpecQoInsertVa.java similarity index 53% rename from src/main/java/com/xkrs/newpro/model/va/QcSpecQoInsertVa.java rename to src/main/java/com/xkrs/model/va/QcSpecQoInsertVa.java index f1a2955..5ebb6ab 100644 --- a/src/main/java/com/xkrs/newpro/model/va/QcSpecQoInsertVa.java +++ b/src/main/java/com/xkrs/model/va/QcSpecQoInsertVa.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.va; +package com.xkrs.model.va; public interface QcSpecQoInsertVa { } diff --git a/src/main/java/com/xkrs/newpro/model/va/QcSpecQoQueryVa.java b/src/main/java/com/xkrs/model/va/QcSpecQoQueryVa.java similarity index 52% rename from src/main/java/com/xkrs/newpro/model/va/QcSpecQoQueryVa.java rename to src/main/java/com/xkrs/model/va/QcSpecQoQueryVa.java index f5e11a8..7f87dad 100644 --- a/src/main/java/com/xkrs/newpro/model/va/QcSpecQoQueryVa.java +++ b/src/main/java/com/xkrs/model/va/QcSpecQoQueryVa.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.va; +package com.xkrs.model.va; public interface QcSpecQoQueryVa { } diff --git a/src/main/java/com/xkrs/newpro/model/va/QcSpecQoUpdateVa.java b/src/main/java/com/xkrs/model/va/QcSpecQoUpdateVa.java similarity index 53% rename from src/main/java/com/xkrs/newpro/model/va/QcSpecQoUpdateVa.java rename to src/main/java/com/xkrs/model/va/QcSpecQoUpdateVa.java index 0071d70..d318593 100644 --- a/src/main/java/com/xkrs/newpro/model/va/QcSpecQoUpdateVa.java +++ b/src/main/java/com/xkrs/model/va/QcSpecQoUpdateVa.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.model.va; +package com.xkrs.model.va; public interface QcSpecQoUpdateVa { } diff --git a/src/main/java/com/xkrs/newpro/service/QcItemService.java b/src/main/java/com/xkrs/service/QcItemService.java similarity index 70% rename from src/main/java/com/xkrs/newpro/service/QcItemService.java rename to src/main/java/com/xkrs/service/QcItemService.java index 1232dd8..e2f2784 100644 --- a/src/main/java/com/xkrs/newpro/service/QcItemService.java +++ b/src/main/java/com/xkrs/service/QcItemService.java @@ -1,8 +1,8 @@ -package com.xkrs.newpro.service; +package com.xkrs.service; -import com.xkrs.newpro.model.qo.QcItemQoDelete; -import com.xkrs.newpro.model.qo.QcItemQoInsert; -import com.xkrs.newpro.model.qo.QcItemQoUpdate; +import com.xkrs.model.qo.QcItemQoDelete; +import com.xkrs.model.qo.QcItemQoInsert; +import com.xkrs.model.qo.QcItemQoUpdate; public interface QcItemService { diff --git a/src/main/java/com/xkrs/newpro/service/QcSourceService.java b/src/main/java/com/xkrs/service/QcSourceService.java similarity index 77% rename from src/main/java/com/xkrs/newpro/service/QcSourceService.java rename to src/main/java/com/xkrs/service/QcSourceService.java index 725d403..be068e4 100644 --- a/src/main/java/com/xkrs/newpro/service/QcSourceService.java +++ b/src/main/java/com/xkrs/service/QcSourceService.java @@ -1,7 +1,7 @@ -package com.xkrs.newpro.service; +package com.xkrs.service; -import com.xkrs.newpro.model.qo.QcSourceQoDelete; -import com.xkrs.newpro.model.qo.QcSourceQoInsert; +import com.xkrs.model.qo.QcSourceQoDelete; +import com.xkrs.model.qo.QcSourceQoInsert; import org.springframework.web.multipart.MultipartFile; public interface QcSourceService { diff --git a/src/main/java/com/xkrs/newpro/service/QcSpecService.java b/src/main/java/com/xkrs/service/QcSpecService.java similarity index 70% rename from src/main/java/com/xkrs/newpro/service/QcSpecService.java rename to src/main/java/com/xkrs/service/QcSpecService.java index b7ca2fb..5207f11 100644 --- a/src/main/java/com/xkrs/newpro/service/QcSpecService.java +++ b/src/main/java/com/xkrs/service/QcSpecService.java @@ -1,8 +1,8 @@ -package com.xkrs.newpro.service; +package com.xkrs.service; -import com.xkrs.newpro.model.qo.QcSpecQoDelete; -import com.xkrs.newpro.model.qo.QcSpecQoInsert; -import com.xkrs.newpro.model.qo.QcSpecQoUpdate; +import com.xkrs.model.qo.QcSpecQoDelete; +import com.xkrs.model.qo.QcSpecQoInsert; +import com.xkrs.model.qo.QcSpecQoUpdate; public interface QcSpecService { diff --git a/src/main/java/com/xkrs/newpro/service/impl/QcItemServiceImpl.java b/src/main/java/com/xkrs/service/impl/QcItemServiceImpl.java similarity index 90% rename from src/main/java/com/xkrs/newpro/service/impl/QcItemServiceImpl.java rename to src/main/java/com/xkrs/service/impl/QcItemServiceImpl.java index 78707e5..25a675a 100644 --- a/src/main/java/com/xkrs/newpro/service/impl/QcItemServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/QcItemServiceImpl.java @@ -1,14 +1,14 @@ -package com.xkrs.newpro.service.impl; +package com.xkrs.service.impl; import com.xkrs.encapsulation.PromptMessageEnum; import com.xkrs.dao.QcItemDao; -import com.xkrs.newpro.model.entity.QcItemEntity; -import com.xkrs.newpro.model.qo.QcItemQoDelete; -import com.xkrs.newpro.model.qo.QcItemQoInsert; -import com.xkrs.newpro.model.qo.QcItemQoUpdate; -import com.xkrs.newpro.service.QcItemService; -import com.xkrs.newpro.utils.LocalDateUtils; -import com.xkrs.newpro.utils.LocalStringUtils; +import com.xkrs.model.entity.QcItemEntity; +import com.xkrs.model.qo.QcItemQoDelete; +import com.xkrs.model.qo.QcItemQoInsert; +import com.xkrs.model.qo.QcItemQoUpdate; +import com.xkrs.service.QcItemService; +import com.xkrs.util.LocalDateUtils; +import com.xkrs.util.LocalStringUtils; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/xkrs/newpro/service/impl/QcSourceServiceImpl.java b/src/main/java/com/xkrs/service/impl/QcSourceServiceImpl.java similarity index 92% rename from src/main/java/com/xkrs/newpro/service/impl/QcSourceServiceImpl.java rename to src/main/java/com/xkrs/service/impl/QcSourceServiceImpl.java index cd8b1bc..4d6d33b 100644 --- a/src/main/java/com/xkrs/newpro/service/impl/QcSourceServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/QcSourceServiceImpl.java @@ -1,16 +1,16 @@ -package com.xkrs.newpro.service.impl; +package com.xkrs.service.impl; import com.xkrs.encapsulation.PromptMessageEnum; import com.xkrs.dao.QcItemDao; import com.xkrs.dao.QcSourceDao; -import com.xkrs.newpro.model.entity.QcItemEntity; -import com.xkrs.newpro.model.entity.QcSourceEntity; -import com.xkrs.newpro.model.qo.QcSourceQoDelete; -import com.xkrs.newpro.model.qo.QcSourceQoInsert; -import com.xkrs.newpro.service.QcSourceService; -import com.xkrs.newpro.utils.Constant; -import com.xkrs.newpro.utils.LocalDateUtils; -import com.xkrs.newpro.utils.LocalStringUtils; +import com.xkrs.model.entity.QcItemEntity; +import com.xkrs.model.entity.QcSourceEntity; +import com.xkrs.model.qo.QcSourceQoDelete; +import com.xkrs.model.qo.QcSourceQoInsert; +import com.xkrs.service.QcSourceService; +import com.xkrs.util.Constant; +import com.xkrs.util.LocalDateUtils; +import com.xkrs.util.LocalStringUtils; import com.xkrs.util.ExcelUploadUtil; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/xkrs/newpro/service/impl/QcSpecServiceImpl.java b/src/main/java/com/xkrs/service/impl/QcSpecServiceImpl.java similarity index 92% rename from src/main/java/com/xkrs/newpro/service/impl/QcSpecServiceImpl.java rename to src/main/java/com/xkrs/service/impl/QcSpecServiceImpl.java index facba70..f613eed 100644 --- a/src/main/java/com/xkrs/newpro/service/impl/QcSpecServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/QcSpecServiceImpl.java @@ -1,16 +1,16 @@ -package com.xkrs.newpro.service.impl; +package com.xkrs.service.impl; import com.xkrs.encapsulation.PromptMessageEnum; import com.xkrs.dao.QcItemDao; import com.xkrs.dao.QcSpecDao; -import com.xkrs.newpro.model.entity.QcItemEntity; -import com.xkrs.newpro.model.entity.QcSpecEntity; -import com.xkrs.newpro.model.qo.QcSpecQoDelete; -import com.xkrs.newpro.model.qo.QcSpecQoInsert; -import com.xkrs.newpro.model.qo.QcSpecQoUpdate; -import com.xkrs.newpro.service.QcSpecService; -import com.xkrs.newpro.utils.LocalDateUtils; -import com.xkrs.newpro.utils.LocalStringUtils; +import com.xkrs.model.entity.QcItemEntity; +import com.xkrs.model.entity.QcSpecEntity; +import com.xkrs.model.qo.QcSpecQoDelete; +import com.xkrs.model.qo.QcSpecQoInsert; +import com.xkrs.model.qo.QcSpecQoUpdate; +import com.xkrs.service.QcSpecService; +import com.xkrs.util.LocalDateUtils; +import com.xkrs.util.LocalStringUtils; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/xkrs/newpro/utils/Constant.java b/src/main/java/com/xkrs/util/Constant.java similarity index 87% rename from src/main/java/com/xkrs/newpro/utils/Constant.java rename to src/main/java/com/xkrs/util/Constant.java index 80c3fc7..90b573d 100644 --- a/src/main/java/com/xkrs/newpro/utils/Constant.java +++ b/src/main/java/com/xkrs/util/Constant.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.utils; +package com.xkrs.util; public interface Constant { diff --git a/src/main/java/com/xkrs/newpro/utils/LocalDateUtils.java b/src/main/java/com/xkrs/util/LocalDateUtils.java similarity index 90% rename from src/main/java/com/xkrs/newpro/utils/LocalDateUtils.java rename to src/main/java/com/xkrs/util/LocalDateUtils.java index 4c7955d..6d91d72 100644 --- a/src/main/java/com/xkrs/newpro/utils/LocalDateUtils.java +++ b/src/main/java/com/xkrs/util/LocalDateUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.utils; +package com.xkrs.util; import java.util.Date; diff --git a/src/main/java/com/xkrs/newpro/utils/LocalStringUtils.java b/src/main/java/com/xkrs/util/LocalStringUtils.java similarity index 85% rename from src/main/java/com/xkrs/newpro/utils/LocalStringUtils.java rename to src/main/java/com/xkrs/util/LocalStringUtils.java index 7797ff7..81aa79a 100644 --- a/src/main/java/com/xkrs/newpro/utils/LocalStringUtils.java +++ b/src/main/java/com/xkrs/util/LocalStringUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.newpro.utils; +package com.xkrs.util; public class LocalStringUtils {