Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/service/impl/AppReportServiceImpl.java

@@ -7,6 +7,7 @@ import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.vo.ReportQueryVo;
 import com.ydtech.modules.admin.service.AppReportService;
 import com.ydtech.modules.admin.utils.SliceUpDateUtil;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.dao.EsmUserReferrerMapper;
 import com.ydtech.modules.order.dao.InsAreaCompanyMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -121,6 +122,7 @@ public class AppReportServiceImpl implements AppReportService {
         }
         map.put("beginTime",beginTime);
         map.put("endTime",endTime);
+        map.put("userId",BaseController.getUser().getId());
         return map;
     }
 
@@ -310,6 +312,6 @@ public class AppReportServiceImpl implements AppReportService {
      */
     @Override
     public AllpremiumDto getAllpremium(String year) {
-        return insAreaCompanyMapper.getAllpremium(year);
+        return insAreaCompanyMapper.getAllpremium(year, BaseController.getUser().getId());
     }
 }

src/main/java/com/ydtech/modules/esm/dao/EsmUserReferrerMapper.java

@@ -221,4 +221,11 @@ public interface EsmUserReferrerMapper extends BaseMapper<EsmUserReferrer> {
      *  @Description: 查询天数数据
      */
     List<EmployeeIncreaseReportDto> employeeIncreaseReportDay(HashMap<String,String> map);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/7 17:59
+     *  @Description:  通过用户id查询用户数据
+     */
+    List<String> findReferrerIds(@Param("userId") String userId);
 }

src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyMapper.java

@@ -120,7 +120,7 @@ public interface InsAreaCompanyMapper extends BaseMapper<InsAreaCompany> {
      *  @Date: 2024/6/7 15:21
      *  @Description: 查询总的签单数
      */
-    AllpremiumDto getAllpremium(@Param("year") String year);
+    AllpremiumDto getAllpremium(@Param("year") String year,@Param("userId") String userId);
 }
 
 

src/main/resources/mapper/modules/admin/SysUserAccountHistoryMapper.xml

@@ -41,6 +41,7 @@
                 WHERE
                     documentary=2
                   and create_time >= #{beginTime}  and  create_time <= #{endTime}
+                  and user_id=#{userId}
                 GROUP BY
                     CONCAT(YEAR(create_time),'-',LPAD(MONTH(create_time), 2, '0')),
                     property
@@ -65,6 +66,7 @@
                 WHERE
                     documentary=2
                   and create_time >= #{beginTime}  and  create_time <= #{endTime}
+                  and user_id=#{userId}
                 GROUP BY
                     CONCAT(YEAR(create_time),'-',LPAD(MONTH(create_time), 2, '0'),'-',LPAD(Day(create_time), 2, '0')),
                     property
@@ -89,6 +91,7 @@
                 WHERE
                     documentary=2
                   and create_time >= #{beginTime}  and  create_time <= #{endTime}
+                  and user_id=#{userId}
                 GROUP BY
                     CONCAT(YEAR ( create_time ),'-',LPAD( MONTH ( create_time ), 2, '0' ),'-',LPAD( DAY ( create_time ), 2, '0' ),' ',LPAD( HOUR ( create_time ), 2, '0' )),
                     property

src/main/resources/mapper/modules/esm/EsmUserReferrerMapper.xml

@@ -146,6 +146,7 @@
                 LEFT JOIN sys_user us ON eur.id = us.id
         WHERE
             us.create_time >= #{beginTime}  and  us.create_time <= #{endTime}
+            and eur.referrer_id=#{userId}
         GROUP BY  CONCAT(YEAR(us.create_time),'-',LPAD(MONTH(us.create_time), 2, '0'))
     </select>
 
@@ -158,6 +159,7 @@
                 LEFT JOIN sys_user us ON eur.id = us.id
         WHERE
             us.create_time &gt;= #{beginTime}  and  us.create_time &lt;= #{endTime}
+            and eur.referrer_id=#{userId}
         GROUP BY  CONCAT(YEAR(us.create_time),'-',LPAD(MONTH(us.create_time), 2, '0'),'-',LPAD(Day(us.create_time), 2, '0'))
     </select>
 
@@ -172,7 +174,16 @@
                 LEFT JOIN sys_user us ON eur.id = us.id
         WHERE
             us.create_time &gt;= #{beginTime}  and  us.create_time &lt;= #{endTime}
+            and eur.referrer_id=#{userId}
         GROUP BY  CONCAT(YEAR ( us.create_time ),'-',LPAD( MONTH ( us.create_time ), 2, '0' ),'-',LPAD( DAY ( us.create_time ), 2, '0' ),' ',LPAD( HOUR ( us.create_time ), 2, '0' ))
     </select>
 
+    <select id="findReferrerIds" resultType="java.lang.String">
+        SELECT
+           id as id
+        FROM
+            esm_user_referrer eur
+            where eur.referrer_id=#{userId}
+    </select>
+
 </mapper>

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -579,10 +579,11 @@
             sum(sypremium) sypremium,
             sum(sumpremium) sumpremium
         FROM
-            ins_area_company iac
+            ins_area_company iac  left join ins_orders io on iac.orderno=io.orderno
         WHERE
             iac.orderstatus = 3  and
             iac.createtime >= #{beginTime}  and  iac.createtime <= #{endTime}
+            and io.userid=#{userId}
         GROUP BY CONCAT(YEAR(iac.createtime),'-',LPAD(MONTH(iac.createtime), 2, '0'))
     </select>
 
@@ -593,10 +594,11 @@
             sum(sypremium) sypremium,
             sum(sumpremium) sumpremium
         FROM
-            ins_area_company iac
+            ins_area_company iac  left join ins_orders io on iac.orderno=io.orderno
         WHERE
             iac.orderstatus = 3  and
             iac.createtime &gt;= #{beginTime}  and  iac.createtime &lt;= #{endTime}
+            and io.userid=#{userId}
         GROUP BY  CONCAT(YEAR(iac.createtime),'-',LPAD(MONTH(iac.createtime), 2, '0'),'-',LPAD(Day(iac.createtime), 2, '0'))
     </select>
 
@@ -608,21 +610,23 @@
             sum( sypremium ) sypremium,
             sum( sumpremium ) sumpremium
         FROM
-            ins_area_company iac
+            ins_area_company iac  left join ins_orders io on iac.orderno=io.orderno
         WHERE
             iac.orderstatus = 3  and
             iac.createtime &gt;= #{beginTime}  and  iac.createtime &lt;= #{endTime}
+            and io.userid=#{userId}
         GROUP BY   CONCAT(YEAR ( iac.createtime ),'-',LPAD( MONTH ( iac.createtime ), 2, '0' ),'-',LPAD( DAY ( iac.createtime ), 2, '0' ),' ',LPAD( HOUR ( iac.createtime ), 2, '0' ))
     </select>
 
     <select id="getAllpremium" resultType="com.ydtech.modules.admin.model.dto.AllpremiumDto">
         SELECT
-            ifnull(sum( sumpremium ),0) as sumPremium,
+            ifnull(sum(  iac.sumpremium ),0) as sumPremium,
             count( 0 ) as sumCount
         FROM
-            ins_area_company
+            ins_area_company iac  left join ins_orders io on iac.orderno=io.orderno
         WHERE
-            orderstatus = 3
-                AND YEAR (createtime) = #{year}
+                iac.orderstatus = 3
+                and io.userid=#{userId}
+                AND YEAR (iac.createtime) = #{year}
     </select>
 </mapper>