合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-community/src/main/java/com/java110/community/bmo/assets/impl/QueryAssetsInspectionBMOImpl.java

@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.community.bmo.assets.IQueryAssetsInspectionBMO;
import com.java110.dto.inspectionTask.InspectionTaskDto;
import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.utils.util.DateUtil;
import com.java110.vo.ResultVo;
@@ -56,6 +56,7 @@
        return ResultVo.createResponseEntity(data);
    }


    private void dealInpectionTask(JSONArray data, InspectionTaskDto inspectionTaskDto1) {
        JSONObject dataObj = null;
        dataObj = new JSONObject();
@@ -68,7 +69,7 @@
            } else if ("20200406".equals(state)) {
                dataObj.put("msg", inspectionTaskDto1.getPlanUserName() + " 正在巡检中");
            } else {
                if (planInTime.getTime() > DateUtil.getCurrentDate().getTime()) {
                if (planInTime.getTime() < DateUtil.getCurrentDate().getTime()) {
                    dataObj.put("msg", inspectionTaskDto1.getPlanUserName() + " 未巡检");
                } else {
                    dataObj.put("msg", inspectionTaskDto1.getPlanUserName() + " 将于 " + inspectionTaskDto1.getPlanInsTime() + " 开始巡检");