Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/BusinessItemCustomController.java

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+@RestController
+@RequestMapping("/business-item-custom")
+public class BusinessItemCustomController {
+
+}
+

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/CustomItemContactsController.java

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+@RestController
+@RequestMapping("/custom-item-contacts")
+public class CustomItemContactsController {
+
+}
+

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/BusinessItemCustom.java

@@ -0,0 +1,48 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class BusinessItemCustom extends Model<BusinessItemCustom> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 客户id
+     */
+    @TableField("contacts_id")
+    private Integer contactsId;
+
+    /**
+     * 联系人id
+     */
+    @TableField("business_id")
+    private Integer businessId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/Contacts.java

@@ -39,6 +39,8 @@ public class Contacts extends Model<Contacts> {
      */
     @TableField("sex")
     private Integer sex;
+    @TableField(exist = false)
+    private String sexValue;
 
     /**
      * 联系人名称
@@ -69,12 +71,16 @@ public class Contacts extends Model<Contacts> {
      */
     @TableField("owner_id")
     private String ownerId;
+    @TableField(exist = false)
+    private String ownerName;
 
     /**
      * 创建人
      */
     @TableField("creator_id")
     private String creatorId;
+    @TableField(exist = false)
+    private String creatorName;
 
     /**
      * 地址

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/Custom.java

@@ -42,6 +42,11 @@ public class Custom extends Model<Custom> {
      */
     @TableField("custom_name")
     private String customName;
+    /**
+     * 地址
+     */
+    @TableField("address")
+    private String address;
     /**
      * 负责人
      */
@@ -90,6 +95,8 @@ public class Custom extends Model<Custom> {
      */
     @TableField("owner_id")
     private String ownerId;
+    @TableField(exist = false)
+    private String ownerName;
 
     /**
      * 客户编号
@@ -200,6 +207,8 @@ public class Custom extends Model<Custom> {
      */
     @TableField("creator_id")
     private String creatorId;
+    @TableField(exist = false)
+    private String creatorName;
 
     /**
      * 描述
@@ -226,6 +235,10 @@ public class Custom extends Model<Custom> {
     private List<UploadFile> files;
     @TableField(exist = false)
     private List<BusinessOpportunity> BusinessOpportunitys;
+    @TableField(exist = false)
+    private List<ActionLog> actionLogs;
+    @TableField(exist = false)
+    private List<Contacts> contactsList;
 
 
     @Override

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/CustomItemContacts.java

@@ -0,0 +1,48 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CustomItemContacts extends Model<CustomItemContacts> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 客户id
+     */
+    @TableField("contacts_id")
+    private Integer contactsId;
+
+    /**
+     * 联系人id
+     */
+    @TableField("custom_id")
+    private Integer customId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/BusinessItemCustomMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.BusinessItemCustom;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+public interface BusinessItemCustomMapper extends BaseMapper<BusinessItemCustom> {
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/ContactsMapper.java

@@ -6,7 +6,9 @@ import com.management.platform.entity.Contacts;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.management.platform.entity.vo.ContactsVo;
 import com.management.platform.util.HttpRespMsg;
+import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -21,4 +23,6 @@ public interface ContactsMapper extends BaseMapper<Contacts> {
 
 
     Page<ContactsVo> pageContacts(Page page, Map<String, Object> map);
+
+    List<Contacts> selectListByIds(List<Integer> ids);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/CustomItemContactsMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.CustomItemContacts;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+public interface CustomItemContactsMapper extends BaseMapper<CustomItemContacts> {
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/CustomMapper.java

@@ -27,4 +27,6 @@ public interface CustomMapper extends BaseMapper<Custom> {
     List<Custom> getList2(Custom custom);
 
     int getTotal2(Custom custom);
+
+    Custom getInfo(Integer id);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/BusinessItemCustomService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.BusinessItemCustom;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+public interface BusinessItemCustomService extends IService<BusinessItemCustom> {
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/CustomItemContactsService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.CustomItemContacts;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+public interface CustomItemContactsService extends IService<CustomItemContacts> {
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/BusinessItemCustomServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.BusinessItemCustom;
+import com.management.platform.mapper.BusinessItemCustomMapper;
+import com.management.platform.service.BusinessItemCustomService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+@Service
+public class BusinessItemCustomServiceImpl extends ServiceImpl<BusinessItemCustomMapper, BusinessItemCustom> implements BusinessItemCustomService {
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/CustomItemContactsServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.CustomItemContacts;
+import com.management.platform.mapper.CustomItemContactsMapper;
+import com.management.platform.service.CustomItemContactsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+@Service
+public class CustomItemContactsServiceImpl extends ServiceImpl<CustomItemContactsMapper, CustomItemContacts> implements CustomItemContactsService {
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/CustomServiceImpl.java

@@ -32,7 +32,10 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
     private UserMapper userMapper;
     @Autowired
     private CustomMapper customMapper;
-
+    @Autowired
+    private BusinessItemCustomMapper businessItemCustomMapper;
+    @Autowired
+    private CustomItemContactsMapper customItemContactsMapper;
     @Autowired
     private ActionLogMapper actionLogMapper;
 
@@ -44,6 +47,9 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
     @Autowired
     private SysFunctionService sysFunctionService;
 
+    @Autowired
+    private ContactsMapper contactsMapper;
+
     @Override
     public HttpRespMsg insertAndUpdate(Custom custom, HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
@@ -158,9 +164,19 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
 
     @Override
     public HttpRespMsg getInfo(Custom custom, HttpServletRequest request) {
-        Custom custom1 = customMapper.selectById(custom.getId());
+        Custom custom1 = customMapper.getInfo(custom.getId());
+
         custom1.setFiles(uploadFileMapper.selectList(new QueryWrapper<UploadFile>().eq("code", "custom").eq("item_id",custom1.getId())));
         custom1.setBusinessOpportunitys(businessOpportunityMapper.selectList(new QueryWrapper<BusinessOpportunity>().eq("customer_id",custom1.getId())));
+        custom1.setActionLogs(actionLogMapper.selectList(new QueryWrapper<ActionLog>().eq("code","custom").eq("item_id",custom1.getId())));
+        List<CustomItemContacts> contacts = customItemContactsMapper.selectList(new QueryWrapper<CustomItemContacts>().eq("contacts_id", custom1.getId()));
+        List<Integer> ids = new ArrayList<>();
+        for (CustomItemContacts contact : contacts) {
+            ids.add(contact.getCustomId());
+        }
+//        List<Contacts> cs = contactsMapper.selectList(new QueryWrapper<Contacts>().in("id", ids));
+        List<Contacts> cs = contactsMapper.selectListByIds(ids);
+        custom1.setContactsList(cs);
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         httpRespMsg.setData(custom1);
         return httpRespMsg;

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/BusinessItemCustomMapper.xml

@@ -0,0 +1,17 @@
+<?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.management.platform.mapper.BusinessItemCustomMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.BusinessItemCustom">
+        <id column="id" property="id" />
+        <result column="contacts_id" property="contactsId" />
+        <result column="business_id" property="businessId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, contacts_id, business_id
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/ContactsMapper.xml

@@ -63,6 +63,27 @@
         order by create_time desc
 
     </select>
+    <select id="selectListByIds" resultType="com.management.platform.entity.Contacts">
+        select id,
+               `name`,
+               phone,
+               email,
+               position,
+               CASE sex
+                   WHEN 0 THEN '女' WHEN 1 THEN '男' ELSE NULL
+        END AS sexValue,
+           (select `name` from `user` where id = creator_id) creatorName,
+           (select `name` from `user` where id = owner_id) ownerName
+        from contacts
+        <where>
+            <if test="ids != null and ids.size() > 0">
+                AND id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
+    </select>
 
 
 </mapper>

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/CustomItemContactsMapper.xml

@@ -0,0 +1,17 @@
+<?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.management.platform.mapper.CustomItemContactsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.CustomItemContacts">
+        <id column="id" property="id" />
+        <result column="contacts_id" property="contactsId" />
+        <result column="business_id" property="businessId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, contacts_id, business_id
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/CustomMapper.xml

@@ -258,5 +258,33 @@
             and customer_industry_id = #{customerIndustryId}
         </if>
     </select>
+    <select id="getInfo" resultType="com.management.platform.entity.Custom">
+        select id,
+               custom_name,
+               custom_source_id,
+               customer_industry_id,
+               customer_level_id,
+               email,
+               address,
+               custom_code,
+               tel_phone,
+               fax,
+               create_time,
+               plate1,
+               plate2,
+               plate3,
+               plate4,
+               plate5,
+               creator_id,
+               custom_desc,
+               is_delete,
+               (select `name` from sys_dict where customer_level_id = id and code = 'CustomLevel') customerLevelValue,
+               (select `name` from sys_dict where customer_industry_id = id and code = 'CustomIndustry') customerIndustryValue,
+               (select `name` from sys_dict where custom_source_id = id and code = 'CustomSources') customSourceValue,
+               (select `name` from `user` where id = incharger_id) inchargerName,
+               (select `name` from `user` where id = creator_id) creatorName
+        from custom
+        where id = #{id}
+    </select>
 
 </mapper>