1.首页押运人员

tangzy

2021-12-03 f122d0833830dcfdea4eac8f664ab2d96ee8ec13

1.首页押运人员

 src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java

@@ -41,7 +41,8 @@

    /**
     * 自定义分页
     * @param query page,size
     *
     * @param query      page,size
     * @param workReport 工作汇报信息对象
     */
    @GetMapping("/page")
@@ -58,7 +59,8 @@

    /**
     * 自定义分页--接收到的汇报信息page
     * @param query page,size
     *
     * @param query      page,size
     * @param workReport 工作汇报信息对象
     */
    @GetMapping("/pageReply")
@@ -74,6 +76,7 @@

    /**
     * 新增
     *
     * @param workReport 工作汇报信息对象
     */
    @PostMapping("/save")
@@ -84,6 +87,7 @@

    /**
     * 修改
     *
     * @param workReport 工作汇报信息对象
     */
    @PostMapping("/update")
@@ -93,14 +97,15 @@

    /**
     * 新增或修改
     *
     * @param workReport 工作汇报信息对象
     */
    @PostMapping("/submit")
    public R submit(@RequestBody WorkReport workReport) {
        if (null!=workReport.getId()){
        if (null != workReport.getId()) {
            workReport.setReplyTime(new Date());
            workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
        }else {
        } else {
            workReport.setReportTime(new Date());
            workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
        }
@@ -109,6 +114,7 @@

    /**
     * 删除
     *
     * @param ids 工作汇报信息ids 数组
     */
    @PostMapping("/remove")
@@ -118,6 +124,7 @@

    /**
     * 详情
     *
     * @param workReport 工作汇报信息对象
     */
    @GetMapping("/detail")
@@ -133,26 +140,35 @@

    /**
     * 获取接收人的单位信息
     *
     * @param detail 汇报详情
     * @return
     */
    private String getReplyDeptName(WorkReportVo detail) {
        List<String> replyDeptIds = Arrays.asList(detail.getReplyDeptIds().split(","));
        if (replyDeptIds.size()>0) {
        if (replyDeptIds.size() > 0) {
            StringBuilder replyDeptNameInfo = new StringBuilder();
            for (String deptId : replyDeptIds) {
                //查询接收人单位信息
                Dept deptDetail = deptService.getById(Long.parseLong(deptId));
                replyDeptNameInfo = replyDeptNameInfo.append(deptDetail.getDeptName()).append(",");
                if (null != deptDetail) {
                    replyDeptNameInfo = replyDeptNameInfo.append(deptDetail.getDeptName()).append(",");
                }

            }
            if (replyDeptNameInfo.length() > 0) {
                //截取
                return replyDeptNameInfo.substring(0, replyDeptNameInfo.length() - 1);
            }
            //截取
            return replyDeptNameInfo.substring(0, replyDeptNameInfo.length() - 1);
            return replyDeptNameInfo.toString();
        }
        return null;
    }

    /**
     * 获取接收人的单位id(dept)信息
     *
     * @param
     * @return
     */
@@ -167,7 +183,7 @@
        //去重
        List<String> collect = list.stream().distinct().collect(Collectors.toList());
        //截取
        return String.join(",",collect);
        return String.join(",", collect);
    }

    /**
@@ -176,7 +192,7 @@
     * @param detail 汇报详情
     * @return
     */
    private String getReplyRealName(WorkReportVo detail){
    private String getReplyRealName(WorkReportVo detail) {
        List<String> userIds = Arrays.asList(detail.getReceivedIds().split(","));
        StringBuilder replyRealNameInfo = new StringBuilder();
        for (String userId : userIds) {