代码提交

liusheng

3 天以前 0a8f9800a264c848adf1361db5bcab5b2fc32869

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java

@@ -69,15 +69,11 @@
        List<Map<String, Object>> list = new ArrayList<>();
        list.add(map);
        //获取total
        long total = PageUtils.count(new ISelect() {
            @Override
            public void doSelect() {
                serviceSubtaskVO.setPageNum(null);
                serviceSubtaskVO.setPageSize(null);
                serviceSubtaskService.patItem(serviceSubtaskVO);
            }
        });
        return getDataTable3(total, list);
        List<ServiceSubtask> serviceSubtasks = serviceSubtaskService.patItem(serviceSubtaskVO);

        return getDataTable3(CollectionUtils.isNotEmpty(serviceSubtasks)?serviceSubtasks.size():0, list);
    }

    /**

 smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java

@@ -94,6 +94,13 @@
    @ApiModelProperty(value = "发送状态 : 1新建 2执行中 3暂停 4终止 5完成")
    private List<Long> sendstates;

    /**
     * 发送状态
     */
    @Excel(name = " 发送状态 ")
    @ApiModelProperty(value = "发送状态 ：1 被领取  2 待发送  3 已发送  4 不执行  5 发送失败 6 已完成")
    private Long sendstate;


    /**
     * 发处理意见：1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访送UUID
@@ -272,13 +279,6 @@
    @Excel(name = " 晚上结束发送时间限制 ")
    @ApiModelProperty(value = "晚上结束发送时间限制")
    private String sendlimitnend;

    /**
     * 发送状态
     */
    @Excel(name = " 发送状态 ")
    @ApiModelProperty(value = "发送状态 : 1新建 2执行中 3暂停 4终止 5完成")
    private Long sendstate;


    /**

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java

@@ -298,10 +298,11 @@

    @Override
    public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO) {
        serviceSubtaskVO.setSendstate(null);
        serviceSubtaskVO.setPageSize(99999999);
        serviceSubtaskVO.setPageNum(1);
        List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
        ServiceSubtaskVO serviceSubtaskVO1 = DtoConversionUtils.sourceToTarget(serviceSubtaskVO, ServiceSubtaskVO.class);
        serviceSubtaskVO1.setSendstate(null);
        serviceSubtaskVO1.setPageSize(99999999);
        serviceSubtaskVO1.setPageNum(1);
        List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO1);
        Map<String, Object> map = new HashMap<>();
        Integer wzx = 0;
        Integer ysf = 0;