diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McIgnitionController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McIgnitionController.java index e39383b..8103456 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McIgnitionController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McIgnitionController.java @@ -9,6 +9,7 @@ import com.chinagas.common.log.annotation.Log; import com.chinagas.common.log.enums.BusinessType; import com.chinagas.common.security.annotation.RequirePermission; import com.chinagas.modules.schsf.domain.McIgnition; +import com.chinagas.modules.schsf.domain.vo.McIgnitionMaintenanceVo; import com.chinagas.modules.schsf.enums.YesNoEnums; import com.chinagas.modules.schsf.service.IMcIgnitionService; import org.springframework.beans.factory.annotation.Autowired; @@ -48,19 +49,10 @@ public class McIgnitionController extends BaseController @RequirePermission("schsf:mcIgnition:maintenance") @Log(title = "点火维护", businessType = BusinessType.UPDATE) @PostMapping("/maintenance") - public AjaxResult maintenance(@RequestBody McIgnition mcIgnition) throws CloneNotSupportedException { - if (BeanUtil.isEmpty(mcIgnition)){ - throw new RuntimeException("参数不可为空"); + public AjaxResult maintenance(@RequestBody McIgnitionMaintenanceVo mcIgnitionMaintenanceVo) throws CloneNotSupportedException { + if (mcIgnitionMaintenanceVo.equals(YesNoEnums.N.getName()) && StringUtils.isEmpty(mcIgnitionMaintenanceVo.getnIgnRsn())){ + throw new RuntimeException("未点火原因不可为空"); } - if (mcIgnition.getId()==null){ - throw new RuntimeException("id不可为空"); - } - if (StringUtils.isEmpty(mcIgnition.getIgnCnfStatusCode())){ - throw new RuntimeException("确认状态不可为空"); - } - if ( mcIgnition.getIgnCnfStatusCode().equals(YesNoEnums.Y.getName()) && mcIgnition.getIgnTime()==null){ - throw new RuntimeException("点火时间不可为空"); - } - return toAjax(mcIgnitionService.updateMcIgnitionMaintenance(mcIgnition)); + return toAjax(mcIgnitionService.updateMcIgnitionMaintenance(mcIgnitionMaintenanceVo)); } } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McIgnitionMaintenanceVo.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McIgnitionMaintenanceVo.java new file mode 100644 index 0000000..7776c06 --- /dev/null +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McIgnitionMaintenanceVo.java @@ -0,0 +1,82 @@ +package com.chinagas.modules.schsf.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +public class McIgnitionMaintenanceVo { + + /** + * 主键id + */ + @NotNull(message = "ID不能为空") + private Long id; + + /** + * 点火确认状态代码(NULL：未确认，Y：是，N：否) + */ + @NotBlank(message = "状态不能为空") + private String ignCnfStatusCode; + + + /** + * 点火时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime ignTime; + + /** + * 客户-用户编号 + */ + @NotBlank(message = "用户编号为空") + private String userCode; + + /** + * 未点火原因 + */ + private String nIgnRsn; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getIgnCnfStatusCode() { + return ignCnfStatusCode; + } + + public void setIgnCnfStatusCode(String ignCnfStatusCode) { + this.ignCnfStatusCode = ignCnfStatusCode; + } + + public LocalDateTime getIgnTime() { + return ignTime; + } + + public void setIgnTime(LocalDateTime ignTime) { + this.ignTime = ignTime; + } + + public String getUserCode() { + return userCode; + } + + public void setUserCode(String userCode) { + this.userCode = userCode; + } + + + public String getnIgnRsn() { + return nIgnRsn; + } + + public void setnIgnRsn(String nIgnRsn) { + this.nIgnRsn = nIgnRsn; + } +} diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcIgnitionService.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcIgnitionService.java index 89c4bd1..779e61d 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcIgnitionService.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcIgnitionService.java @@ -2,6 +2,7 @@ package com.chinagas.modules.schsf.service; import com.chinagas.modules.schsf.domain.McIgnition; import com.chinagas.modules.schsf.domain.McVisit; +import com.chinagas.modules.schsf.domain.vo.McIgnitionMaintenanceVo; import java.util.List; @@ -71,10 +72,10 @@ public interface IMcIgnitionService /** * 点火确认 - * @param mcIgnition + * @param mcIgnitionMaintenanceVo * @return */ - int updateMcIgnitionMaintenance(McIgnition mcIgnition) throws CloneNotSupportedException; + int updateMcIgnitionMaintenance(McIgnitionMaintenanceVo mcIgnitionMaintenanceVo) throws CloneNotSupportedException; void updateMcIgnitionCancel(Long visitId) throws CloneNotSupportedException; } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java index 4425076..a299a19 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java @@ -7,6 +7,7 @@ import com.chinagas.common.datascope.annotation.DataScope; import com.chinagas.common.security.utils.SecurityUtils; import com.chinagas.modules.schsf.domain.McIgnition; import com.chinagas.modules.schsf.domain.McVisit; +import com.chinagas.modules.schsf.domain.vo.McIgnitionMaintenanceVo; import com.chinagas.modules.schsf.enums.IgnitionStatusEnums; import com.chinagas.modules.schsf.enums.YesNoEnums; import com.chinagas.modules.schsf.mapper.McIgnitionMapper; @@ -167,28 +168,32 @@ public class McIgnitionServiceImpl implements IMcIgnitionService { * @return */ @Override - public int updateMcIgnitionMaintenance(McIgnition mcIgnitionVo) throws CloneNotSupportedException { + public int updateMcIgnitionMaintenance(McIgnitionMaintenanceVo mcIgnitionMaintenanceVo) throws CloneNotSupportedException { LocalDateTime time = DateUtils.getNowLocal(); Long userId = SecurityUtils.getUserId(); String userAccount = SecurityUtils.getUsername(); String userName = SecurityUtils.getLoginUser().getSysUser().getNickName(); //老数据 - McIgnition mcIgnition_old = mcIgnitionMapper.selectMcIgnitionById(mcIgnitionVo.getId()); + McIgnition mcIgnition_old = mcIgnitionMapper.selectMcIgnitionById(mcIgnitionMaintenanceVo.getId()); + if (mcIgnition_old==null){ + throw new RuntimeException("被审核信息不存在！"); + } //新数据 McIgnition mcIgnition_new = mcIgnition_old.clone(); - mcIgnition_new.setIgnCnfStatusCode(mcIgnitionVo.getIgnCnfStatusCode()); - mcIgnition_new.setIgnTime(mcIgnitionVo.getIgnTime()); - mcIgnition_new.setnIgnRsn(mcIgnitionVo.getnIgnRsn()); + mcIgnition_new.setIgnCnfStatusCode(mcIgnitionMaintenanceVo.getIgnCnfStatusCode()); + mcIgnition_new.setIgnTime(mcIgnitionMaintenanceVo.getIgnTime()); + mcIgnition_new.setnIgnRsn(mcIgnitionMaintenanceVo.getnIgnRsn()); mcIgnition_new.setUpdateBy(userId.toString()); mcIgnition_new.setUpdateTime(time); - mcIgnition_new.setStatusCode(mcIgnitionVo.getIgnCnfStatusCode().equals("Y")?IgnitionStatusEnums.MAINTENANCE_YES.getCode():IgnitionStatusEnums.MAINTENANCE_NO.getCode()); - mcIgnition_new.setStatusName(mcIgnitionVo.getIgnCnfStatusCode().equals("Y")?IgnitionStatusEnums.MAINTENANCE_YES.getInfo():IgnitionStatusEnums.MAINTENANCE_NO.getInfo()); + mcIgnition_new.setStatusCode(mcIgnitionMaintenanceVo.getIgnCnfStatusCode().equals("Y")?IgnitionStatusEnums.MAINTENANCE_YES.getCode():IgnitionStatusEnums.MAINTENANCE_NO.getCode()); + mcIgnition_new.setStatusName(mcIgnitionMaintenanceVo.getIgnCnfStatusCode().equals("Y")?IgnitionStatusEnums.MAINTENANCE_YES.getInfo():IgnitionStatusEnums.MAINTENANCE_NO.getInfo()); mcIgnition_new.setCnfPersonId(userId); mcIgnition_new.setCnfPersonAccount(userAccount); mcIgnition_new.setCnfPersonName(userName); + mcIgnition_new.setUserCode(StringUtils.isEmpty(mcIgnition_old.getUserCity())?mcIgnitionMaintenanceVo.getUserCode():mcIgnition_old.getUserCity()); int i = mcIgnitionMapper.updateMcIgnition(mcIgnition_new); //1:添加记录 - iMcOperationLogService.insertMcOperationLog("mc_ignition", mcIgnitionVo.getId(), "schsf:mcIgnition:maintenance", + iMcOperationLogService.insertMcOperationLog("mc_ignition", mcIgnitionMaintenanceVo.getId(), "schsf:mcIgnition:maintenance", "维护", "1", null, JSON.toJSONString(mcIgnition_old), JSON.toJSONString(mcIgnition_new)); return i; } -- libgit2 0.21.2