#

luxiaotao1123

2022-02-26 039ca26b5311753223c4a81997ecc5cad6125d62

#

 src/main/java/com/zy/sc/manager/controller/AppController.java

@@ -105,7 +105,7 @@
                param.getDiscoverer(),    // 发现人
                param.getTel(),    // 联系方式
                null,    // 供应商
                null,    //
                2,    //
                1,    // 状态
                getUserId(),    // 添加人员
                now,    // 添加时间
@@ -135,7 +135,9 @@
        for (Issue issue : issues) {
            AppIssueVo vo = new AppIssueVo();
            vo.setIssueId(issue.getId());
            vo.setTitle(issue.getTitle());
            vo.setTitle(issue.getTitle().length()>12?issue.getTitle().substring(0, 12):issue.getTitle());
            vo.setStartTime(issue.getStartTime$().substring(0, 11));
            vo.setSettle(issue.getSettle$());

            if (!hostSet.contains(issue.getHostId())) {
                hostSet.add(issue.getHostId());
@@ -161,7 +163,5 @@
    public R issueDetl(@RequestParam Long issueId){
        return R.ok().add(issueService.selectById(issueId));
    }



}

 src/main/java/com/zy/sc/manager/controller/result/AppIssueVo.java

@@ -14,5 +14,6 @@

    private String startTime;

    private String settle;

}

 src/main/java/com/zy/sc/manager/controller/result/AppSensorTypeVo.java

File was deleted

 src/main/java/com/zy/sc/manager/controller/result/AppSensorVo.java

File was deleted

 src/main/java/com/zy/sc/manager/entity/Issue.java

@@ -122,7 +122,10 @@
    @ApiModelProperty(value= "供应商")
    private String dealer;

    @ApiModelProperty(value= "")
    /**
     * 流程 1: 草稿  2: 提交  3: 已读  4: 作业  5: 完成  6: 取消
     */
    @ApiModelProperty(value= "流程 1: 草稿  2: 提交  3: 已读  4: 作业  5: 完成  6: 取消")
    private Integer settle;

    /**
@@ -384,6 +387,26 @@
        this.settle = settle;
    }

    public String getSettle$(){
        if (null == this.settle){ return null; }
        switch (this.settle){
            case 1:
                return "草稿";
            case 2:
                return "提交";
            case 3:
                return "已读";
            case 4:
                return "作业";
            case 5:
                return "完成";
            case 6:
                return "取消";
            default:
                return String.valueOf(this.status);
        }
    }

    public Integer getStatus() {
        return status;
    }

 src/main/webapp/views/issue/issue.html

@@ -160,9 +160,9 @@
                            <option value="1">草稿</option>
                            <option value="2">提交</option>
                            <option value="3">已读</option>
                            <option value="4">处理中</option>
                            <option value="4">作业</option>
                            <option value="5">完成</option>
                            <option value="0">取消</option>
                            <option value="6">取消</option>
                        </select>
                    </div>
                </div>