显示收藏

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/GeneratorCodeByTables.java

@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-        generateByTables("Gongdc", "com.yh.saas.plugin.yiliangyiyun","settled_company_info","settled_company_contacts","settled_company_error","settled_company_dynamics");
+        generateByTables("Gongdc", "com.yh.saas.plugin.yiliangyiyun","collection_company");
     }
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CollectionCompanyController.java

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 收藏公司 前端控制器
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-30
+ */
+@RestController
+@RequestMapping("/collectionCompany")
+public class CollectionCompanyController {
+
+}
+

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SettledCompanyInfoController.java

@@ -73,7 +73,7 @@ public class SettledCompanyInfoController {
 
 
     /**
-     * 删除销售计划
+     * 删除
      *
      * @param settledCompanyInfo
      * @return
@@ -96,5 +96,41 @@ public class SettledCompanyInfoController {
 
     }
 
+
+    /**
+     * 显示隐藏
+     *
+     * @param settledCompanyInfo
+     * @return
+     */
+    @PostMapping("/api/showHidden")
+    public void showHidden(@RequestBody SettledCompanyInfo settledCompanyInfo) {
+        settledCompanyInfoService.showHidden(settledCompanyInfo.getId());
+    }
+
+    /**
+     * 收藏
+     *
+     * @param settledCompanyInfo
+     * @return
+     */
+    @PostMapping("/api/collection")
+    public String collection(@RequestBody SettledCompanyInfo settledCompanyInfo) {
+        return settledCompanyInfoService.collection(settledCompanyInfo);
+
+    }
+
+    /**
+     * 取消收藏
+     *
+     * @param settledCompanyInfo
+     * @return
+     */
+    @PostMapping("/api/collectionNot")
+    public String collectionNot(@RequestBody SettledCompanyInfo settledCompanyInfo) {
+        return settledCompanyInfoService.collectionNot(settledCompanyInfo);
+
+    }
+
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CollectionCompany.java

@@ -0,0 +1,56 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotations.Version;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 收藏公司
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("collection_company")
+public class CollectionCompany extends BaseModel<CollectionCompany> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 信息id
+     */
+    private String infoId;
+    /**
+     * 公司名称
+     */
+    private String compName;
+    /**
+     * 手机号
+     */
+    private String phone;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SettledCompanyInfo.java

@@ -1,6 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import com.baomidou.mybatisplus.activerecord.Model;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -153,6 +154,13 @@ public class SettledCompanyInfo extends BaseModel<SettledCompanyInfo> {
     @TableField(exist = false)
     private String searchKeyWord;
 
+
+    /**
+     * 当前登录人手机
+     */
+    @TableField(exist = false)
+    private String loginPhone;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CollectionCompanyMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.CollectionCompany;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 收藏公司 Mapper 接口
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-30
+ */
+public interface CollectionCompanyMapper extends BaseMapper<CollectionCompany> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICollectionCompanyService.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.CollectionCompany;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 收藏公司 服务类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-30
+ */
+public interface ICollectionCompanyService extends IService<CollectionCompany> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ISettledCompanyInfoService.java

@@ -65,4 +65,28 @@ public interface ISettledCompanyInfoService extends IService<SettledCompanyInfo>
      */
     String examine(SettledCompanyInfo settledCompanyInfo);
 
+    /**
+     * 显示隐藏
+     *
+     * @param id
+     * @return
+     */
+    void showHidden(String id);
+
+    /**
+     * 收藏
+     *
+     * @param settledCompanyInfo
+     * @return
+     */
+    String collection(SettledCompanyInfo settledCompanyInfo);
+
+    /**
+     * 取消收藏
+     *
+     * @param settledCompanyInfo
+     * @return
+     */
+    String collectionNot(SettledCompanyInfo settledCompanyInfo);
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CollectionCompanyServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.CollectionCompany;
+import com.yh.saas.plugin.yiliangyiyun.mapper.CollectionCompanyMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ICollectionCompanyService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 收藏公司 服务实现类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-30
+ */
+@Service
+public class CollectionCompanyServiceImpl extends ServiceImpl<CollectionCompanyMapper, CollectionCompany> implements ICollectionCompanyService {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SettledCompanyInfoServiceImpl.java

@@ -9,10 +9,7 @@ import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 import com.yh.saas.plugin.yiliangyiyun.mapper.SettledCompanyInfoMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.ICommonUserService;
-import com.yh.saas.plugin.yiliangyiyun.service.ISettledCompanyContactsService;
-import com.yh.saas.plugin.yiliangyiyun.service.ISettledCompanyErrorService;
-import com.yh.saas.plugin.yiliangyiyun.service.ISettledCompanyInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.util.GeTuiUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +46,8 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
     private GeTuiUtils geTuiUtils;
     @Autowired
     private ICommonUserService commonUserService;
+    @Autowired
+    private ICollectionCompanyService collectionCompanyService;
 
     /**
      * 添加入住公司信息
@@ -227,7 +226,7 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
                 settledCompanyInfo1.setStatus(StatusEnum.ORDER_REJECTED.getName());
                 geTuiUtils.pushByCid("审核通知", "您的公司入住申请已被驳回", commonUser.getId());
             }
-            //更改销售计划信息
+            //更改信息
             this.updateById(settledCompanyInfo1);
             return "OK";
         }
@@ -235,4 +234,57 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
     }
 
 
+    /**
+     * 显示隐藏
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public void showHidden(String id) {
+        //查询销售计划信息
+        SettledCompanyInfo settledCompanyInfo = this.selectById(id);
+        if (settledCompanyInfo != null) {
+            if ("2".equals(settledCompanyInfo.getShowFlag())) {
+                settledCompanyInfo.setShowFlag("1");
+            } else {
+                settledCompanyInfo.setShowFlag("2");
+            }
+            this.updateById(settledCompanyInfo);
+        }
+    }
+
+
+    /**
+     * 收藏
+     *
+     * @param settledCompanyInfo
+     * @return
+     */
+    @Override
+    public String collection(SettledCompanyInfo settledCompanyInfo) {
+        CollectionCompany collectionCompany = new CollectionCompany();
+        collectionCompany.setId(IdGenerator.generateUUID());
+        collectionCompany.setInfoId(settledCompanyInfo.getId());
+        collectionCompany.setCompName(settledCompanyInfo.getCompName());
+        collectionCompany.setPhone(settledCompanyInfo.getLoginPhone());
+        collectionCompanyService.insert(collectionCompany);
+        return "OK";
+    }
+
+    /**
+     * 取消收藏
+     *
+     * @param settledCompanyInfo
+     * @return
+     */
+    @Override
+    public String collectionNot(SettledCompanyInfo settledCompanyInfo) {
+        collectionCompanyService.delete(new EntityWrapper<CollectionCompany>()
+                .eq("info_id", settledCompanyInfo.getId())
+                .eq("phone", settledCompanyInfo.getLoginPhone()));
+        return "OK";
+    }
+
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/CollectionCompanyMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.CollectionCompanyMapper">
+
+</mapper>