From 8caeaccef265d090a7d62a95cc12bdd1b3f05e70 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 25 六月 2021 16:33:54 +0800
Subject: [PATCH] 修改试剂管理勾选项
---
src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java | 151 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 138 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index e84cdfa..dd9d9fc 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -1,12 +1,11 @@
package com.nanometer.smartlab.service;
import com.nanometer.smartlab.dao.OpeApplyDao;
-import com.nanometer.smartlab.entity.OpeApply;
-import com.nanometer.smartlab.entity.OpeApplyReserve;
-import com.nanometer.smartlab.entity.OpeOrder;
-import com.nanometer.smartlab.entity.SysUser;
+import com.nanometer.smartlab.dao.SysReagentDao;
+import com.nanometer.smartlab.entity.*;
import com.nanometer.smartlab.entity.enumtype.ApplyStatus;
import com.nanometer.smartlab.entity.enumtype.SeeFlag;
+import com.nanometer.smartlab.entity.enumtype.ValidFlag;
import com.nanometer.smartlab.exception.AlarmCode;
import com.nanometer.smartlab.exception.AlarmException;
import com.nanometer.smartlab.exception.BusinessException;
@@ -15,6 +14,13 @@
import com.nanometer.smartlab.util.MessageUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.primefaces.event.FileUploadEvent;
+import org.primefaces.model.UploadedFile;
import org.springframework.context.annotation.Lazy;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataIntegrityViolationException;
@@ -25,6 +31,8 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.io.IOException;
+import java.io.InputStream;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.ArrayList;
@@ -51,7 +59,11 @@
@Lazy
@Resource
OpeWarehouseReserveService opeWarehouseReserveService;
-
+ @Lazy
+ @Resource
+ SysReagentService sysReagentService;
+ @Resource
+ SysSequenceService sysSequenceService;
@Resource
private SysUserService sysUserService;
@@ -71,7 +83,8 @@
if (StringUtils.isNotBlank(applyUserId)) {
SysUser sysUser = sysUserService.getSysUser(applyUserId);
// 不是管理员时，加入applyUserId
- if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+ if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
params.put("applyUserId", applyUserId);
}
@@ -112,7 +125,8 @@
if (StringUtils.isNotBlank(approveUserId)) {
SysUser sysUser = sysUserService.getSysUser(approveUserId);
// 不是管理员时，加入applyUserId
- if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+ if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
params.put("approveUserId", approveUserId);
}
}
@@ -151,7 +165,8 @@
if (StringUtils.isNotBlank(approveUserId)) {
SysUser sysUser = sysUserService.getSysUser(approveUserId);
// 不是管理员时，加入applyUserId
- if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+ if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
params.put("approveUserId", approveUserId);
}
}
@@ -189,7 +204,8 @@
if (StringUtils.isNotBlank(applyUserId)) {
SysUser sysUser = sysUserService.getSysUser(applyUserId);
// 不是管理员时，加入applyUserId
- if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+ if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
params.put("applyUserId", applyUserId);
}
@@ -530,7 +546,7 @@
}
@Override
- public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply) {
+ public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("reagentName", reagentName);
@@ -538,7 +554,11 @@
params.put("userId",id);
params.put("productSn",productSn);
params.put("applyCode",applyCode);
- params.put("status",status);
+ if (isExpired) {
+ params.put("status",ApplyStatus.EXPIRED);
+ }else{
+ params.put("status", status);
+ }
params.put("isAllApply",isAllApply);
return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params);
} catch (DataAccessException e) {
@@ -549,7 +569,7 @@
}
@Override
public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
- Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply) {
+ Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("reagentName", reagentName);
@@ -559,7 +579,11 @@
params.put("pageSize", pageSize);
params.put("productSn",productSn);
params.put("applyCode",applyCode);
- params.put("status",status);
+ if (isExpired) {
+ params.put("status",ApplyStatus.EXPIRED);
+ }else{
+ params.put("status", status);
+ }
params.put("isAllApply",isAllApply);
return this.opeApplyDao.getOpeApplyReserveListFor(params);
} catch (DataAccessException e) {
@@ -721,4 +745,105 @@
}
+ @Override
+ @Transactional
+ public void importApply(FileUploadEvent event,SysUser user) {
+
+ try {
+
+ UploadedFile file = event.getFile();
+ InputStream is = file.getInputstream();
+ boolean isExcel2003 = true;
+ if (file.getFileName().matches("^.+\\.(?i)(xlsx)$")) {
+ isExcel2003 = false;
+ }
+ Workbook wb = null;
+ if (isExcel2003) {
+ wb = new HSSFWorkbook(is);
+ } else {
+ wb = new XSSFWorkbook(is);
+ }
+ Sheet sheet = wb.getSheetAt(0);
+ int totalRows = sheet.getPhysicalNumberOfRows();
+ ArrayList<OpeApply> adds = new ArrayList<>();
+ Row row = null;
+ int totalCells = 0;
+ for (int i = 1; i < totalRows; i++) {
+ List<String> valuesList = new ArrayList<String>();
+ row = sheet.getRow(i);
+
+ totalCells = row.getPhysicalNumberOfCells();
+
+ for (int t = 0; t < totalCells; t++) {
+ String cellInfo = "";
+
+ if (row.getCell(t) != null) {
+ if (row.getCell(t).getCellTypeEnum().toString().equals("NUMERIC")) {
+ cellInfo = String.valueOf(row.getCell(t).getNumericCellValue());
+ }else{
+ cellInfo = row.getCell(t).getStringCellValue();
+ }
+ }
+ valuesList.add(cellInfo);
+ }
+
+ Map<String,Object> detail = new HashMap<>();
+ detail.put("name", valuesList.get(0));
+ detail.put("cas", valuesList.get(1));
+ detail.put("product_sn", valuesList.get(2));
+ detail.put("main_metering", valuesList.get(3));
+ detail.put("reagent_unit", valuesList.get(4));
+ detail.put("reagent_character", valuesList.get(5));
+ detail.put("product_home", valuesList.get(6));
+ SysReagent sysReagent = sysReagentService.getReagentByDetail(detail);
+ if (sysReagent == null) throw new BusinessException(ExceptionEnumCode.PARAM_NO_EXIST, i+"行：试剂不存在或者有多条，导入失败");
+
+ //申购数量
+ Integer num = new Double(valuesList.get(7)).intValue();
+ if (num < 1) throw new BusinessException(ExceptionEnumCode.PARAM_NO_EXIST, i+"行：试剂申购数量不合法，导入失败");
+ //课题组
+ String objective = valuesList.get(8);
+ //选择的审批人姓名
+ String approveUserName = valuesList.get(9);
+ //根据姓名获取用户信息的id
+ SysUser approveUser = sysUserService.getUserByName(approveUserName);
+ if (approveUser == null) throw new BusinessException(ExceptionEnumCode.PARAM_NO_EXIST, i+"行：审批人不存在或者审批人姓名存在重复，导入失败");
+
+ OpeApply opeApply = new OpeApply();
+ opeApply.setId(IDUtils.uuid());
+ opeApply.setValidFlag(ValidFlag.VALID);
+ opeApply.setStatus(ApplyStatus.PENDING_APPROVAL);
+ opeApply.setApplyCode(sysSequenceService.getApplyCode());
+ //设置试剂id
+ opeApply.setReagent(sysReagent);
+ //价格
+ opeApply.setApplyPrice(sysReagent.getPrice());
+ //申购数量
+ opeApply.setNum(num);
+ //申购人
+ opeApply.setApplyUserId(user.getId());
+ //选择的审批人
+ opeApply.setApproveUserId(approveUser.getId());
+ //选择的课题组信息
+ opeApply.setObjective(objective);
+
+ adds.add(opeApply);
+
+ }
+
+ if (adds.size() > 0) {
+ opeApplyDao.insertOpeApplyList(adds);
+ }
+
+
+
+
+
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+
}
--
Gitblit v1.9.2