数据权限调整

biz-base/src/main/java/com/dayou/controller/ItemController.java

@@ -3,6 +3,7 @@ package com.dayou.controller;
 import com.dayou.annotation.DataPermission;
 import com.dayou.annotation.OperLog;
 import com.dayou.dto.ItemDTO;
+import com.dayou.utils.LoginContext;
 import com.dayou.vo.DepartmentStatVO;
 import com.dayou.vo.ItemStatVO;
 import com.dayou.vo.ItemVO;
@@ -23,6 +24,7 @@ import com.dayou.utils.ConvertUtil;
 import com.dayou.utils.HttpKit;
 import com.dayou.exception.ErrorCode;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.http.MediaType;
@@ -51,7 +53,7 @@ public class ItemController extends BaseController {
     }
 
     /**
-     * 我的项目列表 (包含客户经理是自己或客户经理是自己下属的项目)
+     * 市场部项目列表 (包含客户经理是自己或客户经理是自己下属的项目)
      */
     @DataPermission
     @GetMapping("/mine")
@@ -61,6 +63,17 @@ public class ItemController extends BaseController {
     }
 
     /**
+     * 市场部我的项目列表 (只包含客户经理是自己的项目)
+     */
+    @GetMapping("/me")
+    public RestResponse<Page<ItemVO>> xxPage(ItemDTO item, Page page){
+        HashSet<Long> userIds = new HashSet<>();
+        userIds.add(LoginContext.getUserId());
+        item.setUserIds(userIds);
+        Page<ItemVO> pages=itemService.selectPage(page,item);
+        return RestResponse.data(pages);
+    }
+    /**
      * 项目信息表详情
      */
     @GetMapping("/{id}")

biz-base/src/main/java/com/dayou/controller/MarketLogController.java

@@ -1,6 +1,8 @@
 package com.dayou.controller;
 
+import com.dayou.annotation.DataPermission;
 import com.dayou.annotation.OperLog;
+import com.dayou.dto.DataPermissionCondition;
 import com.dayou.vo.ItemLogCollectVO;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import lombok.extern.slf4j.Slf4j;
