完善工时统计

wisenergy-mapper/src/main/resources/mapper/WorkProjectMapper.xml

@@ -19,6 +19,7 @@
         <result column="modify_time" property="modifyTime"/>
         <result column="business_id" property="businessId"/>
         <result column="business_name" property="businessName"/>
+        <result column="conclusion_time" property="conclusionTime"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -132,14 +133,13 @@
         from
         <include refid="table"/>
         <where>
-
             <if test="ids != null">
                 AND id IN
                 <foreach collection="ids" item="id" separator="," open="(" close=")">
                     #{id}
                 </foreach>
             </if>
-            <if test="null !=isConclusion">
+            <if test="null != isConclusion">
                 AND is_conclusion = #{isConclusion}
             </if>
         </where>