审查接口修改，装备字段新增，指令查询接口修改

Administrator

2021-08-13 6038dbee0781f023397d36c3f27d92a0ac9b8bc7

审查接口修改，装备字段新增，指令查询接口修改

 src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java

@@ -37,6 +37,8 @@
        IPage<DirectiveVo> directiveVoIPage = page.setRecords(baseMapper.selectDirectivePage(page, directive));
        //去除接收人ids,查询出接收人名字
        List<DirectiveVo> records = directiveVoIPage.getRecords();
        System.out.println("records = " + records);
        if (records.size()>0) {
        for (DirectiveVo record : records) {
            String[] receiveDirectiveIds = record.getReceiveDirectiveIds().toString().split(",");
            StringBuilder builder = new StringBuilder();
@@ -56,6 +58,7 @@
            }
            record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
        }
        }
        return directiveVoIPage;
    }


 src/main/java/org/springblade/modules/equipage/entity/Equipage.java

@@ -73,6 +73,12 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date dateForProduction;

    /**
     * 责任人id
     */
    @TableField("user_id")
    private Long userId;



}

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -155,6 +155,7 @@
        Object data1 = jsonObject.get("data");
        JSONObject jsonObject1 = JSONObject.parseObject(data1.toString());
        List<Map<String,Object>> res = (List<Map<String,Object>>)jsonObject1.get("res");
        if(res.size()>0) {
        int count = (int) res.stream().filter(map -> map.get("zdxsfzqkry") != null).count();
        res.forEach(map -> {
            if (null!=map.get("zdxsfzqkry")){
@@ -166,6 +167,10 @@
        }else {
            user.setExaminationType("0");
        }
        }else {
            //没有数据正常
            user.setExaminationType("0");
        }
        return R.status(userService.submit(user));
    }