陈威 / MarketBasedPricingProgram

Download as
Browse Code »

Commit 108c9d85ece39a64fb9d1ef9ee6150b27cb359be

Authored by 陈威
1 parent 348cca59
Exists in dev

点火确认- 是 才判断时间不为空

Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McIgnitionController.java
  Diff comments   View file @108c9d8
... ... @@ -9,6 +9,7 @@ import com.chinagas.common.log.annotation.Log;
9 9 import com.chinagas.common.log.enums.BusinessType;
10 10 import com.chinagas.common.security.annotation.RequirePermission;
11 11 import com.chinagas.modules.schsf.domain.McIgnition;
  12 +import com.chinagas.modules.schsf.enums.YesNoEnums;
12 13 import com.chinagas.modules.schsf.service.IMcIgnitionService;
13 14 import org.springframework.beans.factory.annotation.Autowired;
14 15 import org.springframework.web.bind.annotation.*;
... ... @@ -57,7 +58,7 @@ public class McIgnitionController extends BaseController
57 58 if (StringUtils.isEmpty(mcIgnition.getIgnCnfStatusCode())){
58 59 throw new RuntimeException("确认状态不可为空");
59 60 }
60   - if (mcIgnition.getIgnTime()==null){
  61 + if ( mcIgnition.getIgnCnfStatusCode().equals(YesNoEnums.Y.getName()) && mcIgnition.getIgnTime()==null){
61 62 throw new RuntimeException("点火时间不可为空");
62 63 }
63 64 return toAjax(mcIgnitionService.updateMcIgnitionMaintenance(mcIgnition));
... ...