Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2023-03-29 0b04f664887c73e90bf684a4e69c0fdbfe26349d

 service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskDetailCmd.java

@@ -22,6 +22,7 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.maintainanceTask.MaintainanceTaskDto;
import com.java110.dto.maintainanceTaskDetail.MaintainanceTaskDetailDto;
import com.java110.intf.common.IFileRelInnerServiceSMO;
@@ -144,7 +145,7 @@
     */
    public void addPhoto(JSONObject paramInJson) {
        JSONObject businessUnit = new JSONObject();
        businessUnit.put("fileRelId", "-1");
        businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId("10"));
        businessUnit.put("relTypeCd", "90000");
        businessUnit.put("saveWay", "ftp");
        businessUnit.put("objId", paramInJson.getString("taskDetailId"));
@@ -189,7 +190,7 @@
        String pointStartTime = maintainanceTaskDetailDtos.get(0).getPointStartTime();
        String pointEndTime = maintainanceTaskDetailDtos.get(0).getPointEndTime();
        if (!StringUtil.isEmpty(pointStartTime)) {
            maintainanceStartTime = currentDate + " " + pointStartTime + ":00";
            maintainanceStartTime =   pointStartTime ;
            Date startTime = format.parse(maintainanceStartTime);
            planStartTime = startTime.getTime();
        } else {
@@ -199,7 +200,7 @@
            planStartTime = startTime.getTime();
        }
        if (!StringUtil.isEmpty(pointEndTime)) {
            maintainanceEndTime = currentDate + " " + pointEndTime + ":00";
            maintainanceEndTime =  pointEndTime ;
            Date endTime = format.parse(maintainanceEndTime);
            planFinishTime = endTime.getTime();
        } else {
@@ -221,13 +222,15 @@
        String maintainanceTime = maintainanceTaskDetailPoPo.getInspectionTime();
        Date maintainanceDetailTime = format.parse(maintainanceTime);
        long detailTime = maintainanceDetailTime.getTime();
        if (detailTime < planStartTime) {  //如果巡检点签到时间小于巡检计划开始时间，签到状态就是早到
            maintainanceTaskDetailPoPo.setState("40000");
        } else if (detailTime > planFinishTime) {  //如果巡检点签到时间大于巡检计划结束时间，签到状态就是迟到
            maintainanceTaskDetailPoPo.setState("50000");
        } else {  //如果巡检点签到时间在巡检计划开始时间和巡检计划结束时间之间，签到状态就是正常
            maintainanceTaskDetailPoPo.setState("60000");
        }
        maintainanceTaskDetailPoPo.setState(MaintainanceTaskDetailDto.STATE_FINISH);

//        if (detailTime < planStartTime) {  //如果巡检点签到时间小于巡检计划开始时间，签到状态就是早到
//            maintainanceTaskDetailPoPo.setState(MaintainanceTaskDetailDto.STATE_FINISH);
//        } else if (detailTime > planFinishTime) {  //如果巡检点签到时间大于巡检计划结束时间，签到状态就是迟到
//            maintainanceTaskDetailPoPo.setState("50000");
//        } else {  //如果巡检点签到时间在巡检计划开始时间和巡检计划结束时间之间，签到状态就是正常
//            maintainanceTaskDetailPoPo.setState("60000");
//        }

        int flag = maintainanceTaskDetailV1InnerServiceSMOImpl.updateMaintainanceTaskDetail(maintainanceTaskDetailPoPo);