更新

whycxzp

2023-05-17 a4b81abc5842e7e41bef684b8b6a84868112bf35

更新

 src/main/java/com/whyc/controller/BattdischargePlanController.java

@@ -91,9 +91,9 @@
    }

    @ApiOperation("获取年度放电任务量统计-管理")
    @GetMapping("planCount")
    public Response getPlanCount(){
        return service.getPlanCountWithGroupName();
    @GetMapping("planCountWithTotal")
    public Response getPlanCountWithTotal(){
        return service.getPlanCountWithTotal();
    }

}

 src/main/java/com/whyc/controller/FaultUploadController.java

@@ -23,7 +23,7 @@
    }

    @PutMapping("confirm")
    @ApiOperation("确认")
    @ApiOperation(value = "确认",notes = "属性status:-1-确认不属实,1-确认属实")
    public Response updateConfirm(@RequestBody FaultUpload fault){
        return service.updateConfirm(fault);
    }

 src/main/java/com/whyc/controller/KPIController.java

@@ -1,7 +1,11 @@
package com.whyc.controller;

import com.whyc.dto.Response;
import com.whyc.service.KPIService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -13,7 +17,13 @@
@Api(tags = "项目绩效考核")
public class KPIController {

    @Autowired
    private KPIService service;

    @GetMapping("annualDetail")
    @ApiOperation("年度工作考核明细")
    public Response annualDetail(){
        return service.annualDetail();
    }

}

 src/main/java/com/whyc/dto/KPIDetail.java

New file
@@ -0,0 +1,96 @@
package com.whyc.dto;

/**
 * 考核明细
 */
public class KPIDetail {
    //考核对象
    private String userName;
    //班组名
    private String groupName;
    //放电任务总数
    private Integer dischargePlanNumTotal;
    //放电任务完成数
    private Integer dischargePlanNumFinished;
    //故障上报总数
    private Integer faultUploadNumTotal;
    private Integer faultUploadNumFinished;
    //班组平均得分
    private Float groupAvgScore;
    //班组排名
    private Integer groupRank;
    //个人排名
    private Float personalScore;

    public String getUserName() {
        return userName;
    }

    public void setUserName(String userName) {
        this.userName = userName;
    }

    public String getGroupName() {
        return groupName;
    }

    public void setGroupName(String groupName) {
        this.groupName = groupName;
    }

    public Integer getDischargePlanNumTotal() {
        return dischargePlanNumTotal;
    }

    public void setDischargePlanNumTotal(Integer dischargePlanNumTotal) {
        this.dischargePlanNumTotal = dischargePlanNumTotal;
    }

    public Integer getDischargePlanNumFinished() {
        return dischargePlanNumFinished;
    }

    public void setDischargePlanNumFinished(Integer dischargePlanNumFinished) {
        this.dischargePlanNumFinished = dischargePlanNumFinished;
    }

    public Integer getFaultUploadNumTotal() {
        return faultUploadNumTotal;
    }

    public void setFaultUploadNumTotal(Integer faultUploadNumTotal) {
        this.faultUploadNumTotal = faultUploadNumTotal;
    }

    public Integer getFaultUploadNumFinished() {
        return faultUploadNumFinished;
    }

    public void setFaultUploadNumFinished(Integer faultUploadNumFinished) {
        this.faultUploadNumFinished = faultUploadNumFinished;
    }

    public Float getGroupAvgScore() {
        return groupAvgScore;
    }

    public void setGroupAvgScore(Float groupAvgScore) {
        this.groupAvgScore = groupAvgScore;
    }

    public Integer getGroupRank() {
        return groupRank;
    }

    public void setGroupRank(Integer groupRank) {
        this.groupRank = groupRank;
    }

    public Float getPersonalScore() {
        return personalScore;
    }

    public void setPersonalScore(Float personalScore) {
        this.personalScore = personalScore;
    }
}

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

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

    List<FaultUpload> getListWithGroupName();

}

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

@@ -454,7 +454,7 @@

    }

    public Response getPlanCountWithGroupName() {
    public Response getPlanCountWithTotal() {
        Map<String,Integer> resMap = new HashMap<>();
        resMap.put("放电任务总数",0);
        int total = 0;

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

@@ -33,6 +33,7 @@
        Date now = new Date();
        fault.setUploadUserId(userId);
        fault.setCreateTime(now);
        fault.setStatus(0);
        mapper.insert(fault);
        return new Response().setII(1,"上传完成");
    }
@@ -323,9 +324,9 @@
        int userId = ActionUtil.getUser().getUId().intValue();
        FaultUpload upload = new FaultUpload();
        List<FaultUpload> list = mapper.getList(userId, upload);
        List<FaultUpload> confirmedList = list.stream().filter(temp -> temp.getConfirmUserId() != null).collect(Collectors.toList());
        List<FaultUpload> confirmedList = list.stream().filter(temp -> temp.getStatus() == 1).collect(Collectors.toList());
        List<FaultUpload> myList = list.stream().filter(temp -> temp.getUploadUserId() == userId).collect(Collectors.toList());
        List<FaultUpload> myConfirmedList = myList.stream().filter(temp -> temp.getConfirmUserId() != null).collect(Collectors.toList());
        List<FaultUpload> myConfirmedList = myList.stream().filter(temp -> temp.getStatus() == 1).collect(Collectors.toList());

        //班组 上报总数,已确认数量
        map.put("groupUploadNum",list.size());
@@ -335,4 +336,13 @@
        map.put("myUploadConfirmedNum",myConfirmedList.size());
        return new Response().set(1,map);
    }

    public Response getUploadWithGroupName() {
        Map<String,Integer> map = new HashMap<>();
        int userId = ActionUtil.getUser().getUId().intValue();
        List<FaultUpload> list = mapper.getListWithGroupName();
        List<FaultUpload> confirmedList = list.stream().filter(temp -> temp.getStatus() == 1).collect(Collectors.toList());

        return null;
    }
}

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

@@ -1,7 +1,10 @@
package com.whyc.service;

import com.whyc.dto.Response;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Map;

@Service
public class KPIService {
@@ -13,5 +16,14 @@
    private FaultUploadService uploadService;


    public Response annualDetail() {
        //放电任务,班组
        Map<String, Map<String, Integer>> planCount = planService.getPlanCount();

        //隐患故障上报,个人
        Response myUploadStatusCount = uploadService.getUploadWithGroupName();


        return null;
    }
}

 src/main/resources/mapper/FaultUploadMapper.xml

@@ -90,4 +90,17 @@
                and db_user.tb_user_inf.uid = #{userId}
            )
    </select>
    <select id="getListWithGroupName" resultType="com.whyc.pojo.FaultUpload">
        SELECT distinct
            u.*,user.uName as upload_user_name,g.baoji_group_name as group_name
        FROM
            web_site.tb_fault_upload u,
            db_user.tb_user_battgroup_baojigroup_battgroup bb,
            db_user.tb_user_battgroup_baojigroup g,
            db_user.tb_user_inf user
        WHERE
            u.station_id = bb.StationId
        and bb.baoji_group_id = g.baoji_group_id
        and u.upload_user_id = user.uId
    </select>
</mapper>