调整溯源供应商查询接口

src/main/java/com/yunfeiyun/agmp/tss/controller/WmsSupplierController.java

@@ -13,6 +13,7 @@ import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.common.web.system.service.ISysResService;
 import com.yunfeiyun.agmp.tss.domain.WmsSupplier;
 import com.yunfeiyun.agmp.tss.domain.reqvo.WmsSupplierAddReqVo;
+import com.yunfeiyun.agmp.tss.domain.resvo.WmsSupplierListResVo;
 import com.yunfeiyun.agmp.tss.service.IWmsSupplierService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -45,9 +46,9 @@ public class WmsSupplierController extends BaseController {
     @PreAuthorize("@ss.hasPermi('wms:supplier:list')")
     @GetMapping("/list")
     public TableDataInfo list(WmsSupplier wmsSupplier) {
-        startPage();
         wmsSupplier.setTid(SecurityUtils.getTid());
-        List<WmsSupplier> list = wmsSupplierService.selectWmsSupplierList(wmsSupplier);
+        startPage();
+        List<WmsSupplierListResVo> list = wmsSupplierService.selectWmsSupplierListResVoList(wmsSupplier);
         return getDataTable(list);
     }
 
@@ -59,8 +60,8 @@ public class WmsSupplierController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response,@RequestBody WmsSupplier wmsSupplier) {
         wmsSupplier.setTid(SecurityUtils.getTid());
-        List<WmsSupplier> list = wmsSupplierService.selectWmsSupplierList(wmsSupplier);
-        ExcelUtil<WmsSupplier> util = new ExcelUtil<WmsSupplier>(WmsSupplier.class);
+        List<WmsSupplierListResVo> list = wmsSupplierService.selectWmsSupplierListResVoList(wmsSupplier);
+        ExcelUtil<WmsSupplierListResVo> util = new ExcelUtil<>(WmsSupplierListResVo.class);
         util.exportExcel(response, list, "供应商数据");
     }
 

src/main/java/com/yunfeiyun/agmp/tss/domain/WmsSupplier.java

@@ -2,8 +2,6 @@ package com.yunfeiyun.agmp.tss.domain;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
 import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
-import com.yunfeiyun.agmp.common.enums.DictTypeEnums;
-import com.yunfeiyun.agmp.common.utils.DictUtils;
 import lombok.Data;
 
 /**
@@ -60,9 +58,7 @@ public class WmsSupplier extends BaseEntity {
 
     private String tid;
 
-    public String getSupplierTypeContent(){
-        return DictUtils.getDictLabel(DictTypeEnums.AGM_PROCESS_TYPE.getCode(), supplierType);
-    }
+
 
 
 }

src/main/java/com/yunfeiyun/agmp/tss/domain/resvo/WmsSupplierListResVo.java

@@ -0,0 +1,13 @@
+package com.yunfeiyun.agmp.tss.domain.resvo;
+
+import com.yunfeiyun.agmp.common.enums.DictTypeEnums;
+import com.yunfeiyun.agmp.common.utils.DictUtils;
+import com.yunfeiyun.agmp.tss.domain.WmsSupplier;
+import lombok.Data;
+
+@Data
+public class WmsSupplierListResVo extends WmsSupplier {
+    public String getSupplierTypeContent(){
+        return DictUtils.getDictLabel(DictTypeEnums.AGM_PROCESS_TYPE.getCode(), super.getSupplierType());
+    }
+}

src/main/java/com/yunfeiyun/agmp/tss/mapper/WmsSupplierMapper.java

@@ -1,6 +1,7 @@
 package com.yunfeiyun.agmp.tss.mapper;
 
 import com.yunfeiyun.agmp.tss.domain.WmsSupplier;
+import com.yunfeiyun.agmp.tss.domain.resvo.WmsSupplierListResVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -60,4 +61,6 @@ public interface WmsSupplierMapper {
      * @return 结果
      */
     public int deleteWmsSupplierBySupplierIds(@Param("supplierIds") String[] supplierIds, @Param("tid") String tid);
+
+    List<WmsSupplierListResVo> selectWmsSupplierListResVoList(WmsSupplier wmsSupplier);
 }

src/main/java/com/yunfeiyun/agmp/tss/service/IWmsSupplierService.java

@@ -3,6 +3,7 @@ package com.yunfeiyun.agmp.tss.service;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.tss.domain.WmsSupplier;
 import com.yunfeiyun.agmp.tss.domain.reqvo.WmsSupplierAddReqVo;
