Merge branch 'master' of http://git.cc-lotus.info/sckj/yl-service

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/impl/YljgKhHtxxServiceImpl.java

@@ -152,25 +152,6 @@ public class YljgKhHtxxServiceImpl implements IYljgKhHtxxService
         if (ObjectUtils.isEmpty(yljgKhHtxx.getHtjsrq())) {
             yljgKhHtxx.setHtjsrq(oldYljgKhHtxx.getHtjsrq());
         }
-//        if (!StringUtils.equals(oldYljgKhHtxx.getCwId(), yljgKhHtxx.getCwId())) {
-//            YljgFwcdCw oldCw = yljgFwcdCwMapper.selectYljgFwcdCwById(oldYljgKhHtxx.getCwId());
-//            oldCw.setIsRz(WhetherStatus.NO.getCode());
-//            oldCw.setIsYs(WhetherStatus.NO.getCode());
-//            yljgFwcdCwMapper.updateYljgFwcdCw(oldCw);
-//            YljgFwcdCw newCw = yljgFwcdCwMapper.selectYljgFwcdCwById(yljgKhHtxx.getCwId());
-//            newCw.setIsYs(WhetherStatus.YES.getCode());
-//            YljgKhJbxx jbxx = yljgKhJbxxMapper.selectYljgKhJbxxById(yljgKhHtxx.getKhId());
-//            if (StringUtils.equals(jbxx.getIsRz(), WhetherStatus.YES.getCode())) {
-//                newCw.setIsRz(WhetherStatus.YES.getCode());
-//            }
-//            yljgFwcdCwMapper.updateYljgFwcdCw(newCw);
-//        }
-//        // 20220401 暂存 start
-//        yljgKhHtxx.setLy(yljgFwcdLyMapper.selectYljgFwcdLyById(yljgKhHtxx.getLyId()).getLymc());
-//        yljgKhHtxx.setLc(yljgFwcdLcMapper.selectYljgFwcdLcById(yljgKhHtxx.getLcId()).getLcmc());
-//        yljgKhHtxx.setFjh(yljgFwcdFjMapper.selectYljgFwcdFjById(yljgKhHtxx.getFjId()).getFjmc());
-//        yljgKhHtxx.setCwh(yljgFwcdCwMapper.selectYljgFwcdCwById(yljgKhHtxx.getCwId()).getCwh());
-        // 20220401 暂存 end
         return yljgKhHtxxMapper.updateYljgKhHtxx(yljgKhHtxx);
     }
 

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/controller/YlyYgglBcszController.java

@@ -0,0 +1,106 @@
+package com.ruoyi.organization.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.validate.group.AddGroup;
+import com.ruoyi.organization.domain.YlyYgglBcsz;
+import com.ruoyi.organization.service.IYlyYgglBcszService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 养老院-员工管理-班次设置Controller
+ * 
+ * @author sun
+ * @date 2024-10-31
+ */
+@RestController
+@RequestMapping("/bcsz")
+public class YlyYgglBcszController extends BaseController
+{
+    @Autowired
+    private IYlyYgglBcszService ylyYgglBcszService;
+
+    /**
+     * 查询养老院-员工管理-班次设置列表
+     */
+    @RequiresPermissions("organization:bcsz:list")
+    @GetMapping("/list")
+    public TableDataInfo list(YlyYgglBcsz ylyYgglBcsz)
+    {
+        startPage();
+        List<YlyYgglBcsz> list = ylyYgglBcszService.selectYlyYgglBcszList(ylyYgglBcsz);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出养老院-员工管理-班次设置列表
+     */
+    @RequiresPermissions("organization:bcsz:export")
+    @Log(title = "养老院-员工管理-班次设置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, YlyYgglBcsz ylyYgglBcsz)
+    {
+        List<YlyYgglBcsz> list = ylyYgglBcszService.selectYlyYgglBcszList(ylyYgglBcsz);
+        ExcelUtil<YlyYgglBcsz> util = new ExcelUtil<YlyYgglBcsz>(YlyYgglBcsz.class);
+        util.exportExcel(response, list, "养老院-员工管理-班次设置数据");
+    }
+
+    /**
+     * 获取养老院-员工管理-班次设置详细信息
+     */
+    @RequiresPermissions("organization:bcsz:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(ylyYgglBcszService.selectYlyYgglBcszById(id));
+    }
+
+    /**
+     * 新增养老院-员工管理-班次设置
+     */
+    @RequiresPermissions("organization:bcsz:add")
+    @Log(title = "养老院-员工管理-班次设置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated({AddGroup.class}) @RequestBody YlyYgglBcsz ylyYgglBcsz)
+    {
+        return toAjax(ylyYgglBcszService.insertYlyYgglBcsz(ylyYgglBcsz),ylyYgglBcsz.getId());
+    }
+
+    /**
+     * 修改养老院-员工管理-班次设置
+     */
+    @RequiresPermissions("organization:bcsz:edit")
+    @Log(title = "养老院-员工管理-班次设置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody YlyYgglBcsz ylyYgglBcsz)
+    {
+        return toAjax(ylyYgglBcszService.updateYlyYgglBcsz(ylyYgglBcsz));
+    }
+
+    /**
+     * 删除养老院-员工管理-班次设置
+     */
+    @RequiresPermissions("organization:bcsz:remove")
+    @Log(title = "养老院-员工管理-班次设置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(ylyYgglBcszService.deleteYlyYgglBcszByIds(ids));
+    }
+}

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/domain/YlyHlXmpzLrgd.java

@@ -156,4 +156,6 @@ public class YlyHlXmpzLrgd extends BaseEntity
     @Size(max = 2, message = "{数据状态(0开启99历史)}")
     private String status;
 
+    @Size(max = 500, message = "{附件}")
+    private String fj;
 }

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/domain/YlyJzxxFj.java

@@ -1,6 +1,7 @@
 package com.ruoyi.organization.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
@@ -77,4 +78,9 @@ public class YlyJzxxFj extends BaseEntity
     @Digits(integer = 10,fraction = 2,message = "{包房费}")
     private String bffy;
 
+    @TableField(exist = false)
+    private String mc;
+
+    @TableField(exist = false)
+    private String zt;
 }

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/domain/YlyWpFjwpxx.java

@@ -1,6 +1,7 @@
 package com.ruoyi.organization.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
@@ -46,6 +47,10 @@ public class YlyWpFjwpxx extends BaseEntity
     @ApiModelProperty(value = "房间物品配置id")
     private String fjwppzId;
 
+    /** 物品类型id */
+    @ApiModelProperty(value = "物品类型id")
+    private String wplxId;
+
     /** 名称 */
     @Excel(name = "名称")
     @ApiModelProperty(value = "名称")
@@ -60,4 +65,9 @@ public class YlyWpFjwpxx extends BaseEntity
     @NumberV(message = "{单位}")
     private String dw;
 
+    /** 是否启用(0否1是) */
+    @ApiModelProperty(value = "是否启用", required = true)
+    @Size(min = 1, max = 10, message = "{是否启用}")
+    private String isQy;
+
 }

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/domain/YlyWpLxwpxx.java

@@ -50,20 +50,17 @@ public class YlyWpLxwpxx extends BaseEntity
     @Excel(name = "物品名称")
     @ApiModelProperty(value = "物品名称")
     @Size(max = 50, message = "{物品名称}")
-
     private String mc;
 
     /** 物品单位 */
     @Excel(name = "物品单位")
     @ApiModelProperty(value = "物品单位")
-    @Range(min=0,max=100,message = "{物品单位}")
     @NumberV(message = "{物品单位}")
     private String dw;
 
     /** 是否需要换洗 */
     @Excel(name = "是否需要换洗")
     @ApiModelProperty(value = "是否需要换洗")
-    @Range(min=0,max=100,message = "{是否需要换洗}")
     @NumberV(message = "{是否需要换洗}")
     private String isHx;
 
@@ -71,7 +68,6 @@ public class YlyWpLxwpxx extends BaseEntity
     @Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     @Size(max = 200, message = "{备注}")
-
     private String bz;
 
 }

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/domain/YlyYgglBcgl.java

