11

xujie-pms/src/main/java/com/xujie/pms/controller/EamController.java

@@ -650,7 +650,7 @@ public class EamController {
         return map;
     }
 
-    //---------------维修项目-------------------
+    //---------------点检项目-------------------
 
     /**
      * @Description 查询设备供应商
@@ -765,4 +765,110 @@ public class EamController {
         return resultMap;
     }
 
+    /**
+     * @Description 获取可选值清单
+     * @Title searchItemAvailable
+      * @param inData
+     * @author rq
+     * @date 2023/2/23 10:50
+     * @return R
+     * @throw
+     */
+    @PostMapping("/searchItemAvailable")
+    public R searchItemAvailable(@RequestBody EamPropertiesItemAvailableData inData){
+        List<EamPropertiesItemAvailableData> resultList = eamService.searchItemAvailable(inData);
+        return R.ok().put("rows", resultList).put("total",resultList.size());
+    }
+
+    /**
+     * @Description 保存 编辑可选值
+     * @Title saveItemAvailable
+      * @param inData
+     * @author rq
+     * @date 2023/2/23 10:56
+     * @return R
+     * @throw
+     */
+    @PostMapping("/saveItemAvailable")
+    public R saveItemAvailable(@RequestBody EamPropertiesItemAvailableData inData){
+        eamService.saveItemAvailable(inData);
+        return R.ok();
+    }
+
+    /**
+     * @Description TODO
+     * @Title saveItemAvailable
+      * @param inData
+     * @author rq
+     * @date 2023/2/23 11:42
+     * @return R
+     * @throw
+     */
+    @PostMapping("/deleteItemAvailable")
+    public R deleteItemAvailable(@RequestBody EamPropertiesItemAvailableData inData){
+        eamService.deleteItemAvailable(inData);
+        return R.ok();
+    }
+
+    //---------------点检模板-------------------
+
+    /**
+     * @Description TODO
+     * @Title eamPropertiesModelSearch
+      * @param data
+     * @author rq
+     * @date 2023/2/23 17:15
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/eamPropertiesModelSearch")
+    public R eamPropertiesModelSearch(@RequestBody EamPropertiesModelHeaderData data){
+        PageUtils page  = eamService.eamPropertiesModelSearch(data);
+        return R.ok().put("page", page);
+    }
+
+    /**
+     * @Description TODO
+     * @Title eamPropertiesModelEdit
+     * @param inData
+     * @author rq
+     * @date 2023/2/23 17:40
+     * @return R
+     * @throw
+     */
+    @PostMapping("/eamPropertiesModelSave")
+    public R eamPropertiesModelSave(@RequestBody EamPropertiesModelHeaderData inData){
+        eamService.eamPropertiesModelSave(inData);
+        return R.ok();
+    }
+
+
+    /**
+     * @Description TODO
+     * @Title eamPropertiesModelEdit
+      * @param inData
+     * @author rq
+     * @date 2023/2/23 17:40
+     * @return R
+     * @throw
+     */
+    @PostMapping("/eamPropertiesModelEdit")
+    public R eamPropertiesModelEdit(@RequestBody EamPropertiesModelHeaderData inData){
+        eamService.eamPropertiesModelEdit(inData);
+        return R.ok();
+    }
+    /**
+     * @Description TODO
+     * @Title eamPropertiesModelDelete
+     * @param inData
+     * @author rq
+     * @date 2023/2/23 17:40
+     * @return R
+     * @throw
+     */
+    @PostMapping("/eamPropertiesModelDelete")
+    public R eamPropertiesModelDelete(@RequestBody EamPropertiesModelHeaderData inData){
+        eamService.eamPropertiesModelDelete(inData);
+        return R.ok();
+    }
 }

xujie-pms/src/main/java/com/xujie/pms/data/EamPropertiesModelDetailData.java

