From abdb3f17ff56d14dd1af5f2cfb617b770e260fd9 Mon Sep 17 00:00:00 2001 From: chenweiwei Date: Sat, 1 Jun 2024 23:30:37 +0800 Subject: [PATCH] 点火 --- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McIgnitionController.java | 57 +++++++++++++++++++++++++++++++++++++++------------------ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McIgnition.java | 323 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/IgnitionStatusEnums.java | 28 ++++++++++++++++++++++++++++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcIgnitionService.java | 9 +++++++++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java | 5 ++++- zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McIgnitionMapper.xml | 29 +++++++++++++++++++---------- 7 files changed, 359 insertions(+), 185 deletions(-) create mode 100644 zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/IgnitionStatusEnums.java 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 b99ddde..1458b60 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 @@ -1,9 +1,8 @@ package com.chinagas.modules.schsf.controller; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.util.MapUtils; -import com.alibaba.fastjson2.JSON; +import cn.hutool.core.bean.BeanUtil; import com.chinagas.common.core.domain.AjaxResult; +import com.chinagas.common.core.utils.StringUtils; import com.chinagas.common.core.web.controller.BaseController; import com.chinagas.common.core.web.page.TableDataInfo; import com.chinagas.common.log.annotation.Log; @@ -14,11 +13,7 @@ import com.chinagas.modules.schsf.service.IMcIgnitionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.net.URLEncoder; import java.util.List; -import java.util.Map; /** @@ -47,9 +42,35 @@ 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("参数不可为空"); + } + if (mcIgnition.getId()==null){ + throw new RuntimeException("id不可为空"); + } + if (StringUtils.isEmpty(mcIgnition.getIgnCnfStatusCode())){ + throw new RuntimeException("确认状态不可为空"); + } + if (mcIgnition.getIgnTime()==null){ + throw new RuntimeException("点火时间不可为空"); + } + return toAjax(mcIgnitionService.updateMcIgnitionMaintenance(mcIgnition)); + } + + + + +/* + *//** + * 导出点火维护列表 + *//* @RequirePermission("schsf:mcIgnition:export") @Log(title = "点火维护",businessType = BusinessType.EXPORT) @PostMapping("/export") @@ -78,9 +99,9 @@ public class McIgnitionController extends BaseController } - /** + *//** * 获取点火维护详细信息 - */ + *//* @RequirePermission("schsf:mcIgnition:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) @@ -88,9 +109,9 @@ public class McIgnitionController extends BaseController return AjaxResult.success(mcIgnitionService.selectMcIgnitionById(id)); } - /** + *//** * 新增点火维护 - */ + *//* @RequirePermission("schsf:mcIgnition:add") @Log(title = "点火维护", businessType = BusinessType.INSERT) @PostMapping @@ -99,9 +120,9 @@ public class McIgnitionController extends BaseController return toAjax(mcIgnitionService.insertMcIgnition(mcIgnition)); } - /** + *//** * 修改点火维护 - */ + *//* @RequirePermission("schsf:mcIgnition:edit") @Log(title = "点火维护", businessType = BusinessType.UPDATE) @PutMapping @@ -110,14 +131,14 @@ public class McIgnitionController extends BaseController return toAjax(mcIgnitionService.updateMcIgnition(mcIgnition)); } - /** + *//** * 删除点火维护 - */ + *//* @RequirePermission("schsf:mcIgnition:remove") @Log(title = "点火维护", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(mcIgnitionService.deleteMcIgnitionByIds(ids)); - } + }*/ } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McIgnition.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McIgnition.java index ed23865..5c4a422 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McIgnition.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McIgnition.java @@ -1,11 +1,13 @@ package com.chinagas.modules.schsf.domain; +import cn.hutool.core.date.DateTime; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.chinagas.common.core.web.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.time.LocalDateTime; import java.util.Date; /** @@ -15,340 +17,361 @@ import java.util.Date; * @date 2024-05-22 */ @ExcelIgnoreUnannotated -public class McIgnition extends BaseEntity -{ +public class McIgnition extends BaseEntity implements Cloneable { private static final long serialVersionUID = 1L; - /** 主键id */ + /** + * 主键id + */ private Long id; - /** 拜访id */ + /** + * 拜访id + */ @ExcelProperty(value = "拜访id") private Long visitId; - /** 区域名称 */ + /** + * 区域名称 + */ @ExcelProperty(value = "区域名称") private String regionName; - /** 集团名称 */ + /** + * 集团名称 + */ @ExcelProperty(value = "集团名称") private String groupName; - /** 公司名称 */ + /** + * 公司名称 + */ @ExcelProperty(value = "公司名称") private String companyName; - /** 公司代码 */ + /** + * 公司代码 + */ @ExcelProperty(value = "公司代码") private String companyCode; - /** 客户-省 */ + /** + * 客户-省 + */ @ExcelProperty(value = "客户-省") private String userProvince; - /** 客户-市 */ + /** + * 客户-市 + */ @ExcelProperty(value = "客户-市") private String userCity; - /** 客户-区 */ + /** + * 客户-区 + */ @ExcelProperty(value = "客户-区") private String userDistrict; - /** 客户-街道 */ + /** + * 客户-街道 + */ @ExcelProperty(value = "客户-街道") private String userStreet; - /** 村(小区) */ + /** + * 村(小区) + */ @ExcelProperty(value = "村(小区)") private String vlgOrCmty; - /** 城乡分类 */ + /** + * 城乡分类 + */ @ExcelProperty(value = "城乡分类") private String urbRurCls; - /** 客户-详细地址 */ + /** + * 客户-详细地址 + */ @ExcelProperty(value = "客户-详细地址") private String userDetailedAddress; - /** 客户-用户编号 */ + /** + * 客户-用户编号 + */ @ExcelProperty(value = "客户-用户编号") private String userCode; - /** 客户-户名 */ + /** + * 客户-户名 + */ @ExcelProperty(value = "客户-户名") private String userName; - /** 客户-电话 */ + /** + * 客户-电话 + */ @ExcelProperty(value = "客户-电话") private String userPhone; - /** 点火确认状态代码(0：未确认，1：是，2：否) */ - @ExcelProperty(value = "点火确认状态代码(0：未确认，1：是，2：否)") + /** + * 点火确认状态代码(NULL：未确认，Y：是，N：否) + */ + @ExcelProperty(value = "点火确认状态代码(NULL：未确认，Y：是，N：否)") private String ignCnfStatusCode; - /** 点火时间 */ + /** + * 点火时间 + */ @ExcelProperty(value = "点火时间") - private Date ignTime; + private LocalDateTime ignTime; - /** 未点火原因 */ + /** + * 未点火原因 + */ @ExcelProperty(value = "未点火原因") private String nIgnRsn; - /** 负责人ID */ + /** + * 负责人ID + */ @ExcelProperty(value = "负责人ID") private Long cnfPersonId; - /** 负责人名称 */ + /** + * 负责人名称 + */ @ExcelProperty(value = "负责人名称") private String cnfPersonName; - /** 负责人账号 */ + /** + * 负责人账号 + */ @ExcelProperty(value = "负责人账号") private String cnfPersonAccount; - /** 删除标志（0：未删除，1：已删除） */ + /** + * 删除标志（0：未删除，1：已删除） + */ @ExcelProperty(value = "删除标志") private String defFlag; - public void setId(Long id) - { + + /** + * 状态名称 + */ + private String statusName; + /** + * 状态代码 + */ + private String statusCode; + + + public void setId(Long id) { this.id = id; } - public Long getId() - { + public Long getId() { return id; } - public void setVisitId(Long visitId) - { + + public void setVisitId(Long visitId) { this.visitId = visitId; } - public Long getVisitId() - { + public Long getVisitId() { return visitId; } - public void setRegionName(String regionName) - { + + public void setRegionName(String regionName) { this.regionName = regionName; } - public String getRegionName() - { + public String getRegionName() { return regionName; } - public void setGroupName(String groupName) - { + + public void setGroupName(String groupName) { this.groupName = groupName; } - public String getGroupName() - { + public String getGroupName() { return groupName; } - public void setCompanyName(String companyName) - { + + public void setCompanyName(String companyName) { this.companyName = companyName; } - public String getCompanyName() - { + public String getCompanyName() { return companyName; } - public void setCompanyCode(String companyCode) - { + + public void setCompanyCode(String companyCode) { this.companyCode = companyCode; } - public String getCompanyCode() - { + public String getCompanyCode() { return companyCode; } - public void setUserProvince(String userProvince) - { + + public void setUserProvince(String userProvince) { this.userProvince = userProvince; } - public String getUserProvince() - { + public String getUserProvince() { return userProvince; } - public void setUserCity(String userCity) - { + + public void setUserCity(String userCity) { this.userCity = userCity; } - public String getUserCity() - { + public String getUserCity() { return userCity; } - public void setUserDistrict(String userDistrict) - { + + public void setUserDistrict(String userDistrict) { this.userDistrict = userDistrict; } - public String getUserDistrict() - { + public String getUserDistrict() { return userDistrict; } - public void setUserStreet(String userStreet) - { + + public void setUserStreet(String userStreet) { this.userStreet = userStreet; } - public String getUserStreet() - { + public String getUserStreet() { return userStreet; } - public void setVlgOrCmty(String vlgOrCmty) - { + + public void setVlgOrCmty(String vlgOrCmty) { this.vlgOrCmty = vlgOrCmty; } - public String getVlgOrCmty() - { + public String getVlgOrCmty() { return vlgOrCmty; } - public void setUrbRurCls(String urbRurCls) - { + + public void setUrbRurCls(String urbRurCls) { this.urbRurCls = urbRurCls; } - public String getUrbRurCls() - { + public String getUrbRurCls() { return urbRurCls; } - public void setUserDetailedAddress(String userDetailedAddress) - { + + public void setUserDetailedAddress(String userDetailedAddress) { this.userDetailedAddress = userDetailedAddress; } - public String getUserDetailedAddress() - { + public String getUserDetailedAddress() { return userDetailedAddress; } - public void setUserCode(String userCode) - { + + public void setUserCode(String userCode) { this.userCode = userCode; } - public String getUserCode() - { + public String getUserCode() { return userCode; } - public void setUserName(String userName) - { + + public void setUserName(String userName) { this.userName = userName; } - public String getUserName() - { + public String getUserName() { return userName; } - public void setUserPhone(String userPhone) - { + + public void setUserPhone(String userPhone) { this.userPhone = userPhone; } - public String getUserPhone() - { + public String getUserPhone() { return userPhone; } - public void setIgnCnfStatusCode(String ignCnfStatusCode) - { + + public void setIgnCnfStatusCode(String ignCnfStatusCode) { this.ignCnfStatusCode = ignCnfStatusCode; } - public String getIgnCnfStatusCode() - { + public String getIgnCnfStatusCode() { return ignCnfStatusCode; } - public void setIgnTime(Date ignTime) - { + + public void setIgnTime(LocalDateTime ignTime) { this.ignTime = ignTime; } - public Date getIgnTime() - { + public LocalDateTime getIgnTime() { return ignTime; } - public void setnIgnRsn(String nIgnRsn) - { + + public void setnIgnRsn(String nIgnRsn) { this.nIgnRsn = nIgnRsn; } - public String getnIgnRsn() - { + public String getnIgnRsn() { return nIgnRsn; } - public void setCnfPersonId(Long cnfPersonId) - { + + public void setCnfPersonId(Long cnfPersonId) { this.cnfPersonId = cnfPersonId; } - public Long getCnfPersonId() - { + public Long getCnfPersonId() { return cnfPersonId; } - public void setCnfPersonName(String cnfPersonName) - { + + public void setCnfPersonName(String cnfPersonName) { this.cnfPersonName = cnfPersonName; } - public String getCnfPersonName() - { + public String getCnfPersonName() { return cnfPersonName; } - public void setCnfPersonAccount(String cnfPersonAccount) - { + + public void setCnfPersonAccount(String cnfPersonAccount) { this.cnfPersonAccount = cnfPersonAccount; } - public String getCnfPersonAccount() - { + public String getCnfPersonAccount() { return cnfPersonAccount; } - public void setDefFlag(String defFlag) - { + + public void setDefFlag(String defFlag) { this.defFlag = defFlag; } - public String getDefFlag() - { + public String getDefFlag() { return defFlag; } + + public String getStatusName() { + return statusName; + } + + public void setStatusName(String statusName) { + this.statusName = statusName; + } + + public String getStatusCode() { + return statusCode; + } + + public void setStatusCode(String statusCode) { + this.statusCode = statusCode; + } + + @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("visitId", getVisitId()) - .append("regionName", getRegionName()) - .append("groupName", getGroupName()) - .append("companyName", getCompanyName()) - .append("companyCode", getCompanyCode()) - .append("userProvince", getUserProvince()) - .append("userCity", getUserCity()) - .append("userDistrict", getUserDistrict()) - .append("userStreet", getUserStreet()) - .append("vlgOrCmty", getVlgOrCmty()) - .append("urbRurCls", getUrbRurCls()) - .append("userDetailedAddress", getUserDetailedAddress()) - .append("userCode", getUserCode()) - .append("userName", getUserName()) - .append("userPhone", getUserPhone()) - .append("ignCnfStatusCode", getIgnCnfStatusCode()) - .append("ignTime", getIgnTime()) - .append("nIgnRsn", getnIgnRsn()) - .append("cnfPersonId", getCnfPersonId()) - .append("cnfPersonName", getCnfPersonName()) - .append("cnfPersonAccount", getCnfPersonAccount()) - .append("remark", getRemark()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .append("defFlag", getDefFlag()) - .toString(); + public McIgnition clone() throws CloneNotSupportedException { + return (McIgnition) super.clone(); } } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/IgnitionStatusEnums.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/IgnitionStatusEnums.java new file mode 100644 index 0000000..1f85f9d --- /dev/null +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/IgnitionStatusEnums.java @@ -0,0 +1,28 @@ +package com.chinagas.modules.schsf.enums; + +/** + * 点火维护状态 + */ +public enum IgnitionStatusEnums { + + MAINTENANCE_PENDING("MAINTENANCE_PENDING", "待维护"), + MAINTENANCE_YES("MAINTENANCE_YES", "已维护(是)"), + MAINTENANCE_NO("MAINTENANCE_NO", "已维护(否)"), + CANCEL("CANCEL", "已作废"); + + private final String code; + private final String info; + + + public String getCode() { + return code; + } + public String getInfo() { + return info; + } + IgnitionStatusEnums(String code, String info) { + this.code = code; + this.info = info; + } + +} 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 64ca113..89c4bd1 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 @@ -68,4 +68,13 @@ public interface IMcIgnitionService * @return 结果 */ public int deleteMcIgnitionById(Long id); + + /** + * 点火确认 + * @param mcIgnition + * @return + */ + int updateMcIgnitionMaintenance(McIgnition mcIgnition) 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 2e2878b..c0a7ea4 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 @@ -3,15 +3,20 @@ package com.chinagas.modules.schsf.service.impl; import com.alibaba.fastjson2.JSON; import com.chinagas.common.core.utils.DateUtils; import com.chinagas.common.core.utils.StringUtils; +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.enums.IgnitionStatusEnums; import com.chinagas.modules.schsf.enums.YesNoEnums; import com.chinagas.modules.schsf.mapper.McIgnitionMapper; import com.chinagas.modules.schsf.service.IMcIgnitionService; import com.chinagas.modules.schsf.service.IMcOperationLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.List; /** @@ -20,6 +25,7 @@ import java.util.List; * @author cw * @date 2024-05-22 */ +@Transactional @Service public class McIgnitionServiceImpl implements IMcIgnitionService { @Autowired @@ -39,6 +45,13 @@ public class McIgnitionServiceImpl implements IMcIgnitionService { return 0; } + LocalDateTime time = DateUtils.getNowLocal(); + String userId = SecurityUtils.getUserId().toString(); + String userAccount = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser().getSysUser().getNickName(); + + + McIgnition mcIgnition = new McIgnition(); mcIgnition.setRegionName(mcVisit.getRegionName()); mcIgnition.setGroupName(mcVisit.getGroupName()); @@ -63,14 +76,17 @@ public class McIgnitionServiceImpl implements IMcIgnitionService { mcIgnition.setUserPhone(mcVisit.getUserPhone()); mcIgnition.setIgnCnfStatusCode("0"); - mcIgnition.setCreateTime(mcVisit.getCreateTime()); - mcIgnition.setCreateBy(mcVisit.getCreateBy()); - mcIgnition.setUpdateTime(mcVisit.getUpdateTime()); - mcIgnition.setUpdateBy(mcVisit.getUpdateBy()); + mcIgnition.setCreateTime(time); + mcIgnition.setCreateBy(userId); + mcIgnition.setUpdateTime(time); + mcIgnition.setUpdateBy(userId); + + mcIgnition.setStatusCode(IgnitionStatusEnums.MAINTENANCE_PENDING.getCode()); + mcIgnition.setStatusName(IgnitionStatusEnums.MAINTENANCE_PENDING.getInfo()); int i = mcIgnitionMapper.insertMcIgnition(mcIgnition); //1:添加记录 - iMcOperationLogService.insertMcOperationLog("mc_ignition", mcIgnition.getId(), "项目公司_收费员", - mcVisit.getBillingPersonName(), mcVisit.getBillingPersonAccount(),mcVisit.getCreateBy(), mcIgnition.getCreateTime(), + iMcOperationLogService.insertMcOperationLog("mc_ignition", mcIgnition.getId(), "点火维护", + userName,userAccount,userId, mcIgnition.getCreateTime(), "发起", "1", null, null, JSON.toJSONString(mcIgnition)); return i; } @@ -92,6 +108,7 @@ public class McIgnitionServiceImpl implements IMcIgnitionService { * @param mcIgnition 点火维护 * @return 点火维护 */ + @DataScope(deptAlias = "d", userAlias = "u") @Override public List selectMcIgnitionList(McIgnition mcIgnition) { return mcIgnitionMapper.selectMcIgnitionList(mcIgnition); @@ -142,4 +159,68 @@ public class McIgnitionServiceImpl implements IMcIgnitionService { public int deleteMcIgnitionById(Long id) { return mcIgnitionMapper.deleteMcIgnitionById(id); } + + /** + * 点火维护 + * @param mcIgnition + * @return + */ + @Override + public int updateMcIgnitionMaintenance(McIgnition mcIgnitionVo) 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_new = mcIgnition_old.clone(); + mcIgnition_new.setIgnCnfStatusCode(mcIgnitionVo.getIgnCnfStatusCode()); + mcIgnition_new.setIgnTime(mcIgnitionVo.getIgnTime()); + mcIgnition_new.setnIgnRsn(mcIgnitionVo.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.setCnfPersonId(userId); + mcIgnition_new.setCnfPersonAccount(userAccount); + mcIgnition_new.setCnfPersonName(userName); + int i = mcIgnitionMapper.updateMcIgnition(mcIgnition_new); + //1:添加记录 + iMcOperationLogService.insertMcOperationLog("mc_ignition", mcIgnitionVo.getId(), "点火维护", + userName, userAccount,userId.toString(), time, + "维护", "1", null, JSON.toJSONString(mcIgnition_old), JSON.toJSONString(mcIgnition_new)); + return i; + } + + /** + * 作废 + * @param visitId + */ + @Override + public void updateMcIgnitionCancel(Long visitId) throws CloneNotSupportedException { + LocalDateTime time = DateUtils.getNowLocal(); + String userId = SecurityUtils.getUserId().toString(); + String userAccount = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser().getSysUser().getNickName(); + + McIgnition mcIgnition= new McIgnition(); + mcIgnition.setVisitId(visitId); + List mcIgnitions = mcIgnitionMapper.selectMcIgnitionList(mcIgnition); + if (mcIgnitions !=null && mcIgnitions.size()>0){ + for (McIgnition mcIgnition_old : mcIgnitions) { + //新数据 + McIgnition mcIgnition_new = mcIgnition_old.clone(); + mcIgnition_new.setUpdateBy(userId); + mcIgnition_new.setUpdateTime(time); + mcIgnition_new.setStatusCode(IgnitionStatusEnums.CANCEL.getCode()); + mcIgnition_new.setStatusName(IgnitionStatusEnums.CANCEL.getInfo()); + int i = mcIgnitionMapper.updateMcIgnition(mcIgnition_new); + //1:添加记录 + iMcOperationLogService.insertMcOperationLog("mc_ignition", mcIgnition_new.getId(), "点火维护", + userName, userAccount,userId, time, + "作废", "1", null, JSON.toJSONString(mcIgnition_old), JSON.toJSONString(mcIgnition_new)); + } + } + } } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java index 0d20e4e..5f8d90e 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java @@ -105,7 +105,7 @@ public class McVisitServiceImpl implements IMcVisitService { private void getStatusNodeName(String publishStatus, String modificationStatus, String defFlag, McVisit mcVisit) { if (StringUtils.isNotEmpty(defFlag) && defFlag.equals("1")) { - mcVisit.setDefFlag("1"); +// mcVisit.setDefFlag("1"); mcVisit.setStatusNodeName(""); mcVisit.setStatusCode(VisitStatusEnums.CANCEL.getCode()); mcVisit.setStatusName(VisitStatusEnums.CANCEL.getInfo()); @@ -414,6 +414,9 @@ public class McVisitServiceImpl implements IMcVisitService { iMcOperationLogService.insertMcOperationLog("mc_visit", mcVisit.getId(), "项目公司_市场负责人", userName, userAccount, userId, updateTime, "作废", "1", null, JSON.toJSONString(mcVisit), JSON.toJSONString(mcVisit_new)); + + //2：作废至点火记录 + iMcIgnitionService.updateMcIgnitionCancel(id); return mcVisitMapper.updateMcVisit(mcVisit_new); } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McIgnitionMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McIgnitionMapper.xml index dab5c5e..5bbf1cc 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McIgnitionMapper.xml +++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McIgnitionMapper.xml @@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select t.id, t.visit_id, t.region_name, t.group_name, t.company_name, t.company_code, t.user_province, t.user_city, t.user_district, t.user_street, t.vlg_or_cmty, t.urb_rur_cls, t.user_detailed_address, t.user_code, t.user_name, t.user_phone, t.ign_cnf_status_code, t.ign_time, t.n_ign_rsn, t.cnf_person_id, - t.cnf_person_name, t.cnf_person_account, t.remark, t.create_time, t.create_by, t.update_time, t.update_by, t.def_flag + t.cnf_person_name, t.cnf_person_account, t.remark, t.create_time, t.create_by, t.update_time, t.update_by, t.def_flag,t.status_code,t.status_name from mc_ignition t left join sys_user u on u.user_id = t.create_by left join sys_dept d on d.dept_id = t.company_code @@ -70,6 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t.cnf_person_name like concat('%', #{cnfPersonName}, '%') and t.cnf_person_account = #{cnfPersonAccount} and t.def_flag = #{defFlag} + and t.status_code = #{statusCode} + and t.status_name = #{statusName} ${params.dataScope} @@ -111,6 +113,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, update_by, def_flag, + status_code, + status_name, #{id}, @@ -141,6 +145,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{updateBy}, #{defFlag}, + #{statusCode}, + #{statusName}, @@ -174,6 +180,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, update_by = #{updateBy}, def_flag = #{defFlag}, + status_code = #{statusCode}, + status_name = #{statusName}, where id = #{id} @@ -193,15 +201,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" -- libgit2 0.21.2