yxm
2024-07-08 8444e37fc4e1166c4af81d34dac2dc146a177c37
首页项目列表优化
3 files modified
14 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.java 2 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java 9 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.java
@@ -43,5 +43,7 @@
    List<SgStatistccVO> getSgdevices(@Param("code")String code,@Param("grad") String adGrad);
    String getname(String code);
    //List<String> getProjectIds(String code,@Param("grad") String grad );
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -223,6 +223,9 @@
        </if>
    Group By dict.CODE,dict."DICT_VALUE"
    </select>
    <select id="getname" resultType="java.lang.String">
        select DISTINCT  "bas_guid"  from SJZT_DW."dim_res_info_a" where "bas_name" = #{code}
    </select>
    <!--    <select id="getProjectIds" resultType="java.lang.String">-->
<!--    </select>-->
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -219,11 +219,12 @@
        //片区
        if (ywxtAdDetail == null){
            sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsZero(code);
            String getname = sgProjectInfoMapper.getname(code);
            sgStatisProVOS.forEach(s->{
                if (s.getCommenceNum() == 0) {
                    s.setProjectProgress("0%");
                    s.setPcode("420000000000");
                    s.setPname("湖北省");
                    s.setPcode(code);
                    s.setPname(getname);
                    s.setAdGrad("2");
                }else {
                    List<String> ids =  sgProjectInfoMapper.getProjectId("2",s.getCode());
@@ -238,8 +239,8 @@
                    BigDecimal reduce = bigDecimals.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
                    String bigDecimalPercent1 = getBigDecimalPercent(reduce.divide(BigDecimal.valueOf(s.getProjectSum()), 2, RoundingMode.HALF_UP));
                    s.setProjectProgress(s.getCommenceNum()==0?"0%": bigDecimalPercent1);
                    s.setPcode("420000000000");
                    s.setPname("湖北省");
                    s.setPcode(code);
                    s.setPname(getname);
                    s.setAdGrad("2");
                }});