Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-operate-ui/src/views/project/projectList/component/lxr.vue

@@ -105,7 +105,7 @@
             label="来源"
             width="146">
             <template slot-scope="scope">
-              <div v-if="scope.row.projectName && scope.row.projectId" class="wordprimary" @click="todetail(scope.row.projectId)">
+              <div v-if="scope.row.projectName && scope.row.businessId" class="wordprimary" @click="todetail(scope.row.businessId)">
                 {{scope.row.projectName || '--'}}
               </div>
               <div v-else>自主填报</div>
@@ -235,7 +235,7 @@
     created(){
 
       if(this.thistype == 'project'){
-        this.searchParam.projectId = this.detailId ? this.detailId : this.$route.query.id
+        this.searchParam.businessId = this.detailId ? this.detailId : this.$route.query.id
       }
       if(this.thistype == 'custom'){
         this.searchParam.customerId = this.customerId ? this.customerId : null
@@ -339,7 +339,7 @@
           // accendant:"",
         }
         if(this.thistype == 'project'){
-          this.queryParam.projectId = this.searchParam.projectId
+          this.queryParam.businessId = this.searchParam.businessId
           this.companyName = ""
         }
         if(this.thistype == 'custom'){

dsk-system/src/main/java/com/dsk/system/domain/customer/ContactInfo.java

@@ -32,7 +32,7 @@ public class ContactInfo implements Serializable {
     /**
      * 项目id
      */
-    private Integer projectId;
+    private Integer businessId;
     /**
      * 姓名
      */

dsk-system/src/main/java/com/dsk/system/domain/customer/dto/ContactInfoSearchDto.java

@@ -13,7 +13,7 @@ public class ContactInfoSearchDto implements Serializable {
     /**
      * 项目id
      */
-    private Integer projectId;
+    private Integer businessId;
     /**
      * 企业名称
      */

dsk-system/src/main/java/com/dsk/system/domain/customer/vo/ContactInfoListVo.java

@@ -29,7 +29,7 @@ public class ContactInfoListVo implements Serializable {
     /**
      * 项目id
      */
-    private Integer projectId;
+    private Integer businessId;
     /**
      * 项目名称
      */
@@ -66,6 +66,10 @@ public class ContactInfoListVo implements Serializable {
      * 企业名称
      */
     private String companyName;
+    /**
+     * 备注
+     */
+    private String remark;
     /**
      * 更新人
      */

dsk-system/src/main/resources/mapper/system/customer/ContactInfoMapper.xml

@@ -4,14 +4,14 @@
 
     <select id="selectPageList" resultType="com.dsk.system.domain.customer.vo.ContactInfoListVo">
         select
-            cc.id, cc.customer_id, cc.project_id, bi.project_name, cc.name, cc.sex, cc.role,
-            cc.position, cc.contact_information, cc.company_id, cc.uip_id, cc.company_name,
+            cc.id, cc.customer_id, cc.business_id, bi.project_name, cc.name, cc.sex, cc.role,
+            cc.position, cc.contact_information, cc.company_id, cc.uip_id, cc.company_name, cc.remark,
             cc.update_by
         from contact_info cc
-        left join business_info bi on cc.project_id = bi.id
+        left join business_info bi on cc.business_id = bi.id
         <where>
             <if test="customerId != null and customerId !='' "> and (cc.customer_id = #{customerId} or bi.customer_id = #{customerId})</if>
-            <if test="projectId != null "> and cc.project_id = #{projectId} </if>
+            <if test="businessId != null "> and cc.business_id = #{businessId} </if>
         </where>
         order by cc.create_time desc
     </select>