更新

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

@@ -112,6 +112,11 @@ public class PropertyCompanyController {
         return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "新增失败");
     }
 
+    @PostMapping("/update/status")
+    public RestResponse updateStatus(@RequestBody PropertyCompanyReq req){
+        return propertyCompanyService.updateStatus(req);
+    }
+
     @GetMapping("/export")
     public RestResponse export(HttpServletRequest request, HttpServletResponse response) {
         return propertyCompanyService.export();

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

@@ -59,12 +59,12 @@ public class PropertyContactController {
      */
     public RestResponse add(@RequestBody PropertyContact propertyContact) {
         if (propertyCompanyService.getById(propertyContact.getPpCompanyId()) == null) {
-            return RestResponse.ok(null, "0", "客户不存在");
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "客户不存在");
         }
         if (propertyContactService.save(propertyContact)) {
-            return RestResponse.ok(propertyContact.getId(), "1", "新增成功");
+            return RestResponse.ok(propertyContact.getId(), ApiConstants.RESULT_SUCCESS, "新增成功");
         }
-        return RestResponse.ok(null, "0", "新增失败");
+        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "新增失败");
     }
 
     @PostMapping("/update")
@@ -76,9 +76,9 @@ public class PropertyContactController {
      */
     public RestResponse update(@RequestBody PropertyContact propertyContact) {
         if (propertyContactService.updateById(propertyContact)) {
-            return RestResponse.ok(null, "1", "更新成功");
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "更新成功");
         }
-        return RestResponse.ok(null, "0", "更新失败");
+        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "更新失败");
     }
 
     @PostMapping("/delete")

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/dao/entity/model/PropertyCompanyReq.java

@@ -123,4 +123,6 @@ public class PropertyCompanyReq extends BaseRequestModel implements Serializable
     @TableField("create_date")
     private LocalDateTime createDate;
 
+    private Long propertyCompanyId;
+    private Long propertyContactId;
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/dao/mapper/PropertyCompanyMapper.java

