提成功能自测修改

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

@@ -1,6 +1,7 @@
 package com.dayou.controller;
 
 import com.dayou.annotation.DataPermission;
+import com.dayou.annotation.IgnoreAuth;
 import com.dayou.vo.BrokerageGeneralVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;

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

@@ -1,6 +1,7 @@
 package com.dayou.controller;
 
 import com.dayou.annotation.DataPermission;
+import com.dayou.annotation.IgnoreAuth;
 import com.dayou.vo.BrokerageSequenceVO;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import lombok.extern.slf4j.Slf4j;
@@ -90,6 +91,16 @@ public class ItemBrokerageSequenceController extends BaseController {
         return RestResponse.data(ret);
     }
 
-
+    /**
+     * 提成结算接口，开发测试用
+     * @return
+     */
+    @IgnoreAuth
+    @GetMapping("/settle")
+    public RestResponse<Boolean> settle(){
+        Boolean result = itemBrokerageSequenceService.doAbleItemBrokerageSettle();
+        Boolean nonResult = itemBrokerageSequenceService.doNonMarketerAheadSettle();
+        return RestResponse.data((result && nonResult));
+    }
 }
 

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

@@ -1,65 +0,0 @@
-package com.dayou.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dayou.common.RestResponse;
-import com.dayou.entity.PostCultivate;
-import com.dayou.service.IPostCultivateService;
-import com.dayou.vo.PostCultivateVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 岗位培育关系
- *
- * @author wucl
- * @since 2023-01-10
- */
-@RestController
-@RequestMapping("postCultivate")
-@Slf4j
-public class PostCultivateController {
-
-    @Autowired
-    private IPostCultivateService postCultivateService;
-
-    /**
-     * 岗位培育关系
-     */
-    @GetMapping("")
-    public RestResponse<Page<PostCultivateVO>> page(PostCultivateVO postCultivateVO, Page page){
-        Page<PostCultivateVO> xPage = postCultivateService.getPage(page,postCultivateVO);
-        return RestResponse.data(xPage);
-    }
-
-    /**
-     * 新增培育关系
-     * @param postCultivate
-     * @return
-     */
-    @PostMapping("")
-    public RestResponse<Boolean> add(@RequestBody PostCultivate postCultivate){
-        Boolean ret = postCultivateService.save(postCultivate);
-        return RestResponse.data(ret);
-    }
-
-    /**
-     * 修改培育关系
-     * @param postCultivate
-     * @return
-     */
-    @PutMapping("")
-    public RestResponse<Boolean> update(@RequestBody PostCultivate postCultivate){
-        boolean update = postCultivateService.update(postCultivate);
-        return RestResponse.data(update);
-    }
-
-    /**
-     * 删除培育关系
-     */
-    @DeleteMapping("/{id}")
-    public RestResponse<Boolean> delete(@PathVariable Long id) {
-        Boolean ret = postCultivateService.delete(id);
-        return RestResponse.data(ret);
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.dayou.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dayou.entity.PostCultivate;
-import com.dayou.dao.CustomBaseMapper;
-import com.dayou.vo.PostCultivateVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 岗位培育关系 Mapper 接口
- * </p>
- *
- * @author wucl
- * @since 2023-04-06
- */
-public interface PostCultivateMapper extends CustomBaseMapper<PostCultivate> {
-
-    Page<PostCultivateVO> getPage(Page page, @Param("vo") PostCultivateVO postCultivateVO);
-}

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

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dayou.mapper.PostCultivateMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.dayou.entity.PostCultivate">
-        <result column="id" property="id" />
-        <result column="deleted" property="deleted" />
-        <result column="created" property="created" />
-        <result column="modified" property="modified" />
-        <result column="user_id" property="userId" />
-        <result column="user_post_id" property="userPostId" />
-        <result column="parent_user_id" property="parentUserId" />
-        <result column="parent_user_post_id" property="parentUserPostId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,
-        deleted,
-        created,
-        modified,
-        user_id, user_post_id, user_department_id, parent_user_id, parent_user_post_id,parent_user_department_id,alias
-    </sql>
-
-    <select id="getPage" parameterType="com.dayou.vo.PostCultivateVO" resultType="com.dayou.vo.PostCultivateVO">
-        SELECT
-            pc.id,
-            u.id as user_id,
-            u.NAME as userName,
-            p.NAME AS userPostName,
-            pc.parentUserName AS parentUserName,
-            pc.parentUserPostName AS parentUserPostName,
-            pc.alias as alias,
-            pc.created
-        FROM
-            user_post up
-                LEFT JOIN post p ON p.id = up.post_id
-                LEFT JOIN department d ON d.id = p.department_id
-                LEFT JOIN user u ON u.id = up.user_id
-                left join (
-                SELECT
-                    pc.id,
-                    u2.id as userId,
-                    p2.id as postId,
-                    u2.NAME AS parentUserName,
-                    p2.NAME AS parentUserPostName,
-                    pc.alias,
-                    pc.user_id,
-                    pc.created
-                FROM
-                    `post_cultivate` pc
-
-                        LEFT JOIN user u2 ON u2.id = pc.parent_user_id
-
-                        LEFT JOIN post p2 ON p2.id = pc.parent_user_post_id
-                WHERE
-                    pc.deleted = 0
-                  AND u2.deleted = 0
-                  AND p2.deleted = 0
-            ) pc on pc.user_id = u.id
-        WHERE
-            d.NAME = #{vo.departmentName}
-          AND up.deleted = 0
-          AND p.deleted = 0
-          AND u.deleted = 0
-          AND d.deleted = 0
-        order by pc.id desc
-    </select>
-</mapper>

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

@@ -143,5 +143,6 @@ public class Item extends BaseEntity {
      * 合同上传日期
      */
     @Excel(name = "合同上传日期")
+    @TableField(value = "upload_date", fill = FieldFill.UPDATE)
     private LocalDate uploadDate;
 }

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

@@ -1,59 +0,0 @@
-package com.dayou.entity;
-import com.dayou.common.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.dayou.annotation.ExcelSheet;
-import com.dayou.annotation.ExportCell;
-import com.dayou.annotation.ImportCell;
-/**
- * <p>
- * 岗位培育关系
- * </p>
- *
- * @author wucl
- * @since 2023-04-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ExcelSheet(sheetName = "岗位培育关系")
-public class PostCultivate extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 用户id
-     */
-    private Long userId;
-
-    /**
-     * 用户岗位id
-     */
-    private Long userPostId;
-
-    /**
-     * 用户部门id
-     */
-    private Long userDepartmentId;
-
-    /**
-     * 父级用户id
-     */
-    private Long parentUserId;
-
-    /**
-     * 父级用户岗位id
-     */
-    private Long parentUserPostId;
-
-    /**
-     * 父级用户部门id
-     */
-    private Long parentUserDepartmentId;
-
-    /**
-     * 团队别名
-     */
-    private String alias;
-
-
-}

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

@@ -1,31 +0,0 @@
-package com.dayou.vo;
-
-import com.dayou.entity.PostCultivate;
-import lombok.Data;
-
-/**
- * 类说明：
- *
- * @author: wucl
- * @since: 2023/4/7
- * created with IntelliJ IDEA.
- */
-@Data
-public class PostCultivateVO extends PostCultivate {
-
-    private String userName;
-
-    private String userPostName;
-
-    private String userDepartmentName;
-
-    private String parentUserName;
-
-    private String parentUserPostName;
-
-    private String parentUserDepartmentName;
-    /**
-     * 入参用
-     */
-    private String departmentName;
-}

service/src/main/java/com/dayou/brokerage/handler/LandMarketerBrokerageHandler.java

@@ -54,9 +54,7 @@ public class LandMarketerBrokerageHandler extends BrokerageCalculateSupport impl
     @Autowired
     private IMarketStatService marketStatService;
 
-    @Autowired
-    private IPostCultivateService postCultivateService;
-    
+
     @Autowired
     private IUserService userService;
     

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

@@ -1,21 +1,13 @@
 package com.dayou.service;
-import com.dayou.brokerage.annotation.DoBrokerage;
-import com.dayou.brokerage.constants.BrokerageRule;
 import com.dayou.dto.ItemDTO;
 import com.dayou.entity.Item;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.dayou.entity.ItemBrokerageGeneral;
 import com.dayou.vo.ItemStatVO;
 import com.dayou.vo.ItemVO;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
-import static com.dayou.enums.OperationTypeEnum.ADD;
-
 /**
  * <p>
  * 项目信息表 服务类

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

@@ -1,32 +0,0 @@
-package com.dayou.service;
-import com.dayou.entity.PostCultivate;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.dayou.vo.PostCultivateVO;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.web.multipart.MultipartFile;
-/**
- * <p>
- * 岗位培育关系 服务类
- * </p>
- *
- * @author wucl
- * @since 2023-04-06
- */
-public interface IPostCultivateService extends IService<PostCultivate> {
-
-
-    /**
-     * 计算某个用户培育某岗位人数
-     * @param postName
-     * @return
-     */
-    Integer countCultivate(String postName,Long userId);
-
-    Page<PostCultivateVO> getPage(Page page, PostCultivateVO postCultivateVO);
-    
-    Boolean update(PostCultivate postCultivate);
-
-    Boolean delete(Long id);
-}

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

@@ -1,75 +0,0 @@
-package com.dayou.service.impl;
-
-import com.dayou.entity.Post;
-import com.dayou.entity.PostCultivate;
-import com.dayou.mapper.PostCultivateMapper;
-import com.dayou.service.IPostCultivateService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dayou.service.IPostService;
-import com.dayou.utils.LoginContext;
-import com.dayou.vo.PostCultivateVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.dayou.utils.ExcelUtil;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.web.multipart.MultipartFile;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Optional;
-
-import org.springframework.transaction.annotation.Transactional;
-import com.dayou.enums.BatchTaskTypeEnum;
-
-import static com.dayou.common.Constants.SUPERVISOR;
-
-/**
- * <p>
- * 岗位培育关系 服务实现类
- * </p>
- *
- * @author wucl
- * @since 2023-04-06
- */
-@Service
-public class PostCultivateServiceImpl extends ServiceImpl<PostCultivateMapper, PostCultivate> implements IPostCultivateService {
-
-
-    @Autowired
-    private IPostService postService;
-
-    @Autowired
-    private PostCultivateMapper postCultivateMapper;
-
-    @Override
-    public Integer countCultivate(String postName,Long userId) {
-        Post post = postService.getOne(new LambdaQueryWrapper<Post>().eq(Post::getName, postName));
-        return  this.count(new LambdaQueryWrapper<PostCultivate>().eq(PostCultivate::getParentUserId, userId).eq(PostCultivate::getUserPostId, post.getId()));
-    }
-
-    @Override
-    public Page<PostCultivateVO> getPage(Page page, PostCultivateVO postCultivateVO) {
-        Page<PostCultivateVO>  xPage = postCultivateMapper.getPage(page,postCultivateVO);
-        return xPage;
-    }
-
-    @Override
-    public Boolean update(PostCultivate postCultivate) {
-        return this.updateById(postCultivate);
-    }
-
-    @Override
-    public Boolean delete(Long id) {
-        return this.removeById(id);
-    }
-}