zhongrj
2024-01-16 2085873370c5b2cd5d9b612a79e2484ecea68204
标签默认颜色调整
3 files modified
10 ■■■■ changed files
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/partyOrganization/service/impl/PartyOrganizationMemberServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml 4 ●●●● patch | view | raw | blame | history
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);
                    }
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());
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 &lt; 4
            and jp.status = 2
        </if>
        <if test="place.regionCode != null and place.regionCode !='' ">
            and jg.community_code like concat('%',#{place.regionCode},'%')