#

LSH

2023-10-11 ad6b7f0d80337bcddb1d694cc53bd6273c03149e

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

@@ -70,10 +70,11 @@
                  @RequestParam Map<String, Object> param){
        EntityWrapper<PriQuoteBudget> wrapper = new EntityWrapper<>();
        wrapper.setSqlSelect("id,title,create_time as createTime,settle,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId");
        wrapper.in("member_id", getUserRoleBelongsToUserId());
//        wrapper.in("member_id", getUserRoleBelongsToUserId());
        excludeTrash(param);
        convert(param, wrapper);
        allLike(PriQuoteBudget.class, param.keySet(), wrapper, condition);
        wrapper.or().eq("member_id",getUserId());
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(priQuoteBudgetService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -152,7 +153,7 @@
        initNames.add("提交报价预算单");
        initNames.add("部门经理审核");
        initNames.add("业务员确认");
        priQuoteBudget.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),initNames,3)));
        priQuoteBudget.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),getUser(),initNames,3)));

        //设置项目流程
        plan.setStep(4);
@@ -253,7 +254,7 @@
    public R query(String condition) {
        EntityWrapper<PriQuoteBudget> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        wrapper.in("member_id", getUserRoleBelongsToUserId());
        wrapper.in("user_id", getUserRoleBelongsToUserId());
        Page<PriQuoteBudget> page = priQuoteBudgetService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (PriQuoteBudget priQuoteBudget : page.getRecords()){