添加样表设备部门过滤

sample-form-manager/db/module.sql

@@ -307,6 +307,7 @@ CREATE TABLE mortals_xhx_device_matter_datum(
         `createTime` datetime      COMMENT '创建时间',
         `createUserId` bigint(20)      COMMENT '创建用户',
         `updateTime` datetime      COMMENT '修改时间',
+        `materiaFullName` varchar(1024)      COMMENT '事项全称',
         PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备事项申请材料业务';
 
@@ -314,3 +315,4 @@ CREATE TABLE mortals_xhx_device_matter_datum(
 
 
 
+

sample-form-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceMatterDatumEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.device.model.vo.DeviceMatterDatumVo;
  * 设备事项申请材料业务实体对象
  *
  * @author zxfei
- * @date 2023-03-23
+ * @date 2023-03-29
  */
 
 public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
@@ -68,6 +68,10 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
      * 排序
      */
     private Integer sort;
+    /**
+     * 事项全称
+     */
+    private String materiaFullName;
 
 
 
@@ -254,6 +258,20 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
     public void setSort(Integer sort){
         this.sort = sort;
     }
+    /**
+     * 获取 事项全称
+     * @return String
+     */
+    public String getMateriaFullName(){
+        return materiaFullName;
+    }
+    /**
+     * 设置 事项全称
+     * @param materiaFullName
+     */
+    public void setMateriaFullName(String materiaFullName){
+        this.materiaFullName = materiaFullName;
+    }
 
 
 
@@ -289,6 +307,7 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
         sb.append(",source:").append(getSource());
         sb.append(",isRecommend:").append(getIsRecommend());
         sb.append(",sort:").append(getSort());
+        sb.append(",materiaFullName:").append(getMateriaFullName());
         return sb.toString();
     }
 
@@ -319,5 +338,7 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
         this.isRecommend = null;
 
         this.sort = null;
+
+        this.materiaFullName = null;
     }
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceMatterDatumQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
  * 设备事项申请材料业务查询对象
  *
  * @author zxfei
- * @date 2023-03-23
+ * @date 2023-03-29
  */
 public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
     /** 开始 主键，自增长 */
@@ -186,6 +186,11 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
     /** 结束 修改时间 */
     private String updateTimeEnd;
 
+    /** 事项全称 */
+    private List<String> materiaFullNameList;
+
+    /** 事项全称排除列表 */
+    private List <String> materiaFullNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<DeviceMatterDatumQuery> orConditionList;
 
@@ -1179,6 +1184,38 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 事项全称
+     * @return materiaFullNameList
+     */
+    public List<String> getMateriaFullNameList(){
+        return this.materiaFullNameList;
+    }
+
+    /**
+     * 设置 事项全称
+     * @param materiaFullNameList
+     */
+    public void setMateriaFullNameList(List<String> materiaFullNameList){
+        this.materiaFullNameList = materiaFullNameList;
+    }
+
+    /**
+     * 获取 事项全称
+     * @return materiaFullNameNotList
+     */
+    public List<String> getMateriaFullNameNotList(){
+        return this.materiaFullNameNotList;
+    }
+
+    /**
+     * 设置 事项全称
+     * @param materiaFullNameNotList
+     */
+    public void setMateriaFullNameNotList(List<String> materiaFullNameNotList){
+        this.materiaFullNameNotList = materiaFullNameNotList;
+    }
+
     /**
      * 设置  主键，自增长
      * @param id
@@ -1781,6 +1818,25 @@ public class DeviceMatterDatumQuery extends DeviceMatterDatumEntity {
     }
 
 
+
+    /**
+     * 设置 事项全称
+     * @param materiaFullName
+     */
+    public DeviceMatterDatumQuery materiaFullName(String materiaFullName){
+        setMateriaFullName(materiaFullName);
+        return this;
+    }
+
+    /**
+     * 设置 事项全称
+     * @param materiaFullNameList
+     */
+    public DeviceMatterDatumQuery materiaFullNameList(List<String> materiaFullNameList){
+        this.materiaFullNameList = materiaFullNameList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

sample-form-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceMatterDatumServiceImpl.java

@@ -66,6 +66,8 @@ public class DeviceMatterDatumServiceImpl extends AbstractCRUDServiceImpl<Device
             if(!ObjectUtils.isEmpty(matterEntity)){
                 entity.setMatterCode(matterEntity.getMatterNo());
                 entity.setMatterName(matterEntity.getMatterName());
+                entity.setMateriaFullName(matterEntity.getMatterFullName());
+                entity.setIsRecommend(matterEntity.getIsRecommend());
                 entity.setDeptId(matterEntity.getDeptId());
                 entity.setDeptCode(matterEntity.getDeptCode());
                 entity.setDeptName(matterEntity.getDeptName());