zjh20250411

zjh

2025-04-11 46f0694ffeaee5168a77d8935784963a3f8ee7aa

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java

@@ -2,6 +2,7 @@

import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

@@ -61,7 +62,14 @@
        startPage();
        LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
        if (tjRules.getProId() != null) {
            wq.eq(TjRules::getProId, tjRules.getProId());
            List<TjProject> projects = projectService.getTjProjectListBySoneId(tjRules.getProId());
            if(null !=projects && !projects.isEmpty()){
                wq.and(w-> w.eq(TjRules::getProId, tjRules.getProId())
                        .or().in(TjRules::getProId,projects.stream().map(TjProject::getProId).collect(Collectors.toList())));
            }else {
                wq.eq(TjRules::getProId, tjRules.getProId());
            }

        }
        if (tjRules.getProName() != null) {
            wq.like(TjRules::getProName, tjRules.getProName());
@@ -217,30 +225,30 @@
        TjProject project = projectService.getById(proId);
        TjOrder order = orderService.getOrderByTjNum(tjNum);
        if(null !=project && null !=order){
        TjProject pproject = projectService.getById(project.getProParentId());
        List<Map<String, Object>> tjproGzJy = projectService.getTjproGzJy(tjNum, proId, keyNum, 0);
        if(null !=tjproGzJy && !tjproGzJy.isEmpty()){
            TjProject pproject = projectService.getById(project.getProParentId());
            List<Map<String, Object>> tjproGzJy = projectService.getTjproGzJy(tjNum, proId, keyNum, 0);
            if(null !=tjproGzJy && !tjproGzJy.isEmpty()){
//            proGzjyService.remove(new LambdaQueryWrapper<TjProGzjy>().eq(TjProGzjy::getProId,proId).eq(TjProGzjy::getTjNumber,tjNum));
            proGzjyService.deletedByTjNumAndProId(proId,tjNum);
            for (Map<String, Object> map : tjproGzJy) {
                Object bz = map.get("bz");
                Object bt = map.get("bt");
                Object nr = map.get("nr");
                TjProGzjy proGzjy=new TjProGzjy();
                proGzjy.setTjNumber(tjNum);
                proGzjy.setOrderId(order.getOrderId());
                proGzjy.setProId(Long.valueOf(proId));
                proGzjy.setProName(project.getProName());
                proGzjy.setProPrentId(project.getProParentId());
                proGzjy.setProPrentName(pproject.getProName());
                proGzjy.setProJgz(keyNum);
                if(null !=bz)proGzjy.setBz(bz.toString());
                if(null !=bt)proGzjy.setBt(bt.toString());
                if(null !=nr)proGzjy.setJy(nr.toString());
                proGzjyService.save(proGzjy);
                proGzjyService.deletedByTjNumAndProId(proId,tjNum);
                for (Map<String, Object> map : tjproGzJy) {
                    Object bz = map.get("bz");
                    Object bt = map.get("bt");
                    Object nr = map.get("nr");
                    TjProGzjy proGzjy=new TjProGzjy();
                    proGzjy.setTjNumber(tjNum);
                    proGzjy.setOrderId(order.getOrderId());
                    proGzjy.setProId(Long.valueOf(proId));
                    proGzjy.setProName(project.getProName());
                    proGzjy.setProPrentId(project.getProParentId());
                    proGzjy.setProPrentName(pproject.getProName());
                    proGzjy.setProJgz(keyNum);
                    if(null !=bz)proGzjy.setBz(bz.toString());
                    if(null !=bt)proGzjy.setBt(bt.toString());
                    if(null !=nr)proGzjy.setJy(nr.toString());
                    proGzjyService.save(proGzjy);
                }
            }
        }
        return AjaxResult.success(tjproGzJy);
            return AjaxResult.success(tjproGzJy);
        }
        return AjaxResult.success();
    }