陈威 / MarketBasedPricingProgram

Download as
Browse Code »

Commit 291fcfb32ff76f72cad2b99877efcf3e36a9c2b5

Authored by 陈威
1 parent 967c5c8f
Exists in dev

施工维护

Showing 12 changed files with 102 additions and 10 deletions   Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
  Diff comments   View file @291fcfb
... ... @@ -230,4 +230,15 @@ public class McVisitController extends BaseController {
230 230 }
231 231  
232 232  
  233 + /**
  234 + * 查询当前财年
  235 + * @return
  236 + */
  237 + @RequirePermission("schsf:mcVisit:currentFiscalYear")
  238 + @GetMapping(value = "getCurrentFiscalYear")
  239 + public AjaxResult getCurrentFiscalYear() {
  240 + return AjaxResult.success(mcVisitService.getCurrentFiscalYear());
  241 + }
  242 +
  243 +
233 244 }
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/test.java
  Diff comments   View file @291fcfb
... ... @@ -6,6 +6,10 @@ import org.springframework.web.bind.annotation.GetMapping;
6 6 import org.springframework.web.bind.annotation.RequestMapping;
7 7 import org.springframework.web.bind.annotation.RestController;
8 8  
  9 +import java.time.LocalDate;
  10 +import java.time.Month;
  11 +import java.time.format.DateTimeFormatter;
  12 +
