更新

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

@@ -2,7 +2,7 @@ package cn.com.ty.lift.enterprise.custom.controller;
 
 import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyContact;
 import cn.com.ty.lift.enterprise.custom.dao.entity.model.PropertyContactReq;
-import cn.com.ty.lift.enterprise.custom.service.PropertyCompanyService;
+import cn.com.ty.lift.enterprise.custom.service.impl.PropertyCompanyServiceImpl;
 import cn.com.ty.lift.enterprise.custom.service.impl.PropertyContactServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -23,8 +23,8 @@ import java.util.List;
  * (甲方联系人)客户联系人表 前端控制器
  */
 public class PropertyContactController {
+    private final PropertyCompanyServiceImpl propertyCompanyService;
     private final PropertyContactServiceImpl propertyContactService;
-    private final PropertyCompanyService propertyCompanyService;
 
     @PostMapping("/list")
     /**

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

@@ -43,8 +43,8 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
         PropertyCompany byId = this.getById(id);
         if (byId.getStatus() == 2) {
             return RestResponse.success(null, "有正在服务的关联项目，无法删除");
-        } else if (this.getBaseMapper().selectProjectCount(byId.getId()) != null
-                && this.getBaseMapper().selectProjectCount(byId.getId()).get("count") > 0L) {
+        } else if (baseMapper.selectProjectCount(byId.getId()) != null
+                && baseMapper.selectProjectCount(byId.getId()).get("count") > 0L) {
             byId.setStatus(2);
             this.updateById(byId);
             return RestResponse.success(null, "有正在服务的关联项目，无法删除");

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

@@ -26,7 +26,7 @@ public class PropertyContactServiceImpl extends ServiceImpl<PropertyContactMappe
         PropertyContact byId = this.getById(id);
         if (byId.getStatus() == 2) {
             return RestResponse.fail("有正在服务的关联项目，无法删除");
-        } else if (this.getBaseMapper().selectProjectCount(byId.getId()) != null && this.getBaseMapper().selectProjectCount(byId.getId()).get("count") > 0L) {
+        } else if (baseMapper.selectProjectCount(byId.getId()) != null && baseMapper.selectProjectCount(byId.getId()).get("count") > 0L) {
             byId.setStatus(2);
             this.updateById(byId);
             return RestResponse.fail("有正在服务的关联项目，无法删除");

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/controller/MaintenanceOptionController.java

@@ -98,7 +98,7 @@ public class MaintenanceOptionController {
     }
 
     /**
-     * @param
+     * @param option 维保项id
      * @return
      * @description 判断是否是默认维保项，不是默认的维保项才可以删除
      * @date 2019/12/19 9:20

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

@@ -1,8 +1,7 @@
 package cn.com.ty.lift.system.faq.controller;
 
 
-import cn.com.ty.lift.common.constants.ApiConstants;
-import cn.com.ty.lift.system.faq.entity.Faq;
+import cn.com.ty.lift.system.faq.dao.entity.Faq;
 import cn.com.ty.lift.system.faq.service.impl.FaqServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

lift-system-service/src/main/java/cn/com/ty/lift/system/faq/entity/Faq.java

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.system.faq.entity;
+package cn.com.ty.lift.system.faq.dao.entity;
 
 import cn.com.ty.lift.common.model.BaseTree;
 import com.baomidou.mybatisplus.annotation.IdType;

lift-system-service/src/main/java/cn/com/ty/lift/system/faq/mapper/FaqMapper.java

@@ -1,13 +1,10 @@
-package cn.com.ty.lift.system.faq.mapper;
+package cn.com.ty.lift.system.faq.dao.mapper;
 
-import cn.com.ty.lift.system.faq.entity.Faq;
+import cn.com.ty.lift.system.faq.dao.entity.Faq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
 
 /**
  * <p>

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

@@ -1,6 +1,6 @@
 package cn.com.ty.lift.system.faq.service;
 
-import cn.com.ty.lift.system.faq.entity.Faq;
+import cn.com.ty.lift.system.faq.dao.entity.Faq;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

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

@@ -1,14 +1,12 @@
 package cn.com.ty.lift.system.faq.service.impl;
 
-import cn.com.ty.lift.common.constants.ApiConstants;
-import cn.com.ty.lift.system.faq.entity.Faq;
-import cn.com.ty.lift.system.faq.mapper.FaqMapper;
+import cn.com.ty.lift.system.faq.dao.entity.Faq;
+import cn.com.ty.lift.system.faq.dao.mapper.FaqMapper;
 import cn.com.ty.lift.system.faq.service.FaqService;
 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 org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,7 +19,6 @@ import java.util.List;
  * @author wang-hai-cheng
  * @since 2019-12-05
  */
-@Transactional
 @Service
 public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqService {