yusm 1 年之前
父节点
当前提交
e624bf1e17

+ 7 - 1
fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/BusinessOpportunity.java

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
  * </p>
  * </p>
  *
  *
  * @author Seyason
  * @author Seyason
- * @since 2024-02-28
+ * @since 2024-03-12
  */
  */
 @Data
 @Data
 @EqualsAndHashCode(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
@@ -45,6 +45,12 @@ public class BusinessOpportunity extends Model<BusinessOpportunity> {
     @TableField("name")
     @TableField("name")
     private String name;
     private String name;
 
 
+    /**
+     * 联系人id
+     */
+    @TableField("contacts_id")
+    private Integer contactsId;
+
     /**
     /**
      * 客户id
      * 客户id
      */
      */

+ 3 - 0
fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ContactsServiceImpl.java

@@ -47,6 +47,9 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
         String token = String.valueOf(request.getHeader("Token"));
         String token = String.valueOf(request.getHeader("Token"));
         User user = userMapper.selectById(token);
         User user = userMapper.selectById(token);
         Integer companyId = user.getCompanyId();
         Integer companyId = user.getCompanyId();
+        if (contacts.getOwnerId()==null){
+            httpRespMsg.setError("负责人信息为空!");
+        }
 
 
         LambdaQueryWrapper<Contacts> lqw_contacts = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<Contacts> lqw_contacts = new LambdaQueryWrapper<>();
         lqw_contacts.eq(Contacts::getCustomId,contacts.getCustomId()).eq(Contacts::getName,contacts.getName());
         lqw_contacts.eq(Contacts::getCustomId,contacts.getCustomId()).eq(Contacts::getName,contacts.getName());

+ 2 - 1
fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/BusinessOpportunityMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id" />
         <id column="id" property="id" />
         <result column="company_id" property="companyId" />
         <result column="company_id" property="companyId" />
         <result column="name" property="name" />
         <result column="name" property="name" />
+        <result column="contacts_id" property="contactsId" />
         <result column="customer_id" property="customerId" />
         <result column="customer_id" property="customerId" />
         <result column="amount_of_money" property="amountOfMoney" />
         <result column="amount_of_money" property="amountOfMoney" />
         <result column="expected_transaction_date" property="expectedTransactionDate" />
         <result column="expected_transaction_date" property="expectedTransactionDate" />
@@ -24,7 +25,7 @@
 
 
     <!-- 通用查询结果列 -->
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
-        id, company_id, name, customer_id, amount_of_money, expected_transaction_date, stage, create_time, creator_id, remark, is_delete, plate1, plate2, plate3, plate4, plate5
+        id, company_id, name, contacts_id, customer_id, amount_of_money, expected_transaction_date, stage, create_time, creator_id, incharger_id, remark, is_delete, plate1, plate2, plate3, plate4, plate5
     </sql>
     </sql>
     <select id="selectAllList" resultType="com.management.platform.entity.BusinessOpportunity">
     <select id="selectAllList" resultType="com.management.platform.entity.BusinessOpportunity">
         select
         select