From e02c14b53ecda4912fc93c7f83b1dcb4bb7a3999 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 01 七月 2025 14:36:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java | 1 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java | 4 +---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CompanyDocuments.java | 4 +++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyDocumentsServiceImpl.java | 7 +++++--
h5/pages/staff/snapshot.vue | 25 ++++++++++++++++++++++---
h5/api/staff.js | 2 +-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 4 ++--
admin/src/components/operation/HiddenDangerParam.vue | 4 +++-
9 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/admin/src/components/operation/HiddenDangerParam.vue b/admin/src/components/operation/HiddenDangerParam.vue
index f90e997..200271f 100644
--- a/admin/src/components/operation/HiddenDangerParam.vue
+++ b/admin/src/components/operation/HiddenDangerParam.vue
@@ -132,7 +132,9 @@
return {
isShowModal: false,
loadingInstance: false,
- param: {},
+ param: {
+ checkTypeId: null
+ },
userInfo: this.$store.state.userInfo,
uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadBatch',
typeList: [],
diff --git a/h5/api/staff.js b/h5/api/staff.js
index 56bb771..be0b1ba 100644
--- a/h5/api/staff.js
+++ b/h5/api/staff.js
@@ -251,4 +251,4 @@
method: 'get',
data
})
-}
+}
\ No newline at end of file
diff --git a/h5/pages/staff/snapshot.vue b/h5/pages/staff/snapshot.vue
index 4b9f690..6e01c08 100644
--- a/h5/pages/staff/snapshot.vue
+++ b/h5/pages/staff/snapshot.vue
@@ -19,9 +19,9 @@
<text>*</text>
<text>妫�鏌ョ被鍨�</text>
</view>
- <view class="value" @click="openArea">
+ <view class="value" @click="isShow = true">
<text class="mr6"
- :style="{ color: param.areaName ? '#000000' : '#999999' }">{{ param.areaName ? param.areaName : "璇烽�夋嫨" }}</text>
+ :style="{ color: param.checkTypeName ? '#000000' : '#999999' }">{{ param.checkTypeName ? param.checkTypeName : "璇烽�夋嫨" }}</text>
<u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
</view>
</view>
@@ -87,7 +87,7 @@
<text>鎯呭喌璇存槑</text>
</view>
<view class="value">
- <textarea placeholder="璇疯缁嗘弿杩扮幇鍦烘儏鍐碉紝涓嶅皯浜�10涓瓧" minlength="10" v-model="param.content"
+ <textarea placeholder="璇疯缁嗘弿杩扮幇鍦烘儏鍐�" v-model="param.content"
placeholder-style="color: #999999;" />
</view>
</view>
@@ -132,6 +132,9 @@
@close="isShowArea = false" @cancel="isShowArea = false"></u-picker>
<u-picker keyName="name" :show="isShowType" closeOnClickOverlay :columns="areaType" @confirm="seletedType"
@close="isShowType = false" @cancel="isShowType = false"></u-picker>
+ <!-- 妫�鏌ョ被鍨� -->
+ <u-picker keyName="name" :show="isShow" closeOnClickOverlay :columns="checkTypeList" @confirm="seletedTypeVal"
+ @close="isShow = false" @cancel="isShow = false"></u-picker>
<!-- -->
<u-datetime-picker :show="isShowTime" :formatter="formatter" :minDate="new Date().getTime()" mode="datetime" closeOnClickOverlay
@cancel="isShowTime = false" @close="isShowTime = false" @confirm="seletedDate"></u-datetime-picker>
@@ -159,6 +162,7 @@
param: {},
submitFileList: [],
+ isShow: false,
isShowCompany: false,
isShowArea: false,
isShowType: false,
@@ -168,6 +172,7 @@
deptList: [],
areaOptions: [],
areaType: [],
+ checkTypeList: [],
}
},
onLoad(option) {
@@ -287,6 +292,13 @@
console.log(item)
this.isShowType = false
},
+ seletedTypeVal(e) {
+ const item = e.value[0]
+ this.$set(this.param, 'checkTypeId', item.id)
+ this.$set(this.param, 'checkTypeName', item.name)
+ console.log(item)
+ this.isShow = false
+ },
seletedSafety(e) {
},
@@ -301,6 +313,13 @@
this.deptList = [res.data]
})
DangerConfigType({
+ type: '2'
+ }).then(res => {
+ this.checkTypeList = [res.data]
+ this.$set(this.param, 'checkTypeId', res.data[0].id)
+ this.$set(this.param, 'checkTypeName', res.data[0].name)
+ })
+ DangerConfigType({
type: '1'
}).then(res => {
this.areaType = [res.data]
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java
index 72105c9..e7845db 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java
@@ -115,6 +115,7 @@
// if(connection != null){
// connection.disconnect();
// }
+
}
return null;
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
index fe24fd8..db3b2b7 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -259,8 +259,8 @@
String hkToken = DESUtil.generateTokenToHk(loginUserInfo.getUsername(),Integer.valueOf(
systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_TOKEN_VALIDITY).getCode()
),redisTemplate);
- String url = (type==6?"":(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() +
- systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode()))
+ String url = (systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() +
+ systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode())
+ HKService.getMenuUrl(type,hkToken);
try {
if(redisTemplate!=null&& jwtProperties!=null){
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
index 2af5436..831575c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
@@ -166,9 +166,7 @@
}
InputStream inputStream = HttpsUtil.connectionInputsteam(param.getUrl(),"GET",null,null);
if(inputStream == null){
- if(StringUtils.isBlank(param.getUrl())){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏂囦欢涓嬭浇澶辫触锛岃妫�鏌ユ枃浠惰矾寰勬槸鍚﹀悎娉曪紒");
- }
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏂囦欢涓嬭浇澶辫触锛岃妫�鏌ユ枃浠惰矾寰勬槸鍚﹀悎娉曪紒");
}
if(StringUtils.isBlank(param.getFileName())){
param.setFileName(System.currentTimeMillis()+"");
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CompanyDocuments.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CompanyDocuments.java
index a6d7e9b..d760754 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CompanyDocuments.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CompanyDocuments.java
@@ -41,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -97,4 +96,7 @@
@ApiModelProperty(value = "璐ｄ换閮ㄩ棬缂栫爜(鍏宠仈company)", example = "1")
@TableField(exist = false )
private String fileurlFull;
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�", example = "1")
+ @TableField(exist = false )
+ private String creatorName;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyDocumentsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyDocumentsServiceImpl.java
index a153bd7..b415322 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyDocumentsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyDocumentsServiceImpl.java
@@ -10,6 +10,7 @@
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyDocuments;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CompanyDocumentsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -120,7 +121,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
if(StringUtils.isNotBlank(companyDocuments.getFileurl())){
- String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.COMPANY_DOCUMENTS).getCode();
companyDocuments.setFileurlFull(path + companyDocuments.getFileurl());
}
@@ -148,8 +149,10 @@
queryWrapper.selectAll(CompanyDocuments.class)
.selectAs(Company::getName,CompanyDocuments::getCompanyName)
.selectAs(Category::getName,CompanyDocuments::getCategoryName)
+ .selectAs(SystemUser::getRealname,CompanyDocuments::getCreatorName)
.leftJoin(Company.class,Company::getId,CompanyDocuments::getCompanyId)
.leftJoin(Category.class,Category::getId,CompanyDocuments::getCategoryId)
+ .leftJoin(SystemUser.class,SystemUser::getId,CompanyDocuments::getCreator)
.eq(CompanyDocuments::getIsdeleted,Constants.ZERO)
.like(Objects.nonNull(queryModel)&&StringUtils.isNotBlank(queryModel.getName()),CompanyDocuments::getName,queryModel.getName())
.eq(Objects.nonNull(queryModel)&&Objects.nonNull(queryModel.getCategoryId()),CompanyDocuments::getCategoryId,queryModel.getCategoryId())
@@ -157,7 +160,7 @@
.orderByDesc(CompanyDocuments::getSortnum)
.orderByDesc(CompanyDocuments::getCreateDate);
IPage<CompanyDocuments> iPage = companyDocumentsMapper.selectJoinPage(page, CompanyDocuments.class,queryWrapper);
- String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.COMPANY_DOCUMENTS).getCode();
for (CompanyDocuments companyDocuments:iPage.getRecords()) {
companyDocuments.setFileurlFull(path + companyDocuments.getFileurl());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 4411168..9ae0415 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -353,7 +353,7 @@
.leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
.leftJoin("company t4 on t1.company_id=t4.id")
.leftJoin("company t5 on t2.company_id=t5.id")
- .leftJoin("hidden_danger_param t6 on t2.check_type_id=t6.id");
+ .leftJoin("hidden_danger_param t6 on t.check_type_id=t6.id");
queryWrapper
.eq(HiddenDanger::getId, id)
.eq(HiddenDanger::getIsdeleted, Constants.ZERO)
@@ -451,7 +451,7 @@
.leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
.leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
.leftJoin("company t4 on t1.company_id=t4.id")
- .leftJoin("hidden_danger_param t6 on t2.check_type_id=t6.id")
+ .leftJoin("hidden_danger_param t6 on t.check_type_id=t6.id")
.leftJoin("company t5 on t2.company_id=t5.id");
//鏁版嵁鏉冮檺寮�濮�--------------------start----------------
--
Gitblit v1.9.3