目标fix

songhuangfeng123

2022-08-12 6d0b2b2d93eab87b246c05a2a217ab16357e5f01

目标fix

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java

@@ -1,5 +1,5 @@
package com.gkhy.safePlatform.targetDuty.controller;
import java.util.Date;
import java.util.*;
import java.sql.Timestamp;


@@ -8,12 +8,16 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.targetDuty.entity.ExamineItem;
import com.gkhy.safePlatform.targetDuty.entity.TargetExamine;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
import com.gkhy.safePlatform.targetDuty.model.dto.req.ExamineTemplateSaveOrUpdate;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetExamineSaveOrUpdate;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.ExamineTemplateDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetExamineDivideDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetExamineDto;
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.TargetExamineService;
import com.gkhy.safePlatform.targetDuty.service.TargetMngService;
import com.google.common.collect.Lists;
@@ -25,11 +29,9 @@
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetExamineQueryCriteria;

import java.util.Arrays;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;

/**
 * (TargetExamine)表控制层
@@ -48,6 +50,9 @@
    @Resource
    private TargetMngService targetMngService;

    @Resource
    private CommonService commonService;

    /**
     * 通过主键查询单条数据
     *
@@ -64,7 +69,26 @@

        TargetExamineQueryCriteria criteria = new TargetExamineQueryCriteria();
        criteria.setTargetId(targetId);
        dto.setExamineList(this.targetExamineService.queryAll(criteria));

        List<TargetExamineDivideDto> respList = BeanCopyUtils.copyBeanList(this.targetExamineService.queryAll(criteria), TargetExamineDivideDto.class);


        // --------------------------- 获取部门信息-----------------------
        //收集所用到的部门ID
        Set<Long> collectDepIdSet = new HashSet();
        respList.forEach(f->{
            collectDepIdSet.add(f.getDutyDepartmentId());
            collectDepIdSet.add(f.getMakerDepartmentId());
        });
        //获取部门名集合
        Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);

        respList.forEach(f->{
            f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
            f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId()));
        });

        dto.setExamineList(respList);
        dto.setId(targetMng.getId());
        dto.setIndexNum(targetMng.getIndexNum());
        dto.setqName(targetMng.getqName());

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
@@ -10,6 +11,7 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.targetDuty.entity.TargetDivideDetail;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetCheckAndSubmitQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetMngImportExcel;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetMngQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetMngExcel;
@@ -20,6 +22,7 @@
import com.gkhy.safePlatform.targetDuty.utils.poihelper.ExcelUtil;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -69,7 +72,7 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少targetType");
        }
        PageUtils.checkCheck(pageQuery);
        return this.targetMngService.queryAll(pageQuery);
        return this.targetMngService.queryAll(pageQuery);
    }
    

@@ -205,6 +208,24 @@
    }



    /**
     * 分页查询所有数据 -- 【目标检查上报页面】使用
     *
     * @param pageQuery 查询实体
     * @return 所有数据
     */
    @PostMapping(value = "/checkAndSubimt/list")
    public ResultVO list(Authentication authentication, @RequestBody PageQuery<TargetCheckAndSubmitQueryCriteria> pageQuery){
        if(pageQuery.getSearchParams().getTargetType() == null){
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少targetType");
        }
        PageUtils.checkCheck(pageQuery);
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return this.targetMngService.queryAll(currentUser.getUid(),pageQuery);
    }


    public static void main(String[] args) {
        TargetMng mng = new TargetMng();
        mng.setqName("12");

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java

@@ -1,18 +1,17 @@
package com.gkhy.safePlatform.targetDuty.entity;

import java.sql.Timestamp;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;

/**
 * (TargetExamine)表实体类
 * 安全目标考核(TargetExamine)表实体类
 *
 * @author xurui
 * @since 2022-07-22 09:30:01
 * @since 2022-08-12 08:07:53
 */
@SuppressWarnings("serial")
@TableName("target_examine")
@@ -30,7 +29,7 @@
    }

                //关联的目标指标/外键
    private Long targetId;
            private Long targetId;
        
    public Long getTargetId() {
        return targetId;
@@ -40,7 +39,7 @@
        this.targetId = targetId;
    }
                //责任部门id/外键
    private Long dutyDepartmentId;
            private Long dutyDepartmentId;
        
    public Long getDutyDepartmentId() {
        return dutyDepartmentId;
@@ -50,7 +49,7 @@
        this.dutyDepartmentId = dutyDepartmentId;
    }
                //考核指标
    private String examineValue;
            private String examineValue;
        
    public String getExamineValue() {
        return examineValue;
@@ -59,8 +58,8 @@
    public void setExamineValue(String examineValue) {
        this.examineValue = examineValue;
    }
                //制定部门/外键
    private Long makerDepartmentId;
                //制定部门id/外键
            private Long makerDepartmentId;
        
    public Long getMakerDepartmentId() {
        return makerDepartmentId;
@@ -70,8 +69,8 @@
        this.makerDepartmentId = makerDepartmentId;
    }
                //制定日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp makeDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp makeDate;
        
    public Timestamp getMakeDate() {
        return makeDate;
@@ -81,7 +80,7 @@
        this.makeDate = makeDate;
    }
                //上报值
    private String uploadValue;
            private String uploadValue;
        
    public String getUploadValue() {
        return uploadValue;
@@ -91,8 +90,8 @@
        this.uploadValue = uploadValue;
    }
                //上报时间
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp uploadDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp uploadDate;
        
    public Timestamp getUploadDate() {
        return uploadDate;
@@ -102,7 +101,7 @@
        this.uploadDate = uploadDate;
    }
                //考核结果 1:合格 2：不合格
    private Integer examineResult;
            private Integer examineResult;
        
    public Integer getExamineResult() {
        return examineResult;
@@ -112,7 +111,7 @@
        this.examineResult = examineResult;
    }
                //考核人ID/外键
    private Long examinePersonId;
            private Long examinePersonId;
        
    public Long getExaminePersonId() {
        return examinePersonId;
@@ -121,9 +120,19 @@
    public void setExaminePersonId(Long examinePersonId) {
        this.examinePersonId = examinePersonId;
    }
                //考核人名称
            private String examinePersonName;
        
    public String getExaminePersonName() {
        return examinePersonName;
    }

    public void setExaminePersonName(String examinePersonName) {
        this.examinePersonName = examinePersonName;
    }
                //考核时间
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp examineDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp examineDate;
        
    public Timestamp getExamineDate() {
        return examineDate;

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetCheckAndSubmitQueryCriteria.java

对比新文件
@@ -0,0 +1,63 @@
package com.gkhy.safePlatform.targetDuty.model.dto.req;

import com.gkhy.safePlatform.targetDuty.annotation.Query;

public class TargetCheckAndSubmitQueryCriteria {
    //安全目标指标
    @Query(type = Query.Type.INNER_LIKE)
    private String qName;
    //目标指标编号    
    @Query(type = Query.Type.INNER_LIKE)
    private String indexNum;
    //指标类型 1:年指标 2:月指标
    @Query()
    private Integer targetType;
    //分解状态 1:已分解 2:未分解
    @Query()
    private Integer divideStatus;
    //关联业务类型 1:目标检查 2:目标上报
    private Integer relateType;

    public Integer getRelateType() {
        return relateType;
    }

    public void setRelateType(Integer relateType) {
        this.relateType = relateType;
    }

    public Integer getDivideStatus() {
        return divideStatus;
    }

    public void setDivideStatus(Integer divideStatus) {
        this.divideStatus = divideStatus;
    }

    //安全目标指标

    public String getqName() {
        return qName;
    }

    public void setqName(String qName) {
        this.qName = qName;
    }

    //目标指标编号
    public String getIndexNum() {
        return indexNum;
    }

    public void setIndexNum(String indexNum) {
        this.indexNum = indexNum;
    }
    //指标类型 1:年指标 2:月指标
    public Integer getTargetType() {
        return targetType;
    }

    public void setTargetType(Integer targetType) {
        this.targetType = targetType;
    }
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/CurrentExamineDto.java

@@ -16,6 +16,16 @@
    private String content;
    //本次得分
    private String number;
    //评定标准
    private String judgeStandard;

    public String getJudgeStandard() {
        return judgeStandard;
    }

    public void setJudgeStandard(String judgeStandard) {
        this.judgeStandard = judgeStandard;
    }

    public Long getId() {
        return id;

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetCheckAndSubmitDto.java

对比新文件
@@ -0,0 +1,174 @@
package com.gkhy.safePlatform.targetDuty.model.dto.resp;

import java.io.Serializable;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;

public class TargetCheckAndSubmitDto implements Serializable {

    // 最新的审批id
    private Long approveId;

    public Long getApproveId() {
        return approveId;
    }

    public void setApproveId(Long approveId) {
        this.approveId = approveId;
    }

    // 最新的审批状态
    private Integer approveStatus;

    // 最新的审批人
    private Long approvePersonId;

    // 审批人是否为当前登录人
    private Boolean checkApprove;

    public Integer getApproveStatus() {
        return approveStatus;
    }

    public void setApproveStatus(Integer approveStatus) {
        this.approveStatus = approveStatus;
    }

    public Long getApprovePersonId() {
        return approvePersonId;
    }

    public void setApprovePersonId(Long approvePersonId) {
        this.approvePersonId = approvePersonId;
    }

    public Boolean getCheckApprove() {
        return checkApprove;
    }

    public void setCheckApprove(Boolean checkApprove) {
        this.checkApprove = checkApprove;
    }

    private Long id;
    //安全目标指标    
    private String qName;
    //目标指标编号    
    private String indexNum;
    //年度    
    private String year;
    //指标值    
    private String value;
    //指标级别 1:公司级 2:部门分厂级 3:工段班组级    
    private Integer level;
    //完成期限    
    private Timestamp completeDate;
    //备注信息    
    private String memo;
    //指标类型 1:年指标 2:月指标    
    private Integer targetType;
    //分解状态 1:已分解 2:未分解    
    private Integer divideStatus;
        
    private Timestamp createTime;
        
    private Timestamp updateTime;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public String getqName() {
        return qName;
    }

    public void setqName(String qName) {
        this.qName = qName;
    }

    //目标指标编号
    public String getIndexNum() {
        return indexNum;
    }

    public void setIndexNum(String indexNum) {
        this.indexNum = indexNum;
    }
    //年度        
    public String getYear() {
        return year;
    }

    public void setYear(String year) {
        this.year = year;
    }
    //指标值        
    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }
    //指标级别 1:公司级 2:部门分厂级 3:工段班组级        
    public Integer getLevel() {
        return level;
    }

    public void setLevel(Integer level) {
        this.level = level;
    }
    //完成期限        
    public Timestamp getCompleteDate() {
        return completeDate;
    }

    public void setCompleteDate(Timestamp completeDate) {
        this.completeDate = completeDate;
    }
    //备注信息        
    public String getMemo() {
        return memo;
    }

    public void setMemo(String memo) {
        this.memo = memo;
    }
    //指标类型 1:年指标 2:月指标        
    public Integer getTargetType() {
        return targetType;
    }

    public void setTargetType(Integer targetType) {
        this.targetType = targetType;
    }
    //分解状态 1:已分解 2:未分解        
    public Integer getDivideStatus() {
        return divideStatus;
    }

    public void setDivideStatus(Integer divideStatus) {
        this.divideStatus = divideStatus;
    }
            
    public Timestamp getCreateTime() {
        return createTime;
    }

    public void setCreateTime(Timestamp createTime) {
        this.createTime = createTime;
    }
            
    public Timestamp getUpdateTime() {
        return updateTime;
    }

    public void setUpdateTime(Timestamp updateTime) {
        this.updateTime = updateTime;
    }
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetExamineDivideDto.java

对比新文件
@@ -0,0 +1,162 @@
package com.gkhy.safePlatform.targetDuty.model.dto.resp;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.TargetExamine;

import java.io.Serializable;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;

public class TargetExamineDivideDto implements Serializable {

    @TableId(type = IdType.AUTO)
    private Long id;
    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    //关联的目标指标/外键
    private Long targetId;

    public Long getTargetId() {
        return targetId;
    }

    public void setTargetId(Long targetId) {
        this.targetId = targetId;
    }
    //责任部门id/外键
    private Long dutyDepartmentId;

    public Long getDutyDepartmentId() {
        return dutyDepartmentId;
    }

    public void setDutyDepartmentId(Long dutyDepartmentId) {
        this.dutyDepartmentId = dutyDepartmentId;
    }

    //责任部门名称
    private String dutyDepartmentName;

    //考核指标
    private String examineValue;

    public String getExamineValue() {
        return examineValue;
    }

    public void setExamineValue(String examineValue) {
        this.examineValue = examineValue;
    }
    //制定部门id/外键
    private Long makerDepartmentId;

    public Long getMakerDepartmentId() {
        return makerDepartmentId;
    }

    public void setMakerDepartmentId(Long makerDepartmentId) {
        this.makerDepartmentId = makerDepartmentId;
    }

    //制定部门名称
    private String makerDepartmentName;

    //制定日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp makeDate;

    public Timestamp getMakeDate() {
        return makeDate;
    }

    public void setMakeDate(Timestamp makeDate) {
        this.makeDate = makeDate;
    }
    //上报值
    private String uploadValue;

    public String getUploadValue() {
        return uploadValue;
    }

    public void setUploadValue(String uploadValue) {
        this.uploadValue = uploadValue;
    }
    //上报时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp uploadDate;

    public Timestamp getUploadDate() {
        return uploadDate;
    }

    public void setUploadDate(Timestamp uploadDate) {
        this.uploadDate = uploadDate;
    }
    //考核结果 1:合格 2：不合格
    private Integer examineResult;

    public Integer getExamineResult() {
        return examineResult;
    }

    public void setExamineResult(Integer examineResult) {
        this.examineResult = examineResult;
    }
    //考核人ID/外键
    private Long examinePersonId;

    public Long getExaminePersonId() {
        return examinePersonId;
    }

    public void setExaminePersonId(Long examinePersonId) {
        this.examinePersonId = examinePersonId;
    }
    //考核人名称
    private String examinePersonName;

    public String getExaminePersonName() {
        return examinePersonName;
    }

    public void setExaminePersonName(String examinePersonName) {
        this.examinePersonName = examinePersonName;
    }
    //考核时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp examineDate;

    public Timestamp getExamineDate() {
        return examineDate;
    }

    public void setExamineDate(Timestamp examineDate) {
        this.examineDate = examineDate;
    }

    public String getDutyDepartmentName() {
        return dutyDepartmentName;
    }

    public void setDutyDepartmentName(String dutyDepartmentName) {
        this.dutyDepartmentName = dutyDepartmentName;
    }

    public String getMakerDepartmentName() {
        return makerDepartmentName;
    }

    public void setMakerDepartmentName(String makerDepartmentName) {
        this.makerDepartmentName = makerDepartmentName;
    }
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetExamineDto.java

@@ -18,7 +18,7 @@
    //指标值
    private String value;
    //关联的考核数据列表
    private List<TargetExamine> examineList = new ArrayList<>();
    private List<TargetExamineDivideDto> examineList = new ArrayList<>();

    public Long getId() {
        return id;
@@ -60,11 +60,11 @@
        this.value = value;
    }

    public List<TargetExamine> getExamineList() {
    public List<TargetExamineDivideDto> getExamineList() {
        return examineList;
    }

    public void setExamineList(List<TargetExamine> examineList) {
    public void setExamineList(List<TargetExamineDivideDto> examineList) {
        this.examineList = examineList;
    }
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/RewardPunishmentDetailRepository.java

@@ -1,6 +1,5 @@
package com.gkhy.safePlatform.targetDuty.repository;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.gkhy.safePlatform.targetDuty.entity.RewardPunishmentDetail;
@@ -28,7 +27,7 @@
    @Select("<script> select a.id,a.person_id,a.person_name,a.create_time ,a.memo,b.standard_type ,b.content ,b.q_name ,b.reason " +
            "from reward_punishment_detail a left join reward_punishment_standard b on a.reward_punishment_standard_id=b.id  where 1=1  " +
            "<if test =\"personId !='' and personId !=null\">and find_in_set( #{personId}, a.person_id )</if> </script> ")
    List<RewardPunishmentDetail> queryAll( @Param("personId")String personId);
    List<RewardPunishmentDetail> queryAll(@Param("personId") String personId);


//    @Select("<script> select a.id,a.person_id,a.person_name,a.create_time ,a.memo,b.standard_type ,b.content ,b.q_name ,b.reason " +

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/TargetDutyWorkApproveRepository.java

@@ -19,6 +19,6 @@

    @Select("<script> select c.duty_department_id,c.value,c.maker_department_id,c.make_date,a.relate_desc,a.gmt_create " +
            "from target_duty_work_approve a INNER JOIN target_divide_detail c on a.relate_id = c.target_id  where 1=1  " +
            "AND a.approve_status = 3 AND a.approve_result = 1 AND a.relate_type = 1 AND a.del_flag = 0 AND a.relate_id =#{relateId}  ORDER BY a.gmt_create DESC </script> ")
            "AND a.child_id is null AND a.approve_status = 3 AND a.approve_result = 1 AND a.relate_type = 1 AND a.del_flag = 0 AND a.relate_id =#{relateId}  ORDER BY a.gmt_create DESC </script> ")
    IPage<ListCheckDataDto> listCheckData(IPage<ListCheckDataDto> page, @Param("relateId") Long relateId);
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetMngService.java

@@ -4,6 +4,7 @@
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetCheckAndSubmitQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetMngQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetMngDto;

@@ -23,4 +24,6 @@
    List<TargetMng> queryAll(TargetMngQueryCriteria criteria);

    Object selectOne(Serializable id);

    ResultVO queryAll(Long uid, PageQuery<TargetCheckAndSubmitQueryCriteria> pageQuery);
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java

@@ -82,6 +82,28 @@
            f.setBeExaminedDepartmentName(depNameMap.get(f.getBeExaminedDepartmentId()));
        });

        //获取打分明细
        respList.forEach(dto->{
            List<CurrentExamineDto> list = JSONObject.parseArray( dto.getNumberDetailJson(), CurrentExamineDto.class);
            List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList());

            List<ExamineItem> itemList = examineItemRepository.selectBatchIds(idList);
            Map<Long,ExamineItem> itemMap = itemList.stream().collect(
                    Collectors.toMap(ExamineItem::getId, Function.identity(),(k1, k2)->k1));

            if(itemMap != null){
                list.forEach(f->{
                    ExamineItem item = itemMap.get(f.getId());
                    if(item != null){
                        f.setItemDetail(item.getItemDetail());
                        f.setContent(item.getContent());
                        f.setJudgeStandard(item.getJudgeStandard());
                    }
                });
            }
            dto.setCurrentExamineDtoList(list);
        });

        return new SearchResultVO<>(
                true,
                pageIndex,
@@ -124,6 +146,7 @@
                if(item != null){
                    f.setItemDetail(item.getItemDetail());
                    f.setContent(item.getContent());
                    f.setJudgeStandard(item.getJudgeStandard());
                }
            });
        }

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java

@@ -80,6 +80,12 @@
            f.setSetPersonDepartmentName(depNameMap.get(f.getSetPersonDepartmentId()));
        });

        //获取考核项目明细
        respList.forEach(f->{
            List<ExamineItem> list = examineItemRepository.selectList(new QueryWrapper<ExamineItem>().eq("examine_template_id",f.getId()));
            f.setExamineItemList(list);
        });


        return new SearchResultVO<>(
                true,

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDutyWorkApproveServiceImpl.java

@@ -51,7 +51,7 @@
        IPage<TargetDutyWorkApprove> page = new Page<>(pageIndex, pageSize);

        QueryWrapper queryWrapper = QueryHelpPlus.getPredicate(TargetDutyWorkApprove.class, pageQuery.getSearchParams());
        queryWrapper.eq("delFlag","0");
        queryWrapper.eq("del_flag","0");
        page = baseMapper.selectPage(page,queryWrapper);
        List<TargetDutyWorkApproveDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetDutyWorkApproveDto.class);


 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java

