first

src/main/java/com/spring/modules/base/controller/BaseController.java

@@ -1,10 +1,7 @@
 package com.spring.modules.base.controller;
 
 import com.spring.common.utils.R;
-import com.spring.modules.base.data.AccessProjectData;
-import com.spring.modules.base.data.BuData;
-import com.spring.modules.base.data.BuUserData;
-import com.spring.modules.base.data.SaveAccessSiteData;
+import com.spring.modules.base.data.*;
 import com.spring.modules.base.entity.CompanyData;
 import com.spring.modules.base.entity.*;
 import com.spring.modules.base.service.BaseService;
@@ -330,4 +327,27 @@ public class BaseController extends AbstractController {
         baseService.saveAccessSiteForSite(data);
         return R.ok();
     }
+
+    /**
+     * @Description TODO
+     * @Title searchFieldFunctionList
+      * @param data
+     * @author rq
+     * @date 2023/10/17 16:49
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/searchFieldFunctionList")
+    @ResponseBody
+    public R searchFieldFunctionList(){
+        List<PlmFieldFunctionListData> rows  = baseService.searchFieldFunctionList();
+        return R.ok().put("rows", rows);
+    }
+
+    @PostMapping(value="/searchFieldListWithFunction")
+    @ResponseBody
+    public R searchFieldListWithFunction(@RequestBody PlmFieldListData inData){
+        List<PlmFieldListData> rows  = baseService.searchFieldListWithFunction(inData);
+        return R.ok().put("rows", rows);
+    }
 }

src/main/java/com/spring/modules/base/dao/BaseMapper.java

@@ -2,10 +2,7 @@ package com.spring.modules.base.dao;
 
 
 import com.spring.modules.app.entity.UserEntity;
-import com.spring.modules.base.data.AccessProjectData;
-import com.spring.modules.base.data.BuData;
-import com.spring.modules.base.data.BuUserData;
-import com.spring.modules.base.data.SaveAccessSiteData;
+import com.spring.modules.base.data.*;
 import com.spring.modules.base.entity.AccessSiteData;
 import com.spring.modules.base.entity.CompanyData;
 import com.spring.modules.base.entity.SiteData;
@@ -320,4 +317,17 @@ public interface BaseMapper {
      * @throw
      */
     void saveAccessSite(AccessSite inData);
+
+    /**
+     * @Description TODO
+     * @Title searchFieldFunctionList
+      * @param  
+     * @author rq
+     * @date 2023/10/17 16:54 
+     * @return List<PlmFieldFunctionListData>
+     * @throw
+     */
+    List<PlmFieldFunctionListData> searchFieldFunctionList();
+
+    List<PlmFieldListData> searchFieldListWithFunction(PlmFieldListData inData);
 }

src/main/java/com/spring/modules/base/data/PlmFieldFunctionListData.java

@@ -0,0 +1,9 @@
+package com.spring.modules.base.data;
+
+import com.spring.modules.base.entity.PlmFieldFunctionList;
+import org.apache.ibatis.type.Alias;
+
+@Alias("PlmFieldFunctionListData")
+public class PlmFieldFunctionListData extends PlmFieldFunctionList {
+
+}

src/main/java/com/spring/modules/base/data/PlmFieldListData.java

@@ -0,0 +1,9 @@
+package com.spring.modules.base.data;
+
+import com.spring.modules.base.entity.PlmFieldList;
+import org.apache.ibatis.type.Alias;
+
+@Alias("PlmFieldListData")
+public class PlmFieldListData extends PlmFieldList {
+
+}

src/main/java/com/spring/modules/base/entity/PlmFieldFunctionList.java

@@ -0,0 +1,69 @@
+package com.spring.modules.base.entity;
+
+public class PlmFieldFunctionList {
+    /**
+     * 功能编码
+     */
+    private String functionId;
+
+    /**
+     * 功能名称
+     */
+    private String functionName;
+
+    /**
+     * 功能分组
+     */
+    private String functionGroup;
+
+    /**
+     * 分组排序
+     */
+    private Integer orderGroup;
+
+    /**
+     * 功能排序
+     */
+    private Integer orderFunction;
+
+    public String getFunctionId() {
+        return functionId;
+    }
+
+    public void setFunctionId(String functionId) {
+        this.functionId = functionId;
+    }
+
+    public String getFunctionName() {
+        return functionName;
+    }
+
+    public void setFunctionName(String functionName) {
+        this.functionName = functionName;
+    }
+
+    public String getFunctionGroup() {
+        return functionGroup;
+    }
+
+    public void setFunctionGroup(String functionGroup) {
+        this.functionGroup = functionGroup;
+    }
+
+    public Integer getOrderGroup() {
+        return orderGroup;
+    }
+
+    public void setOrderGroup(Integer orderGroup) {
+        this.orderGroup = orderGroup;
+    }
+
+    public Integer getOrderFunction() {
+        return orderFunction;
+    }
+
+    public void setOrderFunction(Integer orderFunction) {
+        this.orderFunction = orderFunction;
+    }
+}
+

