From ee9d9e3a96f5233bcbf864c561046a3f190ca792 Mon Sep 17 00:00:00 2001 From: dingjie Date: Sat, 16 Dec 2023 20:52:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E4=BF=AE=E6=94=B9=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AgreementInfoController.java | 6 +++--- .../bonus/sgzb/material}/domain/AgreementInfo.java | 2 +- .../sgzb/material}/mapper/AgreementInfoMapper.java | 5 ++--- .../material}/service/AgreementInfoService.java | 6 ++---- .../service/impl/AgreementInfoServiceImpl.java | 13 ++++--------- .../mapper/material}/AgreementInfoMapper.xml | 10 +++++----- 6 files changed, 17 insertions(+), 25 deletions(-) rename sgzb-modules/{sgzb-base/src/main/java/com/bonus/sgzb/base => sgzb-material/src/main/java/com/bonus/sgzb/material}/controller/AgreementInfoController.java (93%) rename sgzb-modules/{sgzb-base/src/main/java/com/bonus/sgzb/base => sgzb-material/src/main/java/com/bonus/sgzb/material}/domain/AgreementInfo.java (98%) rename sgzb-modules/{sgzb-base/src/main/java/com/bonus/sgzb/base => sgzb-material/src/main/java/com/bonus/sgzb/material}/mapper/AgreementInfoMapper.java (77%) rename sgzb-modules/{sgzb-base/src/main/java/com/bonus/sgzb/base => sgzb-material/src/main/java/com/bonus/sgzb/material}/service/AgreementInfoService.java (64%) rename sgzb-modules/{sgzb-base/src/main/java/com/bonus/sgzb/base => sgzb-material/src/main/java/com/bonus/sgzb/material}/service/impl/AgreementInfoServiceImpl.java (78%) rename sgzb-modules/{sgzb-base/src/main/resources/mapper/base => sgzb-material/src/main/resources/mapper/material}/AgreementInfoMapper.xml (94%) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/AgreementInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/AgreementInfoController.java similarity index 93% rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/AgreementInfoController.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/AgreementInfoController.java index 6bc6191f..6b84dda3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/AgreementInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/AgreementInfoController.java @@ -1,7 +1,7 @@ -package com.bonus.sgzb.base.controller; +package com.bonus.sgzb.material.controller; -import com.bonus.sgzb.base.domain.AgreementInfo; -import com.bonus.sgzb.base.service.AgreementInfoService; +import com.bonus.sgzb.material.domain.AgreementInfo; +import com.bonus.sgzb.material.service.AgreementInfoService; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/AgreementInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java similarity index 98% rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/AgreementInfo.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java index 4ba58287..74f07d0e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/AgreementInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.base.domain; +package com.bonus.sgzb.material.domain; import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.web.domain.BaseEntity; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/AgreementInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/AgreementInfoMapper.java similarity index 77% rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/AgreementInfoMapper.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/AgreementInfoMapper.java index d99f447c..558075fa 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/AgreementInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/AgreementInfoMapper.java @@ -1,7 +1,6 @@ -package com.bonus.sgzb.base.mapper; +package com.bonus.sgzb.material.mapper; -import com.bonus.sgzb.base.domain.AgreementInfo; -import com.bonus.sgzb.base.domain.MaintenanceGang; +import com.bonus.sgzb.material.domain.AgreementInfo; import org.apache.ibatis.annotations.Mapper; import java.util.Date; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/AgreementInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/AgreementInfoService.java similarity index 64% rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/AgreementInfoService.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/AgreementInfoService.java index 8dbcbfc5..77ba2557 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/AgreementInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/AgreementInfoService.java @@ -1,8 +1,6 @@ -package com.bonus.sgzb.base.service; +package com.bonus.sgzb.material.service; -import com.bonus.sgzb.base.domain.AgreementInfo; -import com.bonus.sgzb.base.domain.MaintenanceGang; -import com.bonus.sgzb.base.domain.WarehouseKeeper; +import com.bonus.sgzb.material.domain.AgreementInfo; import java.util.List; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/AgreementInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java similarity index 78% rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/AgreementInfoServiceImpl.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java index cfe6263e..9c621824 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/AgreementInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java @@ -1,18 +1,13 @@ -package com.bonus.sgzb.base.service.impl; +package com.bonus.sgzb.material.service.impl; -import com.bonus.sgzb.base.domain.AgreementInfo; -import com.bonus.sgzb.base.domain.MaintenanceGang; -import com.bonus.sgzb.base.mapper.AgreementInfoMapper; -import com.bonus.sgzb.base.mapper.MaintenanceGangMapper; -import com.bonus.sgzb.base.service.AgreementInfoService; -import com.bonus.sgzb.base.service.MaintenanceGangService; +import com.bonus.sgzb.material.domain.AgreementInfo; +import com.bonus.sgzb.material.mapper.AgreementInfoMapper; +import com.bonus.sgzb.material.service.AgreementInfoService; import com.bonus.sgzb.common.core.utils.DateUtils; -import com.bonus.sgzb.common.core.utils.StringHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/AgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml similarity index 94% rename from sgzb-modules/sgzb-base/src/main/resources/mapper/base/AgreementInfoMapper.xml rename to sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml index 05785c93..02f6e60c 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/AgreementInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE bm_agreement_info SET status = '0' WHERE agreement_id = #{id} - SELECT bai.agreement_id, bai.agreement_code , contract_code,file_url ,file_name,sign_time, bui.unit_id,bui.unit_name , bp.lot_id as projectId , bp.lot_name as projectName, plan_start_time,lease_day,auth_person,phone,bai.remark @@ -121,12 +121,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT unit_id , unit_name FROM bm_unit_info WHERE del_flag = '0' - SELECT lot_id as projectId,lot_name as projectName FROM `bm_project_lot` WHERE del_flag = '0'