diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/nu/api/NuInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/nu/api/NuInfoApi.java index 0ad922d9..67871e36 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/nu/api/NuInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/nu/api/NuInfoApi.java @@ -5,6 +5,7 @@ import com.nu.entity.PayParamEntity; import com.nu.modules.nubaseinfo.api.INuBaseInfoApi; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -23,15 +24,11 @@ import java.util.Map; public class NuInfoApi { @Autowired - private INuBaseInfoApi nuBaseInfoApi; + private RedisUtil redisUtil; @PostMapping("/cancelBind") public Result cancelBind(@RequestBody NuBaseInfoEntity dto) { - - NuBaseInfoEntity baseInfo = new NuBaseInfoEntity(); - baseInfo.setNuId(dto.getNuId()); - baseInfo.setIzBindPaying("N"); - nuBaseInfoApi.updateByNuId(baseInfo); + redisUtil.del("binding_nu_paying"+dto.getNuId()); return Result.ok(); } } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/pay/api/WeChatPayApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/pay/api/WeChatPayApi.java index afd3a492..a27b9b56 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/pay/api/WeChatPayApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/pay/api/WeChatPayApi.java @@ -33,6 +33,7 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -70,12 +71,26 @@ public class WeChatPayApi { private INuBillApi nuBillApi; @Autowired private RabbitMQUtil rabbitMQUtil; + @Autowired + private RedisUtil redisUtil; /** * 绑定护理单元支付 */ @PostMapping("/nuBindPay") public Map nativePay(@Valid @RequestBody PayParamEntity params) { + Map resultMap = Maps.newHashMap(); + + //先检测是否有人在支付中 + String isOtherBinding = (String) redisUtil.get("binding_nu_paying" + params.getNursingUnit()); + if (StringUtils.isNotBlank(isOtherBinding)) { + resultMap.put("nuFailType", "NU_PAYING"); + resultMap.put("msg", "其它用户正在绑定此护理单元，如需要继续绑定，请于一分钟后重新查询"); + return resultMap; + } else { + redisUtil.set("binding_nu_paying" + params.getNursingUnit(), params.getNursingUnit(), 10 * 60); + } + //准备各种数据 //系统订单号+商户订单号（使用同一个，便于管理）:年月日时分秒+毫秒值后六位+2位随机数 String outTradeNo = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.valueOf(System.currentTimeMillis() % 1000000) + String.format("%02d", new Random().nextInt(100)); @@ -137,7 +152,6 @@ public class WeChatPayApi { upDto.setId(systemOrderApiEntity.getId()); upDto.setOrderStatus("ORG_PAYMENT_DISABLED");//商家未启用微信支付功能 upDto.setReceiptDescription("由于商家已关闭微信支付功能，无法完成微信支付。");//回执描述 - Map resultMap = Maps.newHashMap(); resultMap.put("nuFailType", "ORG_PAYMENT_DISABLED"); resultMap.put("msg", "由于商家已关闭微信支付功能，无法完成微信支付"); return resultMap; @@ -148,7 +162,6 @@ public class WeChatPayApi { { String valiResult = nuBaseInfoApi.canBinding(nuId); if (StringUtils.isNotBlank(valiResult)) { - Map resultMap = Maps.newHashMap(); //不可以支付 SystemOrderApiEntity upDto = new SystemOrderApiEntity(); upDto.setId(systemOrderApiEntity.getId()); @@ -158,18 +171,7 @@ public class WeChatPayApi { resultMap.put("msg", "护理单元已被其它用户绑定"); upDto.setReceiptDescription("护理单元已被其它用户绑定。");//回执描述 } - if ("bangDingJiaoFeiZhong".equals(valiResult)) { - resultMap.put("nuFailType", "NU_PAYING"); - resultMap.put("msg", "其它用户正在绑定此护理单元，如需要继续绑定，请于一分钟后重新查询"); - upDto.setReceiptDescription("其它用户正在绑定此护理单元，如需要继续绑定，请于一分钟后重新查询。");//回执描述 - } return resultMap; - } else { - //可以支付 修改绑定护理单元的缴费状态 - NuBaseInfoEntity baseInfo = new NuBaseInfoEntity(); - baseInfo.setNuId(nuId); - baseInfo.setIzBindPaying("Y"); - nuBaseInfoApi.updateByNuId(baseInfo); } } @@ -218,12 +220,6 @@ public class WeChatPayApi { rabbitMQUtil.sendToExchange("hldy.nubaseelder", "hldy.nubaseelder.bindnu", mqDto); } - //这里是绑定护理单元支付回调 无论是否支付成功 - //护理单元绑定缴费中置为N（没有人在绑定缴费中） - NuBaseInfoEntity baseInfo = new NuBaseInfoEntity(); - baseInfo.setNuId(orderData.getNuId()); - baseInfo.setIzBindPaying("N"); - nuBaseInfoApi.updateByNuId(baseInfo); } Date now = new Date(); systemOrderApiEntity.setNotifyCount(orderData.getNotifyCount() + 1);//回执次数 diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java index dc4c723e..fd657b62 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java @@ -359,9 +359,6 @@ public class NuBaseInfoServiceImpl extends ServiceImpl> queryPageList(Appraisal appraisal, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { -// // 自定义查询规则 -// Map customeRuleMap = new HashMap<>(); -// // 自定义多选的查询规则为：LIKE_WITH_OR -// customeRuleMap.put("startTime", QueryRuleEnum.LIKE_WITH_OR); -// customeRuleMap.put("endTime", QueryRuleEnum.LIKE_WITH_OR); -// customeRuleMap.put("appraisalStatus", QueryRuleEnum.LIKE_WITH_OR); -// customeRuleMap.put("orderNo", QueryRuleEnum.LIKE_WITH_OR); -// customeRuleMap.put("orderType", QueryRuleEnum.LIKE_WITH_OR); -// customeRuleMap.put("optType", QueryRuleEnum.LIKE_WITH_OR); -// customeRuleMap.put("nuId", QueryRuleEnum.LIKE_WITH_OR); -// customeRuleMap.put("employeeId", QueryRuleEnum.LIKE_WITH_OR); -// customeRuleMap.put("elderId", QueryRuleEnum.LIKE_WITH_OR); -// customeRuleMap.put("izPackage", QueryRuleEnum.LIKE_WITH_OR); -// customeRuleMap.put("izFinish", QueryRuleEnum.LIKE_WITH_OR); -// customeRuleMap.put("izTimeout", QueryRuleEnum.LIKE_WITH_OR); -// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(appraisal, req.getParameterMap(),customeRuleMap); -// Page page = new Page(pageNo, pageSize); -// if(appraisal.getStartTime()!=null){ -// queryWrapper.ge("create_time",appraisal.getStartTime()); -// } -// if(appraisal.getEndTime()!=null){ -// queryWrapper.le("create_time",appraisal.getEndTime()); -// } -// IPage pageList = service.page(page, queryWrapper); - - Page page = new Page(pageNo, pageSize); - IPage pageList = service.findPage(page, appraisal); - return Result.OK(pageList); - } - - /** - * 审核 - * - * @param appraisal - * @return - */ - @AutoLog(value = "服务指令工单-审核") - @ApiOperation(value="服务指令工单-审核", notes="服务指令工单-审核") -// @RequiresPermissions("Appraisal:nu_biz_nu_directive_order:edit") - @RequestMapping(value = "/approval", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result approval(@RequestBody Appraisal appraisal) { - Appraisal AppraisalEntity = service.getById(appraisal.getId()); - if(AppraisalEntity==null) { - return Result.error("未找到对应数据"); - } - service.updateById(appraisal); - return Result.OK("审核成功!"); - } - - /** - * 添加 - * - * @param appraisal - * @return - */ - @AutoLog(value = "服务指令工单-添加") - @ApiOperation(value="服务指令工单-添加", notes="服务指令工单-添加") -// @RequiresPermissions("Appraisal:nu_biz_nu_directive_order:add") - @PostMapping(value = "/add") - public Result add(@RequestBody Appraisal appraisal) { - service.saveMain(appraisal, appraisal.getAppraisalSubList()); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param appraisal - * @return - */ - @AutoLog(value = "服务指令工单-编辑") - @ApiOperation(value="服务指令工单-编辑", notes="服务指令工单-编辑") -// @RequiresPermissions("Appraisal:nu_biz_nu_directive_order:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody Appraisal appraisal) { - Appraisal AppraisalEntity = service.getById(appraisal.getId()); - if(AppraisalEntity==null) { - return Result.error("未找到对应数据"); - } - service.updateMain(appraisal, appraisal.getAppraisalSubList()); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "服务指令工单-通过id删除") - @ApiOperation(value="服务指令工单-通过id删除", notes="服务指令工单-通过id删除") -// @RequiresPermissions("Appraisal:nu_biz_nu_directive_order:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - service.delMain(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "服务指令工单-批量删除") - @ApiOperation(value="服务指令工单-批量删除", notes="服务指令工单-批量删除") -// @RequiresPermissions("Appraisal:nu_biz_nu_directive_order:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.service.delBatchMain(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) { - Appraisal Appraisal = service.getById(id); - if(Appraisal==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(Appraisal); - - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "nu_biz_nu_directive_order_info通过主表ID查询") - @ApiOperation(value="nu_biz_nu_directive_order_info主表ID查询", notes="nu_biz_nu_directive_order_info-通主表ID查询") - @GetMapping(value = "/queryAppraisalSubByMainId") - public Result> queryNuBizNuAppraisalSubListByMainId(@RequestParam(name="id",required=true) String id) { - List nuBizNuAppraisalSubList = subService.selectByMainId(id); - return Result.OK(nuBizNuAppraisalSubList); - } - - /** - * 导出excel - * - * @param request - * @param appraisal - */ -// @RequiresPermissions("Appraisal:nu_biz_nu_directive_order:exportXls") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, Appraisal appraisal) { - // Step.1 组装查询条件查询数据 - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(appraisal, request.getParameterMap()); - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - - //配置选中数据查询条件 - String selections = request.getParameter("selections"); - if(oConvertUtils.isNotEmpty(selections)) { - List selectionList = Arrays.asList(selections.split(",")); - queryWrapper.in("id",selectionList); - } - //Step.2 获取导出数据 - List AppraisalList = service.list(queryWrapper); - - // Step.3 组装pageList - List pageList = new ArrayList(); - for (Appraisal main : AppraisalList) { - Appraisal vo = new Appraisal(); - BeanUtils.copyProperties(main, vo); - List appraisalSubList = subService.selectByMainId(main.getId()); - vo.setAppraisalSubList(appraisalSubList); - pageList.add(vo); - } - - // Step.4 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, "服务考核列表"); - mv.addObject(NormalExcelConstants.CLASS, Appraisal.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("服务考核数据", "导出人:"+sysUser.getRealname(), "服务考核")); - mv.addObject(NormalExcelConstants.DATA_LIST, pageList); - return mv; - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ -// @RequiresPermissions("Appraisal:nu_biz_nu_directive_order:importExcel") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - // 获取上传文件对象 - MultipartFile file = entity.getValue(); - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List list = ExcelImportUtil.importExcel(file.getInputStream(), Appraisal.class, params); - for (Appraisal page : list) { - Appraisal po = new Appraisal(); - BeanUtils.copyProperties(page, po); - service.saveMain(po, page.getAppraisalSubList()); - } - return Result.OK("文件导入成功！数据行数:" + list.size()); - } catch (Exception e) { - log.error(e.getMessage(),e); - return Result.error("文件导入失败:"+e.getMessage()); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Result.OK("文件导入失败！"); - } - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/controller/DirectiveAppraisalController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/controller/DirectiveAppraisalController.java new file mode 100644 index 00000000..80845319 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/controller/DirectiveAppraisalController.java @@ -0,0 +1,180 @@ +package com.nu.modules.biz.appraisal.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.appraisal.entity.DirectiveAppraisal; +import com.nu.modules.biz.appraisal.service.IDirectiveAppraisalService; +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.jeecg.common.system.query.QueryRuleEnum; +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; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + /** + * @Description: 护理单元-服务指令-工单 + * @Author: jeecg-boot + * @Date: 2026-02-28 + * @Version: V1.0 + */ +@Api(tags="护理单元-服务指令-工单") +@RestController +@RequestMapping("/appraisal/directiveAppraisal") +@Slf4j +public class DirectiveAppraisalController extends JeecgController { + @Autowired + private IDirectiveAppraisalService directiveAppraisalService; + + /** + * 分页列表查询 + * + * @param directiveAppraisal + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "护理单元-服务指令-工单-分页列表查询") + @ApiOperation(value="护理单元-服务指令-工单-分页列表查询", notes="护理单元-服务指令-工单-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(DirectiveAppraisal directiveAppraisal, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + Map customParamMap = new HashMap<>(req.getParameterMap()); + customParamMap.remove("column"); // 移除排序字段 + customParamMap.remove("order"); // 移除排序方向 + // 自定义查询规则 + Map customeRuleMap = new HashMap<>(); + // 自定义多选的查询规则为：LIKE_WITH_OR + customeRuleMap.put("nuId", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("instructionTagId", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("categoryId", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("typeId", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("optType", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("optStatus", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(directiveAppraisal, customParamMap,customeRuleMap); + Page page = new Page(pageNo, pageSize); + + //排序：先撤回的放前面 再是未考核的 再是应该执行时间倒序 + queryWrapper.orderByAsc("CASE WHEN revocation IS NOT NULL AND revocation != '' THEN 0 ELSE 1 END"); + queryWrapper.orderByAsc("CASE WHEN status = 0 THEN 0 ELSE 1 END"); + queryWrapper.orderByDesc("start_time"); + + IPage pageList = directiveAppraisalService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param directiveAppraisal + * @return + */ + @AutoLog(value = "护理单元-服务指令-工单-添加") + @ApiOperation(value="护理单元-服务指令-工单-添加", notes="护理单元-服务指令-工单-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody DirectiveAppraisal directiveAppraisal) { + directiveAppraisalService.save(directiveAppraisal); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param directiveAppraisal + * @return + */ + @AutoLog(value = "护理单元-服务指令-工单-编辑") + @ApiOperation(value="护理单元-服务指令-工单-编辑", notes="护理单元-服务指令-工单-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody DirectiveAppraisal directiveAppraisal) { + directiveAppraisalService.updateById(directiveAppraisal); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "护理单元-服务指令-工单-通过id删除") + @ApiOperation(value="护理单元-服务指令-工单-通过id删除", notes="护理单元-服务指令-工单-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + directiveAppraisalService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "护理单元-服务指令-工单-批量删除") + @ApiOperation(value="护理单元-服务指令-工单-批量删除", notes="护理单元-服务指令-工单-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.directiveAppraisalService.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) { + DirectiveAppraisal directiveAppraisal = directiveAppraisalService.getById(id); + if(directiveAppraisal==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(directiveAppraisal); + } + + /** + * 导出excel + * + * @param request + * @param directiveAppraisal + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, DirectiveAppraisal directiveAppraisal) { + return super.exportXls(request, directiveAppraisal, DirectiveAppraisal.class, "护理单元-服务指令-工单"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, DirectiveAppraisal.class); + } + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/Appraisal.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/Appraisal.java deleted file mode 100644 index 736a6af1..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/Appraisal.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.nu.modules.biz.appraisal.entity; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; -import com.baomidou.mybatisplus.annotation.*; -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; - -/** - * @Description: 服务考核 - * @Author: caolei - * @Date: 2026-01-23 - * @Version: V1.0 - */ -@ApiModel(value="nu_biz_nu_directive_order对象", description="服务考核") -@Data -@TableName("nu_biz_nu_directive_order") -public class Appraisal implements Serializable { - private static final long serialVersionUID = 1L; - - /**ID*/ - @TableId(type = IdType.ASSIGN_ID) - private String id; - /**单号*/ - @Excel(name = "单号", width = 15) - private String orderNo; - /**工单类型 1护理;2医疗:3仓库;4行政*/ - @Excel(name = "工单类型", width = 15, dicCode = "service_instruction_tag") - @Dict(dicCode = "service_instruction_tag") - private String orderType; - /**执行类型 1单人 2协助 3转单*/ - @Excel(name = "执行类型", width = 15, dicCode = "directive_order_opt_type") - @Dict(dicCode = "directive_order_opt_type") - private String optType; - /**数据池主表ID，nu_biz_nu_directive_data_pool.id*/ - private String poolId; - /**服务指令业务ID*/ - private String bizId; - /**业务类型*/ - private String bizType; - /**护理单元ID*/ - @Dict(dictTable = "nu_base_info", dicText = "nu_name", dicCode = "nu_id") - private String nuId; - /**护理单元名称*/ - @Excel(name = "护理单元", width = 15) - private String nuName; - /**长者ID*/ - private String elderId; - /**长者名称*/ - @Excel(name = "长者名称", width = 15) - private String elderName; - /**员工ID*/ - private String employeeId; - /**员工姓名*/ -// @Excel(name = "员工姓名", width = 15) - private String employeeName; - /**服务指令ID*/ - private String directiveId; - /**服务指令名称*/ - @Excel(name = "服务指令", width = 15) - private String directiveName; - /**周期类型ID*/ - private String cycleTypeId; - /**周期类型*/ - @Excel(name = "周期类型", width = 15) - private String cycleType; - /**周期值*/ - @Excel(name = "周期值", width = 15) - private String cycleValue; - /**服务指令图片大图*/ - private String previewFile; - /**服务指令图片小图*/ - private String previewFileSmall; - /**语音文件*/ - private String mp3File; - /**视频文件*/ - private String mp4File; - /**服务时长（分钟）*/ - @Excel(name = "服务时长（分钟）", width = 15) - private String serviceDuration; - /**服务说明*/ - @Excel(name = "服务说明", width = 15) - private String serviceContent; - /**是否是服务指令包 Y是 N否*/ - @Excel(name = "是否是指令包", width = 15, dicCode = "is_open") - @Dict(dicCode = "is_open") - private String izPackage; - /**收费价格*/ - @Excel(name = "收费价格", width = 15) - private java.math.BigDecimal tollPrice; - /**提成价格*/ - @Excel(name = "提成价格", width = 15) - private java.math.BigDecimal comPrice; - /**实际提成价格*/ - @Excel(name = "实际提成价格", width = 15) - private java.math.BigDecimal realComPrice; - /**开始时间*/ - @Excel(name = "预计开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date startTime; - /**结束时间*/ - @Excel(name = "预计结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date endTime; - /**实际开始员工*/ - private String beginEmp; - /**实际开始时间*/ - @Excel(name = "实际开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date beginTime; - /**实际结束员工*/ - private String finishEmp; - /**实际结束时间*/ - @Excel(name = "实际结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date finishTime; - /**是否开始 Y是 N否*/ - @Excel(name = "是否开始", width = 15, dicCode = "is_open") - @Dict(dicCode = "is_open") - private String izStart; - /**是否完成 Y是 N否*/ - @Excel(name = "是否完成", width = 15, dicCode = "is_open") - @Dict(dicCode = "is_open") - private String izFinish; - /**发起人ID*/ - private String initiatorId; - /**发起人姓名*/ - private String initiatorName; - /**创建人*/ - private String createEmp; - /**创建人*/ - 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 updateEmp; - /**更新人*/ - 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删除*/ - @TableLogic - private String delFlag; - /**备注*/ - private String remarks; - /**服务容错时长（end_time + 这个时间） 小于 begin_time算超时*/ - @Excel(name = "服务容错时长", width = 15) - private String timeoutDuration; - /**是否超时 Y超时 N未超时*/ - @Excel(name = "是否超时", width = 15, dicCode = "is_open") - @Dict(dicCode = "is_open") - private String izTimeout; - /**实际执行人id（多个）； 主要执行人+协助人*/ - private String optIds; - /**实际执行人名称（多个）； 主要执行人+协助人*/ - @Excel(name = "执行人", width = 15) - private String optNames; - /**手动拍照*/ - private String manuallyPicPath; - /**手动录制*/ - private String manuallyMp4Path; - /**考核状态 0未考核 1通过 2未通过*/ - @Excel(name = "考核状态", width = 15, dicCode = "appraisal_status") - @Dict(dicCode = "appraisal_status") - private String appraisalStatus; - /**考核时间*/ - @Excel(name = "考核时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date appraisalTime; - /**考核人ID*/ - private String appraisalId; - /**考核人*/ - @Excel(name = "考核人", width = 15) - private String appraisalName; - /**考核意见*/ - @Excel(name = "考核意见", width = 15) - private String appraisalComments; - - @TableField(exist = false) - private List appraisalSubList; -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/AppraisalSub.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/DirectiveAppraisal.java similarity index 59% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/AppraisalSub.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/DirectiveAppraisal.java index ccfe3937..56188716 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/AppraisalSub.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/DirectiveAppraisal.java @@ -1,140 +1,130 @@ package com.nu.modules.biz.appraisal.entity; -import java.io.Serializable; 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 java.util.Date; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.UnsupportedEncodingException; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** - * @Description: 服务考核子表 - * @Author: caolei - * @Date: 2026-01-23 + * @Description: 护理单元-服务指令-工单 + * @Author: jeecg-boot + * @Date: 2026-02-28 * @Version: V1.0 */ -@ApiModel(value="nu_biz_nu_directive_order_info对象", description="服务考核子表") @Data -@TableName("nu_biz_nu_directive_order_info") -public class AppraisalSub implements Serializable { +@TableName("nu_biz_nu_directive_order") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_biz_nu_directive_order对象", description="护理单元-服务指令-工单") +public class DirectiveAppraisal implements Serializable { private static final long serialVersionUID = 1L; /**ID*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "ID") - private String id; + private java.lang.String id; /**单号*/ @Excel(name = "单号", width = 15) @ApiModelProperty(value = "单号") - private String orderNo; + private java.lang.String orderNo; /**工单类型 1护理;2医疗:3仓库;4行政*/ @Excel(name = "工单类型 1护理;2医疗:3仓库;4行政", width = 15) @ApiModelProperty(value = "工单类型 1护理;2医疗:3仓库;4行政") - private String orderType; - /**主表ID，nu_biz_nu_directive_order.id*/ - @ApiModelProperty(value = "主表ID，nu_biz_nu_directive_order.id") - private String mainId; + private java.lang.String orderType; /**护理单元ID，nu_base_info.id*/ - @Excel(name = "护理单元ID，nu_base_info.id", width = 15) + @Excel(name = "护理单元ID，nu_base_info.id", width = 15, dictTable = "nu_base_info", dicText = "nu_name", dicCode = "nu_id") + @Dict(dictTable = "nu_base_info", dicText = "nu_name", dicCode = "nu_id") @ApiModelProperty(value = "护理单元ID，nu_base_info.id") - private String nuId; + private java.lang.String nuId; /**护理单元名称*/ @Excel(name = "护理单元名称", width = 15) @ApiModelProperty(value = "护理单元名称") - private String nuName; + private java.lang.String nuName; /**长者ID，nu_biz_elder_info.id*/ @Excel(name = "长者ID，nu_biz_elder_info.id", width = 15) @ApiModelProperty(value = "长者ID，nu_biz_elder_info.id") - private String elderId; + private java.lang.String elderId; /**长者名称*/ @Excel(name = "长者名称", width = 15) @ApiModelProperty(value = "长者名称") - private String elderName; + private java.lang.String elderName; /**员工ID*/ @Excel(name = "员工ID", width = 15) @ApiModelProperty(value = "员工ID") - private String employeeId; + private java.lang.String employeeId; /**员工姓名*/ @Excel(name = "员工姓名", width = 15) @ApiModelProperty(value = "员工姓名") - private String employeeName; + private java.lang.String employeeName; /**分类标签*/ - @Excel(name = "分类标签", width = 15) + @Excel(name = "分类标签", width = 15, dictTable = "nu_config_service_instruction_tag", dicText = "instruction_name", dicCode = "id") + @Dict(dictTable = "nu_config_service_instruction_tag", dicText = "instruction_name", dicCode = "id") @ApiModelProperty(value = "分类标签") - private String instructionTagId; + private java.lang.String instructionTagId; /**分类标签名称*/ @Excel(name = "分类标签名称", width = 15) @ApiModelProperty(value = "分类标签名称") - private String instructionTagName; + private java.lang.String instructionTagName; /**服务类别ID，nu_config_service_category.id*/ - @Excel(name = "服务类别ID，nu_config_service_category.id", width = 15) + @Excel(name = "服务类别ID，nu_config_service_category.id", width = 15, dictTable = "nu_config_service_category", dicText = "category_name", dicCode = "id") + @Dict(dictTable = "nu_config_service_category", dicText = "category_name", dicCode = "id") @ApiModelProperty(value = "服务类别ID，nu_config_service_category.id") - private String categoryId; + private java.lang.String categoryId; /**服务类别名称*/ @Excel(name = "服务类别名称", width = 15) @ApiModelProperty(value = "服务类别名称") - private String categoryName; + private java.lang.String categoryName; /**服务类型ID，nu_config_service_type.id*/ - @Excel(name = "服务类型ID，nu_config_service_type.id", width = 15) + @Excel(name = "服务类型ID，nu_config_service_type.id", width = 15, dictTable = "nu_config_service_type", dicText = "type_name", dicCode = "id") + @Dict(dictTable = "nu_config_service_type", dicText = "type_name", dicCode = "id") @ApiModelProperty(value = "服务类型ID，nu_config_service_type.id") - private String typeId; + private java.lang.String typeId; + /**服务属性 ds定时 js计时*/ + @Excel(name = "服务属性 ds定时 js计时", width = 15) + @ApiModelProperty(value = "服务属性 ds定时 js计时") + private java.lang.String serviceAttribute; /**服务类型名称*/ @Excel(name = "服务类型名称", width = 15) @ApiModelProperty(value = "服务类型名称") - private String typeName; + private java.lang.String typeName; /**服务指令ID，nu_config_service_directive.id*/ @Excel(name = "服务指令ID，nu_config_service_directive.id", width = 15) @ApiModelProperty(value = "服务指令ID，nu_config_service_directive.id") - private String directiveId; + private java.lang.String directiveId; /**服务指令名称*/ @Excel(name = "服务指令名称", width = 15) @ApiModelProperty(value = "服务指令名称") - private String directiveName; + private java.lang.String directiveName; /**周期类型ID*/ @Excel(name = "周期类型ID", width = 15) @ApiModelProperty(value = "周期类型ID") - private String cycleTypeId; + private java.lang.String cycleTypeId; /**周期类型*/ @Excel(name = "周期类型", width = 15) @ApiModelProperty(value = "周期类型") - private String cycleType; + private java.lang.String cycleType; /**周期值*/ @Excel(name = "周期值", width = 15) @ApiModelProperty(value = "周期值") - private String cycleValue; - /**服务指令图片大图*/ - @Excel(name = "服务指令图片大图", width = 15) - @ApiModelProperty(value = "服务指令图片大图") - private String previewFile; - /**服务指令图片小图*/ - @Excel(name = "服务指令图片小图", width = 15) - @ApiModelProperty(value = "服务指令图片小图") - private String previewFileSmall; - /**语音文件*/ - @Excel(name = "语音文件", width = 15) - @ApiModelProperty(value = "语音文件") - private String mp3File; - /**视频文件*/ - @Excel(name = "视频文件", width = 15) - @ApiModelProperty(value = "视频文件") - private String mp4File; + private java.lang.String cycleValue; /**服务时长（分钟）*/ @Excel(name = "服务时长（分钟）", width = 15) @ApiModelProperty(value = "服务时长（分钟）") - private String serviceDuration; + private java.lang.String serviceDuration; /**服务说明*/ @Excel(name = "服务说明", width = 15) @ApiModelProperty(value = "服务说明") - private String serviceContent; + private java.lang.String serviceContent; /**收费价格*/ @Excel(name = "收费价格", width = 15) @ApiModelProperty(value = "收费价格") @@ -143,105 +133,121 @@ public class AppraisalSub implements Serializable { @Excel(name = "提成价格", width = 15) @ApiModelProperty(value = "提成价格") private java.math.BigDecimal comPrice; - /**实际提成价格*/ - @Excel(name = "实际提成价格", width = 15) - @ApiModelProperty(value = "实际提成价格") + /**应收提成价格*/ + @Excel(name = "应收提成价格", width = 15) + @ApiModelProperty(value = "应收提成价格") + private java.math.BigDecimal ysComPrice; + /**实收提成价格*/ + @Excel(name = "实收提成价格", width = 15) + @ApiModelProperty(value = "实收提成价格") private java.math.BigDecimal realComPrice; /**服务指令包ID*/ @Excel(name = "服务指令包ID", width = 15) @ApiModelProperty(value = "服务指令包ID") - private String packageId; + private java.lang.String packageId; /**服务指令包名称*/ @Excel(name = "服务指令包名称", width = 15) @ApiModelProperty(value = "服务指令包名称") - private String packageName; + private java.lang.String packageName; /**是否是服务指令包 Y是 N否*/ @Excel(name = "是否是服务指令包 Y是 N否", width = 15) @ApiModelProperty(value = "是否是服务指令包 Y是 N否") - private String izPackage; + private java.lang.String izPackage; /**开始时间*/ - @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "开始时间") - private Date startTime; + private java.util.Date startTime; /**结束时间*/ @Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "结束时间") - private Date endTime; + private java.util.Date endTime; /**实际开始时间*/ @Excel(name = "实际开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "实际开始时间") - private Date beginTime; + private java.util.Date beginTime; /**实际结束时间*/ @Excel(name = "实际结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "实际结束时间") - private Date finishTime; + private java.util.Date finishTime; /**是否开始 Y是 N否*/ @Excel(name = "是否开始 Y是 N否", width = 15) @ApiModelProperty(value = "是否开始 Y是 N否") - private String izStart; + private java.lang.String izStart; /**是否完成 Y是 N否*/ @Excel(name = "是否完成 Y是 N否", width = 15) @ApiModelProperty(value = "是否完成 Y是 N否") - private String izFinish; + private java.lang.String izFinish; /**创建人*/ @ApiModelProperty(value = "创建人") - private String createBy; + private java.lang.String createBy; /**创建日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") - private Date createTime; + private java.util.Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") - private String updateBy; + private java.lang.String updateBy; /**更新日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") - private Date updateTime; - /**是否删除 0未删除 1删除*/ - @Excel(name = "是否删除 0未删除 1删除", width = 15) - @ApiModelProperty(value = "是否删除 0未删除 1删除") - @TableLogic - private String delFlag; + private java.util.Date updateTime; /**tplink下载地址*/ @Excel(name = "tplink下载地址", width = 15) @ApiModelProperty(value = "tplink下载地址") - private String tplinkPath; + private java.lang.String tplinkPath; /**手动拍照*/ @Excel(name = "手动拍照", width = 15) @ApiModelProperty(value = "手动拍照") - private String manuallyPicPath; + private java.lang.String manuallyPicPath; /**手动录制*/ @Excel(name = "手动录制", width = 15) @ApiModelProperty(value = "手动录制") - private String manuallyMp4Path; + private java.lang.String manuallyMp4Path; /**执行类型 1单人 2协助 3转单*/ - @Excel(name = "执行类型 1单人 2协助 3转单", width = 15) + @Excel(name = "执行类型 1单人 2协助 3转单", width = 15, dicCode = "directive_order_opt_type") + @Dict(dicCode = "directive_order_opt_type") @ApiModelProperty(value = "执行类型 1单人 2协助 3转单") - private String optType; - /**服务容错时长（end_time + 这个时间） 小于 begin_time算超时*/ - @Excel(name = "服务容错时长（end_time + 这个时间） 小于 begin_time算超时", width = 15) - @ApiModelProperty(value = "服务容错时长（end_time + 这个时间） 小于 begin_time算超时") - private String timeoutDuration; - /**是否超时 Y超时 N未超时*/ - @Excel(name = "是否超时 Y超时 N未超时", width = 15) - @ApiModelProperty(value = "是否超时 Y超时 N未超时") - private String izTimeout; + private java.lang.String optType; + /**执行状态 1正常 2未执行 3超时*/ + @Excel(name = "执行状态 1正常 2未执行 3超时", width = 15, dicCode = "directive_order_opt_status") + @Dict(dicCode = "directive_order_opt_status") + @ApiModelProperty(value = "执行状态 1正常 2未执行 3超时") + private java.lang.String optStatus; /**实际执行人id（多个）； 主要执行人+协助人*/ @Excel(name = "实际执行人id（多个）； 主要执行人+协助人", width = 15) @ApiModelProperty(value = "实际执行人id（多个）； 主要执行人+协助人") - private String optIds; + private java.lang.String optIds; /**实际执行人名称（多个）； 主要执行人+协助人*/ @Excel(name = "实际执行人名称（多个）； 主要执行人+协助人", width = 15) @ApiModelProperty(value = "实际执行人名称（多个）； 主要执行人+协助人") - private String optNames; + private java.lang.String optNames; + /**审核状态 0待审核 1通过 2未通过*/ + @Excel(name = "审核状态 0待审核 1通过 2未通过", width = 15, dicCode = "appraisal_status") + @Dict(dicCode = "appraisal_status") + @ApiModelProperty(value = "审核状态 0待审核 1通过 2未通过") + private java.lang.String status; + /**驳回原因*/ + @Excel(name = "驳回原因", width = 15) + @ApiModelProperty(value = "驳回原因") + private java.lang.String content; + /**撤回人（汉字）*/ + @Excel(name = "撤回人（汉字）", width = 15) + @ApiModelProperty(value = "撤回人（汉字）") + private java.lang.String revocation; + /**撤回时间*/ + @Excel(name = "撤回时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "撤回时间") + private java.util.Date revocationTime; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/AppraisalMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/AppraisalMapper.java deleted file mode 100644 index e0a2fa07..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/AppraisalMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.nu.modules.biz.appraisal.mapper; - -import com.nu.modules.biz.appraisal.entity.Appraisal; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 服务考核 - * @Author: caolei - * @Date: 2026-01-23 - * @Version: V1.0 - */ -public interface AppraisalMapper extends BaseMapper { - - IPage findPage(Page page,@Param("params") Appraisal appraisal); - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/AppraisalSubMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/AppraisalSubMapper.java deleted file mode 100644 index 795bc562..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/AppraisalSubMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.nu.modules.biz.appraisal.mapper; - -import java.util.List; -import com.nu.modules.biz.appraisal.entity.AppraisalSub; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -/** - * @Description: 服务考核子表 - * @Author: caolei - * @Date: 2026-01-23 - * @Version: V1.0 - */ -public interface AppraisalSubMapper extends BaseMapper { - - /** - * 通过主表id删除子表数据 - * - * @param mainId 主表id - * @return boolean - */ - boolean deleteByMainId(@Param("mainId") String mainId); - - /** - * 通过主表id查询子表数据 - * - * @param mainId 主表id - * @return List - */ - List selectByMainId(@Param("mainId") String mainId); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/DirectiveAppraisalMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/DirectiveAppraisalMapper.java new file mode 100644 index 00000000..5d4424e5 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/DirectiveAppraisalMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.appraisal.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.appraisal.entity.DirectiveAppraisal; + +/** + * @Description: 护理单元-服务指令-工单 + * @Author: jeecg-boot + * @Date: 2026-02-28 + * @Version: V1.0 + */ +public interface DirectiveAppraisalMapper extends BaseMapper { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/xml/AppraisalMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/xml/AppraisalMapper.xml deleted file mode 100644 index 9a492394..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/xml/AppraisalMapper.xml +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT o.id, - o.order_no, - o.order_type, - o.opt_type, - o.pool_id, - o.biz_id, - o.biz_type, - o.nu_id, - o.nu_name, - o.elder_id, - o.elder_name, - o.employee_id, - o.employee_name, - o.directive_id, - o.directive_name, - o.cycle_type_id, - o.cycle_type, - o.cycle_value, - o.preview_file, - o.preview_file_small, - o.mp3_file, - o.mp4_file, - o.service_duration, - o.service_content, - o.iz_package, - o.toll_price, - o.com_price, - o.real_com_price, - o.start_time, - o.end_time, - o.begin_emp, - o.begin_time, - o.finish_emp, - o.finish_time, - o.iz_start, - o.iz_finish, - o.initiator_id, - o.initiator_name, - o.create_by, - o.create_emp, - o.create_time, - o.update_by, - o.update_emp, - o.update_time, - o.del_flag, - o.remarks, - o.timeout_duration, - o.iz_timeout, - o.opt_ids, - o.opt_names, - o.manually_pic_path, - o.manually_mp4_path, - ifnull(o.appraisal_status,'0') as appraisal_status, - o.appraisal_time, - o.appraisal_id, - o.appraisal_name, - o.appraisal_comments, - s.id as sub_id, - s.order_no as sub_order_no, - s.order_type as sub_order_type, - s.opt_type as sub_opt_type, - s.main_id as sub_main_id, - s.nu_id as sub_nu_id, - s.nu_name as sub_nu_name, - s.elder_id as sub_elder_id, - s.elder_name as sub_elder_name, - s.employee_id as sub_employee_id, - s.employee_name as sub_employee_name, - s.instruction_tag_id as sub_instruction_tag_id, - s.instruction_tag_name as sub_instruction_tag_name, - s.category_id as sub_category_id, - s.category_name as sub_category_name, - s.type_id as sub_type_id, - s.type_name as sub_type_name, - s.directive_id as sub_directive_id, - s.directive_name as sub_directive_name, - s.cycle_type_id as sub_cycle_type_id, - s.cycle_type as sub_cycle_type, - s.cycle_value as sub_cycle_value, - s.preview_file as sub_preview_file, - s.preview_file_small as sub_preview_file_small, - s.mp3_file as sub_mp3_file, - s.mp4_file as sub_mp4_file, - s.service_duration as sub_service_duration, - s.service_content as sub_service_content, - s.toll_price as sub_toll_price, - s.com_price as sub_com_price, - s.real_com_price as sub_real_com_price, - s.package_id as sub_package_id, - s.package_name as sub_package_name, - s.iz_package as sub_iz_package, - s.start_time as sub_start_time, - s.end_time as sub_end_time, - s.begin_time as sub_begin_time, - s.finish_time as sub_finish_time, - s.iz_start as sub_iz_start, - s.iz_finish as sub_iz_finish, - s.timeout_duration as sub_timeout_duration, - s.create_by as sub_create_by, - s.create_time as sub_create_time, - s.update_by as sub_update_by, - s.update_time as sub_update_time, - s.del_flag as sub_del_flag, - s.tplink_path as sub_tplink_path, - s.manually_pic_path as sub_manually_pic_path, - s.manually_mp4_path as sub_manually_mp4_path - FROM nu_biz_nu_directive_order o - LEFT JOIN nu_biz_nu_directive_order_info s ON o.id = s.main_id - - - - - \ No newline at end of file diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/xml/AppraisalSubMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/xml/AppraisalSubMapper.xml deleted file mode 100644 index 8e96811d..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/xml/AppraisalSubMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - DELETE - FROM nu_biz_nu_directive_order_info - WHERE - main_id = #{mainId} - - - diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/xml/DirectiveAppraisalMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/xml/DirectiveAppraisalMapper.xml new file mode 100644 index 00000000..ced8c627 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/mapper/xml/DirectiveAppraisalMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/IAppraisalService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/IAppraisalService.java deleted file mode 100644 index 3aeeaeea..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/IAppraisalService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.nu.modules.biz.appraisal.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.appraisal.entity.Appraisal; -import com.nu.modules.biz.appraisal.entity.AppraisalSub; -import java.io.Serializable; -import java.util.Collection; -import java.util.List; - -/** - * @Description: 服务考核 - * @Author: caolei - * @Date: 2026-01-23 - * @Version: V1.0 - */ -public interface IAppraisalService extends IService { - - IPage findPage(Page page, Appraisal appraisal); - - /** - * 添加一对多 - * - * @param appraisal - * @param appraisalSubList - */ - void saveMain(Appraisal appraisal,List appraisalSubList) ; - - /** - * 修改一对多 - * - * @param appraisal - * @param appraisalSubList - */ - void updateMain(Appraisal appraisal,List appraisalSubList); - - /** - * 删除一对多 - * - * @param id - */ - void delMain (String id); - - /** - * 批量删除一对多 - * - * @param idList - */ - void delBatchMain (Collection idList); - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/IAppraisalSubService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/IAppraisalSubService.java deleted file mode 100644 index be7304c2..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/IAppraisalSubService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.nu.modules.biz.appraisal.service; - -import com.nu.modules.biz.appraisal.entity.AppraisalSub; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * @Description: 服务考核子表 - * @Author: caolei - * @Date: 2026-01-23 - * @Version: V1.0 - */ -public interface IAppraisalSubService extends IService { - - /** - * 通过主表id查询子表数据 - * - * @param mainId 主表id - * @return List - */ - List selectByMainId(String mainId); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/IDirectiveAppraisalService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/IDirectiveAppraisalService.java new file mode 100644 index 00000000..ad56bd84 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/IDirectiveAppraisalService.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.appraisal.service; + +import com.nu.modules.biz.appraisal.entity.DirectiveAppraisal; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 护理单元-服务指令-工单 + * @Author: jeecg-boot + * @Date: 2026-02-28 + * @Version: V1.0 + */ +public interface IDirectiveAppraisalService extends IService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/AppraisalServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/AppraisalServiceImpl.java deleted file mode 100644 index ad590b34..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/AppraisalServiceImpl.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.nu.modules.biz.appraisal.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.biz.appraisal.entity.Appraisal; -import com.nu.modules.biz.appraisal.entity.AppraisalSub; -import com.nu.modules.biz.appraisal.mapper.AppraisalMapper; -import com.nu.modules.biz.appraisal.mapper.AppraisalSubMapper; -import com.nu.modules.biz.appraisal.service.IAppraisalService; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import java.io.Serializable; -import java.util.List; -import java.util.Collection; - -/** - * @Description: 服务考核 - * @Author: caolei - * @Date: 2026-01-23 - * @Version: V1.0 - */ -@Service -public class AppraisalServiceImpl extends ServiceImpl implements IAppraisalService { - - @Autowired - private AppraisalSubMapper subMapper; - - @Override - public IPage findPage(Page page, Appraisal appraisal){ - return baseMapper.findPage(page,appraisal); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void saveMain(Appraisal appraisal, List appraisalSubList) { - baseMapper.insert(appraisal); - if(appraisalSubList!=null && appraisalSubList.size()>0) { - for(AppraisalSub entity:appraisalSubList) { - //外键设置 - entity.setMainId(appraisal.getId()); - subMapper.insert(entity); - } - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateMain(Appraisal appraisal,List appraisalSubList) { - baseMapper.updateById(appraisal); - - //1.先删除子表数据 - subMapper.deleteByMainId(appraisal.getId()); - - //2.子表数据重新插入 - if(appraisalSubList!=null && appraisalSubList.size()>0) { - for(AppraisalSub entity:appraisalSubList) { - //外键设置 - entity.setMainId(appraisal.getId()); - subMapper.insert(entity); - } - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delMain(String id) { - subMapper.deleteByMainId(id); - baseMapper.deleteById(id); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delBatchMain(Collection idList) { - for(Serializable id:idList) { - subMapper.deleteByMainId(id.toString()); - baseMapper.deleteById(id); - } - } - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/AppraisalSubServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/AppraisalSubServiceImpl.java deleted file mode 100644 index a21025dc..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/AppraisalSubServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.nu.modules.biz.appraisal.service.impl; - -import com.nu.modules.biz.appraisal.entity.AppraisalSub; -import com.nu.modules.biz.appraisal.mapper.AppraisalSubMapper; -import com.nu.modules.biz.appraisal.service.IAppraisalSubService; -import org.springframework.stereotype.Service; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 服务考核子表 - * @Author: caolei - * @Date: 2026-01-23 - * @Version: V1.0 - */ -@Service -public class AppraisalSubServiceImpl extends ServiceImpl implements IAppraisalSubService { - - @Override - public List selectByMainId(String mainId) { - return baseMapper.selectByMainId(mainId); - } -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/DirectiveAppraisalServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/DirectiveAppraisalServiceImpl.java new file mode 100644 index 00000000..24ac9b63 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/DirectiveAppraisalServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.biz.appraisal.service.impl; + +import com.nu.modules.biz.appraisal.entity.DirectiveAppraisal; +import com.nu.modules.biz.appraisal.mapper.DirectiveAppraisalMapper; +import com.nu.modules.biz.appraisal.service.IDirectiveAppraisalService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 护理单元-服务指令-工单 + * @Author: jeecg-boot + * @Date: 2026-02-28 + * @Version: V1.0 + */ +@Service +public class DirectiveAppraisalServiceImpl extends ServiceImpl implements IDirectiveAppraisalService { + +}