常见问题更新，区域，客户管理增加按需排序功能

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/controller/PropertyCompanyController.java

@@ -31,7 +31,6 @@ public class PropertyCompanyController {
      *
      * @param request 客户名称或客户地址或客户邮寄地址或客户联系方式,页码,页大小,维保公司id
      * @return RestResponse
-     * @since 2019/12/3 8:51
      */
     @PostMapping("/list")
     @Validation(fields = {"mtCompanyId"})
@@ -49,9 +48,6 @@ public class PropertyCompanyController {
     @Validation(fields = {"id"})
     public RestResponse propertyCompany(@Val @RequestBody PropertyCompanyReq request) {
         PropertyCompany byId = propertyCompanyService.getById(request.getId());
-        if (byId == null) {
-            return RestResponse.success();
-        }
         return RestResponse.success(byId);
     }
 
@@ -60,7 +56,6 @@ public class PropertyCompanyController {
      *
      * @param request [客户]
      * @return RestResponse
-     * @since 2019/11/27 11:45
      */
     @PostMapping("/add")
     public RestResponse add(@RequestBody PropertyCompanyAndPropertyContactReq request) {
@@ -72,7 +67,6 @@ public class PropertyCompanyController {
      *
      * @param propertyCompany [客户]
      * @return RestResponse
-     * @since 2019/11/27 11:45
      */
     @PostMapping("/update")
     @Validation(fields = {"id"})
@@ -86,7 +80,6 @@ public class PropertyCompanyController {
      *
      * @param req [客户id]
      * @return cn.com.xwy.boot.web.dto.RestResponse
-     * @since 2019/11/27 11:46
      */
     @PostMapping("/delete")
     @Validation(fields = {"id"})
@@ -96,6 +89,7 @@ public class PropertyCompanyController {
 
     /**
      * 项目模块用，根据维保公司id查询客户公司列表
+     *
      * @param req [mtCompanyId] 维保公司id
      * @return 客户公司列表
      */

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/service/impl/PropertyCompanyServiceImpl.java

@@ -46,9 +46,13 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
                         .eq(request.getMtCompanyId() != null, "mt_company_id", request.getMtCompanyId())
                         .ne("status", 0)
                         .and(request.getInfo() != null, companyQueryWrapper ->
-                                companyQueryWrapper.like("name", request.getInfo())
-                                        .or().like("address", request.getInfo())
-                                        .or().like("mailing_address", request.getInfo())));
+                                companyQueryWrapper
+                                        .like("name", request.getInfo())
+                                        .or()
+                                        .like("address", request.getInfo())
+                                        .or()
+                                        .like("mailing_address", request.getInfo()))
+                        .orderByAsc("name"));
         records.getRecords().forEach(propertyCompany -> {
             if (propertyCompany.getMailingAddress() == null) {
                 propertyCompany.setMailingAddress("未设置地址");

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/dao/entity/Region.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -75,5 +76,15 @@ public class Region implements Serializable {
     @TableField("remark")
     private String remark;
 
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
 
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/service/impl/RegionServiceImpl.java

@@ -30,7 +30,6 @@ import java.util.Map;
 public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements RegionService {
     private final AreaCodeServiceImpl areaCodeService;
 
-    //分页区域列表
     public RestResponse regions(RegionReq req) {
         Page<Region> page = new Page<>(req.getPageNum(), req.getPageSize());
         //获取维保团队的区域列表
@@ -39,7 +38,8 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
                         .select("area_name areaName", "area_code areaCode", "city_code cityCode", "remark"
                                 , "province_code provinceCode", "clerk", "mt_company_id mtCompanyId"
                                 , "user_id userId", "id")
-                        .eq("mt_company_id", req.getMtCompanyId()));
+                        .eq("mt_company_id", req.getMtCompanyId())
+                        .orderByDesc("create_time"));
         //如果没有区域
         if (page.getRecords().isEmpty()) {
             return RestResponse.success();
@@ -50,8 +50,6 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         List<Map<String, Object>> areaCodes = baseMapper.selectAreaCodes();
         List<Map<String, Object>> userInfos = baseMapper.selectUserInfo();
 
-
-
         if (records.isEmpty()) {
             return RestResponse.success();
         }

lift-system-service/src/main/java/cn/com/ty/lift/system/faq/controller/FaqController.java

@@ -12,7 +12,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 /**
- * 常见问题级常见问题分类表
+ * 常见问题
  *
  * @author wang-hai-cheng
  * @since 2019/12/4
@@ -27,7 +27,6 @@ public class FaqController {
      * 获取分类及问题列表
      *
      * @return RestResponse
-     * @since 2019/12/13 10:11
      */
     @PostMapping("/child")
     public RestResponse child() {
@@ -45,7 +44,6 @@ public class FaqController {
      *
      * @param faq type和parentId
      * @return RestResponse
-     * @since 2019/11/27 10:19
      */
     @PostMapping("/list")
     public RestResponse one(@RequestBody Faq faq) {
@@ -57,11 +55,10 @@ public class FaqController {
      *
      * @param faq 新增信息
      * @return RestResponse
-     * @since 2019/11/27 10:47
      */
     @PostMapping("/add")
     public RestResponse add(@RequestBody Faq faq) {
-        return faqService.add(faq);
+        return RestResponse.success(faqService.save(faq));
     }
 
 
@@ -70,14 +67,10 @@ public class FaqController {
      *
      * @param faq 需要更新的数据
      * @return RestResponse
-     * @since 2019/11/27 10:51
      */
     @PostMapping("/update")
     public RestResponse updateOne(@Valid @RequestBody Faq faq) {
-        if (faqService.updateById(faq)) {
-            return RestResponse.success(null, "成功");
-        }
-        return RestResponse.fail();
+        return RestResponse.success(faqService.updateById(faq));
     }
 
     /**
@@ -85,34 +78,9 @@ public class FaqController {
      *
      * @param faq id 要删除的id
      * @return RestResponse
-     * @since 2019/11/27 10:51
      */
     @PostMapping("/delete")
     public RestResponse delete(@Valid @RequestBody Faq faq) {
         return faqService.delete(faq.getId());
     }
-
-    /**
-     * 排序上移一位
-     *
-     * @param faq id 需要移位的id
-     * @return cn.com.xwy.boot.web.dto.RestResponse
-     * @since 2019/11/27 10:52
-     */
-    @PostMapping("/up")
-    public RestResponse up(@Valid @RequestBody Faq faq) {
-        return faqService.serial(faq.getId(), 1);
-    }
-
-    /**
-     * 排序下移一位
-     *
-     * @param faq id 需要移位的id
-     * @return cn.com.xwy.boot.web.dto.RestResponse
-     * @since 2019/11/27 10:52
-     */
-    @PostMapping("/down")
-    public RestResponse down(@Valid @RequestBody Faq faq) {
-        return faqService.serial(faq.getId(), 0);
-    }
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/faq/service/impl/FaqServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -34,27 +33,6 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
         return RestResponse.success(faqs, "成功");
     }
 
-    /**
-     * 新增分类或问题或答案
-     *
-     * @since 2019/12/5 11:01
-     */
-    public RestResponse add(Faq faq) {
-        List<Faq> faqs = this.list(new QueryWrapper<Faq>()
-                .select("serial")
-                .eq("parent_id", faq.getParentId())
-                .orderByDesc("serial"));
-        if (faqs.isEmpty()) {
-            faq.setSerial(1);
-        } else {
-            faq.setSerial(faqs.get(0).getSerial() + 1);
-        }
-        if (this.save(faq)) {
-            return RestResponse.success(null, "成功");
-        }
-        return RestResponse.fail();
-    }
-
     /**
      * 删除id及id下的所有记录
      *
@@ -62,7 +40,7 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
      * @return 操作结果
      */
     public RestResponse delete(Long id) {
-        List<Faq> faqs = this.list(new QueryWrapper<Faq>().select("id", "parent_id","serial"));
+        List<Faq> faqs = this.list(new QueryWrapper<Faq>().select("id", "parent_id", "serial"));
         removeFaqs(id, faqs);
         List<Long> ids = faqs.stream()
                 //保留序号为-1的记录
@@ -91,46 +69,4 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
             }
         }
     }
-
-    //type 1上移 0下移
-    public RestResponse serial(Long id, Integer type) {
-        Faq byId = this.getById(id);
-        if (null == byId) {
-            return RestResponse.success();
-        }
-        List<Faq> faqs = this.list(new QueryWrapper<Faq>()
-                .eq("parent_id", byId.getParentId())
-                .eq("type", byId.getType())
-                .orderByDesc("serial"));
-        if (faqs.size() == 1) {
-            return RestResponse.success(null, "成功");
-        }
-        //type 0下移
-        //type 1上移
-        if (type == 1) {
-            faqs.sort(Comparator.comparing(Faq::getSerial));
-        }
-        if (faqs.get(0).getSerial().equals(byId.getSerial())) {
-            return RestResponse.success(null, "成功");
-        }
-        if (upOrDown(byId, faqs)) {
-            return RestResponse.success(null, "成功");
-        }
-        return RestResponse.fail();
-    }
-
-    private boolean upOrDown(Faq byId, List<Faq> faqs) {
-        Faq f = new Faq();
-        for (Faq faq : faqs) {
-            if (faq.getSerial().equals(byId.getSerial())) {
-                f.setSerial(byId.getSerial());
-                byId.setSerial(f.getSerial());
-                if (this.updateById(byId) && this.updateById(f)) {
-                    return true;
-                }
-            }
-            f = faq;
-        }
-        return false;
-    }
 }