Browse Source

机构类型

luowei 1 year ago
parent
commit
ba8d8b96ef

+ 2 - 1
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysNfcBindController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.domain.SysAreaCheck;
+import com.xunmei.system.dto.SysNfcBindDTO;
 import com.xunmei.system.service.ISysAreaCheckService;
 import com.xunmei.system.service.ISysAreaService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +51,7 @@ public class SysNfcBindController extends BaseController {
     @ApiOperation(value = "查询SysNfcBind列表")
     @RequiresPermissions("system:bind:list")
     @GetMapping("/list")
-    public TableDataInfo<SysNfcBind> list(SysNfcBind sysNfcBind) {
+    public TableDataInfo<SysNfcBind> list(SysNfcBindDTO sysNfcBind) {
         return sysNfcBindService.selectPage(sysNfcBind);
     }
 

+ 15 - 0
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/dto/SysNfcBindDTO.java

@@ -0,0 +1,15 @@
+package com.xunmei.system.dto;
+
+import com.xunmei.system.domain.SysNfcBind;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/12/5
+ */
+@Data
+public class SysNfcBindDTO extends SysNfcBind {
+    @ApiModelProperty(value = "机构类型")
+    private String orgType;
+}

+ 2 - 1
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysNfcBindMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.domain.SysNfcBind;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.system.dto.SysNfcBindDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -40,7 +41,7 @@ public interface SysNfcBindMapper extends BaseMapper<SysNfcBind> {
      * @param info
      * @return
      */
-    Page<SysNfcBind> selectNFCPage(Page<SysNfcBind> page, @Param("info") SysNfcBind info);
+    Page<SysNfcBind> selectNFCPage(Page<SysNfcBind> page, @Param("info") SysNfcBindDTO info);
 
     SysNfcBind selectSysNfcBindByCode(String code);
 

+ 2 - 1
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysNfcBindService.java

@@ -6,6 +6,7 @@ import com.xunmei.system.domain.SysNfcBind;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.system.dto.SysNfcBindDTO;
 
 /**
  * 【NFC管理】Service接口
@@ -72,5 +73,5 @@ public interface ISysNfcBindService extends IService<SysNfcBind> {
      * @param sysNfcBind 查询条件对象
      * @return Page
      */
-    TableDataInfo<SysNfcBind> selectPage(SysNfcBind sysNfcBind);
+    TableDataInfo<SysNfcBind> selectPage(SysNfcBindDTO sysNfcBind);
 }

+ 2 - 1
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysNfcBindServiceImpl.java

@@ -12,6 +12,7 @@ import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.domain.SysAreaCheck;
 
+import com.xunmei.system.dto.SysNfcBindDTO;
 import com.xunmei.system.service.ISysAreaCheckService;
 import com.xunmei.system.service.ISysAreaService;
 import com.xunmei.system.service.ISysNfcBindService;
@@ -52,7 +53,7 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
     private ISysAreaService sysAreaService;
 
     @Override
-    public TableDataInfo<SysNfcBind> selectPage(SysNfcBind sysNfcBind) {
+    public TableDataInfo<SysNfcBind> selectPage(SysNfcBindDTO sysNfcBind) {
         //未删除
         sysNfcBind.setDelFlag("0");
         Page<SysNfcBind> page;

+ 3 - 0
soc-modules/soc-modules-system/src/main/resources/mapper/system/SysNfcBindMapper.xml

@@ -111,6 +111,9 @@
         <if test="info.areaName != null  and info.areaName != ''">
             and a.area_name like concat("%",#{info.areaName},"%")
         </if>
+          <if test="info.orgType !=null and info.orgType !=''">
+              and b.type=#{info.orgType}
+          </if>
         <if test="info.code != null  and info.code != ''">
             and a.code like concat("%",#{info.code},"%")
         </if>