修改统计置业顾问userId,personId问题

src/main/java/com/yunzhi/marketing/controller/ExtendContentController.java

@@ -243,7 +243,11 @@ public class ExtendContentController extends BaseController {
             responseBean.addError("未找到更新内容");
             return responseBean;
         }
-        extendContent.setStatus(origin.getStatus());
+
+        if (null == extendContent.getStatus()) {
+            extendContent.setStatus(origin.getStatus());
+        }
+
         extendContent.setContentId(id);
         try {
             if (extendContent.getCityId() == null){

src/main/java/com/yunzhi/marketing/controller/TaPolicyController.java

@@ -221,10 +221,18 @@ public class TaPolicyController extends BaseController {
     public ResponseBean taPolicyUpdate(@PathVariable Integer id,
                                         @RequestBody TaPolicy taPolicy,
                                        HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
-        try {
 
+        TaPolicy origin = iTaPolicyService.getById(id);
+        if (null == origin || !id.equals(taPolicy.getPolicyId())) {
+            return ResponseBean.error("未找到编辑内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
+        if (null == taPolicy.getPublishStatus()) {
+            taPolicy.setPublishStatus(origin.getPublishStatus());
+        }
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
             if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
                 taPolicy.setPublishDate(LocalDateTime.now());
                 String personId = getPersonId(request);

src/main/resources/mapper/statistic/TsCustomerGenderStatisticMapper.xml

@@ -4,18 +4,23 @@
 
     <select id="getNewCustomerSexCount" resultType="com.yunzhi.marketing.statistic.entity.GenderStatistic">
         SELECT
-            org_id,realty_consultant,
-            sum(if(sex = 1,1,0)) as man_sum,
-            sum(if(sex = 1,1,0))/count(*) as man_pct,
-            sum(if(sex = 2,1,0)) as woman_sum,
-            sum(if(sex = 2,1,0))/count(*) as woman_pct,
-            sum(if(sex != 1 and sex != 2,1,0)) as unknown_sum,
-            sum(if(sex != 1 and sex != 2,1,0))/count(*) as unknown_pct
+            t.org_id,
+            s.person_id AS realty_consultant,
+            sum( IF ( t.sex = 1, 1, 0 ) ) AS man_sum,
+            sum( IF ( t.sex = 1, 1, 0 ) ) / count( * ) AS man_pct,
+            sum( IF ( t.sex = 2, 1, 0 ) ) AS woman_sum,
+            sum( IF ( t.sex = 2, 1, 0 ) ) / count( * ) AS woman_pct,
+            sum( IF ( t.sex != 1 AND t.sex != 2, 1, 0 ) ) AS unknown_sum,
+            sum( IF ( t.sex != 1 AND t.sex != 2, 1, 0 ) ) / count( * ) AS unknown_pct
         FROM
-            ta_recommend_customer
+            ta_recommend_customer t
+                LEFT JOIN ta_person s ON s.person_id = t.realty_consultant
+                    OR s.user_id = t.realty_consultant
         WHERE
-            verify_status = 1
-            GROUP BY org_id,realty_consultant
+            t.verify_status = 1
+        GROUP BY
+            t.org_id,
+            s.person_id
     </select>
     <select id="getFollowUpSexCount" resultType="com.yunzhi.marketing.statistic.entity.GenderStatistic">
         SELECT
@@ -35,7 +40,7 @@
     <select id="getVisiteSexCount" resultType="com.yunzhi.marketing.statistic.entity.GenderStatistic">
         SELECT
             d.org_id,
-            d.realty_consultant,
+            d.realty_consultant_person as realty_consultant,
             sum( IF ( d.sex = 1, 1, 0 ) ) AS manSum,
             sum( IF ( d.sex = 1, 1, 0 ) ) / count( * ) AS manPct,
             sum( IF ( d.sex = 2, 1, 0 ) ) AS womanSum,
@@ -46,19 +51,22 @@
             (
                 SELECT
                     t.enlist_id,
-                    c.*
+                    c.*,
+                    s.person_id as realty_consultant_person
                 FROM
                     ta_activity_dynamic_enlist t
                     LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
-                    AND t.building_id = c.building_id
-                    AND t.org_id = c.org_id
-                    AND c.verify_status = 1
+                        AND t.building_id = c.building_id
+                        AND t.org_id = c.org_id
+                        AND c.verify_status = 1
+                    LEFT JOIN ta_person s ON s.person_id = c.realty_consultant
+                        OR s.user_id = c.realty_consultant
                 WHERE
                     t.is_checkin = 1
                 GROUP BY
                     c.customer_id
             ) d
         GROUP BY
-            d.org_id,d.realty_consultant
+            d.org_id,d.realty_consultant_person
     </select>
 </mapper>

src/main/resources/mapper/statistic/TsCustomerStatisticDailyMapper.xml

@@ -23,33 +23,38 @@
 
     <select id="getNewCustomerData" resultType="com.yunzhi.marketing.statistic.entity.TsCustomerStatisticDaily">
         SELECT
-            org_id,
-            count( customer_id ) as customer_num,
-			realty_consultant
+            t.org_id,
+            count( DISTINCT ( t.customer_id ) ) AS customer_num,
+            s.person_id AS realty_consultant
         FROM
-            ta_recommend_customer
+            ta_recommend_customer t
+                LEFT JOIN ta_person s ON s.person_id = t.realty_consultant
+                OR s.user_id = t.realty_consultant
         WHERE
-             date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
-             AND verify_status = 1
+                date_format( t.create_date, '%Y-%m-%d' ) = date_format(#{nowDate}, '%Y-%m-%d' )
+          AND t.verify_status = 1
         GROUP BY
-            org_id,realty_consultant
+            t.org_id,
+            s.person_id
     </select>
     <select id="getVisiteCustomerData" resultType="com.yunzhi.marketing.statistic.entity.TsCustomerStatisticDaily">
         SELECT
             count( DISTINCT ( c.customer_id ) ) as customer_num,
             c.org_id,
-			c.realty_consultant
+            s.person_id as realty_consultant
         FROM
             ta_activity_dynamic_enlist t
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
-            AND t.building_id = c.building_id
-            AND t.org_id = c.org_id
-            AND c.verify_status = 1
+                AND t.building_id = c.building_id
+                AND t.org_id = c.org_id
+                AND c.verify_status = 1
+            LEFT JOIN ta_person s ON s.person_id = c.realty_consultant
+                OR s.user_id = c.realty_consultant
         WHERE
             t.is_checkin = #{checkin}
             AND date_format( t.create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
         GROUP BY
-            c.org_id,c.realty_consultant
+            c.org_id, s.person_id
     </select>
     <select id="getDailyList" resultType="com.yunzhi.marketing.statistic.entity.TsCustomerStatisticDaily">
         SELECT