完善

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairFee.java

@@ -55,6 +55,11 @@ public class RepairFee implements Serializable {
      * 设备id
      */
     @Transient
+    private String sbTypeName;
+    /**
+     * 设备id
+     */
+    @Transient
     private String sbLevel;
     /**
      * 工单类型

platform-dao/src/main/resources/mapper/check/CheckStandardMapper.xml

@@ -160,6 +160,7 @@ checkstandard.last_date,
             </if>
         </where>
         Order By
+        checkstandard.level asc,
         sbInfo.level asc,
         sbInfo.no asc,
         checkstandard.period_type asc,

platform-dao/src/main/resources/mapper/repair/RepairFeeMapper.xml

@@ -14,25 +14,30 @@
         <result column="created_time" jdbcType="TIMESTAMP" property="createdTime"/>
         <result column="fee_date" jdbcType="DATE" property="feeDate"/>
         <result column="money_type" jdbcType="SMALLINT" property="moneyType"/>
-        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/><!--
         <association column="sb_id" javaType="string" property="sbName"
                      select="com.platform.dao.mapper.sb.SbInfoMapper.selectNameById"/>
         <association column="sb_id" javaType="string" property="sbNo"
                      select="com.platform.dao.mapper.sb.SbInfoMapper.selectNoById"/>
         <association column="repair_id" javaType="string" property="repairNo"
-                     select="com.platform.dao.mapper.repair.RepairFormMapper.selectNoById"/>
+                     select="com.platform.dao.mapper.repair.RepairFormMapper.selectNoById"/>-->
     </resultMap>
     <sql id="Base_Column_List">
         fee.id, fee.sb_id, fee.no, fee.repair_id, fee.fee, fee.type, fee.reason,
         fee.fee_date,fee.money_type,
         fee.descripition, fee.remark, fee.created_time, fee.update_time,
-        fee.created_user_id, fee.update_user_id
+        fee.created_user_id, fee.update_user_id,
+        sbInfo.name sbName, sbInfo.no sbNo, sbInfo.level sbLevel,sbInfo.type_id,
+        sbType.name sbTypeName,
+        application.no repairNo, application.category
     </sql>
-    <select id="selectPageList" parameterType="com.platform.dao.dto.repair.RepairFeeDTO" resultMap="BaseResultMap">
+    <select id="selectPageList" parameterType="com.platform.dao.dto.repair.RepairFeeDTO"
+            resultType="com.platform.dao.entity.repair.RepairFee">
         select
         <include refid="Base_Column_List"/>
         from t_repair_fee fee
         LEFT JOIN t_sb_info sbInfo on fee.sb_id = sbInfo.id
+        LEFT JOIN t_sb_type sbType on sbType.id = sbInfo.type_id
         LEFT JOIN t_repair_application_form application on fee.repair_id = application.id
         <where>
             <if test="keyword != null and keyword != ''">
@@ -70,9 +75,14 @@
             </if>
         </where>
     </select>
-    <select id="selectById" parameterType="java.lang.Object" resultMap="BaseResultMap">
+    <select id="selectById" parameterType="java.lang.Object" resultType="com.platform.dao.entity.repair.RepairFee">
         select
         <include refid="Base_Column_List"/>
+        from t_repair_fee fee
+        LEFT JOIN t_sb_info sbInfo on fee.sb_id = sbInfo.id
+        LEFT JOIN t_sb_type sbType on sbType.id = sbInfo.type_id
+        LEFT JOIN t_repair_application_form application on fee.repair_id = application.id
+        <include refid="Base_Column_List"/>
         from t_repair_fee
         where id = #{id,jdbcType=VARCHAR}
     </select>

platform-service/src/main/java/com/platform/service/repair/impl/RepairFeeServiceImpl.java

@@ -74,6 +74,11 @@ public class RepairFeeServiceImpl extends BaseServiceImpl<RepairFeeMapper, Repai
         return pageInfo;
     }
 
+    @Override
+    public List<RepairFee> getModelListByDTO(RepairFeeDTO model) {
+        return mapper.selectPageList(model);
+    }
+
     @Override
     public RepairFee saveModelByDTO(RepairFeeDTO model) {
         RepairFee result = super.saveModelByDTO(model);