申购：管制品 搜索

lyfO_o

2021-09-16 0dfab938c5116c8fa0191cadf36a47f5bb4f2936

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

@@ -69,9 +69,9 @@
   private SysUserService sysUserService;

    @Transactional(propagation = Propagation.REQUIRED)
    public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
    public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline, String controlProduct,Timestamp endDeadline, Integer status,
                                          String applyUserId, String approveUserId, String queryCas,
                                          Integer first, Integer pageSize,String applyCode,String applyUserName) {
                                          Integer first, Integer pageSize,String applyCode,String applyUserName,Byte isShow) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            if (StringUtils.isNotBlank(reagentName)) {
@@ -80,6 +80,8 @@
            params.put("startDeadline", startDeadline);
            params.put("endDeadline", endDeadline);
            params.put("status", status);
            params.put("isShow", isShow);
            params.put("controlProduct", controlProduct);

            if (StringUtils.isNotBlank(applyUserId)) {
             SysUser sysUser = sysUserService.getSysUser(applyUserId);
@@ -191,8 +193,8 @@
    }

    @Transactional(propagation = Propagation.REQUIRED)
    public int getOpeApplyTotalCount(String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
                                     String applyUserId, String approveUserId, String queryCas,String applyCode,String applyUserName) {
    public int getOpeApplyTotalCount(String reagentName, Timestamp startDeadline,String controlProduct, Timestamp endDeadline, Integer status,
                                     String applyUserId, String approveUserId, String queryCas,String applyCode,String applyUserName,Byte isShow) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            if (StringUtils.isNotBlank(reagentName)) {
@@ -201,6 +203,8 @@
            params.put("startDeadline", startDeadline);
            params.put("endDeadline", endDeadline);
            params.put("status", status);
            params.put("isShow", isShow);
            params.put("controlProduct", controlProduct);

          if (StringUtils.isNotBlank(applyUserId)) {
             SysUser sysUser = sysUserService.getSysUser(applyUserId);
@@ -863,7 +867,7 @@
                //申购数量
                opeApply.setNum(num);
                //申购人
                opeApply.setApplyUserId(user.getId());
                opeApply.setApplyUserId(applyUser.getId());
                //选择的审批人
                opeApply.setApproveUserId(approveUser.getId());
                //选择的课题组信息