Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java

@@ -360,6 +360,7 @@ public class ThrProductsAddDiController {
 
         FilterThrProductsRequest filterThrProductsRequest=new FilterThrProductsRequest();
         filterThrProductsRequest.setStatus(2);
+        filterThrProductsRequest.setDiType(1);
         List<ThrProductsAddDiEntity>  thrProductsAddDiEntityList=thrProductsAddDiService.filterThrProductsDiLists(filterThrProductsRequest);
 
         for (ThrProductsAddDiEntity thrProductsAddDiEntity:thrProductsAddDiEntityList){

src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml

@@ -260,6 +260,9 @@
         <if test="status != null">
             AND tdi.status = #{status}
         </if>
+        <if test="diType != null">
+            AND  updateTime &lt;= "2023-04-5 00:00:00"
+        </if>
     </where>
 </select>