Browse Source

我的项目任务列表修改

anderx 9 months ago
parent
commit
48cee3a207
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

+ 3 - 3
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1719,7 +1719,7 @@ progress_tid = values(progress_tid)
         date_format(e.create_time ,'%Y-%m-%d')creteTime,a.patent_type  patentType,tmer.service_year serviceYear,toa.type,toa.type_explain typeExplain,
         a.ht_member as htMember,a.additional_deduction additionalDeduction,a.rd_awardsubsidy rdAwardsubsidy,b.project_type as memberProjectType
         from t_order_task a
-        <if test="cid != null or memberProjectType !=null" >
+        <if test="cid != null" >
             left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
         </if>
         left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id left join t_order_mid tm on a.order_no =tm.order_no
@@ -1806,14 +1806,14 @@ progress_tid = values(progress_tid)
             and e.sign_time between #{startTime} and #{endTime}
         </if>
         <if test="memberProjectType !=null">
-            and b.project_type= #{memberProjectType,jdbcType=INTEGER}
+            and a.project_type= #{memberProjectType,jdbcType=INTEGER}
         </if>
     </sql>
 
     <select id="selectOrderTaskListCount" resultType="java.lang.Integer">
         select  count(*) from t_order_task a
         left join t_order_new e on a.order_no=e.order_no
-        <if test="cid != null or memberProjectType !=null" >
+        <if test="cid != null ">
             left join business_project b on a.commodity_id=b.id
             left join business_category c on b.cid=c.id
         </if>