From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001 From: kongzy <kongzy> Date: 星期二, 28 十一月 2023 11:00:42 +0800 Subject: [PATCH] 修改课题管理bug --- src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 96 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java index b8c51c1..87ac3c1 100644 --- a/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java @@ -8,6 +8,8 @@ import com.nanometer.smartlab.exception.AlarmException; import com.nanometer.smartlab.exception.BusinessException; import com.nanometer.smartlab.exception.ExceptionEnumCode; +import com.nanometer.smartlab.model.CommonPage; +import com.nanometer.smartlab.util.ExcelUtils; import com.nanometer.smartlab.util.IDUtils; import com.nanometer.smartlab.util.MessageUtil; import org.apache.commons.lang.StringUtils; @@ -21,10 +23,8 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.math.BigDecimal; +import java.util.*; /** * Created by johnny on 17/11/29. @@ -142,6 +142,34 @@ } @Override + public CommonPage<SysReagent> reagentList(Integer pageNum,Integer pageSize,String name,String cas){ + if(pageNum==null||pageNum<1){ + pageNum=1; + } + if(pageSize==null||pageSize<1){ + pageSize=10; + } + if(pageSize>50){ + pageSize=50; + } + Map<String, Object> params = new HashMap<>(); + + params.put("name",name); + params.put("cas",cas); + params.put("first", (pageNum-1)*pageSize); + params.put("pageSize", pageSize); + CommonPage commonPage=new CommonPage(); + commonPage.setPageNum(pageNum); + commonPage.setPageSize(pageSize); + Long total=new Long(sysReagentDao.reagentSimpleInfoCount(params)); + commonPage.setTotal(total); + commonPage.setTotalPage(CommonPage.getTotalPage(total,pageSize)); + List<SysReagent> sysReagents=sysReagentDao.reagentSimpleInfoList(params); + commonPage.setList(sysReagents); + return commonPage; + } + + @Override public String getReagentUnitByReagentId(String reagentId) { return sysReagentDao.getReagentUnitByReagentId(reagentId); } @@ -182,6 +210,70 @@ return reagentIds.get(0); } + @Override + public SysReagent getRowData(String rowKey) { + return sysReagentDao.getRowData(rowKey); + } + + @Override + public SysReagent getSysReagentListNewRowData(String rowKey) { + return sysReagentDao.getSysReagentListNewRowData(rowKey); + } + + @Override + public boolean export2Excel(List<Map> list, Integer type) throws Exception { + Map<String,String> map = new LinkedHashMap<>(); + if (type == 0){ + map.put("kind", "种类"); + map.put("name", "名称"); + map.put("productSn", "产品编号"); + map.put("cas", "CAS"); + map.put("reagentType", "试剂类型"); + map.put("reagentCharacter", "危险性质"); + map.put("supplierName", "供应商"); + map.put("productHomeName", "厂家"); + map.put("reagentFormat", "规格"); + map.put("reagentUnit", "包装"); + map.put("price", "含税售价"); + map.put("perBox", "每箱数量"); + ExcelUtils.export2Excel(list,"耗材列表",map); + }else { + map.put("kind", "种类"); + map.put("name", "试剂名称"); + map.put("control_products_name", "管制品"); + map.put("productSn", "产品编号"); + map.put("cas", "CAS"); + map.put("reagentType", "试剂类型"); + map.put("reagentCharacter", "危险性质"); + map.put("supplierName", "供应商"); + map.put("productHomeName", "厂家"); + map.put("reagentFormat", "规格"); + map.put("reagentUnit", "包装"); + map.put("price", "含税售价"); +// map.put("originprice", "原始售价"); + map.put("perBox", "每箱数量"); + map.put("safetynum", "安全库存"); + ExcelUtils.export2Excel(list,"试剂列表",map); + } + return true; + } + + @Override + public List<Map> selectAll(String name, String cas, String supplierId, Integer type, String productSn) { + Map<String, Object> params = new HashMap<String, Object>(); + params.put("name", name); + params.put("cas", cas); + params.put("supplierId", supplierId); + params.put("type", type); + params.put("productSn", productSn); + return sysReagentDao.selectAll(params); + } + + @Override + public void updateSysReagentPrice(String reagentId, BigDecimal applyPrice) { + sysReagentDao.updateSysReagentPriceById(reagentId, applyPrice); + } + @Transactional(propagation = Propagation.REQUIRED) public int getSysReagentTotalCount(String name, String cas, String supplierId,Integer type) { -- Gitblit v1.9.2