xujun

science-admin/src/main/java/com/yiboshi/science/entity/ComProjectAssign.java

@@ -21,6 +21,9 @@ public class ComProjectAssign extends BaseEntity {
     @ApiModelProperty(value = "项目Id", position = 2)
     @Length(max=36, message = "项目Id不能大于36")
     private String projId;
+    /** 专家类型（1技术专家、2财务专家） */
+    @ApiModelProperty(value = "专家类型", position = 3)
+    private Integer expertType;
     /** 分配年度 */
     @ApiModelProperty(value = "分配年度", position = 3)
     private Integer assignYear;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectAssignServiceImpl.java

@@ -9,12 +9,15 @@ import com.yiboshi.science.dao.ComProjectAssignDAO;
 import com.yiboshi.science.entity.AssignCount;
 import com.yiboshi.science.entity.ComProject;
 import com.yiboshi.science.entity.ComProjectAssign;
+import com.yiboshi.science.entity.SystemParameter;
 import com.yiboshi.science.enumeration.CommonEnum;
+import com.yiboshi.science.param.dto.ComExpertSpecDTO;
 import com.yiboshi.science.param.dto.ComProjectAssignDTO;
 import com.yiboshi.science.param.dto.ComProjectGroupDTO;
 import com.yiboshi.science.param.query.ComProjectAssignQueryVO;
 import com.yiboshi.science.service.*;
 import lombok.AllArgsConstructor;
+import org.mockito.internal.matchers.Find;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,6 +26,7 @@ import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
@@ -33,6 +37,8 @@ public class ComProjectAssignServiceImpl extends BaseServiceImpl<ComProjectAssig
     private ComBatchService comBatchService;
     @Autowired
     private ComExpertSpecService comExpertSpecService;
+    @Autowired
+    private SystemParameterService systemParameterService;
 
     @Override
     protected void setCriteriaForQuery(ComProjectAssignQueryVO vo, QueryWrapper<ComProjectAssignQueryVO> criteria) {
@@ -108,6 +114,7 @@ public class ComProjectAssignServiceImpl extends BaseServiceImpl<ComProjectAssig
                     ComProjectAssign assign = new ComProjectAssign();
                     assign.setProjId(e);
                     assign.setExpertId(f);
+                    assign.setExpertType(this.getExpertTypeByExpertId(f));
                     assign.setAssignYear(year);
                     this.insert(assign);
                     assignCount.incrementAndGet();
@@ -154,6 +161,16 @@ public class ComProjectAssignServiceImpl extends BaseServiceImpl<ComProjectAssig
         return dto;
     }
 
+    public Integer getExpertTypeByExpertId(String expertId) {
+        List<ComExpertSpecDTO> SpecList = comExpertSpecService.getListByExpertId(expertId);
+        List<ComExpertSpecDTO> FindList = SpecList.stream().filter(e -> e.getSpecId().toLowerCase().equals("a70f06d1-b6aa-11ef-b6cb-0c42a1381189")).collect(Collectors.toList());
+        //1技术专家、2财务专家
+        if (null != FindList && FindList.size() > 0)
+            return 1;
+        else
+            return 2;
+    }
+
     public List<AssignCount> getAssignCount(String expertId) {
         return comProjectAssignDAO.getAssignCount(expertId);
     }