From 79f5ae38888cf31c93167ac78ff2b6c656854f32 Mon Sep 17 00:00:00 2001 From: dingjie Date: Wed, 13 Dec 2023 10:49:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/auth/service/SysLoginService.java | 1 - .../java/com/bonus/sgzb/base/mapper/MaTypeMapper.java | 3 +++ .../sgzb/base/service/impl/MaTypeServiceImpl.java | 2 +- .../main/resources/mapper/base/MaMachineTypeMapper.xml | 9 +++++++++ .../material/controller/PlanBorrowInfoController.java | 8 ++++---- .../material/controller/PlanNeedInfoController.java | 9 ++++----- .../bonus/sgzb/material/domain/PlanBorrowInfo.java | 2 +- .../bonus/sgzb/material/domain/PlanNeedInfo.java | 2 +- .../sgzb/material/mapper/PlanBorrowInfoMapper.java | 4 ++-- .../bonus/sgzb/material/mapper/PlanNeedInfoMapper.java | 4 ++-- .../sgzb/material/service/IPlanBorrowInfoService.java | 4 ++-- .../sgzb/material/service/IPlanNeedInfoService.java | 4 ++-- .../service/impl/PlanBorrowInfoServiceImpl.java | 8 ++++---- .../material/service/impl/PlanNeedInfoServiceImpl.java | 8 ++++---- .../mapper/{ => material}/PlanBorrowInfoMapper.xml | 10 +++++----- .../mapper/{ => material}/PlanNeedInfoMapper.xml | 10 +++++----- 16 files changed, 49 insertions(+), 39 deletions(-) rename sgzb-modules/sgzb-material/src/main/java/{ => com}/bonus/sgzb/material/controller/PlanBorrowInfoController.java (94%) rename sgzb-modules/sgzb-material/src/main/java/{ => com}/bonus/sgzb/material/controller/PlanNeedInfoController.java (93%) rename sgzb-modules/sgzb-material/src/main/java/{ => com}/bonus/sgzb/material/domain/PlanBorrowInfo.java (97%) rename sgzb-modules/sgzb-material/src/main/java/{ => com}/bonus/sgzb/material/domain/PlanNeedInfo.java (98%) rename sgzb-modules/sgzb-material/src/main/java/{ => com}/bonus/sgzb/material/mapper/PlanBorrowInfoMapper.java (94%) rename sgzb-modules/sgzb-material/src/main/java/{ => com}/bonus/sgzb/material/mapper/PlanNeedInfoMapper.java (94%) rename sgzb-modules/sgzb-material/src/main/java/{ => com}/bonus/sgzb/material/service/IPlanBorrowInfoService.java (94%) rename sgzb-modules/sgzb-material/src/main/java/{ => com}/bonus/sgzb/material/service/IPlanNeedInfoService.java (94%) rename sgzb-modules/sgzb-material/src/main/java/{ => com}/bonus/sgzb/material/service/impl/PlanBorrowInfoServiceImpl.java (92%) rename sgzb-modules/sgzb-material/src/main/java/{ => com}/bonus/sgzb/material/service/impl/PlanNeedInfoServiceImpl.java (91%) rename sgzb-modules/sgzb-material/src/main/resources/mapper/{ => material}/PlanBorrowInfoMapper.xml (88%) rename sgzb-modules/sgzb-material/src/main/resources/mapper/{ => material}/PlanNeedInfoMapper.xml (87%) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java index 3cde9d26..2b0ca4e5 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java @@ -1,6 +1,5 @@ package com.bonus.sgzb.auth.service; -import com.bonus.sgzb.system.service.ISysSmsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.bonus.sgzb.common.core.constant.CacheConstants; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java index d7be9917..cbfc09a0 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java @@ -64,4 +64,7 @@ public interface MaTypeMapper int updatePropSetByTypeId(MaPropSet propSet); MaType selectTypeByTypeId(long typeId); + + List selectMaTypeTree(); + } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java index 9584b841..1d907432 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java @@ -151,7 +151,7 @@ public class MaTypeServiceImpl implements ITypeService { @Override public List getMaTypeList(String typeName) { - List maTypes = maTypeMapper.selectMaTypeList(typeName); + List maTypes = maTypeMapper.selectMaTypeTree(); //如果没有查询到那么返回空 return buildDeptTreeSelect(maTypes); } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml index fd069e7f..81ba3892 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml @@ -280,4 +280,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where type_id = #{typeId} + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/controller/PlanBorrowInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PlanBorrowInfoController.java similarity index 94% rename from sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/controller/PlanBorrowInfoController.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PlanBorrowInfoController.java index 9341b5f4..94b5d8f2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/controller/PlanBorrowInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PlanBorrowInfoController.java @@ -1,10 +1,10 @@ -package bonus.sgzb.material.controller; +package com.bonus.sgzb.material.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import bonus.sgzb.material.domain.PlanBorrowInfo; -import bonus.sgzb.material.service.IPlanBorrowInfoService; +import com.bonus.sgzb.material.domain.PlanBorrowInfo; +import com.bonus.sgzb.material.service.IPlanBorrowInfoService; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -31,7 +31,7 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo; */ @Api @RestController -@RequestMapping("/info") +@RequestMapping("/planBorrowInfo") public class PlanBorrowInfoController extends BaseController { @Autowired diff --git a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/controller/PlanNeedInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PlanNeedInfoController.java similarity index 93% rename from sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/controller/PlanNeedInfoController.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PlanNeedInfoController.java index da71edfb..cdcdba87 100644 --- a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/controller/PlanNeedInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PlanNeedInfoController.java @@ -1,10 +1,10 @@ -package bonus.sgzb.material.controller; +package com.bonus.sgzb.material.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import bonus.sgzb.material.domain.PlanNeedInfo; -import bonus.sgzb.material.service.IPlanNeedInfoService; +import com.bonus.sgzb.material.domain.PlanNeedInfo; +import com.bonus.sgzb.material.service.IPlanNeedInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; -import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; @@ -32,7 +31,7 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo; */ @Api @RestController -@RequestMapping("/info") +@RequestMapping("/planNeedInfo") public class PlanNeedInfoController extends BaseController { @Autowired diff --git a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/domain/PlanBorrowInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanBorrowInfo.java similarity index 97% rename from sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/domain/PlanBorrowInfo.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanBorrowInfo.java index f359912a..b8f39680 100644 --- a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/domain/PlanBorrowInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanBorrowInfo.java @@ -1,4 +1,4 @@ -package bonus.sgzb.material.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-material/src/main/java/bonus/sgzb/material/domain/PlanNeedInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanNeedInfo.java similarity index 98% rename from sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/domain/PlanNeedInfo.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanNeedInfo.java index fd3062cd..aee15b91 100644 --- a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/domain/PlanNeedInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanNeedInfo.java @@ -1,4 +1,4 @@ -package bonus.sgzb.material.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-material/src/main/java/bonus/sgzb/material/mapper/PlanBorrowInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PlanBorrowInfoMapper.java similarity index 94% rename from sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/mapper/PlanBorrowInfoMapper.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PlanBorrowInfoMapper.java index 7f45a6df..b3d45e06 100644 --- a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/mapper/PlanBorrowInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PlanBorrowInfoMapper.java @@ -1,7 +1,7 @@ -package bonus.sgzb.material.mapper; +package com.bonus.sgzb.material.mapper; -import bonus.sgzb.material.domain.PlanBorrowInfo; +import com.bonus.sgzb.material.domain.PlanBorrowInfo; import java.util.List; diff --git a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/mapper/PlanNeedInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PlanNeedInfoMapper.java similarity index 94% rename from sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/mapper/PlanNeedInfoMapper.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PlanNeedInfoMapper.java index 6307a5e7..be118a95 100644 --- a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/mapper/PlanNeedInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PlanNeedInfoMapper.java @@ -1,6 +1,6 @@ -package bonus.sgzb.material.mapper; +package com.bonus.sgzb.material.mapper; -import bonus.sgzb.material.domain.PlanNeedInfo; +import com.bonus.sgzb.material.domain.PlanNeedInfo; import java.util.List; diff --git a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/service/IPlanBorrowInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPlanBorrowInfoService.java similarity index 94% rename from sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/service/IPlanBorrowInfoService.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPlanBorrowInfoService.java index 675a6857..bd125919 100644 --- a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/service/IPlanBorrowInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPlanBorrowInfoService.java @@ -1,7 +1,7 @@ -package bonus.sgzb.material.service; +package com.bonus.sgzb.material.service; -import bonus.sgzb.material.domain.PlanBorrowInfo; +import com.bonus.sgzb.material.domain.PlanBorrowInfo; import java.util.List; diff --git a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/service/IPlanNeedInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPlanNeedInfoService.java similarity index 94% rename from sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/service/IPlanNeedInfoService.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPlanNeedInfoService.java index b99f13b9..1a902e4b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/service/IPlanNeedInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPlanNeedInfoService.java @@ -1,7 +1,7 @@ -package bonus.sgzb.material.service; +package com.bonus.sgzb.material.service; -import bonus.sgzb.material.domain.PlanNeedInfo; +import com.bonus.sgzb.material.domain.PlanNeedInfo; import java.util.List; diff --git a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/service/impl/PlanBorrowInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PlanBorrowInfoServiceImpl.java similarity index 92% rename from sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/service/impl/PlanBorrowInfoServiceImpl.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PlanBorrowInfoServiceImpl.java index f08ef2d3..95a4f0a0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/service/impl/PlanBorrowInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PlanBorrowInfoServiceImpl.java @@ -1,10 +1,10 @@ -package bonus.sgzb.material.service.impl; +package com.bonus.sgzb.material.service.impl; import java.util.List; -import bonus.sgzb.material.domain.PlanBorrowInfo; -import bonus.sgzb.material.mapper.PlanBorrowInfoMapper; -import bonus.sgzb.material.service.IPlanBorrowInfoService; +import com.bonus.sgzb.material.domain.PlanBorrowInfo; +import com.bonus.sgzb.material.mapper.PlanBorrowInfoMapper; +import com.bonus.sgzb.material.service.IPlanBorrowInfoService; import com.bonus.sgzb.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/service/impl/PlanNeedInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PlanNeedInfoServiceImpl.java similarity index 91% rename from sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/service/impl/PlanNeedInfoServiceImpl.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PlanNeedInfoServiceImpl.java index d1a0f79c..a4ce2dd8 100644 --- a/sgzb-modules/sgzb-material/src/main/java/bonus/sgzb/material/service/impl/PlanNeedInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PlanNeedInfoServiceImpl.java @@ -1,10 +1,10 @@ -package bonus.sgzb.material.service.impl; +package com.bonus.sgzb.material.service.impl; import java.util.List; -import bonus.sgzb.material.domain.PlanNeedInfo; -import bonus.sgzb.material.mapper.PlanNeedInfoMapper; -import bonus.sgzb.material.service.IPlanNeedInfoService; +import com.bonus.sgzb.material.domain.PlanNeedInfo; +import com.bonus.sgzb.material.mapper.PlanNeedInfoMapper; +import com.bonus.sgzb.material.service.IPlanNeedInfoService; import com.bonus.sgzb.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/PlanBorrowInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanBorrowInfoMapper.xml similarity index 88% rename from sgzb-modules/sgzb-material/src/main/resources/mapper/PlanBorrowInfoMapper.xml rename to sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanBorrowInfoMapper.xml index 251398de..30a1bce6 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/PlanBorrowInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanBorrowInfoMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select borrow_id, need_unit_id, borrow_unit_id, code, create_by, create_time, update_by, update_time, remark, company_id from plan_borrow_info - and need_unit_id = #{needUnitId} @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where borrow_id = #{borrowId} - + insert into plan_borrow_info need_unit_id, @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update plan_borrow_info need_unit_id = #{needUnitId}, diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/PlanNeedInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanNeedInfoMapper.xml similarity index 87% rename from sgzb-modules/sgzb-material/src/main/resources/mapper/PlanNeedInfoMapper.xml rename to sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanNeedInfoMapper.xml index c07a63b2..b661eb2a 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/PlanNeedInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanNeedInfoMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select plan_id, unit_id, code, create_by, create_time, update_by, update_time, remark, company_id from plan_need_info - and unit_id = #{unitId} @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where plan_id = #{planId} - + insert into plan_need_info unit_id, @@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update plan_need_info unit_id = #{unitId},