@@ -1,13 +1,20 @@
package com.gkhy.safePlatform.targetDuty.service.impl;
import java.sql.Timestamp;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepInfoRPCRespDTO;
import com.gkhy.safePlatform.targetDuty.entity.ExamineItem;
import com.gkhy.safePlatform.targetDuty.entity.TargetDutyWorkApprove;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetCheckAndSubmitQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetDivideDetailQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetCheckAndSubmitDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetDivideDetailDto;
import com.gkhy.safePlatform.targetDuty.repository.TargetDutyWorkApproveRepository;
import com.gkhy.safePlatform.targetDuty.repository.TargetMngRepository;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
import com.gkhy.safePlatform.targetDuty.service.CommonService;
@@ -23,6 +30,7 @@
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetMngDto;
import com.gkhy.safePlatform.targetDuty.utils.QueryHelpPlus;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.io.Serializable;
@@ -44,8 +52,11 @@
    private TargetDivideDetailService targetDivideDetailService;

    @Resource
    private TargetDutyWorkApproveRepository targetDutyWorkApproveRepository;

    @Resource
    private CommonService commonService;
	

    @Override
    public ResultVO queryAll(PageQuery<TargetMngQueryCriteria> pageQuery) {
        Long pageIndex = pageQuery.getPageIndex();
@@ -55,6 +66,30 @@
        page = baseMapper.selectPage(page,
                QueryHelpPlus.getPredicate(TargetMng.class, pageQuery.getSearchParams()));
        List<TargetMngDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetMngDto.class);
        respList.forEach(dto->{
            //查询关联分解信息
            TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
            criteria.setTargetId(dto.getId());
            List<TargetDivideDetailDto> respList1 = BeanCopyUtils.copyBeanList(targetDivideDetailService.queryAll(criteria), TargetDivideDetailDto.class);

            // --------------------------- 获取部门信息-----------------------
            //收集所用到的部门ID
            Set<Long> collectDepIdSet = new HashSet();
            respList1.forEach(f->{
                collectDepIdSet.add(f.getDutyDepartmentId());
                collectDepIdSet.add(f.getMakerDepartmentId());
            });
            //获取部门名集合
            Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);

            respList1.forEach(f->{
                f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
                f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId()));
            });


            dto.setTargetDivideDetailList(respList1);
        });

        return new SearchResultVO<>(
                true,
@@ -105,5 +140,44 @@
        return targetMngDto;
    }

    @Override
    public ResultVO queryAll(Long uid, PageQuery<TargetCheckAndSubmitQueryCriteria> pageQuery) {
        Long pageIndex = pageQuery.getPageIndex();
        Long pageSize = pageQuery.getPageSize();
        Page<TargetMng> page = new Page<>(pageIndex, pageSize);

}
        page = baseMapper.selectPage(page,
                QueryHelpPlus.getPredicate(TargetMng.class, pageQuery.getSearchParams()));
        List<TargetCheckAndSubmitDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetCheckAndSubmitDto.class);

        // 判断审批人
        respList.forEach(dto->{
            List<TargetDutyWorkApprove> list = targetDutyWorkApproveRepository.selectList(
                    new QueryWrapper<TargetDutyWorkApprove>().eq("del_flag",0)
                            .eq("relate_type",pageQuery.getSearchParams().getTargetType())
                            .eq("relate_id",dto.getId())
                            .orderByDesc("sort"));

            if (!CollectionUtils.isEmpty(list)) {
                dto.setApproveId(list.get(0).getId());
                dto.setApproveStatus(list.get(0).getApproveStatus());
                dto.setApprovePersonId(list.get(0).getApprovePersonId());
                // 审批中  判断审批人是否人与当前登录人
                if (dto.getApproveStatus()!=null && dto.getApproveStatus()==2){
                    dto.setCheckApprove(dto.getApprovePersonId().equals(uid));
                }
            }
        });

        return new SearchResultVO<>(
                true,
                pageIndex,
                pageSize,page.getPages(),
                page.getTotal(),
                respList,
                ResultCodes.OK
        );
    }


}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java

