1、员工管理-员工信息-服务指令：实现切换至服务指令选列表时的筛选功能（可根据分类标签、服务类别、服务类型、服务指令名称查询，以及前三级的联动处理）

2、调整员工管理-员工信息-重置密码的提示语
3、去掉机构加盟后，机构负责人登录后的“尚未归属部门”提示
4、员工管理-员工标签去掉是否启用，增加作废：作废后移除员工已分配的员工标签
5、服务指令和长者标签的收费价格改为基础价格

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;
     /**

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;
     /**

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;
     /**

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;//目标平台是否存在该指令

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;

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;

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;

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<NuBizEmployeesServcieTags, INuBizEmployeesServcieTagsService> {
-	@Autowired
+    @Autowired
-	private INuBizEmployeesServcieTagsService nuBizEmployeesServcieTagsService;
+    private INuBizEmployeesServcieTagsService nuBizEmployeesServcieTagsService;
-
+    @Autowired
-	/**
+    private ISysBaseAPI sysBaseAPI;
-	 * 分页列表查询
-	 *
-	 * @param nuBizEmployeesServcieTags
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "员工配置的服务标签-分页列表查询")
-	@ApiOperation(value="员工配置的服务标签-分页列表查询", notes="员工配置的服务标签-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<NuBizEmployeesServcieTags>> queryPageList(NuBizEmployeesServcieTags nuBizEmployeesServcieTags,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-        QueryWrapper<NuBizEmployeesServcieTags> queryWrapper = QueryGenerator.initQueryWrapper(nuBizEmployeesServcieTags, req.getParameterMap());
-		Page<NuBizEmployeesServcieTags> page = new Page<NuBizEmployeesServcieTags>(pageNo, pageSize);
-		IPage<NuBizEmployeesServcieTags> 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<String> 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<String> 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<String> 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<String> 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<NuBizEmployeesServcieTags> 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
-    * @param nuBizEmployeesServcieTags
+     * @param pageNo
-    */
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "员工配置的服务标签-分页列表查询")
+    @ApiOperation(value = "员工配置的服务标签-分页列表查询", notes = "员工配置的服务标签-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<NuBizEmployeesServcieTags>> queryPageList(NuBizEmployeesServcieTags nuBizEmployeesServcieTags,
+                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                  HttpServletRequest req) {
+        QueryWrapper<NuBizEmployeesServcieTags> queryWrapper = QueryGenerator.initQueryWrapper(nuBizEmployeesServcieTags, req.getParameterMap());
+        Page<NuBizEmployeesServcieTags> page = new Page<NuBizEmployeesServcieTags>(pageNo, pageSize);
+        IPage<NuBizEmployeesServcieTags> 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<String> add(@RequestBody NuBizEmployeesServcieTags nuBizEmployeesServcieTags) {
+        nuBizEmployeesServcieTagsService.save(nuBizEmployeesServcieTags);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 保存
+     *
+     * @param saveDataList
+     * @return
+     */
+    @AutoLog(value = "服务标签-保存")
+    @ApiOperation(value = "服务标签-保存", notes = "服务标签-保存")
+    @PostMapping(value = "/addBatch")
+    public Result<String> addBatch(@RequestBody List<NuBizEmployeesServcieTags> saveDataList) {
+        String empId = saveDataList.get(0).getEmployeesId();
+        JSONObject deptInfo = sysBaseAPI.getDeptInfo();
+        String orgCode = deptInfo.getString("code");
+        //先删再存
+        nuBizEmployeesServcieTagsService.physicsDeleteByEmpId(empId);
+
+        List<NuBizEmployeesServcieTags> 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<String> 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<String> 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<String> 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<NuBizEmployeesServcieTags> 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<NuBizEm
     }
 
     /**
-      * 通过excel导入数据
+     * 通过excel导入数据
-    *
+     *
-    * @param request
+     * @param request
-    * @param response
+     * @param response
-    * @return
+     * @return
-    */
+     */
     @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

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;
+
 }

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;
 }

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<NuBizEmployeesServcieTags> {
 
+    int physicsDeleteByEmpId(@Param("empId") String employeesId);
 }

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/BizEmployeesInfoMapper.xml