@@ -0,0 +1,143 @@
+package com.xujie.pms.data;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public class EamPropertiesModelDetailData {
+    /**
+     *
+     */
+    private String functionType;
+
+    /**
+     *
+     */
+    private String codeNo;
+
+    /**
+     *
+     */
+    private String propertiesItemNo;
+
+    /**
+     *
+     */
+    private Integer seqNo;
+
+    /**
+     *
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
+    private Date createdDate;
+
+    /**
+     *
+     */
+    private String createdBy;
+
+    /**
+     *
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
+    private Date updateDate;
+
+    /**
+     *
+     */
+    private String updateBy;
+
+    /**
+     *
+     */
+    private String delflag;
+
+    /**
+     *
+     */
+    private Integer version;
+
+    public String getFunctionType() {
+        return functionType;
+    }
+
+    public void setFunctionType(String functionType) {
+        this.functionType = functionType;
+    }
+
+    public String getCodeNo() {
+        return codeNo;
+    }
+
+    public void setCodeNo(String codeNo) {
+        this.codeNo = codeNo;
+    }
+
+    public String getPropertiesItemNo() {
+        return propertiesItemNo;
+    }
+
+    public void setPropertiesItemNo(String propertiesItemNo) {
+        this.propertiesItemNo = propertiesItemNo;
+    }
+
+    public Integer getSeqNo() {
+        return seqNo;
+    }
+
+    public void setSeqNo(Integer seqNo) {
+        this.seqNo = seqNo;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getDelflag() {
+        return delflag;
+    }
+
+    public void setDelflag(String delflag) {
+        this.delflag = delflag;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+}
+

xujie-pms/src/main/java/com/xujie/pms/data/EamPropertiesModelHeaderData.java

@@ -0,0 +1,152 @@
+package com.xujie.pms.data;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xujie.common.utils.QueryPage;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public class EamPropertiesModelHeaderData extends QueryPage {
+    /**
+     *
+     */
+    private String functionType;
+
+    /**
+     *
+     */
+    private String codeNo;
+
+    /**
+     *
+     */
+    private String codeDesc;
+    private String userId;
+    /**
+     *
+     */
+    private String active;
+
+    /**
+     *
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
+    private Date createdDate;
+
+    /**
+     *
+     */
+    private String createdBy;
+
+    /**
+     *
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
+    private Date updateDate;
+
+    /**
+     *
+     */
+    private String updateBy;
+
+    /**
+     *
+     */
+    private String delflag;
+
+    /**
+     *
+     */
+    private Integer version;
+
+    public String getFunctionType() {
+        return functionType;
+    }
+
+    public void setFunctionType(String functionType) {
+        this.functionType = functionType;
+    }
+
+    public String getCodeNo() {
+        return codeNo;
+    }
+
+    public void setCodeNo(String codeNo) {
+        this.codeNo = codeNo;
+    }
+
+    public String getCodeDesc() {
+        return codeDesc;
+    }
+
+    public void setCodeDesc(String codeDesc) {
+        this.codeDesc = codeDesc;
+    }
+
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getDelflag() {
+        return delflag;
+    }
+
+    public void setDelflag(String delflag) {
+        this.delflag = delflag;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+}
+

xujie-pms/src/main/java/com/xujie/pms/mapper/EamMapper.java

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface EamMapper {
@@ -99,5 +101,108 @@ public interface EamMapper {
      */
     IPage<EamSupplierData> eamSupplierSearch(Page<EamSupplierData> page, @Param("query") EamSupplierData inData);
 
+    /**
+     * @Description TODO
+     * @Title searchItemAvailable
+     * @param inData
+     * @author rq
+     * @date 2023/2/23 10:52
+     * @return List<EamPropertiesItemAvailableData>
+     * @throw
+     */
+    List<EamPropertiesItemAvailableData> searchItemAvailable(EamPropertiesItemAvailableData inData);
+
+    /**
+     * @Description 获取值编号
+     * @Title getItemValueNo
+      * @param inData
+     * @author rq
+     * @date 2023/2/23 11:21
+     * @return Float
+     * @throw
+     */
+    Double getItemValueNo(EamPropertiesItemAvailableData inData);
+    
+    /**
+     * @Description TODO
+     * @Title saveItemAvailable 
+      * @param inData 
+     * @author rq
+     * @date 2023/2/23 11:38 
+     * @return void
+     * @throw
+     */
+    void saveItemAvailable(EamPropertiesItemAvailableData inData);
+
+    /**
+     * @Description TODO
+     * @Title updateItemAvailable 
+      * @param inData 
+     * @author rq
+     * @date 2023/2/23 11:38 
+     * @return void
+     * @throw
+     */
+    void updateItemAvailable(EamPropertiesItemAvailableData inData);
+
+    void deleteItemAvailable(EamPropertiesItemAvailableData inData);
+
 
+    //---------------点检模板-------------------
+/**
+ * @Description 查询模板
+ * @Title eamPropertiesModelSearch
+  * @param page
+ * @param inData
+ * @author rq
+ * @date 2023/2/23 17:18
+ * @return IPage<EamPropertiesModelHeaderData>
+ * @throw
+ */
+    IPage<EamPropertiesModelHeaderData> eamPropertiesModelSearch(Page<EamPropertiesModelHeaderData> page, @Param("query") EamPropertiesModelHeaderData inData);
+
+
+    /**
+     * @Description 点检模板新增
+     * @Title EamPropertiesModelHeaderData
+     * @param
+     * @author rq
+     * @date 2023/2/23 17:41
+     * @return void
+     * @throw
+     */
+    void eamPropertiesModelSave(EamPropertiesModelHeaderData inData);
+
+    /**
+     * @Description TODO
+     * @Title eamPropertiesModelEdit
+     * @param inData
+     * @author rq
+     * @date 2023/2/23 17:44
+     * @return void
+     * @throw
+     */
+    void eamPropertiesModelEdit(EamPropertiesModelHeaderData inData);
+
+    /**
+     * @Description TODO
+     * @Title checkPropertiesModel
+      * @param inData
+     * @author rq
+     * @date 2023/2/23 17:58
+     * @return List<EamPropertiesModelHeaderData>
+     * @throw
+     */
+    List<EamPropertiesModelHeaderData> checkPropertiesModel(EamPropertiesModelHeaderData inData);
+
+    /**
+     * @Description TODO
+     * @Title eamPropertiesModelDelete
+     * @param inData
+     * @author rq
+     * @date 2023/2/23 18:01
+     * @return void
+     * @throw
+     */
+    void eamPropertiesModelDelete(EamPropertiesModelHeaderData inData);
 }

xujie-pms/src/main/java/com/xujie/pms/service/EamService.java

@@ -10,378 +10,465 @@ import java.util.Map;
 
 public interface EamService {
     /**
+     * @param inData
+     * @return List<EamFamilyData>
      * @Description 查询设备分类
      * @Title eamFamilySearch
-     * @param inData
      * @author rq
      * @date 2023/1/29 13:34
-     * @return List<EamFamilyData>
      * @throw
      */
     PageUtils eamFamilySearch(EamFamilyData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description 保存设备分类
      * @Title eamFamilySave
-     * @param inData
      * @author rq
      * @date 2023/1/29 15:19
-     * @return ResponseData
      * @throw
      */
     ResponseData eamFamilySave(EamFamilyData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamFamilyEdit
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamFamilyEdit(EamFamilyData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamFamilyDelete
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamFamilyDelete(EamFamilyData inData);
     //-------------------------------设备分组--------------------------------------------
 
     /**
+     * @param inData
+     * @return PageUtils
      * @Description 查询设备分类
      * @Title eamGroupSearch
-     * @param inData
      * @author rq
      * @date 2023/1/29 13:34
-     * @return PageUtils
      * @throw
      */
     PageUtils eamGroupSearch(EamGroupData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description 保存设备分类
      * @Title eamGroupSave
-     * @param inData
      * @author rq
      * @date 2023/1/29 15:19
-     * @return ResponseData
      * @throw
      */
     ResponseData eamGroupSave(EamGroupData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamGroupEdit
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamGroupEdit(EamGroupData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamGroupDelete
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamGroupDelete(EamGroupData inData);
     //-------------------------------设备位置--------------------------------------------
+
     /**
+     * @param inData
+     * @return List<EamLocationData>
      * @Description 查询设备分类
      * @Title eamLocationSearch
-     * @param inData
      * @author rq
      * @date 2023/1/29 13:34
-     * @return List<EamLocationData>
      * @throw
      */
     PageUtils eamLocationSearch(EamLocationData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description 保存设备分类
      * @Title eamLocationSave
-     * @param inData
      * @author rq
      * @date 2023/1/29 15:19
-     * @return ResponseData
      * @throw
      */
     ResponseData eamLocationSave(EamLocationData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamLocationEdit
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamLocationEdit(EamLocationData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamLocationDelete
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamLocationDelete(EamLocationData inData);
     //-------------------------------设备供应商--------------------------------------------
+
     /**
+     * @param inData
+     * @return List<EamSupplierData>
      * @Description 查询设备分类
      * @Title eamSupplierSearch
-     * @param inData
      * @author rq
      * @date 2023/1/29 13:34
-     * @return List<EamSupplierData>
      * @throw
      */
     PageUtils eamSupplierSearch(EamSupplierData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description 保存设备分类
      * @Title eamSupplierSave
-     * @param inData
      * @author rq
      * @date 2023/1/29 15:19
-     * @return ResponseData
      * @throw
      */
     ResponseData eamSupplierSave(EamSupplierData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamSupplierEdit
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamSupplierEdit(EamSupplierData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamSupplierDelete
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamSupplierDelete(EamSupplierData inData);
     //-------------------------------设备制造商--------------------------------------------
+
     /**
+     * @param inData
+     * @return List<EamManufacturerData>
      * @Description 查询设备分类
      * @Title eamManufacturerSearch
-     * @param inData
      * @author rq
      * @date 2023/1/29 13:34
-     * @return List<EamManufacturerData>
      * @throw
      */
     PageUtils eamManufacturerSearch(EamManufacturerData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description 保存设备分类
      * @Title eamManufacturerSave
-     * @param inData
      * @author rq
      * @date 2023/1/29 15:19
-     * @return ResponseData
      * @throw
      */
     ResponseData eamManufacturerSave(EamManufacturerData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamManufacturerEdit
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamManufacturerEdit(EamManufacturerData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamManufacturerDelete
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamManufacturerDelete(EamManufacturerData inData);
     //-------------------------------设备机修人员--------------------------------------------
+
     /**
+     * @param inData
+     * @return List<EamAdminData>
      * @Description 查询设备分类
      * @Title eamAdminSearch
-     * @param inData
      * @author rq
      * @date 2023/1/29 13:34
-     * @return List<EamAdminData>
      * @throw
      */
     PageUtils eamAdminSearch(EamAdminData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description 保存设备分类
      * @Title eamAdminSave
-     * @param inData
      * @author rq
      * @date 2023/1/29 15:19
-     * @return ResponseData
      * @throw
      */
     ResponseData eamAdminSave(EamAdminData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamAdminEdit
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamAdminEdit(EamAdminData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamAdminDelete
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamAdminDelete(EamAdminData inData);
 
     /**
+     * @param site
+     * @return List<EamAdminData>
      * @Description TODO
      * @Title initAdminLevel
-     * @param site
      * @author rq
      * @date 2023/2/2 16:26
-     * @return List<EamAdminData>
      * @throw
      */
     List<EamAdminLevelData> initAdminLevel(EamAdminData data);
 
     //---------------机修人员等级-------------------
+
     /**
+     * @param inData
+     * @return List<EamAdminLevelData>
      * @Description 查询设备分类
      * @Title eamAdminLevelSearch
-     * @param inData
      * @author rq
      * @date 2023/1/29 13:34
-     * @return List<EamAdminLevelData>
      * @throw
      */
     PageUtils eamAdminLevelSearch(EamAdminLevelData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description 保存设备分类
      * @Title eamAdminLevelSave
-     * @param inData
      * @author rq
      * @date 2023/1/29 15:19
-     * @return ResponseData
      * @throw
      */
     ResponseData eamAdminLevelSave(EamAdminLevelData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamAdminLevelEdit
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamAdminLevelEdit(EamAdminLevelData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description TODO
      * @Title eamAdminLevelDelete
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamAdminLevelDelete(EamAdminLevelData inData);
 
 
     //---------------维修项目-------------------
+
     /**
+     * @param inData
+     * @return List<EamAdminLevelData>
      * @Description
      * @Title EamPropertiesItem
-     * @param inData
      * @author rq
      * @date 2023/1/29 13:34
-     * @return List<EamAdminLevelData>
      * @throw
      */
     List<EamPropertiesItemData> eamPropertiesItemSearch(EamPropertiesItemData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description
      * @Title
-     * @param inData
      * @author rq
      * @date 2023/1/29 15:19
-     * @return ResponseData
      * @throw
      */
     ResponseData eamPropertiesItemSave(EamPropertiesItemData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description
      * @Title
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamPropertiesItemEdit(EamPropertiesItemData inData);
 
     /**
+     * @param inData
+     * @return ResponseData
      * @Description
      * @Title
-     * @param inData
      * @author rq
      * @date 2023/1/29 16:50
-     * @return ResponseData
      * @throw
      */
     ResponseData eamPropertiesItemDelete(EamPropertiesItemData inData);
 
     /**
+     * @param [empyDept]
      * @author: sxm
      * @description: 获取部门信息
-     * @param [empyDept]
-     * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @return: java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
      * @date: 2022/6/22 9:38
      */
     List<EmpyDept> getEmpyDeptList(EmpyDept empyDept);
+
+    /**
+     * @param inData
+     * @return List<EamPropertiesItemAvailableData>
+     * @Description TODO
+     * @Title searchItemAvailable
+     * @author rq
+     * @date 2023/2/23 10:52
+     * @throw
+     */
+    List<EamPropertiesItemAvailableData> searchItemAvailable(EamPropertiesItemAvailableData inData);
+
+    /**
+     * @param inData
+     * @return void
+     * @Description 保存可选值
+     * @Title saveItemAvailable
+     * @author rq
+     * @date 2023/2/23 10:57
+     * @throw
+     */
+    void saveItemAvailable(EamPropertiesItemAvailableData inData);
+
+    /**
+     * @param
+     * @return void
+     * @Description TODO
+     * @Title deleteItemAvailable
+     * @author rq
+     * @date 2023/2/23 11:43
+     * @throw
+     */
+    void deleteItemAvailable(EamPropertiesItemAvailableData inData);
+
+    //---------------点检模板-------------------
+
+    /**
+     * @param inData
+     * @return List<EamPropertiesModelHeaderData>
+     * @Description 查询设备分类
+     * @Title
+     * @author rq
+     * @date 2023/1/29 13:34
+     * @throw
+     */
+    PageUtils eamPropertiesModelSearch(EamPropertiesModelHeaderData inData);
+
+    /**
+     * @param
+     * @return void
+     * @Description 点检模板新增
+     * @Title EamPropertiesModelHeaderData
+     * @author rq
+     * @date 2023/2/23 17:41
+     * @throw
+     */
+    void eamPropertiesModelSave(EamPropertiesModelHeaderData inData);
+
+    /**
+     * @param inData
+     * @return void
+     * @Description TODO
+     * @Title eamPropertiesModelEdit
+     * @author rq
+     * @date 2023/2/23 17:45
+     * @throw
+     */
+    void eamPropertiesModelEdit(EamPropertiesModelHeaderData inData);
+
+    /**
+     * @Description TODO
+     * @Title eamPropertiesModelDelete
+      * @param inData
+     * @author rq
+     * @date 2023/2/23 18:01
+     * @return void
+     * @throw
+     */
+    void eamPropertiesModelDelete(EamPropertiesModelHeaderData inData);
+
+
 }

xujie-pms/src/main/java/com/xujie/pms/service/Impl/EamServiceImpl.java

@@ -11,6 +11,7 @@ import com.xujie.pms.service.EamService;
 import com.xujie.pms.util.ResponseData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 import java.util.List;
@@ -407,4 +408,54 @@ public class EamServiceImpl implements EamService {
     public List<EmpyDept> getEmpyDeptList(EmpyDept empyDept) {
         return eamDao.getEmpyDeptList(empyDept);
     }
+
+
+    @Override
+    public List<EamPropertiesItemAvailableData> searchItemAvailable(EamPropertiesItemAvailableData inData) {
+        return eamMapper.searchItemAvailable(inData);
+    }
+
+    @Override
+    public void saveItemAvailable(EamPropertiesItemAvailableData inData){
+        //判断是新增还是删除
+        if(inData.getValueNo()==0){
+            //新增
+            Double valueNo= eamMapper.getItemValueNo(inData);
+            inData.setValueNo(valueNo);
+            eamMapper.saveItemAvailable(inData);
+        }else {
+            eamMapper.updateItemAvailable(inData);
+        }
+    }
+
+    @Override
+    public void deleteItemAvailable(EamPropertiesItemAvailableData inData){
+        eamMapper.deleteItemAvailable(inData);
+    }
+
+    //---------------点检模板-------------------
+    @Override
+    public PageUtils eamPropertiesModelSearch(EamPropertiesModelHeaderData inData){
+        IPage<EamPropertiesModelHeaderData> resultList = this.eamMapper.eamPropertiesModelSearch(
+                new Page<EamPropertiesModelHeaderData>(inData.getPage(), inData.getLimit()), inData);
+        return new PageUtils(resultList);
+    }
+
+    @Override
+    public void eamPropertiesModelSave(EamPropertiesModelHeaderData inData){
+        List<EamPropertiesModelHeaderData>checkPropertiesModel= eamMapper.checkPropertiesModel(inData);
+        if(checkPropertiesModel.size()>0){
+            throw new RuntimeException("该点检模板编码已存在!");
+        }
+        eamMapper.eamPropertiesModelSave(inData);
+    }
+    @Override
+    public void eamPropertiesModelEdit(EamPropertiesModelHeaderData inData){
+        eamMapper.eamPropertiesModelEdit(inData);
+    }
+
+    @Override
+    public void eamPropertiesModelDelete(EamPropertiesModelHeaderData inData){
+        eamMapper.eamPropertiesModelDelete(inData);
+    }
 }

xujie-pms/src/main/resources/mapper/EamMapper.xml

@@ -129,4 +129,62 @@
             </if>
         </where>
 </select>
+
+<select id="searchItemAvailable" resultType="EamPropertiesItemAvailableData">
+        SELECT ItemNo,ValueNo,AvailableValue,CreatedDate,CreatedBy,ItemType
+        from eam_properties_item_available where itemNo=#{itemNo} and ItemType=#{itemType}
+</select>
+
+
+<select id="getItemValueNo" resultType="Double">
+        SELECT isnull( max(valueNo),0)+1 from eam_properties_item_available where itemNo=#{itemNo} and ItemType=#{itemType}
+</select>
+
+<insert id="saveItemAvailable">
+    insert into eam_properties_item_available (ItemNo,ValueNo,AvailableValue,CreatedDate,CreatedBy,ItemType)
+    values(#{itemNo},#{valueNo},#{availableValue},GetDate(),#{createdBy},#{itemType})
+</insert>
+
+<update id="updateItemAvailable">
+    update eam_properties_item_available set  AvailableValue=#{availableValue} where itemNo=#{itemNo} and ItemType=#{itemType} and ValueNo=#{valueNo}
+</update>
+
+<delete id="deleteItemAvailable">
+    delete  from eam_properties_item_available where itemNo=#{itemNo} and ItemType=#{itemType} and ValueNo=#{valueNo}
+</delete>
+
+<select id="eamPropertiesModelSearch"  parameterType="com.xujie.pms.data.EamPropertiesModelHeaderData" resultType="com.xujie.pms.data.EamPropertiesModelHeaderData">
+        SELECT function_type,code_no,code_desc,active,created_date,created_by,update_date,update_by,delflag,version FROM eam_properties_model_header
+        <where>
+
+             <if test="query.codeNo != null and query.codeNo != ''">
+                AND code_no like '%' + #{query.codeNo} +'%'
+            </if>
+             <if test="query.codeDesc != null and query.codeDesc != ''">
+                AND code_desc like '%' + #{query.codeDesc}+'%'
+            </if>
+             <if test="query.active != null and query.active != ''">
+                AND active = #{query.active}
+            </if>
+        </where>
+</select>
+
+<insert id="eamPropertiesModelSave" >
+    insert into eam_properties_model_header  (function_type,code_no,code_desc,active,created_date,created_by,delflag,version)
+    values(#{functionType},#{codeNo},#{codeDesc},#{active},GetDate(),#{userId},'N',0)
+</insert>
+
+<update id="eamPropertiesModelEdit">
+    update eam_properties_model_header set  version=version+1,code_desc=#{codeDesc},active=#{active},created_by=#{userId},created_date=GetDate() where function_type=#{functionType}
+    and code_no=#{codeNo}
+</update>
+
+<select id="checkPropertiesModel" resultType="EamPropertiesModelHeaderData">
+     SELECT function_type,code_no,code_desc,active,created_date,created_by,update_date,update_by,delflag,version FROM eam_properties_model_header
+     where function_type=#{functionType}   and code_no=#{codeNo}
+</select>
+
+<delete id="eamPropertiesModelDelete" >
+    delete from eam_properties_model_header   where function_type=#{functionType}   and code_no=#{codeNo}
+</delete>
 </mapper>