From dece32aeb6b9053e345fda5991a1671463e35e4d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 31 八月 2021 00:33:32 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/bmo/inspectionTaskDetail/impl/InspectionTaskDetailBMOImpl.java | 91 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 77 insertions(+), 14 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/inspectionTaskDetail/impl/InspectionTaskDetailBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/inspectionTaskDetail/impl/InspectionTaskDetailBMOImpl.java
old mode 100644
new mode 100755
index eb138d5..2d0b558
--- a/service-api/src/main/java/com/java110/api/bmo/inspectionTaskDetail/impl/InspectionTaskDetailBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/inspectionTaskDetail/impl/InspectionTaskDetailBMOImpl.java
@@ -4,17 +4,22 @@
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.inspectionTaskDetail.IInspectionTaskDetailBMO;
import com.java110.core.context.DataFlowContext;
-import com.java110.core.smo.inspectionTaskDetail.IInspectionTaskDetailInnerServiceSMO;
-import com.java110.dto.inspectionTaskDetail.InspectionTaskDetailDto;
+import com.java110.dto.inspectionPlan.InspectionTaskDto;
+import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
+import com.java110.dto.inspectionPlan.InspectionTaskDetailDto;
+import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.po.inspection.InspectionTaskDetailPo;
-import com.java110.po.inspection.InspectionTaskPo;
import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
@Service("inspectionTaskDetailBMOImpl")
@@ -22,6 +27,9 @@
@Autowired
private IInspectionTaskDetailInnerServiceSMO inspectionTaskDetailInnerServiceSMOImpl;
+
+ @Autowired
+ private IInspectionTaskInnerServiceSMO inspectionTaskInnerServiceSMOImpl;
/**
* 娣诲姞灏忓尯淇℃伅
@@ -31,14 +39,10 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public void addInspectionTaskDetail(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
paramInJson.put("taskDetailId", "-1");
InspectionTaskDetailPo inspectionTaskPo = BeanConvertUtil.covertBean(paramInJson, InspectionTaskDetailPo.class);
-
super.insert(dataFlowContext, inspectionTaskPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_INSPECTION_TASK_DETAIL);
-
}
-
/**
* 娣诲姞娲诲姩淇℃伅
@@ -47,20 +51,79 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public void updateInspectionTaskDetail(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
+ public void updateInspectionTaskDetail(JSONObject paramInJson, DataFlowContext dataFlowContext) throws ParseException {
InspectionTaskDetailDto inspectionTaskDetailDto = new InspectionTaskDetailDto();
inspectionTaskDetailDto.setTaskDetailId(paramInJson.getString("taskDetailId"));
inspectionTaskDetailDto.setCommunityId(paramInJson.getString("communityId"));
List<InspectionTaskDetailDto> inspectionTaskDetailDtos = inspectionTaskDetailInnerServiceSMOImpl.queryInspectionTaskDetails(inspectionTaskDetailDto);
-
Assert.listOnlyOne(inspectionTaskDetailDtos, "鏈壘鍒伴渶瑕佷慨鏀圭殑娲诲姩 鎴栧鏉℃暟鎹�");
-
JSONObject businessInspectionTaskDetail = new JSONObject();
businessInspectionTaskDetail.putAll(BeanConvertUtil.beanCovertMap(inspectionTaskDetailDtos.get(0)));
businessInspectionTaskDetail.putAll(paramInJson);
- InspectionTaskDetailPo inspectionTaskPo = BeanConvertUtil.covertBean(businessInspectionTaskDetail, InspectionTaskDetailPo.class);
+ InspectionTaskDetailPo inspectionTaskDetailPoPo = BeanConvertUtil.covertBean(businessInspectionTaskDetail, InspectionTaskDetailPo.class);
+ inspectionTaskDetailPoPo.setInspectionTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ inspectionTaskDetailPoPo.setActUserId(paramInJson.getString("userId"));
+ inspectionTaskDetailPoPo.setActUserName(paramInJson.getString("userName"));
+ //鑾峰彇浠诲姟id
+ String taskId = paramInJson.getString("taskId");
+ InspectionTaskDto inspectionTaskDto = new InspectionTaskDto();
+ inspectionTaskDto.setTaskId(taskId);
+ List<InspectionTaskDto> inspectionTaskDtos = inspectionTaskInnerServiceSMOImpl.queryInspectionTasks(inspectionTaskDto);
+ Assert.listOnlyOne(inspectionTaskDtos, "鏌ヨ宸℃浠诲姟鏁版嵁閿欒锛�");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = new Date();
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
+ String currentDate=sdf1.format(date);
+ System.out.println(currentDate);
- super.insert(dataFlowContext, inspectionTaskPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION_TASK_DETAIL);
+
+ //鑾峰彇宸℃鐐圭殑宸℃鐐规椂闂撮檺鍒�
+ String inspectionStartTime="";
+ String inspectionEndTime="";
+ long planStartTime;
+ long planFinishTime;
+ String pointStartTime = inspectionTaskDetailDtos.get(0).getPointStartTime();
+ String pointEndTime = inspectionTaskDetailDtos.get(0).getPointEndTime();
+ if(!StringUtil.isEmpty(pointStartTime)){
+ inspectionStartTime=currentDate+" "+pointStartTime+":00";
+ Date startTime = format.parse(inspectionStartTime);
+ planStartTime = startTime.getTime();
+ }else{
+ //鑾峰彇璁″垝宸℃寮�濮嬫椂闂�
+ String planInsTime = inspectionTaskDtos.get(0).getPlanInsTime();
+ Date startTime = format.parse(planInsTime);
+ planStartTime = startTime.getTime();
+ }
+ if(!StringUtil.isEmpty(pointEndTime)){
+ inspectionEndTime=currentDate+" "+pointEndTime+":00";
+ Date endTime = format.parse(inspectionEndTime);
+ planFinishTime = endTime.getTime();
+ }else{
+ //鑾峰彇璁″垝宸℃缁撴潫鏃堕棿
+ String planEndTime = inspectionTaskDtos.get(0).getPlanEndTime();
+ Date endTime = format.parse(planEndTime);
+ planFinishTime = endTime.getTime();
+ }
+
+ //鑾峰彇璁″垝宸℃寮�濮嬫椂闂�
+// String planInsTime = inspectionTaskDtos.get(0).getPlanInsTime();
+// Date startTime = format.parse(planInsTime);
+// long planStartTime = startTime.getTime();
+// //鑾峰彇璁″垝宸℃缁撴潫鏃堕棿
+// String planEndTime = inspectionTaskDtos.get(0).getPlanEndTime();
+// Date endTime = format.parse(planEndTime);
+// long planFinishTime = endTime.getTime();
+ //鑾峰彇宸℃鐐圭鍒版椂闂�
+ String inspectionTime = inspectionTaskDetailPoPo.getInspectionTime();
+ Date inspectionDetailTime = format.parse(inspectionTime);
+ long detailTime = inspectionDetailTime.getTime();
+ if (detailTime < planStartTime) { //濡傛灉宸℃鐐圭鍒版椂闂村皬浜庡贰妫�璁″垝寮�濮嬫椂闂达紝绛惧埌鐘舵�佸氨鏄棭鍒�
+ inspectionTaskDetailPoPo.setInspectionState("40000");
+ } else if (detailTime > planFinishTime) { //濡傛灉宸℃鐐圭鍒版椂闂村ぇ浜庡贰妫�璁″垝缁撴潫鏃堕棿锛岀鍒扮姸鎬佸氨鏄繜鍒�
+ inspectionTaskDetailPoPo.setInspectionState("50000");
+ } else { //濡傛灉宸℃鐐圭鍒版椂闂村湪宸℃璁″垝寮�濮嬫椂闂村拰宸℃璁″垝缁撴潫鏃堕棿涔嬮棿锛岀鍒扮姸鎬佸氨鏄甯�
+ inspectionTaskDetailPoPo.setInspectionState("60000");
+ }
+ super.insert(dataFlowContext, inspectionTaskDetailPoPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION_TASK_DETAIL);
}
}
--
Gitblit v1.8.0