@@ -89,9 +91,10 @@ public class MarketLogController extends BaseController {
      * 日志汇总列表
      * @return
      */
+    @DataPermission
     @GetMapping("/collect")
-    public RestResponse<List<ItemLogCollectVO>> logCollect( LocalDate startDate, LocalDate endDate){
-        List<ItemLogCollectVO> result = marketLogService.logCollect(startDate,endDate);
+    public RestResponse<List<ItemLogCollectVO>> logCollect(DataPermissionCondition condition){
+        List<ItemLogCollectVO> result = marketLogService.logCollect(condition);
         return RestResponse.data(result);
     }
 

biz-base/src/main/java/com/dayou/controller/VisitController.java

@@ -51,8 +51,8 @@ public class VisitController extends BaseController {
      * 拜访记录表详情
      */
     @GetMapping("/{id}")
-    public RestResponse<Visit> detail(@PathVariable Long id){
-        Visit xVisit =visitService.detail(id);
+    public RestResponse<VisitVO> detail(@PathVariable Long id){
+        VisitVO xVisit =visitService.detail(id);
         return RestResponse.data(xVisit);
      }
 

common/src/main/java/com/dayou/utils/DateUtils.java

@@ -258,6 +258,21 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         return cal.getTime();
     }
 
+    public static LocalDate getLastMonth23(int year,int month){
+
+        Calendar cal = Calendar.getInstance();
+        cal.set(year,month,1);
+        Date date = cal.getTime();
+        Calendar cal1 = Calendar.getInstance();
+        cal1.setTime(date);
+        cal1.add(Calendar.MONTH,-1);
+        cal1.set(Calendar.DAY_OF_MONTH,23);
+        LocalDate last23Date = dateToLocalDate(cal1.getTime());
+        return last23Date;
+    }
+
+
+
     // 获得本月第一天0点时间
     public static Date getCurMonthStart() {
         Calendar cal = Calendar.getInstance();

dao/src/main/java/com/dayou/mapper/MarketLogMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -19,5 +20,5 @@ import java.util.List;
 public interface MarketLogMapper extends CustomBaseMapper<MarketLog> {
 
 
-    List<ItemUserLogVO> getList(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
+    List<ItemUserLogVO> getList(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate , @Param("userIds")Set<Long> userIds);
 }

dao/src/main/java/com/dayou/mapper/MarketStatMapper.java

@@ -4,6 +4,8 @@ import com.dayou.dto.MarketStatDTO;
 import com.dayou.vo.MarketStatVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDate;
+
 /**
  * 类说明：
  *
@@ -12,5 +14,5 @@ import org.apache.ibatis.annotations.Param;
  * created with IntelliJ IDEA.
  */
 public interface MarketStatMapper {
-    MarketStatVO marketStat(@Param("dto") MarketStatDTO dto);
+    MarketStatVO marketStat(@Param("dto") MarketStatDTO dto, @Param("lastMonth23")LocalDate lastMonth23);
 }

dao/src/main/java/com/dayou/mapper/PostMapper.java

@@ -1,8 +1,10 @@
 package com.dayou.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dayou.bo.SimpleParentModel;
 import com.dayou.common.PullDownModel;
 import com.dayou.common.SimpleListModel;
+import com.dayou.common.SimpleModel;
 import com.dayou.entity.Post;
 import com.dayou.dao.CustomBaseMapper;
 import com.dayou.vo.PostVO;
@@ -27,5 +29,5 @@ public interface PostMapper extends CustomBaseMapper<Post> {
 
     List<PullDownModel> xSimpleAll();
 
-    List<SimpleListModel> getDepartmentList(@Param("postIds") Set<Long> postIds);
+    List<SimpleParentModel> getDepartmentList(@Param("postIds") Set<Long> postIds);
 }

dao/src/main/java/com/dayou/mapper/VisitMapper.java

@@ -17,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
 public interface VisitMapper extends CustomBaseMapper<Visit> {
 
     Page<VisitVO> page(Page page, @Param("visit") VisitVO visit);
+
+    VisitVO detail(@Param("id") Long id);
 }

dao/src/main/resources/mapper/MarketLogMapper.xml

@@ -42,6 +42,12 @@ where u.deleted = 0 and ml.deleted = 0
                 and ml.log_date <= curDate()
             </otherwise>
         </choose>
+        <if test="userIds!=null and userIds.size!=0">
+            and  ml.user_id in
+            <foreach collection="userIds" open="(" close=")" separator="," item="userId">
+                #{userId}
+            </foreach>
+        </if>
     </select>
 
 </mapper>

dao/src/main/resources/mapper/MarketStatMapper.xml

@@ -52,9 +52,8 @@
          </foreach>
       </if>
                                                          ) AS yearPaymentDone,
-          ( SELECT ifnull(sum( pc.amount ),0) FROM payment_collection pc left join item i on i.id = pc.item_id WHERE pc.deleted = 0 AND pc.payment_date >= concat( date_format( LAST_DAY( now()), '%Y-%m-' ), '01' )
-      AND pc.payment_date &lt;= LAST_DAY(
-      now())
+          ( SELECT ifnull(sum( pc.amount ),0) FROM payment_collection pc left join item i on i.id = pc.item_id WHERE pc.deleted = 0 AND pc.payment_date >= #{lastMonth23}
+      AND pc.payment_date &lt;= concat( date_format( LAST_DAY( now()), '%Y-%m-' ), '22' )
       <if test="dto!=null and dto.userIds!=null and dto.userIds.size!=0">
          and i.user_id in
          <foreach collection="dto.userIds" open="(" close=")" separator="," item="userId">

dao/src/main/resources/mapper/PostMapper.xml

@@ -64,8 +64,8 @@
         select p.id ,CONCAT(p.name,'-',d.name) as name from post p left join department d on p.department_id = d.id where p.deleted =0 and d.deleted=0
     </select>
 
-    <select id="getDepartmentList" parameterType="java.util.Set" resultType="com.dayou.common.SimpleListModel">
-        select distinct d.name ,d.id from post p left join department d on d.id = p.department_id
+    <select id="getDepartmentList" parameterType="java.util.Set" resultType="com.dayou.bo.SimpleParentModel">
+        select distinct d.name ,d.id ,d.parent_id from post p left join department d on d.id = p.department_id
         where d.deleted = 0 and p.deleted = 0
         <if test="postIds!=null and postIds.size!=0">
             and p.id in

dao/src/main/resources/mapper/VisitMapper.xml

@@ -27,7 +27,8 @@
 
     <select id="page" parameterType="com.dayou.vo.VisitVO" resultType="com.dayou.vo.VisitVO">
         select
-            <include refid="Base_Column_List"/>,c.name as customerName,u.name as userName
+            <include refid="Base_Column_List"/>,c.name as customerName,u.name as userName,c.section as customerSection,
+            c.department as customerDepartment,c.position as customerPosition
         from visit v left join customer c on v.customer_id = c.id left join user u on u.id = v.user_id
         where v.deleted = 0 and c.deleted = 0
         <if test="visit!=null and visit.customerName!=null and visit.customerName!='' ">
@@ -45,4 +46,11 @@
         order by v.id DESC
     </select>
 
+    <select id="detail" parameterType="java.lang.Long" resultType="com.dayou.vo.VisitVO">
+        select
+        <include refid="Base_Column_List"/>,c.name as customerName,u.name as userName,c.section as customerSection,
+        c.department as customerDepartment,c.position as customerPosition
+        from visit v left join customer c on v.customer_id = c.id left join user u on u.id = v.user_id
+        where v.deleted = 0 and c.deleted = 0 and v.id = #{id}
+    </select>
 </mapper>

domain/src/main/java/com/dayou/bo/LoginCacheUserBO.java

@@ -21,7 +21,7 @@ public class LoginCacheUserBO {
 
     private Set<PrivilegeTreeBO> privilegeList;
 
-    private List<SimpleListModel> departmentList;
+    private List<SimpleParentModel> departmentList;
 
 
 }

domain/src/main/java/com/dayou/bo/SimpleParentModel.java

@@ -0,0 +1,20 @@
+package com.dayou.bo;
+
+import com.dayou.common.SimpleListModel;
+import lombok.Data;
+
+/**
+ * 类说明：
+ *
+ * @author: wucl
+ * @since: 2023/2/16
+ * created with IntelliJ IDEA.
+ */
+@Data
+public class SimpleParentModel extends SimpleListModel {
+
+    /**
+     * 父级id
+     */
+    private Long parentId;
+}

domain/src/main/java/com/dayou/dto/DataPermissionCondition.java

@@ -0,0 +1,23 @@
+package com.dayou.dto;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.Set;
+
+/**
+ * 类说明：
+ *
+ * @author: wucl
+ * @since: 2023/2/16
+ * created with IntelliJ IDEA.
+ */
+@Data
+public class DataPermissionCondition {
+
+    private Set<Long> userIds;
+
+    private LocalDate startDate;
+    private LocalDate endDate;
+
+}

domain/src/main/java/com/dayou/dto/MarketStatDTO.java

@@ -15,4 +15,8 @@ import java.util.Set;
 public class MarketStatDTO {
 
     private Set<Long> userIds;
+
+    private Integer year;
+
+    private Integer month;
 }

domain/src/main/java/com/dayou/dto/UserBaseDetailDTO.java

@@ -1,6 +1,7 @@
 package com.dayou.dto;
 
 import com.dayou.bo.LoginCacheUserBO;
+import com.dayou.bo.SimpleParentModel;
 import com.dayou.common.SimpleListModel;
 import lombok.Data;
 
@@ -69,7 +70,7 @@ public class UserBaseDetailDTO {
     /**
      * 部门列表
      */
-    private List<SimpleListModel> departmentList;
+    private List<SimpleParentModel> departmentList;
 
 
     /**

domain/src/main/java/com/dayou/entity/Visit.java

@@ -1,5 +1,7 @@
 package com.dayou.entity;
 import com.dayou.common.BaseEntity;
+
+import java.time.LocalDate;
 import java.util.Date;
 
 import lombok.Data;
@@ -39,7 +41,7 @@ public class Visit extends BaseEntity {
      */
     @ImportCell
     @ExportCell(columnName = "拜访时间")
-    private Date visitTime;
+    private LocalDate visitTime;
 
     /**
      * 拜访地点

domain/src/main/java/com/dayou/vo/VisitVO.java

@@ -27,4 +27,10 @@ public class VisitVO extends Visit {
      * 业务员
      */
     private String userName;
+
+    private String customerDepartment;
+
+    private String customerSection;
+
+    private String customerPosition;
 }

service/src/main/java/com/dayou/aspect/DataPermissionAop.java

@@ -1,6 +1,7 @@
 package com.dayou.aspect;
 
 import com.dayou.annotation.DataPermission;
+import com.dayou.bo.SimpleParentModel;
 import com.dayou.common.SimpleListModel;
 import com.dayou.service.IUserService;
 import com.dayou.utils.LoginContext;
@@ -46,11 +47,16 @@ public class DataPermissionAop {
         Object arg = joinPoint.getArgs()[0];
 
         if (dataPermission.department()){
-            List<Long> departmentIds = LoginContext.getLoginCacheUserBO().getDepartmentList().stream()
-                    .map(SimpleListModel::getId).collect(Collectors.toList());
+            List<SimpleParentModel> departmentList = LoginContext.getLoginCacheUserBO().getDepartmentList();
+            List<Long> ids = departmentList.stream().map(SimpleListModel::getId).collect(Collectors.toList());
+            List<Long> parentIds = departmentList.stream().map(SimpleParentModel::getParentId).collect(Collectors.toList());
+            //需特殊处理最高部门,最高部门无数据权限限制
+            if (parentIds.contains(null)){
+                return joinPoint.proceed();
+            }
             Field departments = arg.getClass().getDeclaredField("departmentIds");
             departments.setAccessible(Boolean.TRUE);
-            departments.set(arg,departmentIds);
+            departments.set(arg,ids);
         }
 
         if (dataPermission.postChild()){

service/src/main/java/com/dayou/service/IMarketLogService.java

@@ -1,4 +1,5 @@
 package com.dayou.service;
+import com.dayou.dto.DataPermissionCondition;
 import com.dayou.entity.MarketLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,5 +31,5 @@ public interface IMarketLogService extends IService<MarketLog> {
 
         Boolean delete(Long id);
 
-    List<ItemLogCollectVO> logCollect(LocalDate startDate, LocalDate endDate);
+    List<ItemLogCollectVO> logCollect(DataPermissionCondition condition);
 }

service/src/main/java/com/dayou/service/IPostService.java

@@ -1,4 +1,5 @@
 package com.dayou.service;
+import com.dayou.bo.SimpleParentModel;
 import com.dayou.common.PullDownModel;
 import com.dayou.common.SimpleListModel;
 import com.dayou.entity.Post;
@@ -44,5 +45,5 @@ public interface IPostService extends IService<Post> {
 
     List<Post> getPostList(PostVO postVO);
 
-    List<SimpleListModel> getDepartmentList(Set<Long> postIds);
+    List<SimpleParentModel> getDepartmentList(Set<Long> postIds);
 }

service/src/main/java/com/dayou/service/IVisitService.java

@@ -18,7 +18,7 @@ public interface IVisitService extends IService<Visit> {
 
         Page<VisitVO> selectPage(Page page, VisitVO visit);
 
-        Visit detail(Long id);
+        VisitVO detail(Long id);
 
         Boolean add(Visit visit);
 

service/src/main/java/com/dayou/service/impl/DepartmentServiceImpl.java

@@ -1,6 +1,8 @@
 package com.dayou.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.dayou.common.BaseEntity;
 import com.dayou.entity.Department;
 import com.dayou.entity.Post;
 import com.dayou.entity.User;
@@ -74,7 +76,9 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
 
     @Override
     public Boolean update(Department department){
-        return  this.updateById(department);
+        return  this.update(new LambdaUpdateWrapper<Department>().set(Department::getName,department.getName())
+                .set(Department::getParentId,department.getParentId())
+                .set(Department::getPhone,department.getPhone()).eq(BaseEntity::getId,department.getId()));
     }
 
     @Override

service/src/main/java/com/dayou/service/impl/MarketLogServiceImpl.java

@@ -1,5 +1,6 @@
 package com.dayou.service.impl;
 
+import com.dayou.dto.DataPermissionCondition;
 import com.dayou.entity.ItemUserLog;
 import com.dayou.entity.MarketLog;
 import com.dayou.mapper.MarketLogMapper;
@@ -81,10 +82,10 @@ public class MarketLogServiceImpl extends ServiceImpl<MarketLogMapper, MarketLog
     }
 
     @Override
-    public List<ItemLogCollectVO> logCollect(LocalDate startDate, LocalDate endDate) {
+    public List<ItemLogCollectVO> logCollect(DataPermissionCondition condition) {
         List<ItemUserLogVO> logList = new ArrayList<>();
         List<ItemLogCollectVO> result = new ArrayList<>();
-        logList = marketLogMapper.getList(startDate,endDate);
+        logList = marketLogMapper.getList(condition.getStartDate(),condition.getEndDate(),condition.getUserIds());
         Map<Long, List<ItemUserLogVO>> collectByUser = logList.stream().collect(Collectors.groupingBy(ItemUserLog::getUserId));
         for(Map.Entry<Long, List<ItemUserLogVO>> byUserMap : collectByUser.entrySet()){
             Map<LocalDate, List<ItemUserLogVO>> collectByDate = byUserMap.getValue().stream().collect(Collectors.groupingBy(ItemUserLog::getLogDate));

service/src/main/java/com/dayou/service/impl/MarketStatServiceImpl.java

@@ -3,10 +3,14 @@ package com.dayou.service.impl;
 import com.dayou.dto.MarketStatDTO;
 import com.dayou.mapper.MarketStatMapper;
 import com.dayou.service.IMarketStatService;
+import com.dayou.utils.DateUtils;
 import com.dayou.vo.MarketStatVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.util.Date;
+
 /**
  * 类说明：
  *
@@ -22,6 +26,19 @@ public class MarketStatServiceImpl implements IMarketStatService {
 
     @Override
     public MarketStatVO marketStat(MarketStatDTO dto) {
-        return marketStatMapper.marketStat(dto);
+
+        //todo 市场部首页统计时间段修改，只把月回款修改了，年回款和年签约还没有改
+        LocalDate lastMonth23 = LocalDate.now();
+        if (dto.getMonth()==null || dto.getYear()==null){
+            lastMonth23 = DateUtils.getLastMonth23(LocalDate.now().getYear(), LocalDate.now().getMonthValue() - 1);
+        }else {
+            lastMonth23 = DateUtils.getLastMonth23(dto.getYear(), dto.getMonth() - 1);
+        }
+        return marketStatMapper.marketStat(dto,lastMonth23);
+    }
+
+    public static void main(String[] args) {
+        LocalDate lastMonth23 = DateUtils.getLastMonth23(2024,0);
+        System.out.println(lastMonth23);
     }
 }

service/src/main/java/com/dayou/service/impl/PostServiceImpl.java

@@ -1,6 +1,7 @@
 package com.dayou.service.impl;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dayou.bo.SimpleParentModel;
 import com.dayou.common.BaseEntity;
 import com.dayou.common.PullDownModel;
 import com.dayou.common.SimpleListModel;
@@ -146,9 +147,9 @@ public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements IP
     }
 
     @Override
-    public List<SimpleListModel> getDepartmentList(Set<Long> postIds) {
+    public List<SimpleParentModel> getDepartmentList(Set<Long> postIds) {
         if (CollectionUtils.isNotEmpty(postIds)){
-            List<SimpleListModel> list = postMapper.getDepartmentList(postIds);
+            List<SimpleParentModel> list = postMapper.getDepartmentList(postIds);
             return list;
         }
         return null;

service/src/main/java/com/dayou/service/impl/UserServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.dayou.bo.LoginCacheUserBO;
 import com.dayou.bo.PrivilegeTreeBO;
+import com.dayou.bo.SimpleParentModel;
 import com.dayou.common.BaseEntity;
 import com.dayou.common.Constants;
 import com.dayou.common.SimpleListModel;
@@ -222,7 +223,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
         Set<Long> postIds = postList.stream().map(SimpleListModel::getId).collect(Collectors.toSet());
 
-        List<SimpleListModel> departmentList = postService.getDepartmentList(postIds);
+        List<SimpleParentModel> departmentList = postService.getDepartmentList(postIds);
         userBaseDetailDTO.setDepartmentList(departmentList);
 
         LoginCacheUserBO loginCacheUserBO = cache.getIfPresent(userId);

service/src/main/java/com/dayou/service/impl/VisitServiceImpl.java

@@ -49,8 +49,8 @@ public class VisitServiceImpl extends ServiceImpl<VisitMapper, Visit> implements
 
 
     @Override
-    public Visit detail(Long id){
-        return this.getById(id);
+    public VisitVO detail(Long id){
+        return visitMapper.detail(id);
     }
 
     @Override