@@ -159,6 +159,19 @@
             <if test="params.sysOrgCode != null and params.sysOrgCode != ''">
                 AND ei.sys_org_code LIKE CONCAT(#{params.sysOrgCode}, '%')
             </if>
+            <if test="params.ygzt != null and params.ygzt != ''">
+                <choose>
+                    <when test="params.ygzt == 'zx'">
+                        AND (ei.iz_freeze = 'N' and ei.iz_online = 'Y')
+                    </when>
+                    <when test="params.ygzt == 'lx'">
+                        AND (ei.iz_freeze = 'N' and ei.iz_online = 'N')
+                    </when>
+                    <when test="params.ygzt == 'dj'">
+                        AND ei.iz_freeze = 'Y'
+                    </when>
+                </choose>
+            </if>
         </where>
         ORDER BY ei.create_time DESC
     </select>

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/NuBizEmployeesServcieTagsMapper.xml

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nu.modules.employeesInfo.mapper.NuBizEmployeesServcieTagsMapper">
 
+    <delete id="physicsDeleteByEmpId">
+        delete from nu_biz_employees_service_tags where employees_id = #{empId}
+    </delete>
 </mapper>

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<NuBizEmployeesServcieTags> {
 
+    int physicsDeleteByEmpId(String employeesId);
 }

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<BizEmployeesInfoMap
             params.put("izOnline", bizEmployeesInfo.getIzOnline());
             params.put("izFreeze", bizEmployeesInfo.getIzFreeze());
             params.put("sysOrgCode", bizEmployeesInfo.getSysOrgCode());
+            params.put("ygzt", bizEmployeesInfo.getYgzt());
         }
 
         // 从request中获取其他参数

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/NuBizEmployeesServcieTagsServiceImpl.java

@@ -10,10 +10,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 员工配置的服务标签
  * @Author: jeecg-boot
- * @Date:   2025-04-01
+ * @Date: 2025-04-01
  * @Version: V1.0
  */
 @Service
 public class NuBizEmployeesServcieTagsServiceImpl extends ServiceImpl<NuBizEmployeesServcieTagsMapper, NuBizEmployeesServcieTags> implements INuBizEmployeesServcieTagsService {
 
+    @Override
+    public int physicsDeleteByEmpId(String employeesId) {
+        return baseMapper.physicsDeleteByEmpId(employeesId);
+    }
 }

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)
+    @Excel(name = "基础价格", width = 15)
-    @ApiModelProperty(value = "收费价格")
+    @ApiModelProperty(value = "基础价格")
     private java.math.BigDecimal tollPrice;
     /**提成价格*/
     @Excel(name = "提成价格", width = 15)

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)
+	@Excel(name = "基础价格", width = 15)
-    @ApiModelProperty(value = "收费价格")
+    @ApiModelProperty(value = "基础价格")
     private java.math.BigDecimal tollPrice;
 	/**提成价格*/
 	@Excel(name = "提成价格", width = 15)

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<DirectiveAppraisa
             empSalary.setServiceDuration(directiveAppraisal.getServiceDuration());
             //服务说明
             empSalary.setServiceContent(directiveAppraisal.getServiceContent());
-            //收费价格
+            //基础价格
             empSalary.setTollPrice(directiveAppraisal.getTollPrice());
             //提成价格
             empSalary.setComPrice(directiveAppraisal.getComPrice());

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java

