From 291fcfb32ff76f72cad2b99877efcf3e36a9c2b5 Mon Sep 17 00:00:00 2001 From: chenweiwei Date: Mon, 3 Jun 2024 16:21:55 +0800 Subject: [PATCH] 施工维护 --- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java | 11 +++++++++++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/test.java | 34 ++++++++++++++++++++++++++++++++++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McConstruction.java | 5 +++++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McIgnition.java | 2 ++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McOperationLog.java | 2 ++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisit.java | 2 ++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/dto/CompanyDto.java | 4 ++-- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java | 2 +- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java | 4 ++++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java | 25 +++++++++++++++++++++---- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java | 14 +++++++++++++- zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml | 7 +++++-- 12 files changed, 102 insertions(+), 10 deletions(-) diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java index 4c90d9e..41da03e 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java @@ -230,4 +230,15 @@ public class McVisitController extends BaseController { } + /** + * 查询当前财年 + * @return + */ + @RequirePermission("schsf:mcVisit:currentFiscalYear") + @GetMapping(value = "getCurrentFiscalYear") + public AjaxResult getCurrentFiscalYear() { + return AjaxResult.success(mcVisitService.getCurrentFiscalYear()); + } + + } 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 4bd801c..1fbfb3c 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,6 +6,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDate; +import java.time.Month; +import java.time.format.DateTimeFormatter; + @RestController @RequestMapping("/test") public class test { @@ -20,7 +24,37 @@ public class test { { return AjaxResult.success("成功2"); } + + + + + public static int determineFiscalYear(LocalDate date) { + if (date.getMonth() == Month.APRIL || (date.getMonth().getValue() > Month.APRIL.getValue() && date.getYear() != 2100)) { + return date.getYear(); + } else if (date.getMonth().getValue() < Month.APRIL.getValue()) { + return date.getYear() - 1; + } else { + return date.getYear() + 1; + } + } + + + + public static void main(String[] args) { + +// LocalDate currentDate = LocalDate.now(); +// int currentFiscalYear = determineFiscalYear(currentDate); +// System.out.println("当前日期的财年是: " + currentFiscalYear); + + DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE; + String dateString = "2025-04-30"; + LocalDate date = LocalDate.parse(dateString, formatter); + System.out.println("转换后的日期是: " + date); + + System.out.println("当前日期的财年是: " + determineFiscalYear(date)); + + // for (int i = 0; i < 10; i++) { // DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"); // AtomicInteger sequenceCounter = new AtomicInteger(0); 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 2ec946f..a3b1339 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 @@ -3,6 +3,7 @@ package com.chinagas.modules.schsf.domain; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.chinagas.common.core.web.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -75,6 +76,7 @@ public class McConstruction extends BaseEntity implements Cloneable private String projectTypeCode; /** 市场派单时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ExcelProperty(value = "市场派单时间") private LocalDateTime assignmentTime; @@ -83,6 +85,7 @@ public class McConstruction extends BaseEntity implements Cloneable private String isCompleted; /** 竣工时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ExcelProperty(value = "竣工时间") private LocalDateTime completionTime; @@ -107,6 +110,8 @@ public class McConstruction extends BaseEntity implements Cloneable private String gasConnMtrRis; /** 通气到表前/立管时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ExcelProperty(value = "通气到表前/立管时间") private LocalDateTime gctMtrrisTime; 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 5c4a422..8482442 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 @@ -4,6 +4,7 @@ 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 com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -124,6 +125,7 @@ public class McIgnition extends BaseEntity implements Cloneable { /** * 点火时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ExcelProperty(value = "点火时间") private LocalDateTime ignTime; diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McOperationLog.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McOperationLog.java index 45c801d..a6b5ce8 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McOperationLog.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McOperationLog.java @@ -3,6 +3,7 @@ package com.chinagas.modules.schsf.domain; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.chinagas.common.core.web.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -35,6 +36,7 @@ public class McOperationLog extends BaseEntity private String procUser; /** 处理时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime procTime; /** 处理人账号 */ diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisit.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisit.java index ba484dc..15e01a5 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisit.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisit.java @@ -3,6 +3,7 @@ package com.chinagas.modules.schsf.domain; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.chinagas.common.core.web.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -65,6 +66,7 @@ public class McVisit extends BaseEntity implements Cloneable private String jobNature; /** 入户时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ExcelProperty(value = "入户时间") private LocalDateTime entryTime; diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/dto/CompanyDto.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/dto/CompanyDto.java index 139ae2c..9ff4517 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/dto/CompanyDto.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/dto/CompanyDto.java @@ -6,7 +6,7 @@ import java.util.List; public class CompanyDto { private String value; private String label; - private List children = new ArrayList(); + private List children = new ArrayList(); public String getValue() { @@ -30,7 +30,7 @@ public class CompanyDto { return children; } - public void setChildren(List children) { + public void setChildren(List children) { this.children = children; } } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java index 138b2ea..b1131a7 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java @@ -66,7 +66,7 @@ public interface McBasicCmtyMapper List getDistinctGroupList(McBasicCmtyVo mcBasicCmtyVo); - List getDistinctCompanyList(McBasicCmtyVo mcBasicCmtyVo); + List getDistinctCompanyList(McBasicCmtyVo mcBasicCmtyVo); List selectVlgOrCmtyList(McBasicCmtyVo mcBasicCmtyVo); diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java index d765dcf..cc0bc24 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java @@ -83,4 +83,8 @@ public interface IMcVisitService int updateMcVisitCancel(Long id,String remark) throws CloneNotSupportedException; + int getCurrentFiscalYear(); + + + } 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 4548c13..e7609bc 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 @@ -12,6 +12,8 @@ import com.chinagas.modules.schsf.service.IMcConstructionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; /** @@ -121,7 +123,7 @@ public class McBasicCmtyServiceImpl implements IMcBasicCmtyService List companyDtos = mcBasicCmtyMapper.getDistinctRegionList(mcBasicCmtyVo); companyDtos.forEach(companyDto -> { List groups = loadDistinctGroups(mcBasicCmtyVo, companyDto); - groups.forEach(group -> group.setChildren(loadDistinctCompanies(mcBasicCmtyVo, group))); + groups.forEach(group -> group.setChildren(loadDistinctCompanies(mcBasicCmtyVo, group,companyDto))); companyDto.setChildren(groups); }); return companyDtos; @@ -142,8 +144,23 @@ public class McBasicCmtyServiceImpl implements IMcBasicCmtyService return mcBasicCmtyMapper.getDistinctGroupList(mcBasicCmtyVo); } - private List loadDistinctCompanies(McBasicCmtyVo mcBasicCmtyVo, CompanyDto parent) { - mcBasicCmtyVo.setGroupName(parent.getValue()); - return mcBasicCmtyMapper.getDistinctCompanyList(mcBasicCmtyVo); + private List loadDistinctCompanies(McBasicCmtyVo mcBasicCmtyVo, CompanyDto groupParent, CompanyDto regionParent) { + mcBasicCmtyVo.setGroupName(groupParent.getValue()); + List distinctCompanyList = mcBasicCmtyMapper.getDistinctCompanyList(mcBasicCmtyVo); + ArrayList lists = new ArrayList<>(); + for (McBasicCmty mcBasicCmty : distinctCompanyList) { + HashMap valueData = new HashMap(); + valueData.put("regionName",regionParent.getValue()); + valueData.put("groupName",groupParent.getValue()); + valueData.put("companyName",mcBasicCmty.getCompanyName()); + valueData.put("companyCode",mcBasicCmty.getCompanyCode()); + valueData.put("urbRurCls",mcBasicCmty.getUrbRurCls()); + valueData.put("value",mcBasicCmty.getCompanyCode()); + HashMap data = new HashMap(); + data.put("value",valueData); + data.put("label",mcBasicCmty.getCompanyName()); + lists.add(data); + } + return lists; } } 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 5f8d90e..60b9247 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 @@ -19,7 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.Month; import java.time.format.DateTimeFormatter; import java.util.List; import java.util.concurrent.ThreadLocalRandom; @@ -420,5 +422,15 @@ public class McVisitServiceImpl implements IMcVisitService { return mcVisitMapper.updateMcVisit(mcVisit_new); } - + @Override + public int getCurrentFiscalYear() { + LocalDate date = LocalDate.now(); + if (date.getMonth() == Month.APRIL || (date.getMonth().getValue() > Month.APRIL.getValue() && date.getYear() != 2100)) { + return date.getYear(); + } else if (date.getMonth().getValue() < Month.APRIL.getValue()) { + return date.getYear() - 1; + } else { + return date.getYear() + 1; + } + } } 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 d738a87..9272a3c 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 @@ -291,9 +291,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" -