From cd934f5e9260243cc25007bd43593dfbfbbfccaa Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 2 Jul 2025 11:18:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E8=B4=AD=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E5=A4=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/NuInvoicingQgdInfoMapper.java | 17 ------ .../service/INuInvoicingQgdInfoService.java | 14 ----- .../impl/NuInvoicingQgdInfoServiceImpl.java | 19 ------ .../mapper/NuInvoicingQgdMainMapper.java | 17 ------ .../service/INuInvoicingQgdMainService.java | 14 ----- .../impl/NuInvoicingQgdMainServiceImpl.java | 19 ------ .../qgd/controller/QgdInfoController.java | 58 +++++++------------ .../qgd/controller/QgdMainController.java | 58 +++++++------------ .../com/nu/modules/qgd/entity/QgdInfo.java | 12 +--- .../com/nu/modules/qgd/entity/QgdMain.java | 12 +--- .../nu/modules/qgd/mapper/QgdInfoMapper.java | 14 +++++ .../nu/modules/qgd/mapper/QgdMainMapper.java | 14 +++++ .../modules/qgd/mapper/xml/QgdInfoMapper.xml | 2 +- .../modules/qgd/mapper/xml/QgdMainMapper.xml | 2 +- .../modules/qgd/service/IQgdInfoService.java | 14 +++++ .../modules/qgd/service/IQgdMainService.java | 14 +++++ .../qgd/service/impl/QgdInfoServiceImpl.java | 19 ++++++ .../qgd/service/impl/QgdMainServiceImpl.java | 19 ++++++ 18 files changed, 144 insertions(+), 194 deletions(-) delete mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/NuInvoicingQgdInfoMapper.java delete mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/INuInvoicingQgdInfoService.java delete mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/impl/NuInvoicingQgdInfoServiceImpl.java delete mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/NuInvoicingQgdMainMapper.java delete mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/INuInvoicingQgdMainService.java delete mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/impl/NuInvoicingQgdMainServiceImpl.java rename nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/controller/NuInvoicingQgdInfoController.java => nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdInfoController.java (64%) rename nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/controller/NuInvoicingQgdMainController.java => nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdMainController.java (62%) rename nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/entity/NuInvoicingQgdInfo.java => nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java (89%) rename nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/entity/NuInvoicingQgdMain.java => nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdMain.java (83%) create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdInfoMapper.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdMainMapper.java rename nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/xml/NuInvoicingQgdMainMapper.xml => nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml (64%) rename nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/xml/NuInvoicingQgdInfoMapper.xml => nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdMainMapper.xml (64%) create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdInfoService.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdMainService.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/NuInvoicingQgdInfoMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/NuInvoicingQgdInfoMapper.java deleted file mode 100644 index 07829fa..0000000 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/NuInvoicingQgdInfoMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.nu.modules.nuInvoicingQgdInfo.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.nuInvoicingQgdInfo.entity.NuInvoicingQgdInfo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 请购单-请购信息 - * @Author: jeecg-boot - * @Date: 2025-06-26 - * @Version: V1.0 - */ -public interface NuInvoicingQgdInfoMapper extends BaseMapper { - -} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/INuInvoicingQgdInfoService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/INuInvoicingQgdInfoService.java deleted file mode 100644 index 2d03ffe..0000000 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/INuInvoicingQgdInfoService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.nuInvoicingQgdInfo.service; - -import com.nu.modules.nuInvoicingQgdInfo.entity.NuInvoicingQgdInfo; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 请购单-请购信息 - * @Author: jeecg-boot - * @Date: 2025-06-26 - * @Version: V1.0 - */ -public interface INuInvoicingQgdInfoService extends IService { - -} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/impl/NuInvoicingQgdInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/impl/NuInvoicingQgdInfoServiceImpl.java deleted file mode 100644 index fabca80..0000000 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/service/impl/NuInvoicingQgdInfoServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.nuInvoicingQgdInfo.service.impl; - -import com.nu.modules.nuInvoicingQgdInfo.entity.NuInvoicingQgdInfo; -import com.nu.modules.nuInvoicingQgdInfo.mapper.NuInvoicingQgdInfoMapper; -import com.nu.modules.nuInvoicingQgdInfo.service.INuInvoicingQgdInfoService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 请购单-请购信息 - * @Author: jeecg-boot - * @Date: 2025-06-26 - * @Version: V1.0 - */ -@Service -public class NuInvoicingQgdInfoServiceImpl extends ServiceImpl implements INuInvoicingQgdInfoService { - -} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/NuInvoicingQgdMainMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/NuInvoicingQgdMainMapper.java deleted file mode 100644 index 30fde20..0000000 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/NuInvoicingQgdMainMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.nu.modules.nuInvoicingQgdMain.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.nuInvoicingQgdMain.entity.NuInvoicingQgdMain; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 请购单 - * @Author: jeecg-boot - * @Date: 2025-06-26 - * @Version: V1.0 - */ -public interface NuInvoicingQgdMainMapper extends BaseMapper { - -} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/INuInvoicingQgdMainService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/INuInvoicingQgdMainService.java deleted file mode 100644 index 9eba15f..0000000 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/INuInvoicingQgdMainService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.nuInvoicingQgdMain.service; - -import com.nu.modules.nuInvoicingQgdMain.entity.NuInvoicingQgdMain; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 请购单 - * @Author: jeecg-boot - * @Date: 2025-06-26 - * @Version: V1.0 - */ -public interface INuInvoicingQgdMainService extends IService { - -} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/impl/NuInvoicingQgdMainServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/impl/NuInvoicingQgdMainServiceImpl.java deleted file mode 100644 index 7075bf7..0000000 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/service/impl/NuInvoicingQgdMainServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.nuInvoicingQgdMain.service.impl; - -import com.nu.modules.nuInvoicingQgdMain.entity.NuInvoicingQgdMain; -import com.nu.modules.nuInvoicingQgdMain.mapper.NuInvoicingQgdMainMapper; -import com.nu.modules.nuInvoicingQgdMain.service.INuInvoicingQgdMainService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 请购单 - * @Author: jeecg-boot - * @Date: 2025-06-26 - * @Version: V1.0 - */ -@Service -public class NuInvoicingQgdMainServiceImpl extends ServiceImpl implements INuInvoicingQgdMainService { - -} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/controller/NuInvoicingQgdInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdInfoController.java similarity index 64% rename from nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/controller/NuInvoicingQgdInfoController.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdInfoController.java index e6a47d0..b14653c 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/controller/NuInvoicingQgdInfoController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdInfoController.java @@ -1,39 +1,22 @@ -package com.nu.modules.nuInvoicingQgdInfo.controller; +package com.nu.modules.qgd.controller; import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.query.QueryRuleEnum; -import org.jeecg.common.util.oConvertUtils; -import com.nu.modules.nuInvoicingQgdInfo.entity.NuInvoicingQgdInfo; -import com.nu.modules.nuInvoicingQgdInfo.service.INuInvoicingQgdInfoService; +import com.nu.modules.qgd.entity.QgdInfo; +import com.nu.modules.qgd.service.IQgdInfoService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; @@ -47,11 +30,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; */ @Api(tags="请购单-请购信息") @RestController -@RequestMapping("/nuInvoicingQgdInfo/nuInvoicingQgdInfo") +//@RequestMapping("/nuInvoicingQgdInfo/nuInvoicingQgdInfo") +@RequestMapping("/invoicing/qgdInfo") @Slf4j -public class NuInvoicingQgdInfoController extends JeecgController { +public class QgdInfoController extends JeecgController { @Autowired - private INuInvoicingQgdInfoService nuInvoicingQgdInfoService; + private IQgdInfoService nuInvoicingQgdInfoService; /** * 分页列表查询 @@ -65,13 +49,13 @@ public class NuInvoicingQgdInfoController extends JeecgController> queryPageList(NuInvoicingQgdInfo nuInvoicingQgdInfo, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingQgdInfo, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = nuInvoicingQgdInfoService.page(page, queryWrapper); + public Result> queryPageList(QgdInfo nuInvoicingQgdInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingQgdInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuInvoicingQgdInfoService.page(page, queryWrapper); return Result.OK(pageList); } @@ -85,7 +69,7 @@ public class NuInvoicingQgdInfoController extends JeecgController add(@RequestBody NuInvoicingQgdInfo nuInvoicingQgdInfo) { + public Result add(@RequestBody QgdInfo nuInvoicingQgdInfo) { nuInvoicingQgdInfoService.save(nuInvoicingQgdInfo); return Result.OK("添加成功！"); } @@ -100,7 +84,7 @@ public class NuInvoicingQgdInfoController extends JeecgController edit(@RequestBody NuInvoicingQgdInfo nuInvoicingQgdInfo) { + public Result edit(@RequestBody QgdInfo nuInvoicingQgdInfo) { nuInvoicingQgdInfoService.updateById(nuInvoicingQgdInfo); return Result.OK("编辑成功!"); } @@ -144,8 +128,8 @@ public class NuInvoicingQgdInfoController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - NuInvoicingQgdInfo nuInvoicingQgdInfo = nuInvoicingQgdInfoService.getById(id); + public Result queryById(@RequestParam(name="id",required=true) String id) { + QgdInfo nuInvoicingQgdInfo = nuInvoicingQgdInfoService.getById(id); if(nuInvoicingQgdInfo==null) { return Result.error("未找到对应数据"); } @@ -160,8 +144,8 @@ public class NuInvoicingQgdInfoController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, NuInvoicingQgdInfo.class); + return super.importExcel(request, response, QgdInfo.class); } } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/controller/NuInvoicingQgdMainController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdMainController.java similarity index 62% rename from nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/controller/NuInvoicingQgdMainController.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdMainController.java index cd959e5..78a8936 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/controller/NuInvoicingQgdMainController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdMainController.java @@ -1,39 +1,22 @@ -package com.nu.modules.nuInvoicingQgdMain.controller; +package com.nu.modules.qgd.controller; import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.query.QueryRuleEnum; -import org.jeecg.common.util.oConvertUtils; -import com.nu.modules.nuInvoicingQgdMain.entity.NuInvoicingQgdMain; -import com.nu.modules.nuInvoicingQgdMain.service.INuInvoicingQgdMainService; +import com.nu.modules.qgd.entity.QgdMain; +import com.nu.modules.qgd.service.IQgdMainService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; @@ -47,11 +30,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; */ @Api(tags="请购单") @RestController -@RequestMapping("/nuInvoicingQgdMain/nuInvoicingQgdMain") +//@RequestMapping("/nuInvoicingQgdMain/nuInvoicingQgdMain") +@RequestMapping("/invoicing/qgdMain") @Slf4j -public class NuInvoicingQgdMainController extends JeecgController { +public class QgdMainController extends JeecgController { @Autowired - private INuInvoicingQgdMainService nuInvoicingQgdMainService; + private IQgdMainService nuInvoicingQgdMainService; /** * 分页列表查询 @@ -65,13 +49,13 @@ public class NuInvoicingQgdMainController extends JeecgController> queryPageList(NuInvoicingQgdMain nuInvoicingQgdMain, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingQgdMain, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = nuInvoicingQgdMainService.page(page, queryWrapper); + public Result> queryPageList(QgdMain nuInvoicingQgdMain, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingQgdMain, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuInvoicingQgdMainService.page(page, queryWrapper); return Result.OK(pageList); } @@ -85,7 +69,7 @@ public class NuInvoicingQgdMainController extends JeecgController add(@RequestBody NuInvoicingQgdMain nuInvoicingQgdMain) { + public Result add(@RequestBody QgdMain nuInvoicingQgdMain) { nuInvoicingQgdMainService.save(nuInvoicingQgdMain); return Result.OK("添加成功！"); } @@ -100,7 +84,7 @@ public class NuInvoicingQgdMainController extends JeecgController edit(@RequestBody NuInvoicingQgdMain nuInvoicingQgdMain) { + public Result edit(@RequestBody QgdMain nuInvoicingQgdMain) { nuInvoicingQgdMainService.updateById(nuInvoicingQgdMain); return Result.OK("编辑成功!"); } @@ -144,8 +128,8 @@ public class NuInvoicingQgdMainController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - NuInvoicingQgdMain nuInvoicingQgdMain = nuInvoicingQgdMainService.getById(id); + public Result queryById(@RequestParam(name="id",required=true) String id) { + QgdMain nuInvoicingQgdMain = nuInvoicingQgdMainService.getById(id); if(nuInvoicingQgdMain==null) { return Result.error("未找到对应数据"); } @@ -160,8 +144,8 @@ public class NuInvoicingQgdMainController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, NuInvoicingQgdMain.class); + return super.importExcel(request, response, QgdMain.class); } } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/entity/NuInvoicingQgdInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java similarity index 89% rename from nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/entity/NuInvoicingQgdInfo.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java index 796b98d..ba84af0 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/entity/NuInvoicingQgdInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java @@ -1,20 +1,14 @@ -package com.nu.modules.nuInvoicingQgdInfo.entity; +package com.nu.modules.qgd.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; @@ -31,7 +25,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_invoicing_qgd_info对象", description="请购单-请购信息") -public class NuInvoicingQgdInfo implements Serializable { +public class QgdInfo implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/entity/NuInvoicingQgdMain.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdMain.java similarity index 83% rename from nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/entity/NuInvoicingQgdMain.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdMain.java index 74a5bb7..c5b3832 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/entity/NuInvoicingQgdMain.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdMain.java @@ -1,20 +1,14 @@ -package com.nu.modules.nuInvoicingQgdMain.entity; +package com.nu.modules.qgd.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; @@ -31,7 +25,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_invoicing_qgd_main对象", description="请购单") -public class NuInvoicingQgdMain implements Serializable { +public class QgdMain implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdInfoMapper.java new file mode 100644 index 0000000..a63d312 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdInfoMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.qgd.mapper; + +import com.nu.modules.qgd.entity.QgdInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 请购单-请购信息 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +public interface QgdInfoMapper extends BaseMapper { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdMainMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdMainMapper.java new file mode 100644 index 0000000..959340b --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdMainMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.qgd.mapper; + +import com.nu.modules.qgd.entity.QgdMain; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 请购单 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +public interface QgdMainMapper extends BaseMapper { + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/xml/NuInvoicingQgdMainMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml similarity index 64% rename from nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/xml/NuInvoicingQgdMainMapper.xml rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml index 0d1bf3a..ca19ff2 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdMain/mapper/xml/NuInvoicingQgdMainMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/xml/NuInvoicingQgdInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdMainMapper.xml similarity index 64% rename from nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/xml/NuInvoicingQgdInfoMapper.xml rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdMainMapper.xml index 880aa6f..50af4b3 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuInvoicingQgdInfo/mapper/xml/NuInvoicingQgdInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdMainMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdInfoService.java new file mode 100644 index 0000000..4fec93b --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdInfoService.java @@ -0,0 +1,14 @@ +package com.nu.modules.qgd.service; + +import com.nu.modules.qgd.entity.QgdInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 请购单-请购信息 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +public interface IQgdInfoService extends IService { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdMainService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdMainService.java new file mode 100644 index 0000000..8e5e5fd --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdMainService.java @@ -0,0 +1,14 @@ +package com.nu.modules.qgd.service; + +import com.nu.modules.qgd.entity.QgdMain; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 请购单 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +public interface IQgdMainService extends IService { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java new file mode 100644 index 0000000..6167413 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.qgd.service.impl; + +import com.nu.modules.qgd.entity.QgdInfo; +import com.nu.modules.qgd.mapper.QgdInfoMapper; +import com.nu.modules.qgd.service.IQgdInfoService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 请购单-请购信息 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +@Service +public class QgdInfoServiceImpl extends ServiceImpl implements IQgdInfoService { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java new file mode 100644 index 0000000..e27671f --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.qgd.service.impl; + +import com.nu.modules.qgd.entity.QgdMain; +import com.nu.modules.qgd.mapper.QgdMainMapper; +import com.nu.modules.qgd.service.IQgdMainService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 请购单 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +@Service +public class QgdMainServiceImpl extends ServiceImpl implements IQgdMainService { + +}