Skip to content

A
amos-boot-biz
Commit e557f74e authored by suhuiguang's avatar suhuiguang
Browse files
Options

feat(使用登记大编辑)：

1.使用登记台套类编辑开发
parent 5073faf2
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 138 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotation/FieldDisplayDefine.java
View file @ e557f74e
......@@ -18,6 +18,8 @@ public @interface FieldDisplayDefine {
Class<?> type() default String.class;
String format() default "yyyy-MM-dd";
boolean isExist() default true;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/BaseChangeDataDto.java
View file @ e557f74e
package com.yeejoin.amos.boot.module.jg.api.dto;
import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
import lombok.Data;
import java.io.Serializable;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/BizRelationDataDto.java
View file @ e557f74e
......@@ -34,7 +34,12 @@ public class BizRelationDataDto {
private String changeAttachment;
/**
* 变更的设备
* 变更的设备集合
*/
private Set<String> records;
/**
* 变更的装置集合
*/
private Set<String> projectContraptionIds;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipDesignChangeDataDto.java
View file @ e557f74e
......@@ -6,6 +6,8 @@ import com.yeejoin.amos.boot.biz.common.annotation.Group;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Data
@Group(value = "equip_design_info")
......@@ -24,7 +26,7 @@ public class EquipDesignChangeDataDto extends BaseChangeDataDto {
private String designUseDate;
@FieldDisplayDefine(value = "设计日期")
private String designDate;
private Date designDate;
@FieldDisplayDefine(value = "总图图号")
private String drawingDo;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/BizDataChangeController.java
View file @ e557f74e
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.yeejoin.amos.boot.module.jg.biz.dto.RequestChangeData;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
import com.yeejoin.amos.boot.module.jg.biz.edit.BizDataChangeServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy.IBizDataChangeHandleStrategy;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.SingleManageEquipEditHandleImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -51,10 +52,11 @@ public class BizDataChangeController {
@ApiOperation(value = "编辑保存--通用", httpMethod = "POST")
public ResponseModel<String> saveV2(@ApiParam(required = true, value = "单据编号") @RequestParam String applyNo,
@ApiParam(required = true, value = "业务类型") @PathVariable String bizType,
@ApiParam(required = true, value = "设备处理器类型") @RequestParam IBizDataChangeHandleStrategy.ModelType modelType,
@RequestBody RequestChangeData changeData) {
// 基础数据校验
changeData.validated();
bizDataChangeService.save(applyNo, bizType, changeData);
bizDataChangeService.save(applyNo, bizType, modelType, changeData);
return ResponseHelper.buildResponse("success");
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/dto/RequestChangeData.java
View file @ e557f74e
......@@ -13,13 +13,6 @@ public class RequestChangeData extends JSONObject {
public static final String multiDataKey = "tableData";
/**
* 分类-用于匹配设备（包括装置）的数据处理器
*
* @see DefaultBizDataChangeHandler.ModelType
*/
private static final String modelTypeKey = "modelType";
/**
* 删除的数据表格key-管道使用
*/
public static final String deletedDataKey = "deleteData";
......@@ -32,22 +25,12 @@ public class RequestChangeData extends JSONObject {
/**
* 变更说明附件
*/
public static final String changeReasonAttachmentKey = "changeReasonAttachment";
public DefaultBizDataChangeHandler.ModelType getModelType() {
if (this.containsKey(modelTypeKey)) {
return DefaultBizDataChangeHandler.ModelType.valueOf(this.getString(modelTypeKey));
}
return null;
}
public static final String changeReasonAttachmentKey = "changeAttachment";
public void validated() {
if (!this.containsKey(changeReasonKey) || !this.containsKey(changeReasonAttachmentKey)) {
throw new BadRequest("变更说明和变更说明附件不能为空！");
}
if (!this.containsKey(modelTypeKey)) {
throw new BadRequest("解析处理器不能为空！");
}
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/BizDataChangeServiceImpl.java
View file @ e557f74e
......@@ -17,14 +17,15 @@ public class BizDataChangeServiceImpl {
*
* @param applyNo 单据编号
* @param bizType 业务类型
* @param modelType 处理器类型
* @param changeData 变化后的数据
*/
@Transactional(rollbackFor = Exception.class)
public void save(String applyNo,
String bizType,
RequestChangeData changeData) {
IBizDataChangeHandleStrategy.ModelType modelType, RequestChangeData changeData) {
IBizDataChangeHandleStrategy handleStrategy = BizDataHandleStrategyContext.getStrategy(bizType);
handleStrategy.doSave(applyNo, changeData.getModelType(), changeData);
handleStrategy.doSave(applyNo, modelType, changeData);
}
public Map<String, ?> queryDetail(String applyNo, String bizType, String bizId) {
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/core/SubClassFinder.java
View file @ e557f74e
package com.yeejoin.amos.boot.module.jg.biz.edit.core;
import com.yeejoin.amos.boot.module.jg.api.dto.BaseChangeDataDto;
import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
import org.reflections.Reflections;
import java.util.HashSet;
import java.util.Set;
public class SubClassFinder {
private static final Set<Class<? extends BaseChangeDataDto>> subClasses;
private static final Set<Class<? extends IBaseChangeData>> subClasses;
static {
//▼ 指定扫描包路径（根据实际项目调整）
Reflections reflections = new Reflections("com.yeejoin.amos.boot.module.jg.api.dto");
Reflections reflections = new Reflections("com.yeejoin.amos.boot.module.jg.api.dto", "com.yeejoin.amos.boot.module.ymt.api.entity");
//▼ 获取所有继承BaseChangeDataDto的类
subClasses = reflections.getSubTypesOf(BaseChangeDataDto.class);
subClasses = reflections.getSubTypesOf(IBaseChangeData.class);
}
public static Set<Class<? extends BaseChangeDataDto>> getAllSubClasses() {
public static Set<Class<? extends IBaseChangeData>> getAllSubClasses() {
return new HashSet<>(subClasses);
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/event/listener/ChangeLogInsertListener.java
View file @ e557f74e
......@@ -41,6 +41,7 @@ public class ChangeLogInsertListener {
static {
bizTypeTableMap.put("useRegister", "tzs_jg_use_registration");
bizTypeTableMap.put("installationNotice", "tzs_jg_installation_notice");
bizTypeTableMap.put("singleManageEquipEdit", "idx_biz_jg_use_info");
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/DefaultBizDataChangeHandler.java
View file @ e557f74e
package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.module.jg.api.dto.BizRelationDataDto;
import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
import com.yeejoin.amos.boot.module.jg.biz.context.EquipDataProcessStrategyContext;
......@@ -24,6 +25,10 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
@Override
public final void doSave(String applyNo, ModelType model, Map<String, Object> changeData) {
if (beforeCheck(applyNo, model, changeData)) {
JSONObject oData = new JSONObject(changeData);
// 删除原始提交的变更说明及附件放置后续存放到json
changeData.remove("changeReason");
changeData.remove("changeAttachment");
IEquipChangeDataProcessStrategy dataProcessor = EquipDataProcessStrategyContext.getStrategy(model);
List<FieldChangeMeta> allChangeColumns = dataProcessor.handle(changeData, applyNo);
List<FieldChangeMeta> bizEditColumns = updBizData(applyNo, model, changeData);
......@@ -33,15 +38,18 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
allChangeColumns.addAll(equipColumns);
}
// 发送数据变更消息
publish2OtherBiz(allChangeColumns, applyNo);
publish2OtherBiz(allChangeColumns, applyNo, oData);
}
}
private void publish2OtherBiz(List<FieldChangeMeta> allChangeColumns, String applyNo) {
private void publish2OtherBiz(List<FieldChangeMeta> allChangeColumns, String applyNo, JSONObject changeData) {
BizRelationDataDto bizRelationDataDto = new BizRelationDataDto();
bizRelationDataDto.setBizId(applyNo);
bizRelationDataDto.setBizType(canHandleBizType());
bizRelationDataDto.setRecords(getEqs(applyNo));
bizRelationDataDto.setChangeReason(changeData.getString("changeReason"));
bizRelationDataDto.setChangeAttachment(JSONObject.toJSONString(changeData.get("changeAttachment")));
bizRelationDataDto.setProjectContraptionIds(getProjectContraptionIds(applyNo));
eventPublisher.publish(new BaseBizDataChangeEvent(this, bizRelationDataDto, allChangeColumns, RequestContext.cloneRequestContext()));
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/installNotice/InstallNoticeDataChangeHandler.java
View file @ e557f74e
......@@ -19,7 +19,7 @@ public class InstallNoticeDataChangeHandler extends DefaultBizDataChangeHandler<
@Override
public String canHandleBizType() {
return "tzs_jg_installation_notice";
return "installationNotice";
}
@Override
......@@ -51,4 +51,9 @@ public class InstallNoticeDataChangeHandler extends DefaultBizDataChangeHandler<
public Boolean bizIsFinished(String applyNo, ModelType model, Map<String, Object> changeData) {
return null;
}
@Override
public Set<String> getProjectContraptionIds(String applyNo) {
return Collections.emptySet();
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/strategy/IBizDataChangeHandleStrategy.java
View file @ e557f74e
......@@ -82,4 +82,12 @@ public interface IBizDataChangeHandleStrategy {
* @return true-完成；false-未完成
*/
Boolean bizIsFinished(String applyNo, ModelType model, Map<String, Object> changeData);
/**
* 获取变更的装置ids
* @param applyNo 单据编号
* @return 装置id集合
*/
Set<String> getProjectContraptionIds(String applyNo);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/useRegister/UseRegisterDataChangeHandler.java
View file @ e557f74e
......@@ -3,9 +3,11 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.useRegister;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
import com.yeejoin.amos.boot.module.jg.api.dto.UseRegisterChangeDataDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
......@@ -15,6 +17,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<BaseBizDataChangeEvent> {
......@@ -31,7 +34,7 @@ public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<Ba
@Override
public String canHandleBizType() {
return "tzs_jg_use_registration";
return "useRegistration";
}
......@@ -45,11 +48,10 @@ public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<Ba
@Override
public List<FieldChangeMeta> updBizData(String applyNo, ModelType model, Map<String, Object> changeData) {
List<FieldChangeMeta> bizEditColumns = new ArrayList<>();
// 单据信息的保存、与设备相关、证相关字段的更新
JgUseRegistration useRegistration = useRegisterUpdateService.getJgUseRegistrationService().getOne(new LambdaQueryWrapper<JgUseRegistration>().eq(JgUseRegistration::getApplyNo, applyNo));
// 1.构建单据字段级变化流水
buildBizFieldChangeLogs(changeData, useRegistration, bizEditColumns);
// 2.更新单据及根据单据状态构建设备字段级变化流水
// 2.更新单据
this.updateBizInfo(changeData);
// 3.更新历史的JSON的数据
this.updateHistoryJson(applyNo);
......@@ -77,7 +79,9 @@ public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<Ba
@Override
public Set<String> getEqs(String applyNo) {
return Collections.emptySet();
JgUseRegistration useRegistration = useRegisterUpdateService.getJgUseRegistrationService().getOne(new LambdaQueryWrapper<JgUseRegistration>().select(BaseEntity::getSequenceNbr).eq(JgUseRegistration::getApplyNo, applyNo));
List<JgUseRegistrationEq> eqs = useRegisterUpdateService.getUseRegistrationEqService().list(new LambdaQueryWrapper<JgUseRegistrationEq>().select(JgUseRegistrationEq::getEquId).eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr()));
return eqs.stream().map(JgUseRegistrationEq::getEquId).collect(Collectors.toSet());
}
@Override
......@@ -92,6 +96,16 @@ public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<Ba
return useRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName());
}
@Override
public Set<String> getProjectContraptionIds(String applyNo) {
JgUseRegistration useRegistration = useRegisterUpdateService.getJgUseRegistrationService().getOne(new LambdaQueryWrapper<JgUseRegistration>().select(BaseEntity::getSequenceNbr, JgUseRegistration::getApplyNo, JgUseRegistration::getProjectContraptionId).eq(JgUseRegistration::getApplyNo, applyNo));
Set<String> projectContraptionIds = new HashSet<>();
projectContraptionIds.add(useRegistration.getProjectContraptionId());
projectContraptionIds.remove(null);
projectContraptionIds.remove("");
return projectContraptionIds;
}
private void updateHistoryJson(String applyNo) {
useRegisterUpdateService.updateHisData(applyNo);
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/useRegister/UseRegisterUpdateService.java
View file @ e557f74e
......@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.CommonEquipDataProcessService;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgProjectContraptionServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationEqServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
......@@ -72,6 +73,8 @@ public class UseRegisterUpdateService {
private final CommonMapper commonMapper;
private final JgUseRegistrationEqServiceImpl useRegistrationEqService;
@PostConstruct
public void init() {
// 新增台套登记
......@@ -158,9 +161,6 @@ public class UseRegisterUpdateService {
jsonObject.put("applyNo", jgUseRegistration.getApplyNo());
jsonObject.remove("submit");
jsonObject.remove("instanceId");
if (!ObjectUtils.isEmpty(jsonObject.get("factoryUseSiteStreet"))) {
jsonObject.put("factoryUseSiteStreet", String.valueOf(Long.valueOf(jsonObject.get("factoryUseSiteStreet").toString())));
}
if (!"unit".equals(jgUseRegistration.getManageType())) {
// 台套逻辑
String record = jgUseRegistrationService.setDefaultRecord(jgUseRegistration, null);
......@@ -374,16 +374,7 @@ public class UseRegisterUpdateService {
// 使用登记信息
JgUseRegistration jgUseRegistration = new JgUseRegistration();
jgUseRegistration.setRecDate(new Date());
if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
jgUseRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
}
// if (map.containsKey("receiveOrgCode")) {
// // 接收单位信息
// String[] splitMaintenanceUnitCode = String.valueOf(map.getString("receiveOrgCode")).split("_");
// jgUseRegistration.setReceiveCompanyCode(splitMaintenanceUnitCode[0]);
// jgUseRegistration.setReceiveOrgName(splitMaintenanceUnitCode[1]);
// jgUseRegistration.setReceiveCompanyOrgCode(jgUseRegistrationService.commonServiceImpl.getOneCompany(jgUseRegistration.getReceiveCompanyCode()).getOrgCode());
// }
jgUseRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
if (map.containsKey("orgBranchCode")) {
// 监察处置机构代码
String[] splitOrgBranchCode = String.valueOf(map.getString("orgBranchCode")).split("_");
......@@ -395,17 +386,33 @@ public class UseRegisterUpdateService {
map.put("safetyManagerId", data[0]);
map.put("safetyManagerName", data[1]);
}
if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
}
if (!ObjectUtils.isEmpty(map.get("inspectOrgName"))) {
jgUseRegistration.setInspectUnitName(map.get("inspectOrgName").toString());
}
jgUseRegistration.setInspectUnitCreditCode(map.getString("inspectUnitCreditCode"));
jgUseRegistration.setInspectUnitName(map.getString("inspectOrgName"));
// 是否西咸
if (!ObjectUtils.isEmpty(map.get("isXixian"))) {
jgUseRegistration.setIsXixian(String.valueOf(map.get("isXixian")));
}
// 使用地点
jgUseRegistration.setIsXixian(map.getString("isXixian"));
// TODO 待优化提取到公共类-使用一份内存
setUseAddress(map, jgUseRegistration);
jgUseRegistration.setUseRegistrationFormFile(JSONObject.toJSONString(map.get("useRegistrationFormFile")));
Map<String, Object> useRegistrationFormUrlMap = jgUseRegistrationService.getCommonService().getRegistrationFormUrl("set", map);
Optional.ofNullable(useRegistrationFormUrlMap)
.ifPresent(item -> jgUseRegistration.setUseRegistrationFormUrl(String.valueOf(item.get("useRegistrationFormUrl"))));
jgUseRegistration.setSequenceNbr(map.getLong("sequenceNbr"));
jgUseRegistrationService.getBaseMapper().updateById(jgUseRegistration);
// 更新设备关联表
LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
lambda.eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
JgUseRegistrationEq jgUseRegistrationEq = new JgUseRegistrationEq();
jgUseRegistrationEq.setEquId(map.get("equipId").toString());
jgUseRegistrationService.getJgUseRegistrationEqService().update(jgUseRegistrationEq, lambda);
// TODO 更新历史数据-主要是业务字段（如管理员等没在主表存储）
jgUseRegistrationService.updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
// 历史有证设备登记生成的 编辑时更新使用登记证管理表
jgUseRegistrationService.updateRegistrationManage(map.getLong("sequenceNbr"));
return Boolean.TRUE;
}
private void setUseAddress(JSONObject map, JgUseRegistration jgUseRegistration) {
// 市
List<LinkedHashMap> city = (List<LinkedHashMap>) redisUtils.get("CITY");
// 区
......@@ -422,7 +429,7 @@ public class UseRegisterUpdateService {
});
}
// 区县
if (!ObjectUtils.isEmpty(map.get("county")) && !ObjectUtils.isEmpty(city)) {
if (!ObjectUtils.isEmpty(map.get("county")) && !ObjectUtils.isEmpty(region)) {
region.forEach(item -> {
if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("county")))) {
jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
......@@ -430,34 +437,14 @@ public class UseRegisterUpdateService {
});
}
// 街道
if (!ObjectUtils.isEmpty(map.get("factoryUseSiteStreet")) && !ObjectUtils.isEmpty(city)) {
if (!ObjectUtils.isEmpty(map.get("factoryUseSiteStreet")) && !ObjectUtils.isEmpty(street)) {
street.forEach(item -> {
if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("factoryUseSiteStreet")))) {
jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
}
});
}
jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + map.get("address"));
Optional.ofNullable(map.get("useRegistrationFormFile"))
.map(JSONObject::toJSONString)
.ifPresent(jgUseRegistration::setUseRegistrationFormFile);
Map<String, Object> useRegistrationFormUrlMap = jgUseRegistrationService.getCommonService().getRegistrationFormUrl("set", map);
Optional.ofNullable(useRegistrationFormUrlMap)
.ifPresent(item -> jgUseRegistration.setUseRegistrationFormUrl(String.valueOf(item.get("useRegistrationFormUrl"))));
jgUseRegistration.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
jgUseRegistrationService.getBaseMapper().updateById(jgUseRegistration);
// 更新设备关联表
LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
lambda.eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
JgUseRegistrationEq jgUseRegistrationEq = new JgUseRegistrationEq();
jgUseRegistrationEq.setEquId(map.get("equipId").toString());
jgUseRegistrationService.getJgUseRegistrationEqService().update(jgUseRegistrationEq, lambda);
// 更新历史数据-主要是业务字段（如管理员等没在主表存储）
jgUseRegistrationService.updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
// 历史有证设备登记生成的 编辑时更新使用登记证管理表
jgUseRegistrationService.updateRegistrationManage(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
return null;
jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + map.getString("address"));
}
/**
......@@ -472,7 +459,6 @@ public class UseRegisterUpdateService {
// 使用登记信息
JgUseRegistration jgUseRegistration = new JgUseRegistration();
jgUseRegistration.setRegDate(new Date());
if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
jgUseRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
}
......@@ -787,11 +773,14 @@ public class UseRegisterUpdateService {
List<FieldChangeMeta> fieldChangeMetas = new ArrayList<>(useInfoFieldChangeMetas);
// todo 更新检验检测信息 原有业务系统要改造在审核完成时更新json时 把jySeq写上
IdxBizJgInspectionDetectionInfo inspectionDetectionInfoOld = jgUseRegistrationService.getInspectionDetectionInfoService().getById(hisData.getLong("jySeq"));
if(inspectionDetectionInfoOld == null){
if (inspectionDetectionInfoOld == null) {
inspectionDetectionInfoOld = jgUseRegistrationService.getInspectionDetectionInfoService().queryNewestDetailByRecord(useInfoNew.getRecord());
}
IdxBizJgInspectionDetectionInfo inspectionDetectionInfoNew = BeanUtil.copyProperties(inspectionDetectionInfoOld, IdxBizJgInspectionDetectionInfo.class);
String jySeq = inspectionDetectionInfoNew.getSequenceNbr();
BeanUtil.copyProperties(hisData, inspectionDetectionInfoNew);
// TODO 重要 json里有主表的主键copyProperties时导致inspectionDetectionInfoN的主键被覆盖 故如此赋值
inspectionDetectionInfoNew.setSequenceNbr(jySeq);
List<FieldChangeMeta> inspectionFieldChangeMetas = commonEquipDataProcessService.simpleTrackAndUpdate(jgUseRegistrationService.getInspectionDetectionInfoService().getBaseMapper(), inspectionDetectionInfoOld, inspectionDetectionInfoNew, useInfoNew.getRecord(), "SEQUENCE_NBR", inspectionDetectionInfoOld.getSequenceNbr());
fieldChangeMetas.addAll(inspectionFieldChangeMetas);
// 更新注册登记信息表
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java
View file @ e557f74e
......@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
import com.yeejoin.amos.boot.biz.common.annotation.Group;
import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.biz.service.*;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgUseInfoServiceImpl;
......@@ -73,8 +74,8 @@ public class CommonEquipDataProcessService {
@PostConstruct
public void init() {
Set<Class<? extends BaseChangeDataDto>> subClasses = getAllSubClasses();
for (Class<? extends BaseChangeDataDto> subClass : subClasses) {
Set<Class<? extends IBaseChangeData>> subClasses = getAllSubClasses();
for (Class<? extends IBaseChangeData> subClass : subClasses) {
Field[] fields = subClass.getDeclaredFields();
for (Field field : fields) {
field.setAccessible(true);
......@@ -449,6 +450,10 @@ public class CommonEquipDataProcessService {
String value = String.valueOf(field.get(beanData));
fieldChangeMeta.setColumnNewValue(value);
fieldChangeMeta.setColumnOldValue(value);
} else if (oV instanceof Date) {
String value = DateUtil.format((Date)oV, displayDefine.format());
fieldChangeMeta.setColumnNewValue(value);
fieldChangeMeta.setColumnOldValue(value);
}
changeData.add(fieldChangeMeta);
}
......@@ -475,7 +480,7 @@ public class CommonEquipDataProcessService {
EquipDesignChangeDataDto changeDataDto = new EquipDesignChangeDataDto();
IdxBizJgDesignInfo designInfo = idxBizJgDesignInfoMapper.selectOne(new LambdaQueryWrapper<IdxBizJgDesignInfo>().eq(IdxBizJgDesignInfo::getRecord, record));
BeanUtil.copyProperties(designInfo, changeDataDto);
changeDataDto.setDesignDate(DateUtil.formatDate(designInfo.getDesignDate()));
changeDataDto.setDesignDate(designInfo.getDesignDate());
return convertBeanField2Column2(changeDataDto, record);
}
......@@ -523,7 +528,7 @@ public class CommonEquipDataProcessService {
EquipDesignChangeDataDto changeDataDto = new EquipDesignChangeDataDto();
IdxBizJgDesignInfo designInfo = idxBizJgDesignInfoMapper.selectOne(new LambdaQueryWrapper<IdxBizJgDesignInfo>().eq(IdxBizJgDesignInfo::getRecord, record));
BeanUtil.copyProperties(designInfo, changeDataDto);
changeDataDto.setDesignDate(DateUtil.formatDate(designInfo.getDesignDate()));
changeDataDto.setDesignDate(designInfo.getDesignDate());
return changeDataDto;
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/EquipChangeDataUpdateServiceImpl.java
View file @ e557f74e
......@@ -69,7 +69,7 @@ public class EquipChangeDataUpdateServiceImpl {
public void updateDesignChangeData(String record, EquipDesignChangeDataDto equipDesignChangeDataDto) {
LambdaUpdateWrapper<IdxBizJgDesignInfo> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(IdxBizJgDesignInfo::getRecord, record);
updateWrapper.set(IdxBizJgDesignInfo::getDesignDate, StringUtils.isNotEmpty(equipDesignChangeDataDto.getDesignDate()) ? DateUtil.parse(equipDesignChangeDataDto.getDesignDate(), "yyyy-MM-dd") : null);
updateWrapper.set(IdxBizJgDesignInfo::getDesignDate, equipDesignChangeDataDto.getDesignDate());
updateWrapper.set(IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDesignDoc());
updateWrapper.set(IdxBizJgDesignInfo::getDesignUnitCreditCode, equipDesignChangeDataDto.getDesignUnitCreditCode());
updateWrapper.set(IdxBizJgDesignInfo::getDesignUnitName, equipDesignChangeDataDto.getDesignUnitName());
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleEquipChangeProcess.java
View file @ e557f74e
......@@ -43,11 +43,11 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
String record = this.getRecord(defaultChangeId);
List<FieldChangeMeta> allChangeColumns = new ArrayList<>();
// 新数据解析
EquipRegisterChangeDataDto registerChangeDataDto = commonEquipDataProcessService.castMap2Bean(changeData, EquipRegisterChangeDataDto.class);
EquipFactoryChangeDataDto factoryChangeDataDto = commonEquipDataProcessService.castMap2Bean(changeData, EquipFactoryChangeDataDto.class);
EquipDesignChangeDataDto designChangeDataDto = commonEquipDataProcessService.castMap2Bean(changeData, EquipDesignChangeDataDto.class);
EquipUseInfoChangeDataDto useInfoChangeDataDto = commonEquipDataProcessService.castMap2Bean(changeData, EquipUseInfoChangeDataDto.class);
commonEquipDataProcessService.buildChangeFields(record, designChangeDataDto, factoryChangeDataDto, registerChangeDataDto,useInfoChangeDataDto, allChangeColumns);
EquipRegisterChangeDataDto registerChangeDataDto = CommonEquipDataProcessService.castMap2Bean(changeData, EquipRegisterChangeDataDto.class);
EquipFactoryChangeDataDto factoryChangeDataDto = CommonEquipDataProcessService.castMap2Bean(changeData, EquipFactoryChangeDataDto.class);
EquipDesignChangeDataDto designChangeDataDto = CommonEquipDataProcessService.castMap2Bean(changeData, EquipDesignChangeDataDto.class);
EquipUseInfoChangeDataDto useInfoChangeDataDto = CommonEquipDataProcessService.castMap2Bean(changeData, EquipUseInfoChangeDataDto.class);
commonEquipDataProcessService.buildChangeFields(record, designChangeDataDto, factoryChangeDataDto, registerChangeDataDto, useInfoChangeDataDto, allChangeColumns);
// 前置校验
commonEquipDataProcessService.checkValidField(record, registerChangeDataDto, null, null, null);
commonEquipDataProcessService.checkValidField(record, factoryChangeDataDto, registerChangeDataDto.getEquList(), registerChangeDataDto.getEquCategory(), registerChangeDataDto.getEquDefine());
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleProjectEquipChangeProcess.java
View file @ e557f74e
......@@ -51,7 +51,7 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
pieLineDataChangeService.deletePieLineBatch(deletedPieLinesJavaList, allChangeColumns, defaultChangeId);
}
// 2.装置基本信息校验、保存(前端返回的装置信息为大写 需注意)
ProjectContraptionChangeDataDto projectContraptionChangeDataDto = commonEquipDataProcessService.castMap2Bean(changeData, ProjectContraptionChangeDataDto.class);
ProjectContraptionChangeDataDto projectContraptionChangeDataDto = CommonEquipDataProcessService.castMap2Bean(changeData, ProjectContraptionChangeDataDto.class);
this.calTotalPieLineLength(projectContraptionChangeDataDto, items);
pieLineDataChangeService.update(projectContraptionChangeDataDto, allChangeColumns);
// 3.管道信息入库保存
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
View file @ e557f74e
......@@ -170,7 +170,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
"inspectReport", "designStandard", "designDoc", "longitudeLatitude", "otherAccessoriesDes", "otherAccessoriesFact",
"otherAccessoriesReg", "installProxyStatementAttachment", "installContractAttachment", "insOtherAccessories",
"maintenanceContract", "maintOtherAccessories", "installProxyStatementAttachment", "installContractAttachment",
"insOtherAccessories", "maintenanceContract", "factSupervisionInspectionReport", "boilerEnergyEfficiencyCertificate"};
"insOtherAccessories", "maintenanceContract", "factSupervisionInspectionReport", "boilerEnergyEfficiencyCertificate", "otherAccessories"};
@Autowired
CodeUtil codeUtil;
@Autowired
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgConstructionInfo.java
View file @ e557f74e
package com.yeejoin.amos.boot.module.ymt.api.entity;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -19,7 +22,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("idx_biz_jg_construction_info")
public class IdxBizJgConstructionInfo extends TzsBaseEntity {
public class IdxBizJgConstructionInfo extends TzsBaseEntity implements IBaseChangeData {
/**
......@@ -56,12 +59,14 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity {
* 施工单位名称
*/
@TableField("\"USC_UNIT_NAME\"")
@FieldDisplayDefine(value = "施工单位名称")
private String uscUnitName;
/**
* 施工时间
* 施工日期
*/
@TableField("\"USC_DATE\"")
@FieldDisplayDefine(value = "施工日期")
private Date uscDate;
/**
......@@ -97,29 +102,34 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity {
* 施工负责人
*/
@TableField(value = "\"CONSTRUCTION_LEADER_NAME\"")
@FieldDisplayDefine(value = "施工负责人")
private String constructionLeaderName;
/**
* 施工负责人手机
*/
@TableField(value = "\"CONSTRUCTION_LEADER_PHONE\"")
@FieldDisplayDefine(value = "施工负责人手机")
private String constructionLeaderPhone;
/**
* 施工委托书图片
* 施工委托书附件
*/
@TableField(value = "\"PROXY_STATEMENT_ATTACHMENT\"")
@FieldDisplayDefine(value = "施工委托书附件", type = JSON.class)
private String proxyStatementAttachment;
/**
* 施工合同照片
*/
@TableField(value = "\"CONSTRUCTION_CONTRACT_ATTACHMENT\"")
@FieldDisplayDefine(value = "施工合同附件", type = JSON.class)
private String constructionContractAttachment;
/**
* 其他附件
*/
@FieldDisplayDefine(value = "其他附件", type = JSON.class)
@TableField(value = "\"CONSTRUCTION_OTHER_ACCESSORIES\"")
private String constructionOtherAccessories;
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgInspectionDetectionInfo.java
View file @ e557f74e
package com.yeejoin.amos.boot.module.ymt.api.entity;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
import com.yeejoin.amos.boot.biz.common.annotation.Group;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -22,7 +24,7 @@ import java.util.Date;
@Accessors(chain = true)
@TableName("idx_biz_jg_inspection_detection_info")
@Group("idx_biz_jg_inspection_detection_info")
public class IdxBizJgInspectionDetectionInfo extends TzsBaseEntity {
public class IdxBizJgInspectionDetectionInfo extends TzsBaseEntity implements IBaseChangeData {
......@@ -48,24 +50,28 @@ public class IdxBizJgInspectionDetectionInfo extends TzsBaseEntity {
*
*/
@TableField("\"INSPECT_TYPE\"")
@FieldDisplayDefine(value ="检验类型")
private String inspectType;
/**
*
*/
@TableField("\"INSPECT_ORG_CODE\"")
@FieldDisplayDefine(value ="检验机构统一信用代码")
private String inspectOrgCode;
/**
*
*/
@TableField("\"INSPECT_ORG_NAME\"")
@FieldDisplayDefine(value ="检验机构名称")
private String inspectOrgName;
/**
*
*/
@TableField("\"INSPECT_REPORT\"")
@FieldDisplayDefine(value ="检验报告", type = JSON.class)
private String inspectReport;
/**
......@@ -78,12 +84,14 @@ public class IdxBizJgInspectionDetectionInfo extends TzsBaseEntity {
*
*/
@TableField("\"INSPECT_DATE\"")
@FieldDisplayDefine(value ="检验日期")
private Date inspectDate;
/**
*
*/
@TableField("\"INSPECT_CONCLUSION\"")
@FieldDisplayDefine(value ="检验结论")
private String inspectConclusion;
/**
......@@ -115,6 +123,7 @@ public class IdxBizJgInspectionDetectionInfo extends TzsBaseEntity {
*
*/
@TableField("\"INSPECT_REPORT_NO\"")
@FieldDisplayDefine(value ="检验报告编号")
private String inspectReportNo;
@TableField(exist = false)
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgMaintenanceRecordInfo.java
View file @ e557f74e
package com.yeejoin.amos.boot.module.ymt.api.entity;
import cn.hutool.json.JSON;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
import com.yeejoin.amos.boot.biz.common.annotation.Group;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -19,7 +23,8 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("idx_biz_jg_maintenance_record_info")
public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity {
@Group("idx_biz_jg_maintenance_record_info")
public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity implements IBaseChangeData {
......@@ -47,36 +52,42 @@ public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity {
*
*/
@TableField("\"ME_UNIT_CREDIT_CODE\"")
@FieldDisplayDefine(value = "维保单位统一信用代码")
private String meUnitCreditCode;
/**
*
*/
@TableField("\"ME_UNIT_NAME\"")
@FieldDisplayDefine(value = "维保单位名称")
private String meUnitName;
/**
* 维保备案合同
*/
@TableField("\"REPAIR_INFORM\"")
@FieldDisplayDefine(value = "维保备案合同附件", type = JSON.class)
private String repairInform;
/**
* 维保合同开始日期
*/
@TableField("\"INFORM_START\"")
@FieldDisplayDefine(value = "维保合同开始日期")
private Date informStart;
/**
* 维保合同结束日期
*/
@TableField("\"INFORM_END\"")
@FieldDisplayDefine(value = "维保合同结束日期")
private Date informEnd;
/**
*维保负责人1姓名
*/
@TableField("\"ME_MASTER\"")
@FieldDisplayDefine(value = "维保负责人1姓名")
private String meMaster;
......@@ -84,6 +95,7 @@ public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity {
*维保负责人1身份证
*/
@TableField("\"ME_MASTER_ID\"")
@FieldDisplayDefine(value = "维保负责人1身份证")
private String meMasterId;
......@@ -91,6 +103,7 @@ public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity {
*维保负责人1电话
*/
@TableField("\"ME_MASTER_PHONE\"")
@FieldDisplayDefine(value = "维保负责人1电话")
private String meMasterPhone;
......@@ -98,6 +111,7 @@ public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity {
*维保负责人2姓名
*/
@TableField("\"ME_MASTER1\"")
@FieldDisplayDefine(value = "维保负责人2姓名")
private String meMaster1;
......@@ -105,12 +119,14 @@ public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity {
*维保负责人2身份证
*/
@TableField("\"ME_MASTER1_ID\"")
@FieldDisplayDefine(value = "维保负责人2身份证")
private String meMaster1Id;
/**
*维保负责人2电话
*/
@FieldDisplayDefine(value = "维保负责人2电话")
@TableField("\"ME_MASTER1_PHONE\"")
private String meMaster1Phone;
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgSupervisionInfo.java
View file @ e557f74e
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
import com.yeejoin.amos.boot.biz.common.annotation.Group;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -20,7 +21,7 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
@TableName("idx_biz_jg_supervision_info")
@Group("idx_biz_jg_supervision_info")
public class IdxBizJgSupervisionInfo extends TzsBaseEntity {
public class IdxBizJgSupervisionInfo extends TzsBaseEntity implements IBaseChangeData {
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java
View file @ e557f74e
......@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
import com.yeejoin.amos.boot.biz.common.annotation.Group;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.elasticsearch.common.recycler.Recycler;
import java.util.Date;
......@@ -24,220 +24,220 @@ import java.util.Date;
@Accessors(chain = true)
@TableName("idx_biz_jg_use_info")
@Group(value = "idx_biz_jg_use_info")
public class IdxBizJgUseInfo extends TzsBaseEntity {
public class IdxBizJgUseInfo extends TzsBaseEntity implements IBaseChangeData {
/**
*
*/
@TableField("\"RECORD\"")
@TableField("\"RECORD\"")
private String record;
/**
*
*/
@TableField("\"INSTANCE_ID\"")
@TableField("\"INSTANCE_ID\"")
private String instanceId;
/**
*
*/
@TableField("\"STATUS\"")
@TableField("\"STATUS\"")
private String status;
/**
*
*/
@TableField("\"USE_UNIT_CREDIT_CODE\"")
@TableField("\"USE_UNIT_CREDIT_CODE\"")
@FieldDisplayDefine(value = "使用单位统一信用代码")
private String useUnitCreditCode;
/**
*
*/
@TableField("\"USE_UNIT_NAME\"")
@TableField("\"USE_UNIT_NAME\"")
@FieldDisplayDefine(value = "使用单位名称")
private String useUnitName;
/**
*
*/
@TableField("\"ESTATE_UNIT_CREDIT_CODE\"")
@TableField("\"ESTATE_UNIT_CREDIT_CODE\"")
@FieldDisplayDefine(value = "产权单位统一信用代码")
private String estateUnitCreditCode;
/**
*
*/
@TableField("\"ESTATE_UNIT_NAME\"")
@TableField("\"ESTATE_UNIT_NAME\"")
@FieldDisplayDefine(value = "产权单位名称")
private String estateUnitName;
/**
*
*/
@TableField("\"USE_STATE_CHANGE_DATE\"")
@TableField("\"USE_STATE_CHANGE_DATE\"")
private String useStateChangeDate;
/**
*
*/
@TableField("\"CHANGES\"")
@TableField("\"CHANGES\"")
private String changes;
/**
*
*/
@TableField("\"USE_INNER_CODE\"")
@TableField("\"USE_INNER_CODE\"")
@FieldDisplayDefine(value = "使用内部编号")
private String useInnerCode;
/**
*
*/
@TableField("\"USE_DATE\"")
@TableField("\"USE_DATE\"")
@FieldDisplayDefine(value = "投用日期")
private String useDate;
/**
*
*/
@TableField("\"AGENT\"")
@TableField("\"AGENT\"")
private String agent;
/**
*
*/
@TableField("\"PROVINCE\"")
@TableField("\"PROVINCE\"")
@FieldDisplayDefine(value = "省份行政区划")
private String province;
/**
*
*/
@TableField("\"CITY\"")
@TableField("\"CITY\"")
@FieldDisplayDefine(value = "地市行政区划")
private String city;
/**
*
*/
@TableField("\"COUNTY\"")
@TableField("\"COUNTY\"")
@FieldDisplayDefine(value = "区县行政区划")
private String county;
/**
*
*/
@TableField("\"FACTORY_USE_SITE_STREET\"")
@TableField("\"FACTORY_USE_SITE_STREET\"")
@FieldDisplayDefine(value = "街道行政区划")
private String factoryUseSiteStreet;
/**
*
*/
@TableField("\"ADDRESS\"")
@TableField("\"ADDRESS\"")
@FieldDisplayDefine(value = "详细地址")
private String address;
/**
*
*/
@TableField("\"LONGITUDE_LATITUDE\"")
@TableField("\"LONGITUDE_LATITUDE\"")
@FieldDisplayDefine(value = "经纬度", type = JSON.class)
private String longitudeLatitude;
/**
*
*/
@TableField("\"USE_PLACE\"")
@TableField("\"USE_PLACE\"")
@FieldDisplayDefine(value = "使用场所")
private String usePlace;
/**
*
*/
@TableField("\"EQU_MANAGE_DT\"")
@TableField("\"EQU_MANAGE_DT\"")
private String equManageDt;
/**
*
*/
@TableField("\"SAFETY_MANAGE_DT\"")
@TableField("\"SAFETY_MANAGE_DT\"")
private String safetyManageDt;
/**
*
*/
@FieldDisplayDefine(value = "安管理员名称")
@TableField("\"SAFETY_MANAGER\"")
@TableField("\"SAFETY_MANAGER\"")
private String safetyManager;
/**
*
*/
@FieldDisplayDefine(value = "安管理员电话")
@TableField("\"PHONE\"")
@TableField("\"PHONE\"")
private String phone;
/**
*
*/
@TableField("\"EQU_STATE\"")
@TableField("\"EQU_STATE\"")
private String equState;
/**
*
*/
@TableField("\"PROVINCE_NAME\"")
@TableField("\"PROVINCE_NAME\"")
private String provinceName;
/**
*
*/
@TableField("\"CITY_NAME\"")
@TableField("\"CITY_NAME\"")
private String cityName;
/**
*
*/
@TableField("\"COUNTY_NAME\"")
@TableField("\"COUNTY_NAME\"")
private String countyName;
/**
*
*/
@TableField("\"IS_NOT_ES\"")
@TableField("\"IS_NOT_ES\"")
private String isNotEs;
/**
*
*/
@TableField("\"IS_NOT_ELEV\"")
@TableField("\"IS_NOT_ELEV\"")
private String isNotElev;
/**
* 创建时间
* 创建时间
*/
@TableField("\"CREATE_DATE\"")
private Date createDate;
/**
* 认领时间
* 认领时间
*/
@TableField("\"CLAIM_DATE\"")
private Date claimDate;
/**
* 数据来源（新增：0、导入：1、复制：复制数据的id 、jg:从监管加入的设备）
* 数据来源（新增：0、导入：1、复制：复制数据的id 、jg:从监管加入的设备）
*/
@TableField("\"DATA_SOURCE\"")
private String dataSource;
/**
* 是否西咸
* 是否西咸
*/
@TableField("\"IS_NOT_XIXIAN\"")
@FieldDisplayDefine(value = "是否西咸")
......@@ -256,7 +256,7 @@ public class IdxBizJgUseInfo extends TzsBaseEntity {
/**
* 是否是否纳管：true - 已纳管 false-未纳管
* 是否是否纳管：true - 已纳管 false-未纳管
*/
@TableField("\"IS_INTO_MANAGEMENT\"")
@FieldDisplayDefine(value = "是否已纳管")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment