Browse Source

Merge branch 'test2' of jishutao/kede-server into prod

anderx 1 year ago
parent
commit
e46d2f30b4

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

@@ -1202,8 +1202,8 @@ progress_tid = values(progress_tid)
                  unilateral_service ,
             </if>
             <if test="progressTid != null">
-                and progress_tid ,
-            </if
+                 progress_tid ,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderNo != null">

+ 1 - 0
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -118,6 +118,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
 
     @Override
     public Object detailsList(InputTaskDetailsBo in) {
+//        findPage("selectTaskDetailsList","selectTaskDetailsCount",in);
         return null;
     }