@@ -0,0 +1,41 @@
+package com.ruoyi.organization.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.Size;
+
+/**
+ * 养老院-建筑信息-房间对象 yly_jzxx_fj
+ *
+ * @author CH
+ * @date 2024-08-16
+ */
+@Data
+@NoArgsConstructor
+@TableName("yly_yggl_bcgl")
+@ApiModel("养老院-员工管理-班次区域关联表")
+public class YlyYgglBcgl {
+    private static final long serialVersionUID = 1L;
+
+    /** 班次主键 */
+    @Excel(name = "班次主键")
+    @ApiModelProperty(value = "班次主键")
+    private String bcId;
+
+    /** 房间主键 */
+    @Excel(name = "房间主键")
+    @ApiModelProperty(value = "房间主键")
+    private String qyId;
+}

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/domain/YlyYgglBcsz.java

@@ -0,0 +1,86 @@
+package com.ruoyi.organization.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.system.validate.group.AddGroup;
+import org.hibernate.validator.constraints.Range;
+import com.ruoyi.system.validate.DictV;
+import com.ruoyi.system.validate.DateV;
+import com.ruoyi.system.validate.MobileV;
+import com.ruoyi.system.validate.PhoneV;
+import com.ruoyi.system.validate.IdCardV;
+import com.ruoyi.system.validate.NumberV;
+
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 养老院-员工管理-班次设置对象 yly_yggl_bcsz
+ *
+ * @author sun
+ * @date 2024-10-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@TableName("yly_yggl_bcsz")
+@ApiModel("养老院-员工管理-班次设置")
+public class YlyYgglBcsz extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @Excel(name = "主键")
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /** 机构主键 */
+    @Excel(name = "机构主键")
+    @ApiModelProperty(value = "机构主键")
+    private String jgId;
+
+    /** 班次名称 */
+    @Excel(name = "班次名称")
+    @ApiModelProperty(value = "班次名称", required = true)
+    @NotBlank(message = "{班次名称}",groups = AddGroup.class)
+    @Size(min = 1, max = 72, message = "{班次名称}")
+    private String bcmc;
+
+    /** 开始时间 */
+    @Excel(name = "开始时间")
+    @ApiModelProperty(value = "开始时间")
+    @Size(max = 20, message = "{开始时间}")
+    private String kssj;
+
+    /** 结束时间 */
+    @Excel(name = "结束时间")
+    @ApiModelProperty(value = "结束时间")
+    @Size(max = 20, message = "{结束时间}")
+    private String jssj;
+
+    /** 是否交班 */
+    @Excel(name = "是否交班")
+    @ApiModelProperty(value = "是否交班", required = true)
+    private String isjb;
+
+    /** 是否关联区域 */
+    @Excel(name = "是否关联区域")
+    @ApiModelProperty(value = "是否关联区域", required = true)
+    private String isgl;
+
+    /** 数据状态 */
+    @Excel(name = "数据状态")
+    @ApiModelProperty(value = "数据状态", required = true)
+    private String status;
+
+}

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/mapper/YlyWpFjwpxxMapper.java

