DESKTOP-2K9OVK9\siwei преди 5 месеца
родител
ревизия
81507a7842

+ 9 - 0
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/qytdzz/TTdzzyjJg.java

@@ -42,6 +42,7 @@ public class TTdzzyjJg extends BaseEntity {
      */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String groupvalue;
+    private String groupcolor;
 
     /**
      * $column.columnComment
@@ -131,6 +132,14 @@ public class TTdzzyjJg extends BaseEntity {
         this.nationaltype = nationaltype;
     }
 
+    public String getGroupcolor() {
+        return groupcolor;
+    }
+
+    public void setGroupcolor(String groupcolor) {
+        this.groupcolor = groupcolor;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

+ 2 - 1
onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/qytdzz/TTdzzyjJgMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sumvalue"    column="sumvalue"    />
         <result property="geomvalue"    column="geomvalue"    />
         <result property="countvalue"    column="countvalue"    />
+        <result property="groupcolor"    column="groupcolor"    />
     </resultMap>
 
     <sql id="selectTTdzzyjJgVo">
@@ -46,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTTdzzyjJgSumByRwBsm" parameterType="TTdzzyjJg" resultMap="TTdzzyjJgResult">
         <choose>
             <when test="nationaltype!=null and nationaltype != '' ">
-                select t1.mx_bsm,t1.yz_bsm,t2.dict_value groupvalue,  t1.sumvalue,  t1.geomvalue, t1.countvalue from (
+                select t1.mx_bsm,t1.yz_bsm,t2.dict_value groupvalue,t2.dict_color groupcolor,  t1.sumvalue,  t1.geomvalue, t1.countvalue from (
                 <include refid="selectTTdzzyjJgSumVo"/> ) t1
                 left join national_code_dict t2 on t2.dict_label =t1.groupvalue and t2.dict_type =  #{nationaltype}
             </when>