湖北水库：审批修改

shenyijian

2024-09-10 9c00c5de75be77dfeb314a6fea96455af7cbf53e

湖北水库：审批修改

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java

@@ -181,7 +181,6 @@

    private Integer status;

    @TableField(exist = false)
    private String projectProgress;

    @TableField(exist = false)

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProjectTreeVO.java

@@ -10,9 +10,19 @@
@Data
public class SgProjectTreeVO {
    /**
     * 项目id
     * id
     */
    private String id;

    /**
     * 层级
     */
    private Integer level;

    /**
     * 片区
     */
    private String lot;

    /**
     * 省
@@ -29,6 +39,11 @@
    private String countyNm;

    /**
     * 乡镇
     */
    private String townNm;

    /**
     * 水库名
     */
    private String resNm;

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml

@@ -480,18 +480,39 @@
    </select>
    <select id="projectTree" resultType="cn.gistack.sm.sg.VO.SgProjectTreeVO">
        SELECT
            info.id,
            dria."city_nm",
            dria."province_nm",
            dria."county_nm",
            dria."res_nm"
<!--         TOP 200 -->
        info.id,
        info.lot,
        dria."province_nm",
        dria."city_nm",
        dria."county_nm",
        dria."town_nm",
        dria."res_nm"
        FROM
            YWXT.SG_PROJECT_INFO info
        YWXT.SG_PROJECT_INFO info
                LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = info.sk_id
        WHERE
            1 =1
        <if test="dto.buildStage != null and dto.buildStage != ''">
            and info.build_stage = #{dto.buildStage}
        </if>
        <if test="dto.sgCodeS != null and dto.sgCodeS.size > 0">
            and (dria."province_cd" in
            <foreach collection="dto.sgCodeS" item="id" separator="," open="(" close=")">
                #{id}
            </foreach>
            or dria."city_cd" in
            <foreach collection="dto.sgCodeS" item="id" separator="," open="(" close=")">
                #{id}
            </foreach>
            or dria."county_cd" in
            <foreach collection="dto.sgCodeS" item="id" separator="," open="(" close=")">
                #{id}
            </foreach>
            or dria."town_cd" in
            <foreach collection="dto.sgCodeS" item="id" separator="," open="(" close=")">
                #{id}
            </foreach>)
        </if>
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java

@@ -263,7 +263,7 @@
            .orderByAsc(SgReportUserDO::getApprovalOrder).list();
        //审批者
        SgReportUserDO sgReportUserDO = new SgReportUserDO();
        if (isReject==1 && sgProgressReportDO.getStatus().equals(2)){
        if (isReject==1){
            sgReportUserDO = sgReportUserDOS.get(0);
        }else {
            sgReportUserDO = sgReportUserDOS.stream().filter(s -> s.getUserId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get();
@@ -291,21 +291,16 @@

                }
            });
            cachedThreadPool.execute(new Runnable(){
                @Override
                public  void  run(){
                    Long proframId = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
                    setProgramProgress(proframId);
                }
            });
            Long projectID = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
            setProgramProgress(projectID);
        }
        }else {
            updateChainWrapper.set(SgProgressReportDO::getStatus,3);
            updateChainWrapper.set(SgProgressReportDO::getResubmit,0);
            userUpdate.set(SgReportUserDO::getApprovalStatus,2);
            /*if (isReject==1){
            if (isReject==1){
                userUpdate.set(SgReportUserDO::getUserId,userId);
            }*/
            }
            userUpdate.update();
            /*for (SgReportUserDO reportUserDO : sgReportUserDOS) {
                if (reportUserDO.getApprovalOrder()<=sgReportUserDO.getApprovalOrder()&&reportUserDO.getApprovalOrder()!=0){
@@ -343,12 +338,14 @@
     * @param proframId
     */
    public void setProgramProgress(Long proframId) {
        SgProjectInfoVO sgProjectInfoVO = sgProjectInfoMapper.selectVOById(proframId);
        List<SgProjectInfoDO> progress = sgProjectInfoService.getProjectProgress(Collections.singletonList(sgProjectInfoVO));
        ProjectSearchDTO searchDTO = new ProjectSearchDTO();
        searchDTO.setProjectId(String.valueOf(proframId));
        List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject(searchDTO);
        List<SgProjectInfoDO> progress = sgProjectInfoService.getProjectProgress(list);
        String projectProgress = progress.get(0).getProjectProgress();
        if (StringUtils.isNotBlank(projectProgress)){
            String s = projectProgress.substring(0, projectProgress.length() - 1);
            new LambdaUpdateChainWrapper<>(sgProjectInfoMapper).set(SgProjectInfoDO::getProjectProgress,s).update() ;
            new LambdaUpdateChainWrapper<>(sgProjectInfoMapper).set(SgProjectInfoDO::getProjectProgress,s).eq(SgProjectInfoDO::getId,proframId).update() ;
        }
    }
    private  void setReportUser(Date date, SgReportUserDO reportUserDO) {

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java

@@ -614,64 +614,85 @@

    @Override
    public List<SgProjectTreeVO> projectTree(ProjectSearchDTO dto) {
        List<String> sgCodeS = getSgCodeByUser();
        dto.setSgCodeS(sgCodeS);
        List<SgProjectTreeVO> list =     sgProjectInfoMapper.projectTree(dto);
        if (CollectionUtils.isNotEmpty(list)){
        // 按省、市、县分组
        Map<String, Map<String, Map<String, List<SgProjectTreeVO>>>> groupedProjects = list.stream()
            .collect(Collectors.groupingBy(SgProjectTreeVO::getProvinceNm,
                Collectors.groupingBy(SgProjectTreeVO::getCityNm,
                    Collectors.groupingBy(SgProjectTreeVO::getCountyNm))));

        // 构建树结构
        List<SgProjectTreeVO> result = new ArrayList<>();
        for (Map.Entry<String, Map<String, Map<String, List<SgProjectTreeVO>>>> provinceEntry : groupedProjects.entrySet()) {
            String province = provinceEntry.getKey();
            Map<String, Map<String, List<SgProjectTreeVO>>> cityMap = provinceEntry.getValue();

            SgProjectTreeVO provinceNode = new SgProjectTreeVO();
            provinceNode.setProvinceNm(province);
            provinceNode.setId(UUID.randomUUID().toString().replace("-",""));
            provinceNode.setRegionName(province);
            provinceNode.setChildList(new ArrayList<>());
            long provinceNum = 0;
            for (Map.Entry<String, Map<String, List<SgProjectTreeVO>>> cityEntry : cityMap.entrySet()) {
                String city = cityEntry.getKey();
                Map<String, List<SgProjectTreeVO>> countyMap = cityEntry.getValue();

                SgProjectTreeVO cityNode = new SgProjectTreeVO();
                List<String> cityIds = new ArrayList<>();
                cityNode.setCityNm(city);
                cityNode.setId(UUID.randomUUID().toString().replace("-",""));
                cityNode.setRegionName(city);
                cityNode.setChildList(new ArrayList<>());

                for (Map.Entry<String, List<SgProjectTreeVO>> countyEntry : countyMap.entrySet()) {
                    String county = countyEntry.getKey();
                    List<SgProjectTreeVO> countyProjects = countyEntry.getValue();
                    for (SgProjectTreeVO countyProject : countyProjects) {
                        countyProject.setRegionName(countyProject.getResNm());
            // 按省、片区、市、县、乡镇分组
            Map<String, Map<String, Map<String, Map<String, Map<String, List<SgProjectTreeVO>>>>>> groupedProjects = list.stream()
                .collect(
                    Collectors.groupingBy(SgProjectTreeVO::getProvinceNm,
                        Collectors.groupingBy(SgProjectTreeVO::getLot,
                            Collectors.groupingBy(SgProjectTreeVO::getCityNm,
                                Collectors.groupingBy(SgProjectTreeVO::getCountyNm,
                                    Collectors.groupingBy(SgProjectTreeVO::getTownNm
                                    ))))));
                List<SgProjectTreeVO> tree = new ArrayList<>();
                for (Map.Entry<String, Map<String, Map<String, Map<String, Map<String, List<SgProjectTreeVO>>>>>> provinceEntry : groupedProjects.entrySet()) {
                    SgProjectTreeVO provinceNode = new SgProjectTreeVO();
                    provinceNode.setProvinceNm(provinceEntry.getKey());
                    provinceNode.setRegionName(provinceEntry.getKey());
                    provinceNode.setId(UUID.randomUUID().toString().replace("-",""));
                    provinceNode.setLevel(1);
                    List<SgProjectTreeVO> provinceChildren = new ArrayList<>();
                    for (Map.Entry<String, Map<String, Map<String, Map<String, List<SgProjectTreeVO>>>>> lotEntry : provinceEntry.getValue().entrySet()) {
                        SgProjectTreeVO lotNode = new SgProjectTreeVO();
                        List<String> lotIds = new ArrayList<>();
                        lotNode.setLot(lotEntry.getKey());
                        lotNode.setRegionName(lotEntry.getKey());
                        lotNode.setId(UUID.randomUUID().toString().replace("-",""));
                        lotNode.setLevel(2);
                        List<SgProjectTreeVO> lotChildren = new ArrayList<>();
                        for (Map.Entry<String, Map<String, Map<String, List<SgProjectTreeVO>>>> cityEntry : lotEntry.getValue().entrySet()) {
                            SgProjectTreeVO cityNode = new SgProjectTreeVO();
                            List<String> cityIds = new ArrayList<>();
                            cityNode.setCityNm(cityEntry.getKey());
                            cityNode.setRegionName(cityEntry.getKey());
                            cityNode.setId(UUID.randomUUID().toString().replace("-",""));
                            cityNode.setLevel(3);
                            List<SgProjectTreeVO> cityChildren = new ArrayList<>();
                            for (Map.Entry<String, Map<String, List<SgProjectTreeVO>>> countyEntry : cityEntry.getValue().entrySet()) {
                                SgProjectTreeVO countyNode = new SgProjectTreeVO();
                                List<String> countyIds = new ArrayList<>();
                                countyNode.setCountyNm(countyEntry.getKey());
                                countyNode.setRegionName(countyEntry.getKey());
                                countyNode.setId(UUID.randomUUID().toString().replace("-",""));
                                countyNode.setLevel(4);
                                List<SgProjectTreeVO> countyChildren = new ArrayList<>();
                                for (Map.Entry<String, List<SgProjectTreeVO>> townEntry : countyEntry.getValue().entrySet()) {
                                    SgProjectTreeVO townNode = new SgProjectTreeVO();
                                    townNode.setTownNm(townEntry.getKey());
                                    townNode.setRegionName(townEntry.getKey());
                                    townNode.setChildList(townEntry.getValue());
                                    townNode.setChildNum((long) townEntry.getValue().size());
                                    townNode.setId(UUID.randomUUID().toString().replace("-",""));
                                    townNode.setLevel(5);
                                    townNode.setProjectIds(townEntry.getValue().stream().map(SgProjectTreeVO::getId).collect(Collectors.toList()));
                                    countyIds.addAll(townNode.getProjectIds());
                                    countyChildren.add(townNode);
                                }
                                countyNode.setChildNum(countyChildren.stream().mapToLong(SgProjectTreeVO::getChildNum).sum());
                                countyNode.setChildList(countyChildren);
                                countyNode.setProjectIds(countyIds);
                                cityIds.addAll(countyIds);
                                cityChildren.add(countyNode);
                            }
                            cityNode.setChildNum(cityChildren.stream().mapToLong(SgProjectTreeVO::getChildNum).sum());
                            cityNode.setChildList(cityChildren);
                            cityNode.setProjectIds(cityIds);
                            lotIds.addAll(cityIds);
                            lotChildren.add(cityNode);
                        }
                        lotNode.setChildNum(lotChildren.stream().mapToLong(SgProjectTreeVO::getChildNum).sum());
                        lotNode.setChildList(lotChildren);
                        lotNode.setProjectIds(lotIds);
                        provinceChildren.add(lotNode);
                    }
                    SgProjectTreeVO countyNode = new SgProjectTreeVO();
                    countyNode.setCountyNm(county);
                    countyNode.setRegionName(county);
                    countyNode.setId(UUID.randomUUID().toString().replace("-",""));
                    countyNode.setChildList(new ArrayList<>(countyProjects));
                    countyNode.setChildNum((long) countyProjects.size());
                    countyNode.setProjectIds(countyProjects.stream().map(SgProjectTreeVO::getId).collect(Collectors.toList()));
                    cityIds.addAll(countyNode.getProjectIds());
                    cityNode.getChildList().add(countyNode);
                    provinceNode.setChildNum(provinceChildren.stream().mapToLong(SgProjectTreeVO::getChildNum).sum());
                    provinceNode.setChildList(provinceChildren);
                    tree.add(provinceNode);
                }

                cityNode.setChildNum((long) cityIds.size());
                cityNode.setProjectIds(cityIds);
                provinceNode.getChildList().add(cityNode);
                provinceNum+= (long) cityIds.size();
            }

            provinceNode.setChildNum(provinceNum);
            result.add(provinceNode);
        }
        return result;
                return tree;
        }
        return new ArrayList<>();
    }