From c65ac3a33caee98e3314370b0a84536466701311 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 十月 2024 08:54:01 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 6 +-----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 10 ++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java | 19 +++++++++++++------
3 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 014c378..b85c0e4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -39,11 +39,7 @@
* 3銆佽兘绠′腑蹇冿細ngzx
*/
public interface MenuPageId{
- String afzx = "afzx";//瀹夐槻涓績
- String xkzx = "xkzx";//娑堟帶涓績
- String ngzx = "ngzx";//鑳界涓績
- String jsc = "jsc";//鐗╀笟鍚庡嫟
- String kqgzt = "attendance_workstand";//鑰冨嫟绠＄悊
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
index a864f48..9119694 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
@@ -77,6 +77,9 @@
@ApiModelProperty(value = "鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�", example = "1")
// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�")
private Integer memberId;
+ @ApiModelProperty(value = "璐ｄ换閮ㄩ棬缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
+// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�")
+ private Integer dutyCompanyId;
@ApiModelProperty(value = "澶勭悊鏃堕棿")
// @ExcelColumn(name="澶勭悊鏃堕棿")
@@ -91,17 +94,21 @@
private Integer checkUserId;
@ApiModelProperty(value = "鍖哄煙鍚嶇О")
- @ExcelColumn(name="闅愭偅鍖哄煙",index = 1)
+ @ExcelColumn(name="闅愭偅鍖哄煙",index = 2)
private String areaName;
@ApiModelProperty(value = "鐢宠浜哄鍚�", example = "1")
@TableField(exist = false)
- @ExcelColumn(name="鎻愭姤浜哄鍚�",index = 3)
+ @ExcelColumn(name="鎻愭姤浜哄鍚�",index =4)
private String memberName;
@ApiModelProperty(value = "鐢宠浜烘墍灞炵粍缁囧悕绉�", example = "1")
@TableField(exist = false)
- @ExcelColumn(name="鎵�灞炵粍缁�",index = 4)
+ @ExcelColumn(name="鎵�灞炵粍缁�",index = 5)
private String companyName;
+ @ApiModelProperty(value = "璐ｄ换閮ㄩ棬鍚嶇О", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="璐ｄ换閮ㄩ棬鍚嶇О",index = 1)
+ private String dutyCompanyName;
@ApiModelProperty(value = "鐢宠浜烘墜鏈哄彿", example = "1")
@TableField(exist = false)
// @ExcelColumn(name="鐢宠浜烘墜鏈哄彿")
@@ -120,7 +127,7 @@
private String checkorPhone;
@ApiModelProperty(value = "闅愭偅绫诲瀷鍚嶇О", example = "1")
@TableField(exist = false)
- @ExcelColumn(name="闅愭偅绫诲瀷",index = 2)
+ @ExcelColumn(name="闅愭偅绫诲瀷",index = 3)
private String categoryName;
@ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂达紙鍩轰簬鎻愭姤鏃堕棿锛�", example = "2024-05-20 11:48:50")
@@ -141,12 +148,12 @@
@ApiModelProperty(value = "鎻愭姤鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ExcelColumn(name="鎻愭姤鏃堕棿",index = 5)
+ @ExcelColumn(name="鎻愭姤鏃堕棿",index = 6)
private Date submitTime;
@ApiModelProperty(value = "澶勭悊鏃堕棿锛堟暣鏀�/閫�鍥炰娇鐢級")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ExcelColumn(name="澶勭悊鏃堕棿",index = 7)
+ @ExcelColumn(name="澶勭悊鏃堕棿",index = 8)
private Date dealTime;
@ApiModelProperty(value = "闄勪欢淇℃伅")
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 474604d..a920b7b 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
@@ -238,11 +238,13 @@
.select("t1.phone",HiddenDanger::getMemberPhone)
.select("t2.name",HiddenDanger::getCheckorName)
.select("t2.phone",HiddenDanger::getCheckorPhone)
+ .select("t5.company_name_path",HiddenDanger::getDutyCompanyName)
.select("t4.company_name_path",HiddenDanger::getCompanyName);
queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId)
.leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
.leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
- .leftJoin("company t4 on t1.company_id=t4.id");
+ .leftJoin("company t4 on t1.company_id=t4.id")
+ .leftJoin("company t5 on t.duty_company_id=t5.id");
queryWrapper
.eq(HiddenDanger::getId, id).last("limit 1");
@@ -318,11 +320,13 @@
.select("t1.phone",HiddenDanger::getMemberPhone)
.select("t2.name",HiddenDanger::getCheckorName)
.select("t2.phone",HiddenDanger::getCheckorPhone)
+ .select("t5.company_name_path",HiddenDanger::getDutyCompanyName)
.select("t4.company_name_path",HiddenDanger::getCompanyName);
queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId)
.leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
.leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
- .leftJoin("company t4 on t1.company_id=t4.id");
+ .leftJoin("company t4 on t1.company_id=t4.id")
+ .leftJoin("company t5 on t.duty_company_id=t5.id");
//鏁版嵁鏉冮檺寮�濮�--------------------start----------------
LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
@@ -350,6 +354,7 @@
.eq(pageWrap.getModel().getStatus() != null, HiddenDanger::getStatus, pageWrap.getModel().getStatus())
.eq(pageWrap.getModel().getApplyCheckUserId() != null, HiddenDanger::getApplyCheckUserId, pageWrap.getModel().getApplyCheckUserId())
.eq(pageWrap.getModel().getCateId() != null, HiddenDanger::getCateId, pageWrap.getModel().getCateId())
+ .eq(pageWrap.getModel().getDutyCompanyId() != null, HiddenDanger::getDutyCompanyId, pageWrap.getModel().getDutyCompanyId())
.eq(pageWrap.getModel().getContent() != null, HiddenDanger::getContent, pageWrap.getModel().getContent())
.eq(pageWrap.getModel().getMemberId() != null, HiddenDanger::getMemberId, pageWrap.getModel().getMemberId())
.ge(pageWrap.getModel().getCheckDate() != null, HiddenDanger::getCheckDate, Utils.Date.getStart(pageWrap.getModel().getCheckDate()))
@@ -358,6 +363,7 @@
.eq(pageWrap.getModel().getCheckUserId() != null, HiddenDanger::getCheckUserId, pageWrap.getModel().getCheckUserId())
.eq(pageWrap.getModel().getAreaName() != null, HiddenDanger::getAreaName, pageWrap.getModel().getAreaName())
.like(pageWrap.getModel().getCompanyName() != null,"t4.company_name_path",pageWrap.getModel().getCompanyName())
+ .like(pageWrap.getModel().getDutyCompanyName() != null,"t5.company_name_path",pageWrap.getModel().getDutyCompanyName())
.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
.or().like(Member::getPhone,pageWrap.getModel().getMemberName()))
--
Gitblit v1.9.3