Browse Source

续费列表已删除产品名称显示

wangyu 6 years ago
parent
commit
957296cee6

+ 1 - 1
diagbotman-service/src/main/java/com/diagbot/facade/UserRenewalsFacade.java

@@ -113,7 +113,7 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
             userRenewalsWrapper.setUserId(userIds);
         }
         List<RenewalsInfosDTO> list = this.selectUserRenewals(page,userRenewalsWrapper).getRecords();
-        List<ProductLineDTO> productList =lantoneProductFacade.productLines();
+        List<ProductLineDTO> productList =lantoneProductFacade.productLinesB();
         Map<Long, ProductLineDTO> productMap = EntityUtil.makeEntityMap(productList,"id");
         List<Long> userIds =new ArrayList<>();
         for (RenewalsInfosDTO renewalsInfosDTO:list) {

+ 7 - 0
diagbotman-service/src/main/java/com/diagbot/mapper/LantoneProductMapper.java

@@ -28,6 +28,13 @@ public interface LantoneProductMapper extends BaseMapper<LantoneProduct> {
      */
     List<ProductLineDTO> productLines();
 
+    /**
+     * @Description: 查询所有产品信息系包括已删除的
+     * @Author: wangyu
+     * @Date: 9:49 2018/9/18
+     */
+    List<ProductLineDTO> productLinesB();
+
     /**
      * @Description: 根据产品名称分页查询
      * @Author: wangyu

+ 7 - 0
diagbotman-service/src/main/java/com/diagbot/service/LantoneProductService.java

@@ -27,6 +27,13 @@ public interface LantoneProductService extends IService<LantoneProduct> {
      */
     List<ProductLineDTO> productLines();
 
+    /**
+     * @Description: 查询所有产品信息系包括已删除的
+     * @Author: wangyu
+     * @Date: 9:49 2018/9/18
+     */
+    List<ProductLineDTO> productLinesB();
+
     /**
      * @Description: 朗通查询所有产品线
      * @Author: wangyu

+ 10 - 0
diagbotman-service/src/main/java/com/diagbot/service/impl/LantoneProductServiceImpl.java

@@ -39,6 +39,16 @@ public class LantoneProductServiceImpl extends ServiceImpl<LantoneProductMapper,
         return baseMapper.productLines();
     }
 
+    /**
+     * @Description: 显示朗通产品线
+     * @Author: wangyu
+     * @Date: 13:29 2018/9/18
+     */
+    @Override
+    public List<ProductLineDTO> productLinesB() {
+        return baseMapper.productLinesB();
+    }
+
     /**
      * @Description: 查询朗通所有产品线
      * @Author: wangyu

+ 5 - 0
diagbotman-service/src/main/resources/mapper/LantoneProductMapper.xml

@@ -47,6 +47,11 @@
         SELECT * FROM `diag_lantone_product` WHERE is_deleted = 'N'
     </select>
 
+
+    <select id="productLinesB" resultType="com.diagbot.dto.ProductLineDTO">
+        SELECT * FROM `diag_lantone_product`
+    </select>
+
     <!--根据产品名称分页查询-->
     <select id="selectProduct" resultType="com.diagbot.dto.LantoneProductDTO">
         SELECT