Merge branch 'master' of http://test16.zhongdianyun.com/renjiancai/tasktime.git

olive-console/src/main/java/com/zrqx/olive/ttask/controller/TaskController.java

@@ -90,7 +90,7 @@ public class TaskController {
 
 	@Autowired
 	private TaskRecordService taskRecordService;
-	
+
 	@Autowired
 	private ProjectFileDao projectFileMapper;
 
@@ -109,8 +109,7 @@ public class TaskController {
 			@Validated PageParamRequest pageParamRequest) {
 		return CommonResult.success(CommonPage.restPage(taskService.getpage(taskRequest, pageParamRequest)));
 	}
-	
-	
+
 	@ApiOperation(value = "历史记录")
 	@RequestMapping(value = "/recordlist", method = RequestMethod.GET)
 	@ApiImplicitParam(name = "record", value = "搜索历史记录")
@@ -118,7 +117,6 @@ public class TaskController {
 		List<TaskRecordVo> list = taskRecordService.getList(taskRecordRequest);
 		return CommonResult.success(list);
 	}
-	
 
 	/**
 	 * 新增任务管理表
@@ -134,7 +132,7 @@ public class TaskController {
 		task.setCreateTime(new Date());
 		task.setTaskStatus(1);
 		if (taskService.save(task)) {
-			if(taskRequest.getFile()!=null) {
+			if (taskRequest.getFile() != null) {
 				for (ProjectFile projectFile : taskRequest.getFile()) {
 					projectFile.setTaskId(task.getId());
 					projectFile.setUploadTime(new Date());
@@ -142,22 +140,31 @@ public class TaskController {
 				}
 			}
 			try {
-				// 处理项目工时
-				QueryWrapper<Team> qw = new QueryWrapper<>();
-				qw.eq("project_id", taskRequest.getProjectId());
-				List<Team> teamlist = teamService.list(qw);
-				System.out.println(teamlist);
-				if (teamlist.size() > 0) {
-					BigDecimal allocateSurplus = teamlist.get(0).getAllocateSurplus();
-					
-					if (taskRequest.getWorkingHours() != null) {
-						BigDecimal result = allocateSurplus.subtract(taskRequest.getWorkingHours());
-						if (result.floatValue() < 0) {
-							return CommonResult.failed("当前项目工时不足");
+
+				if (taskRequest.getUserId() != null) {
+					// 处理项目工时
+					QueryWrapper<Team> qw = new QueryWrapper<>();
+					// 售前项目
+					if (taskRequest.getStatus() == 2) {
+						qw.eq("sales_project_id", taskRequest.getProjectId());
+					}
+                    // 正常项目
+					if (taskRequest.getStatus() == 1) {
+						qw.eq("project_id", taskRequest.getProjectId());
+					}
+					List<Team> teamlist = teamService.list(qw);
+
+					if (teamlist.size() > 0) {
+						BigDecimal allocateSurplus = teamlist.get(0).getAllocateSurplus();
+						if (taskRequest.getWorkingHours() != null) {
+							BigDecimal result = allocateSurplus.subtract(taskRequest.getWorkingHours());
+							if (result.floatValue() < 0) {
+								return CommonResult.failed("当前项目工时不足");
+							}
+							Team team = teamlist.get(0);
+							team.setAllocateSurplus(result);
+							teamService.updateById(team);
 						}
-						Team team = teamlist.get(0);
-						team.setAllocateSurplus(result);
-						teamService.updateById(team);
 					}
 				}
 				// 保存历史记录
@@ -165,6 +172,7 @@ public class TaskController {
 				taskRecord.setTaskId(task.getId());
 				taskRecord.setType(5);
 				record(taskRecord, request);
+
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -195,7 +203,14 @@ public class TaskController {
 			if (task.getWorkingHours() != null) {
 
 				QueryWrapper<Team> qw1 = new QueryWrapper<>();
-				qw1.eq("project_id", task.getProjectId());
+				// 售前项目
+				if (task.getStatus() == 2) {
+					qw1.eq("sales_project_id", task.getProjectId());
+				}
+                // 正常项目
+				if (task.getStatus() == 1) {
+					qw1.eq("project_id", task.getProjectId());
+				}
 				List<Team> teamlist = teamService.list(qw1);
 				if (teamlist.size() > 0) {
 					BigDecimal allocateSurplus = teamlist.get(0).getAllocateSurplus();
@@ -229,40 +244,38 @@ public class TaskController {
 		record(form, request);
 		return CommonResult.success(true);
 	}
-	
+
 	@ApiOperation(value = "完成", notes = "完成")
 	@PostMapping(value = "/complete")
 	public CommonResult<Boolean> complete(@RequestBody TaskRecordRequest form, HttpServletRequest request)
 			throws Exception {
 		QueryWrapper<Task> qw = new QueryWrapper<>();
 		Task task = taskService.getById(form.getTaskId());
-		//完成任务
+		// 完成任务
 		task.setTaskStatus(3);
 		task.setUserId(form.getUserId());
 		task.setUpdateTime(new Date());
 		qw.like("id", form.getTaskId());
 		taskService.updateById(task);
-		//保存附件到任务里
-		if(form.getFile()!=null) {
+		// 保存附件到任务里
+		if (form.getFile() != null) {
 			for (ProjectFile projectFile : form.getFile()) {
 				projectFile.setTaskId(task.getId());
 				projectFile.setUploadTime(new Date());
 				projectFileMapper.insert(projectFile);
 			}
 		}
-		
 		// 保存历史记录
 		record(form, request);
 		return CommonResult.success(true);
 	}
-	
 
 	/**
 	 * 修改任务管理表
 	 * 
 	 * @param id             integer id
 	 * @param articleRequest 修改参数
-	 * @author Mr.Zhang
+	 * @author 
 	 * @since 2020-04-18
 	 */
 	@ApiOperation(value = "修改")
@@ -271,9 +284,9 @@ public class TaskController {
 	public CommonResult<String> update(@RequestBody @Validated TaskRequest taskRequest, HttpServletRequest request) {
 		Task task = new Task();
 		BeanUtils.copyProperties(taskRequest, task);
-		
+
 		projectFileMapper.deleteByIdEntity(taskRequest.getId());
-		if(taskRequest.getFile()!=null) {
+		if (taskRequest.getFile() != null) {
 			for (ProjectFile projectFile : taskRequest.getFile()) {
 				projectFile.setTaskId(task.getId());
 				projectFile.setUploadTime(new Date());
@@ -305,7 +318,7 @@ public class TaskController {
 			taskRecord.setType(form.getType());
 			taskRecord.setUploadTime(new Date());
 			taskRecord.setUserId(systemAdminResponse.getId());
-			System.out.println("任建宇"+taskRecord);
+			System.out.println("任建宇" + taskRecord);
 			taskRecordService.save(taskRecord);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
@@ -327,9 +340,9 @@ public class TaskController {
 		TaskVo taskvo = new TaskVo();
 		BeanUtils.copyProperties(task, taskvo);
 		LambdaQueryWrapper<ProjectFile> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
-		if(id != null){
+		if (id != null) {
 			lambdaQueryWrapper1.eq(ProjectFile::getTaskId, id);
-        }
+		}
 		List<ProjectFile> fileList = projectFileMapper.selectList(lambdaQueryWrapper1);
 		taskvo.setFile(fileList);
 		return CommonResult.success(taskvo);

olive-console/src/main/java/com/zrqx/olive/ttask/dao/TaskDao.java

@@ -51,6 +51,9 @@ public interface TaskDao extends BaseMapper<Task> {
 			+ "<if test = 'request.projectId!=null'> "
 			+ " AND a.project_id = #{request.projectId} "
 			+ "</if>"
+			+ "<if test = 'request.salesProjectId!=null'> "
+			+ " AND a.sales_project_id = #{request.salesProjectId} "
+			+ "</if>"
 			+ "<if test = 'request.taskStatus == 4'> "
 			+ " AND task_status != 0 "
 			+ "</if>"

olive-console/src/main/java/com/zrqx/olive/ttask/model/Task.java

@@ -77,6 +77,9 @@ public class Task implements Serializable {
     @ApiModelProperty(value = "项目id")
     private String projectId;
     
+	@ApiModelProperty(value = "售前项目id")
+	private String salesProjectId;
+    
     @ApiModelProperty(value = "1：任务管理 2：售前管理")
     private Integer status;
     

olive-console/src/main/java/com/zrqx/olive/ttask/request/TaskRequest.java

@@ -79,6 +79,9 @@ public class TaskRequest implements Serializable {
 
 	@ApiModelProperty(value = "项目id")
 	private String projectId;
+	
+	@ApiModelProperty(value = "售前项目id")
+	private String salesProjectId;
 
 	@ApiModelProperty(value = "1：任务管理 2：售前管理")
 	private Integer status;

olive-console/src/main/java/com/zrqx/olive/ttask/vo/TaskVo.java

@@ -90,6 +90,9 @@ public class TaskVo implements Serializable {
 	@ApiModelProperty(value = "项目id")
 	private String projectId;
 	
+	@ApiModelProperty(value = "售前项目id")
+	private String salesProjectId;
+	
 	@ApiModelProperty(value = "项目名称")
 	private String projectName;