能力管理--联调

历史档案--联调
非标产值--联调

cement-business/src/main/java/cn/wise/sc/cement/business/entity/NonStandardApply.java

@@ -48,6 +48,9 @@ public class NonStandardApply implements Serializable {
 	@ApiModelProperty("开始时间")
 	private LocalDate startTime;
 
+	@ApiModelProperty("结束时间")
+	private LocalDate endTime;
+
 	@ApiModelProperty("工作描述")
 	private String workDescription;
 

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardApplyMapper.xml

@@ -56,7 +56,6 @@
         END
         )as 状态,
         na.work_type as 工作类别,
-        na.start_time as 开始时间,
         na.work_description as 工作描述
         FROM nonstandard_apply na
         LEFT JOIN sys_user su ON su.id = na.user_id

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/NonStandardApplyQuery.java

@@ -30,6 +30,9 @@ public class NonStandardApplyQuery {
 	@ApiModelProperty(name = "startTime", value = "开始时间")
 	private LocalDate startTime;
 
+	@ApiModelProperty(name = "endTime", value = "结束时间")
+	private LocalDate endTime;
+
 	@ApiModelProperty(name = "workDescription", value = "工作描述")
 	private String workDescription;
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/NonStandardApplyVo.java

@@ -37,6 +37,9 @@ public class NonStandardApplyVo {
 	@ApiModelProperty("开始时间")
 	private LocalDate startTime;
 
+	@ApiModelProperty("结束时间")
+	private LocalDate endTime;
+
 	@ApiModelProperty("工作描述")
 	private String workDescription;
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApplyServiceImpl.java

@@ -72,10 +72,7 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 	public BaseResponse<NonStandardApply> create(NonStandardApplyQuery query) {
 		NonStandardApply cama = new NonStandardApply();
 		BeanUtils.copyProperties(query, cama);
-		Double a=cama.getReportedHours();
-		Double b=a/24+1;
-		long c=new Double(b).longValue();
-		cama.setStatistical(cama.getStartTime() + "/" + cama.getStartTime().plusDays(c));
+		cama.setStatistical(cama.getStartTime() + "/" + cama.getEndTime());
 		nonStandardApplyMapper.insert(cama);
 		return BaseResponse.okData(cama);
 	}
@@ -145,8 +142,7 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 			headers[4] = "上报工时";
 			headers[5] = "状态";
 			headers[6] = "工作类别";
-			headers[7] = "开始时间";
-			headers[8] = "工作描述";
+			headers[7] = "工作描述";
 
 			List<Object[]> datas = new ArrayList<>(list.size());
 			for (Map<String, Object> m : list) {