陈威 / MarketBasedPricingProgram

Download as
Browse Code »

Commit c5003b7d0d8ff91da2d3dc882462813b19feab60

Authored by 陈威
1 parent 606a7e31
Exists in dev

update

Showing 4 changed files with 29 additions and 30 deletions   Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisit.java
  Diff comments   View file @c5003b7
... ... @@ -70,7 +70,7 @@ public class McVisit extends BaseEntity implements Cloneable
70 70 private String jobNature;
71 71  
72 72 /** 入户时间 */
73   - @JsonFormat(pattern = "yyyy-MM-dd")
  73 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
74 74 @ExcelProperty(value = "入户时间")
75 75 private LocalDateTime entryTime;
76 76  
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/ConstructionStatusEnums.java 0 → 100644
  Diff comments   View file @c5003b7
... ... @@ -0,0 +1,21 @@
  1 +package com.chinagas.modules.schsf.enums;
  2 +
  3 +public enum ConstructionStatusEnums {
  4 + MAINTENANCE_SG("MAINTENANCE_SG", "待工程维护"),
  5 + MAINTENANCE_YY("MAINTENANCE_YY", "待运营维护"),
  6 + MAINTENANCE_END("MAINTENANCE_END", "已维护");
  7 +
  8 + private final String code;
  9 + private final String info;
  10 +
  11 + public String getCode() {
  12 + return code;
  13 + }
  14 + public String getInfo() {
  15 + return info;
  16 + }
  17 + ConstructionStatusEnums(String code, String info) {
  18 + this.code = code;
  19 + this.info = info;
  20 + }
  21 +}
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/McConstructionStatusEnums.java
View file @606a7e3
... ... @@ -1,21 +0,0 @@
1   -package com.chinagas.modules.schsf.enums;
2   -
3   -public enum McConstructionStatusEnums {
4   - MAINTENANCE_SG("MAINTENANCE_SG", "待工程维护"),
5   - MAINTENANCE_YY("MAINTENANCE_YY", "待运营维护"),
6   - MAINTENANCE_END("MAINTENANCE_END", "已维护");
7   -
8   - private final String code;
9   - private final String info;
10   -
11   - public String getCode() {
12   - return code;
13   - }
14   - public String getInfo() {
15   - return info;
16   - }
17   - McConstructionStatusEnums(String code, String info) {
18   - this.code = code;
19   - this.info = info;
20   - }
21   -}
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McConstructionServiceImpl.java
  Diff comments   View file @c5003b7
... ... @@ -7,11 +7,10 @@ import com.chinagas.common.datascope.annotation.DataScope;
7 7 import com.chinagas.common.security.utils.SecurityUtils;
8 8 import com.chinagas.modules.schsf.domain.McBasicCmty;
9 9 import com.chinagas.modules.schsf.domain.McConstruction;
10   -import com.chinagas.modules.schsf.enums.McConstructionStatusEnums;
  10 +import com.chinagas.modules.schsf.enums.ConstructionStatusEnums;
11 11 import com.chinagas.modules.schsf.mapper.McConstructionMapper;
12 12 import com.chinagas.modules.schsf.service.IMcConstructionService;
13 13 import com.chinagas.modules.schsf.service.IMcOperationLogService;
14   -import org.jetbrains.annotations.NotNull;
15 14 import org.springframework.beans.factory.annotation.Autowired;
16 15 import org.springframework.stereotype.Service;
17 16 import org.springframework.transaction.annotation.Transactional;
... ... @@ -140,8 +139,8 @@ public class McConstructionServiceImpl implements IMcConstructionService {
140 139 mcConstruction.setUpdateTime(time);
141 140 mcConstruction.setUpdateBy(userId);
142 141 mcConstruction.setCmtyId(mcBasicCmty.getId());
143   - mcConstruction.setStatusCode(McConstructionStatusEnums.MAINTENANCE_SG.getCode());
144   - mcConstruction.setStatusName(McConstructionStatusEnums.MAINTENANCE_SG.getInfo());
  142 + mcConstruction.setStatusCode(ConstructionStatusEnums.MAINTENANCE_SG.getCode());
  143 + mcConstruction.setStatusName(ConstructionStatusEnums.MAINTENANCE_SG.getInfo());
145 144 int i = mcConstructionMapper.insertMcConstruction(mcConstruction);
146 145 //1:添加记录
147 146 iMcOperationLogService.insertMcOperationLog("mc_construction", mcConstruction.getId(), "schsf:mcBasicCmty:importData",
... ... @@ -197,8 +196,8 @@ public class McConstructionServiceImpl implements IMcConstructionService {
197 196 mcConstruction_new.setProjectPersonAccount(userAccount);
198 197 mcConstruction_new.setUpdateBy(userId.toString());
199 198 mcConstruction_new.setUpdateTime(time);
200   - mcConstruction_new.setStatusCode(McConstructionStatusEnums.MAINTENANCE_YY.getCode());
201   - mcConstruction_new.setStatusName(McConstructionStatusEnums.MAINTENANCE_YY.getInfo());
  199 + mcConstruction_new.setStatusCode(ConstructionStatusEnums.MAINTENANCE_YY.getCode());
  200 + mcConstruction_new.setStatusName(ConstructionStatusEnums.MAINTENANCE_YY.getInfo());
202 201 int i = mcConstructionMapper.updateMcConstruction(mcConstruction_new);
203 202  
204 203 iMcOperationLogService.insertMcOperationLog("mc_construction", mcConstruction_param.getId(), "schsf:mcConstruction:engineering",
... ... @@ -236,8 +235,8 @@ public class McConstructionServiceImpl implements IMcConstructionService {
236 235 mcConstruction_new.setOperatePersonAccount(userAccount);
237 236 mcConstruction_new.setUpdateBy(userId.toString());
238 237 mcConstruction_new.setUpdateTime(time);
239   - mcConstruction_new.setStatusCode(McConstructionStatusEnums.MAINTENANCE_END.getCode());
240   - mcConstruction_new.setStatusName(McConstructionStatusEnums.MAINTENANCE_END.getInfo());
  238 + mcConstruction_new.setStatusCode(ConstructionStatusEnums.MAINTENANCE_END.getCode());
  239 + mcConstruction_new.setStatusName(ConstructionStatusEnums.MAINTENANCE_END.getInfo());
241 240 int i = mcConstructionMapper.updateMcConstruction(mcConstruction_new);
242 241 iMcOperationLogService.insertMcOperationLog("mc_construction", mcConstruction_param.getId(), "schsf:mcConstruction:operations",
243 242 "运营维护", "1", null, JSON.toJSONString(mcConstruction_old), JSON.toJSONString(mcConstruction_new));
... ...