src/main/java/com/spring/modules/base/entity/PlmFieldList.java

@@ -0,0 +1,56 @@
+package com.spring.modules.base.entity;
+
+public class PlmFieldList {
+    /**
+     * 字段id
+     */
+    private String fieldId;
+
+    /**
+     * 字段描述
+     */
+    private String fieldDesc;
+
+    /**
+     * 功能Id
+     */
+    private String functionId;
+
+    /**
+     * 字段名
+     */
+    private String fieldName;
+
+    public String getFieldId() {
+        return fieldId;
+    }
+
+    public void setFieldId(String fieldId) {
+        this.fieldId = fieldId;
+    }
+
+    public String getFieldDesc() {
+        return fieldDesc;
+    }
+
+    public void setFieldDesc(String fieldDesc) {
+        this.fieldDesc = fieldDesc;
+    }
+
+    public String getFunctionId() {
+        return functionId;
+    }
+
+    public void setFunctionId(String functionId) {
+        this.functionId = functionId;
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public void setFieldName(String fieldName) {
+        this.fieldName = fieldName;
+    }
+}
+

src/main/java/com/spring/modules/base/service/BaseService.java

@@ -1,9 +1,6 @@
 package com.spring.modules.base.service;
 
-import com.spring.modules.base.data.AccessProjectData;
-import com.spring.modules.base.data.BuData;
-import com.spring.modules.base.data.BuUserData;
-import com.spring.modules.base.data.SaveAccessSiteData;
+import com.spring.modules.base.data.*;
 import com.spring.modules.base.entity.CompanyData;
 import com.spring.modules.base.entity.*;
 import com.spring.modules.base.utils.ResponseData;
@@ -206,4 +203,26 @@ public interface BaseService {
      * @throw
      */
     void saveAccessSiteForSite(SaveAccessSiteData inData);
+
+    /**
+     * @Description TODO
+     * @Title searchFieldFunctionList
+      * @param
+     * @author rq
+     * @date 2023/10/17 16:51
+     * @return List<PlmFieldFunctionListData>
+     * @throw
+     */
+    List<PlmFieldFunctionListData> searchFieldFunctionList();
+
+    /**
+     * @Description TODO
+     * @Title searchFieldListWithFunction
+      * @param inData
+     * @author rq
+     * @date 2023/10/17 17:50
+     * @return List<PlmFieldListData>
+     * @throw
+     */
+    List<PlmFieldListData> searchFieldListWithFunction(PlmFieldListData inData);
 }

src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java

@@ -5,10 +5,7 @@ package com.spring.modules.base.service.Impl;
 import com.spring.common.constant.SysMsgConstant;
 
 import com.spring.modules.base.dao.BaseMapper;
-import com.spring.modules.base.data.AccessProjectData;
-import com.spring.modules.base.data.BuData;
-import com.spring.modules.base.data.BuUserData;
-import com.spring.modules.base.data.SaveAccessSiteData;
+import com.spring.modules.base.data.*;
 import com.spring.modules.base.entity.CompanyData;
 import com.spring.modules.base.entity.*;
 import com.spring.modules.base.service.BaseService;
@@ -247,5 +244,13 @@ public class BaseServiceImpl implements BaseService {
         }
     }
 
+    @Override
+    public List<PlmFieldFunctionListData> searchFieldFunctionList(){
+        return baseMapper.searchFieldFunctionList();
+    }
 
+    @Override
+    public List<PlmFieldListData> searchFieldListWithFunction(PlmFieldListData inData){
+        return  baseMapper.searchFieldListWithFunction(inData);
+    }
 }

src/main/resources/mapper/base/BaseMapper.xml

@@ -212,4 +212,15 @@
     <insert id="saveAccessSite" >
         insert  into AccessSite (UserID,Site) values(#{userid},#{site})
     </insert>
+
+    <select id="searchFieldFunctionList" resultType="PlmFieldFunctionListData">
+        select function_id,function_name,function_group
+        from plm_field_function_list
+        order by order_group,order_function
+
+    </select>
+
+    <select id="searchFieldListWithFunction" resultType="PlmFieldListData">
+        select field_id,field_desc,function_id,field_name from plm_field_list where function_id=#{functionId}
+    </select>
 </mapper>