@@ -9,6 +9,16 @@

public class AccidentReportDetailRespDTO {

    private List<AccidentExpressFileRespDTO> expressFileList;

    public List<AccidentExpressFileRespDTO> getExpressFileList() {
        return expressFileList;
    }

    public void setExpressFileList(List<AccidentExpressFileRespDTO> expressFileList) {
        this.expressFileList = expressFileList;
    }

    private Integer status;

    public Integer getStatus() {

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java

@@ -14,15 +14,13 @@
import com.gkhy.safePlatform.incidentManage.exception.AccidentException;
import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentReportFileReqDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentReportReqDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportCountRespDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportDetailRespDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportFileRespDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportPageRespDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.*;
import com.gkhy.safePlatform.incidentManage.query.AccidentReportQuery;
import com.gkhy.safePlatform.incidentManage.query.AccidentReportRPCQuery;
import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportDBQuery;
import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportRPCDBQuery;
import com.gkhy.safePlatform.incidentManage.service.AccidentReportService;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentExpressFileInfoService;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentExpressInfoService;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentReportFileInfoService;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentReportInfoService;
@@ -51,6 +49,9 @@

    @Autowired
    private AccidentExpressInfoService accidentExpressInfoService;

    @Autowired
    private AccidentExpressFileInfoService accidentExpressFileInfoService;


    @Override
@@ -140,12 +141,20 @@
            throw new AccidentException(AccidentResultCodes.ACCIDENT_REPORT_NOT_EXIST);
        } else {
            BeanUtils.copyProperties(AccidentReportInfoDetailDO, AccidentReportDetailRespDTO);
            //查找对应的附件
            //查找事故报告对应的附件
            List<AccidentReportFileInfoDO> AccidentReportFileInfoDOList = accidentReportFileInfoService.selectByAccidentReportId(id);
            if (!CollectionUtils.isEmpty(AccidentReportFileInfoDOList)) {
                List<AccidentReportFileRespDTO> accidentReportFileRespDTOList = BeanCopyUtils.copyBeanList(AccidentReportFileInfoDOList, AccidentReportFileRespDTO.class);
                AccidentReportDetailRespDTO.setFileList(accidentReportFileRespDTOList);
            }
            //  查找事故快报对应的附件
            List<AccidentExpressFileInfoDO> AccidentExpressFileInfoDOList = accidentExpressFileInfoService.selectByAccidentExpressId(AccidentReportDetailRespDTO.getAccidentExpressId());
            if (!CollectionUtils.isEmpty(AccidentExpressFileInfoDOList)) {
                List<AccidentExpressFileRespDTO> accidentExpressFileRespDTOList = BeanCopyUtils.copyBeanList(AccidentExpressFileInfoDOList, AccidentExpressFileRespDTO.class);
                AccidentReportDetailRespDTO.setExpressFileList(accidentExpressFileRespDTOList);
            }


            return new ResultVO<>(ResultCodes.OK, AccidentReportDetailRespDTO);
        }
    }