From 2085873370c5b2cd5d9b612a79e2484ecea68204 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 16 Jan 2024 20:43:07 +0800
Subject: [PATCH] 标签默认颜色调整
---
src/main/java/org/springblade/modules/partyOrganization/service/impl/PartyOrganizationMemberServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index 958b83c..9d99598 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -424,7 +424,7 @@
userHouseLabelEntity.setLabelId(BigDecimal.valueOf(one1.getId()).longValue());
userHouseLabelEntity.setHouseholdId(householdEntity.getId());
// 设置默认的绿色
- userHouseLabelEntity.setColor("#30D17C");
+ userHouseLabelEntity.setColor("green");
userHouseLabelEntity.setLableType(1);
userHouseLabelEntity.setLabelName(s);
userHouseLabelEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
@@ -556,7 +556,7 @@
userHouseLabelEntity.setLableType(1);
userHouseLabelEntity.setLabelName(s);
// 设置默认的绿色
- userHouseLabelEntity.setColor("#30D17C");
+ userHouseLabelEntity.setColor("green");
userHouseLabelEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
bean.save(userHouseLabelEntity);
}
diff --git a/src/main/java/org/springblade/modules/partyOrganization/service/impl/PartyOrganizationMemberServiceImpl.java b/src/main/java/org/springblade/modules/partyOrganization/service/impl/PartyOrganizationMemberServiceImpl.java
index 63364aa..d467afe 100644
--- a/src/main/java/org/springblade/modules/partyOrganization/service/impl/PartyOrganizationMemberServiceImpl.java
+++ b/src/main/java/org/springblade/modules/partyOrganization/service/impl/PartyOrganizationMemberServiceImpl.java
@@ -43,7 +43,7 @@
userHouseLabelEntity.setHouseCode(partyOrganizationMember.getHouseCode());
userHouseLabelEntity.setLabelId(Long.parseLong(partyOrganizationMember.getPartyMemberType()));
- userHouseLabelEntity.setColor("#30D17C");
+ userHouseLabelEntity.setColor("green");
userHouseLabelEntity.setLableType(1);
userHouseLabelEntity.setHouseholdId(Long.parseLong(partyOrganizationMember.getHouseholdId()));
userHouseLabelEntity.setCreateTime(DateUtil.now());
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index da539ad..677dbb5 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -66,10 +66,10 @@
and jp.source = #{place.source}
</if>
<if test="place.isPerfect==1">
- and jpe.confirm_flag = 4
+ and jp.status = 1
</if>
<if test="place.isPerfect==2">
- and jpe.confirm_flag >= 1 and jpe.confirm_flag < 4
+ and jp.status = 2
</if>
<if test="place.regionCode != null and place.regionCode !='' ">
and jg.community_code like concat('%',#{place.regionCode},'%')
--
Gitblit v1.9.3