* 新需求

src/main/java/com/huiju/estateagents/controller/TaQrcodeController.java

@@ -8,6 +8,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaQrcode;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaQrcodeService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,6 +77,11 @@ public class TaQrcodeController extends BaseController {
     public ResponseBean saveQrcode(@RequestBody TaQrcode taQrcode, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            // 校验参数
+            if (StringUtils.isBlank(taQrcode.getTargetId()) || StringUtils.isBlank(taQrcode.getTargetType())) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
             responseBean = iTaQrcodeService.saveQrcode(taQrcode, getUserId(request), getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -92,6 +92,7 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
         qrcodeQueryWrapper.eq(taQrcode.getChannelId() != null, "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) {
             responseBean.addError("请勿重复提交");
@@ -115,7 +116,7 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
 
         // 生成二维码
         String paramsStr = WxQrCodeUtils.generateSceneAndPage(taQrcode.getTargetType(), "",
-                taQrcode.getTargetId(), taQrcode.getTargetType(), taQrcode.getChannelId() + "", taQrcode.getQrCodeId() + "", taQrcode.getBuildingId());
+                taQrcode.getTargetId(), taQrcode.getTargetType(), String.valueOf(taQrcode.getChannelId()), String.valueOf(taQrcode.getQrCodeId()), taQrcode.getBuildingId());
         ResponseBean qrCodeResult = iMiniAppService.getQrCode(paramsStr, taMiniapp.getMiniappId());
         if (qrCodeResult != null && ResponseBean.CODE_SUCCESS == qrCodeResult.getCode()) {
             // 更新数据
@@ -209,7 +210,7 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
             case 3:
                 List<QrCodeNewPersonNum> records3 = taQrcodeMapper.getNewPersonsRecordExport(qrCodeId, orgId);
                 fileName = URLEncoder.encode("新增注册用户", "UTF-8");
-                response.setHeader("Content-disposition", "attachment;filename="+fileName+".xlsx");
+                response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
                 EasyExcel.write(response.getOutputStream(), QrCodeNewPersonNum.class).sheet("新增注册用户").doWrite(records3);
                 break;
             default:

src/main/resources/mapper/TaQrcodeMapper.xml

@@ -37,7 +37,7 @@
             ta_person_visit_record t
         WHERE
             t.org_id = #{orgId}
-            AND t.qrcode_id = #{qrCodeId}
+            AND t.qr_code_id = #{qrCodeId}
     </select>
 
     <select id="getVisitNum" resultType="java.lang.Integer">
@@ -47,7 +47,7 @@
             ta_person_visit_record t
         WHERE
             t.org_id = #{orgId}
-            AND t.qrcode_id = #{qrCodeId}
+            AND t.qr_code_id = #{qrCodeId}
     </select>
 
     <select id="getNewPersons" resultType="java.lang.Integer">
@@ -64,17 +64,17 @@
         SELECT
             t.*,
             IFNULL(t2.`name`,t2.nickname) userName,
-            t2.tel userTel,
-            t2.sex,
-            t2.city,
-            sum(t.record_id) accessCount
+            t2.phone userTel,
+            t2.gender sex,
+            t3.shortname city,
+            count(*) accessCount
         FROM
             ta_person_visit_record t
-            left join ta_person t2
-            on t.person_id = t2.person_id
+            left join ta_person t2 on t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
-            AND t.qrcode_id = #{qrCodeId}
+            AND t.qr_code_id = #{qrCodeId}
         GROUP BY
 	        t.person_id
     </select>
@@ -82,17 +82,18 @@
     <select id="getVisitPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitPersonNum">
         SELECT
             IFNULL( t2.`name`, t2.nickname ) nickName,
-            t2.tel phone,
-            t2.sex gender,
-            t2.city province,
-            sum( t.record_id ) visitNum
+            t2.phone phone,
+            t2.gender gender,
+            t3.shortname province,
+            count( * ) visitNum
         FROM
             ta_person_visit_record t
             LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
 
-            AND t.qrcode_id = #{qrCodeId}
+            AND t.qr_code_id = #{qrCodeId}
 
         GROUP BY
             t.person_id
@@ -102,30 +103,32 @@
         SELECT
             t.*,
             IFNULL( t2.`name`, t2.nickname ) userName,
-            t2.tel userTel,
-            t2.sex,
-            t2.city
+            t2.phone userTel,
+            t2.gender sex,
+            t3.shortname city
         FROM
             ta_person_visit_record t
             LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
-            AND t.qrcode_id = #{qrCodeId}
+            AND t.qr_code_id = #{qrCodeId}
     </select>
 
     <select id="getVisitNumRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum">
         SELECT
             IFNULL( t2.`name`, t2.nickname ) nickName,
-            t2.tel phone,
-            t2.sex gender,
-            t2.city province,
+            t2.phone phone,
+            t2.gender gender,
+            t3.shortname province,
 			t.visit_time visitTime
         FROM
             ta_person_visit_record t
             LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
-            AND t.qrcode_id = #{qrCodeId}
+            AND t.qr_code_id = #{qrCodeId}
     </select>
 
     <select id="getNewPersonsRecord" resultType="com.huiju.estateagents.entity.TaCustomerFrom">
@@ -134,14 +137,17 @@
             t2.`name` userName,
             t2.phone userTel,
             t2.sex,
-            t2.city ,
+            t3.shortname city,
             t2.create_date registerTime
         FROM
             ta_customer_from t
             LEFT JOIN ta_recommend_customer t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
             AND t.qr_code_id = #{qrCodeId}
+        GROUP BY
+	        t.customer_id
     </select>
 
     <select id="getNewPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum">
@@ -149,14 +155,17 @@
             t2.`name` nickName,
             t2.phone,
             t2.sex gender,
-            t2.city province,
+            t3.shortname province,
             t.create_date registerTime
         FROM
             ta_customer_from t
             LEFT JOIN ta_recommend_customer t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
             AND t.qr_code_id = #{qrCodeId}
+        GROUP BY
+	        t.customer_id
     </select>
 
 </mapper>