Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/service/impl/TaQrcodeServiceImpl.java

@@ -20,6 +20,7 @@ import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaQrcodeMapper;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaQrcodeService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -90,13 +91,21 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
         // 校验是否已有相同的数据
         QueryWrapper<TaQrcode> qrcodeQueryWrapper = new QueryWrapper<>();
         qrcodeQueryWrapper.eq("org_id", orgId);
-        qrcodeQueryWrapper.eq(StringUtils.isNotBlank(taQrcode.getBuildingId()), "building_id", taQrcode.getBuildingId());
-        qrcodeQueryWrapper.eq(taQrcode.getChannelId() != null, "channel_id", taQrcode.getChannelId());
+        if (StringUtils.isBlank(taQrcode.getBuildingId())) {
+            qrcodeQueryWrapper.isNull("building_id");
+        } else {
+            qrcodeQueryWrapper.eq("building_id", taQrcode.getBuildingId());
+        }
+        if (null == taQrcode.getChannelId()) {
+            qrcodeQueryWrapper.isNull("channel_id");
+        } else {
+            qrcodeQueryWrapper.eq("channel_id", taQrcode.getChannelId());
+        }
         qrcodeQueryWrapper.eq("target_type", taQrcode.getTargetType());
         qrcodeQueryWrapper.eq("target_id", taQrcode.getTargetId());
         qrcodeQueryWrapper.gt("status", CommConstant.STATUS_DELETE);
-        TaQrcode taQrCodeCheck = taQrcodeMapper.selectOne(qrcodeQueryWrapper);
-        if (taQrCodeCheck != null) {
+        List<TaQrcode> taQrCodeCheckList = taQrcodeMapper.selectList(qrcodeQueryWrapper);
+        if (CollectionUtils.isNotEmpty(taQrCodeCheckList)) {
             responseBean.addError("请勿重复提交");
             return responseBean;
         }

src/main/resources/mapper/TaQrcodeMapper.xml

@@ -87,13 +87,15 @@
             AND t.qr_code_id = #{qrCodeId}
         GROUP BY
 	        t.person_id
+	    ORDER BY
+		    t.visit_time DESC
     </select>
 
     <select id="getVisitPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitPersonNum">
         SELECT
             IFNULL( t2.`name`, t2.nickname ) nickName,
             t2.phone phone,
-            t2.gender gender,
+            (case t2.gender when 1 then '男' when 2 then '女' else '未知' end)  gender,
             t3.shortname province,
             count( * ) visitNum
         FROM
@@ -102,11 +104,11 @@
             LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
-
             AND t.qr_code_id = #{qrCodeId}
-
         GROUP BY
             t.person_id
+        ORDER BY
+		    t.visit_time DESC
     </select>
 
     <select id="getVisitNumRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
@@ -123,13 +125,15 @@
         WHERE
             t.org_id = #{orgId}
             AND t.qr_code_id = #{qrCodeId}
+        ORDER BY
+            t.visit_time desc
     </select>
 
     <select id="getVisitNumRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum">
         SELECT
             IFNULL( t2.`name`, t2.nickname ) nickName,
             t2.phone phone,
-            t2.gender gender,
+             (case t2.gender when 1 then '男' when 2 then '女' else '未知' end) gender,
             t3.shortname province,
 			t.visit_time visitTime
         FROM
@@ -139,6 +143,8 @@
         WHERE
             t.org_id = #{orgId}
             AND t.qr_code_id = #{qrCodeId}
+        ORDER BY
+            t.visit_time desc
     </select>
 
     <select id="getNewPersonsRecord" resultType="com.huiju.estateagents.entity.TaCustomerFrom">
@@ -158,15 +164,17 @@
             AND t.qr_code_id = #{qrCodeId}
         GROUP BY
 	        t.customer_id
+	    order by
+	        t2.create_date desc
     </select>
 
     <select id="getNewPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum">
         SELECT
             t2.`name` nickName,
             t2.phone,
-            t2.sex gender,
+            (case t2.sex when 1 then '男' when 2 then '女' else '未知' end) gender,
             t3.shortname province,
-            t.create_date registerTime
+            t2.create_date registerTime
         FROM
             ta_customer_from t
             LEFT JOIN ta_recommend_customer t2 ON t.person_id = t2.person_id
@@ -176,6 +184,8 @@
             AND t.qr_code_id = #{qrCodeId}
         GROUP BY
 	        t.customer_id
+	    order by
+	        t2.create_date desc
     </select>
 
 </mapper>