查询岗检排名列表

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostAssessmentRatingOtherController.java

@@ -173,6 +173,26 @@ public class PostAssessmentRatingOtherController extends BaseController {
     @Log(title = "打分表(职能互评生产日常)", businessType = BusinessType.INSERT)
     @PostMapping("/batchAddRatingOther")
     public AjaxResult batchAddRatingOther(@RequestBody PostAssessmentRatingOther postAssessmentRatingOther) {
+        postAssessmentRatingOther.setDeptId(getDeptId());
         return toAjax(postAssessmentRatingOtherService.batchAddRatingOther(postAssessmentRatingOther));
     }
+
+
+
+
+    @ApiOperation("职能互评表打分提交")
+    @PreAuthorize("@ss.hasPermi('postCheck:postAssessmentRatingOther:update')")
+    @Log(title = "职能互评表打分提交", businessType = BusinessType.UPDATE)
+    @PostMapping("/functionalDepartmentSub")
+    public AjaxResult functionalDepartmentSub(@RequestBody PostAssessmentRatingOther postAssessmentRatingOther) {
+        return toAjax(postAssessmentRatingOtherService.batchAddRatingOtherUpdate(postAssessmentRatingOther));
+    }
+
+    @ApiOperation("生产部门日常得分")
+    @PreAuthorize("@ss.hasPermi('postCheck:postAssessmentRatingOther:update')")
+    @Log(title = "生产部门日常得分", businessType = BusinessType.UPDATE)
+    @PostMapping("/productionDepartmentSub")
+    public AjaxResult productionDepartmentSub(@RequestBody List<PostAssessmentRatingOther> postAssessmentRatingOther) {
+        return toAjax(postAssessmentRatingOtherService.productionDepartmentSub(postAssessmentRatingOther));
+    }
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostAssessmentRatingOther.java

@@ -5,6 +5,8 @@ import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -26,6 +28,8 @@ import lombok.EqualsAndHashCode;
 @Data
 @ApiModel(value = "打分表(职能互评生产日常)对象")
 @TableName("post_assessment_rating_other") // 数据库表名
+@AllArgsConstructor
+@NoArgsConstructor
 public class PostAssessmentRatingOther extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -81,6 +85,6 @@ public class PostAssessmentRatingOther extends BaseEntity
 
     @ApiModelProperty("明细表集合")
     @TableField(exist = false)
-    private List<PostAssessmentRatingOtherInfo> children = new ArrayList<>();
+    private List<PostAssessmentRatingOtherInfo> children;
 
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostAssessmentRatingOtherInfo.java

@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.ruoyi.postCheck.domain.tools.PostAssessmentRatingOtherInfoDept;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -26,7 +28,9 @@ import lombok.EqualsAndHashCode;
 @Data
 @ApiModel(value = "打分表明细(职能互评生产日常)对象")
 @TableName("post_assessment_rating_other_info") // 数据库表名
-public class PostAssessmentRatingOtherInfo extends BaseEntity
+@AllArgsConstructor
+@NoArgsConstructor
+public class    PostAssessmentRatingOtherInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -75,6 +79,6 @@ public class PostAssessmentRatingOtherInfo extends BaseEntity
 
     @ApiModelProperty("打分表明细里面放的为各个部门的评分结果")
     @TableField(exist = false)
-    private List<PostAssessmentRatingOtherInfoDept> children = new ArrayList<>();
+    private List<PostAssessmentRatingOtherInfoDept> children;
 
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/tools/PostAssessmentRatingOtherInfoDept.java

@@ -6,8 +6,10 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -21,12 +23,14 @@ import java.math.BigDecimal;
 
 @Data
 @ApiModel(value = "打分表明细里面放的为各个部门的评分结果")
+@NoArgsConstructor
 public class PostAssessmentRatingOtherInfoDept implements Serializable {
 
 
 //    public PostAssessmentRatingOtherInfoDept(Long ratingOtherInfoId, Long byDeptId, String byDeptName, BigDecimal byDeptScore) {
-    public PostAssessmentRatingOtherInfoDept( Long byDeptId, String byDeptName, BigDecimal byDeptScore) {
+    public PostAssessmentRatingOtherInfoDept( Long id,Long byDeptId, String byDeptName, BigDecimal byDeptScore) {
 //        this.ratingOtherInfoId = ratingOtherInfoId;
+        this.id = id;
         this.byDeptId = byDeptId;
         this.byDeptName = byDeptName;
         this.byDeptScore = byDeptScore;
@@ -41,6 +45,8 @@ public class PostAssessmentRatingOtherInfoDept implements Serializable {
 //    private Integer dutyType;
 
     @ApiModelProperty("被评分部门ID")
+    private Long id;
+    @ApiModelProperty("被评分部门ID")
     private Long byDeptId;
 
     @ApiModelProperty("被评分部门名称")

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/mapper/PostAssessmentRatingOtherMapper.java

@@ -1,6 +1,8 @@
 package com.ruoyi.postCheck.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.postCheck.domain.PostAssessmentRatingOther;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -28,6 +30,10 @@ public interface PostAssessmentRatingOtherMapper extends BaseMapper<PostAssessme
      */
     public List<PostAssessmentRatingOther> selectPostAssessmentRatingOtherList(PostAssessmentRatingOther postAssessmentRatingOther);
 
+
+
+    public List<PostAssessmentRatingOther> selectPostAssessmentRatingOtherListGroup(PostAssessmentRatingOther postAssessmentRatingOther);
+
     /**
      * 新增打分表(职能互评生产日常)
      *
@@ -59,4 +65,10 @@ public interface PostAssessmentRatingOtherMapper extends BaseMapper<PostAssessme
      * @return 结果
      */
     public int deletePostAssessmentRatingOtherByIds(Long[] ids);
+
+
+    List<Long> getDeptIdList(Long id);
+
+    List<Map<String,String>> getDeptIdListByType(Integer type);
+
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/mapper/PostCheckedProblemMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.postCheck.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 import com.ruoyi.postCheck.domain.PostCheckedProblem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -59,4 +60,6 @@ public interface PostCheckedProblemMapper extends BaseMapper<PostCheckedProblem>
      * @return 结果
      */
     public int deletePostCheckedProblemByIds(Long[] ids);
+
+    BigDecimal getPostTotalByDeptId(Long deptId);
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostAssessmentRatingOtherService.java

@@ -67,4 +67,8 @@ public interface IPostAssessmentRatingOtherService extends IService<PostAssessme
      * @return
      */
     int batchAddRatingOther(PostAssessmentRatingOther postAssessmentRatingOther);
+
+    int batchAddRatingOtherUpdate(PostAssessmentRatingOther postAssessmentRatingOther);
+
+    int productionDepartmentSub(List<PostAssessmentRatingOther> postAssessmentRatingOther);
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostAssessmentRatingOtherServiceImpl.java

@@ -1,27 +1,39 @@
 package com.ruoyi.postCheck.service.impl;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.constant.PostAssessmentRatingOtherEnum;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.postCheck.domain.PostAssessmentRatingOther;
 import com.ruoyi.postCheck.domain.PostAssessmentRatingOtherInfo;
+import com.ruoyi.postCheck.domain.PostAssessmentRules;
 import com.ruoyi.postCheck.domain.tools.PostAssessmentRatingOtherInfoDept;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import com.ruoyi.postCheck.mapper.PostAssessmentRatingMapper;
+import com.ruoyi.postCheck.mapper.PostAssessmentRatingOtherInfoMapper;
 import com.ruoyi.postCheck.mapper.PostAssessmentRatingOtherMapper;
-import com.ruoyi.postCheck.domain.PostAssessmentRatingOther;
+import com.ruoyi.postCheck.mapper.PostAssessmentRulesMapper;
 import com.ruoyi.postCheck.service.IPostAssessmentRatingOtherService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+
+
+
+
+
+
+
+
+
 /**
  * 打分表(职能互评生产日常)Service业务层处理
  *
@@ -31,6 +43,12 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class PostAssessmentRatingOtherServiceImpl extends ServiceImpl<PostAssessmentRatingOtherMapper, PostAssessmentRatingOther> implements IPostAssessmentRatingOtherService {
     @Autowired
+    private PostAssessmentRulesMapper postAssessmentRulesMapper;
+    @Autowired
+    private PostAssessmentRatingOtherInfoMapper postAssessmentRatingOtherInfoMapper;
+    @Autowired
+    private PostAssessmentRatingMapper postAssessmentRatingMapper;
+    @Autowired
     private PostAssessmentRatingOtherMapper postAssessmentRatingOtherMapper;
 
     /**
@@ -42,94 +60,45 @@ public class PostAssessmentRatingOtherServiceImpl extends ServiceImpl<PostAssess
     @Override
     public PostAssessmentRatingOther selectPostAssessmentRatingOtherById(Long id) {
         PostAssessmentRatingOther data = postAssessmentRatingOtherMapper.selectPostAssessmentRatingOtherById(id);
-
-        id = 123456789l;
-        data = new PostAssessmentRatingOther();
-
-//        PostAssessmentRatingOther data = new PostAssessmentRatingOther();
-        data.setId(id);
-        data.setType(PostAssessmentRatingOtherEnum.TYPE_ZN_HP.getValue());
-        data.setBatchId("111111");
-        data.setStatus(PostAssessmentRatingOtherEnum.STATUS_ING.getValue());//状态
-        data.setStartTime(new Date());//评分时间
-
-
+        List<PostAssessmentRatingOther> postAssessmentRatingOthers = postAssessmentRatingOtherMapper.selectList(Wrappers.<PostAssessmentRatingOther>lambdaQuery()
+                .eq(PostAssessmentRatingOther::getBatchId,data.getBatchId())
+        );
+        if (postAssessmentRatingOthers.isEmpty()){
+            return new PostAssessmentRatingOther();
+        }
 //        String[] deptArr = new String[]{"健康安全环保中心", "生产指挥中心", "设备管理中心", "技术中心", "仓储组", "党建工作部", "内控法务部", "人力资源部", "商务部", "办公室", "规划计划部", "信息中心", "财务资金部"};
-
+        Long type = 2L;
+        if (data.getType() == 2){
+            type = 3L;
+        }
+        List<PostAssessmentRules> postAssessmentRules = postAssessmentRulesMapper.selectList(Wrappers.<PostAssessmentRules>lambdaQuery()
+                .eq(PostAssessmentRules::getType, type)
+        );
         List<PostAssessmentRatingOtherInfo> children = new ArrayList<>();
-
-        String[] deptArr = new String[]{"健康安全环保中心", "生产指挥中心", "设备管理中心", "技术中心", "仓储组", "党建工作部", "内控法务部", "人力资源部", "商务部", "办公室", "规划计划部", "信息中心", "财务资金部"};
-        PostAssessmentRatingOtherInfo child1 = new PostAssessmentRatingOtherInfo();
-        child1.setId(System.currentTimeMillis());
-        child1.setRatingOtherId(id);
+        for (PostAssessmentRules postAssessmentRule : postAssessmentRules) {
+            PostAssessmentRatingOtherInfo child1 = new PostAssessmentRatingOtherInfo();
 // "评分分类/项目/专业：职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规与保密职责；5-任职资格与能力素质要求；6-岗位责任制文件完整性与适宜性；
 // 10-工作态度；11-部门协作；12-廉洁从业；13-主要工作完成情况；
 // 20-HSE；21-生产；22-设备；")
-        child1.setDutyType(10);
-        child1.setScoreWeight(new BigDecimal(20));
-        List<PostAssessmentRatingOtherInfoDept> children1 = new ArrayList<>();
-        for (int i = 0; i < deptArr.length; i++) {
-            Long deptId = Long.parseLong(String.valueOf(i + 1));
-            String deptName = deptArr[i];
-            children1.add(new PostAssessmentRatingOtherInfoDept(deptId, deptName, new BigDecimal(20 - i)));
-        }
-        child1.setChildren(children1);
-        child1.setRule("评分标准-工作态度");
-
-        PostAssessmentRatingOtherInfo child2 = new PostAssessmentRatingOtherInfo();
-        child2.setId(System.currentTimeMillis());
-        child2.setRatingOtherId(id);
-        child2.setDutyType(11);
-        child2.setScoreWeight(new BigDecimal(20));
-        List<PostAssessmentRatingOtherInfoDept> children2 = new ArrayList<>();
-        for (int i = 0; i < deptArr.length; i++) {
-            Long deptId = Long.parseLong(String.valueOf(i + 1));
-            String deptName = deptArr[i];
-            children2.add(new PostAssessmentRatingOtherInfoDept(deptId, deptName, new BigDecimal(20 - i)));
+            child1.setDutyType(postAssessmentRule.getDutyType());
+            child1.setScoreWeight(new BigDecimal(postAssessmentRule.getFullScore()));
+            List<PostAssessmentRatingOtherInfoDept> children1 = new ArrayList<>();
+            for (PostAssessmentRatingOther postAssessmentRatingOther : postAssessmentRatingOthers) {
+                List<PostAssessmentRatingOtherInfo> postAssessmentRatingOtherInfos = postAssessmentRatingOtherInfoMapper.selectList(Wrappers.<PostAssessmentRatingOtherInfo>lambdaQuery()
+                        .eq(PostAssessmentRatingOtherInfo::getRatingOtherId,postAssessmentRatingOther.getId())
+                        .eq(PostAssessmentRatingOtherInfo::getDutyType,postAssessmentRule.getDutyType())
+                );
+                BigDecimal distance = new BigDecimal("0");
+                if (postAssessmentRatingOtherInfos.isEmpty()){
+                    continue;
+                }
+                distance = postAssessmentRatingOtherInfos.get(0).getByDeptScore();
+                children1.add(new PostAssessmentRatingOtherInfoDept(postAssessmentRatingOtherInfos.get(0).getId(),postAssessmentRatingOther.getDeptId(), postAssessmentRatingMapper.getSysDeptName(postAssessmentRatingOther.getDeptId()), distance));
+            }
+            child1.setChildren(children1);
+            children.add(child1);
         }
-        child2.setChildren(children2);
-        child2.setRule("评分标准-部门协作");
-
-
-        PostAssessmentRatingOtherInfo child3 = new PostAssessmentRatingOtherInfo();
-        child3.setId(System.currentTimeMillis());
-        child3.setRatingOtherId(id);
-        child3.setDutyType(12);
-        child3.setScoreWeight(new BigDecimal(20));
-        List<PostAssessmentRatingOtherInfoDept> children3 = new ArrayList<>();
-        for (int i = 0; i < deptArr.length; i++) {
-            Long deptId = Long.parseLong(String.valueOf(i + 1));
-            String deptName = deptArr[i];
-            children3.add(new PostAssessmentRatingOtherInfoDept(deptId, deptName, new BigDecimal(20 - i)));
-        }
-        child3.setChildren(children3);
-        child3.setRule("评分标准-廉洁从业");
-
-
-        PostAssessmentRatingOtherInfo child4 = new PostAssessmentRatingOtherInfo();
-        child4.setId(System.currentTimeMillis());
-        child4.setRatingOtherId(id);
-        child4.setDutyType(13);
-        child4.setScoreWeight(new BigDecimal(20));
-        List<PostAssessmentRatingOtherInfoDept> children4 = new ArrayList<>();
-        for (int i = 0; i < deptArr.length; i++) {
-            Long deptId = Long.parseLong(String.valueOf(i + 1));
-            String deptName = deptArr[i];
-            children4.add(new PostAssessmentRatingOtherInfoDept(deptId, deptName, new BigDecimal(20 - i)));
-        }
-        child4.setChildren(children4);
-        child4.setRule("评分标准-主要工作完成情况");
-
-
-        children.add(child1);
-        children.add(child2);
-        children.add(child3);
-        children.add(child4);
-
-
         data.setChildren(children);
-
-
         return data;
     }
 
@@ -141,60 +110,18 @@ public class PostAssessmentRatingOtherServiceImpl extends ServiceImpl<PostAssess
      */
     @Override
     public List<PostAssessmentRatingOther> selectPostAssessmentRatingOtherList(PostAssessmentRatingOther postAssessmentRatingOther) {
-        List<PostAssessmentRatingOther> list = postAssessmentRatingOtherMapper.selectPostAssessmentRatingOtherList(postAssessmentRatingOther);
-        list = new ArrayList<>();
-
-        Long id = 123456789l;
-        PostAssessmentRatingOther data = new PostAssessmentRatingOther();
-        data.setId(id);
-        data.setType(PostAssessmentRatingOtherEnum.TYPE_ZN_HP.getValue());
-        data.setBatchId("111111");
-        data.setStatus(PostAssessmentRatingOtherEnum.STATUS_ING.getValue());//状态
-        data.setStartTime(new Date());//评分时间
-
-//        String[] deptArr = new String[]{"", "", "", "", "", "", "", "", "", "", "", "", ""};
-
-        List<PostAssessmentRatingOtherInfo> children = new ArrayList<>();
-
-        PostAssessmentRatingOtherInfo child1 = new PostAssessmentRatingOtherInfo();
-        child1.setId(System.currentTimeMillis());
-        child1.setRatingOtherId(id);
-// "评分分类/项目/专业：职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规与保密职责；5-任职资格与能力素质要求；6-岗位责任制文件完整性与适宜性；
-// 10-工作态度；11-部门协作；12-廉洁从业；13-主要工作完成情况；
-// 20-HSE；21-生产；22-设备；")
-        child1.setDutyType(10);
-        child1.setScoreWeight(new BigDecimal(20));
-
-        PostAssessmentRatingOtherInfo child2 = new PostAssessmentRatingOtherInfo();
-        child2.setId(System.currentTimeMillis());
-        child2.setRatingOtherId(id);
-        child2.setDutyType(11);
-        child2.setScoreWeight(new BigDecimal(20));
-
-
-        PostAssessmentRatingOtherInfo child3 = new PostAssessmentRatingOtherInfo();
-        child3.setId(System.currentTimeMillis());
-        child3.setRatingOtherId(id);
-        child3.setDutyType(12);
-        child3.setScoreWeight(new BigDecimal(20));
-
-
-        PostAssessmentRatingOtherInfo child4 = new PostAssessmentRatingOtherInfo();
-        child4.setId(System.currentTimeMillis());
-        child4.setRatingOtherId(id);
-        child4.setDutyType(13);
-        child4.setScoreWeight(new BigDecimal(20));
-
-
-        children.add(child1);
-        children.add(child2);
-        children.add(child3);
-        children.add(child4);
-
-
-        data.setChildren(children);
-
-        list.add(data);
+        List<PostAssessmentRatingOther> list = postAssessmentRatingOtherMapper.selectPostAssessmentRatingOtherListGroup(postAssessmentRatingOther);
+        if (list.isEmpty()){
+            return new ArrayList<>();
+        }
+        List<Long> collect = list.stream().map(PostAssessmentRatingOther::getId).collect(Collectors.toList());
+        List<PostAssessmentRatingOtherInfo> children = postAssessmentRatingOtherInfoMapper.selectList(Wrappers.<PostAssessmentRatingOtherInfo>lambdaQuery()
+                .in(PostAssessmentRatingOtherInfo::getRatingOtherId,collect)
+        );
+        for (PostAssessmentRatingOther assessmentRatingOther : list) {
+            List<PostAssessmentRatingOtherInfo> collect1 = children.stream().filter(d -> d.getRatingOtherId().equals(assessmentRatingOther.getId())).collect(Collectors.toList());
+            assessmentRatingOther.setChildren(collect1);
+        }
         return list;
     }
 
@@ -272,39 +199,91 @@ public class PostAssessmentRatingOtherServiceImpl extends ServiceImpl<PostAssess
             return 0;
         }
 
+        List<PostAssessmentRules> postAssessmentRules = new ArrayList<>();
         //初始化13个职能部门评分 类型：1-职能互评；
         if (type == PostAssessmentRatingOtherEnum.TYPE_ZN_HP.getValue()) {
-
-            return SpringUtils.getBean(PostAssessmentRatingOtherServiceImpl.class).batchAddRatingOtherZhiNengDept(startTime);
+            postAssessmentRules = postAssessmentRulesMapper.selectList(Wrappers.<PostAssessmentRules>lambdaQuery()
+                    .eq(PostAssessmentRules::getType,2)
+            );
         }
 
         //初始化13个生产部门评分 类型：2-生产日常；
         if (type == PostAssessmentRatingOtherEnum.TYPE_SC_RC.getValue()) {
-            return SpringUtils.getBean(PostAssessmentRatingOtherServiceImpl.class).batchAddRatingOtherShengChanDept(startTime);
+            postAssessmentRules =postAssessmentRulesMapper.selectList(Wrappers.<PostAssessmentRules>lambdaQuery()
+                    .eq(PostAssessmentRules::getType,3)
+            );
+
+        }
+        List<Long> deptIdList = postAssessmentRatingOtherMapper.getDeptIdList(postAssessmentRatingOther.getDeptId());
+        String string = UUID.randomUUID().toString();
+        for (Long deptId : deptIdList) {
+            PostAssessmentRatingOther postAssessmentRatingOtherOther =new PostAssessmentRatingOther();
+            postAssessmentRatingOtherOther.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            postAssessmentRatingOtherOther.setType(type);
+            postAssessmentRatingOtherOther.setBatchId(string);
+            postAssessmentRatingOtherOther.setStartTime(new Date());
+            postAssessmentRatingOtherOther.setStatus(1);
+            postAssessmentRatingOtherOther.setDeptId(deptId);
+            postAssessmentRatingOtherOther.setCreateDefault();
+            postAssessmentRatingOtherOther.setCreateUserId(SecurityUtils.getLoginUser().getUserId());
+            postAssessmentRatingOtherMapper.insert(postAssessmentRatingOtherOther);
+            if(!postAssessmentRules.isEmpty()){
+                for (PostAssessmentRules postAssessmentRule : postAssessmentRules) {
+                    PostAssessmentRatingOtherInfo info = new PostAssessmentRatingOtherInfo();
+                    info.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+                    info.setRatingOtherId(postAssessmentRatingOtherOther.getId());
+                    info.setDutyType(postAssessmentRule.getDutyType());
+                    info.setScoreWeight(new BigDecimal(postAssessmentRule.getFullScore()));
+                    info.setByDeptId(deptId);
+                    info.setCreateDefault();
+                    postAssessmentRatingOtherInfoMapper.insert(info);
+                }
+
+            }
         }
-        return 0;
+        return 1;
     }
 
-    /**
-     * 初始化13个职能部门评分 类型：1-职能互评；
-     *
-     * @param startTime 评分时间
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public int batchAddRatingOtherZhiNengDept(Date startTime) {
-        //TODO 待开发：
+    @Override
+    public int batchAddRatingOtherUpdate(PostAssessmentRatingOther postAssessmentRatingOther) {
+        List<PostAssessmentRatingOther> postAssessmentRatingOthers = postAssessmentRatingOtherMapper.selectList(Wrappers.<PostAssessmentRatingOther>lambdaQuery()
+                .eq(PostAssessmentRatingOther::getBatchId,postAssessmentRatingOther.getBatchId())
+        );
+        if (postAssessmentRatingOthers.isEmpty()){
+            throw new RuntimeException("提交失败");
+        }
+        List<Long> collect = postAssessmentRatingOthers.stream().map(PostAssessmentRatingOther::getId).collect(Collectors.toList());
+        List<PostAssessmentRatingOtherInfo> info = postAssessmentRatingOtherInfoMapper.selectList(Wrappers.<PostAssessmentRatingOtherInfo>lambdaQuery()
+                .in(PostAssessmentRatingOtherInfo::getRatingOtherId,collect)
+        );
+        List<PostAssessmentRatingOtherInfo> children = postAssessmentRatingOther.getChildren();
+        children.forEach(x->{
+            List<PostAssessmentRatingOtherInfoDept> dept = x.getChildren();
+            dept.forEach(y->{
+                List<PostAssessmentRatingOtherInfo> collect1 = info.stream().filter(d -> d.getByDeptId().equals(y.getByDeptId()) && d.getDutyType().equals(x.getDutyType())).collect(Collectors.toList());
+                for (PostAssessmentRatingOtherInfo postAssessmentRatingOtherInfo : collect1) {
+                    postAssessmentRatingOtherInfo.setUpdateDefault();
+                    postAssessmentRatingOtherInfo.setByDeptScore(y.getByDeptScore());
+                    postAssessmentRatingOtherInfoMapper.updateById(postAssessmentRatingOtherInfo);
+                }
+            });
+        });
         return 1;
     }
 
-
-    /**
-     * 初始化13个生产部门评分 类型：2-生产日常；
-     *
-     * @param startTime 评分时间
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public int batchAddRatingOtherShengChanDept(Date startTime) {
-        //TODO 待开发：
+    @Override
+    public int productionDepartmentSub(List<PostAssessmentRatingOther> postAssessmentRatingOther) {
+        for (PostAssessmentRatingOther assessmentRatingOther : postAssessmentRatingOther) {
+            List<PostAssessmentRatingOtherInfo> children = assessmentRatingOther.getChildren();
+            children.forEach(x->{
+                PostAssessmentRatingOtherInfo info = new PostAssessmentRatingOtherInfo();
+                info.setId(x.getId());
+                info.setByDeptScore(x.getByDeptScore());
+                info.setUpdateDefault();
+                postAssessmentRatingOtherInfoMapper.updateById(info);
+            });
+        }
         return 1;
     }
+
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostAssessmentRatingServiceImpl.java

@@ -1,12 +1,26 @@
 package com.ruoyi.postCheck.service.impl;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.postCheck.domain.PostAssessmentRatingOther;
+import com.ruoyi.postCheck.domain.PostAssessmentRatingOtherInfo;
+import com.ruoyi.postCheck.domain.PostAssessmentRules;
+import com.ruoyi.postCheck.domain.PostCheckedProblem;
+import com.ruoyi.postCheck.mapper.PostAssessmentRatingOtherInfoMapper;
 import com.ruoyi.postCheck.mapper.PostAssessmentRatingOtherMapper;
+import com.ruoyi.postCheck.mapper.PostAssessmentRulesMapper;
+import com.ruoyi.postCheck.mapper.PostCheckedProblemMapper;
+import com.ruoyi.postCheck.mapper.PostPlanInfoMapper;
+import com.ruoyi.postCheck.mapper.PostPlanMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.postCheck.mapper.PostAssessmentRatingMapper;
@@ -23,8 +37,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentRatingMapper, PostAssessmentRating> implements IPostAssessmentRatingService {
     @Autowired
+    private PostAssessmentRatingOtherMapper postAssessmentRatingOtherMapper;
+    @Autowired
+    private PostAssessmentRatingOtherInfoMapper postAssessmentRatingOtherInfoMapper;
+    @Autowired
     private PostAssessmentRatingMapper postAssessmentRatingMapper;
-
+    @Autowired
+    private PostCheckedProblemMapper postCheckedProblemMapper;
+    @Autowired
+    private PostPlanInfoMapper postPlanInfoMapper;
+    @Autowired
+    private PostPlanMapper postPlanMapper;
+    @Autowired
+    private PostAssessmentRulesMapper postAssessmentRulesMapper;
     /**
      * 查询考核评比
      *
@@ -44,10 +69,75 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
      */
     @Override
     public List<PostAssessmentRating> selectPostAssessmentRatingList(PostAssessmentRating postAssessmentRating) {
-        List<PostAssessmentRating> postAssessmentRatings = postAssessmentRatingMapper.selectPostAssessmentRatingList(postAssessmentRating);
-        postAssessmentRatings.forEach(x->{
-            x.setDeptIdStr(postAssessmentRatingMapper.getSysDeptName(x.getDeptId()));
-        });
+        // type 1 是职能管理部门， 2 生产运营部门
+        Integer type;
+        if (postAssessmentRating.getType() == 2){
+            type = 3;
+        } else {
+            type = 2;
+        }
+        List<PostAssessmentRating> postAssessmentRatings = new ArrayList<>();
+        List<Map<String, String>> deptIdListByType = postAssessmentRatingOtherMapper.getDeptIdListByType(postAssessmentRating.getType());
+        List<PostAssessmentRules> postAssessmentRules = postAssessmentRulesMapper.selectList(Wrappers.lambdaQuery());
+        for (Map<String, String> map : deptIdListByType) {
+            PostAssessmentRating post = new PostAssessmentRating();
+            post.setDeptId(Long.parseLong(map.get("deptId")));
+            post.setDeptIdStr(String.valueOf(map.get("deptName")));
+            // 计算一个部门的岗检得分
+            // 1 先查询问题
+            BigDecimal postSouce = new BigDecimal("100");
+            List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(Wrappers.<PostCheckedProblem>lambdaQuery()
+                    .eq(PostCheckedProblem::getCheckedDeptId,post.getDeptId())
+            );
+            BigDecimal postTotal = postCheckedProblemMapper.getPostTotalByDeptId(post.getDeptId());
+            if (postCheckedProblems.size() > 0){
+                // 计算扣除分数
+                BigDecimal postAfter = new BigDecimal("100");
+                Set<PostAssessmentRules> collect = postAssessmentRules.stream().filter(d -> d.getType() == type).collect(Collectors.toSet());
+                for (PostCheckedProblem postCheckedProblem : postCheckedProblems) {
+                    Optional<PostAssessmentRules> first = postAssessmentRules.stream().filter(d ->d.getType() == type && d.getDutyType().equals(postCheckedProblem.getDutyType())).findFirst();
+                    if (first.isPresent()){
+                        if (postCheckedProblem.getProblemLevel().equals("1")){
+                            postAfter = postAfter.subtract(new BigDecimal(String.valueOf(first.get().getProblemLevelOne())));
+                        }else{
+                            postAfter = postAfter.subtract(new BigDecimal(String.valueOf(first.get().getProblemLevelTwo())));
+                        }
+                    }
+                }
+                // 计算系数 1-问题总数/需要查的问题数
+                BigDecimal divide = new BigDecimal(postCheckedProblems.size()).divide(postTotal.multiply(new BigDecimal(collect.size())));
+                if (divide.compareTo(new BigDecimal("1")) < 0 && divide.compareTo(new BigDecimal("0")) > 0 ){
+                    postSouce = postAfter.multiply(new BigDecimal("1").subtract(divide));
+                }else{
+                    postSouce = new BigDecimal("0");
+                }
+            }else {
+                postSouce = new BigDecimal("0");
+            }
+            post.setPositionScore(postSouce);
+            // 计算互评得分
+
+            List<PostAssessmentRatingOtherInfo> postAssessmentRatingOtherInfos = postAssessmentRatingOtherInfoMapper.selectList(Wrappers.<PostAssessmentRatingOtherInfo>lambdaQuery()
+                    .eq(PostAssessmentRatingOtherInfo::getByDeptId,post.getDeptId())
+                    .apply("and \"rating_other_id\" in (SELECT \"id\" FROM \"public\".\"post_assessment_rating_other\" WHERE \"type\"  = 1\n)")
+                    .orderByAsc(PostAssessmentRatingOtherInfo::getByDeptScore)
+            );
+            BigDecimal peerEvaluationScore = new BigDecimal("100");
+            if (postAssessmentRatingOtherInfos.size()>0){
+                postAssessmentRatingOtherInfos.remove(postAssessmentRatingOtherInfos.size()-1);
+                postAssessmentRatingOtherInfos.remove(0);
+                BigDecimal sum = new BigDecimal("0");
+                postAssessmentRatingOtherInfos.forEach(x -> {
+                    sum.add(x.getByDeptScore());
+                });
+                peerEvaluationScore = sum.divide(new BigDecimal(postAssessmentRatingOtherInfos.size()));
+            }
+            post.setPeerEvaluationScore(peerEvaluationScore);
+            postAssessmentRatings.add(post);
+            // 计算总得分
+            post.setDepartmentScore(post.getPositionScore().add(post.getPeerEvaluationScore()).divide(new BigDecimal("2")));
+        }
+        // 计算  岗检得分
         return postAssessmentRatings;
     }
 

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostCheckedProblemServiceImpl.java

@@ -131,8 +131,6 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
                 throw new BaseException("第" + count + "行更新失败请检查！");
             }
         }
-        // 计算岗检排名得分
-        jobInspectionScore(postCheckedProblemList);
         return 1;
     }
 
