Merge branch 'cpq-dev' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/controller/AdwebEnquiryController.java

@@ -669,6 +669,24 @@ public class AdwebEnquiryController extends JeecgController<AdwebEnquiry, IAdweb
         return Result.OK("批量复原成功!");
     }
 
+    @GetMapping("/getWastedEnquiry")
+    public Result<List<EnquiryListDto>> getWastedEnquiry(EnquiryListSearchDto enquiryListSearchDto) {
+
+        List<EnquiryListDto> wasterEnquiries = adwebEnquiryMapper.getWastedEnquiry(
+                enquiryListSearchDto.getWasteEnquiryType()
+                ,enquiryListSearchDto.getIp()
+                ,enquiryListSearchDto.getEmail()
+                ,enquiryListSearchDto.getKeyword()
+                ,enquiryListSearchDto.getSearchText()
+                ,enquiryListSearchDto.getType()
+                ,enquiryListSearchDto.getSiteId()
+        );
+
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        return Result.OK(wasterEnquiries);
+    }
+
 
     /**
      * 根据询盘信息创建邮件发送记录

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/mapper/AdwebEnquiryMapper.java

@@ -63,4 +63,7 @@ public interface AdwebEnquiryMapper extends BaseMapper<AdwebEnquiry> {
                                                 @Param("whatsApp") String whatsApp,
                                                 @Param("principalUid") String principalUid);
 
+    List<EnquiryListDto> getWastedEnquiry(String wasteEnquiryType, String ip, String email, String keyword, String searchText, String type, Integer siteId);
+
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/mapper/xml/AdwebEnquiryMapper.xml

@@ -195,6 +195,96 @@
         t1.record_ctime DESC
     </select>
 
+    <select id="getWastedEnquiry" resultType="org.jeecg.modules.adweb.enquiry.dto.result.EnquiryListDto">
+        SELECT t1.id,
+        t2.`name` AS siteName,
+        t1.`no`,
+        t1.no_out AS noOut,
+        t1.modular,
+        t1.record_ctime AS recordCtime,
+        t1.from_email AS fromEmail,
+        t1.country,
+        t1.site_host AS siteHost,
+        t1.uid,
+        t1.`status`,
+        t1.tracker,
+        t1.site_code AS siteCode,
+        t1.site_id AS siteId,
+        t1.phase,
+        t1.track_status AS trackStatus,
+        t1.replay_status AS replayStatus,
+        t1.sys_effective AS sysEffective,
+        t1.user_effective AS userEffective,
+        t1.sensitive_message AS sensitiveMessage,
+        t1.company_id AS companyId,
+        t1.contact_ids AS contactIds,
+        t1.trans_content AS transContent,
+        t1.whats_app AS whatsApp,
+        t1.name contact,
+        t1.phone,
+        t1.company formCompany,
+        t1.from_page,
+        t1.message context,
+        t1.from_page path,
+        t1.from_ip fromIp,
+        t1.customer_ip customerIp,
+        t1.read_status,
+        t1.visit_id,
+        t1.special_field,
+        t1.country_name countryName,
+        t1.effective_reason effectiveReason,
+        t1.plugin_name pluginName FROM adweb_enquiry t1
+        LEFT JOIN adweb_site t2 ON t1.site_code = t2.`code`
+        WHERE
+        t1.status = 1 AND t1.user_effective = 0 AND t1.sys_effective = 1 AND t1.waste_enquiry_type = #{wasteEnquiryType}
+        <if test="ip != null and ip != ''">
+            <if test="siteId != null and siteId != ''">
+                AND t1.site_id = #{siteId}
+            </if>
+            AND t1.customer_ip = #{ip}
+            <if test="null != searchText and '' != searchText">
+                AND (
+                t1.from_email like CONCAT('%', #{searchText}, '%')
+                OR t1.name like CONCAT('%', #{searchText}, '%')
+                )
+            </if>
+        </if>
+        <if test="email != null and email != ''">
+            <if test="type == null or type == ''">
+                AND t1.from_email = #{email}
+            </if>
+            <if test="type == 0">
+                AND (
+                t1.from_email like CONCAT('%', #{email}, '%')
+                AND t1.from_email != #{email} and t1.site_id = #{siteId}
+                )
+            </if>
+            <if test="type == 1">
+                and t1.from_email = #{email} and t1.site_id = #{siteId}
+            </if>
+            <if test="null != searchText and '' != searchText">
+                and (
+                t1.from_email like CONCAT('%', #{searchText}, '%')
+                or t1.name like CONCAT('%', #{searchText}, '%')
+                )
+            </if>
+
+        </if>
+        <if test="keyword != null and keyword != ''">
+            <if test="siteId != null and siteId != ''">
+                AND t1.site_id = #{siteId}
+            </if>
+            AND SUBSTRING_INDEX(effective_reason,'-',-1) = #{keyword}
+            <if test="null != searchText and '' != searchText">
+                and (
+                t1.from_email like CONCAT('%', #{searchText}, '%')
+                or t1.name like CONCAT('%', #{searchText}, '%')
+                )
+            </if>
+        </if>
+        ORDER BY t1.record_ctime DESC
+    </select>
+
     <update id="updatePrincipalUidByRegion">
         update
         adweb_enquiry t1,