Merge branch '20241030_sun' of sckj/yl-service into master

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/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/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/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/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/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/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));
+    }
+
     /**
      * 导出养老院-建筑信息-房间列表
      */