修改查询条件

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/modules/sys/mapper/xml/CompletionInformationMapper.xml

@@ -45,7 +45,7 @@
 		(case  when a.submissiondate!='' and a.submissiondate is not null then
 			(case  when timestampdiff(day,a.submissiondate,expectedDate)>=0  then '否' else '是' end)
 		else
-			(case  when timestampdiff(day,date_format(now(),'%Y-%m-%d'),a.expectedDate)<=0 then '' else '是' end)
+			(case  when timestampdiff(day,date_format(now(),'%Y-%m-%d'),a.expectedDate)>=0 then '' else '是' end)
 		end
 		) as "overdue"
 		FROM lishu_item_list a
@@ -97,13 +97,15 @@
 				AND a.completiondate <=#{endCompletionDate}
 			</if>
 			<if test="beginRemainingDate != null and beginRemainingDate != ''">
-				AND (case when a.submissiondate='' or a.submissiondate is null then''
-				else timestampdiff(day,date_format(now(),'%Y-%m-%d'),a.submissiondate) end
+				AND (case
+				when a.submissiondate!='' and a.submissiondate is not null then null
+				else timestampdiff(day,date_format(now(),'%Y-%m-%d'),a.expectedDate) end
 				) &gt;= #{beginRemainingDate}
 			</if>
 			<if test="endRemainingDate != null and endRemainingDate != ''">
-				AND (case when a.submissiondate='' or a.submissiondate is null then''
-				else timestampdiff(day,date_format(now(),'%Y-%m-%d'),a.submissiondate) end
+				AND (case
+				when a.submissiondate!='' and a.submissiondate is not null then null
+				else timestampdiff(day,date_format(now(),'%Y-%m-%d'),a.expectedDate) end
 				) &lt;= #{endRemainingDate}
 			</if>
 			<if test="overdue!=null and overdue!=''">