修改申购查询

李宇

2021-07-08 a18c90522ead2e77a86bfda6d4a13c19243d6209

修改申购查询

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

@@ -475,7 +475,8 @@
                }else {
                    dataRow.createCell(22).setCellValue(String.valueOf(company.getMetaValue()));
                }

                dataRow.createCell(23).setCellValue(String.valueOf(dataList.get(i).getStatus().getText()));
                dataRow.createCell(24).setCellValue(String.valueOf(dataList.get(i).getOrderStatus().getText()));
            }

        return hssfWorkbook;
@@ -789,13 +790,12 @@
                    if( opeApply != null)
                    {
                        if(opeApply.getStockFlag()!=0){
                            SysUser user1=null;
                            if(opeApply.getBeforeApproveUserId()!=null&&!opeApply.getBeforeApproveUserId().equals("")){
                                user1=sysUserService.getSysUserForSuppllier(opeApply.getBeforeApproveUserId());
                            }else {
                                user1 = sysUserService.getSysUserForSuppllier(opeApply.getApproveUserId());
                            }

//                            SysUser user1=null;
//                            if(opeApply.getBeforeApproveUserId()!=null&&!opeApply.getBeforeApproveUserId().equals("")){
//                                user1=sysUserService.getSysUserForSuppllier(opeApply.getBeforeApproveUserId());
//                            }else {
//                                user1 = sysUserService.getSysUserForSuppllier(opeApply.getApproveUserId());
//                            }
                            //opeApply.setOwnerDepartment(user1.getDepartment());
                            //System projectUser=
                            opeApply.setOwnerDepartment(sysUserService.getSysUserForSuppllier(opeApply.getApplyUserId()).getDepartment());
@@ -832,6 +832,7 @@
                            {
                                tempMap.put(opeApply.getReagent().getId(), opeApply.getNum());
                            }
                            opeApply.setOrderStatus(order.getStatus());
                            realDataList.add(opeApply);
                        }

@@ -882,6 +883,8 @@
            headerList.add("申购人");
            headerList.add("部门");
            headerList.add("单位");
            headerList.add("申购单状态");
            headerList.add("订单状态");
            HSSFWorkbook hssfWorkbook =exportExcelNew(headerList, realDataList);
            hssfWorkbook.write(out);
            out.flush();

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

@@ -116,12 +116,9 @@
            and (oa.approve_user_id = #{searchApproval} or oa.before_approve_user_id = #{searchApproval})
        </if>

        <if test="applyUserName != null and applyUserName != ''">
            and su.name like #{applyUserName}
        </if>

        <if test="approvaUserName != null and approvaUserName != ''">
            and (suApprove.name like #{approvaUserName} or sys.name like #{approvaUserName})
            and (suApprove.name like concat('%',#{approvaUserName},'%')
            or sys.name like concat('%',#{approvaUserName},'%') )
        </if>

        <if test="editId != null and editId != ''">
@@ -177,7 +174,6 @@
      left join sys_user as fir on fir.id=oa.first_user
    left join base_meta as bm on sr.product_home = bm.id
    where oa.valid_flag = 1
      and sr.valid_flag = 1
    <include refid="queryWhereSql"/>
    order by oa.create_time desc
    <if test="first != null and pageSize != null">
@@ -195,7 +191,7 @@
      left join sys_user as sys on sys.id=oa.before_approve_user_id
      left join sys_user as fir on fir.id=oa.first_user
      left join base_meta as bm on sr.product_home = bm.id
      where oa.valid_flag = 1 and sr.valid_flag = 1
      where oa.valid_flag = 1
    <include refid="queryWhereSql"/>
  </select>


 src/main/java/com/nanometer/smartlab/entity/OpeApply.java

@@ -73,6 +73,8 @@

    private String secondUserName;

    private ApplyStatus orderStatus;

    public String getSecondUserName() {
        return secondUserName;
    }
@@ -402,4 +404,13 @@
        sb.append('}');
        return sb.toString();
    }


    public ApplyStatus getOrderStatus() {
        return orderStatus;
    }

    public void setOrderStatus(ApplyStatus orderStatus) {
        this.orderStatus = orderStatus;
    }
}