医健宝需求-看课记录增加关联组查询

fs-company/src/main/java/com/fs/company/controller/company/CompanyDeptController.java

@@ -47,6 +47,20 @@ public class CompanyDeptController extends BaseController
         return AjaxResult.success(depts);
     }
 
+    /**
+     * 获取部门组列表
+     * */
+    @PreAuthorize("@ss.hasPermi('company:dept:list')")
+    @GetMapping("/groupList")
+    public AjaxResult groupList(CompanyDept dept)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        dept.setCompanyId(loginUser.getCompany().getCompanyId());
+        dept.setStatus("0");
+        List<CompanyDept> depts = deptService.selectCompanyDeptGroupList(dept);
+        return AjaxResult.success(depts);
+    }
+
 
     /**
      * 获取部门下拉树列表

fs-service/src/main/java/com/fs/company/mapper/CompanyDeptMapper.java

@@ -118,4 +118,7 @@ public interface CompanyDeptMapper
     CompanyDept selectDeptNameBydeptName(@Param("deptName") String deptName);
 
     void deleteCompanyDeptByCompanyIds(Long[] companyIds);
+
+    @Select("select t.dept_id,t.dept_name from company_dept t where t.ancestors REGEXP '^[^,]+,[^,]+$' ")
+    List<CompanyDept> selectCompanyDeptGroupList(CompanyDept dept);
 }

fs-service/src/main/java/com/fs/company/service/ICompanyDeptService.java

@@ -90,4 +90,6 @@ public interface ICompanyDeptService
      * @return 部门
      */
     CompanyDept getDefaultCompanyDeptByCompanyId(Long companyId);
+
+    List<CompanyDept> selectCompanyDeptGroupList(CompanyDept dept);
 }

fs-service/src/main/java/com/fs/company/service/ICompanyTrafficRecordLogService.java

@@ -12,5 +12,7 @@ public interface ICompanyTrafficRecordLogService {
     CompanyTrafficRecordLog selectById(Long id);
     //保存流量记录
     boolean save(CompanyTrafficRecordLog entity);
+    //查询当天的流量充扣记录
+    CompanyTrafficRecordLog selectTodayRecord(Long companyId);
 
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyDeptServiceImpl.java

@@ -244,6 +244,12 @@ public class CompanyDeptServiceImpl implements ICompanyDeptService
     public CompanyDept getDefaultCompanyDeptByCompanyId(Long companyId) {
         return companyDeptMapper.getTopCompanyDeptByCompanyId(companyId);
     }
+
+    @Override
+    public List<CompanyDept> selectCompanyDeptGroupList(CompanyDept dept) {
+        return companyDeptMapper.selectCompanyDeptGroupList(dept);
+    }
+
     /**
      * 递归列表
      */

fs-service/src/main/java/com/fs/company/service/impl/CompanyTrafficRecordLogServiceImpl.java

@@ -9,8 +9,11 @@ import com.fs.company.service.ICompanyTrafficRecordLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
+import static com.fs.common.utils.DateUtils.getNowDate;
+
 @Service
 @Slf4j
 public class CompanyTrafficRecordLogServiceImpl extends ServiceImpl<CompanyTrafficRecordLogMapper, CompanyTrafficRecordLog> implements ICompanyTrafficRecordLogService {
@@ -37,4 +40,12 @@ public class CompanyTrafficRecordLogServiceImpl extends ServiceImpl<CompanyTraff
     public boolean save(CompanyTrafficRecordLog entity) {
         return baseMapper.insert(entity)==1;
     }
+
+    @Override
+    public CompanyTrafficRecordLog selectTodayRecord(Long companyId) {
+        /*return baseMapper.selectOne(new LambdaQueryWrapper<CompanyTrafficRecordLog>()
+                .eq(CompanyTrafficRecordLog::getCompanyId, companyId)
+                .eq(CompanyTrafficRecordLog::getOperationType, 1)*/
+        return null;
+    }
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyTrafficRecordServiceImpl.java

@@ -98,6 +98,11 @@ public class CompanyTrafficRecordServiceImpl extends ServiceImpl<CompanyTrafficR
         //根据fs_course_traffic_log表获取公司昨天流量
         Long trafficAmountYesterday = fsCourseTrafficLogMapper.sumTrafficByCompanyYesterday(companyTrafficRecord.getCompanyId());
         if(trafficAmountYesterday!=null) {
+            //判断是否已经更新当天流量
+            CompanyTrafficRecordLog todayRecodeLog =  companyTrafficRecordLogService.selectTodayRecord(companyTrafficRecord.getCompanyId());
+            if(todayRecodeLog != null){
+                return;
+            }
             long balance = companyTrafficRecord.getBalance() - trafficAmountYesterday;
             companyTrafficRecord.setBalance(balance);
             log.info("【更新流量】：{}", "部门ID:" + companyTrafficRecord.getDeptId() +"公司ID:" + companyTrafficRecord.getCompanyId() +  "消耗流量:" + trafficAmountYesterday+"剩余流量:"+balance);

fs-service/src/main/java/com/fs/course/param/FsCourseWatchLogListParam.java

@@ -36,6 +36,9 @@ public class FsCourseWatchLogListParam implements Serializable {
 
     private Integer sendType;
 
+    //销售-部门(组)
+    private Long deptId;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date eTime;
 

fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -72,6 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test ='maps.isVip !=null'>
                 and l.user_id != 0 and u.is_vip = #{maps.isVip}
             </if>
+            <if test = 'maps.deptId != null'>
+                and cu.dept_id = #{maps.deptId}
+            </if>
             <if test ='maps.sendType !=null'>
                 and l.send_type = #{maps.sendType}
             </if>