From 967c5c8f515913dcd673d94c27e414eec01dd4f6 Mon Sep 17 00:00:00 2001 From: chenweiwei Date: Sun, 2 Jun 2024 00:53:17 +0800 Subject: [PATCH] 施工维护 --- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McConstructionController.java | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/test.java | 30 ++++++++++++------------------ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McConstruction.java | 34 ++++++++++++++++++++-------------- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcConstructionService.java | 45 ++++++++++++++++++++++++++++++++++++--------- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java | 9 ++++++++- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McConstructionServiceImpl.java | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java | 4 ++-- zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml | 2 +- zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McConstructionMapper.xml | 2 +- 9 files changed, 322 insertions(+), 151 deletions(-) diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McConstructionController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McConstructionController.java index 2b87f36..312a0a8 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McConstructionController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McConstructionController.java @@ -1,31 +1,17 @@ package com.chinagas.modules.schsf.controller; -import java.net.URLEncoder; -import java.util.List; -import java.io.IOException; -import java.util.Map; -import javax.servlet.http.HttpServletResponse; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.util.MapUtils; -import com.alibaba.fastjson2.JSON; import com.chinagas.common.core.domain.AjaxResult; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.chinagas.common.core.web.controller.BaseController; +import com.chinagas.common.core.web.page.TableDataInfo; 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.McConstruction; import com.chinagas.modules.schsf.service.IMcConstructionService; -import com.chinagas.common.core.web.controller.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; -import com.chinagas.common.core.web.page.TableDataInfo; +import java.util.List; /** @@ -54,75 +40,101 @@ public class McConstructionController extends BaseController } - /** - * 导出施工维护列表 - */ - @RequirePermission("schsf:mcConstruction:export") - @Log(title = "施工维护",businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response,McConstruction mcConstruction) throws IOException { - List list = mcConstructionService.selectMcConstructionList(mcConstruction); - try { - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - response.setCharacterEncoding("utf-8"); - // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 - String fileName = URLEncoder.encode("施工维护", "UTF-8").replaceAll("\\+", "%20"); - response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - // 这里需要设置不关闭流 - EasyExcel.write(response.getOutputStream(), McConstruction.class).autoCloseStream(Boolean.FALSE).sheet("客户信息列表") - .doWrite(list); - } catch (Exception e) { - // 重置response - e.printStackTrace(); - response.reset(); - response.setContentType("application/json"); - response.setCharacterEncoding("utf-8"); - Map map = MapUtils.newHashMap(); - map.put("status", "failure"); - map.put("message", "下载文件失败" + e.getMessage()); - response.getWriter().println(JSON.toJSONString(map)); - } - } - /** - * 获取施工维护详细信息 - */ - @RequirePermission("schsf:mcConstruction:query") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(mcConstructionService.selectMcConstructionById(id)); - } /** - * 新增施工维护 + * 新增点火维护 */ - @RequirePermission("schsf:mcConstruction:add") - @Log(title = "施工维护", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody McConstruction mcConstruction) - { - return toAjax(mcConstructionService.insertMcConstruction(mcConstruction)); + @RequirePermission("schsf:mcConstruction:engineering") + @Log(title = "施工维护", businessType = BusinessType.UPDATE) + @PostMapping("/engineering") + public AjaxResult engineering(@RequestBody McConstruction mcConstruction) throws CloneNotSupportedException { + + return toAjax(mcConstructionService.updateMcConstructionByEngineering(mcConstruction)); } /** - * 修改施工维护 + * 新增点火维护 */ - @RequirePermission("schsf:mcConstruction:edit") + @RequirePermission("schsf:mcConstruction:operations") @Log(title = "施工维护", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody McConstruction mcConstruction) - { - return toAjax(mcConstructionService.updateMcConstruction(mcConstruction)); + @PostMapping("/operations") + public AjaxResult operations(@RequestBody McConstruction mcConstruction) throws CloneNotSupportedException { + return toAjax(mcConstructionService.updateMcConstructionByOperations(mcConstruction)); } - /** - * 删除施工维护 - */ - @RequirePermission("schsf:mcConstruction:remove") - @Log(title = "施工维护", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(mcConstructionService.deleteMcConstructionByIds(ids)); - } + + + +// +// /** +// * 导出施工维护列表 +// */ +// @RequirePermission("schsf:mcConstruction:export") +// @Log(title = "施工维护",businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// public void export(HttpServletResponse response,McConstruction mcConstruction) throws IOException { +// List list = mcConstructionService.selectMcConstructionList(mcConstruction); +// try { +// response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); +// response.setCharacterEncoding("utf-8"); +// // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 +// String fileName = URLEncoder.encode("施工维护", "UTF-8").replaceAll("\\+", "%20"); +// response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); +// // 这里需要设置不关闭流 +// EasyExcel.write(response.getOutputStream(), McConstruction.class).autoCloseStream(Boolean.FALSE).sheet("客户信息列表") +// .doWrite(list); +// } catch (Exception e) { +// // 重置response +// e.printStackTrace(); +// response.reset(); +// response.setContentType("application/json"); +// response.setCharacterEncoding("utf-8"); +// Map map = MapUtils.newHashMap(); +// map.put("status", "failure"); +// map.put("message", "下载文件失败" + e.getMessage()); +// response.getWriter().println(JSON.toJSONString(map)); +// } +// } +// /** +// * 获取施工维护详细信息 +// */ +// @RequirePermission("schsf:mcConstruction:query") +// @GetMapping(value = "/{id}") +// public AjaxResult getInfo(@PathVariable("id") Long id) +// { +// return AjaxResult.success(mcConstructionService.selectMcConstructionById(id)); +// } +// +// /** +// * 新增施工维护 +// */ +// @RequirePermission("schsf:mcConstruction:add") +// @Log(title = "施工维护", businessType = BusinessType.INSERT) +// @PostMapping +// public AjaxResult add(@RequestBody McConstruction mcConstruction) +// { +// return toAjax(mcConstructionService.insertMcConstruction(mcConstruction)); +// } +// +// /** +// * 修改施工维护 +// */ +// @RequirePermission("schsf:mcConstruction:edit") +// @Log(title = "施工维护", businessType = BusinessType.UPDATE) +// @PutMapping +// public AjaxResult edit(@RequestBody McConstruction mcConstruction) +// { +// return toAjax(mcConstructionService.updateMcConstruction(mcConstruction)); +// } +// +// /** +// * 删除施工维护 +// */ +// @RequirePermission("schsf:mcConstruction:remove") +// @Log(title = "施工维护", businessType = BusinessType.DELETE) +// @DeleteMapping("/{ids}") +// public AjaxResult remove(@PathVariable Long[] ids) +// { +// return toAjax(mcConstructionService.deleteMcConstructionByIds(ids)); +// } } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/test.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/test.java index b38908f..4bd801c 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/test.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/test.java @@ -6,11 +6,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.concurrent.ThreadLocalRandom; -import java.util.concurrent.atomic.AtomicInteger; - @RestController @RequestMapping("/test") public class test { @@ -26,19 +21,18 @@ public class test { return AjaxResult.success("成功2"); } public static void main(String[] args) { - for (int i = 0; i < 10; i++) { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"); - AtomicInteger sequenceCounter = new AtomicInteger(0); - // 获取当前的日期和时间，并格式化为字符串 - String timestamp = LocalDateTime.now().format(formatter); - // 生成并格式化六位自增序列号 - int randomNum = ThreadLocalRandom.current().nextInt(1000000); - String sequencePart = String.format("%06d", randomNum); - // 合并时间戳和序列号以生成工单编号 - String s = timestamp + sequencePart; - System.out.println(sequencePart); - } - +// for (int i = 0; i < 10; i++) { +// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"); +// AtomicInteger sequenceCounter = new AtomicInteger(0); +// // 获取当前的日期和时间，并格式化为字符串 +// String timestamp = LocalDateTime.now().format(formatter); +// // 生成并格式化六位自增序列号 +// int randomNum = ThreadLocalRandom.current().nextInt(1000000); +// String sequencePart = String.format("%06d", randomNum); +// // 合并时间戳和序列号以生成工单编号 +// String s = timestamp + sequencePart; +// System.out.println(sequencePart); +// } } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McConstruction.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McConstruction.java index b356728..2ec946f 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McConstruction.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McConstruction.java @@ -1,12 +1,12 @@ package com.chinagas.modules.schsf.domain; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; 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; /** * 施工维护对象 mc_construction @@ -15,7 +15,7 @@ import com.chinagas.common.core.web.domain.BaseEntity; * @date 2024-05-30 */ @ExcelIgnoreUnannotated -public class McConstruction extends BaseEntity +public class McConstruction extends BaseEntity implements Cloneable { private static final long serialVersionUID = 1L; @@ -76,7 +76,7 @@ public class McConstruction extends BaseEntity /** 市场派单时间 */ @ExcelProperty(value = "市场派单时间") - private Date assignmentTime; + private LocalDateTime assignmentTime; /** 是否竣工 */ @ExcelProperty(value = "是否竣工") @@ -84,7 +84,7 @@ public class McConstruction extends BaseEntity /** 竣工时间 */ @ExcelProperty(value = "竣工时间") - private Date completionTime; + private LocalDateTime completionTime; /** 未竣工原因 */ @ExcelProperty(value = "未竣工原因") @@ -108,7 +108,7 @@ public class McConstruction extends BaseEntity /** 通气到表前/立管时间 */ @ExcelProperty(value = "通气到表前/立管时间") - private Date gctMtrrisTime; + private LocalDateTime gctMtrrisTime; /** 未完成原因 */ @ExcelProperty(value = "未完成原因") @@ -256,12 +256,12 @@ public class McConstruction extends BaseEntity { return projectTypeCode; } - public void setAssignmentTime(Date assignmentTime) + public void setAssignmentTime(LocalDateTime assignmentTime) { this.assignmentTime = assignmentTime; } - public Date getAssignmentTime() + public LocalDateTime getAssignmentTime() { return assignmentTime; } @@ -274,12 +274,12 @@ public class McConstruction extends BaseEntity { return isCompleted; } - public void setCompletionTime(Date completionTime) + public void setCompletionTime(LocalDateTime completionTime) { this.completionTime = completionTime; } - public Date getCompletionTime() + public LocalDateTime getCompletionTime() { return completionTime; } @@ -328,12 +328,12 @@ public class McConstruction extends BaseEntity { return gasConnMtrRis; } - public void setGctMtrrisTime(Date gctMtrrisTime) + public void setGctMtrrisTime(LocalDateTime gctMtrrisTime) { this.gctMtrrisTime = gctMtrrisTime; } - public Date getGctMtrrisTime() + public LocalDateTime getGctMtrrisTime() { return gctMtrrisTime; } @@ -421,4 +421,10 @@ public class McConstruction extends BaseEntity .append("defFlag", getDefFlag()) .toString(); } + + + @Override + public McConstruction clone() throws CloneNotSupportedException { + return (McConstruction) super.clone(); + } } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcConstructionService.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcConstructionService.java index fa5b771..9b243a0 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcConstructionService.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcConstructionService.java @@ -1,19 +1,21 @@ package com.chinagas.modules.schsf.service; -import java.util.List; +import com.chinagas.modules.schsf.domain.McBasicCmty; import com.chinagas.modules.schsf.domain.McConstruction; +import java.util.List; + /** * 施工维护Service接口 - * + * * @author cw * @date 2024-05-30 */ -public interface IMcConstructionService +public interface IMcConstructionService { /** * 查询施工维护 - * + * * @param id 施工维护主键 * @return 施工维护 */ @@ -21,7 +23,7 @@ public interface IMcConstructionService /** * 查询施工维护列表 - * + * * @param mcConstruction 施工维护 * @return 施工维护集合 */ @@ -29,7 +31,7 @@ public interface IMcConstructionService /** * 新增施工维护 - * + * * @param mcConstruction 施工维护 * @return 结果 */ @@ -37,7 +39,7 @@ public interface IMcConstructionService /** * 修改施工维护 - * + * * @param mcConstruction 施工维护 * @return 结果 */ @@ -45,7 +47,7 @@ public interface IMcConstructionService /** * 批量删除施工维护 - * + * * @param ids 需要删除的施工维护主键集合 * @return 结果 */ @@ -53,9 +55,34 @@ public interface IMcConstructionService /** * 删除施工维护信息 - * + * * @param id 施工维护主键 * @return 结果 */ public int deleteMcConstructionById(Long id); + + + /** + * 根据基础数据-户数 添加数据 + * @param mcBasicCmty + * @return + */ + public int insertMcConstructionByMcBasicCmty(McBasicCmty mcBasicCmty); + + /** + * 工程 + * @param mcConstruction + * @return + * @throws CloneNotSupportedException + */ + int updateMcConstructionByEngineering(McConstruction mcConstruction) throws CloneNotSupportedException; + + + /** + * 运营 + * @param mcConstruction + * @return + * @throws CloneNotSupportedException + */ + int updateMcConstructionByOperations(McConstruction mcConstruction) throws CloneNotSupportedException; } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java index 4596493..4548c13 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java @@ -8,6 +8,7 @@ import com.chinagas.modules.schsf.domain.dto.CompanyDto; import com.chinagas.modules.schsf.domain.vo.McBasicCmtyVo; import com.chinagas.modules.schsf.mapper.McBasicCmtyMapper; import com.chinagas.modules.schsf.service.IMcBasicCmtyService; +import com.chinagas.modules.schsf.service.IMcConstructionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,6 +25,8 @@ public class McBasicCmtyServiceImpl implements IMcBasicCmtyService { @Autowired private McBasicCmtyMapper mcBasicCmtyMapper; + @Autowired + private IMcConstructionService iMcConstructionService; /** * 查询基础数据-户数 @@ -63,7 +66,11 @@ public class McBasicCmtyServiceImpl implements IMcBasicCmtyService mcBasicCmty.setCreateBy(SecurityUtils.getUserId().toString()); mcBasicCmty.setUpdateTime(DateUtils.getNowLocal()); mcBasicCmty.setUpdateBy(SecurityUtils.getUserId().toString()); - return mcBasicCmtyMapper.insertMcBasicCmty(mcBasicCmty); + int i = mcBasicCmtyMapper.insertMcBasicCmty(mcBasicCmty); + if (i>0){ + iMcConstructionService.insertMcConstructionByMcBasicCmty(mcBasicCmty); + } + return i; } /** diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McConstructionServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McConstructionServiceImpl.java index 337261c..fb9bb6d 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McConstructionServiceImpl.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McConstructionServiceImpl.java @@ -1,96 +1,221 @@ package com.chinagas.modules.schsf.service.impl; -import java.util.List; +import com.alibaba.fastjson2.JSON; import com.chinagas.common.core.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.chinagas.modules.schsf.mapper.McConstructionMapper; +import com.chinagas.common.security.utils.SecurityUtils; +import com.chinagas.modules.schsf.domain.McBasicCmty; import com.chinagas.modules.schsf.domain.McConstruction; +import com.chinagas.modules.schsf.mapper.McConstructionMapper; import com.chinagas.modules.schsf.service.IMcConstructionService; +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; /** * 施工维护Service业务层处理 - * + * * @author cw * @date 2024-05-30 */ +@Transactional @Service -public class McConstructionServiceImpl implements IMcConstructionService -{ +public class McConstructionServiceImpl implements IMcConstructionService { @Autowired private McConstructionMapper mcConstructionMapper; + @Autowired + private IMcOperationLogService iMcOperationLogService; /** * 查询施工维护 - * + * * @param id 施工维护主键 * @return 施工维护 */ @Override - public McConstruction selectMcConstructionById(Long id) - { + public McConstruction selectMcConstructionById(Long id) { return mcConstructionMapper.selectMcConstructionById(id); } /** * 查询施工维护列表 - * + * * @param mcConstruction 施工维护 * @return 施工维护 */ @Override - public List selectMcConstructionList(McConstruction mcConstruction) - { + public List selectMcConstructionList(McConstruction mcConstruction) { return mcConstructionMapper.selectMcConstructionList(mcConstruction); } /** * 新增施工维护 - * + * * @param mcConstruction 施工维护 * @return 结果 */ @Override - public int insertMcConstruction(McConstruction mcConstruction) - { + public int insertMcConstruction(McConstruction mcConstruction) { mcConstruction.setCreateTime(DateUtils.getNowLocal()); return mcConstructionMapper.insertMcConstruction(mcConstruction); } /** * 修改施工维护 - * + * * @param mcConstruction 施工维护 * @return 结果 */ @Override - public int updateMcConstruction(McConstruction mcConstruction) - { + public int updateMcConstruction(McConstruction mcConstruction) { mcConstruction.setUpdateTime(DateUtils.getNowLocal()); return mcConstructionMapper.updateMcConstruction(mcConstruction); } /** * 批量删除施工维护 - * + * * @param ids 需要删除的施工维护主键 * @return 结果 */ @Override - public int deleteMcConstructionByIds(Long[] ids) - { + public int deleteMcConstructionByIds(Long[] ids) { return mcConstructionMapper.deleteMcConstructionByIds(ids); } /** * 删除施工维护信息 - * + * * @param id 施工维护主键 * @return 结果 */ @Override - public int deleteMcConstructionById(Long id) - { + public int deleteMcConstructionById(Long id) { return mcConstructionMapper.deleteMcConstructionById(id); } + + /** + * 根据小区信息新增施工维护 + * + * @param mcBasicCmty + * @return + */ + @Override + public int insertMcConstructionByMcBasicCmty(McBasicCmty mcBasicCmty) { + LocalDateTime time = DateUtils.getNowLocal(); + String userId = SecurityUtils.getUserId().toString(); + String userAccount = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser().getSysUser().getNickName(); + + McConstruction mcConstruction = new McConstruction(); + mcConstruction.setRegionName(mcBasicCmty.getRegionName()); + mcConstruction.setGroupName(mcBasicCmty.getGroupName()); + mcConstruction.setCompanyCode(mcBasicCmty.getCompanyCode()); + mcConstruction.setCompanyName(mcBasicCmty.getCompanyName()); + mcConstruction.setProvince(mcBasicCmty.getProvince()); + mcConstruction.setCity(mcBasicCmty.getCity()); + mcConstruction.setDistrict(mcBasicCmty.getDistrict()); + mcConstruction.setStreet(mcBasicCmty.getStreet()); + mcConstruction.setVlgOrCmty(mcBasicCmty.getVlgOrCmty()); + List mcConstructions = mcConstructionMapper.selectMcConstructionList(mcConstruction); + if (mcConstructions != null && !mcConstructions.isEmpty()) { + return 0; + } + mcConstruction.setUrbRurCls(mcBasicCmty.getUrbRurCls()); + mcConstruction.setProjectTypeName(mcBasicCmty.getProjectTypeName()); + mcConstruction.setProjectTypeCode(mcBasicCmty.getProjectTypeName().contains("已通气项目零散开发") ? "1" : "0"); + mcConstruction.setIsCompleted("W"); + mcConstruction.setGasConnMtrRis("W"); + + mcConstruction.setCreateTime(time); + mcConstruction.setCreateBy(userId); + mcConstruction.setUpdateTime(time); + mcConstruction.setUpdateBy(userId); + mcConstruction.setCmtyId(mcBasicCmty.getId()); + + int i = mcConstructionMapper.insertMcConstruction(mcConstruction); + //1:添加记录 + iMcOperationLogService.insertMcOperationLog("mc_construction", mcConstruction.getId(), "施工维护", + userName, userAccount, userId, time, + "发起", "1", "导入基础数据-户数", null, JSON.toJSONString(mcConstruction)); + return i; + } + + /** + * 施工维护-工程 + * + * @param mcConstruction_param + * @return + * @throws CloneNotSupportedException + */ + @Override + public int updateMcConstructionByEngineering(McConstruction mcConstruction_param) throws CloneNotSupportedException { + LocalDateTime time = DateUtils.getNowLocal(); + Long userId = SecurityUtils.getUserId(); + String userAccount = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser().getSysUser().getNickName(); + + McConstruction mcConstruction_old = mcConstructionMapper.selectMcConstructionById(mcConstruction_param.getId()); + McConstruction mcConstruction_new = mcConstruction_old.clone(); + //是否已竣工 + mcConstruction_new.setIsCompleted(mcConstruction_param.getIsCompleted()); + //竣工时间 + mcConstruction_new.setCompletionTime(mcConstruction_param.getCompletionTime()); + //未竣工原因 + mcConstruction_new.setNonNcmpRsn(mcConstruction_param.getNonNcmpRsn()); + //市场派单时间 + mcConstruction_new.setAssignmentTime(mcConstruction_param.getAssignmentTime()); + + mcConstruction_new.setProjectPersonId(userId); + mcConstruction_new.setProjectPersonName(userName); + mcConstruction_new.setProjectPersonAccount(userAccount); + mcConstruction_new.setUpdateBy(userId.toString()); + mcConstruction_new.setUpdateTime(time); + int i = mcConstructionMapper.updateMcConstruction(mcConstruction_new); + + iMcOperationLogService.insertMcOperationLog("mc_construction", mcConstruction_param.getId(), "施工维护-工程维护", + userName, userAccount, userId.toString(), time, + "工程维护", "1", null, JSON.toJSONString(mcConstruction_old), JSON.toJSONString(mcConstruction_new)); + return i; + } + + /** + * 施工维护-运营 + * + * @param mcConstruction_param + * @return + * @throws CloneNotSupportedException + */ + @Override + public int updateMcConstructionByOperations(McConstruction mcConstruction_param) throws CloneNotSupportedException { + LocalDateTime time = DateUtils.getNowLocal(); + Long userId = SecurityUtils.getUserId(); + String userAccount = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser().getSysUser().getNickName(); + + McConstruction mcConstruction_old = mcConstructionMapper.selectMcConstructionById(mcConstruction_param.getId()); + McConstruction mcConstruction_new = mcConstruction_old.clone(); + //是否通气到表前 + mcConstruction_new.setGasConnMtrRis(mcConstruction_param.getGasConnMtrRis()); + //市场派单时间 + mcConstruction_new.setAssignmentTime(mcConstruction_param.getAssignmentTime()); + //通气到表前 + mcConstruction_new.setGctMtrrisTime(mcConstruction_param.getGctMtrrisTime()); + //未完成原因 + mcConstruction_new.setGctNcmpRsn(mcConstruction_param.getGctNcmpRsn()); + + mcConstruction_new.setProjectPersonId(userId); + mcConstruction_new.setProjectPersonName(userName); + mcConstruction_new.setProjectPersonAccount(userAccount); + mcConstruction_new.setUpdateBy(userId.toString()); + mcConstruction_new.setUpdateTime(time); + int i = mcConstructionMapper.updateMcConstruction(mcConstruction_new); + iMcOperationLogService.insertMcOperationLog("mc_construction", mcConstruction_param.getId(), "施工维护-运营维护", + userName, userAccount, userId.toString(), time, + "运营维护", "1", null, JSON.toJSONString(mcConstruction_old), JSON.toJSONString(mcConstruction_new)); + return i; + } } 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 c0a7ea4..8a1cfad 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 @@ -74,7 +74,7 @@ public class McIgnitionServiceImpl implements IMcIgnitionService { mcIgnition.setUserCode(mcVisit.getUserCode()); mcIgnition.setUserName(mcVisit.getUserName()); mcIgnition.setUserPhone(mcVisit.getUserPhone()); - mcIgnition.setIgnCnfStatusCode("0"); + mcIgnition.setIgnCnfStatusCode("W"); mcIgnition.setCreateTime(time); mcIgnition.setCreateBy(userId); @@ -87,7 +87,7 @@ public class McIgnitionServiceImpl implements IMcIgnitionService { //1:添加记录 iMcOperationLogService.insertMcOperationLog("mc_ignition", mcIgnition.getId(), "点火维护", userName,userAccount,userId, mcIgnition.getCreateTime(), - "发起", "1", null, null, JSON.toJSONString(mcIgnition)); + "发起", "1", "导入基础数据-户数", null, JSON.toJSONString(mcIgnition)); return i; } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml index 635ff57..d738a87 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml +++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml @@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into mc_basic_cmty id, diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McConstructionMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McConstructionMapper.xml index 90f0a24..3cb38d0 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McConstructionMapper.xml +++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McConstructionMapper.xml @@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into mc_construction id, -- libgit2 0.21.2