@@ -2,6 +2,9 @@ package cn.com.ty.lift.enterprise.custom.dao.mapper;
 
 import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -12,5 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2019-11-11
  */
 public interface PropertyCompanyMapper extends BaseMapper<PropertyCompany> {
-
+    @Select("select count(id) count from project")
+    Map<String, Integer> selectProjectCount();
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/dao/mapper/PropertyContactMapper.java

@@ -2,6 +2,9 @@ package cn.com.ty.lift.enterprise.custom.dao.mapper;
 
 import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyContact;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -12,5 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2019-11-11
  */
 public interface PropertyContactMapper extends BaseMapper<PropertyContact> {
-
+    @Select("select count(id) count from project")
+    Map<String, Integer> selectProjectCount();
 }

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

@@ -12,5 +12,4 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2019-11-11
  */
 public interface PropertyCompanyService extends IService<PropertyCompany> {
-
 }

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

@@ -8,23 +8,14 @@ import cn.com.ty.lift.enterprise.custom.dao.entity.model.PropertyCompanyReq;
 import cn.com.ty.lift.enterprise.custom.dao.mapper.PropertyCompanyMapper;
 import cn.com.ty.lift.enterprise.custom.service.PropertyCompanyService;
 import cn.com.xwy.boot.web.dto.RestResponse;
-import cn.hutool.poi.excel.ExcelUtil;
-import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 
 /**
  * <p>
@@ -44,6 +35,8 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
         PropertyCompany byId = this.getById(id);
         if (byId.getStatus() == 2) {
             return RestResponse.ok(null, "0", "有正在服务的关联项目，无法删除");
+        } else if (this.getBaseMapper().selectProjectCount() != null && this.getBaseMapper().selectProjectCount().get("count") > 0) {
+            return RestResponse.ok(null, "0", "有正在服务的关联项目，无法删除");
         } else {
             byId.setStatus(0);
             if (this.updateById(byId)) {
@@ -62,8 +55,11 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
                         .eq("mt_company_id", propertyCompany.getMtCompanyId())
                         .ne("status", 0)
                         .like(propertyCompany.getName() != null, "name", propertyCompany.getName())
+                        .or()
                         .like(propertyCompany.getAddress() != null, "address", propertyCompany.getAddress())
+                        .or()
                         .like(propertyCompany.getTelephone() != null, "telephone", propertyCompany.getTelephone())
+                        .or()
                         .like(propertyCompany.getMailingAddress() != null, "mailing_address", propertyCompany.getMailingAddress()));
         if (records.getRecords().isEmpty()) {
             return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
@@ -87,4 +83,20 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
     public RestResponse export() {
         return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "待实现");
     }
+
+    //更新客户公司和客户联系人的status
+    @Transactional
+    public RestResponse updateStatus(PropertyCompanyReq req) {
+        PropertyCompany companyById = this.getById(req.getPropertyCompanyId());
+        PropertyContact contactById = propertyContactService.getById(req.getPropertyContactId());
+        if (companyById == null | contactById == null) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "客户或联系人不存在");
+        }
+        companyById.setStatus(2);
+        contactById.setStatus(2);
+        if (this.updateById(companyById) && propertyContactService.updateById(contactById)) {
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "成功");
+        }
+        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "失败");
+    }
 }

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

@@ -5,15 +5,10 @@ import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyContact;
 import cn.com.ty.lift.enterprise.custom.dao.mapper.PropertyContactMapper;
 import cn.com.ty.lift.enterprise.custom.service.PropertyContactService;
 import cn.com.xwy.boot.web.dto.RestResponse;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.HashMap;
 
 /**
  * <p>
@@ -32,6 +27,8 @@ public class PropertyContactServiceImpl extends ServiceImpl<PropertyContactMappe
         PropertyContact byId = this.getById(id);
         if (byId.getStatus() == 2) {
             return RestResponse.ok(null, "0", "有正在服务的关联项目，无法删除");
+        } else if (this.getBaseMapper().selectProjectCount() != null && this.getBaseMapper().selectProjectCount().get("count") > 0) {
+            return RestResponse.ok(null, "0", "有正在服务的关联项目，无法删除");
         } else {
             byId.setStatus(0);
             if (this.updateById(byId)) {

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/controller/RegionController.java

@@ -6,6 +6,7 @@ import cn.com.ty.lift.enterprise.region.dao.entity.Region;
 import cn.com.ty.lift.enterprise.region.dao.entity.model.RegionReq;
 import cn.com.ty.lift.enterprise.region.service.impl.RegionServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -69,7 +70,13 @@ public class RegionController {
      */
     @PostMapping("/project/regions")
     public RestResponse regions(@RequestBody Region region) {
-        return regionService.projectRegions(region);
+        List<Region> regions = regionService.list(new QueryWrapper<Region>()
+                .select("id", "area_name")
+                .eq("mt_company_id", region.getMtCompanyId()));
+        if (regions.isEmpty()) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+        }
+        return RestResponse.ok(regions, ApiConstants.RESULT_SUCCESS, "成功");
     }
 
     /**
@@ -92,6 +99,17 @@ public class RegionController {
         return RestResponse.ok(area_code, ApiConstants.RESULT_SUCCESS, "查询成功");
     }
 
+    /**
+     * @param
+     * @return
+     * @description 区域属于的省市名，省市编码
+     * @date 2019/12/19 15:15
+     */
+    @PostMapping("/project/areaInfo")
+    public RestResponse projectAreaInfo(@RequestBody Region region) {
+        return regionService.projectRegions(region);
+    }
+
     /**
      * @param
      * @return
@@ -102,4 +120,5 @@ public class RegionController {
     public RestResponse users(@RequestBody Region region) {
         return regionService.selectRegionUser(region);
     }
+
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/dao/mapper/RegionMapper.java

@@ -17,8 +17,8 @@ import java.util.Map;
  * @since 2019-12-09
  */
 public interface RegionMapper extends BaseMapper<Region> {
-    @Select("select id,area_name areaName, city_code cityCode, province_code provinceCode from region where mt_company_id = #{mtCompanyId}")
-    List<Map<String, Object>> selectProjectRegions(@Param("mtCompanyId") Long mtCompanyId);
+    @Select("select city_code cityCode, province_code provinceCode from region where id = #{id}")
+    List<Map<String, Object>> selectProjectRegions(@Param("id") Long id);
 
     @Select("select r.id, r.area_code areaCode, r.province_code provinceCode, r.city_code cityCode, r.area_name areaName, r.remark, u.name from region r left join user_info u on r.user_id = u.user_id where r.mt_company_id = ${mtCompanyId} limit ${pageNum},${pageSize}")
     List<Map<String, Object>> selectRegions(@Param("mtCompanyId") Long mtCompanyId, @Param("pageNum") Long pageNum, @Param("pageSize") Long pageSize);

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

@@ -95,7 +95,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 
     //项目模块用，查询区域列表和它属于的省市名称和code
     public RestResponse projectRegions(Region r) {
-        List<Map<String, Object>> regions = this.baseMapper.selectProjectRegions(r.getMtCompanyId());
+        List<Map<String, Object>> regions = this.baseMapper.selectProjectRegions(r.getId());
         if (regions.isEmpty()) {
             return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
         }

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/controller/QuanNewsController.java

@@ -35,7 +35,7 @@ public class QuanNewsController {
 
     @PostMapping("/top")
     /**
-     * @description 置顶
+     * @description 置顶/取消置顶
      * @date 2019/12/2 15:40
      * @param [新闻id]
      * @return cn.com.xwy.boot.web.dto.RestResponse

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/service/impl/QuanNewsServiceImpl.java

@@ -43,6 +43,10 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
         if (type == 1) {
             if (byId.getTopSerial() != 0) {
                 //如果新闻在置顶新闻中
+                List<QuanNews> tops = this.list(new QueryWrapper<QuanNews>().ne("top_serial", 0));
+                for (QuanNews top : tops) {
+                    top.setTopSerial(top.getTopSerial() + 1);
+                }
                 QuanNews top = this.getOne(new QueryWrapper<QuanNews>().eq("top_serial", 1));
                 top.setTopSerial(byId.getTopSerial());
                 byId.setTopSerial(1);