From 6d07596890c54a8b7cdfd14d8ebd4b4e9acefecd Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 02 十二月 2025 14:22:47 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 6 +-----
admin/src/components/business/OperaJkIccardWindow.vue | 2 +-
server/system_service/src/main/java/com/doumee/dao/business/model/Member.java | 38 --------------------------------------
admin/.env.production | 2 +-
4 files changed, 3 insertions(+), 45 deletions(-)
diff --git a/admin/.env.production b/admin/.env.production
index 03aa2d2..17805c0 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -1,7 +1,7 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
-VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
+VUE_APP_API_URL = 'http://10.49.152.112/system_gateway'
VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'
diff --git a/admin/src/components/business/OperaJkIccardWindow.vue b/admin/src/components/business/OperaJkIccardWindow.vue
index 3d9b329..c81726c 100644
--- a/admin/src/components/business/OperaJkIccardWindow.vue
+++ b/admin/src/components/business/OperaJkIccardWindow.vue
@@ -18,7 +18,7 @@
</el-form-item>
<el-form-item label="鍏宠仈鐢ㄦ埛" prop="memberId">
<div style="width: 100%; display: flex; flex-direction: column;">
- <el-select v-model="form.memberId" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.memberId" placeholder="璇烽�夋嫨" filterable>
<el-option v-for="(item, index) in userAll" :key="index" :label="item.name" :value="item.id"></el-option>
</el-select>
<span style="color: #999999; margin-top: 5px;">绯荤粺浼氶�氳繃IC鍏宠仈鐢ㄦ埛锛屼笌閽ュ寵鏌滀笂鐨勮溅杈嗙殑鍙告満/楠岃瘉浜哄憳淇℃伅杩涜鏍￠獙</span>
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
index 19a68c3..f805fbf 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -130,99 +130,64 @@
private String code;
@ApiModelProperty(value = "璁垮骞撮緞")
private Date birthday;
-
-
@ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
private String idcardNo;
@ApiModelProperty(value = "淇敼鐨勮韩浠借瘉鍙� ")
@TableField(exist = false)
private String idcardNoNew;
-
-
@ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
private Integer idcardType;
@ApiModelProperty(value = "鏄惁鏄墿娴佸徃鏈� 0涓嶆槸 1鏄�", example = "1")
private Integer isDriver;
-
-
-
@ApiModelProperty(value = "鐝 0鐧界彮 1澶滅彮")
private Integer classes;
-
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤 2鎷夐粦/鍐荤粨", example = "1")
private Integer status;
-
@ApiModelProperty(value = "娣诲姞浜虹紪鐮侊紙鑷叧鑱旓級", example = "1")
private Integer parentId;
-
@ApiModelProperty(value = "寰俊openid")
private String openid;
-
@ApiModelProperty(value = "椋炰功鏍囪瘑")
private String fsId;
-
@ApiModelProperty(value = "椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
private Integer fsStatus;
@ApiModelProperty(value = "椋炰功鏈�杩戝悓姝ユ椂闂�")
private Date fsDate;
-
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
private String hkId;
-
-
-
-
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
private Date hkDate;
-
-
-
@ApiModelProperty(value = "宀椾綅缂栫爜锛屽叧鑱攑ositionbiao", example = "1")
private Integer positionId;
@ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
private String erpId;
-
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
private Date erpDate;
-
@ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
private Integer erpStatus;
-
@ApiModelProperty(value = "閽夐拤鏍囪瘑", example = "1")
private String ddId;
-
@ApiModelProperty(value = "閽夐拤鍚屾鏃堕棿")
private Date ddDate;
-
@ApiModelProperty(value = "閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
private Integer ddStatus;
-
@ApiModelProperty(value = "鐧婚檰瀵嗙爜")
private String passward;
-
-
@ApiModelProperty(value = "鏄惁楂樼骇瀹℃壒浜� 0鍚� 1鏄�", example = "1")
private Integer highCheckor;
-
@ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄evice_role),澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1")
private String roleId;
-
@ApiModelProperty(value = "闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
private Date roleDate;
-
@ApiModelProperty(value = "ERP缁勭粐缂栫爜")
private String erpOrgId;
@ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
private String visitCompanyName;
-
-
@ApiModelProperty(value = "鏈�鍚庢搷浣滀汉")
@TableField(exist = false)
private String editorName;
-
-
@ApiModelProperty(value = "缁勭粐绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐 澶氫釜浠�,鍒嗗壊")
@TableField(exist = false)
private String companyTypes;
@@ -292,15 +257,12 @@
@ApiModelProperty(value = "鍩硅寮�濮嬫椂闂�")
@TableField(exist = false)
private Date trainStartTime;
-
@ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�")
@TableField(exist = false)
private List<String> roleNames;
-
@ApiModelProperty(value = "鏄惁鏌ヨ鍥哄畾浜哄憳锛�0=鍚︼紱1=鏄�" )
@TableField(exist = false)
private Integer querySpecial;
-
@ApiModelProperty(value = "鏄惁鏌ヨ閽ュ寵鏌滄牎楠屼汉鍛橈細0=鍚︼紱1=鏄�" )
@TableField(exist = false)
private Integer queryAuth;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index 212de3f..9f68973 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -722,8 +722,7 @@
jkCabinetGrid.setCarUseBookId(carUseBookList.get(Constants.ZERO).getId());
}
}
-
-
+
if(CollectionUtils.isNotEmpty(jkCabinetGridList)){
girdIdList = jkCabinetGridList.stream().map(i->i.getId()).collect(Collectors.toList());
@@ -883,7 +882,6 @@
warningEvent.setStatus(Constants.ZERO);
warningEvent.setRegion(Objects.nonNull(jkCabinet)&&StringUtils.isNotBlank(jkCabinet.getLocation())?jkCabinet.getLocation():"鏈煡浣嶇疆");
warningEventMapper.insert(warningEvent);
-
try {
// 瀛樺偍寮傚父閫氱煡鏃ュ織
WarningPush warningPush = new WarningPush();
@@ -916,9 +914,7 @@
warningEvent.setStatus(Constants.TWO);
warningEventMapper.updateById(warningEvent);
}
-
}
-
}
}
}
--
Gitblit v1.9.3