sgj
2026-03-12 533c9a4e44b06c90df7434a38e0da26e10cdac46
fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
@@ -37,10 +37,6 @@
    private WorkOrderMapper workOrderMapper;
    @Resource
    private InoutNoticeService noticeService;
    @Resource
    private InoutNoticeInMapper noticeInMapper;
    @Resource
    private InoutNoticeOutMapper noticeOutMapper;
    public void addData(WorkOrder data) {
@@ -80,6 +76,7 @@
            queryWrapper.lt("create_time", DateUtil.getCurZero(param.getEnd()));
        }
        queryWrapper.orderByDesc("id");
        workOrderMapper.selectPage(page, queryWrapper);
    }
@@ -180,8 +177,10 @@
                selfTodo++;
            }
            if (null != work.getAssigneeId() && work.getAssigneeId().equals(user.getLoginName())) {
                selfTodo++;
                assignTodo++;
                if(!WorkNode.NODE_END.getCode().equals(work.getNode())){
                    selfTodo++;
                    assignTodo++;
                }
            }
            if (DateUtil.isToday(work.getCreateTime())) {
                todayTodo++;
@@ -204,11 +203,6 @@
        queryWrapper.eq("company_id", user.getCompanyId());
        //如果是个人工单,处理人为空或者为当前人
        if (WorkOrderParam.SCOPE_SELF.equals(scope)) {
            queryWrapper.isNull("assignee_id").or().eq("assignee_id", user.getLoginName());
        }
        //监管用户-查看所有库区和待办
        if (Constant.USER_TYPE_10.equals(user.getUserType())) {
            if (WorkOrderParam.SCOPE_SELF.equals(scope)) {
@@ -218,26 +212,32 @@
        //库区用户,如果是公司用户可以查看公司下属所有库区,如果为当前库区只查询当前库区
        if (Constant.USER_TYPE_30.equals(user.getUserType())) {
            if (WorkOrderParam.SCOPE_SELF.equals(scope)) {
                queryWrapper.eq("node", WorkNode.NODE1.getCode());
            }
            if (ContextUtil.isDepotUser(user.getDeptId() + "")) {
                queryWrapper.eq("dept_id", user.getDeptId() + "");
            } else {
                queryWrapper.likeRight("dept_id", user.getDeptId() + "");
            }
            if (WorkOrderParam.SCOPE_SELF.equals(scope)) {
                queryWrapper.eq("node", WorkNode.NODE1.getCode());
            }
        }
        //银行用户,根据合同查询银行下所有库区
        if (Constant.USER_TYPE_20.equals(user.getUserType())) {
            //如果没有配置银行,设置一个不存在的银行号
            if (StringUtils.isBlank(user.getUserData())) user.setUserData("9");
            queryWrapper.eq("bank_id", user.getUserData());
                queryWrapper.eq("bank_id", user.getUserData());
            if (WorkOrderParam.SCOPE_SELF.equals(scope)) {
                queryWrapper.eq("node", WorkNode.NODE3.getCode());
            }
        }
        //如果是个人工单,处理人为空或者为当前人
        if (WorkOrderParam.SCOPE_SELF.equals(scope)) {
            queryWrapper.isNull("assignee_id").or().eq("assignee_id", user.getLoginName());
        }
    }