#

Junjie

2023-09-08 133307a0637193ca0c23f468aea2bd91c76e710a

 src/main/java/com/zy/crm/manager/controller/CstmrController.java

@@ -19,6 +19,7 @@
import com.zy.crm.manager.service.CstmrFollService;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.CstmrTypeService;
import com.zy.crm.manager.utils.CompanySearchUtils;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
import com.zy.crm.system.entity.Role;
@@ -67,10 +68,23 @@
    @ManagerAuth
    public R page(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String followerName,
                  @RequestParam(required = false) String conditionName,
                  @RequestParam(required = false) String condition,
                  @RequestParam(required = false, value = "dept_id") Long deptId,
                  @RequestParam(required = false, value = "user_id") Long userId){
        List<Integer> ids = new ArrayList<>();
        if (!Cools.isEmpty(followerName)){
            User username = userService.selectOne(new EntityWrapper<User>().eq("username", followerName));
            if (!Cools.isEmpty(username)){
                List<CstmrFoll> cstmrIds = cstmrFollService.selectCstmrIdUserId(username.getId().intValue());
                for (CstmrFoll id : cstmrIds){
                    ids.add(id.getCstmrId().intValue());
                }
            }else {
                return R.error("未查询到跟进人信息！");
            }
        }
        if (!Cools.isEmpty(conditionName)){
            switch (conditionName){
                case "director":
@@ -84,17 +98,18 @@

            }
        }
        return R.ok(cstmrService.getPage1(new Page<>(curr, limit)
        return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? null : String.valueOf(deptId)
                , userId == null ? getUserId() : userId
                , Cools.isEmpty(followerName) ? null : ids
                , conditionName
                , condition)
        );
    }

    @RequestMapping(value = "/cstmr/add/auth")
    @ManagerAuth
    @ManagerAuth(memo = "添加甲方单位")
    public R add(Cstmr cstmr) {
        Long hostId = getHostId();
        if (cstmrService.selectByUuid(hostId, cstmr.getUuid()) != null) {
@@ -115,7 +130,7 @@
    }

   @RequestMapping(value = "/cstmr/update/auth")
   @ManagerAuth
   @ManagerAuth(memo = "更新甲方单位")
    public R update(Cstmr cstmr){
        if (Cools.isEmpty(cstmr) || null==cstmr.getId()){
            return R.error();
@@ -127,7 +142,7 @@
    }

    @RequestMapping(value = "/cstmr/delete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "删除甲方单位")
    public R delete(@RequestParam(value="ids[]") Long[] ids){
        for (Long id : ids){
            cstmrService.deleteById(id);
@@ -135,6 +150,12 @@
        return R.ok();
    }

    @RequestMapping(value = "/cstmr/delete/one/{id}")
    @ManagerAuth(memo = "删除甲方单位")
    public R deleteOne(@PathVariable Long id) {
        cstmrService.deleteById(id);
        return R.ok();
    }


    @RequestMapping(value = "/cstmrQuery/auth")
@@ -153,6 +174,13 @@
        return R.ok(result);
    }

    @RequestMapping(value = "/cstmrSearch/auth")
    @ManagerAuth
    public R cstmrSearch(String condition) {
        List<Map<String, Object>> search = CompanySearchUtils.search(condition, 1);
        return R.ok(search);
    }

    @RequestMapping(value = "/cstmr/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {