forked from kidgrow-microservices-platform

dougang
2020-12-23 4c25b1614b5a7e2c0d35b997c67f6622a8ba81b1
解决创建机构时二维码无参数的问题
1 files modified
37 ■■■■■ changed files
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ScreeningOrganizationInfoController.java 37 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ScreeningOrganizationInfoController.java
@@ -29,7 +29,10 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.*;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -107,15 +110,16 @@
            }
            return ResultBody.failed().msg(errMsg.toString());
        } else {
            if (organizationInfo.getId() == null) {
            boolean v = organizationInfoService.saveOrUpdate(organizationInfo);
            if (v) {
                if (StringUtils.isBlank(organizationInfo.getQrCode())) {
                //新增机构增加关注二维码
                String url = createQr(String.valueOf(organizationInfo.getId()));
                if (StringUtils.isNotBlank(url)) {
                    organizationInfo.setQrCode(url);
                        organizationInfoService.updateById(organizationInfo);
                }
            }
            boolean v = organizationInfoService.saveOrUpdate(organizationInfo);
            if (v) {
                return ResultBody.ok().data(organizationInfo).msg("保存成功");
            } else {
                return ResultBody.failed().msg("保存失败");
@@ -220,21 +224,24 @@
                List<ScreeningOrganizationExcel> list = ExcelUtil.importExcel(excel, 0, 1, ScreeningOrganizationExcel.class);
                rowNum = list.size();
                if (rowNum > 0) {
                    List<ScreeningOrganizationInfo> users = new ArrayList<>(rowNum);
                    String[] area = areaCode.split("#");
                    list.forEach(u -> {
                        ScreeningOrganizationInfo user = new ScreeningOrganizationInfo();
                        BeanUtil.copyProperties(u, user);
                        user.setSourceHospitalName(hospitalName);
                        user.setSourceHospitalId(Long.parseLong(hospitalId));
                        user.setProvince(area[0]);
                        user.setCity(area[1]);
                        user.setArea(area[2]);
                        user.setAreaCode(areaName);
                        users.add(user);
                        ScreeningOrganizationInfo organizationInfo = new ScreeningOrganizationInfo();
                        BeanUtil.copyProperties(u, organizationInfo);
                        organizationInfo.setSourceHospitalName(hospitalName);
                        organizationInfo.setSourceHospitalId(Long.parseLong(hospitalId));
                        organizationInfo.setProvince(area[0]);
                        organizationInfo.setCity(area[1]);
                        organizationInfo.setArea(area[2]);
                        organizationInfo.setAreaCode(areaName);
                        organizationInfoService.saveOrUpdate(organizationInfo);
                        if (StringUtils.isBlank(organizationInfo.getQrCode())) {
                            organizationInfo.setQrCode(createQr(String.valueOf(organizationInfo.getId())));
                            organizationInfoService.updateById(organizationInfo);
                        }
                    });
                    organizationInfoService.saveBatch(users);
                }
            }
        } catch (Exception e) {