合并分支 'master' 到 'dev_third_stage'

Master

查看合并请求 laws-nio/laws-weilai!31

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java

@@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.MessageTypeEnum;
+import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.project.entity.*;
@@ -64,6 +66,8 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 	 */
 	@Override
     public void add(JSONObject jsonObject) {
+		String cut = jsonObject.getString("cut");
+
 		ProjectTaskInventoryDetailEO taskInventoryDetail = JSONObject.parseObject(JSONObject.toJSONString(jsonObject), ProjectTaskInventoryDetailEO.class);
 
 		List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOAddList = new ArrayList<>();
@@ -81,6 +85,15 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			projectTaskInventoryDetail.setStatus(taskInventoryDetail.getStatus());
 			projectTaskInventoryDetail.setTaskDefinitionKey(taskInventoryDetail.getTaskDefinitionKey());
 
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			if(StringUtils.equals(projectTaskInventoryDetail.getUserId(),currentUser.getId())){
+				if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+					throw new JeroBootException("分发工程师时不能分发给自己。");
+				}else if(StringUtils.equals(cut, CutEnum.EN.getValue())){
+					throw new JeroBootException("You cannot distribute to yourself when you distribute to engineers.");
+				}
+			}
+
 			//这个工程师被分发过.
 			if(StringUtils.isNotEmpty(projectTaskInventoryDetail.getId())){
 				projectTaskInventoryDetailEOUpdateList.add(projectTaskInventoryDetail);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java

@@ -635,6 +635,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 		projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
 		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
 
+		QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
+		projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
+		ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
+
 		SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
 
 		String msgContentEN = "";

jero-web/src/common/lang/en-us.js

@@ -961,7 +961,7 @@ module.exports = {
   ConfirmQuestion: 'Confirm Question',
   disableInput: 'Disable input',
   taskConfirmationDeadline: 'Task Confirmation Deadline',
-  OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out'
+  OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out',
   taskConfirmationResponsiblePerson:'Task confirmation of responsible person',
   or: 'or',
   warningTime: 'Warning time',