物资类型对接调整，新增提醒时间和告警时间计算，调整区域接口树形，隔离点新增锁具图片，名称，类型

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsIsolationPointController.java

@@ -55,6 +55,7 @@ public class IsIsolationPointController extends BaseController {
                 .eq(StringUtils.isNotBlank(dto.getPowerType()), IsIsolationPoint::getPowerType, dto.getPowerType())
                 .ge(StringUtils.isNotBlank(dto.getStartTime()), IsIsolationPoint::getCreateTime, dto.getStartTime())
                 .le(StringUtils.isNotBlank(dto.getEndTime()), IsIsolationPoint::getCreateTime, dto.getEndTime())
+                .eq(StringUtils.isNotBlank(dto.getLockType()), IsIsolationPoint::getLockType, dto.getLockType())
                 .orderByDesc(IsIsolationPoint::getPointId));
         return CommonResult.success(result);
     }

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsController.java

@@ -8,7 +8,7 @@ import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsMaterials;
 import com.ktg.iscs.domain.dto.materials.MaterialsPageDTO;
-import com.ktg.iscs.domain.vo.materials.LoanMaterialDTO;
+import com.ktg.iscs.domain.dto.materials.LoanMaterialDTO;
 import com.ktg.iscs.domain.vo.materials.MaterialsPageVO;
 import com.ktg.iscs.service.IIsMaterialsService;
 import io.swagger.annotations.Api;

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsLoanController.java

@@ -7,8 +7,8 @@ import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsMaterialsLoan;
-import com.ktg.iscs.domain.dto.MaterialsLoan.MaterialsLoanPageDTO;
-import com.ktg.iscs.domain.vo.MaterialsLoan.MaterialsLoanPageVO;
+import com.ktg.iscs.domain.dto.materialsLoan.MaterialsLoanPageDTO;
+import com.ktg.iscs.domain.vo.materialsLoan.MaterialsLoanPageVO;
 import com.ktg.iscs.service.IIsMaterialsLoanService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsTypeController.java

@@ -1,6 +1,5 @@
 package com.ktg.iscs.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.annotation.Log;
 import com.ktg.common.core.controller.BaseController;
@@ -8,12 +7,13 @@ import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsMaterialsType;
+import com.ktg.iscs.domain.dto.materialsType.MaterialsTypePageDTO;
+import com.ktg.iscs.domain.vo.materialsType.MaterialsTypePageVO;
 import com.ktg.iscs.service.IIsMaterialsTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -45,13 +45,9 @@ public class IsMaterialsTypeController extends BaseController
     })
     @PreAuthorize("@ss.hasPermi('iscs:type:list')")
     @GetMapping("/getIsMaterialsTypePage")
-    public CommonResult<Page<IsMaterialsType>> getIsMaterialsTypePage(Page<IsMaterialsType> page, IsMaterialsType isMaterialsType)
+    public CommonResult<Page<MaterialsTypePageVO>> getIsMaterialsTypePage(Page<IsMaterialsType> page, IsMaterialsType isMaterialsType)
     {
-        Page<IsMaterialsType> result = isMaterialsTypeService.page(page, Wrappers.<IsMaterialsType>lambdaQuery()
-                .like(StringUtils.isNotBlank(isMaterialsType.getMaterialsTypeCode()), IsMaterialsType::getMaterialsTypeCode, isMaterialsType.getMaterialsTypeCode())
-                .like(StringUtils.isNotBlank(isMaterialsType.getMaterialsTypeName()), IsMaterialsType::getMaterialsTypeName, isMaterialsType.getMaterialsTypeName())
-                .eq(StringUtils.isNotBlank(isMaterialsType.getEnableFlag()), IsMaterialsType::getEnableFlag, isMaterialsType.getEnableFlag())
-                .orderByDesc(IsMaterialsType::getMaterialsTypeId));
+        Page<MaterialsTypePageVO> result = isMaterialsTypeService.getIsMaterialsTypePage(page, isMaterialsType);
         return CommonResult.success(result);
     }
 
@@ -77,7 +73,7 @@ public class IsMaterialsTypeController extends BaseController
     @Parameter(name = "materialsTypeId", description = "materialsTypeId")
     @PreAuthorize("@ss.hasPermi('iscs:type:query')")
     @GetMapping(value = "/selectIsMaterialsTypeById")
-    public CommonResult<IsMaterialsType> selectIsMaterialsTypeById(Long materialsTypeId)
+    public CommonResult<MaterialsTypePageVO> selectIsMaterialsTypeById(Long materialsTypeId)
     {
         return CommonResult.success(isMaterialsTypeService.selectIsMaterialsTypeByMaterialsTypeId(materialsTypeId));
     }
