修复文档提出BUG

mall-admin/src/main/java/com/macro/mall/controller/vanke/VankeDepartmentController.java

@@ -30,8 +30,9 @@ public class VankeDepartmentController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
     public CommonResult<CommonPage<VankeDepartment>> list(@ApiParam(value="分页大小") @RequestParam(value = "pageSize", required = false) Integer pageSize,
-                                                           @ApiParam(value="分页页数") @RequestParam(value = "pageNum", required = false) Integer pageNum) {
-        return CommonResult.success(CommonPage.restPage(this.vankeDepartmentSerive.getPageList(pageNum, pageSize)));
+                                                           @ApiParam(value="分页页数") @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                           @ApiParam(value="部门名称") @RequestParam(value = "name", required = false) String name) {
+        return CommonResult.success(CommonPage.restPage(this.vankeDepartmentSerive.getPageList(pageNum, pageSize,name)));
     }
 
     @ApiOperation("万科后台_部门插入操作")

mall-portal/src/main/java/com/macro/mall/portal/controller/member/VankeDepartmentController.java

@@ -26,8 +26,9 @@ public class VankeDepartmentController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
     public CommonResult<CommonPage<VankeDepartment>> list(@ApiParam(value="分页大小") @RequestParam(value = "pageSize", required = false) Integer pageSize,
-                                                           @ApiParam(value="分页页数") @RequestParam(value = "pageNum", required = false) Integer pageNum) {
-        return CommonResult.success(CommonPage.restPage(this.vankeDepartmentSerive.getPageList(pageNum, pageSize)));
+                                                           @ApiParam(value="分页页数") @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                           @ApiParam(value="部门名称") @RequestParam(value = "name", required = false) String name) {
+        return CommonResult.success(CommonPage.restPage(this.vankeDepartmentSerive.getPageList(pageNum, pageSize,name)));
     }
 
 }

mall-service/src/main/java/com/macro/mall/service/vanke/IVankeDepartmentSerive.java

@@ -8,16 +8,19 @@ import java.util.List;
 
 public interface IVankeDepartmentSerive {
 
-    /**.
+    /**
+     * .
      * 分页查询
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    List<VankeDepartment> getPageList(Integer pageNum, Integer pageSize);
+    List<VankeDepartment> getPageList(Integer pageNum, Integer pageSize,String name);
 
     /**
      * 插入部门
+     *
      * @param vankeDepartment
      * @return
      */
@@ -25,8 +28,17 @@ public interface IVankeDepartmentSerive {
 
     /**
      * 根据id 修改对应的参数
+     *
      * @param vankeDepartment
      * @return
      */
     ResultMsg updateDepartment(VankeDepartment vankeDepartment);
+
+    /**
+     * 根据部门名称搜索一条数据
+     *
+     * @param departName
+     * @return
+     */
+    VankeDepartment selectOneByDepartName(String departName);
 }

mall-service/src/main/java/com/macro/mall/service/vanke/impl/VankeDepartmentSeriveImpl.java

@@ -31,13 +31,16 @@ public class VankeDepartmentSeriveImpl implements IVankeDepartmentSerive {
     private IVankeBackLogService vankeBackLogService;
 
     @Override
-    public List<VankeDepartment> getPageList(Integer pageNum, Integer pageSize){
+    public List<VankeDepartment> getPageList(Integer pageNum, Integer pageSize,String name){
         if(pageNum != null &&  pageSize != null){
             PageHelper.startPage(pageNum, pageSize);
         }
         VankeDepartmentExample example = new VankeDepartmentExample();
         VankeDepartmentExample.Criteria criteria = example.createCriteria();
         criteria.andDeleteStatusEqualTo(1);//'1未删除 0已删除'
+        if(name != null || !name.isEmpty()){
+            criteria.andNameLike("%"+name+"%");
+        }
         return  this.vankeDepartmentMapper.selectByExample(example);
     }
 
@@ -48,6 +51,11 @@ public class VankeDepartmentSeriveImpl implements IVankeDepartmentSerive {
         if(vankeDepartment.getName() == null && "".equals(vankeDepartment.getName())){
             return new ResultMsg(false,"请输入部门名称");
         }
+        //校验部门名称是否唯一
+        VankeDepartment vankeDepartment1 = this.selectOneByDepartName(vankeDepartment.getName());
+        if(vankeDepartment1 != null){
+            return new ResultMsg(false,"已存在此部门名称为："+vankeDepartment1.getName()+"，请勿重复添加！" );
+        }
         UmsAdmin admin = umsAdminService.getCurrentUmsAdmin();
         vankeDepartment.setCreateBy(admin.getId());
         vankeDepartment.setUpdateBy(admin.getId());
@@ -90,5 +98,22 @@ public class VankeDepartmentSeriveImpl implements IVankeDepartmentSerive {
         return new ResultMsg(true,"操作成功");
     }
 
+    /**
+     * 根据部门名称搜索一条数据
+     *
+     * @param departName
+     * @return
+     */
+    @Override
+    public VankeDepartment selectOneByDepartName(String departName){
+        VankeDepartmentExample example = new VankeDepartmentExample();
+        VankeDepartmentExample.Criteria criteria = example.createCriteria();
+        criteria.andNameEqualTo(departName);
+        List<VankeDepartment> vankeDepartmentList = this.vankeDepartmentMapper.selectByExample(example);
+        if(vankeDepartmentList != null && vankeDepartmentList.size() > 0){
+            return vankeDepartmentList.get(0);
+        }
+        return null;
+    }
 
 }

mall-service/src/main/resources/com/macro/mall/dao/vanke/VankeGoodsStockDao.xml

@@ -14,7 +14,7 @@
 
 
   <select id="selectGoodsCollection" parameterType="com.macro.mall.model.dto.vanke.VankeGoodsStockDto" resultType="java.lang.Integer">
-      SELECT IFNULL(SUM(goods_num),0) FROM vanke_goods_stock
+      SELECT IFNULL(SUM(outbound_num),0) FROM vanke_outbound_record
       where goods_id = #{goodsId}
       and date_format(createtime,'%Y-%m-%d') = #{queryTime}
     </select>