@@ -56,9 +56,9 @@ public class BizConfigServiceDirective implements Serializable {
 	@Excel(name = "指令标签id", width = 15)
     @ApiModelProperty(value = "指令标签id")
     private String instructionTagId;
-	/**收费价格*/
+	/**基础价格*/
-	@Excel(name = "收费价格", width = 15)
+	@Excel(name = "基础价格", width = 15)
-    @ApiModelProperty(value = "收费价格")
+    @ApiModelProperty(value = "基础价格")
     private BigDecimal tollPrice;
 	/**提成价格*/
 	@Excel(name = "提成价格", width = 15)

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml

@@ -179,7 +179,7 @@
             service_duration varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务时长（分钟）',
             service_content varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务说明',
             iz_package varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否是服务指令包 Y是 N否',
-            toll_price decimal(12,4) NULL DEFAULT NULL COMMENT '收费价格',
+            toll_price decimal(12,4) NULL DEFAULT NULL COMMENT '基础价格',
             com_price decimal(12,4) NULL DEFAULT NULL COMMENT '提成价格',
             real_com_price decimal(12,4) NULL DEFAULT NULL COMMENT '实际提成价格',
             start_time datetime(0) NULL DEFAULT NULL COMMENT '开始时间',

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java

@@ -85,7 +85,7 @@ public class DirectiveOrder implements Serializable {
     private String serviceContent;
     /**超时时长（分钟）*/
     private String timeoutDuration;
-    /**收费价格*/
+    /**基础价格*/
     private BigDecimal tollPrice;
     /**提成价格*/
     private BigDecimal comPrice;

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderInfo.java

@@ -130,9 +130,9 @@ public class DirectiveOrderInfo implements Serializable {
     @Excel(name = "服务说明", width = 15)
     @ApiModelProperty(value = "服务说明")
     private java.lang.String serviceContent;
-    /**收费价格*/
+    /**基础价格*/
-    @Excel(name = "收费价格", width = 15)
+    @Excel(name = "基础价格", width = 15)
-    @ApiModelProperty(value = "收费价格")
+    @ApiModelProperty(value = "基础价格")
     private java.math.BigDecimal tollPrice;
     /**提成价格*/
     @Excel(name = "提成价格", width = 15)

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml

@@ -186,9 +186,9 @@
             (case when ifnull(f.orderNum,0) = 0 then 1 else 0 end) as izFree,
             0 as level
         from nu_biz_employees_info a
-        inner join nu_biz_employees_servcie_tags b on a.id = b.employees_id
+        inner join nu_biz_employees_service_tags b on a.id = b.employees_id
-        inner join nu_service_tag c on c.id = b.tags_id
+        inner join nu_service_tag_main c on c.id = b.tags_id
-        inner join nu_servtag_directive d on d.tag_id = c.id
+        inner join nu_service_tag_info d on d.tag_id = c.id
         left join (
             select employee_id,count(*) as orderNum,
                    sum(service_duration) as totalDuration,
@@ -237,9 +237,9 @@
     <select id="getPermissionEmps" resultType="com.nu.modules.biz.order.entity.DirectiveOrder">
         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_biz_employees_service_tags b on a.id = b.employees_id
-        inner join nu_service_tag c on c.id = b.tags_id
+        inner join nu_service_tag_main c on c.id = b.tags_id
-        inner join nu_servtag_directive d on d.tag_id = c.id
+        inner join nu_service_tag_info d on d.tag_id = c.id
         where d.directive_id in
         <foreach item="directiveId" index="index" collection="directiveIds.split(',')"
                  open="(" separator="," close=")">

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)
+    @Excel(name = "基础价格(元)", width = 20)
-    @ApiModelProperty(value = "收费价格")
+    @ApiModelProperty(value = "基础价格")
     private java.math.BigDecimal tollPrice;
     /**
      * 提成价格

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)
+    @Excel(name = "基础价格", width = 15)
-    @ApiModelProperty(value = "收费价格")
+    @ApiModelProperty(value = "基础价格")
     private java.math.BigDecimal tollPrice;
     /**
      * 提成价格

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<ConfigServ
             info.setDirectiveId(configServiceDirective.getId());//服务指令ID
             info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
             info.setServiceAttribute(configServiceDirective.getServiceAttribute());//服务属性
-            info.setTollPrice(configServiceDirective.getTollPrice());//收费价格
+            info.setTollPrice(configServiceDirective.getTollPrice());//基础价格
             info.setComPrice(configServiceDirective.getComPrice());//提成价格
             info.setServiceContent(configServiceDirective.getServiceContent());//服务说明
             info.setServiceDuration(configServiceDirective.getServiceDuration());//服务时长
@@ -450,7 +450,7 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
                 info.setDirectiveId(his.getId());//服务指令ID
                 info.setDirectiveName(his.getDirectiveName());//服务指令名称
                 info.setServiceAttribute(his.getServiceAttribute());//服务属性
-                info.setTollPrice(his.getTollPrice());//收费价格
+                info.setTollPrice(his.getTollPrice());//基础价格
                 info.setComPrice(his.getComPrice());//提成价格
                 info.setServiceContent(his.getServiceContent());//服务说明
                 info.setServiceDuration(his.getServiceDuration());//服务时长
@@ -479,7 +479,7 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
                 info.setDirectiveId(configServiceDirective.getId());//服务指令ID
                 info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
                 info.setServiceAttribute(configServiceDirective.getServiceAttribute());//服务属性
-                info.setTollPrice(configServiceDirective.getTollPrice());//收费价格
+                info.setTollPrice(configServiceDirective.getTollPrice());//基础价格
                 info.setComPrice(configServiceDirective.getComPrice());//提成价格
                 info.setServiceContent(configServiceDirective.getServiceContent());//服务说明
                 info.setServiceDuration(configServiceDirective.getServiceDuration());//服务时长

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java

@@ -64,10 +64,10 @@ public class ConfigServiceDirective implements Serializable {
     @ApiModelProperty(value = "服务指令名称")
     private java.lang.String directiveName;
     /**
-     * 收费价格
+     * 基础价格
      */
-    @Excel(name = "收费价格", width = 15)
+    @Excel(name = "基础价格", width = 15)
-    @ApiModelProperty(value = "收费价格")
+    @ApiModelProperty(value = "基础价格")
     private java.math.BigDecimal tollPrice;
     /**
      * 提成价格
@@ -320,7 +320,7 @@ public class ConfigServiceDirective implements Serializable {
     @TableField(exist = false)
     private String directiveId;
     @TableField(exist = false)
-    private boolean izAbnormal;//查询服务时长、收费价格、提成价格 都等于 0的数据
+    private boolean izAbnormal;//查询服务时长、基础价格、提成价格 都等于 0的数据
     @TableField(exist = false)
     private String compareOrgCode;//对比的机构编码
     @TableField(exist = false)

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java

@@ -619,7 +619,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
                 info.setTypeName(typeMap.get(item.getTypeId()));//服务类型名称
                 info.setDirectiveId(item.getId());//服务指令ID
                 info.setDirectiveName(item.getDirectiveName());//服务指令名称
-                info.setTollPrice(item.getTollPrice());//收费价格
+                info.setTollPrice(item.getTollPrice());//基础价格
                 info.setComPrice(item.getComPrice());//提成价格
                 info.setCycleType(item.getCycleType());//指令类型
                 info.setServiceContent(item.getServiceContent());//服务说明

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/controller/ServiceTagController.java

@@ -52,14 +52,11 @@ public class ServiceTagController extends JeecgController<ServiceTag, IServiceTa
     //@AutoLog(value = "服务标签-分页列表查询")
     @ApiOperation(value = "服务标签-分页列表查询", notes = "服务标签-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<ServiceTag>> queryPageList(ServiceTag serviceTag,
+    public Result<IPage<ServiceTag>> queryPageList(ServiceTag serviceTag, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                         HttpServletRequest req) {
         Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
         // 自定义多选的查询规则为：LIKE_WITH_OR
         customeRuleMap.put("tagName", QueryRuleEnum.LIKE_WITH_OR);
-        QueryWrapper<ServiceTag> queryWrapper = QueryGenerator.initQueryWrapper(serviceTag, req.getParameterMap(),customeRuleMap);
+        QueryWrapper<ServiceTag> queryWrapper = QueryGenerator.initQueryWrapper(serviceTag, req.getParameterMap(), customeRuleMap);
         Page<ServiceTag> page = new Page<ServiceTag>(pageNo, pageSize);
         queryWrapper.select("id");
         queryWrapper.orderByDesc("create_time");
@@ -88,6 +85,7 @@ public class ServiceTagController extends JeecgController<ServiceTag, IServiceTa
         return Result.OK("添加成功！");
     }
 
+
     /**
      * 编辑
      *
@@ -106,6 +104,21 @@ public class ServiceTagController extends JeecgController<ServiceTag, IServiceTa
         return Result.OK("编辑成功!");
     }
 
+    /**
+     * 作废
+     * @param serviceTag
+     * @return
+     */
+    @AutoLog(value = "服务标签-作废")
+    @ApiOperation(value = "服务标签-作废", notes = "服务标签-作废")
+    @RequestMapping(value = "/cancellation", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> cancellation(@RequestBody ServiceTag serviceTag) {
+        serviceTagService.updateById(serviceTag);
+        //移除员工已分配员工标签
+        serviceTagService.removeTag(serviceTag.getId());
+        return Result.OK("操作成功!");
+    }
+
     /**
      * 通过id删除
      *
@@ -179,8 +192,6 @@ public class ServiceTagController extends JeecgController<ServiceTag, IServiceTa
     }
 
 
-
-
     /**
      * 获取服务标签列表根据员工id
      *
@@ -191,11 +202,8 @@ public class ServiceTagController extends JeecgController<ServiceTag, IServiceTa
      * @return
      */
     @GetMapping(value = "/getEmployeesList")
-    public Result<IPage<ServiceTag>> getEmployeesList(ServiceTag serviceTag,
+    public Result<IPage<ServiceTag>> getEmployeesList(ServiceTag serviceTag, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+        if (StringUtils.isEmpty(serviceTag.getEmployeesId())) {
-                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                   HttpServletRequest req) {
-        if(StringUtils.isEmpty(serviceTag.getEmployeesId())){
             return Result.error("员工id不能为空");
         }
         Page<ServiceTag> page = new Page<ServiceTag>(pageNo, pageSize);
@@ -206,7 +214,7 @@ public class ServiceTagController extends JeecgController<ServiceTag, IServiceTa
 
     @GetMapping(value = "/getEmployeesServiceTags")
     public Result<List<ServiceTag>> getEmployeesServiceTags(ServiceTag serviceTag) {
-        if(StringUtils.isEmpty(serviceTag.getEmployeesId())){
+        if (StringUtils.isEmpty(serviceTag.getEmployeesId())) {
             return Result.error("员工id不能为空");
         }
         List<ServiceTag> pageList = serviceTagService.getEmployeesServiceTags(serviceTag);

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<ConfigServiceDirective> directives;
-
+    @TableField(exist = false)
+    @Dict(dicCode = "emp_service_tag_type")
+    private String type;
     @TableField(exist = false)
     private String employeesTagsId;
     @TableField(exist = false)

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<ServiceTag> {
     IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, ServiceTag serviceTag);
 
     List<ServiceTag> getEmployeesServiceTags(ServiceTag serviceTag);
+
+    int removeTag(@Param("tagId") String tagId);
 }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml

@@ -59,7 +59,8 @@
                 <result property="sysOrgCode" column="bodytag_sys_org_code"/>
             </collection>
             <!-- 关联的情绪标签列表 -->
-            <collection property="emotionTagList" ofType="com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag">
+            <collection property="emotionTagList"
+                        ofType="com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag">
                 <id property="id" column="emotag_id"/>
                 <result property="tagName" column="emotag_name"/>
                 <result property="sort" column="emotag_sort"/>
@@ -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
         <where>
             del_flag = '0' and id in
             <foreach collection="ids" item="item" open="(" separator="," close=")">
@@ -145,7 +146,7 @@
             </foreach>
         </where>
         ) 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 id="queryTotal" resultType="java.lang.Long">
         SELECT COUNT(*)
-        FROM nu_service_tag
+        FROM nu_service_tag_main
         <where>
             del_flag = '0'
             <if test="serviceTag.tagName != null and serviceTag.tagName != ''">
@@ -174,12 +175,16 @@
 
     <delete id="deleteDirectives">
         delete
-        from nu_servtag_directive
+        from nu_service_tag_info
         where tag_id = #{tag.id}
     </delete>
 
+    <delete id="removeTag">
+        delete from nu_biz_employees_service_tags where tags_id = #{tagId} and type = 'bq'
+    </delete>
+
     <insert id="saveDirectives">
-        INSERT INTO nu_servtag_directive (tag_id, directive_id, sort)
+        INSERT INTO nu_service_tag_info (tag_id, directive_id, sort)
         VALUES
         <foreach collection="tag.getDirectives()" item="directive" separator=",">
             (#{tag.id}, #{directive.id}, #{directive.sort})
@@ -196,8 +201,8 @@
                nst.del_flag,
                nst.create_time,
                est.employees_id
-        from nu_service_tag nst
+        from nu_service_tag_main nst
-                 LEFT JOIN nu_biz_employees_servcie_tags est
+                 LEFT JOIN nu_biz_employees_service_tags est
                            on nst.id = est.tags_id and est.employees_id = #{serviceTag.employeesId}
         where nst.del_flag = '0'
           and nst.iz_enabled = 'Y'
@@ -206,9 +211,15 @@
 
 
     <select id="getEmployeesServiceTags" resultType="com.nu.modules.config.servicetag.entity.ServiceTag">
-        select a.id, b.tag_name, b.description, a.create_time, b.id as employeesTagsId
+        select a.id,
-        from nu_biz_employees_servcie_tags a
+               a.type,
-                 LEFT JOIN nu_service_tag b on a.tags_id = b.id
+               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}
     </select>
 

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<ServiceTag> {
     IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, ServiceTag queryWrapper);
 
     List<ServiceTag> getEmployeesServiceTags(ServiceTag serviceTag);
+
+    void removeTag(String id);
 }

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<ServiceTagMapper, Service
         return baseMapper.getEmployeesServiceTags(serviceTag);
     }
 
+    /**
+     * 移除所有员工已分配的此员工标签
+     * @param tagId
+     */
+    @Override
+    public void removeTag(String tagId) {
+        baseMapper.removeTag(tagId);
+    }
+
 }