修改选中项

李宇

2021-06-25 b48666e1f30b3334726d218d6b05d1228a307fd7

修改选中项

 src/main/java/com/nanometer/smartlab/controller/BaseMetaController.java

@@ -131,6 +131,7 @@
                        if (count > 0) {
                            list = baseMetaService.getBaseMetaList(groupId, keyword, first, pageSize);
                        }
                        selectedList = new ArrayList<>();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -139,17 +140,17 @@

                @Override
                public BaseMeta getRowData(String rowKey) {
                    Iterator<BaseMeta> iterator = this.iterator();
                    if (iterator != null) {
                        BaseMeta bm = null;
                        while (iterator.hasNext()) {
                            bm = iterator.next();
                            if (rowKey.equals(bm.getId())) {
                                return bm;
                            }
                        }
                    }
                    return null;
//                    Iterator<BaseMeta> iterator = this.iterator();
//                    if (iterator != null) {
//                        BaseMeta bm = null;
//                        while (iterator.hasNext()) {
//                            bm = iterator.next();
//                            if (rowKey.equals(bm.getId())) {
//                                return bm;
//                            }
//                        }
//                    }
                    return baseMetaService.getBaseMeta(rowKey);
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java

@@ -56,7 +56,7 @@
                        if (isSearch){
                            isSearch = false;
                        }

                        selectOne = null;
                    } catch (Exception e) {
                        logger.error("error occured.", e);
                    }
@@ -65,15 +65,15 @@

                @Override
                public DangerousEncode getRowData(String rowKey) {
                    Iterator<DangerousEncode> iterator = this.iterator();
                    DangerousEncode su = null;
                    while (iterator.hasNext()) {
                        su = iterator.next();
                        if (Long.parseLong(rowKey) == (su.getId())) {
                            return su;
                        }
                    }
                    return null;
//                    Iterator<DangerousEncode> iterator = this.iterator();
//                    DangerousEncode su = null;
//                    while (iterator.hasNext()) {
//                        su = iterator.next();
//                        if (Long.parseLong(rowKey) == (su.getId())) {
//                            return su;
//                        }
//                    }
                    return dangerousEncodeService.selectById(Long.parseLong(rowKey));
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/EncodeReplaceDictController.java

@@ -59,7 +59,7 @@
                        if (isSearch) {
                            isSearch = false;
                        }

                        selectOne = null;
                    } catch (Exception e) {
                        logger.error("error occured.", e);
                    }
@@ -68,15 +68,15 @@

                @Override
                public EncodeReplaceDict getRowData(String rowKey) {
                    Iterator<EncodeReplaceDict> iterator = this.iterator();
                    EncodeReplaceDict su = null;
                    while (iterator.hasNext()) {
                        su = iterator.next();
                        if ( su.getId().equals(Long.parseLong(rowKey))) {
                            return su;
                        }
                    }
                    return null;
//                    Iterator<EncodeReplaceDict> iterator = this.iterator();
//                    EncodeReplaceDict su = null;
//                    while (iterator.hasNext()) {
//                        su = iterator.next();
//                        if ( su.getId().equals(Long.parseLong(rowKey))) {
//                            return su;
//                        }
//                    }
                    return encodeReplaceDictService.getOne(Long.parseLong(rowKey));
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java

@@ -67,6 +67,7 @@
                        if (isSearch) {
                            isSearch = false;
                        }
                        selectedOne = null;
                    } catch (Exception e) {
                        logger.error("error occured.", e);
                    }
@@ -75,15 +76,15 @@

                @Override
                public HazardousWaste getRowData(String rowKey) {
                    Iterator<HazardousWaste> iterator = this.iterator();
                    HazardousWaste su = null;
                    while (iterator.hasNext()) {
                        su = iterator.next();
                        if ( su.getId().equals(Long.parseLong(rowKey))) {
                            return su;
                        }
                    }
                    return null;
//                    Iterator<HazardousWaste> iterator = this.iterator();
//                    HazardousWaste su = null;
//                    while (iterator.hasNext()) {
//                        su = iterator.next();
//                        if ( su.getId().equals(Long.parseLong(rowKey))) {
//                            return su;
//                        }
//                    }
                    return hazardousWasteService.selectById(Long.parseLong(rowKey));
                }
            };
        }
