Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/highServer/JnbHighServerController.java

@@ -108,4 +108,22 @@ public class JnbHighServerController extends BaseController {
     public AjaxResult liveBroadcastDetails(@PathVariable Long id) {
         return success(jnbHighServerService.liveBroadcastDetails(id));
     }
+
+    /**
+     * 小程序获取生活服务列表
+     */
+    @GetMapping("/lifeServicesList")
+    public TableDataInfo getLifeServices(JnbHighServer jnbHighServer) {
+        startPage();
+        List<JnbHighServerVO> list = jnbHighServerService.getLifeServices(jnbHighServer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 小程序获取生活服务详情
+     */
+    @GetMapping("/lifeServicesDetails/{id}")
+    public AjaxResult lifeServicesDetails(@PathVariable Long id) {
+        return success(jnbHighServerService.lifeServicesDetails(id));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/quotations/JnbQuotationsConfigController.java

@@ -38,19 +38,18 @@ public class JnbQuotationsConfigController extends BaseController {
     /**
      * 查询行情产品配置列表
      */
-    @PreAuthorize("@ss.hasPermi('jnb:config:list')")
+//    @PreAuthorize("@ss.hasPermi('jnb:config:list')")
     @GetMapping("/list")
     public TableDataInfo list(JnbQuotationsConfig jnbQuotationsConfig) {
         startPage();
         List<JnbQuotationsConfig> list = jnbQuotationsConfigService.selectJnbQuotationsConfigList(jnbQuotationsConfig);
-        System.out.println(list);
         return getDataTable(list);
     }
 
     /**
      * 获取行情产品配置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('jnb:config:query')")
+//    @PreAuthorize("@ss.hasPermi('jnb:config:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(jnbQuotationsConfigService.selectJnbQuotationsConfigById(id));
@@ -59,7 +58,7 @@ public class JnbQuotationsConfigController extends BaseController {
     /**
      * 新增行情产品配置
      */
-    @PreAuthorize("@ss.hasPermi('jnb:config:add')")
+//    @PreAuthorize("@ss.hasPermi('jnb:config:add')")
     @Log(title = "行情产品配置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody JnbQuotationsConfig jnbQuotationsConfig) {
@@ -74,7 +73,7 @@ public class JnbQuotationsConfigController extends BaseController {
     /**
      * 修改行情产品配置
      */
-    @PreAuthorize("@ss.hasPermi('jnb:config:edit')")
+//    @PreAuthorize("@ss.hasPermi('jnb:config:edit')")
     @Log(title = "行情产品配置", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody JnbQuotationsConfig jnbQuotationsConfig) {
@@ -89,10 +88,10 @@ public class JnbQuotationsConfigController extends BaseController {
     /**
      * 删除行情产品配置
      */
-    @PreAuthorize("@ss.hasPermi('jnb:config:remove')")
+//    @PreAuthorize("@ss.hasPermi('jnb:config:remove')")
     @Log(title = "行情产品配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{id}")
-    public AjaxResult remove(@PathVariable Long id) {
+    public AjaxResult remove(@PathVariable("id") Long id) {
         int i = jnbQuotationsConfigService.deleteJnbQuotationsConfigByIds(id);
         if (i > 0){
             return toAjax(i);
@@ -104,7 +103,7 @@ public class JnbQuotationsConfigController extends BaseController {
     /**
      * 查询树结构
      */
-    @PreAuthorize("@ss.hasPermi('jnb:config:list')")
+//    @PreAuthorize("@ss.hasPermi('jnb:config:list')")
     @Log(title = "行情产品配置")
     @GetMapping("all")
     public AjaxResult all(JnbQuotationsConfig jnbQuotationsConfig) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/quotations/JnbQuotationsController.java

@@ -31,7 +31,7 @@ public class JnbQuotationsController extends BaseController
     /**
      * 查询行情列表
      */
-    @PreAuthorize("@ss.hasPermi('jnb:quotations:list')")
+//    @PreAuthorize("@ss.hasPermi('jnb:quotations:list')")
     @GetMapping("/list")
     public TableDataInfo list(JnbQuotations jnbQuotations)
     {
@@ -43,17 +43,17 @@ public class JnbQuotationsController extends BaseController
     /**
      * 获取行情详细信息
      */
-    @PreAuthorize("@ss.hasPermi('jnb:quotations:query')")
-    @GetMapping(value = "/{id}/{type}")
-    public AjaxResult getInfo(@PathVariable("id") Long id,@PathVariable("type")Integer type)
+//    @PreAuthorize("@ss.hasPermi('jnb:quotations:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(jnbQuotationsService.selectJnbQuotationsById(id,type));
+        return success(jnbQuotationsService.selectJnbQuotationsById(id));
     }
 
     /**
      * 新增行情
      */
-    @PreAuthorize("@ss.hasPermi('jnb:quotations:add')")
+//    @PreAuthorize("@ss.hasPermi('jnb:quotations:add')")
     @Log(title = "行情", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody JnbQuotations jnbQuotations)
@@ -69,7 +69,7 @@ public class JnbQuotationsController extends BaseController
     /**
      * 修改行情
      */
-    @PreAuthorize("@ss.hasPermi('jnb:quotations:edit')")
+//    @PreAuthorize("@ss.hasPermi('jnb:quotations:edit')")
     @Log(title = "行情", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody JnbQuotations jnbQuotations)
@@ -81,11 +81,11 @@ public class JnbQuotationsController extends BaseController
     /**
      * 删除行情
      */
-    @PreAuthorize("@ss.hasPermi('jnb:quotations:remove')")
+//    @PreAuthorize("@ss.hasPermi('jnb:quotations:remove')")
     @Log(title = "行情", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}/{type}")
-    public AjaxResult remove(@PathVariable Long[] ids,@PathVariable("type")Integer type)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable("ids") Long[] ids)
     {
-        return toAjax(jnbQuotationsService.deleteJnbQuotationsByIds(ids,type));
+        return toAjax(jnbQuotationsService.deleteJnbQuotationsByIds(ids));
     }
 }

sooka-jnb/src/main/java/com/sooka/jnb/handleAffairs/domain/TopicType.java

@@ -7,6 +7,8 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * 主题类型配置对象 jnb_topic_type
@@ -33,7 +35,9 @@ public class TopicType extends BaseEntity
 
     /** 办理对象（字典值：个人or法人） */
     @Excel(name = "办理对象", readConverterExp = "字=典值：个人or法人",dictType = "object_application")
-    @NotBlank(message = "办理对象不能为空")
     private String objectOfHandling;
 
+    @NotEmpty(message = "办理对象不能为空")
+    private List<String> objectOfHandlingArray;
+
 }

sooka-jnb/src/main/java/com/sooka/jnb/handleAffairs/service/impl/TopicTypeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.jnb.handleAffairs.service.impl;
 
+import java.util.Arrays;
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -29,8 +30,9 @@ public class TopicTypeServiceImpl implements ITopicTypeService
      */
     @Override
     public TopicType selectTopicTypeById(Long id)
-    {
-        return topicTypeMapper.selectTopicTypeById(id);
+    {   TopicType topicType = topicTypeMapper.selectTopicTypeById(id);
+        topicType.setObjectOfHandlingArray(Arrays.asList(topicType.getObjectOfHandling().split(",")));
+        return topicType;
     }
 
     /**
@@ -41,8 +43,11 @@ public class TopicTypeServiceImpl implements ITopicTypeService
      */
     @Override
     public List<TopicType> selectTopicTypeList(TopicType topicType)
-    {
-        return topicTypeMapper.selectTopicTypeList(topicType);
+    {   List<TopicType> list = topicTypeMapper.selectTopicTypeList(topicType);
+        list.forEach(e->{
+            e.setObjectOfHandlingArray(Arrays.asList(e.getObjectOfHandling().split(",")));
+        });
+        return list;
     }
 
     /**
@@ -57,6 +62,7 @@ public class TopicTypeServiceImpl implements ITopicTypeService
         topicType.setCreateTime(DateUtils.getNowDate());
         topicType.setCreateBy(SecurityUtils.getUserId().toString());
         topicType.setDelFlag("0");
+        topicType.setObjectOfHandling(String.join(",",topicType.getObjectOfHandlingArray()));
         return topicTypeMapper.insertTopicType(topicType);
     }
 
@@ -71,6 +77,7 @@ public class TopicTypeServiceImpl implements ITopicTypeService
     {
         topicType.setUpdateTime(DateUtils.getNowDate());
         topicType.setUpdateBy(SecurityUtils.getUserId().toString());
+        topicType.setObjectOfHandling(String.join(",",topicType.getObjectOfHandlingArray()));
         return topicTypeMapper.updateTopicType(topicType);
     }
 

sooka-jnb/src/main/java/com/sooka/jnb/highServer/mapper/JnbHighServerMapper.java

@@ -64,4 +64,8 @@ public interface JnbHighServerMapper {
     List<JnbHighServerVO> getLiveBroadcast(JnbHighServer jnbHighServer);
 
     JnbHighServerVO liveBroadcastDetails(Long id);
+
+    List<JnbHighServerVO> getLifeServices(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO lifeServicesDetails(Long id);
 }

sooka-jnb/src/main/java/com/sooka/jnb/highServer/service/IJnbHighServerService.java

@@ -63,4 +63,8 @@ public interface IJnbHighServerService {
     List<JnbHighServerVO> getLiveBroadcast(JnbHighServer jnbHighServer);
 
     JnbHighServerVO liveBroadcastDetails(Long id);
+
+    List<JnbHighServerVO> getLifeServices(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO lifeServicesDetails(Long id);
 }

sooka-jnb/src/main/java/com/sooka/jnb/highServer/service/impl/JnbHighServerServiceImpl.java

@@ -152,4 +152,24 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
         }
         return jnbHighServerVO;
     }
+
+    @Override
+    public List<JnbHighServerVO> getLifeServices(JnbHighServer jnbHighServer) {
+        List<JnbHighServerVO> list = jnbHighServerMapper.getLifeServices(jnbHighServer);
+        for (JnbHighServerVO var : list) {
+            if (StringUtils.isNotEmpty(var.getImgUrlList())) {
+                var.setPictureList(Arrays.asList(var.getImgUrlList().split(",")));
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public JnbHighServerVO lifeServicesDetails(Long id) {
+        JnbHighServerVO jnbHighServerVO = jnbHighServerMapper.lifeServicesDetails(id);
+        if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
+            jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
+        }
+        return jnbHighServerVO;
+    }
 }

sooka-jnb/src/main/java/com/sooka/jnb/quotations/domain/JnbQuotations.java

@@ -55,15 +55,6 @@ public class JnbQuotations extends BaseEntity
     /** 删除状态 */
     private String delFlag;
 
-    /** 产品配置id */
-    @Excel(name = "产品配置id")
-    private String configId;
-
-    /** 图片路径 */
-    @TableField(exist = false)
-    private String imgUrlList;
-
-    @TableField(exist = false)
-    private Integer imgType;
+    private String url;
 
 }

sooka-jnb/src/main/java/com/sooka/jnb/quotations/domain/JnbQuotationsConfig.java

@@ -42,4 +42,6 @@ public class JnbQuotationsConfig extends BaseEntity
 
     /** 子分类 */
     private List<JnbQuotationsConfig> children;
+
+    private  String imgUrlList;
 }

sooka-jnb/src/main/java/com/sooka/jnb/quotations/service/IJnbQuotationsConfigService.java

@@ -50,7 +50,7 @@ public interface IJnbQuotationsConfigService
     /**
      * 批量删除行情产品配置
      * 
-     * @param ids 需要删除的行情产品配置主键集合
+     * @param id 需要删除的行情产品配置主键集合
      * @return 结果
      */
     public int deleteJnbQuotationsConfigByIds(Long id);

sooka-jnb/src/main/java/com/sooka/jnb/quotations/service/IJnbQuotationsService.java

@@ -18,7 +18,7 @@ public interface IJnbQuotationsService
      * @param id 行情主键
      * @return 行情
      */
-    public JnbQuotations selectJnbQuotationsById(Long id,Integer type);
+    public JnbQuotations selectJnbQuotationsById(Long id);
 
     /**
      * 查询行情列表
@@ -50,6 +50,6 @@ public interface IJnbQuotationsService
      * @param ids 需要删除的行情主键集合
      * @return 结果
      */
-    public int deleteJnbQuotationsByIds(Long[] ids ,Integer type);
+    public int deleteJnbQuotationsByIds(Long[] ids);
 
 }

sooka-jnb/src/main/java/com/sooka/jnb/quotations/service/impl/JnbQuotationsConfigServiceImpl.java

@@ -1,13 +1,13 @@
 package com.sooka.jnb.quotations.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.sooka.jnb.highServer.domain.JnbHighServerImg;
+import com.sooka.jnb.highServer.mapper.JnbHighServerImgMapper;
+import com.sooka.jnb.quotations.domain.JnbQuotations;
 import com.sooka.jnb.quotations.domain.JnbQuotationsConfig;
 import com.sooka.jnb.quotations.domain.vo.JnbQuotationsTreeVO;
 import com.sooka.jnb.quotations.mapper.JnbQuotationsConfigMapper;
@@ -16,6 +16,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
 
 
 /**
@@ -31,8 +34,9 @@ public class JnbQuotationsConfigServiceImpl implements IJnbQuotationsConfigServi
     @Autowired
     private JnbQuotationsConfigMapper jnbQuotationsConfigMapper;
 
-    @Autowired
-    private RedisTemplate redisTemplate;
+    @Resource
+    private JnbHighServerImgMapper jnbHighServerImgMapper;
+
 
 
     /**
@@ -57,9 +61,8 @@ public class JnbQuotationsConfigServiceImpl implements IJnbQuotationsConfigServi
 //            return (JnbQuotationsTreeVO<JnbQuotationsConfig>) redisTemplate.opsForValue().get(QUOTATIONS_TREE);
 //        }
         List<JnbQuotationsConfig> jnbQuotationsConfigs = jnbQuotationsConfigMapper.selectAllQuotationsConfig(jnbQuotations);
-        JnbQuotationsTreeVO<JnbQuotationsConfig> jnbQuotationsConfig = initTree(jnbQuotationsConfigs);
-//        redisTemplate.boundValueOps(QUOTATIONS_TREE).set(jnbQuotationsConfig, 1, TimeUnit.HOURS);
-        return jnbQuotationsConfig;
+        //        redisTemplate.boundValueOps(QUOTATIONS_TREE).set(jnbQuotationsConfig, 1, TimeUnit.HOURS);
+        return (JnbQuotationsTreeVO<JnbQuotationsConfig>) initTree(jnbQuotationsConfigs);
     }
 
     /**
@@ -93,7 +96,7 @@ public class JnbQuotationsConfigServiceImpl implements IJnbQuotationsConfigServi
         if (firstLevels == null || firstLevels.isEmpty()) {
             //判断fristLevels是否为null(或元素个数为0)
             //必须先判空,否则容易出现空指针异常
-            throw new RuntimeException("行情产品配置数据异常");
+            return new JnbQuotationsTreeVO();
         }
         for (JnbQuotationsConfig firstLevel : firstLevels) {
             // 一级分类对象的id就是二级分类对象的父分类id
@@ -178,6 +181,7 @@ public class JnbQuotationsConfigServiceImpl implements IJnbQuotationsConfigServi
         return jnbQuotationsConfigMapper.updateJnbQuotationsConfig(jnbQuotationsConfig);
     }
 
+
     /**
      * 批量删除行情产品配置
      *

sooka-jnb/src/main/java/com/sooka/jnb/quotations/service/impl/JnbQuotationsServiceImpl.java

@@ -40,12 +40,8 @@ public class JnbQuotationsServiceImpl implements IJnbQuotationsService {
      * @return 行情
      */
     @Override
-    public JnbQuotations selectJnbQuotationsById(Long id,Integer type) {
+    public JnbQuotations selectJnbQuotationsById(Long id) {
         JnbQuotations jnbQuotations = jnbQuotationsMapper.selectJnbQuotationsById(id);
-        String s =jnbHighServerImgMapper.selectAll(id,type);
-        if (null != s) {
-            jnbQuotations.setImgUrlList(jnbHighServerImgMapper.selectAll(id,type));
-        }
         return jnbQuotations;
     }
 
@@ -75,22 +71,6 @@ public class JnbQuotationsServiceImpl implements IJnbQuotationsService {
         jnbQuotations.setCreateBy(SecurityUtils.getUserId().toString());
         jnbQuotations.setCreateTime(DateUtils.getNowDate());
         int insert = jnbQuotationsMapper.insertJnbQuotations(jnbQuotations);
-        if (insert > 0) {
-            List<String> imgUrlList = Arrays.asList(jnbQuotations.getImgUrlList().split(","));
-            if (!ObjectUtils.isEmpty(imgUrlList)) {
-                List<JnbHighServerImg> imgList = new ArrayList<>();
-                imgUrlList.forEach(a -> {
-                    JnbHighServerImg serverImg = new JnbHighServerImg();
-                    serverImg.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
-                    serverImg.setCreateTime(DateUtils.getNowDate());
-                    serverImg.setServerId(jnbQuotations.getId());
-                    serverImg.setImgUrl(a);
-                    serverImg.setType(13);
-                    imgList.add(serverImg);
-                });
-                jnbHighServerImgMapper.saveJnbHighServerImg(imgList);
-            }
-        }
         return insert;
     }
 
@@ -104,28 +84,9 @@ public class JnbQuotationsServiceImpl implements IJnbQuotationsService {
     public int updateJnbQuotations(JnbQuotations jnbQuotations) {
         jnbQuotations.setUpdateBy(SecurityUtils.getUsername());
         jnbQuotations.setUpdateTime(DateUtils.getNowDate());
-        img(jnbQuotations.getImgUrlList(), jnbHighServerImgMapper, jnbQuotations.getId(), jnbQuotations);
         return jnbQuotationsMapper.updateJnbQuotations(jnbQuotations);
     }
 
-    public static void img(String imgUrlList2, JnbHighServerImgMapper jnbHighServerImgMapper, Long id, JnbQuotations jnbQuotations) {
-        List<String> imgUrlList = Arrays.asList(imgUrlList2.split(","));
-        if (!ObjectUtils.isEmpty(imgUrlList)) {
-            List<JnbHighServerImg> imgList = new ArrayList<>();
-            jnbHighServerImgMapper.deleteJnbHighServerByServerId(id,13);
-            imgUrlList.forEach(a -> {
-                JnbHighServerImg serverImg = new JnbHighServerImg();
-                serverImg.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
-                serverImg.setCreateTime(DateUtils.getNowDate());
-                serverImg.setServerId(id);
-                serverImg.setImgUrl(a);
-                serverImg.setType(13);
-                imgList.add(serverImg);
-            });
-            jnbHighServerImgMapper.saveJnbHighServerImg(imgList);
-        }
-    }
-
     /**
      * 批量删除行情
      *
@@ -134,11 +95,8 @@ public class JnbQuotationsServiceImpl implements IJnbQuotationsService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteJnbQuotationsByIds(Long[] ids,Integer type) {
+    public int deleteJnbQuotationsByIds(Long[] ids) {
         int i = jnbQuotationsMapper.deleteJnbQuotationsByIds(ids);
-        if (i > 0) {
-            jnbHighServerImgMapper.deleteJnbHighServerByServerIds(ids,type);
-        }
         return i;
     }
 

sooka-jnb/src/main/resources/mapper/highServer/JnbHighServerMapper.xml

@@ -137,4 +137,41 @@
         where jhs.del_flag = 0 and jhs.type = 5 and jhs.id = #{id}
         GROUP BY jhs.id
     </select>
+
+    <select id="getLifeServices" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+               title_name,
+               text_details,
+               jhs.type as type,
+               jhs.create_by,
+               jhs.create_time,
+               jhs.update_by,
+               jhs.update_time,
+               GROUP_CONCAT(jhsi.id)       AS imgId,
+               GROUP_CONCAT(jhsi.img_url)  AS imgUrlList,
+               jhs.like_num,
+               jhs.watch_num
+        FROM jnb_high_server jhs
+                 left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 6
+        GROUP BY jhs.id
+    </select>
+    <select id="lifeServicesDetails" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+               title_name,
+               text_details,
+               jhs.type as type,
+               jhs.create_by,
+               jhs.create_time,
+               jhs.update_by,
+               jhs.update_time,
+               GROUP_CONCAT(jhsi.id) AS imgId,
+               GROUP_CONCAT(jhsi.img_url) AS imgUrlList,
+               jhs.like_num,
+               jhs.watch_num
+        FROM jnb_high_server jhs
+                 left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 6 and jhs.id = #{id}
+        GROUP BY jhs.id
+    </select>
 </mapper>

sooka-jnb/src/main/resources/mapper/quotations/JnbQuotationsConfigMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectJnbQuotationsConfigVo"/>
         <where>  
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
             and del_flag = 0
         </where>
     </select>

sooka-jnb/src/main/resources/mapper/quotations/JnbQuotationsMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectJnbQuotationsVo">
-        select id, product_name, area, type, price, phone, address, create_by, create_time, del_flag from jnb_quotations
+        select id, product_name, area, type, price, phone, address,url, create_by, create_time, del_flag from jnb_quotations
     </sql>
 
     <select id="selectJnbQuotationsList" parameterType="JnbQuotations" resultMap="JnbQuotationsResult">
@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="area != null  and area != ''"> and area = #{area}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
              and del_flag = 0
         </where>
     </select>
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="price != null">price,</if>
             <if test="phone != null">phone,</if>
             <if test="address != null">address,</if>
+            <if test="url != null">url,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -67,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="price != null">#{price},</if>
             <if test="phone != null">#{phone},</if>
             <if test="address != null">#{address},</if>
+            <if test="url != null">#{url},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -84,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="price != null">price = #{price},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="address != null">address = #{address},</if>
+            <if test="url != null">address = #{url},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>