Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -16,6 +16,7 @@ import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectResponse
 import cn.com.ty.lift.business.project.dao.mapper.ProjectHistoryMapper;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
 import cn.com.ty.lift.common.base.ExportRequest;
+import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.export.ExportUtils;
 import cn.com.ty.lift.common.utils.DateUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
@@ -33,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -178,6 +180,11 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
     @Transactional(rollbackFor = Exception.class)
     public RestResponse add(ProjectExtensionRequest request) {
         Project project = request.getProject();
+        if(project.getStartDate().isAfter(LocalDate.now())){
+            project.setProjectStatus("1");
+        }else{
+            project.setProjectStatus("2");
+        }
         boolean ret = saveProject(project);
         if (!ret) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

lift-common/src/main/java/cn.com.ty.lift.common/aliservice/alipay/AlipayUtil.java

@@ -1,8 +1,16 @@
 package cn.com.ty.lift.common.aliservice.alipay;
 
-import com.alipay.api.*;
-import com.alipay.api.request.*;
-import com.alipay.api.response.*;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.CertAlipayRequest;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.request.AlipayFundTransUniTransferRequest;
+import com.alipay.api.request.AlipayTradeCancelRequest;
+import com.alipay.api.request.AlipayTradeCreateRequest;
+import com.alipay.api.request.AlipayTradeQueryRequest;
+import com.alipay.api.response.AlipayFundTransUniTransferResponse;
+import com.alipay.api.response.AlipayTradeCancelResponse;
+import com.alipay.api.response.AlipayTradeCreateResponse;
+import com.alipay.api.response.AlipayTradeQueryResponse;
 
 import java.math.BigDecimal;
 import java.util.HashMap;

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

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.enterprise.custom.controller;
 
+import cn.com.ty.lift.enterprise.common.Judge;
 import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyCompany;
 import cn.com.ty.lift.enterprise.custom.dao.entity.model.PropertyCompanyAndPropertyContactReq;
 import cn.com.ty.lift.enterprise.custom.dao.entity.model.PropertyCompanyReq;
@@ -28,11 +29,14 @@ public class PropertyCompanyController {
     /**
      * @description 根据条件查询客户列表
      * @date 2019/12/3 8:51
-     * @param [客户名称或客户地址或客户邮寄地址或客户联系方式,页码,页大小,维保公司id]
+     * @param propertyCompany 客户名称或客户地址或客户邮寄地址或客户联系方式,页码,页大小,维保公司id
      * @return RestResponse
      */
-    public RestResponse propertyCompanies(@RequestBody PropertyCompanyReq propertyCompany) {
-        return propertyCompanyService.propertyCompanies(propertyCompany);
+    public RestResponse propertyCompanies(@RequestBody PropertyCompanyReq req) {
+        Judge.id(req.getMtCompanyId());
+        Judge.notNull(req.getPageNum());
+        Judge.notNull(req.getPageSize());
+        return propertyCompanyService.propertyCompanies(req);
     }
 
     @GetMapping("/{id}")
@@ -43,6 +47,7 @@ public class PropertyCompanyController {
      * @return RestResponse
      */
     public RestResponse propertyCompany(@PathVariable Long id) {
+        Judge.id(id);
         PropertyCompany byId = propertyCompanyService.getById(id);
         if (byId == null) {
             return RestResponse.success();
@@ -69,6 +74,7 @@ public class PropertyCompanyController {
      * @return RestResponse
      */
     public RestResponse update(@RequestBody PropertyCompany propertyCompany) {
+        Judge.id(propertyCompany.getId());
         if (propertyCompanyService.updateById(propertyCompany)) {
             return RestResponse.success(null, "成功");
         }

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

@@ -1,17 +1,11 @@
 package cn.com.ty.lift.enterprise.custom.dao.entity.model;
 
 import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyCompany;
-import cn.com.xwy.boot.controller.BaseRequestModel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -26,8 +20,6 @@ import java.time.LocalDateTime;
 @Accessors(chain = true)
 public class PropertyCompanyReq extends PropertyCompany implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     private String info;
 
     private Long pageNum;
@@ -35,4 +27,5 @@ public class PropertyCompanyReq extends PropertyCompany implements Serializable
 
     private Long propertyCompanyId;
     private Long propertyContactId;
+
 }

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

@@ -37,40 +37,21 @@ import java.util.List;
 public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMapper, PropertyCompany> implements PropertyCompanyService {
     private final PropertyContactServiceImpl propertyContactService;
 
-    @Transactional
-    public RestResponse delete(Long id) {
-        PropertyCompany byId = this.getById(id);
-        if (byId.getStatus() == 2) {
-            return RestResponse.success(null, "有正在服务的关联项目，无法删除");
-        } else if (baseMapper.selectProjectCount(byId.getId()) != null
-                && baseMapper.selectProjectCount(byId.getId()).get("count") > 0L) {
-            byId.setStatus(2);
-            this.updateById(byId);
-            return RestResponse.success(null, "有正在服务的关联项目，无法删除");
-        } else {
-            byId.setStatus(0);
-            if (this.updateById(byId)) {
-                return RestResponse.success(null, "成功");
-            }
-            return RestResponse.fail();
-        }
-    }
-
-    public RestResponse propertyCompanies(PropertyCompanyReq propertyCompany) {
-        Page<PropertyCompany> page = new Page<>(propertyCompany.getPageNum(), propertyCompany.getPageSize());
+    public RestResponse propertyCompanies(PropertyCompanyReq req) {
+        Page<PropertyCompany> page = new Page<>(req.getPageNum(), req.getPageSize());
         //根据请求参数查询客户列表
         IPage<PropertyCompany> records = this
                 .page(page, new QueryWrapper<PropertyCompany>()
                         .select("id", "mt_company_id", "name", "mailing_address", "status")
-                        .eq("mt_company_id", propertyCompany.getMtCompanyId())
+                        .eq(req.getMtCompanyId() != null, "mt_company_id", req.getMtCompanyId())
                         .ne("status", 0)
-                        .and(propertyCompany.getInfo() != null, c ->
+                        .and(req.getInfo() != null, c ->
                                 c
-                                        .like(propertyCompany.getInfo() != null, "name", propertyCompany.getInfo())
+                                        .like("name", req.getInfo())
                                         .or()
-                                        .like(propertyCompany.getInfo() != null, "address", propertyCompany.getInfo())
+                                        .like("address", req.getInfo())
                                         .or()
-                                        .like(propertyCompany.getInfo() != null, "mailing_address", propertyCompany.getInfo())
+                                        .like("mailing_address", req.getInfo())
                         ));
         if (records.getRecords().isEmpty()) {
             return RestResponse.success();
@@ -89,6 +70,28 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
         return RestResponse.fail();
     }
 
+    @Transactional
+    public RestResponse delete(Long id) {
+        PropertyCompany byId = this.getById(id);
+        if (null == byId) {
+            return RestResponse.success();
+        }
+        if (byId.getStatus() == 2) {
+            return RestResponse.success(null, "有正在服务的关联项目，无法删除");
+        } else if (baseMapper.selectProjectCount(byId.getId()) != null
+                && baseMapper.selectProjectCount(byId.getId()).get("count") > 0L) {
+            byId.setStatus(2);
+            this.updateById(byId);
+            return RestResponse.success(null, "有正在服务的关联项目，无法删除");
+        } else {
+            byId.setStatus(0);
+            if (this.updateById(byId)) {
+                return RestResponse.success(null, "成功");
+            }
+            return RestResponse.fail();
+        }
+    }
+
     public void export(PropertyCompany propertyCompany, HttpServletResponse res) {
         String fileName = "甲方公司_" + LocalDate.now().toString() + ".xlsx";
         List<PropertyCompany> companies = this.list(new QueryWrapper<PropertyCompany>()

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -40,8 +41,9 @@ public class MaintenanceOptionController {
     public RestResponse list(@RequestBody OptionReq req) {
         IPage<MaintenanceOption> page = optionService.page(
                 new Page<>(req.getPageNum(), req.getPageSize()), new QueryWrapper<MaintenanceOption>()
-                        .in("mt_company_id", 0L, req.getMtCompanyId())
-                        .eq(req.getType() != null, "type", req.getType())
+                        //10086是平台的团队id
+                        .in("mt_company_id", 10086L, req.getMtCompanyId())
+                        .in(req.getType() != null, "type", type(req))
                         .eq(req.getLiftType() != null, "lift_type", req.getLiftType())
                         .orderByDesc("mt_company_id")
         );
@@ -51,14 +53,27 @@ public class MaintenanceOptionController {
         return RestResponse.success(page);
     }
 
+    /**
+     * app端维保项列表
+     *
+     * @param req
+     * @return RestResponse
+     */
     @PostMapping("/options")
-    public RestResponse options(@RequestBody MaintenanceOption req) {
+    public RestResponse options(@RequestBody OptionReq req) {
+        Integer liftType = req.getLiftType();
+        String sort = null;
+        if (liftType.equals(3)) {
+            sort = "-1,1";
+        }
         List<MaintenanceOption> options = optionService.list(
                 new QueryWrapper<MaintenanceOption>()
-                        .in("mt_company_id", 0L, req.getMtCompanyId())
-                        .eq(req.getType() != null, "type", req.getType())
+                        //10086是平台的团队id
+                        .in("mt_company_id", 10086L, req.getMtCompanyId())
+                        .in(req.getType() != null, "type", type(req))
                         .eq(req.getLiftType() != null, "lift_type", req.getLiftType())
-                        .eq(req.getSort() != null, "sort", req.getSort()));
+                        .in(sort != null, "sort", sort)
+        );
         if (options.isEmpty()) {
             return RestResponse.success();
         }
@@ -73,9 +88,6 @@ public class MaintenanceOptionController {
      */
     @PostMapping("/add")
     public RestResponse add(@RequestBody MaintenanceOption option) {
-        if (option.getMtCompanyId().equals(0L)) {
-            option.setEdit(0);
-        }
         if (optionService.save(option)) {
             return RestResponse.success(option.getId(), "成功");
         }
@@ -90,8 +102,8 @@ public class MaintenanceOptionController {
      */
     @PostMapping("/modify")
     public RestResponse modify(@RequestBody MaintenanceOption option) {
-        MaintenanceOption byId = optionService.getById(option.getId());
-        if (byId.getEdit() == 0) {
+        //10086是平台的团队id
+        if (option.getMtCompanyId().equals(10086L)) {
             return RestResponse.fail("默认维保项无法编辑");
         }
         if (optionService.updateById(option)) {
@@ -108,8 +120,8 @@ public class MaintenanceOptionController {
      */
     @PostMapping("/delete")
     public RestResponse delete(@RequestBody MaintenanceOption option) {
-        MaintenanceOption byId = optionService.getById(option.getId());
-        if (byId.getEdit() == 0) {
+        //10086是平台的团队id
+        if (option.getMtCompanyId().equals(10086L)) {
             return RestResponse.fail("默认维保项无法删除");
         }
         if (optionService.removeById(option.getId())) {
@@ -117,4 +129,25 @@ public class MaintenanceOptionController {
         }
         return RestResponse.fail();
     }
+
+    /**
+     * 维保项type 1半月 2季度保 3半年保 4全年保(仅仅只有自己的，
+     * 比如type=2时，并没有1的维保项，所以要处理一下，把1包含进去
+     *
+     * @param req
+     * @return type列表
+     */
+    private ArrayList<Integer> type(OptionReq req) {
+        ArrayList<Integer> types = new ArrayList<>();
+        Integer type = req.getType();
+        if (type > 0)
+            types.add(1);
+        if (type > 1)
+            types.add(2);
+        if (type > 2)
+            types.add(3);
+        if (type > 3)
+            types.add(4);
+        return types;
+    }
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/dao/entity/MaintenanceOption.java

@@ -77,10 +77,4 @@ public class MaintenanceOption implements Serializable {
      */
     @TableField("signage")
     private String signage;
-
-    /**
-     * 是否可编辑
-     */
-    @TableField("edit")
-    private Integer edit;
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/dao/entity/model/OptionReq.java

@@ -2,8 +2,12 @@ package cn.com.ty.lift.enterprise.option.dao.entity.model;
 
 import cn.com.ty.lift.enterprise.option.dao.entity.MaintenanceOption;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
 public class OptionReq extends MaintenanceOption {
     private Integer pageNum;
     private Integer pageSize;

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/dao/mapper/OrganizationMapper.java

@@ -18,6 +18,6 @@ import java.util.List;
  */
 public interface OrganizationMapper extends BaseMapper<Project> {
 
-    @Select("select p.user_id userId,u.avatar_url avatar,u.name name, p.user_role role,u.mobile mobile,p.is_monitor monitor from project_user p left join user_info u on p.user_id = u.user_id where p.project_id = #{projectId} and p.user_role in (13, 14, 15, 16)")
+    @Select("select p.user_id userId,u.avatar_url avatar,u.name name, p.user_role role,u.mobile mobile,p.is_monitor monitor from project_user p left join user_info u on p.user_id = u.user_id where p.project_id = #{projectId} and p.user_role in ('ROLEMTWORK', 'CLERK', 'REGION_DIRECTOR', 'HIGH_DIRECTOR')")
     List<HashMap<String, Object>> users(@Param("projectId") Long projectId);
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/service/OrganizationService.java

@@ -32,17 +32,17 @@ public class OrganizationService {
             Object role = projectUser.get("role");
             if (role != null) {
                 switch (role.toString()) {
-                    case "13":
+                    case "ROLEMTWORK":
                         projectUser.replace("role", "维保工");
                         break;
-                    case "14":
-                        projectUser.replace("role", "省级经理");
+                    case "CLERK":
+                        projectUser.replace("role", "文员");
                         break;
-                    case "15":
-                        projectUser.replace("role", "市级经理");
+                    case "REGION_DIRECTOR":
+                        projectUser.replace("role", "区域主管");
                         break;
-                    case "16":
-                        projectUser.replace("role", "文员");
+                    case "HIGH_DIRECTOR":
+                        projectUser.replace("role", "高级主管");
                         break;
                 }
             }

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

@@ -139,7 +139,8 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
             if (regionUser.isEmpty()) {
                 result.put("regionUser", null);
             } else {
-                result.put("regionUser", regionUser.get(0).get("name"));
+                //区域下，只会有一个区域主管，所以查出来列表，只需要第一个
+                result.put("regionUser",regionUser.get(0));
             }
         }
         if (null != region.getClerk() && !region.getClerk().equals("-1")) {

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

@@ -5,8 +5,10 @@ import cn.com.ty.lift.quan.news.dao.entity.model.QuanNewsReq;
 import cn.com.ty.lift.quan.news.service.impl.QuanNewsServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/dao/entity/QuanNews.java

@@ -53,8 +53,8 @@ public class QuanNews implements Serializable {
     /**
      * 视频地址
      */
-    @TableField("video_name")
-    private String videoName;
+    @TableField("video_path")
+    private String videoPath;
 
     /**
      * 发布时间

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/dao/entity/model/QuanNewsReq.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.quan.news.dao.entity.model;
 
+import cn.com.ty.lift.quan.news.dao.entity.QuanNews;
 import cn.com.xwy.boot.controller.BaseRequestModel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -22,60 +23,22 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class QuanNewsReq extends BaseRequestModel implements Serializable {
+public class QuanNewsReq extends QuanNews implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 新闻id
+     * 页码
      */
-    @TableId(value = "id", type = IdType.ID_WORKER)
-    private Long id;
+    private Long pageNum;
 
     /**
-     * 置顶排序 0不置顶 非0就是置顶(按照数字大小排序)
+     * 页大小
      */
-    @TableField("top_serial")
-    private Integer topSerial;
-
-    /**
-     * 标题
-     */
-    @TableField("title")
-    private String title;
-
-    /**
-     * 内容+图片
-     */
-    @TableField("content")
-    private String content;
-
-    /**
-     * 视频名称
-     */
-    private String videoName;
-
-    /**
-     * 发布时间
-     */
-    @TableField("release_date")
-    private LocalDateTime releaseDate;
-
-    /**
-     * 发布人名称
-     */
-    @TableField("release_user")
-    private String releaseUser;
-
-    /**
-     * 发布人id
-     */
-    @TableField("release_id")
-    private Long releaseId;
+    private Long pageSize;
 
     /**
      * 查询时是否包含置顶新闻
-     *
      */
     private Integer haveTops;
 

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

@@ -1,6 +1,5 @@
 package cn.com.ty.lift.quan.news.service.impl;
 
-import cn.com.ty.lift.common.utils.AliyunOSS;
 import cn.com.ty.lift.quan.news.dao.entity.QuanNews;
 import cn.com.ty.lift.quan.news.dao.entity.model.QuanNewsReq;
 import cn.com.ty.lift.quan.news.dao.mapper.QuanNewsMapper;
@@ -215,10 +214,6 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
      * @date 2019/12/4 13:34
      */
     public RestResponse updateNews(QuanNews quanNews) {
-        QuanNews byId = this.getById(quanNews);
-        if (byId.getVideoName() != null) {
-            AliyunOSS.me().deleteObject(byId.getVideoName());
-        }
         if (this.updateById(quanNews)) {
             return RestResponse.success(null, "成功");
         } else {
@@ -240,9 +235,6 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
             //取消新闻置顶
             this.top(id, 0);
         }
-        if (byId.getVideoName() != null) {
-            AliyunOSS.me().deleteObject(byId.getVideoName());
-        }
         if (this.removeById(id)) {
             return RestResponse.success(null, "成功");
         } else {

lift-system-service/src/main/java/cn/com/ty/lift/system/banner/service/impl/BannerImageServiceImpl.java

@@ -6,6 +6,7 @@ import cn.com.ty.lift.system.banner.service.BannerImageService;
 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.stereotype.Service;
 
 import java.util.List;