@@ -1,8 +1,11 @@
 package com.ruoyi.organization.mapper;
 
 import com.ruoyi.common.datascope.utils.BaseMapperPlus;
+import com.ruoyi.organization.domain.YlyHlXmpzItem;
 import com.ruoyi.organization.domain.YlyWpFjwpxx;
 
+import java.util.List;
+
 /**
  * 物品-房间配置子表Mapper接口
  *
@@ -11,4 +14,7 @@ import com.ruoyi.organization.domain.YlyWpFjwpxx;
  */
 public interface YlyWpFjwpxxMapper extends BaseMapperPlus<YlyWpFjwpxx> {
 
+    public List<YlyWpFjwpxx> selectYlyWpFjwpxxListIni();
+    public List<YlyWpFjwpxx> selectYlyWpFjwpxxTreeList(YlyWpFjwpxx ylyWpFjwpxx);
+
 }

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/mapper/YlyYgglBcszMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.organization.mapper;
+
+import java.util.List;
+import com.ruoyi.organization.domain.YlyYgglBcsz;
+import com.ruoyi.common.datascope.utils.BaseMapperPlus;
+
+/**
+ * 养老院-员工管理-班次设置Mapper接口
+ * 
+ * @author sun
+ * @date 2024-10-31
+ */
+public interface YlyYgglBcszMapper extends BaseMapperPlus<YlyYgglBcsz> {
+
+}

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/service/IYlyJzxxFjService.java

@@ -28,6 +28,8 @@ public interface IYlyJzxxFjService
      */
     public List<YlyJzxxFj> selectYlyJzxxFjList(YlyJzxxFj ylyJzxxFj);
 
+    public List<YlyJzxxFj> common(YlyJzxxFj ylyJzxxFj);
+
     /**
      * 新增养老院-建筑信息-房间
      *

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/service/IYlyWpFjwpxxService.java

@@ -3,6 +3,7 @@ package com.ruoyi.organization.service;
 import com.ruoyi.organization.domain.YlyWpFjwpxx;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 物品-房间配置子表Service接口
@@ -27,6 +28,7 @@ public interface IYlyWpFjwpxxService
      * @return 物品-房间配置子表集合
      */
     public List<YlyWpFjwpxx> selectYlyWpFjwpxxList(YlyWpFjwpxx ylyWpFjwpxx);
+    public List<Map<String,Object>> selectYlyWpFjwpxxTreeList(YlyWpFjwpxx ylyWpFjwpxx);
 
     /**
      * 新增物品-房间配置子表

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/service/IYlyYgglBcszService.java

@@ -0,0 +1,54 @@
+package com.ruoyi.organization.service;
+
+import java.util.List;
+import com.ruoyi.organization.domain.YlyYgglBcsz;
+
+/**
+ * 养老院-员工管理-班次设置Service接口
+ * 
+ * @author sun
+ * @date 2024-10-31
+ */
+public interface IYlyYgglBcszService 
+{
+    /**
+     * 查询养老院-员工管理-班次设置
+     * 
+     * @param id 养老院-员工管理-班次设置主键
+     * @return 养老院-员工管理-班次设置
+     */
+    public YlyYgglBcsz selectYlyYgglBcszById(String id);
+
+    /**
+     * 查询养老院-员工管理-班次设置列表
+     * 
+     * @param ylyYgglBcsz 养老院-员工管理-班次设置
+     * @return 养老院-员工管理-班次设置集合
+     */
+    public List<YlyYgglBcsz> selectYlyYgglBcszList(YlyYgglBcsz ylyYgglBcsz);
+
+    /**
+     * 新增养老院-员工管理-班次设置
+     * 
+     * @param ylyYgglBcsz 养老院-员工管理-班次设置
+     * @return 结果
+     */
+    public int insertYlyYgglBcsz(YlyYgglBcsz ylyYgglBcsz);
+
+    /**
+     * 修改养老院-员工管理-班次设置
+     * 
+     * @param ylyYgglBcsz 养老院-员工管理-班次设置
+     * @return 结果
+     */
+    public int updateYlyYgglBcsz(YlyYgglBcsz ylyYgglBcsz);
+
+    /**
+     * 批量删除养老院-员工管理-班次设置
+     * 
+     * @param ids 需要删除的养老院-员工管理-班次设置主键集合
+     * @return 结果
+     */
+    public int deleteYlyYgglBcszByIds(String[] ids);
+
+}

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/service/impl/YlyHlXmpzItemServiceImpl.java

@@ -96,8 +96,8 @@ public class YlyHlXmpzItemServiceImpl implements IYlyHlXmpzItemService
     @Override
     public int insertYlyHlXmpzItem(YlyHlXmpzItem ylyHlXmpzItem)
     {
-        if(StringUtils.isNull(ylyHlXmpzItem.getHlXmpzId()) || StringUtils.isNull(ylyHlXmpzItem.getHlXmglId()) || StringUtils.isNull(ylyHlXmpzItem.getHlXmglType())){
-            throw new ServiceException("请传入完整参数！");
+        if(StringUtils.isNull(ylyHlXmpzItem.getHlXmpzId()) && StringUtils.isNull(ylyHlXmpzItem.getHlXmglId()) && StringUtils.isNull(ylyHlXmpzItem.getHlXmglType())){
+            throw new ServiceException("内部错误-请传入完整服务项目参数！");
         }
         ylyHlXmpzItem.setId(IdUtils.simpleUUID());
         ylyHlXmpzItem.setIsQy("1");

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/service/impl/YlyJzxxCwServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.organization.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.organization.domain.YlyJzxxCw;
 import com.ruoyi.organization.mapper.YlyJzxxCwMapper;
@@ -8,6 +9,7 @@ import com.ruoyi.organization.service.IYlyJzxxCwService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -44,6 +46,10 @@ public class YlyJzxxCwServiceImpl implements IYlyJzxxCwService
     @Override
     public List<YlyJzxxCw> selectYlyJzxxCwList(YlyJzxxCw ylyJzxxCw)
     {
+        if (StringUtils.isEmpty(ylyJzxxCw.getFjhId())) {
+            return new ArrayList<>();
+        }
+        ylyJzxxCw.setJgId(SecurityUtils.getJgId());
         return ylyJzxxCwMapper.selectList(new LambdaQueryWrapper<>(ylyJzxxCw));
     }
 

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/service/impl/YlyJzxxFjHxpzServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.organization.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.organization.domain.YlyJzxxFjHxpz;
 import com.ruoyi.organization.mapper.YlyJzxxFjHxpzMapper;
 import com.ruoyi.organization.service.IYlyJzxxFjHxpzService;
@@ -43,6 +44,7 @@ public class YlyJzxxFjHxpzServiceImpl implements IYlyJzxxFjHxpzService
     @Override
     public List<YlyJzxxFjHxpz> selectYlyJzxxFjHxpzList(YlyJzxxFjHxpz ylyJzxxFjHxpz)
     {
+        ylyJzxxFjHxpz.setJgId(SecurityUtils.getJgId());
         return ylyJzxxFjHxpzMapper.selectList(new LambdaQueryWrapper<>(ylyJzxxFjHxpz));
     }
 
@@ -55,7 +57,7 @@ public class YlyJzxxFjHxpzServiceImpl implements IYlyJzxxFjHxpzService
     @Override
     public int insertYlyJzxxFjHxpz(YlyJzxxFjHxpz ylyJzxxFjHxpz)
     {
-//        ylyJzxxFjHxpz.setJgId(SecurityUtils.getJgId());
+        ylyJzxxFjHxpz.setJgId(SecurityUtils.getJgId());
         return ylyJzxxFjHxpzMapper.insert(ylyJzxxFjHxpz);
     }
 

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/service/impl/YlyJzxxFjServiceImpl.java

@@ -2,17 +2,22 @@ package com.ruoyi.organization.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.organization.domain.YlyJzxxCw;
 import com.ruoyi.organization.domain.YlyJzxxFj;
 import com.ruoyi.organization.domain.YlyJzxxFjHxpz;
 import com.ruoyi.organization.domain.YlyWpLxpz;
+import com.ruoyi.organization.mapper.YlyJzxxCwMapper;
 import com.ruoyi.organization.mapper.YlyJzxxFjHxpzMapper;
 import com.ruoyi.organization.mapper.YlyJzxxFjMapper;
 import com.ruoyi.organization.mapper.YlyWpLxpzMapper;
 import com.ruoyi.organization.service.IYlyJzxxFjService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -34,6 +39,9 @@ public class YlyJzxxFjServiceImpl implements IYlyJzxxFjService
     @Autowired
     private YlyWpLxpzMapper ylyWpLxpzMapper;
 
+    @Autowired
+    private YlyJzxxCwMapper ylyJzxxCwMapper;
+
     /**
      * 查询养老院-建筑信息-房间
      *
@@ -54,6 +62,39 @@ public class YlyJzxxFjServiceImpl implements IYlyJzxxFjService
      */
     @Override
     public List<YlyJzxxFj> selectYlyJzxxFjList(YlyJzxxFj ylyJzxxFj) {
+        if (StringUtils.isEmpty(ylyJzxxFj.getLylcId())) {
+            return new ArrayList<>();
+        }
+        ylyJzxxFj.setJgId(SecurityUtils.getJgId());
+        List<YlyJzxxFj> res = ylyJzxxFjMapper.selectList(new LambdaQueryWrapper<>(ylyJzxxFj));
+        res.forEach(r -> {
+            if (StringUtils.isNotEmpty(r.getHx())) {
+                YlyJzxxFjHxpz pz = ylyJzxxFjHxpzMapper.selectById(r.getHx());
+                if (ObjectUtils.isNotEmpty(pz)) {
+                    r.setHx(pz.getMc());
+                }
+            }
+            if (StringUtils.isNotEmpty(r.getWppzId())) {
+                YlyWpLxpz wp =ylyWpLxpzMapper.selectById(r.getWppzId());
+                if (ObjectUtils.isNotEmpty(wp)) {
+                    r.setWppzId(wp.getFlmc());
+                }
+            }
+            List<YlyJzxxCw> cwList = ylyJzxxCwMapper.selectList(new LambdaQueryWrapper<YlyJzxxCw>()
+                    .eq(YlyJzxxCw::getFjhId, r.getId()));
+            if (CollectionUtils.isNotEmpty(cwList)) {
+                long rz = cwList.stream().filter(c -> StringUtils.equals(c.getCwzt(), "")).count();
+                r.setZt(rz + "/" + cwList.size() + "已住");
+            } else {
+                r.setZt("空");
+            }
+        });
+        return res;
+    }
+
+    @Override
+    public List<YlyJzxxFj> common(YlyJzxxFj ylyJzxxFj) {
+        ylyJzxxFj.setJgId(SecurityUtils.getJgId());
         List<YlyJzxxFj> res = ylyJzxxFjMapper.selectList(new LambdaQueryWrapper<>(ylyJzxxFj));
         res.forEach(r -> {
             if (StringUtils.isNotEmpty(r.getHx())) {
@@ -81,7 +122,7 @@ public class YlyJzxxFjServiceImpl implements IYlyJzxxFjService
     @Override
     public int insertYlyJzxxFj(YlyJzxxFj ylyJzxxFj)
     {
-//        ylyJzxxFj.setJgId(SecurityUtils.getJgId());
+        ylyJzxxFj.setJgId(SecurityUtils.getJgId());
         return ylyJzxxFjMapper.insert(ylyJzxxFj);
     }
 

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/service/impl/YlyJzxxLylcServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.organization.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.organization.domain.YlyJzxxLylc;
 import com.ruoyi.organization.mapper.YlyJzxxLylcMapper;
 import com.ruoyi.organization.service.IYlyJzxxLylcService;
@@ -43,6 +44,7 @@ public class YlyJzxxLylcServiceImpl implements IYlyJzxxLylcService
     @Override
     public List<YlyJzxxLylc> selectYlyJzxxLylcList(YlyJzxxLylc ylyJzxxLylc)
     {
+        ylyJzxxLylc.setJgId(SecurityUtils.getJgId());
         return ylyJzxxLylcMapper.selectList(new LambdaQueryWrapper<>(ylyJzxxLylc));
     }
 
@@ -55,7 +57,7 @@ public class YlyJzxxLylcServiceImpl implements IYlyJzxxLylcService
     @Override
     public int insertYlyJzxxLylc(YlyJzxxLylc ylyJzxxLylc)
     {
-//        ylyJzxxLylc.setJgId(SecurityUtils.getJgId());
+        ylyJzxxLylc.setJgId(SecurityUtils.getJgId());
         return ylyJzxxLylcMapper.insert(ylyJzxxLylc);
     }
 

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/service/impl/YlyMenuServiceImpl.java

@@ -107,12 +107,19 @@ public class YlyMenuServiceImpl implements IYlyMenuService
         }
         ylyMenuMapper.deleteMenuIdByRoleId(ylyMenu.getRoleId());
         List<YlyRoleMenu> in = new ArrayList<>();
-        for (String menuId : ylyMenu.getMenuIdList())
-        {
+        for (String menuId : ylyMenu.getMenuIdList()) {
             YlyRoleMenu rm = new YlyRoleMenu();
             rm.setRoleId(Long.valueOf(ylyMenu.getRoleId()));
             rm.setMenuId(Long.valueOf(menuId));
             in.add(rm);
+            List<YlyMenu> children = ylyMenuMapper.selectList(new LambdaQueryWrapper<YlyMenu>()
+                    .eq(YlyMenu::getParentId, menuId));
+            children.forEach(c -> {
+                YlyRoleMenu rmc = new YlyRoleMenu();
+                rmc.setRoleId(Long.valueOf(ylyMenu.getRoleId()));
+                rmc.setMenuId(Long.valueOf(c.getMenuId()));
+                in.add(rmc);
+            });
         }
         ylyMenuMapper.batchMenuIdByRoleId(in);
         return 1;

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/service/impl/YlyWpFjwpxxServiceImpl.java

@@ -1,14 +1,22 @@
 package com.ruoyi.organization.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.organization.domain.YlyHlXmpzItem;
 import com.ruoyi.organization.domain.YlyWpFjwpxx;
+import com.ruoyi.organization.domain.YlyWpLxpz;
+import com.ruoyi.organization.mapper.YlyHlXmpzItemMapper;
 import com.ruoyi.organization.mapper.YlyWpFjwpxxMapper;
+import com.ruoyi.organization.mapper.YlyWpLxpzMapper;
 import com.ruoyi.organization.service.IYlyWpFjwpxxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
+
+import static com.ruoyi.organization.service.impl.YlyHlXmpzItemServiceImpl.distinctByLastKey;
 
 /**
  * 物品-房间配置子表Service业务层处理
@@ -22,6 +30,9 @@ public class YlyWpFjwpxxServiceImpl implements IYlyWpFjwpxxService
     @Autowired
     private YlyWpFjwpxxMapper ylyWpFjwpxxMapper;
 
+    @Autowired
+    private YlyWpLxpzMapper ylyWpLxpzMapper;
+
     /**
      * 查询物品-房间配置子表
      *
@@ -46,6 +57,32 @@ public class YlyWpFjwpxxServiceImpl implements IYlyWpFjwpxxService
         return ylyWpFjwpxxMapper.selectList(new LambdaQueryWrapper<>(ylyWpFjwpxx));
     }
 
+    @Override
+    public List<Map<String,Object>> selectYlyWpFjwpxxTreeList(YlyWpFjwpxx ylyWpFjwpxx)
+    {
+        List<Map<String,Object>> mapList = new ArrayList<>();
+        List<YlyWpLxpz> wplxList = ylyWpLxpzMapper.selectList(new LambdaQueryWrapper<>());
+        List<YlyWpFjwpxx> list =  ylyWpFjwpxxMapper.selectYlyWpFjwpxxTreeList(ylyWpFjwpxx);
+        List<YlyWpFjwpxx> listIni =  ylyWpFjwpxxMapper.selectYlyWpFjwpxxListIni();
+        List<YlyWpFjwpxx> listFor = listIni;
+        if(!(StringUtils.isNull(ylyWpFjwpxx.getFjwppzId()) || list.size()==0)){
+            listIni.addAll(list);
+            List<YlyWpFjwpxx> returnList = distinctByLastKey(YlyWpFjwpxx::getMc,listIni);
+            listFor = returnList;
+        }
+
+        for (int i = 0; i < wplxList.size(); i++) {
+            Map<String,Object> map = new HashMap<>();
+            map.put("label",wplxList.get(i).getFlmc());
+            String str = wplxList.get(i).getId();
+            map.put("children",listFor.stream().filter(l -> StringUtils.equals(str,l.getWplxId())));
+            mapList.add(map);
+        }
+
+        return mapList;
+    }
+
+
     /**
      * 新增物品-房间配置子表
      *
@@ -56,6 +93,11 @@ public class YlyWpFjwpxxServiceImpl implements IYlyWpFjwpxxService
     public int insertYlyWpFjwpxx(YlyWpFjwpxx ylyWpFjwpxx)
     {
 //        ylyWpFjwpxx.setJgId(SecurityUtils.getJgId());
+        if(StringUtils.isNull(ylyWpFjwpxx.getFjwppzId()) && StringUtils.isNull(ylyWpFjwpxx.getWplxId()) && StringUtils.isNull(ylyWpFjwpxx.getMc()) && StringUtils.isNull(ylyWpFjwpxx.getDw()) ){
+            throw new ServiceException("内部错误-请传入完整房间物品配置参数！");
+        }
+        ylyWpFjwpxx.setId(IdUtils.simpleUUID());
+        ylyWpFjwpxx.setIsQy("1");
         return ylyWpFjwpxxMapper.insert(ylyWpFjwpxx);
     }
 

ruoyi-modules/mz-organization-yly/src/main/java/com/ruoyi/organization/service/impl/YlyYgglBcszServiceImpl.java

@@ -0,0 +1,87 @@
+package com.ruoyi.organization.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.security.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Arrays;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.organization.mapper.YlyYgglBcszMapper;
+import com.ruoyi.organization.domain.YlyYgglBcsz;
+import com.ruoyi.organization.service.IYlyYgglBcszService;
+
+/**
+ * 养老院-员工管理-班次设置Service业务层处理
+ *
+ * @author sun
+ * @date 2024-10-31
+ */
+@Service
+public class YlyYgglBcszServiceImpl implements IYlyYgglBcszService
+{
+    @Autowired
+    private YlyYgglBcszMapper ylyYgglBcszMapper;
+
+    /**
+     * 查询养老院-员工管理-班次设置
+     *
+     * @param id 养老院-员工管理-班次设置主键
+     * @return 养老院-员工管理-班次设置
+     */
+    @Override
+    public YlyYgglBcsz selectYlyYgglBcszById(String id)
+    {
+        return ylyYgglBcszMapper.selectById(id);
+    }
+
+    /**
+     * 查询养老院-员工管理-班次设置列表
+     *
+     * @param ylyYgglBcsz 养老院-员工管理-班次设置
+     * @return 养老院-员工管理-班次设置
+     */
+    @Override
+    public List<YlyYgglBcsz> selectYlyYgglBcszList(YlyYgglBcsz ylyYgglBcsz)
+    {
+        return ylyYgglBcszMapper.selectList(new LambdaQueryWrapper<>(ylyYgglBcsz));
+    }
+
+    /**
+     * 新增养老院-员工管理-班次设置
+     *
+     * @param ylyYgglBcsz 养老院-员工管理-班次设置
+     * @return 结果
+     */
+    @Override
+    public int insertYlyYgglBcsz(YlyYgglBcsz ylyYgglBcsz)
+    {
+        ylyYgglBcsz.setJgId(SecurityUtils.getJgId());
+        return ylyYgglBcszMapper.insert(ylyYgglBcsz);
+    }
+
+    /**
+     * 修改养老院-员工管理-班次设置
+     *
+     * @param ylyYgglBcsz 养老院-员工管理-班次设置
+     * @return 结果
+     */
+    @Override
+    public int updateYlyYgglBcsz(YlyYgglBcsz ylyYgglBcsz)
+    {
+        return ylyYgglBcszMapper.updateById(ylyYgglBcsz);
+    }
+
+    /**
+     * 批量删除养老院-员工管理-班次设置
+     *
+     * @param ids 需要删除的养老院-员工管理-班次设置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteYlyYgglBcszByIds(String[] ids)
+    {
+        return ylyYgglBcszMapper.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

ruoyi-modules/mz-organization-yly/src/main/resources/mapper/organization/YlyHlXmpzLrgdMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fwsm"    column="fwsm"    />
         <result property="fwkssj"    column="fwkssj"    />
         <result property="fwjssj"    column="fwjssj"    />
+        <result property="fj"    column="fj"    />
         <result property="status"    column="status"    />
         <result property="createTimeStr"    column="create_time_str"    />
         <result property="createUserId"    column="create_user_id"    />

ruoyi-modules/mz-organization-yly/src/main/resources/mapper/organization/YlyWpFjwpxxMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="fjwppzId"    column="fjwppz_id"    />
+        <result property="wplxId"    column="wplx_id"    />
         <result property="mc"    column="mc"    />
         <result property="dw"    column="dw"    />
         <result property="state"    column="state"    />
@@ -28,4 +29,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateUnitName"    column="update_unit_name"    />
     </resultMap>
 
+    <select id="selectYlyWpFjwpxxListIni"  resultMap="YlyWpFjwpxxResult">
+        select id, wplx_id, mc,dw
+        from yly_wp_lxwpxx
+    </select>
+
+    <select id="selectYlyWpFjwpxxTreeList" parameterType="ylyWpFjwpxx" resultMap="YlyWpFjwpxxResult">
+        select id, fjwppz_id, wplx_id, mc,dw,is_qy
+        from yly_wp_fjwpxx
+        <where>
+            <if test="fjwppzId != null  and fjwppzId != ''"> and fjwppz_id = #{fjwppzId}</if>
+        </where>
+    </select>
+
+
 </mapper>

ruoyi-modules/mz-organization-yly/src/main/resources/mapper/organization/YlyYgglBcszMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.organization.mapper.YlyYgglBcszMapper">
+    
+    <resultMap type="YlyYgglBcsz" id="YlyYgglBcszResult">
+        <result property="id"    column="id"    />
+        <result property="jgId"    column="jg_id"    />
+        <result property="bcmc"    column="bcmc"    />
+        <result property="kssj"    column="kssj"    />
+        <result property="jssj"    column="jssj"    />
+        <result property="isjb"    column="isjb"    />
+        <result property="isgl"    column="isgl"    />
+        <result property="status"    column="status"    />
+        <result property="createTimeStr"    column="create_time_str"    />
+        <result property="createUserId"    column="create_user_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createUserType"    column="create_user_type"    />
+        <result property="createUnit"    column="create_unit"    />
+        <result property="createTounit"    column="create_tounit"    />
+        <result property="createBmjsc"    column="create_bmjsc"    />
+        <result property="createQhjsc"    column="create_qhjsc"    />
+        <result property="createUnitName"    column="create_unit_name"    />
+        <result property="createAreaCode"    column="create_area_code"    />
+        <result property="updateTimeStr"    column="update_time_str"    />
+        <result property="updateUserId"    column="update_user_id"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateUnit"    column="update_unit"    />
+        <result property="updateUnitName"    column="update_unit_name"    />
+    </resultMap>
+
+</mapper>

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/controller/YlyJzxxFjController.java

@@ -41,6 +41,11 @@ public class YlyJzxxFjController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/common")
+    public AjaxResult common(YlyJzxxFj ylyJzxxFj) {
+        return AjaxResult.success(ylyJzxxFjService.common(ylyJzxxFj));
+    }
+
     /**
      * 导出养老院-建筑信息-房间列表
      */

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/controller/YlyWpFjwpxxController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 物品-房间配置子表Controller
@@ -41,6 +42,15 @@ public class YlyWpFjwpxxController extends BaseController
         return getDataTable(list);
     }
 
+
+    @GetMapping("/treeList")
+    public TableDataInfo treeList(YlyWpFjwpxx ylyWpFjwpxx)
+    {
+//        startPage();
+        List<Map<String,Object>> list = ylyWpFjwpxxService.selectYlyWpFjwpxxTreeList(ylyWpFjwpxx);
+        return getDataTable(list);
+    }
+
     /**
      * 导出物品-房间配置子表列表
      */

ruoyi-ui/src/api/organization/yly/dict/data.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询字典数据列表
 export function listData(query) {
   return request({
-    url: '/yly/dict/data/list',
+    url: '/organization/dict/data/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listData(query) {
 // 查询字典数据详细
 export function getData(dictCode) {
   return request({
-    url: '/yly/dict/data/' + dictCode,
+    url: '/organization/dict/data/' + dictCode,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getData(dictCode) {
 // 根据字典类型查询字典数据信息
 export function getDicts(dictType) {
   return request({
-    url: '/yly/dict/data/type/' + dictType,
+    url: '/organization/dict/data/type/' + dictType,
     method: 'get'
   })
 }
@@ -28,7 +28,7 @@ export function getDicts(dictType) {
 // 新增字典数据
 export function addData(data) {
   return request({
-    url: '/yly/dict/data',
+    url: '/organization/dict/data',
     method: 'post',
     data: data
   })
@@ -37,7 +37,7 @@ export function addData(data) {
 // 修改字典数据
 export function updateData(data) {
   return request({
-    url: '/yly/dict/data',
+    url: '/organization/dict/data',
     method: 'put',
     data: data
   })
@@ -46,7 +46,7 @@ export function updateData(data) {
 // 删除字典数据
 export function delData(dictCode) {
   return request({
-    url: '/yly/dict/data/' + dictCode,
+    url: '/organization/dict/data/' + dictCode,
     method: 'delete'
   })
 }

ruoyi-ui/src/api/organization/yly/dict/type.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询字典类型列表
 export function listType(query) {
   return request({
-    url: '/yly/dict/type/list',
+    url: '/organization/dict/type/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listType(query) {
 // 查询字典类型详细
 export function getType(dictId) {
   return request({
-    url: '/yly/dict/type/' + dictId,
+    url: '/organization/dict/type/' + dictId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getType(dictId) {
 // 新增字典类型
 export function addType(data) {
   return request({
-    url: '/yly/dict/type',
+    url: '/organization/dict/type',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addType(data) {
 // 修改字典类型
 export function updateType(data) {
   return request({
-    url: '/yly/dict/type',
+    url: '/organization/dict/type',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateType(data) {
 // 删除字典类型
 export function delType(dictId) {
   return request({
-    url: '/yly/dict/type/' + dictId,
+    url: '/organization/dict/type/' + dictId,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delType(dictId) {
 // 刷新字典缓存
 export function refreshCache() {
   return request({
-    url: '/yly/dict/type/refreshCache',
+    url: '/organization/dict/type/refreshCache',
     method: 'delete'
   })
 }
@@ -54,7 +54,7 @@ export function refreshCache() {
 // 获取字典选择框列表
 export function optionselect() {
   return request({
-    url: '/yly/dict/type/optionselect',
+    url: '/organization/dict/type/optionselect',
     method: 'get'
   })
 }
@@ -63,7 +63,7 @@ export function optionselect() {
 // 业务字典查询
 export function objdictList(query) {
   return request({
-    url: '/yly/dict/type/objdict',
+    url: '/organization/dict/type/objdict',
     method: 'get',
     params: query
   })
@@ -71,7 +71,7 @@ export function objdictList(query) {
 // 业务表查询
 export function objtableList(query) {
   return request({
-    url: '/yly/dict/type/objtable',
+    url: '/organization/dict/type/objtable',
     method: 'get',
     params: query
   })
@@ -79,7 +79,7 @@ export function objtableList(query) {
 // Tree数据查询
 export function gettreedata(query) {
   return request({
-    url: '/yly/dict/type/gettreedata',
+    url: '/organization/dict/type/gettreedata',
     method: 'get',
     params: query
   })
@@ -87,7 +87,7 @@ export function gettreedata(query) {
 // 统计数据获取
 export function getstatisticaldata(query) {
   return request({
-    url: '/yly/dict/type/getstatisticaldata',
+    url: '/organization/dict/type/getstatisticaldata',
     method: 'get',
     params: query
   })

ruoyi-ui/src/api/organization/yly/wpFjpz.js

@@ -9,6 +9,15 @@ export function listWpFjpz(query) {
   })
 }
 
+// 查询物品-房间配置列表树
+export function listWpFjpzTree(query) {
+  return request({
+    url: '/organization/wpFjpz/treeList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询物品-房间配置详细
 export function getWpFjpz(id) {
   return request({

ruoyi-ui/src/views/yly/wpFjwpxx/index.vue

@@ -40,7 +40,6 @@
       <el-table-column label="房间物品配置id" align="center" prop="fjwppzId" />
       <el-table-column label="名称" align="center" prop="mc" />
       <el-table-column label="单位" align="center" prop="dw" />
-      <el-table-column label="创建人行政区划编码" align="center" prop="createAreaCode" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -89,13 +88,6 @@
           <number placeholder="是否生效(0是1否)" v-model.sync="form.state" :min="0" :max="100" />
         </el-form-item>
 
-        <el-form-item label="部门检索串" prop="createBmjsc">
-          <el-input v-model="form.createBmjsc" placeholder="请输入部门检索串" />
-        </el-form-item>
-
-        <el-form-item label="区划检索串" prop="createQhjsc">
-          <el-input v-model="form.createQhjsc" placeholder="请输入区划检索串" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" :loading="submitFormLoading">确 定</el-button>
@@ -147,12 +139,6 @@
         dw: [
           { max: 5, message: '单位不能超过5个字符', trigger: 'blur'},
         ],
-        createBmjsc: [
-          { max: 60, message: '部门检索串不能超过60个字符', trigger: 'blur'},
-        ],
-        createQhjsc: [
-          { max: 80, message: '区划检索串不能超过80个字符', trigger: 'blur'},
-        ],
       }
     };
   },
@@ -183,8 +169,6 @@
         mc: null,
         dw: null,
         state: null,
-        createBmjsc: null,
-        createQhjsc: null,
       };
       this.resetForm("form");
     },

ruoyi-ui/src/views/yly/wpLxpz/wpLxwpxx/index.vue

@@ -64,7 +64,11 @@
       <!--</el-table-column>-->
       <!--<el-table-column label="物品配置id" align="center" prop="wplxId" />-->
       <el-table-column label="物品名称" align="center" prop="mc"/>
-      <el-table-column label="物品单位" align="center" prop="dw"/>
+      <el-table-column label="物品单位" align="center" prop="dw">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.yly_ItemSettingUnit" :value="scope.row.dw"/>
+        </template>
+      </el-table-column>
       <el-table-column label="是否需要换洗" align="center" prop="isHx">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.yly_global_yes_no" :value="scope.row.isHx"/>
@@ -113,7 +117,7 @@
         <el-form-item label="单位" prop="dw">
           <el-select v-model="form.dw" placeholder="请选择物品单位">
             <el-option
-              v-for="dict in dict.type.yly_caring_exe_frequency"
+              v-for="dict in dict.type.yly_ItemSettingUnit"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -173,7 +177,7 @@
         }
       }
     },
-    dicts: ['yly_caring_exe_frequency','yly_global_yes_no'],
+    dicts: ['yly_ItemSettingUnit','yly_global_yes_no'],
     data() {
       return {
         currentRow:'',