历史记录

olive-console/src/main/java/com/zrqx/olive/project/controller/ProjectController.java

 package com.zrqx.olive.project.controller;
 
+import java.util.Date;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,6 +18,8 @@ import com.common.CheckAdminToken;
 import com.common.CommonResult;
 import com.common.PageParamRequest;
 import com.github.pagehelper.PageInfo;
+import com.zrqx.olive.project.model.ProjectRecord;
+import com.zrqx.olive.project.request.ProjectRecordRequest;
 import com.zrqx.olive.project.request.QueryProjectRequest;
 import com.zrqx.olive.project.request.SaveProjectRequest;
 import com.zrqx.olive.project.request.StatisticsProjectRequest;
@@ -57,6 +61,26 @@ public class ProjectController {
 		}
 		return CommonResult.success();
 	}
+	@ApiOperation(value = "添加项目历史记录", notes = "新增一个")
+	@RequestMapping(value = "/saveRecord", method = RequestMethod.POST)
+	public CommonResult<Boolean> saveRecord(@RequestBody ProjectRecordRequest projectRecord,HttpServletRequest request) throws Exception{
+		String token = checkAdminToken.getTokenFormRequest(request);
+		SystemAdminResponse systemAdminResponse = systemAdminService.getInfoByToken(token);
+		//添加历史记录
+		ProjectRecord record = new ProjectRecord();
+		if(projectRecord.getType().equals("2")) {
+			record.setDescribes("由"+systemAdminResponse.getAccount()+"编辑");
+		}else {
+			record.setDescribes("由"+systemAdminResponse.getAccount()+"创建");
+		}
+		record.setProjectId(projectRecord.getProjectId());
+		record.setUserName(systemAdminResponse.getAccount());
+		record.setUploadTime(new Date());
+		if (!recordService.save(record)) {
+			return CommonResult.failed("添加失败");
+		}
+		return CommonResult.success();
+	}
 	@ApiOperation(value = "查询", notes = "根据ID查询")
 	@GetMapping(value = "/getId")
 	public CommonResult<ProjectVo> getById(String oid) {

olive-console/src/main/java/com/zrqx/olive/project/controller/TeamController.java

@@ -106,7 +106,6 @@ public class TeamController {
 				BigDecimal bignum3 = team.getToBeAllocated().subtract(updateTeamRequest.getTimeList().get(i).getTime());  
 				team.setToBeAllocated(bignum3);
 		        if(teamService.updateById(team)){
-		        	
 		        	TeamRecord record = new TeamRecord();
 		        	String account = systemAdminResponse.getAccount();
 		        	Department department = departmentService.getById(team.getDepartmentId());

olive-console/src/main/java/com/zrqx/olive/project/request/ProjectRecordRequest.java

+package com.zrqx.olive.project.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ProjectRecordRequest对象", description="查询成员")
+public class ProjectRecordRequest {
+
+	@ApiModelProperty("项目Id")
+	private String projectId;
+	@ApiModelProperty("1保存 2编辑")
+	private String type;
+}

olive-console/src/main/java/com/zrqx/olive/project/service/impl/StatisticsProjectServiceImpl.java

@@ -127,17 +127,6 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
 				userMapper.insert(projectUser);
 			}
 		}
-		//添加历史记录
-		ProjectRecord record = new ProjectRecord();
-		if(form.getId()==null) {
-			record.setDescribes("由"+systemAdminResponse.getAccount()+"创建");
-		}else{
-			record.setDescribes("由"+systemAdminResponse.getAccount()+"编辑");
-		}
-		record.setProjectId(project.getId());
-		record.setUserName(systemAdminResponse.getAccount());
-		record.setUploadTime(new Date());
-		recordMapper.insert(record);
 		return true;
 	}
 
@@ -184,16 +173,13 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
 		if(null != customerId){
             wrapper.eq("customer_id", customerId);
         }
-		if(null != customerId){
-            wrapper.eq("customer_id", customerId);
-        }
 		wrapper.orderByDesc("upload_time");
 		List<StatisticsProject> list = mapper.selectList(wrapper);
 		for (StatisticsProject statisticsProject : list) {
 			StatisticsProjectRequest aqr = new StatisticsProjectRequest();
 			BeanUtils.copyProperties(statisticsProject, aqr);
-			aqr.setStartTime(DateUtils.dateTimeToStr(statisticsProject.getStartTime()));
-			aqr.setEndTime(DateUtils.dateTimeToStr(statisticsProject.getEndTime()));
+			aqr.setStartTime(DateUtils.dateTimeToStrYMD(statisticsProject.getStartTime()));
+			aqr.setEndTime(DateUtils.dateTimeToStrYMD(statisticsProject.getEndTime()));
             statisticsProjectRequest.add(aqr);
 		}
 		return statisticsProjectRequest;