客户接受时间

pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java

@@ -73,16 +73,25 @@ public class HomeController extends BaseController {
         return R.ok(homeService.getUserContractAmountsByDeptId(type,deptId));
     }
     /**
-     * 首页大盘数据：各渠道成交
+     * 首页大盘数据：各渠道成交(公司总数居)
      * @param type 1本月 2上月 3本季度 4本年 5所有
      * @return
      */
     @SaCheckPermission("business:salary:list")
     @GetMapping("/byChannel")
     public R<ChannelAmountVo> byChannel(@RequestParam() Integer type) {
-        return R.ok(homeService.byChannel(type));
+        return R.ok(homeService.byChannel(type,1));
+    }
+    /**
+     * 首页大盘数据：销售个人数据
+     * @param type 1本月 2上月 3本季度 4本年 5所有
+     * @return
+     */
+    @SaCheckPermission("business:salary:list")
+    @GetMapping("/channelByUser")
+    public R<ChannelAmountVo> channelByUser(@RequestParam() Integer type) {
+        return R.ok(homeService.byChannel(type,2));
     }
-
     /**
      * 首页大盘数据：任务完成情况
      * @param type 1本月 2上月 3本季度 4本年 5所有
@@ -102,4 +111,14 @@ public class HomeController extends BaseController {
     public R<Map<String,Object>> getTaskTime(@RequestParam() Integer type) {
         return R.ok(homeService.getTaskTime(type));
     }
+
+    /**
+     * 首页大盘数据：销售数据统计
+     * @param type 1本月 2上月 3本季度 4本年 5所有
+     * @return
+     */
+    @GetMapping("/salasData")
+    public R<Map<String,Object>> salasData(@RequestParam() Integer type) {
+        return R.ok(homeService.salasData(type));
+    }
 }

pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java

@@ -48,8 +48,8 @@ public class PsCustomController extends BaseController {
 
     @SaCheckPermission("business:customInfo:list")
     @GetMapping("/listByLoginUser")
-    public R<List<Map<String,Object>>> listByLoginUser() {
+    public R<List<Map<String,Object>>> listByLoginUser(String name) {
-        return R.ok(psCustomInfoService.listByLoginUser());
+        return R.ok(psCustomInfoService.listByLoginUser(name));
     }
     /**
      * 查询客户信息列表
@@ -211,7 +211,7 @@ public class PsCustomController extends BaseController {
      */
     @SaCheckPermission("business:customInfo:list")
     @RepeatSubmit
-    @Log(title = "主动认领")
+    @Log(title = "指派")
     @GetMapping("/assign")
     public R<Void> assign(@NotNull Long customerId,@NotNull Long userId) {
         psCustomInfoService.assign(customerId,userId);

pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsCustomInfo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 客户基本信息对象 ps_custom_info
@@ -88,6 +89,9 @@ public class PsCustomInfo extends TenantEntity {
      */
     @TableLogic
     private Integer delFlag;
-
+    /**
+     * 接受时间
+     */
+    private Date acceptDate;
 
 }

pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsContractInfoMapper.java

@@ -50,4 +50,10 @@ public interface PsContractInfoMapper extends BaseMapperPlus<PsContractInfo, PsC
 
     //首页查询各个渠道成交的合同
     List<ChannelPayInfo> byChannel(@Param(Constants.WRAPPER) Wrapper<PsContractInfo> queryWrapper);
+    //首页查询各个渠道成交的合同
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "info.create_dept"),
+            @DataColumn(key = "userName", value = "info.custom_manager")
+    })
+    List<ChannelPayInfo> byChannelUser(@Param(Constants.WRAPPER) Wrapper<PsContractInfo> queryWrapper);
 }

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/HomeService.java

@@ -20,7 +20,7 @@ public interface HomeService {
      * @param type
      * @return
      */
-    ChannelAmountVo byChannel(Integer type);
+    ChannelAmountVo byChannel(Integer type,Integer dateType);
 
     /**
      * 首页大盘数据：任务完成率
@@ -34,4 +34,10 @@ public interface HomeService {
      * @return
      */
     Map<String,Object> getTaskTime(Integer type);
+    /**
+     * 首页大盘数据：销售数据统计
+     * @param type
+     * @return
+     */
+    Map<String,Object> salasData(Integer type);
 }

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsCustomInfoService.java

