From c42b3b7eaa50a3e0e857575af8af31019ae9f87c Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Thu, 5 Feb 2026 11:22:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E4=BB=A4=E5=B7=A5=E5=8D=95=E5=AD=90?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/entity/DirectiveOrderInfoEntity.java | 145 ++++++++++++++++ .../DirectiveOrderInfoController.java | 162 ++++++++++++++++++ .../biz/order/entity/DirectiveOrderInfo.java | 161 +++++++++++++++++ .../mapper/DirectiveOrderInfoMapper.java | 22 +++ .../mapper/xml/DirectiveOrderInfoMapper.xml | 67 ++++++++ .../service/IDirectiveOrderInfoService.java | 17 ++ .../impl/DirectiveOrderInfoServiceImpl.java | 30 ++++ 7 files changed, 604 insertions(+) create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderInfoEntity.java create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/controller/DirectiveOrderInfoController.java create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderInfo.java create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderInfoMapper.java create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderInfoMapper.xml create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/IDirectiveOrderInfoService.java create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderInfoServiceImpl.java diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderInfoEntity.java new file mode 100644 index 00000000..a72ed215 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderInfoEntity.java @@ -0,0 +1,145 @@ +package com.nu.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 护理单元-服务指令-工单子表 + * @Author: jeecg-boot + * @Date: 2026-01-05 + * @Version: V1.0 + */ +@Data +public class DirectiveOrderInfoEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**ID*/ + private String id; + /**工单类型 1护理;2医疗:3仓库;4行政*/ + private String orderType; + /**单号*/ + private String orderNo; + /**主表ID，nu_biz_nu_directive_order.id*/ + private String mainId; + /**数据池子表ID，nu_biz_nu_directive_data_pool_sub.id*/ + private String nuId; + /**护理单元名称*/ + private String nuName; + /**长者ID，nu_biz_elder_info.id*/ + private String elderId; + /**长者名称*/ + private String elderName; + /**员工ID*/ + private String employeeId; + /**员工姓名*/ + private String employeeName; + /**分类标签*/ + private String instructionTagId; + /**分类标签名称*/ + private String instructionTagName; + /**服务类别ID，nu_config_service_category.id*/ + private String categoryId; + /**服务类别名称*/ + private String categoryName; + /**服务类型ID，nu_config_service_type.id*/ + private String typeId; + /**服务类型名称*/ + private String typeName; + /**服务指令ID，nu_config_service_directive.id*/ + private String directiveId; + /**服务指令名称*/ + private String directiveName; + /**指令类型ID*/ + private String cycleTypeId; + /**指令类型*/ + private String cycleType; + /**周期值*/ + private String cycleValue; + /**服务指令图片大图*/ + private String previewFile; + /**服务指令图片小图*/ + private String previewFileSmall; + /**语音文件*/ + private String mp3File; + /**视频文件*/ + private String mp4File; + /**服务时长（分钟）*/ + private String serviceDuration; + /**服务说明*/ + private String serviceContent; + /**超时时长（分钟）*/ + private String timeoutDuration; + /**收费价格*/ + private BigDecimal tollPrice; + /**提成价格*/ + private BigDecimal comPrice; + /**实际提成价格*/ + private BigDecimal realComPrice; + /**服务指令包ID*/ + private String packageId; + /**服务指令包名称*/ + private String packageName; + /**是否是服务指令包 Y是 N否*/ + private String izPackage; + /**开始时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date startTime; + /**结束时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date endTime; + /**实际开始时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date beginTime; + /**实际结束时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date finishTime; + /**是否开始 Y是 N否*/ + private String izStart; + /**是否完成 Y是 N否*/ + private String izFinish; + /**创建人*/ + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**是否删除 0未删除 1删除*/ + private String delFlag; + /**tplink下载地址*/ + private String tplinkPath; + /**手动拍照*/ + private String manuallyPicPath; + /**手动录制*/ + private String manuallyMp4Path; + + /**执行类型 1单人 2协助 3转单*/ + private String optType; + private String optTypeName; + + /**是否超时 Y超时 N未超时*/ + private String izTimeout; + /**实际执行人id（多个）； 主要执行人+协助人*/ + private String optIds; + /**实际执行人名称（多个）； 主要执行人+协助人*/ + private String optNames; + + private String beforeBy; + private String beforeByName; + private String immediateFile; + private String immediateFileFocus; +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/controller/DirectiveOrderInfoController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/controller/DirectiveOrderInfoController.java new file mode 100644 index 00000000..94232c93 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/controller/DirectiveOrderInfoController.java @@ -0,0 +1,162 @@ +package com.nu.modules.biz.order.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.modules.biz.order.entity.DirectiveOrderInfo; +import com.nu.modules.biz.order.service.IDirectiveOrderInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 护理单元-服务指令-工单子表 + * @Author: jeecg-boot + * @Date: 2026-01-05 + * @Version: V1.0 + */ +@Api(tags="护理单元-服务指令-工单子表") +@RestController +@RequestMapping("/services/directiveOrderInfo") +@Slf4j +public class DirectiveOrderInfoController extends JeecgController { + @Autowired + private IDirectiveOrderInfoService directiveOrderInfoService; + + /** + * 分页列表查询 + * + * @param directiveOrderInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "护理单元-服务指令-工单子表-分页列表查询") + @ApiOperation(value="护理单元-服务指令-工单子表-分页列表查询", notes="护理单元-服务指令-工单子表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(DirectiveOrderInfo directiveOrderInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(directiveOrderInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = directiveOrderInfoService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param directiveOrderInfo + * @return + */ + @AutoLog(value = "护理单元-服务指令-工单子表-添加") + @ApiOperation(value="护理单元-服务指令-工单子表-添加", notes="护理单元-服务指令-工单子表-添加") + @RequiresPermissions("centercontrol:nu_biz_nu_directive_order_info:add") + @PostMapping(value = "/add") + public Result add(@RequestBody DirectiveOrderInfo directiveOrderInfo) { + directiveOrderInfoService.save(directiveOrderInfo); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param directiveOrderInfo + * @return + */ + @AutoLog(value = "护理单元-服务指令-工单子表-编辑") + @ApiOperation(value="护理单元-服务指令-工单子表-编辑", notes="护理单元-服务指令-工单子表-编辑") + @RequiresPermissions("centercontrol:nu_biz_nu_directive_order_info:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody DirectiveOrderInfo directiveOrderInfo) { + directiveOrderInfoService.updateById(directiveOrderInfo); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "护理单元-服务指令-工单子表-通过id删除") + @ApiOperation(value="护理单元-服务指令-工单子表-通过id删除", notes="护理单元-服务指令-工单子表-通过id删除") + @RequiresPermissions("centercontrol:nu_biz_nu_directive_order_info:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + directiveOrderInfoService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "护理单元-服务指令-工单子表-批量删除") + @ApiOperation(value="护理单元-服务指令-工单子表-批量删除", notes="护理单元-服务指令-工单子表-批量删除") + @RequiresPermissions("centercontrol:nu_biz_nu_directive_order_info:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.directiveOrderInfoService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "护理单元-服务指令-工单子表-通过id查询") + @ApiOperation(value="护理单元-服务指令-工单子表-通过id查询", notes="护理单元-服务指令-工单子表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + DirectiveOrderInfo directiveOrderInfo = directiveOrderInfoService.getById(id); + if(directiveOrderInfo==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(directiveOrderInfo); + } + + /** + * 导出excel + * + * @param request + * @param directiveOrderInfo + */ + @RequiresPermissions("centercontrol:nu_biz_nu_directive_order_info:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, DirectiveOrderInfo directiveOrderInfo) { + return super.exportXls(request, directiveOrderInfo, DirectiveOrderInfo.class, "护理单元-服务指令-工单子表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("centercontrol:nu_biz_nu_directive_order_info:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, DirectiveOrderInfo.class); + } + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderInfo.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderInfo.java new file mode 100644 index 00000000..776afd17 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderInfo.java @@ -0,0 +1,161 @@ +package com.nu.modules.biz.order.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 服务指令工单子表 + * @Author: caolei + * @Date: 2025-11-13 + * @Version: V1.0 + */ +@Data +@TableName("nu_biz_nu_directive_order_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_biz_nu_directive_order_info对象", description="服务指令工单子表") +public class DirectiveOrderInfo implements Serializable { + private static final long serialVersionUID = 1L; + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + private String id; + /**单号*/ + private String orderNo; + /**工单类型*/ + private String orderType; + /**主表id*/ + private String mainId; + /**护理单元id*/ + private String nuId; + /**护理单元名称*/ + private String nuName; + /**长者id*/ + private String elderId; + /**长者姓名*/ + private String elderName; + /**员工ID*/ + private String employeeId; + /**员工姓名*/ + private String employeeName; + /**分类标签id*/ + private String instructionTagId; + /**分类标签*/ + private String instructionTagName; + /**服务类别id*/ + private String categoryId; + /**服务类别名称*/ + private String categoryName; + /**服务类型id*/ + private String typeId; + /**服务类型名称*/ + private String typeName; + /**服务指令id*/ + private String directiveId; + /**服务指令名称*/ + private String directiveName; + /**指令类型ID*/ + private String cycleTypeId; + /**指令类型*/ + private String cycleType; + /**周期值*/ + private String cycleValue; + /**服务指令图片大图*/ + private String previewFile; + /**服务指令图片大图-网络地址*/ +// private String netPreviewFile; + /**服务指令图片小图*/ + private String previewFileSmall; + /**服务指令图片小图-网络地址*/ +// private String netPreviewFileSmall; + /**指令音频文件*/ + private String mp3File; + /**指令音频文件-网络地址*/ +// private String netMp3File; + /**指令视频文件*/ + private String mp4File; + /**指令视频文件-网络地址*/ +// private String netMp4File; + /**服务时长（分钟）*/ + private String serviceDuration; + /**服务描述*/ + private String serviceContent; + /**超时时长（分钟）*/ + private String timeoutDuration; + /**收费价格*/ + private BigDecimal tollPrice; + /**提成价格*/ + private BigDecimal comPrice; + /**实际提成价格*/ + private BigDecimal realComPrice; + /**指令包id*/ + private String packageId; + /**指令包名称*/ + private String packageName; + /**是否是服务指令包 Y是 N否*/ + private String izPackage; + /**开始时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date startTime; + /**结束时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date endTime; + /**实际开始时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date beginTime; + /**实际结束时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date finishTime; + /**是否开始 Y是 N否*/ + private String izStart; + /**是否完成 Y是 N否*/ + private String izFinish; + /**创建人*/ + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**是否删除 0未删除 1删除*/ + private String delFlag; + private String tplinkPath; + private String manuallyPicPath; + private String manuallyMp4Path; + + /**执行类型 1单人 2协助 3转单*/ + private String optType; + + /**是否超时 Y超时 N未超时*/ + private String izTimeout; + /**实际执行人id（多个）； 主要执行人+协助人*/ + private String optIds; + /**实际执行人名称（多个）； 主要执行人+协助人*/ + private String optNames; + + @TableField(exist = false) + private String immediateFile; + @TableField(exist = false) + private String immediateFileFocus; + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderInfoMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderInfoMapper.java new file mode 100644 index 00000000..b9180422 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderInfoMapper.java @@ -0,0 +1,22 @@ +package com.nu.modules.biz.order.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.nu.modules.biz.order.entity.DirectiveOrderInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 服务指令工单子表 + * @Author: caolei + * @Date: 2025-11-18 + * @Version: V1.0 + */ +public interface DirectiveOrderInfoMapper extends BaseMapper { + List getDirectiveList(@Param("directiveId") String directiveId); + List getSubDirectiveList(@Param("packageId") String packageId); + + List queryOrderInfoList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderInfoMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderInfoMapper.xml new file mode 100644 index 00000000..f05d9b2d --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderInfoMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/IDirectiveOrderInfoService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/IDirectiveOrderInfoService.java new file mode 100644 index 00000000..bb24dc02 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/IDirectiveOrderInfoService.java @@ -0,0 +1,17 @@ +package com.nu.modules.biz.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.order.entity.DirectiveOrderInfo; + +import java.util.List; + +/** + * @Description: 服务指令工单子表 + * @Author: caolei + * @Date: 2025-11-18 + * @Version: V1.0 + */ +public interface IDirectiveOrderInfoService extends IService { + List getDirectiveList(String directiveId); + List getSubDirectiveList(String packageId); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderInfoServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderInfoServiceImpl.java new file mode 100644 index 00000000..13b232bf --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderInfoServiceImpl.java @@ -0,0 +1,30 @@ +package com.nu.modules.biz.order.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.biz.order.entity.DirectiveOrderInfo; +import com.nu.modules.biz.order.mapper.DirectiveOrderInfoMapper; +import com.nu.modules.biz.order.service.IDirectiveOrderInfoService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import java.util.List; + +/** + * @Description: 服务指令工单子表 + * @Author: caolei + * @Date: 2025-11-18 + * @Version: V1.0 + */ +@Service +@Slf4j +public class DirectiveOrderInfoServiceImpl extends ServiceImpl implements IDirectiveOrderInfoService { + + @Override + public List getDirectiveList(String directiveId){ + return baseMapper.getDirectiveList(directiveId); + } + + @Override + public List getSubDirectiveList(String packageId){ + return baseMapper.getSubDirectiveList(packageId); + } +}