suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

槽液管理查询用户修改

Browse Source
liweidong
pangyang 3 weeks ago
parent 2d125467f9
commit c9473b2fe8
2 changed files with 98 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 60
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java
  2. 87
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java

60
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java
Unescape View File

@ -639,39 +639,37 @@ public class LiquidTankTaskCopyController extends BladeController {
// List<LiquidTankTaskCopyVO> list = service.getListByLiquidTankReportId(report.getId());
List<LiquidTankTaskCopyVO> list = service.getListByLiquidTankReportIdNew(report.getId());
if(null != list && list.size() > 0){
Long centerId = list.get(0).getWorkCenterId();
QueryWrapper<LiquidTankReportConfig> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("WC_ID",centerId);
List<LiquidTankReportConfig> rule = configService.list(queryWrapper);
String name = "";
String tableTtile ="";
if(null != rule && rule.size() > 0){
name = rule.get(0).getNamePrefix();
tableTtile = rule.get(0).getReportCode();
}
try {
FullMergeExcelUtil.exportUserExcel(
response,
"槽液检测报告",
name,
tableTtile,
new String[]{"取样时间", "温度(℃)", "槽号", "体积(L)", "分析项目", "规范下限(g/L)", "目标下限(g/L)",
"添加点(g/L)", "目标值(g/L)","目标上限(g/L)","规范上限(g/L)","化验频率","化验值(g/L)",
"药品计算公式","药品添加量","药品批次号","药品监督员签名","药品添加人签名","调整后化验值(g/L)",
"是否合格","有效期","超出规范极限调整后的结果","槽液清理记录","控制规范"},
list,
new int[]{0}
);
} catch (Exception e) {
throw new RuntimeException(e);
}
Long centerId = list.get(0).getWorkCenterId();
QueryWrapper<LiquidTankReportConfig> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("WC_ID",centerId);
List<LiquidTankReportConfig> rule = configService.list(queryWrapper);
String name = "";
String tableTtile ="";
if(null != rule && rule.size() > 0){
name = rule.get(0).getNamePrefix();
tableTtile = rule.get(0).getReportCode();
}
try {
FullMergeExcelUtil.exportUserExcel(
response,
"槽液检测报告",
name,
tableTtile,
new String[]{"取样时间", "温度(℃)", "槽号", "体积(L)", "分析项目", "规范下限(g/L)", "目标下限(g/L)",
"添加点(g/L)", "目标值(g/L)","目标上限(g/L)","规范上限(g/L)","化验频率","化验值(g/L)",
"药品计算公式","药品添加量","药品批次号","药品监督员签名","药品添加人签名","调整后化验值(g/L)",
"是否合格","有效期","超出规范极限调整后的结果","槽液清理记录","控制规范"},
list,
new int[]{0}
);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
/**

87
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java
Unescape View File

@ -6,6 +6,7 @@ import jakarta.annotation.Resource;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
import org.springblade.desk.basic.pojo.entity.Formula;
import org.springblade.desk.basic.pojo.entity.TeamSet;
import org.springblade.desk.basic.pojo.entity.WorkCenter;
@ -76,43 +77,93 @@ public class LiquidTankTaskSetVoService {
vo.setWcName(wc.getWcName());
}
if (IdUtil.isValid(vo.getTestUserId())) {
UserInfo testUI = userClient.userInfo(vo.getTestUserId()).getData();
if (testUI != null) {
vo.setTestUserRealName(testUI.getUser().getRealName());
R<UserInfo> r = userClient.userInfo(vo.getTestUserId());
if(null != r){
UserInfo testUI = r.getData();
if (testUI != null) {
vo.setTestUserRealName(testUI.getUser().getRealName());
}
}
}
if (IdUtil.isValid(vo.getRepeatTestUserId())) {
UserInfo repeatTestUI = userClient.userInfo(vo.getRepeatTestUserId()).getData();
if (repeatTestUI != null) {
vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName());
R<UserInfo> r = userClient.userInfo(vo.getRepeatTestUserId());
if(null != r){
UserInfo repeatTestUI = r.getData();
if (repeatTestUI != null) {
vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName());
}
}
// UserInfo repeatTestUI = userClient.userInfo(vo.getRepeatTestUserId()).getData();
// if (repeatTestUI != null) {
// vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName());
// }
}
if (IdUtil.isValid(vo.getProcessUserId())) {
UserInfo processUI = userClient.userInfo(vo.getProcessUserId()).getData();
if (processUI != null) {
vo.setProcessUserRealName(processUI.getUser().getRealName());
R<UserInfo> r = userClient.userInfo(vo.getProcessUserId());
if(null != r){
UserInfo processUI = r.getData();
if (processUI != null) {
vo.setProcessUserRealName(processUI.getUser().getRealName());
}
}
// UserInfo processUI = userClient.userInfo(vo.getProcessUserId()).getData();
// if (processUI != null) {
// vo.setProcessUserRealName(processUI.getUser().getRealName());
// }
}
// 审核人
if (IdUtil.isValid(vo.getReviewUserId())) {
UserInfo reviewUI = userClient.userInfo(vo.getReviewUserId()).getData();
if (reviewUI != null) {
vo.setReviewUserRealName(reviewUI.getUser().getRealName());
R<UserInfo> r = userClient.userInfo(vo.getReviewUserId());
if(null != r){
UserInfo reviewUI = r.getData();
if (reviewUI != null) {
vo.setReviewUserRealName(reviewUI.getUser().getRealName());
}
}
// UserInfo reviewUI = userClient.userInfo(vo.getReviewUserId()).getData();
// if (reviewUI != null) {
// vo.setReviewUserRealName(reviewUI.getUser().getRealName());
// }
}
// 发药人
if (IdUtil.isValid(vo.getSendDrugUserId())) {
UserInfo sendUI = userClient.userInfo(vo.getSendDrugUserId()).getData();
if (sendUI != null) {
vo.setSendDurgUserRealName(sendUI.getUser().getRealName());
R<UserInfo> r = userClient.userInfo(vo.getSendDrugUserId());
if(null != r){
UserInfo sendUI = r.getData();
if (sendUI != null) {
vo.setSendDurgUserRealName(sendUI.getUser().getRealName());
}
}
// UserInfo sendUI = userClient.userInfo(vo.getSendDrugUserId()).getData();
// if (sendUI != null) {
// vo.setSendDurgUserRealName(sendUI.getUser().getRealName());
// }
}
// 领药人
if (IdUtil.isValid(vo.getReceiveDrugUserId())) {
UserInfo receiveUI = userClient.userInfo(vo.getReceiveDrugUserId()).getData();
if (receiveUI != null && receiveUI.getUser() != null) {
vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName());
R<UserInfo> r = userClient.userInfo(vo.getReceiveDrugUserId());
if(null != r){
UserInfo receiveUI = r.getData();
if (receiveUI != null) {
vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName());
}
}
// UserInfo receiveUI = userClient.userInfo(vo.getReceiveDrugUserId()).getData();
// if (receiveUI != null && receiveUI.getUser() != null) {
// vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName());
// }
}
WorkTank wt = workTankService.getById(vo.getWorkTankId());
if (wt != null) {

Write Preview
Loading…
Cancel
Save