Skip to content

A
amos-boot-biz
Commit b1f4454d authored by 韩桐桐's avatar 韩桐桐
Browse files
Options

fix(jg):汇总表经办人查询换成从平台查询

parent ec9a6476
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 15 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
View file @ b1f4454d
...@@ -44,6 +44,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum; ...@@ -44,6 +44,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.*; import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel; import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.systemctl.Systemctl; import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel; import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
...@@ -185,10 +186,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -185,10 +186,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
try { try {
zip.putNextEntry(new ZipEntry(filePrefix + "第" + (i + 1) + "页" + ".pdf")); zip.putNextEntry(new ZipEntry(filePrefix + "第" + (i + 1) + "页" + ".pdf"));
IOUtils.write(futures.get(i).join(), zip); IOUtils.write(futures.get(i).join(), zip);
zip.closeEntry();
} catch (IOException e) { } catch (IOException e) {
log.error("打包zip失败：" + e.getMessage()); log.error("打包zip失败：" + e.getMessage());
throw new BadRequest("打包zip失败"); throw new BadRequest("打包zip失败");
} finally {
zip.closeEntry();
} }
} }
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
...@@ -1568,13 +1570,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1568,13 +1570,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData()); JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
JSONArray equipmentLists = (JSONArray) jsonObject.get("equipmentLists"); JSONArray equipmentLists = (JSONArray) jsonObject.get("equipmentLists");
total = equipmentLists.size(); total = equipmentLists.size();
AgencyUserModel result = new AgencyUserModel();
JgUseRegistration jgUseRegistration = jgUseRegistrationMapper.selectOne(new QueryWrapper<JgUseRegistration>().lambda() JgUseRegistration jgUseRegistration = jgUseRegistrationMapper.selectOne(new QueryWrapper<JgUseRegistration>().lambda()
.eq(JgUseRegistration::getSequenceNbr, sequenceNbr)); .eq(JgUseRegistration::getSequenceNbr, sequenceNbr));
TzsUserInfo tzsUserInfo = new TzsUserInfo();
if (!ValidationUtil.isEmpty(jgUseRegistration.getCreateUserId())) { if (!ValidationUtil.isEmpty(jgUseRegistration.getCreateUserId())) {
tzsUserInfo = userInfoMapper.selectOne(new QueryWrapper<TzsUserInfo>().lambda() result = Privilege.agencyUserClient.queryByUserId(jgUseRegistration.getCreateUserId()).getResult();
.eq(TzsUserInfo::getIsDelete, false)
.eq(TzsUserInfo::getAmosUserId, jgUseRegistration.getCreateUserId()));
} }
if ("8300".equals(category)) {// 压力管道基本信息汇总表 if ("8300".equals(category)) {// 压力管道基本信息汇总表
// 模板 // 模板
...@@ -1586,7 +1587,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1586,7 +1587,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 总页数 // 总页数
int page = (int) Math.ceil(total / size); int page = (int) Math.ceil(total / size);
// 异步获取数据 // 异步获取数据
List<CompletableFuture<byte[]>> futures = pressurePipeDataPreparation(page, jsonObject, size, total, equipmentLists, wordPath, filePrefix, tzsUserInfo); List<CompletableFuture<byte[]>> futures = pressurePipeDataPreparation(page, jsonObject, size, total, equipmentLists, wordPath, filePrefix, result);
// byte[]压缩zip // byte[]压缩zip
toZipFile(response, futures, filePrefix, customFileName); toZipFile(response, futures, filePrefix, customFileName);
} else if ("2300".equals(category)) {// 气瓶基本信息汇总表 } else if ("2300".equals(category)) {// 气瓶基本信息汇总表
...@@ -1599,7 +1600,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1599,7 +1600,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 总页数 // 总页数
int page = (int) Math.ceil(total / size); int page = (int) Math.ceil(total / size);
// 异步获取数据 // 异步获取数据
List<CompletableFuture<byte[]>> futures = cylinderDataPreparation(page, jsonObject, size, total, equipmentLists, wordPath, filePrefix, tzsUserInfo); List<CompletableFuture<byte[]>> futures = cylinderDataPreparation(page, jsonObject, size, total, equipmentLists, wordPath, filePrefix, result);
// byte[]压缩zip // byte[]压缩zip
toZipFile(response, futures, filePrefix, customFileName); toZipFile(response, futures, filePrefix, customFileName);
} }
...@@ -1610,7 +1611,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1610,7 +1611,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
* *
* @return * @return
*/ */
private List<CompletableFuture<byte[]>> cylinderDataPreparation(int page, JSONObject jsonObject, int size, double total, JSONArray equipmentLists, String wordPath, String filePrefix, TzsUserInfo tzsUserInfo) { private List<CompletableFuture<byte[]>> cylinderDataPreparation(int page, JSONObject jsonObject, int size, double total, JSONArray equipmentLists, String wordPath, String filePrefix, AgencyUserModel result) {
List<CompletableFuture<byte[]>> futures = IntStream.rangeClosed(1, page) List<CompletableFuture<byte[]>> futures = IntStream.rangeClosed(1, page)
.mapToObj(current -> CompletableFuture.supplyAsync(() -> { .mapToObj(current -> CompletableFuture.supplyAsync(() -> {
Map<String, Object> exportParamsMap = new HashMap<>(); Map<String, Object> exportParamsMap = new HashMap<>();
...@@ -1623,11 +1624,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1623,11 +1624,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 使用单位 // 使用单位
exportParamsMap.put("useUnitName", jsonObject.get("useUnitName")); exportParamsMap.put("useUnitName", jsonObject.get("useUnitName"));
// 联系电话 // 联系电话
exportParamsMap.put("phone", ValidationUtil.isEmpty(tzsUserInfo.getPhone()) ? "" : tzsUserInfo.getPhone()); exportParamsMap.put("phone", ValidationUtil.isEmpty(result.getMobile()) ? "" : result.getMobile());
// 经办人 // 经办人
exportParamsMap.put("agent", ValidationUtil.isEmpty(tzsUserInfo.getName()) ? "" : tzsUserInfo.getName()); exportParamsMap.put("agent", ValidationUtil.isEmpty(result.getRealName()) ? "" : result.getRealName());
// 电子邮箱 // 电子邮箱
exportParamsMap.put("email", ValidationUtil.isEmpty(tzsUserInfo.getEmail()) ? "" : tzsUserInfo.getEmail()); exportParamsMap.put("email", ValidationUtil.isEmpty(result.getEmail()) ? "" : result.getEmail());
// 数据分页 // 数据分页
int start = (current - 1) * size; int start = (current - 1) * size;
int end = ((current - 1) * size + size) < total ? (current - 1) * size + size : (int) total; int end = ((current - 1) * size + size) < total ? (current - 1) * size + size : (int) total;
...@@ -1646,7 +1647,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1646,7 +1647,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
* *
* @return * @return
*/ */
private List<CompletableFuture<byte[]>> pressurePipeDataPreparation(int page, JSONObject jsonObject, int size, double total, JSONArray equipmentLists, String wordPath, String filePrefix, TzsUserInfo tzsUserInfo) { private List<CompletableFuture<byte[]>> pressurePipeDataPreparation(int page, JSONObject jsonObject, int size, double total, JSONArray equipmentLists, String wordPath, String filePrefix, AgencyUserModel result) {
List<CompletableFuture<byte[]>> futures = IntStream.rangeClosed(1, page) List<CompletableFuture<byte[]>> futures = IntStream.rangeClosed(1, page)
.mapToObj(current -> CompletableFuture.supplyAsync(() -> { .mapToObj(current -> CompletableFuture.supplyAsync(() -> {
Map<String, Object> exportParamsMap = new HashMap<>(); Map<String, Object> exportParamsMap = new HashMap<>();
...@@ -1667,11 +1668,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1667,11 +1668,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 安全管理员 // 安全管理员
exportParamsMap.put("safetyManager", String.valueOf(jsonObject.get("safetyManager")).split("_")[1]); exportParamsMap.put("safetyManager", String.valueOf(jsonObject.get("safetyManager")).split("_")[1]);
// 联系电话 // 联系电话
exportParamsMap.put("phone", ValidationUtil.isEmpty(tzsUserInfo.getPhone()) ? "" : tzsUserInfo.getPhone()); exportParamsMap.put("phone", ValidationUtil.isEmpty(result.getMobile()) ? "" : result.getMobile());
// 经办人 // 经办人
exportParamsMap.put("agent", ValidationUtil.isEmpty(tzsUserInfo.getName()) ? "" : tzsUserInfo.getName()); exportParamsMap.put("agent", ValidationUtil.isEmpty(result.getRealName()) ? "" : result.getRealName());
// 电子邮箱 // 电子邮箱
exportParamsMap.put("email", ValidationUtil.isEmpty(tzsUserInfo.getEmail()) ? "" : tzsUserInfo.getEmail()); exportParamsMap.put("email", ValidationUtil.isEmpty(result.getEmail()) ? "" : result.getEmail());
// 数据分页 // 数据分页
int start = (current - 1) * size; int start = (current - 1) * size;
int end = ((current - 1) * size + size) < total ? (current - 1) * size + size : (int) total; int end = ((current - 1) * size + size) < total ? (current - 1) * size + size : (int) total;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment