bug修改 和页面调整

gdg

2020-12-31 836986e000c23a66897953e1cdbbffe5fd2e47ca

bug修改
和页面调整

 src/main/java/com/nanometer/smartlab/api/ApiAction.java

@@ -11,6 +11,7 @@
import com.nanometer.smartlab.dao.SysLaboratoryContainerDao;
import com.nanometer.smartlab.dao.SysWarehouseContainerDao;
import com.nanometer.smartlab.entity.*;
import com.nanometer.smartlab.entity.dto.HazardousWasteUser;
import com.nanometer.smartlab.entity.dto.InWarehouseInfoDto;
import com.nanometer.smartlab.entity.dto.ReagentReceivingDto;
import com.nanometer.smartlab.entity.dto.SysWarehouseDto;
@@ -23,10 +24,7 @@
import com.nanometer.smartlab.exception.ExceptionEnumCode;
import com.nanometer.smartlab.model.ResponseModel;
import com.nanometer.smartlab.service.*;
import com.nanometer.smartlab.util.Constants;
import com.nanometer.smartlab.util.FacesUtils;
import com.nanometer.smartlab.util.IDUtils;
import com.nanometer.smartlab.util.MessageUtil;
import com.nanometer.smartlab.util.*;

import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
@@ -339,6 +337,7 @@
            retJSON.put("code", e.getApiStatus().getRetCode());
            retJSON.put("message", e.getErrorMessage());
        } catch (Exception e) {
            e.printStackTrace();
            retJSON.put("code", ApiStatus.SYS_ERR.getRetCode());
            StackTraceElement[] stackTraceElements = e.getStackTrace();

@@ -545,9 +544,15 @@
            map.put("reagentType", opeReagentStatus.getReagent().getReagentType());
            map.put("deadline", opeReagentStatus.getReagent().getDeadline());
            map.put("specification", opeReagentStatus.getReagent().getReagentFormat());
            map.put("masterMetering", opeReagentStatus.getReagent().getMainMetering());
            map.put("itemNumber", opeReagentStatus.getReagent().getReagentType());
            map.put("producer", opeReagentStatus.getReagent().getProductHome());
            map.put("articleNumber", opeReagentStatus.getArticleNumber());
            if (opeReagentStatus.getReagent().getMainMetering() == null){
                map.put("masterMetering",opeReagentStatus.getReagent().getReagentUnit());
            }else{
                map.put("masterMetering", opeReagentStatus.getReagent().getMainMetering());
            }

        }
        logger.info("getReagentInfo end...");
        return ResponseModel.getOkInstence(datalist);
@@ -1354,5 +1359,39 @@

    }

    /**
     * @Description: 危废登录
     * @date 2020/12/29 14:13
     */
    @ResponseBody
    @RequestMapping("hazardousWaste/login")
    public Object hazardousWaste(@RequestBody HazardousWasteUser user) {

        try {
            String account = user.getAccount();
            if (StringUtils.isBlank(account)){
                return  ResponseModel.getErrInstance("账户名为空");
            }

            SysUser sysUser = sysUserService.getUserByAccount(account);
            if (sysUser == null){
                return  ResponseModel.getErrInstance("账户名不存在");
            }else{
                if (sysUser.getPassword().equals(MD5Utils.encode(user.getPassword()))){
                    user.setId(sysUser.getId());
                    user.setRoleName(sysUser.getRoleName());
                    return ResponseModel.getOkInstence(user);
                }else{
                    return ResponseModel.getErrInstance("密码错误");
                }
            }

        }catch (Exception e){
            e.printStackTrace();
            logger.info(e);
            return ResponseModel.getErrInstance("系统出错");
        }

    }

}

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

@@ -174,11 +174,15 @@
  </select>

    <select id="getOpeReagentStatusInfoList" parameterType="java.util.Map"  resultMap="OpeReagentStatus">
        select s.id ,name,cas, deadline,reagent_code,bm3.meta_value reagent_format,r.main_metering,bm1.meta_value reagent_type,bm2.meta_value product_home from ope_reagent_status s
        select s.id ,name,cas, deadline,reagent_code,bm3.meta_value reagent_format,r.main_metering,bm1.meta_value reagent_type,bm2.meta_value product_home,
        bm4.meta_value reagent_unit,
        s.article_number
        from ope_reagent_status s
        left join sys_reagent r on r.id = s.reagent_id
        left join base_meta bm1 on bm1.id = r.reagent_type
        left join base_meta bm2 on bm2.id = r.product_home
        left join base_meta bm3 on bm3.id = r.reagent_format
        left join base_meta bm4 on bm4.id = r.reagent_unit
        where s.update_time >= #{startTime} and #{endTime} > s.update_time
        <if test="containerid != null">
              and s.container_id = #{containerid}

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

@@ -1261,6 +1261,10 @@
                    logger.error("The containerCode has not been exists!");
                }
            }
            //-1 状态
            if (status.equals(-1)){
                continue;
            }
             opeReagentStatusDao.syncOpeReagentStatus(params);

         }

 src/main/webapp/personal_use_info.xhtml

@@ -113,9 +113,9 @@
                    <h:outputText value="#{row.articleNumber}"></h:outputText>
                </p:column>

                <p:column headerText="残存量">
                    <h:outputText value="#{row.remainder}"></h:outputText>
                </p:column>
<!--                <p:column headerText="残存量">-->
<!--                    <h:outputText value="#{row.remainder}"></h:outputText>-->
<!--                </p:column>-->

                <p:column headerText="申领人">
                    <h:outputText value="#{row.userName}" />

 src/main/webapp/reagent_user_flow_info.xhtml

@@ -54,8 +54,7 @@
                    <h:outputText value="#{row.operatestateName}" />
                </p:column>
                <p:column headerText="残存量">
                    <h:outputText value="#{row.remainder == null?'':''.concat(row.remainder).concat(sysReagentService.getReagentUnitByReagentId(row.reagent.id))}" rendered="#{row.operatestateName eq '仓库领用' ||row.operatestateName eq '仓库入库' }"/>
                    <h:outputText value="#{row.remainder == null?'':''.concat(row.remainder).concat('g')}" rendered="#{ row.operatestateName ne '仓库领用' and row.operatestateName ne '仓库入库' }"/>
                    <h:outputText value="#{row.remainder == null?'':row.remainder}"/>
                </p:column>