优化

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/controller/ItdmJCXMSHJHController.java

@@ -1,12 +1,10 @@
 package org.jeecg.modules.itdmGongDan.controller;
 
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.modules.itdmGongDan.dto.ItdmXMJLQueryListDTO;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanMasterService;
 import org.jeecg.modules.itdmGongDan.service.IItdmJCXMSHJHService;
@@ -61,8 +59,8 @@ public class ItdmJCXMSHJHController {
     @ApiOperation(value="项目经理新增或修改工单master", notes="项目经理新增或修改工单master")
     @PostMapping(value = "/XMJLAddOrUpdate")
     public Result<String> XMJLAddOrUpdate(@RequestBody ItdmXMJLQueryListVO vo) {
-        System.out.println("项目经理新增工单master");
-        System.out.println(JSON.toJSON(vo));
+        System.out.println("项目经理新增或修改工单master");
+//        System.out.println(JSON.toJSON(vo));
         return Result.OK(iItdmJCXMSHJHService.XMJLAddOrUpdate(vo));
     }
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/vo/ItdmJHYQueryListVO.java

@@ -300,10 +300,12 @@ public class ItdmJHYQueryListVO {
             vo.setLastTime(days);//如果没有开始时间和结束时间，初始化开始时间为今天，持续时间为1为
             vo.setJihuaStartDate(new Date());
         }
-        if(vo.getStatus()==0) vo.setStatusC("未确认");
-        else if(vo.getStatus()==1) vo.setStatusC("已确认");
-        else if(vo.getStatus()==2) vo.setStatusC("完成");
-        vo.setWeituoNo(weituoNo);
+        if(vo.getStatus()!=null){
+            if(vo.getStatus()==0) vo.setStatusC("未确认");
+            else if(vo.getStatus()==1) vo.setStatusC("已确认");
+            else if(vo.getStatus()==2) vo.setStatusC("完成");
+            vo.setWeituoNo(weituoNo);
+        }
 
         if(vo.getChuanganqi()!=null && !vo.getChuanganqi().equals("")){
             String[] arr = vo.getChuanganqi().split(",");