From 3ea2c1e07543e73f74dab7647234292f74e9f131 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 16 Mar 2026 10:41:29 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=BF=A1=E6=81=AF-=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=EF=BC=9A=E5=AE=9E=E7=8E=B0=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=87=B3=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E9=80=89=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=B6=E7=9A=84=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=88=E5=8F=AF=E6=A0=B9=E6=8D=AE=E5=88=86=E7=B1=BB=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E3=80=81=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=88=AB=E3=80=81?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=9E=8B=E3=80=81=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=89=8D=E4=B8=89=E7=BA=A7=E7=9A=84=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E5=A4=84=E7=90=86=EF=BC=89=202=E3=80=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E4=BF=A1=E6=81=AF-=E9=87=8D=E7=BD=AE=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD=203=E3=80=81?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9C=BA=E6=9E=84=E5=8A=A0=E7=9B=9F=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=9C=BA=E6=9E=84=E8=B4=9F=E8=B4=A3=E4=BA=BA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=90=8E=E7=9A=84=E2=80=9C=E5=B0=9A=E6=9C=AA=E5=BD=92?= =?UTF-8?q?=E5=B1=9E=E9=83=A8=E9=97=A8=E2=80=9D=E6=8F=90=E7=A4=BA=204?= =?UTF-8?q?=E3=80=81=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E6=A0=87=E7=AD=BE=E5=8E=BB=E6=8E=89=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=90=AF=E7=94=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BD=9C=E5=BA=9F?= =?UTF-8?q?=EF=BC=9A=E4=BD=9C=E5=BA=9F=E5=90=8E=E7=A7=BB=E9=99=A4=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E5=B7=B2=E5=88=86=E9=85=8D=E7=9A=84=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=205=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E5=92=8C=E9=95=BF=E8=80=85=E6=A0=87=E7=AD=BE=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=B4=B9=E4=BB=B7=E6=A0=BC=E6=94=B9=E4=B8=BA=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nu/dto/DirectiveAsyncMQDto.java | 2 +- .../com/nu/dto/DirectiveOpeLogInfoMQDto.java | 2 +- .../com/nu/dto/DirectiveSyncLogInfoMQDto.java | 2 +- .../java/com/nu/entity/DirectiveEntity.java | 4 +- .../com/nu/entity/DirectiveOrderEntity.java | 2 +- .../nu/entity/DirectiveOrderInfoEntity.java | 2 +- .../nu/entity/EmployeesSalaryInfoEntity.java | 2 +- .../NuBizEmployeesServcieTagsController.java | 277 ++++++++++-------- .../entity/BizEmployeesInfo.java | 3 + .../entity/NuBizEmployeesServcieTags.java | 12 +- .../NuBizEmployeesServcieTagsMapper.java | 2 + .../mapper/xml/BizEmployeesInfoMapper.xml | 13 + .../xml/NuBizEmployeesServcieTagsMapper.xml | 3 + .../INuBizEmployeesServcieTagsService.java | 1 + .../impl/BizEmployeesInfoServiceImpl.java | 1 + .../NuBizEmployeesServcieTagsServiceImpl.java | 6 +- .../salary/entity/EmployeesSalaryInfo.java | 6 +- .../appraisal/entity/DirectiveAppraisal.java | 6 +- .../impl/DirectiveAppraisalServiceImpl.java | 2 +- .../entity/BizConfigServiceDirective.java | 6 +- .../mapper/xml/DirectiveDataPoolMapper.xml | 2 +- .../biz/order/entity/DirectiveOrder.java | 2 +- .../biz/order/entity/DirectiveOrderInfo.java | 6 +- .../order/mapper/xml/DirectiveOrderMapper.xml | 12 +- .../entity/CanAddDirective.java | 6 +- .../entity/DirectiveSyncLogInfo.java | 6 +- .../ConfigServiceDirectiveController.java | 6 +- .../entity/ConfigServiceDirective.java | 8 +- .../ConfigServiceDirectiveServiceImpl.java | 2 +- .../controller/ServiceTagController.java | 34 ++- .../config/servicetag/entity/ServiceTag.java | 6 +- .../servicetag/mapper/ServiceTagMapper.java | 2 + .../mapper/xml/ServiceTagMapper.xml | 33 ++- .../service/IServiceTagService.java | 2 + .../service/impl/ServiceTagServiceImpl.java | 9 + 35 files changed, 304 insertions(+), 186 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java index 27a0afea..0c3e3288 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java @@ -36,7 +36,7 @@ public class DirectiveAsyncMQDto implements Serializable { */ private String directiveName; /** - * 收费价格 + * 基础价格 */ private java.math.BigDecimal tollPrice; /** diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java index 7b0e70c7..e5ecf810 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java @@ -68,7 +68,7 @@ public class DirectiveOpeLogInfoMQDto implements Serializable { */ private String directiveName; /** - * 收费价格 + * 基础价格 */ private BigDecimal tollPrice; /** diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java index d6edb66e..284f1f34 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java @@ -68,7 +68,7 @@ public class DirectiveSyncLogInfoMQDto implements Serializable { */ private String directiveName; /** - * 收费价格 + * 基础价格 */ private BigDecimal tollPrice; /** diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveEntity.java index 805bc1a6..718818a5 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveEntity.java @@ -37,7 +37,7 @@ public class DirectiveEntity implements Serializable { */ private String directiveName; /** - * 收费价格 + * 基础价格 */ private java.math.BigDecimal tollPrice; /** @@ -207,7 +207,7 @@ public class DirectiveEntity implements Serializable { private String excludeIds;//需要排除的ids private String filterIzEnabled; private String directiveId; - private boolean izAbnormal;//查询服务时长、收费价格、提成价格 都等于 0的数据 + private boolean izAbnormal;//查询服务时长、基础价格、提成价格 都等于 0的数据 private String compareOrgCode;//对比的机构编码 private boolean ownExist;//本平台是否存在该指令 private boolean targetExist;//目标平台是否存在该指令 diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java index 665a30b0..e545c91c 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java @@ -88,7 +88,7 @@ public class DirectiveOrderEntity implements Serializable { private String packageName; /**是否是服务指令包 Y是 N否*/ private String izPackage; - /**收费价格*/ + /**基础价格*/ private BigDecimal tollPrice; /**提成价格*/ private BigDecimal comPrice; 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 index a72ed215..f95e9c4b 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderInfoEntity.java @@ -74,7 +74,7 @@ public class DirectiveOrderInfoEntity implements Serializable { private String serviceContent; /**超时时长（分钟）*/ private String timeoutDuration; - /**收费价格*/ + /**基础价格*/ private BigDecimal tollPrice; /**提成价格*/ private BigDecimal comPrice; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesSalaryInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesSalaryInfoEntity.java index 3db25880..cc25fe31 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesSalaryInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesSalaryInfoEntity.java @@ -72,7 +72,7 @@ public class EmployeesSalaryInfoEntity implements Serializable { private String serviceDuration; /**服务说明*/ private String serviceContent; - /**收费价格*/ + /**基础价格*/ private BigDecimal tollPrice; /**提成价格*/ private BigDecimal comPrice; diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/controller/NuBizEmployeesServcieTagsController.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/controller/NuBizEmployeesServcieTagsController.java index ffc2dbfc..3273ea2d 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/controller/NuBizEmployeesServcieTagsController.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/controller/NuBizEmployeesServcieTagsController.java @@ -1,9 +1,17 @@ package com.nu.modules.employeesInfo.controller; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.Arrays; +import java.util.Date; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; +import org.apache.commons.compress.utils.Lists; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.query.QueryGenerator; import com.nu.modules.employeesInfo.entity.NuBizEmployeesServcieTags; import com.nu.modules.employeesInfo.service.INuBizEmployeesServcieTagsService; @@ -22,125 +30,164 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; - /** +/** * @Description: 员工配置的服务标签 * @Author: jeecg-boot - * @Date: 2025-04-01 + * @Date: 2025-04-01 * @Version: V1.0 */ -@Api(tags="员工配置的服务标签") +@Api(tags = "员工配置的服务标签") @RestController @RequestMapping("/bizEmployeesInfo/nuBizEmployeesServcieTags") @Slf4j public class NuBizEmployeesServcieTagsController extends JeecgController { - @Autowired - private INuBizEmployeesServcieTagsService nuBizEmployeesServcieTagsService; - - /** - * 分页列表查询 - * - * @param nuBizEmployeesServcieTags - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "员工配置的服务标签-分页列表查询") - @ApiOperation(value="员工配置的服务标签-分页列表查询", notes="员工配置的服务标签-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(NuBizEmployeesServcieTags nuBizEmployeesServcieTags, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuBizEmployeesServcieTags, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = nuBizEmployeesServcieTagsService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param nuBizEmployeesServcieTags - * @return - */ - @AutoLog(value = "员工配置的服务标签-添加") - @ApiOperation(value="员工配置的服务标签-添加", notes="员工配置的服务标签-添加") -// @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:add") - @PostMapping(value = "/add") - public Result add(@RequestBody NuBizEmployeesServcieTags nuBizEmployeesServcieTags) { - nuBizEmployeesServcieTagsService.save(nuBizEmployeesServcieTags); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param nuBizEmployeesServcieTags - * @return - */ - @AutoLog(value = "员工配置的服务标签-编辑") - @ApiOperation(value="员工配置的服务标签-编辑", notes="员工配置的服务标签-编辑") - @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody NuBizEmployeesServcieTags nuBizEmployeesServcieTags) { - nuBizEmployeesServcieTagsService.updateById(nuBizEmployeesServcieTags); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "员工配置的服务标签-通过id删除") - @ApiOperation(value="员工配置的服务标签-通过id删除", notes="员工配置的服务标签-通过id删除") -// @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - nuBizEmployeesServcieTagsService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "员工配置的服务标签-批量删除") - @ApiOperation(value="员工配置的服务标签-批量删除", notes="员工配置的服务标签-批量删除") - @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.nuBizEmployeesServcieTagsService.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) { - NuBizEmployeesServcieTags nuBizEmployeesServcieTags = nuBizEmployeesServcieTagsService.getById(id); - if(nuBizEmployeesServcieTags==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(nuBizEmployeesServcieTags); - } + @Autowired + private INuBizEmployeesServcieTagsService nuBizEmployeesServcieTagsService; + @Autowired + private ISysBaseAPI sysBaseAPI; /** - * 导出excel - * - * @param request - * @param nuBizEmployeesServcieTags - */ + * 分页列表查询 + * + * @param nuBizEmployeesServcieTags + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "员工配置的服务标签-分页列表查询") + @ApiOperation(value = "员工配置的服务标签-分页列表查询", notes = "员工配置的服务标签-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(NuBizEmployeesServcieTags nuBizEmployeesServcieTags, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuBizEmployeesServcieTags, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuBizEmployeesServcieTagsService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param nuBizEmployeesServcieTags + * @return + */ + @AutoLog(value = "员工配置的服务标签-添加") + @ApiOperation(value = "员工配置的服务标签-添加", notes = "员工配置的服务标签-添加") +// @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:add") + @PostMapping(value = "/add") + public Result add(@RequestBody NuBizEmployeesServcieTags nuBizEmployeesServcieTags) { + nuBizEmployeesServcieTagsService.save(nuBizEmployeesServcieTags); + return Result.OK("添加成功！"); + } + + /** + * 保存 + * + * @param saveDataList + * @return + */ + @AutoLog(value = "服务标签-保存") + @ApiOperation(value = "服务标签-保存", notes = "服务标签-保存") + @PostMapping(value = "/addBatch") + public Result addBatch(@RequestBody List saveDataList) { + String empId = saveDataList.get(0).getEmployeesId(); + JSONObject deptInfo = sysBaseAPI.getDeptInfo(); + String orgCode = deptInfo.getString("code"); + //先删再存 + nuBizEmployeesServcieTagsService.physicsDeleteByEmpId(empId); + + List saveData = Lists.newArrayList(); + + //解决排序问题 + LocalDateTime now = LocalDateTime.now(); + int secondsOffset = 0; + for (NuBizEmployeesServcieTags item : saveDataList) { + NuBizEmployeesServcieTags data = new NuBizEmployeesServcieTags(); + data.setEmployeesId(empId); + data.setType(item.getType()); + data.setTagsId(item.getEmployeesTagsId()); + data.setSysOrgCode(orgCode); + + data.setCreateTime(Date.from(now.plusSeconds(secondsOffset).atZone(ZoneId.systemDefault()).toInstant())); + secondsOffset++; + saveData.add(data); + } + + nuBizEmployeesServcieTagsService.saveBatch(saveData); + return Result.OK("保存成功！"); + } + + /** + * 编辑 + * + * @param nuBizEmployeesServcieTags + * @return + */ + @AutoLog(value = "员工配置的服务标签-编辑") + @ApiOperation(value = "员工配置的服务标签-编辑", notes = "员工配置的服务标签-编辑") + @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody NuBizEmployeesServcieTags nuBizEmployeesServcieTags) { + nuBizEmployeesServcieTagsService.updateById(nuBizEmployeesServcieTags); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "员工配置的服务标签-通过id删除") + @ApiOperation(value = "员工配置的服务标签-通过id删除", notes = "员工配置的服务标签-通过id删除") +// @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + nuBizEmployeesServcieTagsService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "员工配置的服务标签-批量删除") + @ApiOperation(value = "员工配置的服务标签-批量删除", notes = "员工配置的服务标签-批量删除") + @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.nuBizEmployeesServcieTagsService.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) { + NuBizEmployeesServcieTags nuBizEmployeesServcieTags = nuBizEmployeesServcieTagsService.getById(id); + if (nuBizEmployeesServcieTags == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(nuBizEmployeesServcieTags); + } + + /** + * 导出excel + * + * @param request + * @param nuBizEmployeesServcieTags + */ @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, NuBizEmployeesServcieTags nuBizEmployeesServcieTags) { @@ -148,12 +195,12 @@ public class NuBizEmployeesServcieTagsController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java index ae5639cf..fe9934f8 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java @@ -249,4 +249,7 @@ public class BizEmployeesInfo implements Serializable { @TableField(exist = false) private String userId; + @TableField(exist = false) + private String ygzt; + } diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/NuBizEmployeesServcieTags.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/NuBizEmployeesServcieTags.java index 40b50242..6c52b26c 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/NuBizEmployeesServcieTags.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/NuBizEmployeesServcieTags.java @@ -3,10 +3,12 @@ package com.nu.modules.employeesInfo.entity; import java.io.Serializable; 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 lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecg.common.aspect.annotation.Dict; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; @@ -21,7 +23,7 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("nu_biz_employees_servcie_tags") +@TableName("nu_biz_employees_service_tags") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_biz_employees_servcie_tags对象", description="员工配置的服务标签") @@ -36,6 +38,11 @@ public class NuBizEmployeesServcieTags implements Serializable { @Excel(name = "员工id", width = 15) @ApiModelProperty(value = "员工id") private java.lang.String employeesId; + /**类型 bq：标签 zl:指令*/ + @Excel(name = "类型", width = 15) + @ApiModelProperty(value = "类型") + @Dict(dicCode = "emp_service_tag_type") + private java.lang.String type; /**标签id*/ @Excel(name = "标签id", width = 15) @ApiModelProperty(value = "标签id") @@ -59,4 +66,7 @@ public class NuBizEmployeesServcieTags implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; + + @TableField(exist = false) + private String employeesTagsId; } diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/NuBizEmployeesServcieTagsMapper.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/NuBizEmployeesServcieTagsMapper.java index 7ed0bcb4..bc896c3a 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/NuBizEmployeesServcieTagsMapper.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/NuBizEmployeesServcieTagsMapper.java @@ -2,6 +2,7 @@ package com.nu.modules.employeesInfo.mapper; import com.nu.modules.employeesInfo.entity.NuBizEmployeesServcieTags; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * @Description: 员工配置的服务标签 @@ -11,4 +12,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface NuBizEmployeesServcieTagsMapper extends BaseMapper { + int physicsDeleteByEmpId(@Param("empId") String employeesId); } diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/BizEmployeesInfoMapper.xml b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/BizEmployeesInfoMapper.xml index dfd7ec3f..d71ef635 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/BizEmployeesInfoMapper.xml +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/BizEmployeesInfoMapper.xml @@ -159,6 +159,19 @@ AND ei.sys_org_code LIKE CONCAT(#{params.sysOrgCode}, '%') + + + + AND (ei.iz_freeze = 'N' and ei.iz_online = 'Y') + + + AND (ei.iz_freeze = 'N' and ei.iz_online = 'N') + + + AND ei.iz_freeze = 'Y' + + + ORDER BY ei.create_time DESC diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/NuBizEmployeesServcieTagsMapper.xml b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/NuBizEmployeesServcieTagsMapper.xml index fec8e2ee..fcb0f88c 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/NuBizEmployeesServcieTagsMapper.xml +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/NuBizEmployeesServcieTagsMapper.xml @@ -2,4 +2,7 @@ + + delete from nu_biz_employees_service_tags where employees_id = #{empId} + diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/INuBizEmployeesServcieTagsService.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/INuBizEmployeesServcieTagsService.java index 7fbcb977..b59cbf52 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/INuBizEmployeesServcieTagsService.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/INuBizEmployeesServcieTagsService.java @@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface INuBizEmployeesServcieTagsService extends IService { + int physicsDeleteByEmpId(String employeesId); } diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/BizEmployeesInfoServiceImpl.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/BizEmployeesInfoServiceImpl.java index f8f37829..a1015fe6 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/BizEmployeesInfoServiceImpl.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/BizEmployeesInfoServiceImpl.java @@ -117,6 +117,7 @@ public class BizEmployeesInfoServiceImpl extends ServiceImpl implements INuBizEmployeesServcieTagsService { + @Override + public int physicsDeleteByEmpId(String employeesId) { + return baseMapper.physicsDeleteByEmpId(employeesId); + } } diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/salary/entity/EmployeesSalaryInfo.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/salary/entity/EmployeesSalaryInfo.java index 0cf903a0..55327985 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/salary/entity/EmployeesSalaryInfo.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/salary/entity/EmployeesSalaryInfo.java @@ -135,9 +135,9 @@ public class EmployeesSalaryInfo implements Serializable { @Excel(name = "服务说明", width = 15) @ApiModelProperty(value = "服务说明") private java.lang.String serviceContent; - /**收费价格*/ - @Excel(name = "收费价格", width = 15) - @ApiModelProperty(value = "收费价格") + /**基础价格*/ + @Excel(name = "基础价格", width = 15) + @ApiModelProperty(value = "基础价格") private java.math.BigDecimal tollPrice; /**提成价格*/ @Excel(name = "提成价格", width = 15) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/DirectiveAppraisal.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/DirectiveAppraisal.java index 320801d9..9e8ebd94 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/DirectiveAppraisal.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/entity/DirectiveAppraisal.java @@ -129,9 +129,9 @@ public class DirectiveAppraisal implements Serializable { @Excel(name = "服务说明", width = 15) @ApiModelProperty(value = "服务说明") private java.lang.String serviceContent; - /**收费价格*/ - @Excel(name = "收费价格", width = 15) - @ApiModelProperty(value = "收费价格") + /**基础价格*/ + @Excel(name = "基础价格", width = 15) + @ApiModelProperty(value = "基础价格") private java.math.BigDecimal tollPrice; /**提成价格*/ @Excel(name = "提成价格", width = 15) 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 index dcce13ec..9f12380d 100644 --- 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 @@ -115,7 +115,7 @@ public class DirectiveAppraisalServiceImpl extends ServiceImpl select a.id as employeeId,count(*) as ownCn from nu_biz_employees_info a - inner join nu_biz_employees_servcie_tags b on a.id = b.employees_id - inner join nu_service_tag c on c.id = b.tags_id - inner join nu_servtag_directive d on d.tag_id = c.id + inner join nu_biz_employees_service_tags b on a.id = b.employees_id + inner join nu_service_tag_main c on c.id = b.tags_id + inner join nu_service_tag_info d on d.tag_id = c.id where d.directive_id in diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/entity/CanAddDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/entity/CanAddDirective.java index f9f9b149..566917a1 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/entity/CanAddDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/entity/CanAddDirective.java @@ -77,10 +77,10 @@ public class CanAddDirective implements Serializable { @ApiModelProperty(value = "指令类型") private java.lang.String cycleType; /** - * 收费价格 + * 基础价格 */ - @Excel(name = "收费价格(元)", width = 20) - @ApiModelProperty(value = "收费价格") + @Excel(name = "基础价格(元)", width = 20) + @ApiModelProperty(value = "基础价格") private java.math.BigDecimal tollPrice; /** * 提成价格 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivesynclog/entity/DirectiveSyncLogInfo.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivesynclog/entity/DirectiveSyncLogInfo.java index fac4c3e5..679e46f8 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivesynclog/entity/DirectiveSyncLogInfo.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivesynclog/entity/DirectiveSyncLogInfo.java @@ -95,10 +95,10 @@ public class DirectiveSyncLogInfo implements Serializable { @ApiModelProperty(value = "服务指令名称") private java.lang.String directiveName; /** - * 收费价格 + * 基础价格 */ - @Excel(name = "收费价格", width = 15) - @ApiModelProperty(value = "收费价格") + @Excel(name = "基础价格", width = 15) + @ApiModelProperty(value = "基础价格") private java.math.BigDecimal tollPrice; /** * 提成价格 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java index 188c648f..069ccf9d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java @@ -318,7 +318,7 @@ public class ConfigServiceDirectiveController extends JeecgController> queryPageList(ServiceTag serviceTag, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + public Result> queryPageList(ServiceTag serviceTag, @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("tagName", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(serviceTag, req.getParameterMap(),customeRuleMap); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(serviceTag, req.getParameterMap(), customeRuleMap); Page page = new Page(pageNo, pageSize); queryWrapper.select("id"); queryWrapper.orderByDesc("create_time"); @@ -88,6 +85,7 @@ public class ServiceTagController extends JeecgController cancellation(@RequestBody ServiceTag serviceTag) { + serviceTagService.updateById(serviceTag); + //移除员工已分配员工标签 + serviceTagService.removeTag(serviceTag.getId()); + return Result.OK("操作成功!"); + } + /** * 通过id删除 * @@ -179,8 +192,6 @@ public class ServiceTagController extends JeecgController> getEmployeesList(ServiceTag serviceTag, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - if(StringUtils.isEmpty(serviceTag.getEmployeesId())){ + public Result> getEmployeesList(ServiceTag serviceTag, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + if (StringUtils.isEmpty(serviceTag.getEmployeesId())) { return Result.error("员工id不能为空"); } Page page = new Page(pageNo, pageSize); @@ -206,7 +214,7 @@ public class ServiceTagController extends JeecgController> getEmployeesServiceTags(ServiceTag serviceTag) { - if(StringUtils.isEmpty(serviceTag.getEmployeesId())){ + if (StringUtils.isEmpty(serviceTag.getEmployeesId())) { return Result.error("员工id不能为空"); } List pageList = serviceTagService.getEmployeesServiceTags(serviceTag); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/entity/ServiceTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/entity/ServiceTag.java index f98d61af..a8d216d4 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/entity/ServiceTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/entity/ServiceTag.java @@ -22,7 +22,7 @@ import java.util.List; * @Version: V1.0 */ @Data -@TableName("nu_service_tag") +@TableName("nu_service_tag_main") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_service_tag对象", description="服务标签") @@ -75,7 +75,9 @@ public class ServiceTag implements Serializable { @TableField(exist = false) private List directives; - + @TableField(exist = false) + @Dict(dicCode = "emp_service_tag_type") + private String type; @TableField(exist = false) private String employeesTagsId; @TableField(exist = false) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/ServiceTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/ServiceTagMapper.java index 7baca40c..2e26ffa7 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/ServiceTagMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/ServiceTagMapper.java @@ -27,4 +27,6 @@ public interface ServiceTagMapper extends BaseMapper { IPage getEmployeesList(Page page, ServiceTag serviceTag); List getEmployeesServiceTags(ServiceTag serviceTag); + + int removeTag(@Param("tagId") String tagId); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml index 13e2e28b..8aad3350 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml @@ -59,7 +59,8 @@ - + @@ -137,7 +138,7 @@ csc.category_name AS csc_category_name, cst.type_name AS cst_type_name FROM - (SELECT * FROM nu_service_tag + (SELECT * FROM nu_service_tag_main del_flag = '0' and id in @@ -145,7 +146,7 @@ ) dp - LEFT JOIN nu_servtag_directive sd ON dp.id = sd.tag_id + LEFT JOIN nu_service_tag_info sd ON dp.id = sd.tag_id LEFT JOIN nu_config_service_directive csd ON sd.directive_id = csd.id LEFT JOIN nu_directive_body_tag dbt ON csd.id = dbt.directive_id LEFT JOIN nu_config_body_tag cdbt ON dbt.tag_id = cdbt.id @@ -160,7 +161,7 @@ - select a.id, b.tag_name, b.description, a.create_time, b.id as employeesTagsId - from nu_biz_employees_servcie_tags a - LEFT JOIN nu_service_tag b on a.tags_id = b.id + select a.id, + a.type, + a.create_time, + case a.type when 'bq' then b.tag_name when 'zl' then zl.directive_name else null end AS tag_name, + case a.type when 'bq' then b.description when 'zl' then zl.service_content else null end AS description, + case a.type when 'bq' then b.id when 'zl' then zl.id else null end AS employeesTagsId + from nu_biz_employees_service_tags a + LEFT JOIN nu_service_tag_main b on a.tags_id = b.id + LEFT JOIN nu_config_service_directive zl on a.tags_id = zl.id where a.employees_id = #{employeesId} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/IServiceTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/IServiceTagService.java index df649a37..031f615a 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/IServiceTagService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/IServiceTagService.java @@ -28,4 +28,6 @@ public interface IServiceTagService extends IService { IPage getEmployeesList(Page page, ServiceTag queryWrapper); List getEmployeesServiceTags(ServiceTag serviceTag); + + void removeTag(String id); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/impl/ServiceTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/impl/ServiceTagServiceImpl.java index 19c87f76..be471fde 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/impl/ServiceTagServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/impl/ServiceTagServiceImpl.java @@ -72,4 +72,13 @@ public class ServiceTagServiceImpl extends ServiceImpl