Merge remote-tracking branch 'origin/jtdev' into jtdev

gonglilong

2024-09-14 7f615dc1f37ccc9efd7f5b2f7e044c2e62f01074

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java

@@ -145,4 +145,9 @@
     */
    private List<String> childTypeList;

    /**
     * 部门ID
     */
    private String deptId;

}

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

@@ -5,16 +5,16 @@
    <select id="queryPageList" resultType="cn.gistack.sm.sg.VO.SgGxVO">
        select * from  YWXT.SG_GX gx where 1=1 and GX_TYPE not in('sgzb','sgys')
        <if test="dto.gxType != null and dto.gxType != ''">
            and gx.gx_type LIKE CONCAT('%', #{dto.gxType}, '%')
            and gx.gx_type  = #{dto.gxType}
            <if test="dto.childTypeList != null and !dto.childTypeList.isEmpty()">
                or gx.gx_type in
                <foreach collection="dto.childTypeList" open="(" close=")" separator="," item="id">
                    #{id}
                </foreach>
            </if>
        </if>
        <if test="dto.gxName != null and dto.gxName != ''">
            and gx.gx_name LIKE CONCAT('%', #{dto.gxName}, '%')
        </if>
        <if test="dto.childTypeList>0 and dto.childTypeList != null">
            and gx.gx_type in
            <foreach collection="dto.childTypeList" open="(" close=")" separator="," item="id">
                #{id}
            </foreach>
        </if>
    </select>
    <select id="queryStepByIds" resultType="cn.gistack.sm.sg.DO.SgGxStepDO">
@@ -33,6 +33,6 @@
        select * from  YWXT.SG_GX  where id = #{id}
    </select>
    <select id="childType" resultType="java.lang.String">
        select id from "YWXT"."BLADE_DICT_BIZ" where parent_id = (select id from "YWXT"."BLADE_DICT_BIZ" where dict_key = #{gxType});
        select dict_key from "YWXT"."BLADE_DICT_BIZ" where parent_id = (select id from "YWXT"."BLADE_DICT_BIZ" where dict_key = #{gxType});
    </select>
</mapper>

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

@@ -66,6 +66,9 @@
                #{id}
            </foreach>)
        </if>
        <if test="dto.deptId != null and dto.deptId !=''">
            and (info.control_unit = #{dto.deptId} or info.construction_unit = #{dto.deptId})
        </if>
       <if test="dto.projectSort == null">
            ORDER BY info.status desc ,info.project_progress desc NULLS LAST
        </if>
@@ -179,6 +182,9 @@
     </if>
     <if test="dto.buildStage != null and dto.buildStage != ''">
         and pro.build_stage like CONCAT(CONCAT('%',#{dto.buildStage}),'%')
     </if>
     <if test="dto.deptId != null and dto.deptId !=''">
         and (pro.control_unit = #{dto.deptId} or pro.construction_unit = #{dto.deptId})
     </if>
        ORDER BY pro.project_progress desc NULLS LAST
    </select>
@@ -353,7 +359,9 @@
        dria."county_cd" AS countyCode,
        att."guid" AS cityCode,
        ad."ad_code" AS provinceCode,
        pro.project_progress
        pro.project_progress,
        pro.control_unit,
        pro.construction_unit
        FROM
        ywxt.sg_project_info pro
        LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = pro.sk_id
@@ -377,6 +385,9 @@
        <if test="dto.buildStage != null and dto.buildStage != ''">
            and pro.build_stage like CONCAT(CONCAT('%',#{dto.buildStage}),'%')
        </if>
        <if test="dto.deptId != null and dto.deptId !=''">
            and (pro.control_unit = #{dto.deptId} or pro.construction_unit = #{dto.deptId})
        </if>
        order by pro.project_progress desc NULLS LAST
    </select>
    <select id="queryStepByProject1" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">

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

@@ -52,6 +52,7 @@
    public Object queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) {
        List<String> sgCodeS = getSgCodeByUser();
        searchDTO.setSgCodeS(sgCodeS);
        setDeptId(searchDTO);
        Boolean isPage = searchDTO.getIsPage();
        if (isPage==null) isPage = true;
        if (isPage ){
@@ -61,7 +62,7 @@
                Map<Long, String> progressMap = projectProgress.stream().filter(s->s.getProjectProgress()!=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
                sgProjectInfoDOS.forEach(s->{
                    s.setProjectProgress(progressMap.get(s.getId()));
                    setPercentage(s);
//                    setPercentage(s);
                });
            }
            return page.setRecords(sgProjectInfoDOS);
@@ -76,7 +77,7 @@
                Map<Long, String> progressMap = projectProgress.stream().filter(s->s.getProjectProgress()!=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
                sgProjectInfoDOS.forEach(s->{
                    s.setProjectProgress(progressMap.get(s.getId()));
                    setPercentage(s);
//                    setPercentage(s);
                });
            }
            sgProjectInfoDOS.forEach(s->{
@@ -120,10 +121,11 @@
     * @param s
     */
    private void setPercentage(SgProjectInfoDO s) {
        s.setSurfaceProgress(s.getSurfaceProgress()==null?null:s.getSurfaceProgress()+"%");
        s.setVideoProgress(s.getVideoProgress()==null?null:s.getVideoProgress()+"%");
        s.setTransProgress(s.getTransProgress()==null?null:s.getTransProgress()+"%");
        s.setSeepageProgress(s.getSeepageProgress()==null?null:s.getSeepageProgress()+"%");
        s.setSurfaceProgress(StringUtils.isNotBlank(s.getSurfaceProgress()) ?null:s.getSurfaceProgress()+"%");
        s.setVideoProgress(StringUtils.isNotBlank(s.getVideoProgress())?null:s.getVideoProgress()+"%");
        s.setTransProgress(StringUtils.isNotBlank(s.getTransProgress())?null:s.getTransProgress()+"%");
        s.setSeepageProgress(StringUtils.isNotBlank(s.getSeepageProgress())?null:s.getSeepageProgress()+"%");
        s.setProjectAddress(StringUtils.isNotBlank(s.getProjectProgress())?null:s.getProjectProgress()+"%");
    }

    /**
@@ -301,6 +303,7 @@
     */
    @Override
    public IPage<SgProjectInfoVO> progressPage(IPage<SgProjectInfoVO> page, ProjectSearchDTO searchDTO) {
        setDeptId(searchDTO);
        List<SgProjectInfoVO> list = new ArrayList<>();
            if(StringUtils.isNotBlank(searchDTO.getAdCode())){
                list =    sgProjectInfoMapper.progressList1(page, searchDTO);
@@ -334,7 +337,19 @@
    public List<SgProjectInfoDO> listAll(ProjectSearchDTO searchDTO) {
        List<String> sgCodeS = getSgCodeByUser();
        searchDTO.setSgCodeS(sgCodeS);
        setDeptId(searchDTO);
        return sgProjectInfoMapper.queryPageList(null,searchDTO);
    }

    /**
     * setDeptId
     * @param searchDTO
     */
    private  void setDeptId(ProjectSearchDTO searchDTO) {
        String deptId = AuthUtil.getDeptId();
        if (!deptId.equals("420000000000")){
            searchDTO.setDeptId(deptId);
        }
    }

    /**
@@ -394,13 +409,13 @@
                SgOperatingRateVO sVo = deviceTypes.get(vo.getProIds());
                if (Objects.nonNull(sVo)){
                    vo.setSurfaceNum(sVo.getSurfaceNum());
                    vo.setSurfaceProgress(sVo.getSurfaceProgress()==null?null:sVo.getSurfaceProgress()+"%");
                    vo.setSurfaceProgress(sVo.getSurfaceProgress());
                    vo.setVideoNum(sVo.getVideoNum());
                    vo.setVideoProgress(sVo.getVideoProgress()==null?null:sVo.getVideoProgress()+"%");
                    vo.setVideoProgress(sVo.getVideoProgress());
                    vo.setTransNum(sVo.getTransNum());
                    vo.setTransProgress(sVo.getTransProgress()==null?null:sVo.getTransProgress()+"%");
                    vo.setTransProgress(sVo.getTransProgress());
                    vo.setSeepageNum(sVo.getSeepageNum());
                    vo.setSeepageProgress(sVo.getSeepageProgress()==null?null:sVo.getSeepageProgress()+"%");
                    vo.setSeepageProgress(sVo.getSeepageProgress());
                }
            }
        }
@@ -595,7 +610,7 @@
        BigDecimal percentage = bigDecimal.multiply(new BigDecimal("100"));
        // 如果不需要保留小数位，可以设置一个scale为0
        BigDecimal percentageRounded = percentage.setScale(0, RoundingMode.HALF_UP);
        return percentageRounded.toString();
        return percentageRounded+"%";
    }

    @Override