热门商品 热门公司 管理

公示接口条件
新品和热门接口

dgtly-admin/src/main/java/com/dgtly/web/controller/company/CompanyController.java

@@ -20,11 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import com.dgtly.common.annotation.Log;
 import com.dgtly.common.enums.BusinessType;
 import com.dgtly.system.domain.SysCompany;
@@ -184,6 +180,20 @@ public class CompanyController extends BaseController
         return toAjax(i);
     }
 
+    /**
+     * @descption: 商户信息修改
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020/3/3 14:03
+     */
+    @PostMapping("/company/edit")
+    @ResponseBody
+    public Object edit(SysCompany company)
+    {
+        return toAjax(sysCompanyService.updateSysCompany(company));
+    }
+
 
 
     /*****************************审核商户信息提交相关*************************************************/

dgtly-admin/src/main/resources/templates/company/company.html

@@ -43,8 +43,10 @@
         </div>
     </div>
     <th:block th:include="include :: footer" />
+    <th:block th:include="include :: bootstrap-table-editable-js" />
     <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:company:edit')}]];
+        var editFlag = [[${@permission.hasPermi('company:company:edit')}]];
+        var sortFlag = [[${@permission.hasPermi('company:company:sort')}]];
         var prefix = ctx + "company";
 
         $(function() {
@@ -52,6 +54,9 @@
                 url: prefix + "/list",
                 updateUrl: prefix + "/info/{id}",
                 modalName: "商户表",
+                onEditableSave: onEditableSave,
+                showColumns: false,
+                showToggle: false,
                 columns: [{
                     checkbox: true
                 },
@@ -94,6 +99,24 @@
                     title: '创建时间',
                     align: 'center'
                 },
+                {
+                    field : 'sort',
+                    title : '排序',
+                    visible: !sortFlag,
+                    editable : {
+                        type : 'text',
+                        title : '排序（数字越大 排序越靠前）',
+                        emptytext : "排序为空",
+                        validate : function(value) {
+                            if (value.length == 0) {
+                                return '排序值不能为空';
+                            }
+                            if (isNaN(value)) {
+                                return '请输入数字';
+                            }
+                        }
+                    }
+                },
                 {
                     title: '操作',
                     align: 'center',
@@ -119,6 +142,33 @@
             }
         }
 
+        function onEditableSave (field, row, oldValue, $el) {
+
+            var data = new FormData();
+            data.append('id', row.id);
+            data.append('sort', row.sort);
+            $.ajax({
+                url:ctx+"company/company/edit",
+                type:"post",
+                data: data,
+                cache: false,
+                contentType: false,
+                processData: false,
+                dataType: 'json',
+                success: function(result) {
+                    if (result.code == web_status.SUCCESS) {
+                        $.modal.alertSuccess("成功");
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                },
+                error:function(result) {
+                    alert("上传失败")
+                }
+            });
+
+        }
+
     </script>
 </body>
 </html>

dgtly-api/src/main/java/com/dgtly/api/controller/SysCompanyController.java

@@ -146,9 +146,9 @@ public class SysCompanyController extends ApiBaseController {
     @PostMapping("/enterPublicity")
     public Object enterPublicity(){
         ParameterObject obj = getParameterObject();
+        CompanyReviewed cr = obj.parseBean(CompanyReviewed.class);
         startPage(obj);
-        CompanyReviewed cr = new CompanyReviewed();
-        List<CompanyReviewed> crs =  companyReviewedService.selectEnterPublicityList();
+        List<CompanyReviewed> crs =  companyReviewedService.selectEnterPublicityList(cr);
         return AjaxResult.success(getDataTable(crs));
     }
 

dgtly-common/src/main/java/com/dgtly/common/core/controller/ApiBaseController.java

@@ -105,6 +105,31 @@ public class ApiBaseController
 
         PageHelper.startPage(pageNum, pageSize, orderBy);
 
+    }
+    /**
+     * 设置请求分页数据
+     */
+    protected void startPage(PageDomain pageDomain)
+    {
+        Integer pageNum = null;
+        Integer pageSize =null;
+        String orderBy =null;
+        if(pageDomain!=null){
+            pageNum = pageDomain.getPageNum();
+            pageSize= pageDomain.getPageSize();
+            orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+        }
+        if (!StringUtils.isNotNull(pageNum)) {
+            pageNum = 1;
+        }
+        if(! StringUtils.isNotNull(pageSize))
+        {
+            pageSize = 10;
+
+        }
+
+        PageHelper.startPage(pageNum, pageSize, orderBy);
+
     }
 
     /**

dgtly-goods/dgtly-goods-admin/src/main/java/com/dgtly/goods/controller/GoodsInfoController.java

@@ -73,12 +73,18 @@ public class GoodsInfoController extends BaseController
     public TableDataInfo list(GoodsInfo goodsInfo)
     {
         /*判断是否是系统内部人员*/
-        if(ShiroUtils.getCompanyId()!=Long.parseLong(configService.selectConfigByKey("sys.company.id"))){
+        String sysCompanyId = configService.selectConfigByKey("sys.company.id");
+        List<GoodsInfo> list;
+        startPage();
+        if(ShiroUtils.getCompanyId()!=Long.parseLong(sysCompanyId)){
             goodsInfo.setCompanyId(ShiroUtils.getCompanyId());
+            list = goodsInfoService.selectGoodsInfoList(goodsInfo);
+        }else{
+            list = goodsInfoService.selectGoodsInfoListByAdmin(goodsInfo);
         }
 
-        startPage();
-        List<GoodsInfo> list = goodsInfoService.selectGoodsInfoList(goodsInfo);
+
+
         return getDataTable(list);
     }
 

dgtly-goods/dgtly-goods-admin/src/main/resources/templates/goods/info/edit.html

@@ -421,7 +421,6 @@
     }
     //获取分类信息
     function getTypyAttributu(id){
-        console.log(id)
         $.ajax({
             type: "POST",
             url: ctx + "goods/type/getInfo/"+id,
@@ -486,7 +485,8 @@
     function  upload_slideshow(){
         if ($("#input-slideshow-add").val() == '') {
             return;
-        }var data = new FormData();
+        }
+        var data = new FormData();
         data.append('file', document.getElementById('input-slideshow-add').files[0]);
         $.ajax({
             url:ctx+"common/upload",

dgtly-goods/dgtly-goods-admin/src/main/resources/templates/goods/info/info.html

@@ -16,7 +16,7 @@
                             </li>
 
                             <li th:if="${isSystemUser}">
-                                <input name="companyId" type="hidden" id="input_companyId">
+                                <input name="companyId" type="text" id="input_companyId" style="display: none">
                                 <p >所属商户：</p>
                                 <input name="companyName" onclick="selectTree('company')" id="input_companyTreeName" type="text" placeholder="选择商户"
                                            class="form-control required" readonly="readonly" required>
@@ -24,7 +24,7 @@
 
                             <li>
                                 <p>所属类型：</p>
-                                <input name="typeId" type="hidden" id="input_typeId">
+                                <input name="typeId" type="text" id="input_typeId" style="display: none">
                                 <input name="typeName" onclick="selectTree('type')" id="input_typeTreeName" type="text" placeholder="选择商品分类"
                                        class="form-control required" readonly="readonly" required>
                             </li>
@@ -61,10 +61,12 @@
         </div>
     </div>
     <th:block th:include="include :: footer" />
+    <th:block th:include="include :: bootstrap-table-editable-js" />
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('goods:info:edit')}]];
         var putawayFlag = [[${@permission.hasPermi('goods:info:putaway')}]];
         var removeFlag = [[${@permission.hasPermi('goods:info:remove')}]];
+        var sortFlag = [[${@permission.hasPermi('goods:info:sort')}]];
         var putawayDict = [[${@dict.getType('goods_putaway')}]];
         var isSystemUser = [[${isSystemUser}]];
         var prefix = ctx + "goods/info";
@@ -76,23 +78,22 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                onEditableSave: onEditableSave,
+                showColumns: false,
+                showToggle: false,
                 modalName: "商品基础详情",
                 columns: [{
                     checkbox: true
                 },
                 {
                     field : 'id', 
-                    title : '上架标志',
+                    title : 'id',
                     visible: false
                 },
                 {
                     field : 'name', 
                     title : '商品名称'
                 },
-                {
-                    field : 'companyId',
-                    visible: false
-                },
                 {
                     field : 'companyName',
                     title : '所属商户'
@@ -101,11 +102,6 @@
                     field : 'typeName',
                     title : '所属类型',
                 },
-                {
-                    field : 'typeId', 
-                    title : '所属类型id',
-                    visible: false
-                },
                 {
                     field : 'price', 
                     title : '一口价'
@@ -136,6 +132,24 @@
                         return $.table.selectDictLabel(putawayDict, value);
                     }
                 },
+                {
+                    field : 'sort',
+                    title : '排序',
+                    visible: !sortFlag,
+                    editable : {
+                        type : 'text',
+                        title : '排序（数字越大 排序越靠前）',
+                        emptytext : "【名称】为空",
+                        validate : function(value) {
+                            if (value.length == 0) {
+                                return '排序值不能为空';
+                            }
+                            if (isNaN(value)) {
+                                return '请输入数字';
+                            }
+                        }
+                    }
+                },
                 {
                     title: '操作',
                     align: 'center',
@@ -231,6 +245,32 @@
             layer.close(index);
             $.table.search()
         }
+        function onEditableSave (field, row, oldValue, $el) {
+
+            var data = new FormData();
+            data.append('id', row.id);
+            data.append('sort', row.sort);
+            $.ajax({
+                url:ctx+"goods/info/edit",
+                type:"post",
+                data: data,
+                cache: false,
+                contentType: false,
+                processData: false,
+                dataType: 'json',
+                success: function(result) {
+                    if (result.code == web_status.SUCCESS) {
+                        $.modal.alertSuccess("成功");
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                },
+                error:function(result) {
+                    alert("上传失败")
+                }
+            });
+
+        }
 
 
     </script>

dgtly-goods/dgtly-goods-api/src/main/java/com/dgtly/goods/controller/GoodsInfoController.java

@@ -9,6 +9,7 @@ import com.dgtly.common.core.controller.ApiBaseController;
 import com.dgtly.common.core.domain.AjaxResult;
 import com.dgtly.common.core.domain.ParameterObject;
 import com.dgtly.common.core.domain.ResultType;
+import com.dgtly.common.core.page.PageDomain;
 import com.dgtly.common.exception.api.LessParamException;
 import com.dgtly.goods.domain.GoodsInfo;
 import com.dgtly.goods.service.IGoodsInfoService;
@@ -58,8 +59,16 @@ public class GoodsInfoController extends ApiBaseController {
     @ApiImplicitParam(name = "params" , paramType = "body")
     @PostMapping("/hotlist")
     public Object getHotList(){
-        List<GoodsInfo> goodsInfos =  goodsInfoService.selectGoodsInfoHotList();
-        return AjaxResult.success().putKV("list",goodsInfos);
+        PageDomain pg1 = new PageDomain();
+        pg1.setPageNum(1);pg1.setPageSize(4);
+        startPage(pg1);
+        List<GoodsInfo> hotList =  goodsInfoService.selectGoodsInfoListInWeb(null);
+        PageDomain pg2 = new PageDomain();
+        pg2.setPageNum(1);pg2.setPageSize(4);
+        pg2.setOrderByColumn("create_time");pg2.setIsAsc("desc");
+        startPage(pg2);
+        List<GoodsInfo> newList =  goodsInfoService.selectGoodsInfoListInWeb(null);
+        return AjaxResult.success().putKV("hotlist",hotList).putKV("newList",newList);
     }
 
     @ApiOperation(value = "商品详情")

dgtly-goods/dgtly-goods-common/src/main/java/com/dgtly/goods/domain/GoodsInfo.java

@@ -73,6 +73,9 @@ public class GoodsInfo extends BaseEntity
     @Excel(name = "商品材质")
     private String material;
 
+    /** 排序 */
+    @Excel(name = "排序")
+    private String sort;
     /** 上架标志（0代表草稿状态 1代表上架） */
     @Excel(name = "上架标志", readConverterExp = "0=代表草稿状态,1=代表上架")
     private String putawayFlag;
@@ -298,6 +301,16 @@ public class GoodsInfo extends BaseEntity
     }
 
 
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

dgtly-goods/dgtly-goods-common/src/main/java/com/dgtly/goods/mapper/GoodsInfoMapper.java

@@ -30,6 +30,7 @@ public interface GoodsInfoMapper
      */
     public List<GoodsInfo> selectGoodsInfoList(GoodsInfo goodsInfo);
 
+    public List<GoodsInfo> selectGoodsInfoListByAdmin(GoodsInfo goodsInfo);
     /**
      * 新增商品基础详情
      * 
@@ -62,12 +63,7 @@ public interface GoodsInfoMapper
      */
     public int deleteGoodsInfoByIds(String[] ids);
 
-    /**
-     * 查询热门商品
-     *
-     * @return 结果
-     */
-    public List<GoodsInfo> selectGoodsInfoHotList();
+
 
     /**
      * @descption: 根据分类id查询商品数量包括小雷的
@@ -106,4 +102,6 @@ public interface GoodsInfoMapper
      * @date: 2020/3/3 10:43
      */
     int putawayGooodsInfo(@Param("ids") String[] ids, @Param("putawayFlag")String putawayFlag);
+
+
 }

dgtly-goods/dgtly-goods-common/src/main/java/com/dgtly/goods/service/IGoodsInfoService.java

@@ -27,6 +27,15 @@ public interface IGoodsInfoService
      */
     public List<GoodsInfo> selectGoodsInfoList(GoodsInfo goodsInfo);
 
+    /**
+     * @descption: 查询商品基础详情列表不通过过滤
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020/3/3 10:43
+     */
+    List<GoodsInfo> selectGoodsInfoListByAdmin(GoodsInfo goodsInfo);
+
     /**
      * 新增商品基础详情
      * 
@@ -59,13 +68,7 @@ public interface IGoodsInfoService
      */
     public int deleteGoodsInfoById(Long id);
 
-    /**
-     * 查询热门商品
-     *
-     * @param
-     * @return 结果
-     */
-    public List<GoodsInfo> selectGoodsInfoHotList();
+
 
     /**
      * @descption: 根据分类id查询商品数量包括小雷的
@@ -104,4 +107,5 @@ public interface IGoodsInfoService
      * @date: 2020/3/3 10:43
      */
     int putawayGooodsInfo(String ids, String putawayFlag);
+
 }

dgtly-goods/dgtly-goods-common/src/main/java/com/dgtly/goods/service/impl/GoodsInfoServiceImpl.java

@@ -1,6 +1,8 @@
 package com.dgtly.goods.service.impl;
 
 import java.util.List;
+
+import com.dgtly.common.annotation.DataScope;
 import com.dgtly.common.utils.DateUtils;
 import com.dgtly.goods.domain.GoodsAttribute;
 import com.dgtly.goods.domain.GoodsColor;
@@ -21,7 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020-02-13
  */
 @Service
-public class GoodsInfoServiceImpl implements IGoodsInfoService 
+public class GoodsInfoServiceImpl implements IGoodsInfoService
 {
     @Autowired
     private GoodsInfoMapper goodsInfoMapper;
@@ -54,11 +56,24 @@ public class GoodsInfoServiceImpl implements IGoodsInfoService
      * @return 商品基础详情
      */
     @Override
+    @DataScope(deptAlias = "d")
     public List<GoodsInfo> selectGoodsInfoList(GoodsInfo goodsInfo)
     {
         return goodsInfoMapper.selectGoodsInfoList(goodsInfo);
     }
 
+    /**
+     * @descption: 查询商品基础详情列表不通过过滤
+     * @param:
+     * @return:
+     * @auther: qxp
+     * @date: 2020/3/3 10:43
+     */
+    @Override
+    public List<GoodsInfo> selectGoodsInfoListByAdmin(GoodsInfo goodsInfo) {
+        return goodsInfoMapper.selectGoodsInfoListByAdmin(goodsInfo);
+    }
+
     /**
      * 新增商品基础详情
      * 
@@ -117,15 +132,7 @@ public class GoodsInfoServiceImpl implements IGoodsInfoService
         return goodsInfoMapper.deleteGoodsInfoById(id);
     }
 
-    /**
-     * 查询热门商品
-     *
-     * @return 结果
-     */
-    @Override
-    public List<GoodsInfo> selectGoodsInfoHotList() {
-        return goodsInfoMapper.selectGoodsInfoHotList();
-    }
+
 
     /**
      * @descption: 根据分类id查询商品数量包括小雷的

dgtly-goods/dgtly-goods-common/src/main/resources/mapper/goods/GoodsInfoMapper.xml

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="companyName"    column="companyName"    />
         <result property="typeName"    column="typeName"    />
+        <result property="sort"    column="sort"    />
         <collection  property="goodsAttributes"   javaType="java.util.List"       resultMap="GoodsAttributeResult" />
         <collection  property="goodsSizes"   javaType="java.util.List"       resultMap="GoodsSizeResult" />
         <collection  property="goodsColors"   javaType="java.util.List"       resultMap="GoodsColorResult" />
@@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectGoodsInfoVo">
         select gi.id, gi.name, gi.company_id, gi.type_id, gi.price, gi.cover, gi.slideshow, gi.des, gi.delivery, gi.produced_time, gi.produced_address,
          gi.warehouse_address, gi.weight,gi.material,gi.putaway_flag, gi.del_flag, gi.create_time, gi.create_by, gi.update_time, gi.update_by, gi.remark,
+         gi.sort,
          gt.name typeName,sc.company_name companyName,
          ga.attribute_id,ga.value,gs.size,gc.color,
          gta.attribute_name attributeName,gta.sort
@@ -69,10 +71,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectGoodsInfoList" parameterType="GoodsInfo" resultMap="GoodsInfoResult">
         select gi.id, gi.name, gi.company_id, gi.type_id, gi.price, gi.cover, gi.slideshow, gi.create_time, gi.create_by, gi.update_time, gi.update_by, gi.remark,
-        gi.putaway_flag,gi.weight,gi.material,gi.produced_time,
+        gi.putaway_flag,gi.weight,gi.material,gi.produced_time,gi.sort,
+        gt.name typeName,sc.company_name companyName
+        from goods_info gi
+        left join goods_type gt on gt.id =gi.type_id
+        left join sys_user u on u.login_name = gi.create_by
+        left join sys_dept d on u.dept_id = d.dept_id
+        left join sys_company sc on sc.id =gi.company_id
+        <where>
+            gi.del_flag = "0"
+            <if test="name != null  and name != ''"> and gi.name like concat('%', #{name}, '%')</if>
+            <if test="companyId != null "> and gi.company_id = #{companyId}</if>
+            <if test="typeId != null "> and find_in_set(#{typeId},gt.ancestors) </if>
+            <if test="price != null "> and gi.price = #{price}</if>
+            <if test="cover != null  and cover != ''"> and gi.cover = #{cover}</if>
+            <if test="slideshow != null  and slideshow != ''"> and gi.slideshow = #{slideshow}</if>
+            <if test="des != null  and des != ''"> and gi.des = #{des}</if>
+            <if test="delivery != null  and delivery != ''"> and gi.delivery = #{delivery}</if>
+            <if test="producedTime != null "> and gi.produced_time = #{producedTime}</if>
+            <if test="producedAddress != null  and producedAddress != ''"> and gi.produced_address = #{producedAddress}</if>
+            <if test="warehouseAddress != null  and warehouseAddress != ''"> and gi.warehouse_address = #{warehouseAddress}</if>
+            <if test="weight != null  and weight != ''"> and gi.weight = #{weight}</if>
+            <if test="material != null  and material != ''"> and gi.material like concat('%', #{material}, '%')</if>
+            <if test="putawayFlag != null  and putawayFlag != ''"> and gi.putaway_flag = #{putawayFlag}</if>
+            ${params.dataScope}
+        </where>
+        order by gi.putaway_flag ,gi.sort desc,gi.create_time
+    </select>
+
+    <select id="selectGoodsInfoListByAdmin" parameterType="GoodsInfo" resultMap="GoodsInfoResult">
+        select gi.id, gi.name, gi.company_id, gi.type_id, gi.price, gi.cover, gi.slideshow, gi.create_time, gi.create_by, gi.update_time, gi.update_by, gi.remark,
+        gi.putaway_flag,gi.weight,gi.material,gi.produced_time,gi.sort,
         gt.name typeName,sc.company_name companyName
         from goods_info gi
         left join goods_type gt on gt.id =gi.type_id
+        left join sys_user u on u.login_name = gi.create_by
+        left join sys_dept d on u.dept_id = d.dept_id
         left join sys_company sc on sc.id =gi.company_id
         <where>
             gi.del_flag = "0"
@@ -90,8 +124,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="weight != null  and weight != ''"> and gi.weight = #{weight}</if>
             <if test="material != null  and material != ''"> and gi.material like concat('%', #{material}, '%')</if>
             <if test="putawayFlag != null  and putawayFlag != ''"> and gi.putaway_flag = #{putawayFlag}</if>
+            ${params.dataScope}
         </where>
-        order by gi.putaway_flag ,gi.create_time
+        order by gi.putaway_flag desc ,gi.sort desc,gi.create_time
     </select>
     
     <select id="selectGoodsInfoById" parameterType="Long" resultMap="GoodsInfoResult">
@@ -126,6 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null ">update_time,</if>
             <if test="updateBy != null  and updateBy != ''">update_by,</if>
             <if test="remark != null  and remark != ''">remark,</if>
+            <if test="sort != null  and sort != ''">sort,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null  and name != ''">#{name},</if>
@@ -148,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null ">#{updateTime},</if>
             <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
             <if test="remark != null  and remark != ''">#{remark},</if>
+            <if test="sort != null  and sort != ''">#{sort},</if>
          </trim>
     </insert>
 
@@ -174,6 +211,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null ">update_time = #{updateTime},</if>
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
             <if test="remark != null  and remark != ''">remark = #{remark},</if>
+            <if test="sort != null  and sort != ''">sort = #{sort},</if>
         </trim>
         where id = #{id}
     </update>
@@ -197,19 +235,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
 
-    <select id="selectGoodsInfoHotList" parameterType="GoodsInfo" resultMap="GoodsInfoResult">
-        select gi.id, gi.name, gi.company_id, gi.type_id, gi.price, gi.cover, gi.slideshow, gi.create_time, gi.create_by, gi.update_time, gi.update_by, gi.remark,
-        gi.putaway_flag,gi.weight,gi.produced_time,gi.material,
-        gt.name typeName,sc.company_name companyName
-        from goods_info gi
-        left join goods_type gt on gt.id =gi.type_id
-        left join sys_company sc on sc.id =gi.company_id
-        where
-            gi.del_flag = "0"
-            and gi.putaway_flag = "1"
-        order by gi.create_time
-        limit 0,10
-    </select>
+
 
 
     <select id="selectGoodsInfoCountByTypeId" parameterType="GoodsInfo" resultType="Integer">
@@ -223,7 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectGoodsInfoListInWeb" parameterType="GoodsInfo" resultMap="GoodsInfoResult">
         select gi.id, gi.name, gi.company_id, gi.type_id, gi.price, gi.cover, gi.slideshow, gi.create_time, gi.create_by, gi.update_time, gi.update_by, gi.remark,
-        gi.putaway_flag,gi.weight,gi.material,gi.produced_time,
+        gi.putaway_flag,gi.weight,gi.material,gi.produced_time,gi.sort,
         gt.name typeName,sc.company_name companyName
         from goods_info gi
         left join goods_type gt on gt.id =gi.type_id
@@ -240,7 +266,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endPrice != null and endPrice!='' "> and gi.price &lt;= #{endPrice}</if>
             <if test="weight != null  and weight != ''"> and gi.weight = #{weight}</if>
         </where>
-        order by gi.putaway_flag ,gi.create_time
+        order by gi.sort desc
     </select>
 
     <update id="putawayGooodsInfo">

dgtly-system/src/main/java/com/dgtly/companyext/mapper/CompanyReviewedMapper.java

@@ -92,7 +92,7 @@ public interface CompanyReviewedMapper
      * @auther: qxp
      * @date: 2020/3/3 13:25
      */
-    List<CompanyReviewed> selectEnterPublicityList();
+    List<CompanyReviewed> selectEnterPublicityList(CompanyReviewed companyReviewed);
 
     /**
      * @descption: 查询商户信息变更记录

dgtly-system/src/main/java/com/dgtly/companyext/service/ICompanyReviewedService.java

@@ -104,7 +104,7 @@ public interface ICompanyReviewedService
      * @auther: qxp
      * @date: 2020/3/3 13:25
      */
-    List<CompanyReviewed> selectEnterPublicityList();
+    List<CompanyReviewed> selectEnterPublicityList(CompanyReviewed cr);
 
     /**
      * @descption: 查询商户信息变更记录

dgtly-system/src/main/java/com/dgtly/companyext/service/impl/CompanyReviewedServiceImpl.java

@@ -172,8 +172,8 @@ public class CompanyReviewedServiceImpl implements ICompanyReviewedService
      * @date: 2020/3/3 13:25
      */
     @Override
-    public List<CompanyReviewed> selectEnterPublicityList() {
-        return companyReviewedMapper.selectEnterPublicityList();
+    public List<CompanyReviewed> selectEnterPublicityList(CompanyReviewed cr) {
+        return companyReviewedMapper.selectEnterPublicityList(cr);
     }
 
     /**

dgtly-system/src/main/java/com/dgtly/system/domain/SysCompany.java

@@ -81,7 +81,9 @@ public class SysCompany extends BaseEntity
     @Excel(name = "版本号")
     private Integer versionNum;
 
-
+    /** 排序值越大越靠前  */
+    @Excel(name = "排序")
+    private String sort;
 
     /** 主营业务*/
     private String primaryBusiness;
@@ -240,6 +242,13 @@ public class SysCompany extends BaseEntity
     }
 
 
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
 
     @Override
     public String toString() {

dgtly-system/src/main/resources/mapper/companyext/CompanyReviewedMapper.xml

@@ -233,6 +233,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join company_examine ce on ce.company_reviewed_id = cr.id
         <where>
             cr.reason=0
+            <if test="companyName != null  and companyName != ''"> and cr.company_name like concat('%', #{companyName}, '%')</if>
+            <if test="status != null  and status != ''"> and cr.status =#{status}</if>
         </where>
     </select>
 

dgtly-system/src/main/resources/mapper/system/SysCompanyMapper.xml

@@ -27,13 +27,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
         <result property="primaryBusiness"    column="primary_business"    />
+        <result property="sort"    column="sort"    />
     </resultMap>
 
 
     <sql id="selectSysCompanyVo">
         select id, company_name,company_type,detail_address,longitude,latitude,legal_person,contact_number,establish_date,
         unified_social_credit_code,business_license_url,default_img_url,propaganda_img_url,company_introduce,version_num,
-        create_by,update_by,update_time,remark,status,create_time,primary_business
+        create_by,update_by,update_time,remark,status,create_time,primary_business,sort
         from sys_company
     </sql>
 
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null  and status != ''">and status =#{status}</if>
             <if test="companyType != null  and companyType != ''">and companyType =#{company_type}</if>
         </where>
+        order by sort desc
     </select>
     
     <select id="selectSysCompanyById" parameterType="Long" resultMap="SysCompanyResult">
@@ -74,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null  and updateBy != ''">update_by,</if>
             <if test="remark != null  and remark != ''">remark,</if>
             <if test="primaryBusiness != null  and primaryBusiness != ''">primary_business,</if>
+            <if test="sort != null  and sort != ''">sort,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             now(),
@@ -96,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
             <if test="remark != null  and remark != ''">#{remark},</if>
             <if test="primaryBusiness != null  and primaryBusiness != ''">#{primaryBusiness},</if>
+            <if test="sort != null  and sort != ''">#{sort},</if>
          </trim>
     </insert>
 
@@ -122,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null  and updateBy != ''">update_by= #{updateBy},</if>
             <if test="remark != null  and remark != ''">remark= #{remark},</if>
             <if test="primaryBusiness != null  and primaryBusiness != ''">primary_business=#{primaryBusiness},</if>
+            <if test="sort != null  and sort != ''">sort=#{sort},</if>
         </trim>
         where id = #{id}
     </update>
@@ -142,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select sc.id, sc.company_name,sc.establish_date,sc.default_img_url,sc.primary_business,sc.propaganda_img_url
         from sys_company sc
         where sc.id != 1 and sc.status = 0
+        order by sort desc
         limit 0,10
     </select>
     <select id="selectSysCompanyListExRoot" parameterType="SysCompany" resultMap="SysCompanyResult">
@@ -150,6 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             id !=1
             <if test="companyName != null  and companyName != ''"> and company_name like concat('%',#{companyName},'%') </if>
         </where>
+        order by sort desc
     </select>