Forráskód Böngészése

修改方案过滤的bug

785834757 2 hónapja
szülő
commit
d05a816f7c

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/scheme/vo/SchemeResultVo.java

@@ -23,6 +23,9 @@ public class SchemeResultVo {
         private String companyId;
         private String productId;
         private String schemeType;
+        private String energyType;
+        private String vehicleType;
+        private String carnature;
         List<SchemeInfoVo> infos = new ArrayList<>();
     }
 

+ 6 - 0
tenant/organization/src/main/resources/mapper/PtlSchemeMapper.xml

@@ -6,6 +6,9 @@
         <id column="id" property="id"/>
         <result column="company_id" property="companyId"/>
         <result column="product_id" property="productId"/>
+        <result column="energy_type" property="energyType"/>
+        <result column="vehicle_type" property="vehicleType"/>
+        <result column="carnature" property="carnature"/>
         <collection property="infos" ofType="com.jzg.commons.entity.scheme.vo.SchemeResultVo$SchemeInfoVo"  javaType="java.util.List">
             <id column="scheme_info_id" property="id"/>
             <result column="scheme_name" property="schemeName"/>
@@ -119,6 +122,9 @@
             ps.company_id,
             ps.product_id,
             ps.product_name,
+            ps.energy_type,
+            ps.vehicle_type,
+            ps.carnature,
             psi.id AS scheme_info_id,
             psi.scheme_type,
             psi.scheme_name,