blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2024-06-07 2f640b1038fa331954f78ed1f4317212cf5bb34d 
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java


@@ -14,6 +14,7 @@


import com.example.erp.service.userInfo.SysErrorService;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.transaction.interceptor.TransactionAspectSupport;




import java.text.SimpleDateFormat;


@@ -23,6 +24,7 @@




@Service


@DS("pp")


@Transactional(rollbackFor = Exception.class)


public class ReworkService {


    @Autowired


    ReworkMapper reworkMapper;


@@ -39,11 +41,13 @@






        List<Map<String, Object>> ReworkMap =reworkMapper.getSelectRework(offset,pageSize);


        List<BasicDataProduce> basicDataProduceList=basicDateProduceMapper.SelectWorkBasicTeams();






        for (Map<String, Object> item:ReworkMap){


            item.put("reworkTeam","");


            List<BasicDataProduce> basicCategory=new ArrayList<>();




            List<BasicDataProduce> basicDataProduceList=basicDateProduceMapper.SelectWorkBasicTeams(item.get("reworkProcesses").toString());


            for (BasicDataProduce basicDataProduce:basicDataProduceList){


                if(Objects.equals(basicDataProduce.getBasicData().getBasicName(),item.get("reworkProcesses"))){


                    basicCategory.add(basicDataProduce);