9 13 @RestController
10 14 @RequestMapping("/test")
11 15 public class test {
... ... @@ -20,7 +24,37 @@ public class test {
20 24 {
21 25 return AjaxResult.success("成功2");
22 26 }
  27 +
  28 +
  29 +
  30 +
  31 + public static int determineFiscalYear(LocalDate date) {
  32 + if (date.getMonth() == Month.APRIL || (date.getMonth().getValue() > Month.APRIL.getValue() && date.getYear() != 2100)) {
  33 + return date.getYear();
  34 + } else if (date.getMonth().getValue() < Month.APRIL.getValue()) {
  35 + return date.getYear() - 1;
  36 + } else {
  37 + return date.getYear() + 1;
  38 + }
  39 + }
  40 +
  41 +
  42 +
  43 +
23 44 public static void main(String[] args) {
  45 +
  46 +// LocalDate currentDate = LocalDate.now();
  47 +// int currentFiscalYear = determineFiscalYear(currentDate);
  48 +// System.out.println("当前日期的财年是: " + currentFiscalYear);
  49 +
  50 + DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE;
  51 + String dateString = "2025-04-30";
  52 + LocalDate date = LocalDate.parse(dateString, formatter);
  53 + System.out.println("转换后的日期是: " + date);
  54 +
  55 + System.out.println("当前日期的财年是: " + determineFiscalYear(date));
  56 +
  57 +
24 58 // for (int i = 0; i < 10; i++) {
25 59 // DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");
26 60 // AtomicInteger sequenceCounter = new AtomicInteger(0);
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McConstruction.java
  Diff comments   View file @291fcfb
... ... @@ -3,6 +3,7 @@ package com.chinagas.modules.schsf.domain;
3 3 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
4 4 import com.alibaba.excel.annotation.ExcelProperty;
5 5 import com.chinagas.common.core.web.domain.BaseEntity;
  6 +import com.fasterxml.jackson.annotation.JsonFormat;
6 7 import org.apache.commons.lang3.builder.ToStringBuilder;
7 8 import org.apache.commons.lang3.builder.ToStringStyle;
8 9  
... ... @@ -75,6 +76,7 @@ public class McConstruction extends BaseEntity implements Cloneable
75 76 private String projectTypeCode;
76 77  
77 78 /** 市场派单时间 */
  79 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
78 80 @ExcelProperty(value = "市场派单时间")
79 81 private LocalDateTime assignmentTime;
80 82  
... ... @@ -83,6 +85,7 @@ public class McConstruction extends BaseEntity implements Cloneable
83 85 private String isCompleted;
84 86  
85 87 /** 竣工时间 */
  88 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
86 89 @ExcelProperty(value = "竣工时间")
87 90 private LocalDateTime completionTime;
88 91  
... ... @@ -107,6 +110,8 @@ public class McConstruction extends BaseEntity implements Cloneable
107 110 private String gasConnMtrRis;
108 111  
109 112 /** 通气到表前/立管时间 */
  113 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
  114 +
110 115 @ExcelProperty(value = "通气到表前/立管时间")
111 116 private LocalDateTime gctMtrrisTime;
112 117  
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McIgnition.java
  Diff comments   View file @291fcfb
... ... @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
4 4 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
5 5 import com.alibaba.excel.annotation.ExcelProperty;
6 6 import com.chinagas.common.core.web.domain.BaseEntity;
  7 +import com.fasterxml.jackson.annotation.JsonFormat;
7 8 import org.apache.commons.lang3.builder.ToStringBuilder;
8 9 import org.apache.commons.lang3.builder.ToStringStyle;
9 10  
... ... @@ -124,6 +125,7 @@ public class McIgnition extends BaseEntity implements Cloneable {
124 125 /**
125 126 * 点火时间
126 127 */
  128 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
127 129 @ExcelProperty(value = "点火时间")
128 130 private LocalDateTime ignTime;
129 131  
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McOperationLog.java
  Diff comments   View file @291fcfb
... ... @@ -3,6 +3,7 @@ package com.chinagas.modules.schsf.domain;
3 3 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
4 4 import com.alibaba.excel.annotation.ExcelProperty;
5 5 import com.chinagas.common.core.web.domain.BaseEntity;
  6 +import com.fasterxml.jackson.annotation.JsonFormat;
6 7 import org.apache.commons.lang3.builder.ToStringBuilder;
7 8 import org.apache.commons.lang3.builder.ToStringStyle;
8 9  
... ... @@ -35,6 +36,7 @@ public class McOperationLog extends BaseEntity
35 36 private String procUser;
36 37  
37 38 /** 处理时间 */
  39 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
38 40 private LocalDateTime procTime;
39 41  
40 42 /** 处理人账号 */
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisit.java
  Diff comments   View file @291fcfb
... ... @@ -3,6 +3,7 @@ package com.chinagas.modules.schsf.domain;
3 3 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
4 4 import com.alibaba.excel.annotation.ExcelProperty;
5 5 import com.chinagas.common.core.web.domain.BaseEntity;
  6 +import com.fasterxml.jackson.annotation.JsonFormat;
6 7 import org.apache.commons.lang3.builder.ToStringBuilder;
7 8 import org.apache.commons.lang3.builder.ToStringStyle;
8 9  
... ... @@ -65,6 +66,7 @@ public class McVisit extends BaseEntity implements Cloneable
65 66 private String jobNature;
66 67  
67 68 /** 入户时间 */
  69 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
68 70 @ExcelProperty(value = "入户时间")
69 71 private LocalDateTime entryTime;
70 72  
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/dto/CompanyDto.java
  Diff comments   View file @291fcfb
... ... @@ -6,7 +6,7 @@ import java.util.List;
6 6 public class CompanyDto {
7 7 private String value;
8 8 private String label;
9   - private List<CompanyDto> children = new ArrayList<CompanyDto>();
  9 + private List children = new ArrayList();
10 10  
11 11  
12 12 public String getValue() {
... ... @@ -30,7 +30,7 @@ public class CompanyDto {
30 30 return children;
31 31 }
32 32  
33   - public void setChildren(List<CompanyDto> children) {
  33 + public void setChildren(List children) {
34 34 this.children = children;
35 35 }
36 36 }
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java
  Diff comments   View file @291fcfb
... ... @@ -66,7 +66,7 @@ public interface McBasicCmtyMapper
66 66  
67 67 List<CompanyDto> getDistinctGroupList(McBasicCmtyVo mcBasicCmtyVo);
68 68  
69   - List<CompanyDto> getDistinctCompanyList(McBasicCmtyVo mcBasicCmtyVo);
  69 + List<McBasicCmty> getDistinctCompanyList(McBasicCmtyVo mcBasicCmtyVo);
70 70  
71 71 List<McBasicCmty> selectVlgOrCmtyList(McBasicCmtyVo mcBasicCmtyVo);
72 72  
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java
  Diff comments   View file @291fcfb
... ... @@ -83,4 +83,8 @@ public interface IMcVisitService
83 83 int updateMcVisitCancel(Long id,String remark) throws CloneNotSupportedException;
84 84  
85 85  
  86 + int getCurrentFiscalYear();
  87 +
  88 +
  89 +
86 90 }
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java
  Diff comments   View file @291fcfb
... ... @@ -12,6 +12,8 @@ import com.chinagas.modules.schsf.service.IMcConstructionService;
12 12 import org.springframework.beans.factory.annotation.Autowired;
13 13 import org.springframework.stereotype.Service;
14 14  
  15 +import java.util.ArrayList;
  16 +import java.util.HashMap;
15 17 import java.util.List;
16 18  
17 19 /**
... ... @@ -121,7 +123,7 @@ public class McBasicCmtyServiceImpl implements IMcBasicCmtyService
121 123 List<CompanyDto> companyDtos = mcBasicCmtyMapper.getDistinctRegionList(mcBasicCmtyVo);
122 124 companyDtos.forEach(companyDto -> {
123 125 List<CompanyDto> groups = loadDistinctGroups(mcBasicCmtyVo, companyDto);
124   - groups.forEach(group -> group.setChildren(loadDistinctCompanies(mcBasicCmtyVo, group)));
  126 + groups.forEach(group -> group.setChildren(loadDistinctCompanies(mcBasicCmtyVo, group,companyDto)));
125 127 companyDto.setChildren(groups);
126 128 });
127 129 return companyDtos;
... ... @@ -142,8 +144,23 @@ public class McBasicCmtyServiceImpl implements IMcBasicCmtyService
142 144 return mcBasicCmtyMapper.getDistinctGroupList(mcBasicCmtyVo);
143 145 }
144 146  
145   - private List<CompanyDto> loadDistinctCompanies(McBasicCmtyVo mcBasicCmtyVo, CompanyDto parent) {
146   - mcBasicCmtyVo.setGroupName(parent.getValue());
147   - return mcBasicCmtyMapper.getDistinctCompanyList(mcBasicCmtyVo);
  147 + private List loadDistinctCompanies(McBasicCmtyVo mcBasicCmtyVo, CompanyDto groupParent, CompanyDto regionParent) {
  148 + mcBasicCmtyVo.setGroupName(groupParent.getValue());
  149 + List<McBasicCmty> distinctCompanyList = mcBasicCmtyMapper.getDistinctCompanyList(mcBasicCmtyVo);
  150 + ArrayList<Object> lists = new ArrayList<>();
  151 + for (McBasicCmty mcBasicCmty : distinctCompanyList) {
  152 + HashMap<String, Object> valueData = new HashMap<String, Object>();
  153 + valueData.put("regionName",regionParent.getValue());
  154 + valueData.put("groupName",groupParent.getValue());
  155 + valueData.put("companyName",mcBasicCmty.getCompanyName());
  156 + valueData.put("companyCode",mcBasicCmty.getCompanyCode());
  157 + valueData.put("urbRurCls",mcBasicCmty.getUrbRurCls());
  158 + valueData.put("value",mcBasicCmty.getCompanyCode());
  159 + HashMap<String, Object> data = new HashMap<String, Object>();
  160 + data.put("value",valueData);
  161 + data.put("label",mcBasicCmty.getCompanyName());
  162 + lists.add(data);
  163 + }
  164 + return lists;
148 165 }
149 166 }
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
  Diff comments   View file @291fcfb
... ... @@ -19,7 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired;
19 19 import org.springframework.stereotype.Service;
20 20 import org.springframework.transaction.annotation.Transactional;
21 21  
  22 +import java.time.LocalDate;
22 23 import java.time.LocalDateTime;
  24 +import java.time.Month;
23 25 import java.time.format.DateTimeFormatter;
24 26 import java.util.List;
25 27 import java.util.concurrent.ThreadLocalRandom;
... ... @@ -420,5 +422,15 @@ public class McVisitServiceImpl implements IMcVisitService {
420 422 return mcVisitMapper.updateMcVisit(mcVisit_new);
421 423 }
422 424  
423   -
  425 + @Override
  426 + public int getCurrentFiscalYear() {
  427 + LocalDate date = LocalDate.now();
  428 + if (date.getMonth() == Month.APRIL || (date.getMonth().getValue() > Month.APRIL.getValue() && date.getYear() != 2100)) {
  429 + return date.getYear();
  430 + } else if (date.getMonth().getValue() < Month.APRIL.getValue()) {
  431 + return date.getYear() - 1;
  432 + } else {
  433 + return date.getYear() + 1;
  434 + }
  435 + }
424 436 }
... ...
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml
  Diff comments   View file @291fcfb
... ... @@ -291,9 +291,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
291 291  
292 292 </select>
293 293  
294   - <select id="getDistinctCompanyList" resultType="com.chinagas.modules.schsf.domain.dto.CompanyDto"
  294 + <select id="getDistinctCompanyList" resultType="com.chinagas.modules.schsf.domain.McBasicCmty"
295 295 parameterType="com.chinagas.modules.schsf.domain.vo.McBasicCmtyVo">
296   - SELECT DISTINCT t.company_code as 'value',t.company_name as 'label'
  296 + SELECT DISTINCT
  297 + t.company_code as 'companyCode',
  298 + t.company_name as 'companyName',
  299 + t.urb_rur_cls as 'urbRurCls'
297 300 FROM mc_basic_cmty t
298 301 left join sys_user u on u.user_id = t.create_by
299 302 left join sys_dept d on d.dept_id = t.company_code
... ...