+import com.yunfeiyun.agmp.tss.domain.resvo.WmsSupplierListResVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -64,4 +65,6 @@ public interface IWmsSupplierService  {
     public int deleteWmsSupplierBySupplierId(String supplierId,String tid);
 
     public AjaxResult upload(MultipartFile file);
+
+    List<WmsSupplierListResVo> selectWmsSupplierListResVoList(WmsSupplier wmsSupplier);
 }

src/main/java/com/yunfeiyun/agmp/tss/service/impl/WmsSupplierServiceImpl.java

@@ -12,6 +12,7 @@ import com.yunfeiyun.agmp.common.web.system.mapper.SysResMapper;
 import com.yunfeiyun.agmp.common.web.system.service.ISysResService;
 import com.yunfeiyun.agmp.tss.domain.WmsSupplier;
 import com.yunfeiyun.agmp.tss.domain.reqvo.WmsSupplierAddReqVo;
+import com.yunfeiyun.agmp.tss.domain.resvo.WmsSupplierListResVo;
 import com.yunfeiyun.agmp.tss.mapper.WmsSupplierMapper;
 import com.yunfeiyun.agmp.tss.service.IWmsSupplierService;
 import org.slf4j.Logger;
@@ -152,4 +153,9 @@ public class WmsSupplierServiceImpl implements IWmsSupplierService {
             return AjaxResult.error(ErrorCode.UPLOAD_FAIL.getCode());
         }
     }
+
+    @Override
+    public List<WmsSupplierListResVo> selectWmsSupplierListResVoList(WmsSupplier wmsSupplier) {
+        return wmsSupplierMapper.selectWmsSupplierListResVoList(wmsSupplier);
+    }
 }

src/main/resources/mapper/WmsSupplierMapper.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="supplierCreator"    column="supplierCreator"    />
         <result property="supplierCreateddate"    column="supplierCreateddate"    />
         <result property="supplierType" column="supplierType"/>
-        <result property="cusareaId" column="cusareaId"></result>
+        <result property="cusareaId" column="cusareaId"/>
         <result property="tid" column="tid"/>
     </resultMap>
 
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplierRemark != null  and supplierRemark != ''"> and supplierRemark = #{supplierRemark}</if>
             <if test="supplierCreator != null  and supplierCreator != ''"> and supplierCreator = #{supplierCreator}</if>
             <if test="supplierCreateddate != null  and supplierCreateddate != ''"> and supplierCreateddate = #{supplierCreateddate}</if>
-            <if test="supplierType != null  and supplierType != ''"> and supplierType = #{supplierType}</if>
+            <if test="supplierType != null  and supplierType != ''"> and a.supplierType = #{supplierType}</if>
             <if test="cusareaId != null and cusareaId != ''">and cusareaId = #{cusareaId}</if>
         </where>
     </select>
@@ -102,4 +102,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
         and tid = #{tid}
     </delete>
+
+    <select id="selectWmsSupplierListResVoList"
+            resultType="com.yunfeiyun.agmp.tss.domain.resvo.WmsSupplierListResVo">
+        select supplierId, supplierName, supplierLinkman, supplierLinktel, supplierLinkaddress, supplierRemark, supplierCreator, supplierCreateddate,supplierType, b.resUrl as supplierPreview, b.resId as supplierQualificationResId, cusareaId from WmsSupplier a
+        LEFT JOIN SysRes b on b.resBusId = a.supplierId
+        <where>
+            a.tid = #{tid}
+            <if test="supplierName != null  and supplierName != ''"> and supplierName like concat('%', #{supplierName}, '%')</if>
+            <if test="supplierLinkman != null  and supplierLinkman != ''"> and supplierLinkman = #{supplierLinkman}</if>
+            <if test="supplierLinktel != null  and supplierLinktel != ''"> and supplierLinktel = #{supplierLinktel}</if>
+            <if test="supplierLinkaddress != null  and supplierLinkaddress != ''"> and supplierLinkaddress = #{supplierLinkaddress}</if>
+            <if test="supplierRemark != null  and supplierRemark != ''"> and supplierRemark = #{supplierRemark}</if>
+            <if test="supplierCreator != null  and supplierCreator != ''"> and supplierCreator = #{supplierCreator}</if>
+            <if test="supplierCreateddate != null  and supplierCreateddate != ''"> and supplierCreateddate = #{supplierCreateddate}</if>
+            <if test="supplierType != null  and supplierType != ''"> and a.supplierType = #{supplierType}</if>
+            <if test="cusareaId != null and cusareaId != ''">and cusareaId = #{cusareaId}</if>
+        </where>
+    </select>
 </mapper>