更新

whycxzp

2023-05-18 7f5f4a07599abf2f80e1e4620eedb2ad7fc3e43c

更新

 src/main/java/com/whyc/mapper/FaultUploadMapper.java

@@ -10,6 +10,6 @@
    List<FaultUpload> getList(int userId,FaultUpload upload);
    List<FaultUpload> getList2(int userId,FaultUpload upload);

    List<FaultUpload> getListWithGroupName();
    List<FaultUpload> getListWithGroupName(int userId);

}

 src/main/java/com/whyc/service/FaultUploadService.java

@@ -335,7 +335,7 @@
        Map<String,FaultUpload> resMap = new HashMap<>();

        int userId = ActionUtil.getUser().getUId().intValue();
        List<FaultUpload> list = mapper.getListWithGroupName();
        List<FaultUpload> list = mapper.getListWithGroupName(userId);
        Map<String, List<FaultUpload>> userListMap = list.stream().collect(Collectors.groupingBy(FaultUpload::getUploadUserName));
        Set<String> userNameSet = userListMap.keySet();
        for (String userName : userNameSet) {

 src/main/java/com/whyc/service/KPIService.java

@@ -45,6 +45,10 @@
                KPIDetail detail = new KPIDetail();
                detail.setUserName(userInf.getUName());
                detail.setGroupName(baoJiGroupName);
                detail.setDischargePlanNumTotal(0);
                detail.setDischargePlanNumFinished(0);
                detail.setFaultUploadNumTotal(0);
                detail.setFaultUploadNumFinished(0);
                kpiDetails.add(detail);
            }
        }
@@ -94,15 +98,22 @@
            String dischargePlanScoreStr = (String) MathUtil.divide(dischargePlanNumFinished, dischargePlanNumTotal, 2, 4);
            float dischargePlanScore = Float.parseFloat(dischargePlanScoreStr);

            float faultUploadScore = faultUploadNumTotal * 0.3f + (Float) MathUtil.divide(faultUploadNumFinished, faultUploadNumTotal, 1, 3) * 70f;
            float faultUploadDivideFloat = 0f;
            Object faultUploadDivide = MathUtil.divide(faultUploadNumFinished, faultUploadNumTotal, 1, 3);
            if (faultUploadDivide instanceof Double){
                faultUploadDivideFloat = ((Double) faultUploadDivide).floatValue();
            }else{
                faultUploadDivideFloat = (float)faultUploadDivide;
            }
            float faultUploadScore = MathUtil.multiply(faultUploadNumTotal , 0.3f,2) + MathUtil.multiply(faultUploadDivideFloat,70f,2);

            float personalScore = dischargePlanScore * 0.4f + faultUploadScore * 0.6f;
            float personalScore = MathUtil.multiply(dischargePlanScore,0.4f,2) + MathUtil.multiply(faultUploadScore,0.6f,2);
            kpiDetail.setPersonalScore(personalScore);

        }



        return null;
        return new Response().set(1,kpiDetails);
    }
}

 src/main/java/com/whyc/service/WorkflowMainService.java

@@ -135,6 +135,13 @@
    public Response<PageInfo<WorkflowMain>> ownListPage(int userId, int type, int status, int pageNum, int pageSize) {
        PageHelper.startPage(pageNum,pageSize);
        List<WorkflowMain> mains = getOwnListByUserAndType(userId,type,status);
        if(type == 1) {
            for (WorkflowMain main : mains) {
                Integer id = main.getId();
                List<BattDischargePlanTemp> tempList = tempService.getListByMainId(id);
                main.setTempList(tempList);
            }
        }
        PageInfo<WorkflowMain> pageInfo = new PageInfo<>(mains);
        return new Response<PageInfo<WorkflowMain>>().set(1,pageInfo);
    }
@@ -157,6 +164,13 @@
    public Response<PageInfo<WorkflowMain>> getReceivedListPage(int type, int status, UserInf user, int pageNum, int pageSize) {
        PageHelper.startPage(pageNum,pageSize);
        List<WorkflowMain> mains = getReceivedListByUserAndType(user,type,status);
        if (type == 1) {
            for (WorkflowMain main : mains) {
                Integer id = main.getId();
                List<BattDischargePlanTemp> tempList = tempService.getListByMainId(id);
                main.setTempList(tempList);
            }
        }
        PageInfo<WorkflowMain> pageInfo = new PageInfo<>(mains);
        return new Response<PageInfo<WorkflowMain>>().set(1,pageInfo);
    }

 src/main/java/com/whyc/util/MathUtil.java

@@ -91,6 +91,10 @@
        }
    }

    public static float multiply(float num,float num2,int scale){
        return BigDecimal.valueOf(num).multiply(BigDecimal.valueOf(num2)).setScale(2,RoundingMode.HALF_UP).floatValue();
    }

    /**
     * 求自变量X,因变量Y的线性回归 @PerryHsu
     * y = ax+b

 src/main/resources/mapper/BattdischargePlanMapper.xml

@@ -177,6 +177,7 @@
        WHERE
            plan.battgroupid = baoJiGroupBattGroup.BattGroupId
        AND baoJiGroupBattGroup.baoji_group_id = baoJiGroup.baoji_group_id
        AND baoJiGroup.discharge_plan_flag = 1
        AND plan.BattGroupId in (select distinct db_battinf.tb_battinf.BattGroupId
                          from db_battinf.tb_battinf,
                               db_user.tb_user_battgroup_baojigroup_battgroup,

 src/main/resources/mapper/FaultUploadMapper.xml

@@ -102,5 +102,17 @@
            u.station_id = bb.StationId
        and bb.baoji_group_id = g.baoji_group_id
        and u.upload_user_id = user.uId
        and g.discharge_plan_flag = 1
        and station_id in
        (
            select distinct stationId
            from db_user.tb_user_battgroup_baojigroup_battgroup
            , db_user.tb_user_battgroup_baojigroup_usr
            , db_user.tb_user_inf
            where db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id =
            db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
            and db_user.tb_user_inf.uid = db_user.tb_user_battgroup_baojigroup_usr.uid
            and db_user.tb_user_inf.uid = #{userId}
        )
    </select>
</mapper>