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 312376a..4dc053c 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 @@ -70,7 +70,7 @@ public class McVisit extends BaseEntity implements Cloneable private String jobNature; /** 入户时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @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/enums/ConstructionStatusEnums.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/ConstructionStatusEnums.java new file mode 100644 index 0000000..fe1348d --- /dev/null +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/ConstructionStatusEnums.java @@ -0,0 +1,21 @@ +package com.chinagas.modules.schsf.enums; + +public enum ConstructionStatusEnums { + MAINTENANCE_SG("MAINTENANCE_SG", "待工程维护"), + MAINTENANCE_YY("MAINTENANCE_YY", "待运营维护"), + MAINTENANCE_END("MAINTENANCE_END", "已维护"); + + private final String code; + private final String info; + + public String getCode() { + return code; + } + public String getInfo() { + return info; + } + ConstructionStatusEnums(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/enums/McConstructionStatusEnums.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/McConstructionStatusEnums.java deleted file mode 100644 index 66c7175..0000000 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/McConstructionStatusEnums.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.chinagas.modules.schsf.enums; - -public enum McConstructionStatusEnums { - MAINTENANCE_SG("MAINTENANCE_SG", "待工程维护"), - MAINTENANCE_YY("MAINTENANCE_YY", "待运营维护"), - MAINTENANCE_END("MAINTENANCE_END", "已维护"); - - private final String code; - private final String info; - - public String getCode() { - return code; - } - public String getInfo() { - return info; - } - McConstructionStatusEnums(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/impl/McConstructionServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McConstructionServiceImpl.java index adf1e26..bf24962 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 @@ -7,11 +7,10 @@ import com.chinagas.common.datascope.annotation.DataScope; 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.enums.McConstructionStatusEnums; +import com.chinagas.modules.schsf.enums.ConstructionStatusEnums; import com.chinagas.modules.schsf.mapper.McConstructionMapper; import com.chinagas.modules.schsf.service.IMcConstructionService; import com.chinagas.modules.schsf.service.IMcOperationLogService; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -140,8 +139,8 @@ public class McConstructionServiceImpl implements IMcConstructionService { mcConstruction.setUpdateTime(time); mcConstruction.setUpdateBy(userId); mcConstruction.setCmtyId(mcBasicCmty.getId()); - mcConstruction.setStatusCode(McConstructionStatusEnums.MAINTENANCE_SG.getCode()); - mcConstruction.setStatusName(McConstructionStatusEnums.MAINTENANCE_SG.getInfo()); + mcConstruction.setStatusCode(ConstructionStatusEnums.MAINTENANCE_SG.getCode()); + mcConstruction.setStatusName(ConstructionStatusEnums.MAINTENANCE_SG.getInfo()); int i = mcConstructionMapper.insertMcConstruction(mcConstruction); //1:添加记录 iMcOperationLogService.insertMcOperationLog("mc_construction", mcConstruction.getId(), "schsf:mcBasicCmty:importData", @@ -197,8 +196,8 @@ public class McConstructionServiceImpl implements IMcConstructionService { mcConstruction_new.setProjectPersonAccount(userAccount); mcConstruction_new.setUpdateBy(userId.toString()); mcConstruction_new.setUpdateTime(time); - mcConstruction_new.setStatusCode(McConstructionStatusEnums.MAINTENANCE_YY.getCode()); - mcConstruction_new.setStatusName(McConstructionStatusEnums.MAINTENANCE_YY.getInfo()); + mcConstruction_new.setStatusCode(ConstructionStatusEnums.MAINTENANCE_YY.getCode()); + mcConstruction_new.setStatusName(ConstructionStatusEnums.MAINTENANCE_YY.getInfo()); int i = mcConstructionMapper.updateMcConstruction(mcConstruction_new); iMcOperationLogService.insertMcOperationLog("mc_construction", mcConstruction_param.getId(), "schsf:mcConstruction:engineering", @@ -236,8 +235,8 @@ public class McConstructionServiceImpl implements IMcConstructionService { mcConstruction_new.setOperatePersonAccount(userAccount); mcConstruction_new.setUpdateBy(userId.toString()); mcConstruction_new.setUpdateTime(time); - mcConstruction_new.setStatusCode(McConstructionStatusEnums.MAINTENANCE_END.getCode()); - mcConstruction_new.setStatusName(McConstructionStatusEnums.MAINTENANCE_END.getInfo()); + mcConstruction_new.setStatusCode(ConstructionStatusEnums.MAINTENANCE_END.getCode()); + mcConstruction_new.setStatusName(ConstructionStatusEnums.MAINTENANCE_END.getInfo()); int i = mcConstructionMapper.updateMcConstruction(mcConstruction_new); iMcOperationLogService.insertMcOperationLog("mc_construction", mcConstruction_param.getId(), "schsf:mcConstruction:operations", "运营维护", "1", null, JSON.toJSONString(mcConstruction_old), JSON.toJSONString(mcConstruction_new)); -- libgit2 0.21.2