@@ -125,14 +126,14 @@

                @Override
                public HazardousWaste getRowData(String rowKey) {
                    Iterator<HazardousWaste> iterator = this.iterator();
                    HazardousWaste su = null;
                    while (iterator.hasNext()) {
                        su = iterator.next();
                        if ( su.getId().equals(Long.parseLong(rowKey))) {
                            return su;
                        }
                    }
//                    Iterator<HazardousWaste> iterator = this.iterator();
//                    HazardousWaste su = null;
//                    while (iterator.hasNext()) {
//                        su = iterator.next();
//                        if ( su.getId().equals(Long.parseLong(rowKey))) {
//                            return su;
//                        }
//                    }
                    return null;
                }
            };

 src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java

@@ -404,6 +404,7 @@
                            list = sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryType,
                                    laboratoryName,null,project,controllerName, first, pageSize);
                        }
                        selectedList = new ArrayList<> ();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -412,17 +413,17 @@

                @Override
                public SysLaboratoryContainer getRowData(String rowKey) {
                    Iterator<SysLaboratoryContainer> iterator = this.iterator();
                    if (iterator != null) {
                        SysLaboratoryContainer su = null;
                        while (iterator.hasNext()) {
                            su = iterator.next();
                            if (rowKey.equals(su.getId())) {
                                return su;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysLaboratoryContainer> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysLaboratoryContainer su = null;
//                        while (iterator.hasNext()) {
//                            su = iterator.next();
//                            if (rowKey.equals(su.getId())) {
//                                return su;
//                            }
//                        }
//                    }
                    return sysLaboratoryContainerService.getSysLaboratoryContainer(rowKey);
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java

@@ -290,6 +290,7 @@
                        if (count > 0) {
                            list = sysLaboratoryService.getSysLaboratoryList(type, name,project, first, pageSize);
                        }
                        selectedList = new ArrayList<> ();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -298,17 +299,17 @@

                @Override
                public SysLaboratory getRowData(String rowKey) {
                    Iterator<SysLaboratory> iterator = this.iterator();
                    if (iterator != null) {
                        SysLaboratory su = null;
                        while (iterator.hasNext()) {
                            su = iterator.next();
                            if (rowKey.equals(su.getId())) {
                                return su;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysLaboratory> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysLaboratory su = null;
//                        while (iterator.hasNext()) {
//                            su = iterator.next();
//                            if (rowKey.equals(su.getId())) {
//                                return su;
//                            }
//                        }
//                    }
                    return sysLaboratoryService.getSysLaboratory(rowKey);
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/LaboratoryReagentReserveController.java

@@ -153,16 +153,16 @@

                @Override
                public LaboratoryReagentReserve getRowData(String rowKey) {
                    Iterator<LaboratoryReagentReserve> iterator = this.iterator();
                    if (iterator != null) {
                        LaboratoryReagentReserve br = null;
                        while (iterator.hasNext()) {
                            br = iterator.next();
                            if (rowKey.equals(br.getId())) {
                                return br;
                            }
                        }
                    }
//                    Iterator<LaboratoryReagentReserve> iterator = this.iterator();
//                    if (iterator != null) {
//                        LaboratoryReagentReserve br = null;
//                        while (iterator.hasNext()) {
//                            br = iterator.next();
//                            if (rowKey.equals(br.getId())) {
//                                return br;
//                            }
//                        }
//                    }
                    return null;
                }
            };

 src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java

@@ -110,6 +110,7 @@
                        if (count > 0) {
                            list = opeUseFlowService.getOpeUseFlowListByName(houseName,reagentId, reagentCode, containerCode,null, getUserId(),startDate,endDate, first, pageSize);
                        }
                        selectedOne = null;
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -118,21 +119,20 @@

                @Override
                public OpeUseFlow getRowData(String rowKey) {
                    Iterator<OpeUseFlow> iterator = this.iterator();
                    OpeUseFlow temp = null;
                    if(iterator!= null)
                    {
                        while(iterator.hasNext())
                        {
                            temp=iterator.next();
                            if(rowKey.equals(temp.getId()))
                            {
                                return temp;
                            }
                        }
                    }

                    return temp;
//                    Iterator<OpeUseFlow> iterator = this.iterator();
//                    OpeUseFlow temp = null;
//                    if(iterator!= null)
//                    {
//                        while(iterator.hasNext())
//                        {
//                            temp=iterator.next();
//                            if(rowKey.equals(temp.getId()))
//                            {
//                                return temp;
//                            }
//                        }
//                    }
                    return opeUseFlowService.selectById(rowKey);
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java

@@ -272,6 +272,7 @@
                            list = opeUseFlowService.getPersonalUseInfoList
                                    (reagentCode,  getUserId(),startTime,endTime ,receiptNumber,department,project,applyPerson,reagentName,first,pageSize);
                        }
                        selectOne = null;
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -280,17 +281,17 @@

                @Override
                public OpeUseFlow getRowData(String rowKey) {
                    Iterator<OpeUseFlow> iterator = this.iterator();
                    if (iterator != null) {
                        OpeUseFlow su = null;
                        while (iterator.hasNext()) {
                            su = iterator.next();
                            if (rowKey.equals(su.getReceiptNumber())) {
                                return su;
                            }
                        }
                    }
                    return null;
//                    Iterator<OpeUseFlow> iterator = this.iterator();
//                    if (iterator != null) {
//                        OpeUseFlow su = null;
//                        while (iterator.hasNext()) {
//                            su = iterator.next();
//                            if (rowKey.equals(su.getReceiptNumber())) {
//                                return su;
//                            }
//                        }
//                    }
                    return opeUseFlowService.selectByReceiptNumber(rowKey,getUserId());
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java

@@ -17,10 +17,7 @@
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

@Controller
@@ -238,6 +235,7 @@
                        if (count > 0) {
                            list = sysProjectService.getSysProjectListUpdate(first, pageSize,getUserId(),projectId,projectName,sysUserName);
                        }
                        selectedList = new ArrayList<>();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -246,17 +244,17 @@

                @Override
                public SysProject getRowData(String rowKey) {
                    Iterator<SysProject> iterator = this.iterator();
                    if (iterator != null) {
                        SysProject br = null;
                        while (iterator.hasNext()) {
                            br = iterator.next();
                            if (rowKey.equals(br.getId())) {
                                return br;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysProject> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysProject br = null;
//                        while (iterator.hasNext()) {
//                            br = iterator.next();
//                            if (rowKey.equals(br.getId())) {
//                                return br;
//                            }
//                        }
//                    }
                    return sysProjectService.getSysProject(rowKey);
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/RoleMngController.java

@@ -14,6 +14,7 @@
import org.springframework.stereotype.Controller;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -221,6 +222,7 @@
                        if (count > 0) {
                            list = baseRoleService.getBaseRoleList(null, null, first, pageSize);
                        }
                        selectedList = new ArrayList<>();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -229,17 +231,17 @@

                @Override
                public BaseRole getRowData(String rowKey) {
                    Iterator<BaseRole> iterator = this.iterator();
                    if (iterator != null) {
                        BaseRole br = null;
                        while (iterator.hasNext()) {
                            br = iterator.next();
                            if (rowKey.equals(br.getId())) {
                                return br;
                            }
                        }
                    }
                    return null;
//                    Iterator<BaseRole> iterator = this.iterator();
//                    if (iterator != null) {
//                        BaseRole br = null;
//                        while (iterator.hasNext()) {
//                            br = iterator.next();
//                            if (rowKey.equals(br.getId())) {
//                                return br;
//                            }
//                        }
//                    }
                    return baseRoleService.getBaseRole(rowKey);
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/SupplierInfoMngController.java

@@ -13,6 +13,7 @@
import org.springframework.stereotype.Controller;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -116,6 +117,7 @@
                        if (count > 0) {
                            list = sysSupplierService.getSysSupplierList(name, first, pageSize);
                        }
                        selectedList = new ArrayList<>();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -124,17 +126,17 @@

                @Override
                public SysSupplier getRowData(String rowKey) {
                    Iterator<SysSupplier> iterator = this.iterator();
                    if (iterator != null) {
                        SysSupplier ss = null;
                        while (iterator.hasNext()) {
                            ss = iterator.next();
                            if (rowKey.equals(ss.getId())) {
                                return ss;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysSupplier> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysSupplier ss = null;
//                        while (iterator.hasNext()) {
//                            ss = iterator.next();
//                            if (rowKey.equals(ss.getId())) {
//                                return ss;
//                            }
//                        }
//                    }
                    return sysSupplierService.getSysSupplier(rowKey);
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java

@@ -313,6 +313,7 @@
                                    }
                                }
                            }
                            selectedList = new ArrayList<> ();
                        } catch (Exception e) {
                            logger.error(e);
                        }
@@ -321,17 +322,17 @@

                    @Override
                    public SupplierOrder getRowData(String rowKey) {
                        Iterator<SupplierOrder> iterator = this.iterator();
                        if (iterator != null) {
                                SupplierOrder ss = null;
                            while (iterator.hasNext()) {
                                ss = iterator.next();
                                if (rowKey.equals(ss.getId())) {
                                    return ss;
                                }
                            }
                        }
                        return null;
//                        Iterator<SupplierOrder> iterator = this.iterator();
//                        if (iterator != null) {
//                                SupplierOrder ss = null;
//                            while (iterator.hasNext()) {
//                                ss = iterator.next();
//                                if (rowKey.equals(ss.getId())) {
//                                    return ss;
//                                }
//                            }
//                        }
                        return supplierOpeOrderService.selectById(rowKey);
                    }
                };
            }

 src/main/java/com/nanometer/smartlab/controller/SysAlarmsController.java

@@ -1,6 +1,7 @@
package com.nanometer.smartlab.controller;

import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -67,16 +68,16 @@

                @Override
                public SysAlarm getRowData(String rowKey) {
                    Iterator<SysAlarm> iterator = this.iterator();
                    if (iterator != null) {
                        SysAlarm oa = null;
                        while (iterator.hasNext()) {
                            oa = iterator.next();
                            if (rowKey.equals(oa.getId())) {
                                return oa;
                            }
                        }
                    }
//                    Iterator<SysAlarm> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysAlarm oa = null;
//                        while (iterator.hasNext()) {
//                            oa = iterator.next();
//                            if (rowKey.equals(oa.getId())) {
//                                return oa;
//                            }
//                        }
//                    }
                    return null;
                }
            };

 src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java

@@ -156,6 +156,7 @@
                        if (count > 0) {
                            list = sysControllerService.getSysControllerList(code, name, first, pageSize);
                        }
                        selectedList = new ArrayList<>();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -164,17 +165,17 @@

                @Override
                public SysController getRowData(String rowKey) {
                    Iterator<SysController> iterator = this.iterator();
                    if (iterator != null) {
                            SysController br = null;
                        while (iterator.hasNext()) {
                            br = iterator.next();
                            if (Integer.valueOf(rowKey) == br.getId()) {
                                return br;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysController> iterator = this.iterator();
//                    if (iterator != null) {
//                            SysController br = null;
//                        while (iterator.hasNext()) {
//                            br = iterator.next();
//                            if (Integer.valueOf(rowKey) == br.getId()) {
//                                return br;
//                            }
//                        }
//                    }
                    return sysControllerService.getSysController(Integer.parseInt(rowKey));
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/SysFileMngController.java

@@ -22,10 +22,7 @@
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.*;

@Controller
@Scope("session")
@@ -259,6 +256,7 @@
                        if (count > 0) {
                            list = sysFileService.getSysFileList(name,first, pageSize);
                        }
                        selectedList = new ArrayList<>();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -267,17 +265,17 @@

                @Override
                public SysFile getRowData(String rowKey) {
                    Iterator<SysFile> iterator = this.iterator();
                    if (iterator != null) {
                        SysFile br = null;
                        while (iterator.hasNext()) {
                            br = iterator.next();
                            if (rowKey.equals(br.getId())) {
                                return br;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysFile> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysFile br = null;
//                        while (iterator.hasNext()) {
//                            br = iterator.next();
//                            if (rowKey.equals(br.getId())) {
//                                return br;
//                            }
//                        }
//                    }
                    return sysFileService.getSysFileById(rowKey);
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/SysWarningsController.java

@@ -1,6 +1,7 @@
package com.nanometer.smartlab.controller;

import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -62,6 +63,7 @@
                        if (count > 0) {
                            list = sysWarningService.getSysWarningList(containerCode, startTime, endTime, first, pageSize);
                        }
                        selectedList = new ArrayList<>();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -70,17 +72,17 @@

                @Override
                public SysWarning getRowData(String rowKey) {
                    Iterator<SysWarning> iterator = this.iterator();
                    if (iterator != null) {
                        SysWarning oa = null;
                        while (iterator.hasNext()) {
                            oa = iterator.next();
                            if (rowKey.equals(oa.getId())) {
                                return oa;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysWarning> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysWarning oa = null;
//                        while (iterator.hasNext()) {
//                            oa = iterator.next();
//                            if (rowKey.equals(oa.getId())) {
//                                return oa;
//                            }
//                        }
//                    }
                    return sysWarningService.getSysWarning(rowKey);
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/UserMngController.java

@@ -548,7 +548,7 @@
                            }
                        }


                        selectedList = new ArrayList<>();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -557,17 +557,17 @@

                @Override
                public SysUser getRowData(String rowKey) {
                    Iterator<SysUser> iterator = this.iterator();
                    if (iterator != null) {
                        SysUser su = null;
                        while (iterator.hasNext()) {
                            su = iterator.next();
                            if (rowKey.equals(su.getId())) {
                                return su;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysUser> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysUser su = null;
//                        while (iterator.hasNext()) {
//                            su = iterator.next();
//                            if (rowKey.equals(su.getId())) {
//                                return su;
//                            }
//                        }
//                    }
                    return sysUserService.getSysUser(rowKey);
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/WarehouseContainerMngController.java

@@ -246,6 +246,7 @@
                            list = sysWarehouseContainerService.getSysWarehouseContainerList(warehouseType,
                                    warehouseName,null, first, pageSize);
                        }
                        selectedList = new ArrayList<>();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -254,17 +255,17 @@

                @Override
                public SysWarehouseContainer getRowData(String rowKey) {
                    Iterator<SysWarehouseContainer> iterator = this.iterator();
                    if (iterator != null) {
                        SysWarehouseContainer su = null;
                        while (iterator.hasNext()) {
                            su = iterator.next();
                            if (rowKey.equals(su.getId())) {
                                return su;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysWarehouseContainer> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysWarehouseContainer su = null;
//                        while (iterator.hasNext()) {
//                            su = iterator.next();
//                            if (rowKey.equals(su.getId())) {
//                                return su;
//                            }
//                        }
//                    }
                    return sysWarehouseContainerService.getSysWarehouseContainer(rowKey);
                }
            };
        }

 src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java

@@ -1,5 +1,6 @@
package com.nanometer.smartlab.controller;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -170,6 +171,7 @@
                        if (count > 0) {
                            list = sysWarehouseService.getSysWarehouseList(type, name, first, pageSize);
                        }
                        selectedList = new ArrayList<>();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -178,17 +180,17 @@

                @Override
                public SysWarehouse getRowData(String rowKey) {
                    Iterator<SysWarehouse> iterator = this.iterator();
                    if (iterator != null) {
                        SysWarehouse su = null;
                        while (iterator.hasNext()) {
                            su = iterator.next();
                            if (rowKey.equals(su.getId())) {
                                return su;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysWarehouse> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysWarehouse su = null;
//                        while (iterator.hasNext()) {
//                            su = iterator.next();
//                            if (rowKey.equals(su.getId())) {
//                                return su;
//                            }
//                        }
//                    }
                    return sysWarehouseService.getSysWarehouse(rowKey);
                }
            };
        }

 src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.java

@@ -31,4 +31,6 @@
    List<DangerousEncodeVo> selectByReagentName(@Param("reagentname") String reagentname, @Param("cas") String cas);

    DangerousEncode selectByName(@Param("reagentname") String reagentname);

    DangerousEncode selectById(@Param("id") Long id);
}

 src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml

@@ -344,4 +344,10 @@
          </if>
      </where>
  </select>
  <select id="selectById" resultType="com.nanometer.smartlab.entity.DangerousEncode">
    select
    <include refid="Base_Column_List" />
    from sys_dangerous_encode
    where id = #{id}
  </select>
</mapper>

 src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.java

@@ -46,4 +46,8 @@
    int getApplyInfoSize(Map params);

    int countOpeUseFlow(OpeUseFlow opeUseFlow);

    OpeUseFlow selectById(@Param("id") String id);

    OpeUseFlow selectByReceiptNumber(Map params);
}

 src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml

@@ -224,9 +224,6 @@
            and su.name like concat("%",#{applyPerson},"%")
        </if>
        group by ouf.receipt_number) a



    </select>
    <select id="selectPersonalUseInfo" resultType="com.nanometer.smartlab.entity.OpeUseFlow">
        SELECT ouf.receipt_number receiptNumber,
@@ -331,7 +328,39 @@
        and operatestate =#{operateState}
        and valid_flag = 1
    </select>

    <select id="selectById" resultType="com.nanometer.smartlab.entity.OpeUseFlow">
        select  *
        from ope_use_flow
        where id = #{id}
    </select>
    <select id="selectByReceiptNumber" resultType="com.nanometer.smartlab.entity.OpeUseFlow">
        SELECT ouf.receipt_number receiptNumber,
        count(ouf.reagent_code) applyNum,
        su.name username,
        su.project ,
        su.phone,
        bm1.meta_value department,
        sl.name laboratoryName,
        ouf.create_time createTime,
        ouf.house_id houseId
        FROM
        ope_use_flow  ouf
        LEFT JOIN sys_user su on su.id = ouf.user_id
        LEFT JOIN base_meta bm on bm.id = ouf.operatestate
        LEFT JOIN ope_reagent_status ors on ors.reagent_code = ouf.reagent_code
        LEFT JOIN sys_reagent sr on sr.id = ors.reagent_id
        left join base_meta bm1 on bm1.id = su.department
        left join sys_laboratory sl on sl.id = ouf.house_id
        <if test="userId !=null and userId != ''">
            LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
        </if>
        WHERE ouf.operatestate = #{operatestate}
        and   LENGTH(trim(ouf.receipt_number))>0
        and ouf.valid_flag = 1
        and ouf.receipt_number =  #{receiptNumber}
        group by ouf.receipt_number
        ORDER BY ouf.create_time desc
    </select>
    <insert id="insertOpeUseFlow" parameterType="com.nanometer.smartlab.entity.OpeUseFlow">
    insert into ope_use_flow(id, reagent_code, status, house_id, container_id, user_id, remainder, place, store_type, valid_flag, create_time, realstatus, operatestate
    <if test="receiptNumber != null">

 src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.java

@@ -13,4 +13,6 @@

    public List getSupplierList(Map params);
    public int updateDestoryFlagById(SupplierOrder supplierOrder);

    SupplierOrder selectById(String id);
}

 src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.xml

@@ -66,6 +66,34 @@
      limit #{first}, #{pageSize}
    </if>
  </select>
  <select id="selectById" resultType="com.nanometer.smartlab.entity.SupplierOrder">
    select oo.*,
    sr.name as reagentName, sr.cas as reagentCas, sr.reagent_type as reagentType, sr.reagent_character as reagentCharacter, sr.supplier_id as reagentSupplierId,
    sr.reagent_format as reagentFormat, sr.main_metering as reagentMainMetering, sr.reagent_unit as reagentUnit, oa.apply_price as reagentPrice, sr.per_box as reagentPerBox,
    sr.memo as reagentMemo, sr.valid_flag as reagentValidFlag, sr.create_time as reagentCreateTime, sr.update_time as reagentUpdateTime, sr.product_sn as reagentProductSn,
    sr.dangerous_flag as reagentDangerousFlag,
    ss.name as reagentSupplierName,
    (SELECT sum(c.num*c.apply_price) from ope_order a LEFT JOIN ope_apply_order b on a.id = b.ope_order_id
    LEFT JOIN ope_apply c on c.id =  b.ope_apply_id
    LEFT JOIN sys_reagent d on c.reagent_id = d.id where a.id = oo.id) as totlePrice,
    suApprove.`name` as approveUserName,
    sys.name as secondUserName,
    su.`name` as orderUserName,
    GROUP_CONCAT(oa.id) as Ids,
    GROUP_CONCAT(suApprove.`name`)as approveUserName,
    oa.first_user,fir.`name` firName,oa.before_approve_user_id
    from ope_order oo
    LEFT JOIN ope_apply_order oao on oo.id = oao.ope_order_id
    left join ope_apply as oa on oao.ope_apply_id = oa.id
    left join sys_reagent sr on oa.reagent_id = sr.id
    left join sys_supplier as ss on sr.supplier_id = ss.id
    left join sys_user as su on oa.apply_user_id = su.id
    left join sys_user as suApprove on oa.approve_user_id = suApprove.id
    left join sys_user as sys on sys.id=oa.before_approve_user_id
    left join sys_user fir on fir.id=oa.first_user
    where 1 = 1
    and oo.id = #{id}
  </select>

  <update id="updateDestoryFlagById" parameterType="com.nanometer.smartlab.entity.SupplierOrder">
    update ope_order set destory_flag=1 where id=#{id}

 src/main/java/com/nanometer/smartlab/service/DangerousEncodeService.java

@@ -31,4 +31,6 @@
    List<DangerousEncodeVo> selectByReagentName(String reagentname, String cas);

    DangerousEncode selectByName(String reagentname);

    DangerousEncode selectById(Long id);
}

 src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java

@@ -199,6 +199,11 @@
        return dangerousEncodeMapper.selectByName(reagentname);
    }

    @Override
    public DangerousEncode selectById(Long id) {
        return dangerousEncodeMapper.selectById(id);
    }


    @Override
    public void export2Excel(List<Map> list) throws Exception {

 src/main/java/com/nanometer/smartlab/service/HazardousWasteService.java

@@ -33,4 +33,6 @@
    void updateWaste(HazardousWaste hazardousWaste);

    List<HazardousWaste> setAllWasterCount(String starttime, String endtime, String status, String applyPerson);

    HazardousWaste selectById(Long id);
}

 src/main/java/com/nanometer/smartlab/service/HazardousWasteServiceImpl.java

@@ -167,4 +167,9 @@
        return hazardousWasteMapper.setAllWasterCount(starttime, endtime, status, applyPerson);
    }

    @Override
    public HazardousWaste selectById(Long id) {
        return hazardousWasteMapper.selectByPrimaryKey(id);
    }

}

 src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java

@@ -59,4 +59,8 @@
    int getOpeUseFlow(OpeUseFlow opeUseFlow);

    void scrapReagent(String reagentId,String reagentCode, String userId);

    OpeUseFlow selectById(String rowKey);

    OpeUseFlow selectByReceiptNumber(String receiptNumber,String userId);
}

 src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java

@@ -576,4 +576,27 @@

    }

    @Override
    public OpeUseFlow selectById(String id) {
        return opeUseFlowDao.selectById(id);
    }

    @Override
    public OpeUseFlow selectByReceiptNumber(String receiptNumber,String userId) {

        Map<String, Object> params = new HashMap<>();
        params.put("userId", userId);
        params.put("receiptNumber", receiptNumber);
        //操作状态位仓库领取
        Map<String, String> metaMap2 = new HashMap<>();
        metaMap2.put("groupId", "operate_status");
        metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
        List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
        params.put("operatestate", baseMetas.get(0).getId());

        addParamByUserId(userId, params);

        return opeUseFlowDao.selectByReceiptNumber(params);
    }

}

 src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderService.java

@@ -15,4 +15,5 @@

    public void updateDestoryFlagById(SupplierOrder supplierOrder);

    SupplierOrder selectById(String id);
}

 src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderServiceImpl.java

@@ -75,4 +75,9 @@
            throw new BusinessException(ExceptionEnumCode.DB_ERR, MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
        }
    }

    @Override
    public SupplierOrder selectById(String id) {
        return supplierOpeOrderDao.selectById(id);
    }
}