@@ -89,9 +85,9 @@ public class IsMaterialsTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('iscs:type:add')")
     @Log(title = "物资类型", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsMaterialsType")
-    public CommonResult<Boolean> insertIsMaterialsType(@RequestBody @Parameter(name = "isMaterialsType", description = "新增数据类,放到body") IsMaterialsType isMaterialsType)
+    public CommonResult<Boolean> insertIsMaterialsType(@RequestBody @Parameter(name = "dto", description = "新增数据类,放到body") MaterialsTypePageDTO dto)
     {
-        return CommonResult.success(isMaterialsTypeService.insertIsMaterialsType(isMaterialsType) == 1);
+        return CommonResult.success(isMaterialsTypeService.insertIsMaterialsType(dto) == 1);
     }
 
     /**
@@ -101,9 +97,9 @@ public class IsMaterialsTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('iscs:type:edit')")
     @Log(title = "物资类型", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsMaterialsType")
-    public CommonResult<Boolean> updateIsMaterialsType(@RequestBody @Parameter(name = "isMaterialsType", description = "修改数据类,放到body") IsMaterialsType isMaterialsType)
+    public CommonResult<Boolean> updateIsMaterialsType(@RequestBody @Parameter(name = "dto", description = "修改数据类,放到body") MaterialsTypePageDTO dto)
     {
-        return CommonResult.success(isMaterialsTypeService.updateIsMaterialsType(isMaterialsType) == 1);
+        return CommonResult.success(isMaterialsTypeService.updateIsMaterialsType(dto) == 1);
     }
 
     /**

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsIsolationPoint.java

@@ -74,5 +74,13 @@ public class IsIsolationPoint extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "锁具名称")
+    private String lockName;
+
+    @ApiModelProperty(value = "锁具类型")
+    private String lockType;
+
+    @ApiModelProperty(value = "锁具图片")
+    private String lockImg;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsMaterialsRestitutionRules.java

@@ -2,15 +2,12 @@ package com.ktg.iscs.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 物资借出规则对象 is_materials_restitution_rules
  *
@@ -40,19 +37,19 @@ public class IsMaterialsRestitutionRules extends BaseBean
     private Integer restorationRequired;
 
     @ApiModelProperty(value = "出借时长")
-    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
-    @Excel(name = "出借时长", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date loanDuration;
+    // @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
+    // @Excel(name = "出借时长", width = 30, dateFormat = "yyyy-MM-dd")
+    private Integer loanDuration;
 
     @ApiModelProperty(value = "提醒时间")
-    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
-    @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date reminderTime;
+    // @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
+    // @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Integer reminderTime;
 
     @ApiModelProperty(value = "超时报警")
-    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
-    @Excel(name = "超时报警", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date timeoutAlarm;
+    // @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
+    // @Excel(name = "超时报警", width = 30, dateFormat = "yyyy-MM-dd")
+    private Integer timeoutAlarm;
 
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsMaterialsType.java

@@ -63,5 +63,8 @@ public class IsMaterialsType extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "状态")
+    private String status;
+
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsWorkarea.java

@@ -67,6 +67,9 @@ public class IsWorkarea extends BaseBean
     @ApiModelProperty(value = "显示顺序")
     private Integer orderNum;
 
+    @ApiModelProperty(value = "状态")
+    private String status;
+
     @TableField(exist = false)
     private List<?> children = new ArrayList<>();
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/materials/LoanMaterialDTO.java → ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/materials/LoanMaterialDTO.java

@@ -1,4 +1,4 @@
-package com.ktg.iscs.domain.vo.materials;
+package com.ktg.iscs.domain.dto.materials;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/MaterialsLoan/MaterialsLoanPageDTO.java → ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/materialsLoan/MaterialsLoanPageDTO.java

@@ -1,4 +1,4 @@
-package com.ktg.iscs.domain.dto.MaterialsLoan;
+package com.ktg.iscs.domain.dto.materialsLoan;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/materialsType/MaterialsTypePageDTO.java

@@ -0,0 +1,91 @@
+package com.ktg.iscs.domain.dto.materialsType;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 物资类型对象 is_materials_type
+ *
+ * @author cgj
+ * @date 2024-11-08
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class MaterialsTypePageDTO extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "物资类型ID")
+    @TableId(type = IdType.AUTO)
+    private Long materialsTypeId;
+
+    @ApiModelProperty(value = "物资类型编号")
+    @Excel(name = "物资类型编号")
+    private String materialsTypeCode;
+
+    @ApiModelProperty(value = "物资类型名称")
+    @Excel(name = "物资类型名称")
+    private String materialsTypeName;
+
+    @ApiModelProperty(value = "父类型ID")
+    @Excel(name = "父类型ID")
+    private Long parentId;
+
+    @ApiModelProperty(value = "所有父节点ID，各值之间用逗号分隔")
+    @Excel(name = "所有父节点ID，各值之间用逗号分隔")
+    private String ancestors;
+
+    @ApiModelProperty(value = "是否启用")
+    @Excel(name = "是否启用")
+    private String enableFlag;
+
+    @ApiModelProperty(value = "可用寿命")
+    @Excel(name = "可用寿命")
+    private String serviceLife;
+
+    @ApiModelProperty(value = "剩余寿命")
+    @Excel(name = "剩余寿命")
+    private String availableLife;
+
+    @ApiModelProperty(value = "可用次数")
+    @Excel(name = "可用次数")
+    private Long serviceTimes;
+
+    @ApiModelProperty(value = "剩余次数")
+    @Excel(name = "剩余次数")
+    private Long availableTimes;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "物资规则ID")
+    @TableId(type = IdType.AUTO)
+    private Long ruleId;
+
+    @ApiModelProperty(value = "是否需要归还")
+    @Excel(name = "是否需要归还")
+    private Integer restitutionRequired;
+
+    @ApiModelProperty(value = "是否归还原位")
+    @Excel(name = "是否归还原位")
+    private Integer restorationRequired;
+
+    @ApiModelProperty(value = "出借时长")
+    private Integer loanDuration;
+
+    @ApiModelProperty(value = "提醒时间")
+    private Integer reminderTime;
+
+    @ApiModelProperty(value = "超时报警")
+    private Integer timeoutAlarm;
+
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/point/PagePointDTO.java

@@ -33,4 +33,8 @@ public class PagePointDTO
 
     @ApiModelProperty(value = "结束时间")
     private String endTime;
+
+    @ApiModelProperty(value = "锁具类型")
+    private String lockType;
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/MaterialsLoan/MaterialsLoanPageVO.java → ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/materialsLoan/MaterialsLoanPageVO.java

@@ -1,4 +1,4 @@
-package com.ktg.iscs.domain.vo.MaterialsLoan;
+package com.ktg.iscs.domain.vo.materialsLoan;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -84,4 +84,6 @@ public class MaterialsLoanPageVO extends BaseBean
     private String delFlag;
 
 
+
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/materialsType/MaterialsTypePageVO.java

@@ -0,0 +1,91 @@
+package com.ktg.iscs.domain.vo.materialsType;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 物资类型对象 is_materials_type
+ *
+ * @author cgj
+ * @date 2024-11-08
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class MaterialsTypePageVO extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "物资类型ID")
+    @TableId(type = IdType.AUTO)
+    private Long materialsTypeId;
+
+    @ApiModelProperty(value = "物资类型编号")
+    @Excel(name = "物资类型编号")
+    private String materialsTypeCode;
+
+    @ApiModelProperty(value = "物资类型名称")
+    @Excel(name = "物资类型名称")
+    private String materialsTypeName;
+
+    @ApiModelProperty(value = "父类型ID")
+    @Excel(name = "父类型ID")
+    private Long parentId;
+
+    @ApiModelProperty(value = "所有父节点ID，各值之间用逗号分隔")
+    @Excel(name = "所有父节点ID，各值之间用逗号分隔")
+    private String ancestors;
+
+    @ApiModelProperty(value = "是否启用")
+    @Excel(name = "是否启用")
+    private String enableFlag;
+
+    @ApiModelProperty(value = "可用寿命")
+    @Excel(name = "可用寿命")
+    private String serviceLife;
+
+    @ApiModelProperty(value = "剩余寿命")
+    @Excel(name = "剩余寿命")
+    private String availableLife;
+
+    @ApiModelProperty(value = "可用次数")
+    @Excel(name = "可用次数")
+    private Long serviceTimes;
+
+    @ApiModelProperty(value = "剩余次数")
+    @Excel(name = "剩余次数")
+    private Long availableTimes;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "物资规则ID")
+    @TableId(type = IdType.AUTO)
+    private Long ruleId;
+
+    @ApiModelProperty(value = "是否需要归还")
+    @Excel(name = "是否需要归还")
+    private Integer restitutionRequired;
+
+    @ApiModelProperty(value = "是否归还原位")
+    @Excel(name = "是否归还原位")
+    private Integer restorationRequired;
+
+    @ApiModelProperty(value = "出借时长")
+    private Integer loanDuration;
+
+    @ApiModelProperty(value = "提醒时间")
+    private Integer reminderTime;
+
+    @ApiModelProperty(value = "超时报警")
+    private Integer timeoutAlarm;
+
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/points/PointDetailVO.java

@@ -62,5 +62,14 @@ public class PointDetailVO extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "锁具名称")
+    private String lockName;
+
+    @ApiModelProperty(value = "锁具类型")
+    private String lockType;
+
+    @ApiModelProperty(value = "锁具图片")
+    private String lockImg;
+
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/workarea/PageWorkareaVO.java

@@ -64,5 +64,7 @@ public class PageWorkareaVO extends BaseBean
     @ApiModelProperty(value = "显示顺序")
     private Integer orderNum;
 
+    @ApiModelProperty(value = "状态")
+    private String status;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsMaterialsLoanMapper.java

@@ -3,8 +3,8 @@ package com.ktg.iscs.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsMaterialsLoan;
-import com.ktg.iscs.domain.dto.MaterialsLoan.MaterialsLoanPageDTO;
-import com.ktg.iscs.domain.vo.MaterialsLoan.MaterialsLoanPageVO;
+import com.ktg.iscs.domain.dto.materialsLoan.MaterialsLoanPageDTO;
+import com.ktg.iscs.domain.vo.materialsLoan.MaterialsLoanPageVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsMaterialsTypeMapper.java

@@ -1,8 +1,11 @@
 package com.ktg.iscs.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsMaterialsType;
+import com.ktg.iscs.domain.vo.materialsType.MaterialsTypePageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -21,7 +24,7 @@ public interface IsMaterialsTypeMapper extends BaseMapperX<IsMaterialsType>
      * @param materialsTypeId 物资类型主键
      * @return 物资类型
      */
-    IsMaterialsType selectIsMaterialsTypeByMaterialsTypeId(Long materialsTypeId);
+    MaterialsTypePageVO selectIsMaterialsTypeByMaterialsTypeId(Long materialsTypeId);
 
     /**
      * 查询物资类型列表
@@ -62,4 +65,6 @@ public interface IsMaterialsTypeMapper extends BaseMapperX<IsMaterialsType>
      * @return 结果
      */
     int deleteIsMaterialsTypeByMaterialsTypeIds(Long[] materialsTypeIds);
+
+    Page<MaterialsTypePageVO> getIsMaterialsTypePage(Page<IsMaterialsType> page, @Param(value = "isMaterialsType") IsMaterialsType isMaterialsType);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsMaterialsLoanService.java

@@ -3,8 +3,8 @@ package com.ktg.iscs.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.iscs.domain.IsMaterialsLoan;
-import com.ktg.iscs.domain.dto.MaterialsLoan.MaterialsLoanPageDTO;
-import com.ktg.iscs.domain.vo.MaterialsLoan.MaterialsLoanPageVO;
+import com.ktg.iscs.domain.dto.materialsLoan.MaterialsLoanPageDTO;
+import com.ktg.iscs.domain.vo.materialsLoan.MaterialsLoanPageVO;
 
 import java.util.List;
 

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsMaterialsService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.iscs.domain.IsMaterials;
 import com.ktg.iscs.domain.dto.materials.MaterialsPageDTO;
-import com.ktg.iscs.domain.vo.materials.LoanMaterialDTO;
+import com.ktg.iscs.domain.dto.materials.LoanMaterialDTO;
 import com.ktg.iscs.domain.vo.materials.MaterialsPageVO;
 
 import java.util.List;

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsMaterialsTypeService.java

@@ -1,7 +1,10 @@
 package com.ktg.iscs.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.iscs.domain.IsMaterialsType;
+import com.ktg.iscs.domain.dto.materialsType.MaterialsTypePageDTO;
+import com.ktg.iscs.domain.vo.materialsType.MaterialsTypePageVO;
 
 import java.util.List;
 
@@ -19,7 +22,7 @@ public interface IIsMaterialsTypeService extends IService<IsMaterialsType>
      * @param materialsTypeId 物资类型主键
      * @return 物资类型
      */
-    IsMaterialsType selectIsMaterialsTypeByMaterialsTypeId(Long materialsTypeId);
+    MaterialsTypePageVO selectIsMaterialsTypeByMaterialsTypeId(Long materialsTypeId);
 
     /**
      * 查询物资类型列表
@@ -32,18 +35,18 @@ public interface IIsMaterialsTypeService extends IService<IsMaterialsType>
     /**
      * 新增物资类型
      *
-     * @param isMaterialsType 物资类型
+     * @param dto 物资类型
      * @return 结果
      */
-    int insertIsMaterialsType(IsMaterialsType isMaterialsType);
+    int insertIsMaterialsType(MaterialsTypePageDTO dto);
 
     /**
      * 修改物资类型
      *
-     * @param isMaterialsType 物资类型
+     * @param dto 物资类型
      * @return 结果
      */
-    int updateIsMaterialsType(IsMaterialsType isMaterialsType);
+    int updateIsMaterialsType(MaterialsTypePageDTO dto);
 
     /**
      * 批量删除物资类型
@@ -60,4 +63,6 @@ public interface IIsMaterialsTypeService extends IService<IsMaterialsType>
      * @return 结果
      */
     int deleteIsMaterialsTypeByMaterialsTypeId(Long materialsTypeId);
+
+    Page<MaterialsTypePageVO> getIsMaterialsTypePage(Page<IsMaterialsType> page, IsMaterialsType isMaterialsType);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMaterialsLoanServiceImpl.java

@@ -5,14 +5,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
 import com.ktg.common.utils.DateUtils;
+import com.ktg.iscs.domain.IsMaterials;
 import com.ktg.iscs.domain.IsMaterialsLoan;
-import com.ktg.iscs.domain.dto.MaterialsLoan.MaterialsLoanPageDTO;
-import com.ktg.iscs.domain.vo.MaterialsLoan.MaterialsLoanPageVO;
+import com.ktg.iscs.domain.dto.materialsLoan.MaterialsLoanPageDTO;
+import com.ktg.iscs.domain.vo.materialsLoan.MaterialsLoanPageVO;
+import com.ktg.iscs.domain.vo.materialsType.MaterialsTypePageVO;
 import com.ktg.iscs.mapper.IsMaterialsLoanMapper;
 import com.ktg.iscs.service.IIsMaterialsLoanService;
+import com.ktg.iscs.service.IIsMaterialsService;
+import com.ktg.iscs.service.IIsMaterialsTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.Instant;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,6 +32,10 @@ public class IsMaterialsLoanServiceImpl extends ServiceImpl<IsMaterialsLoanMappe
 {
     @Autowired
     private IsMaterialsLoanMapper isMaterialsLoanMapper;
+    @Autowired
+    private IIsMaterialsService isMaterialsService;
+    @Autowired
+    private IIsMaterialsTypeService isMaterialsTypeService;
 
     /**
      * 查询物资借出
@@ -60,10 +70,43 @@ public class IsMaterialsLoanServiceImpl extends ServiceImpl<IsMaterialsLoanMappe
     @Override
     public int insertIsMaterialsLoan(IsMaterialsLoan isMaterialsLoan)
     {
-        isMaterialsLoan.setCreateTime(DateUtils.getNowDate());
+        Date nowDate = DateUtils.getNowDate();
+        isMaterialsLoan.setLoanTime(nowDate);
+        isMaterialsLoan.setCreateTime(nowDate);
+        // 开始读取类型和规则，然后计算归还时间，提醒时间
+        IsMaterials materials = isMaterialsService.getById(isMaterialsLoan.getMaterialsId());
+        if (materials != null) {
+            MaterialsTypePageVO materialsTypePageVO = isMaterialsTypeService.selectIsMaterialsTypeByMaterialsTypeId(materials.getMaterialsTypeId());
+            if (materialsTypePageVO != null && materialsTypePageVO.getLoanDuration() != null) {
+                // 计算应该归还时间
+                Date date = formatDateTime(nowDate, materialsTypePageVO.getLoanDuration());
+                if (materialsTypePageVO.getReminderTime() != null) {
+                    // 计算提醒时间
+                    Date reminderTime = formatDateTime(nowDate, materialsTypePageVO.getLoanDuration() - materialsTypePageVO.getReminderTime());
+                }
+                if (materialsTypePageVO.getTimeoutAlarm() != null) {
+                    // 计算告警时间
+                    Date timeoutAlarm = formatDateTime(nowDate, materialsTypePageVO.getLoanDuration() + materialsTypePageVO.getTimeoutAlarm());
+                }
+            }
+        }
         return isMaterialsLoanMapper.insertIsMaterialsLoan(isMaterialsLoan);
     }
 
+    // 格式化日期时间的方法
+    private static Date formatDateTime(Date currentDate, Integer secondsToAdd) {
+        // 获取当前时间
+        System.out.println("当前时间: " + currentDate);
+        // 将Date转换为Instant
+        Instant instant = currentDate.toInstant();
+        // 根据设定的秒数增加时间
+        Instant newInstant = instant.plusSeconds(secondsToAdd);
+        // 将Instant转换回Date
+        Date newDate = Date.from(newInstant);
+        System.out.println("增加时间后: " + newDate);
+        return newDate;
+    }
+
     /**
      * 修改物资借出
      *

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMaterialsServiceImpl.java

@@ -9,7 +9,7 @@ import com.ktg.common.utils.DateUtils;
 import com.ktg.iscs.domain.IsMaterials;
 import com.ktg.iscs.domain.IsMaterialsLoan;
 import com.ktg.iscs.domain.dto.materials.MaterialsPageDTO;
-import com.ktg.iscs.domain.vo.materials.LoanMaterialDTO;
+import com.ktg.iscs.domain.dto.materials.LoanMaterialDTO;
 import com.ktg.iscs.domain.vo.materials.MaterialsPageVO;
 import com.ktg.iscs.mapper.IsMaterialsMapper;
 import com.ktg.iscs.service.IIsMaterialsLoanService;

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMaterialsTypeServiceImpl.java

@@ -2,16 +2,23 @@ package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
 import com.ktg.common.utils.DateUtils;
+import com.ktg.common.utils.bean.BeanUtils;
 import com.ktg.iscs.domain.IsMaterials;
+import com.ktg.iscs.domain.IsMaterialsRestitutionRules;
 import com.ktg.iscs.domain.IsMaterialsType;
+import com.ktg.iscs.domain.dto.materialsType.MaterialsTypePageDTO;
+import com.ktg.iscs.domain.vo.materialsType.MaterialsTypePageVO;
 import com.ktg.iscs.mapper.IsMaterialsTypeMapper;
+import com.ktg.iscs.service.IIsMaterialsRestitutionRulesService;
 import com.ktg.iscs.service.IIsMaterialsService;
 import com.ktg.iscs.service.IIsMaterialsTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -29,6 +36,8 @@ public class IsMaterialsTypeServiceImpl extends ServiceImpl<IsMaterialsTypeMappe
     private IsMaterialsTypeMapper isMaterialsTypeMapper;
     @Autowired
     private IIsMaterialsService iIsMaterialsService;
+    @Autowired
+    private IIsMaterialsRestitutionRulesService iIsMaterialsRestitutionRulesService;
 
     /**
      * 查询物资类型
@@ -37,7 +46,7 @@ public class IsMaterialsTypeServiceImpl extends ServiceImpl<IsMaterialsTypeMappe
      * @return 物资类型
      */
     @Override
-    public IsMaterialsType selectIsMaterialsTypeByMaterialsTypeId(Long materialsTypeId)
+    public MaterialsTypePageVO selectIsMaterialsTypeByMaterialsTypeId(Long materialsTypeId)
     {
         return isMaterialsTypeMapper.selectIsMaterialsTypeByMaterialsTypeId(materialsTypeId);
     }
@@ -57,27 +66,53 @@ public class IsMaterialsTypeServiceImpl extends ServiceImpl<IsMaterialsTypeMappe
     /**
      * 新增物资类型
      *
-     * @param isMaterialsType 物资类型
+     * @param dto 物资类型
      * @return 结果
      */
+    @Transactional
     @Override
-    public int insertIsMaterialsType(IsMaterialsType isMaterialsType)
+    public int insertIsMaterialsType(MaterialsTypePageDTO dto)
     {
-        isMaterialsType.setCreateTime(DateUtils.getNowDate());
-        return isMaterialsTypeMapper.insertIsMaterialsType(isMaterialsType);
+        dto.setCreateTime(DateUtils.getNowDate());
+        IsMaterialsType isMaterialsType = BeanUtils.toBean(dto, IsMaterialsType.class);
+        int i = isMaterialsTypeMapper.insertIsMaterialsType(isMaterialsType);
+        // 开始新增规则
+        IsMaterialsRestitutionRules isMaterialsRestitutionRules = new IsMaterialsRestitutionRules();
+        isMaterialsRestitutionRules.setMaterialsTypeId(isMaterialsType.getMaterialsTypeId());
+        isMaterialsRestitutionRules.setRestitutionRequired(dto.getRestitutionRequired());
+        isMaterialsRestitutionRules.setRestorationRequired(dto.getRestorationRequired());
+        isMaterialsRestitutionRules.setLoanDuration(dto.getLoanDuration());
+        isMaterialsRestitutionRules.setReminderTime(dto.getReminderTime());
+        isMaterialsRestitutionRules.setTimeoutAlarm(dto.getTimeoutAlarm());
+        isMaterialsRestitutionRules.setDelFlag(dto.getDelFlag());
+        iIsMaterialsRestitutionRulesService.insertIsMaterialsRestitutionRules(isMaterialsRestitutionRules);
+        return i;
     }
 
     /**
      * 修改物资类型
      *
-     * @param isMaterialsType 物资类型
+     * @param dto 物资类型
      * @return 结果
      */
+    @Transactional
     @Override
-    public int updateIsMaterialsType(IsMaterialsType isMaterialsType)
+    public int updateIsMaterialsType(MaterialsTypePageDTO dto)
     {
-        isMaterialsType.setUpdateTime(DateUtils.getNowDate());
-        return isMaterialsTypeMapper.updateIsMaterialsType(isMaterialsType);
+        dto.setUpdateTime(DateUtils.getNowDate());
+        IsMaterialsType isMaterialsType = BeanUtils.toBean(dto, IsMaterialsType.class);
+        int i = isMaterialsTypeMapper.updateIsMaterialsType(isMaterialsType);
+        // 开始修改规则
+        IsMaterialsRestitutionRules one = iIsMaterialsRestitutionRulesService.getOne(Wrappers.<IsMaterialsRestitutionRules>lambdaQuery()
+                .eq(IsMaterialsRestitutionRules::getMaterialsTypeId, dto.getMaterialsTypeId()));
+        IsMaterialsRestitutionRules bean = BeanUtils.toBean(dto, IsMaterialsRestitutionRules.class);
+        if (one != null) {
+            bean.setRuleId(one.getRuleId());
+            iIsMaterialsRestitutionRulesService.updateIsMaterialsRestitutionRules(bean);
+        } else {
+            iIsMaterialsRestitutionRulesService.insertIsMaterialsRestitutionRules(bean);
+        }
+        return i;
     }
 
     /**
@@ -86,6 +121,7 @@ public class IsMaterialsTypeServiceImpl extends ServiceImpl<IsMaterialsTypeMappe
      * @param materialsTypeIds 需要删除的物资类型主键
      * @return 结果
      */
+    @Transactional
     @Override
     public int deleteIsMaterialsTypeByMaterialsTypeIds(String materialsTypeIds)
     {
@@ -101,7 +137,16 @@ public class IsMaterialsTypeServiceImpl extends ServiceImpl<IsMaterialsTypeMappe
             Assert.isTrue(false, collect + "分类下有物资，不可删除！");
 
         }
-        return isMaterialsTypeMapper.deleteIsMaterialsTypeByMaterialsTypeIds(longIds);
+        // 开始删除
+        int i = isMaterialsTypeMapper.deleteIsMaterialsTypeByMaterialsTypeIds(longIds);
+        // 开始删除rules
+        List<IsMaterialsRestitutionRules> rulesList = iIsMaterialsRestitutionRulesService.list(Wrappers.<IsMaterialsRestitutionRules>lambdaQuery()
+                .in(IsMaterialsRestitutionRules::getMaterialsTypeId, materialsTypeIds));
+        if (!rulesList.isEmpty()) {
+            String ids = rulesList.stream().map(IsMaterialsRestitutionRules::getRuleId).map(String::valueOf).collect(Collectors.joining(","));
+            iIsMaterialsRestitutionRulesService.deleteIsMaterialsRestitutionRulesByRuleIds(ids);
+        }
+        return i;
     }
 
     /**
@@ -115,4 +160,9 @@ public class IsMaterialsTypeServiceImpl extends ServiceImpl<IsMaterialsTypeMappe
     {
         return isMaterialsTypeMapper.deleteIsMaterialsTypeByMaterialsTypeId(materialsTypeId);
     }
+
+    @Override
+    public Page<MaterialsTypePageVO> getIsMaterialsTypePage(Page<IsMaterialsType> page, IsMaterialsType isMaterialsType) {
+        return isMaterialsTypeMapper.getIsMaterialsTypePage(page, isMaterialsType);
+    }
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsWorkareaServiceImpl.java

@@ -86,6 +86,14 @@ public class IsWorkareaServiceImpl extends ServiceImpl<IsWorkareaMapper, IsWorka
         List<IsWorkarea> list = list(Wrappers.<IsWorkarea>lambdaQuery()
                 .eq(IsWorkarea::getWorkareaCode, isWorkarea.getWorkareaCode()));
         Assert.isTrue(list.isEmpty(), "该区域编号已被使用!");
+        IsWorkarea one =getById(isWorkarea.getParentId());
+        String ancestors;
+        if (one != null) {
+            ancestors = one.getAncestors() + "," + isWorkarea.getParentId();
+        } else {
+            ancestors = "0";
+        }
+        isWorkarea.setAncestors(ancestors);
         return isWorkareaMapper.insertIsWorkarea(isWorkarea);
     }
 

ktg-iscs/src/main/resources/mapper/IsIsolationPointMapper.xml

@@ -20,10 +20,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
+        <result property="lockName"    column="lock_name"    />
+        <result property="lockType"    column="lock_type"    />
+        <result property="lockImg"    column="lock_img"    />
     </resultMap>
 
     <sql id="selectIsIsolationPointVo">
-        select point_id, point_code, point_name, point_type, workshop_id, workarea_id, power_type, isolation_method, point_icon, point_picture, del_flag, create_by, create_time, update_time, update_by from is_isolation_point
+        select point_id, point_code, point_name, point_type, workshop_id, workarea_id, power_type, isolation_method,
+               point_icon, point_picture, del_flag, create_by, create_time, update_time, update_by,
+               lock_name, lock_type, lock_img
+               from is_isolation_point
     </sql>
 
     <select id="selectIsIsolationPointList" parameterType="IsIsolationPoint" resultMap="IsIsolationPointResult">
@@ -60,6 +66,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="lockName != null and lockName != ''">lock_name,</if>
+            <if test="lockType != null and lockType != ''">lock_type,</if>
+            <if test="lockImg != null and lockImg != ''">lock_img,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="pointCode != null and pointCode != ''">#{pointCode},</if>
@@ -76,6 +85,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="lockName != null and lockName != ''">#{lockName},</if>
+            <if test="lockType != null and lockType != ''">#{lockType},</if>
+            <if test="lockImg != null and lockImg != ''">#{lockImg},</if>
          </trim>
     </insert>
 
@@ -96,6 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="lockName != null and lockName != ''">lock_name = #{lockName},</if>
+            <if test="lockType != null and lockType != ''">lock_type = #{lockType},</if>
+            <if test="lockImg != null and lockImg != ''">lock_img = #{lockImg},</if>
         </trim>
         where point_id = #{pointId}
     </update>

ktg-iscs/src/main/resources/mapper/IsMaterialsLoanMapper.xml

@@ -117,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <select id="getIsMaterialsLoanPage" resultType="com.ktg.iscs.domain.vo.MaterialsLoan.MaterialsLoanPageVO">
+    <select id="getIsMaterialsLoanPage" resultType="com.ktg.iscs.domain.vo.materialsLoan.MaterialsLoanPageVO">
         SELECT
             l.*,
             m.materials_code,

ktg-iscs/src/main/resources/mapper/IsMaterialsTypeMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.iscs.mapper.IsMaterialsTypeMapper">
-    
+
     <resultMap type="IsMaterialsType" id="IsMaterialsTypeResult">
         <result property="materialsTypeId"    column="materials_type_id"    />
         <result property="materialsTypeCode"    column="materials_type_code"    />
@@ -21,15 +21,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
+        <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectIsMaterialsTypeVo">
-        select materials_type_id, materials_type_code, materials_type_name, parent_id, ancestors, enable_flag, service_life, available_life, service_times, available_times, remark, del_flag, create_by, create_time, update_time, update_by from is_materials_type
+        select materials_type_id, materials_type_code, materials_type_name, parent_id, ancestors, enable_flag,
+               service_life, available_life, service_times, available_times, remark, del_flag, create_by, create_time,
+               update_time, update_by, status
+        from is_materials_type
     </sql>
 
     <select id="selectIsMaterialsTypeList" parameterType="IsMaterialsType" resultMap="IsMaterialsTypeResult">
         <include refid="selectIsMaterialsTypeVo"/>
-        <where>  
+        <where>
             <if test="materialsTypeCode != null  and materialsTypeCode != ''"> and materials_type_code = #{materialsTypeCode}</if>
             <if test="materialsTypeName != null  and materialsTypeName != ''"> and materials_type_name like concat('%', #{materialsTypeName}, '%')</if>
             <if test="parentId != null "> and parent_id = #{parentId}</if>
@@ -41,12 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="availableTimes != null "> and available_times = #{availableTimes}</if>
         </where>
     </select>
-    
-    <select id="selectIsMaterialsTypeByMaterialsTypeId" parameterType="Long" resultMap="IsMaterialsTypeResult">
-        <include refid="selectIsMaterialsTypeVo"/>
-        where materials_type_id = #{materialsTypeId}
-    </select>
-        
+
+
     <insert id="insertIsMaterialsType" parameterType="IsMaterialsType" useGeneratedKeys="true" keyProperty="materialsTypeId">
         insert into is_materials_type
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="status != null and status != ''">status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="materialsTypeCode != null and materialsTypeCode != ''">#{materialsTypeCode},</if>
@@ -82,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="status != null and status != ''">#{status},</if>
          </trim>
     </insert>
 
@@ -103,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
         </trim>
         where materials_type_id = #{materialsTypeId}
     </update>
@@ -112,9 +115,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteIsMaterialsTypeByMaterialsTypeIds" parameterType="String">
-        delete from is_materials_type where materials_type_id in 
+        delete from is_materials_type where materials_type_id in
         <foreach item="materialsTypeId" collection="array" open="(" separator="," close=")">
             #{materialsTypeId}
         </foreach>
     </delete>
-</mapper>
+
+    <select id="getIsMaterialsTypePage" resultType="com.ktg.iscs.domain.vo.materialsType.MaterialsTypePageVO">
+        SELECT
+            t.*,
+            r.rule_id,
+            r.restitution_required,
+            r.restoration_required,
+            r.loan_duration,
+            r.reminder_time,
+            r.timeout_alarm
+        FROM
+            is_materials_type t
+            LEFT JOIN is_materials_restitution_rules r ON r.materials_type_id = t.materials_type_id
+        <where>
+            <if test="isMaterialsType.materialsTypeCode != null and isMaterialsType.materialsTypeCode.trim != ''">
+                and t.materials_type_code like concat('%',#{isMaterialsType.materialsTypeCode},'%')
+            </if>
+            <if test="isMaterialsType.materialsTypeName != null and isMaterialsType.materialsTypeName.trim != ''">
+                and t.materials_type_name like concat('%',#{isMaterialsType.materialsTypeName},'%')
+            </if>
+            <if test="isMaterialsType.status != null and isMaterialsType.status.trim != ''">
+                and t.status like concat('%',#{isMaterialsType.status},'%')
+            </if>
+        </where>
+            order by t.materials_type_id desc
+    </select>
+    <select id="selectIsMaterialsTypeByMaterialsTypeId"
+            resultType="com.ktg.iscs.domain.vo.materialsType.MaterialsTypePageVO">
+        SELECT
+            t.*,
+            r.rule_id,
+            r.restitution_required,
+            r.restoration_required,
+            r.loan_duration,
+            r.reminder_time,
+            r.timeout_alarm
+        FROM
+            is_materials_type t
+            LEFT JOIN is_materials_restitution_rules r ON r.materials_type_id = t.materials_type_id
+        WHERE t.materials_type_id = #{materialsTypeId}
+
+    </select>
+
+</mapper>

ktg-iscs/src/main/resources/mapper/IsWorkareaMapper.xml

@@ -19,12 +19,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="parentId"    column="parent_id"    />
         <result property="ancestors"    column="ancestors"    />
         <result property="orderNum"    column="order_num"    />
+        <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectIsWorkareaVo">
         select workarea_id, workarea_code, workarea_name,
                workarea_type, workshop_id, map, del_flag, create_by,
-               create_time, update_time, update_by, parent_id, ancestors, order_num
+               create_time, update_time, update_by, parent_id, ancestors, order_num, status
         from is_workarea
     </sql>
 
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="parentId != null">parent_id,</if>
             <if test="ancestors != null and ancestors != ''">ancestors,</if>
             <if test="orderNum != null">order_num,</if>
+            <if test="status != null and status != ''">status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workareaCode != null and workareaCode != ''">#{workareaCode},</if>
@@ -72,9 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="ancestors != null and ancestors != ''">ancestors,</if>
-            <if test="orderNum != null">order_num,</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
+            <if test="orderNum != null">#{orderNum},</if>
+            <if test="status != null">#{status},</if>
          </trim>
     </insert>
 
@@ -94,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="parentId != null">parent_id = #{parentId},</if>
             <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
             <if test="orderNum != null">order_num = #{orderNum},</if>
+            <if test="status != null">status = #{status},</if>
         </trim>
         where workarea_id = #{workareaId}
     </update>
@@ -129,8 +133,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dto.workshopId != null">
                 and w.workshop_id = #{dto.workshopId}
             </if>
+            <if test="dto.status != null and dto.status.trim != ''">
+                and w.status = #{dto.status}
+            </if>
         </where>
-            order by workarea_id desc
+            order by w.parent_id, w.order_num
     </select>
 
 </mapper>