@@ -177,9 +175,26 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
                 }
             }
         }
-        if (score.compareTo(new BigDecimal("0")) < 0)
+
+        // todo 公式计算
+        if (postCheckedProblems.size()>0){
+            BigDecimal bigDecimal = new BigDecimal("1");
+            List<PostPlanInfo> postPlanInfos = postPlanInfoMapper.selectList(Wrappers.<PostPlanInfo>lambdaQuery()
+                    .eq(PostPlanInfo::getPostPlanId,postPlan.getId())
+            );
+            if (postPlanInfos.size() <= 0){
+                score = new BigDecimal("0");
+            }else{
+                BigDecimal divide = new BigDecimal(postCheckedProblems.size()).divide(new BigDecimal(postPlanInfos.size()).multiply(new BigDecimal("6")));
+                if (divide.compareTo(new BigDecimal("0"))<=0 || divide.compareTo(new BigDecimal("1")) > 0){
+                    score = new BigDecimal("0");
+                }else{
+                    score = bigDecimal.subtract(divide);
+                }
+            }
+        }else{
             score = new BigDecimal("0");
-        // todo 公式不完整
+        }
         postAssessmentRatingMapper.update(null,Wrappers.<PostAssessmentRating>lambdaUpdate()
                 .set(PostAssessmentRating::getPositionScore,score)
                 .eq(PostAssessmentRating::getDeptId,departmentId)

ruoyi-postcheck/src/main/resources/mapper/postCheck/PostAssessmentRatingOtherMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.postCheck.mapper.PostAssessmentRatingOtherMapper">
-    
+
     <resultMap type="PostAssessmentRatingOther" id="PostAssessmentRatingOtherResult">
         <result property="id"    column="id"    />
         <result property="type"    column="type"    />
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPostAssessmentRatingOtherList" parameterType="PostAssessmentRatingOther" resultMap="PostAssessmentRatingOtherResult">
         <include refid="selectPostAssessmentRatingOtherVo"/>
-        <where>  
+        <where>
             <if test="type != null "> and type = #{type}</if>
             <if test="batchId != null  and batchId != ''"> and batch_id = #{batchId}</if>
             <if test="startTime != null "> and start_time = #{startTime}</if>
@@ -41,12 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createUserId != null "> and create_user_id = #{createUserId}</if>
         </where>
     </select>
-    
+
     <select id="selectPostAssessmentRatingOtherById" parameterType="Long" resultMap="PostAssessmentRatingOtherResult">
         <include refid="selectPostAssessmentRatingOtherVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertPostAssessmentRatingOther" parameterType="PostAssessmentRatingOther">
         insert into post_assessment_rating_other
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -114,9 +114,70 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deletePostAssessmentRatingOtherByIds" parameterType="String">
-        delete from post_assessment_rating_other where id in 
+        delete from post_assessment_rating_other where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+
+    <select id="getDeptIdList" resultType="java.lang.Long">
+        SELECT "dept_id"
+        FROM "public"."sys_dept" where "dept_id" != #{id};
+    </select>
+
+
+
+    <select id="selectPostAssessmentRatingOtherListGroup"
+            resultType="com.ruoyi.postCheck.domain.PostAssessmentRatingOther">
+        select
+        max("id") id,
+        max("type") "type",
+        max("batch_id") batch_id,
+        max("start_time") start_time,
+        max("status") status,
+        max("dept_id") dept_id,
+        max("complete_time") complete_time,
+        max("score_user_id") score_user_id,
+        max("score_user_name") score_user_name,
+        max("create_user_id") create_user_id,
+        max("remark") remark,
+        max("del_flag") del_flag,
+        max("create_time") create_time,
+        max("create_by") create_by,
+        max("update_time") update_time from post_assessment_rating_other
+        <where>
+            <if test="type != null ">
+                and type = #{type}
+            </if>
+            <if test="batchId != null  and batchId != ''">
+                and batch_id = #{batchId}
+            </if>
+            <if test="startTime != null ">
+                and start_time = #{startTime}
+            </if>
+            <if test="status != null ">
+                and status = #{status}
+            </if>
+            <if test="deptId != null ">
+                and dept_id = #{deptId}
+            </if>
+            <if test="completeTime != null ">
+                and complete_time = #{completeTime}
+            </if>
+            <if test="scoreUserId != null ">
+                and score_user_id = #{scoreUserId}
+            </if>
+            <if test="scoreUserName != null  and scoreUserName != ''">
+                and score_user_name like concat('%', #{scoreUserName}, '%')
+            </if>
+            <if test="createUserId != null ">
+                and create_user_id = #{createUserId}
+            </if>
+        </where>
+        group by batch_id
+    </select>
+
+    <select id="getDeptIdListByType" resultType="java.util.Map">
+        SELECT "dept_id" as deptId,"dept_name" as deptName FROM "public"."sys_dept" where "type" = #{type};
+    </select>
+</mapper>

ruoyi-postcheck/src/main/resources/mapper/postCheck/PostCheckedProblemMapper.xml

@@ -292,4 +292,11 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="getPostTotalByDeptId" resultType="java.math.BigDecimal">
+        SELECT COUNT(0)
+        FROM "public"."sys_user_post" a LEFT JOIN "public"."sys_user_role" sur ON a."user_id"  = sur."user_id"
+                                        LEFT JOIN "public"."sys_role_dept" srd ON sur."role_id"  = srd."role_id"
+        WHERE srd."dept_id" = #{deptId} GROUP BY a."post_id"
+    </select>
 </mapper>