@@ -31,7 +31,7 @@ public interface IPsCustomInfoService {
      * 查询登陆人下所有的客户名称和id
      * @return 客户id和姓名
      */
-    List<Map<String,Object>> listByLoginUser();
+    List<Map<String,Object>> listByLoginUser(String name);
     /**
      * 分页查询客户基本信息列表
      *

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PublicApproverServiceImpl.java

@@ -29,10 +29,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.Comparator;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -61,6 +58,7 @@ public class PublicApproverServiceImpl extends ApproverAbstractServiceImpl {
         PsCustomInfo info = customInfoMapper.selectById(Long.valueOf(psApproverRecord.getBusinessId()));
         info.setCustomStatus(CustomerStatusEnum.INIT.getCode());
         info.setCustomManager(Long.valueOf(psApproverRecord.getUpdateData()));
+        info.setAcceptDate(new Date());
         customInfoMapper.updateById(info);
     }
 

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java

@@ -20,6 +20,7 @@ import com.pusong.business.mapper.PsTaskAppointMapper;
 import com.pusong.business.mapper.PsTaskMainMapper;
 import com.pusong.business.service.HomeService;
 import com.pusong.common.core.constant.CacheNames;
+import com.pusong.common.core.utils.DateUtils;
 import com.pusong.system.domain.bo.SysDictDataBo;
 import com.pusong.system.domain.vo.SysDictDataVo;
 import com.pusong.system.service.ISysDictDataService;
@@ -33,6 +34,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -297,11 +299,12 @@ public class HomeServiceImpl implements HomeService {
     /**
      * 首页大盘数据：各渠道成交
      * @param type
+     * @param dateType 1查全部数据 2查个人权限的数据
      * @return
      */
-    @Cacheable(cacheNames = CacheNames.HOME_C, key = "#type")
+    @Cacheable(cacheNames = CacheNames.HOME_C, key = "#type+'_'+#dateType")
-    public ChannelAmountVo byChannel(Integer type){
+    public ChannelAmountVo byChannel(Integer type,Integer dateType){
-        Map<String, Object> mapParam = this.getDate(type);
+        Map<String, Object> mapParam = dateType == 1?this.getDate(type):this.getDateByUser(type);
         LocalDate startDate = (LocalDate)mapParam.get("startDate");
         LocalDate endDate = (LocalDate)mapParam.get("endDate");
         String date = (String)mapParam.get("date");
@@ -309,10 +312,17 @@ public class HomeServiceImpl implements HomeService {
         ChannelAmountVo res = new ChannelAmountVo();
         res.setDateStr(date);
         log.info("查询日期：{}到{}",startDate,endDate);
-        List<ChannelPayInfo> list = psContractInfoMapper.byChannel(new QueryWrapper<PsContractInfo>()
+        QueryWrapper<PsContractInfo> wq = new QueryWrapper<PsContractInfo>()
                 .ne("info.is_due", CommonStatusEnum.SUCCESS.getCode()).ne("info.contract_status", ContractStatusEnum.INIT.getCode())
-                .eq("pay.pay_status",PayStatusEnum.SUCCESS.getCode())
+                .eq("pay.pay_status", PayStatusEnum.SUCCESS.getCode())
-                .ge(startDate != null,"info.apply_date",startDate).le(endDate != null,"info.apply_date",endDate));
+                .ge(startDate != null, "info.apply_date", startDate).le(endDate != null, "info.apply_date", endDate);
+        List<ChannelPayInfo> list;
+        if(dateType == 1){//所有的数据权限
+            list = psContractInfoMapper.byChannel(wq);
+        }else{//用户个人的数据权限
+            list = psContractInfoMapper.byChannelUser(wq);
+        }
+
         //查询各个渠道的字典表
         SysDictDataBo dictData = new SysDictDataBo();
         dictData.setInDictType(List.of("custom_source"));
@@ -411,6 +421,8 @@ public class HomeServiceImpl implements HomeService {
         map.put("inAvg",0);//内勤
         map.put("outAvg",0);//外勤
         map.put("secAvg",0);//特勤
+        map.put("dateStr",date);//
+        map.put("currentDate", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm",new Date()));//当前时间
         for(Map<String, Object> appointMap : appointList){
             if(StringUtils.equals("1",appointMap.get("appoint_type").toString())){
                 appointMap.put("inAvg",appointMap.get("avg"));
@@ -422,4 +434,66 @@ public class HomeServiceImpl implements HomeService {
         }
         return map;
     }
+    /**
+     * 首页大盘数据：销售数据统计
+     * @param type
+     * @return
+     */
+    public Map<String,Object> salasData(Integer type){
+        Map<String, Object> mapParam = this.getDateByUser(type);
+        LocalDate startDate = (LocalDate)mapParam.get("startDate");
+        LocalDate endDate = (LocalDate)mapParam.get("endDate");
+        String date = (String)mapParam.get("date");
+
+
+
+
+        //返回map
+        Map<String,Object> map = new HashMap<>();
+        map.put("dateStr",date);//
+        map.put("currentDate", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm",new Date()));//当前时间
+        return null;
+    }
+
+    public static Map<String, Object> getDateByUser(Integer type){
+        LocalDate startDate = null;
+        LocalDate endDate = null;
+        String date = "";
+        LocalDate now = LocalDate.now();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        switch (type){
+            case 1://今日
+                startDate = now;
+                date =startDate.format(df);
+                break;
+            case 2: //昨日
+                startDate = now.plusDays(-1);
+                endDate = now;
+                date =startDate.format(df);
+                break;
+            case 3: //本周
+                startDate = now.with(TemporalAdjusters.previousOrSame(java.time.DayOfWeek.MONDAY));
+                date =startDate.format(df) + " 至今";
+                break;
+            case 4: //上周
+                endDate = now.with(TemporalAdjusters.previousOrSame(java.time.DayOfWeek.MONDAY));
+                startDate = endDate.plusDays(-7);
+                date =startDate.format(df) +" 至 "+ endDate.format(df);
+                break;
+            case 5: //本月
+                startDate = now.withDayOfMonth(1);
+                date =startDate.format(DateTimeFormatter.ofPattern("yyyy-MM"));
+                break;
+            case 6: //上月
+                startDate = now.minusMonths(1).withDayOfMonth(1);
+                endDate = now.withDayOfMonth(1);
+                date =startDate.format(DateTimeFormatter.ofPattern("yyyy-MM"));
+                break;
+        }
+        Map<String,Object> map = new HashMap<>();
+        map.put("startDate",startDate);
+        map.put("endDate",endDate);
+        map.put("date",date);
+        return map;
+    }
 }

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java

@@ -74,15 +74,18 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
      * @return 客户id和姓名
      */
     @Override
-    public List<Map<String,Object>> listByLoginUser() {
+    public List<Map<String,Object>> listByLoginUser(String name) {
+
         //查询客户基本信息
-        List<PsCustomInfo> list = baseMapper.selectList(new QueryWrapper<PsCustomInfo>().select("id", "custom_name")
+        List<PsCustomInfo> list = baseMapper.selectList(new QueryWrapper<PsCustomInfo>().select("id", "custom_name","custom_mobile")
-                .lambda().eq(PsCustomInfo::getDelFlag, 0).isNotNull(PsCustomInfo::getCustomName).ne(PsCustomInfo::getCustomName,"").ne(PsCustomInfo::getCustomName,"无"));
+                .lambda().eq(PsCustomInfo::getDelFlag, 0).isNotNull(PsCustomInfo::getCustomName).ne(PsCustomInfo::getCustomName,"").ne(PsCustomInfo::getCustomName,"无")
+                .and(StringUtils.isNotBlank(name),wq->wq.like(PsCustomInfo::getCustomName,name).or().like(PsCustomInfo::getCustomMobile,name)));
         List<Map<String,Object>> listmap = new ArrayList<>();
         list.forEach(item->{
             Map<String,Object> map = new HashMap<>();
             map.put("id",item.getId());
             map.put("customName",item.getCustomName());
+            map.put("custom_mobile",item.getCustomMobile());
             listmap.add(map);
         });
 
@@ -246,6 +249,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
         add.setCustomManager(LoginHelper.getUserId());
         add.setBlack(CommonStatusEnum.N.getCode());
         add.setCustomStatus(CustomerStatusEnum.INIT.getCode());
+        add.setAcceptDate(new Date());
         boolean flag = baseMapper.insert(add) > 0;
         if(CollectionUtils.isNotEmpty(bo.getPriceBos())){
             bo.getPriceBos().forEach(item->item.setCustomId(add.getId()));
@@ -495,6 +499,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
         PsCustomInfo psCustomInfo = baseMapper.selectById(customerId);
         psCustomInfo.setCustomStatus(CustomerStatusEnum.INIT.getCode());
         psCustomInfo.setCustomManager(userId);
+        psCustomInfo.setAcceptDate(new Date());
         baseMapper.updateById(psCustomInfo);
     }
 

pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractInfoMapper.xml

@@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="byChannel" resultType="com.pusong.business.domain.vo.home.ChannelPayInfo">
+    <sql id="channel">
         select
             cus.custom_source channel,
             info.contract_code,
@@ -120,9 +120,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             pay.business_type,
             pay.money
         from ps_contract_info info
-             left  join ps_custom_info cus on info.custom_id = cus.id
+                 left  join ps_custom_info cus on info.custom_id = cus.id
-             left join ps_contract_pay pay on info.contract_code = pay.contract_code
+                 left join ps_contract_pay pay on info.contract_code = pay.contract_code
+    </sql>
+    <select id="byChannel" resultType="com.pusong.business.domain.vo.home.ChannelPayInfo">
+        <include refid="channel"/>
             ${ew.getCustomSqlSegment}
     </select>
+    <select id="byChannelUser" resultType="com.pusong.business.domain.vo.home.ChannelPayInfo">
+        <include refid="channel"/>
+        ${ew.getCustomSqlSegment}
+    </select>
 
 </mapper>