低值易耗品管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
futian.liu
2023-12-02 edc87e2fc3760cd7d1230bc058acf5620ea2c465 
 consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java


@@ -10,7 +10,14 @@


import com.consum.base.pojo.LDeptFormScrappedParam;


import com.consum.base.pojo.query.LDeptFormScrappedQry;


import com.consum.base.pojo.response.DepFormScrappedExtendVo;


import com.consum.model.po.*;


import com.consum.model.po.BaseCategory;


import com.consum.model.po.DepFormScrapped;


import com.consum.model.po.DepFormScrappedGoods;


import com.consum.model.po.DepFormScrappedModel;


import com.consum.model.po.FinSysTenantDepartment;


import com.consum.model.po.FinSysTenantUser;


import com.consum.model.po.LWhFormTransfer;


import com.consum.model.po.SDictData;


import com.fasterxml.jackson.databind.ObjectMapper;


import com.iplatform.model.po.S_user_core;


import com.walker.db.page.GenericPager;


@@ -19,16 +26,15 @@


import com.walker.infrastructure.utils.StringUtils;


import com.walker.jdbc.service.BaseServiceImpl;


import com.walker.web.ResponseValue;


import org.springframework.beans.BeanUtils;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import javax.annotation.Resource;


import java.util.ArrayList;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.stream.Collectors;


import javax.annotation.Resource;


import org.springframework.beans.BeanUtils;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




/**


 * @ClassName DepFormScrappedServiceImpl


@@ -43,9 +49,9 @@


    @Resource


    private CodeGeneratorService codeGeneratorService;


    @Resource


    private FinSysTenantDepartmentServiceImpl departmentService;


    private FinSysTenantDepartmentService departmentService;


    @Resource


    private LWhFormTransferServiceImpl lWhFormTransferService;


    private LWhFormTransferService lWhFormTransferService;


    @Resource


    private BaseCategoryServiceImpl baseCategoryService;


    @Resource


@@ -85,7 +91,6 @@


            lDeptFormScrapped.setDepartmentId(sysInfo.getSysDeptId());


            lDeptFormScrapped.setDepartmentName(department.getName());


        }






        lDeptFormScrapped.setCreateTime(dealTime);


        lDeptFormScrapped.setStates(1);


@@ -255,10 +260,10 @@


            depFormScrappedModel.setDepFormScrappedGoodsId(scrappedGoodsId);


            List<DepFormScrappedModel> scrappedModelList = select(depFormScrappedModel);


            List<List<DepFormScrappedModel>> modelList = scrappedModelList.stream()


                    .collect(Collectors.groupingBy(DepFormScrappedModel::getBaseGoodsModelsId))


                    .values().stream()


                    .map(list -> list.stream().collect(Collectors.toList()))


                    .collect(Collectors.toList());


                .collect(Collectors.groupingBy(DepFormScrappedModel::getBaseGoodsModelsId))


                .values().stream()


                .map(list -> list.stream().collect(Collectors.toList()))


                .collect(Collectors.toList());




            scrappedGoodsMap.put("models", modelList);


            goodsList.add(scrappedGoodsMap);


@@ -285,6 +290,7 @@


        }


        return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());


    }




    public List<Map<String, Object>> listByModel(LDeptFormScrappedQry param) {


        HashMap<String, Object> paramts = new HashMap<>();


        StringBuilder sql = new StringBuilder(EXPORT_SQL);


@@ -299,7 +305,7 @@


            paramts.put("businessFormCode", param.getBusinessFormCode());


        }


        //物品名称


        if (StringUtils.isNotEmpty(param.getGoodsTemplateName())){


        if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {


            sql.append(" and model.BASE_GOODS_TEMPLATE_NAME LIKE :goodsTemplateName ");


            paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);


        }