update icon

kongzy

2023-11-01 dd8795a2675e32b25abe98f644f80d5f72fadb90

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

@@ -11,8 +11,10 @@
import com.hazelcast.core.IFunction;
import com.nanometer.smartlab.dao.*;
import com.nanometer.smartlab.entity.*;
import com.nanometer.smartlab.entity.dto.OpeUseFlowQueryDto;
import com.nanometer.smartlab.entity.dto.PersonUseDetail;
import com.nanometer.smartlab.entity.enumtype.OperateStatus;
import com.nanometer.smartlab.model.CommonPage;
import com.nanometer.smartlab.util.Constants;
import com.nanometer.smartlab.util.ExcelUtils;
import org.apache.commons.lang.StringUtils;
@@ -189,6 +191,50 @@
        }
    }

    public CommonPage<OpeUseFlow> getOpeUseFlowSimpleInfoList(Integer pageNum, Integer pageSize, OpeUseFlowQueryDto opeUseFlowQueryDto) {
        CommonPage commonPage=new CommonPage();
        Map<String, Object> params = new HashMap<String, Object>();
        if(pageNum==null||pageNum<1){
            pageNum=1;
        }
        if(pageSize==null||pageSize<1){
            pageSize=10;
        }
        if(pageSize>50){
            pageSize=50;//每页最多查询50条记录
        }
        commonPage.setPageNum(pageNum);
        commonPage.setPageSize(pageSize);

        params.put("reagentName", opeUseFlowQueryDto.getReagentName());
        if (StringUtils.isNotBlank(opeUseFlowQueryDto.getReagentCode())) {
            params.put("reagentCode", "%" + opeUseFlowQueryDto.getReagentCode() + "%");
        }
        SimpleDateFormat sdfstart = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
        SimpleDateFormat sdfend = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
        Date now = new Date();
        Calendar cal = Calendar.getInstance();
        cal.setTime(now);
        cal.add(Calendar.DATE, -7);
        Date startTime = cal.getTime();
        params.put("startDate",opeUseFlowQueryDto.getStartDate()!=null?opeUseFlowQueryDto.getStartDate():sdfstart.format(startTime));
        params.put("endDate",opeUseFlowQueryDto.getEndDate()!=null?opeUseFlowQueryDto.getEndDate():sdfend.format(now));

        params.put("houseName", opeUseFlowQueryDto.getHouseName());
        params.put("operatestate", opeUseFlowQueryDto.getOperatestate());
        params.put("containerCode", opeUseFlowQueryDto.getContainerCode());

        params.put("first", (pageNum-1)*pageSize);
        params.put("pageSize", pageSize);

        Long total= new Long(this.opeUseFlowDao.getOpeUseFlowTotalCount(params));
        commonPage.setTotalPage(CommonPage.getTotalPage(total,pageSize));
        commonPage.setTotal(total);
        List<OpeUseFlow> opeUseFlows= this.opeUseFlowDao.getOpeUseFlowSimpleInfoList(params);
        commonPage.setList(opeUseFlows);
        return commonPage;
    }

    @Transactional(propagation = Propagation.REQUIRED)
    public int getOpeUseFlowTotalCountByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId,Date startDate,Date endDate,String operatestate) {
        try {