1.跟踪记录查询增加过滤预切板功能

src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java

@@ -52,8 +52,11 @@ public class YdjhzzController {
 
     @ApiOperation(value = "查询")
     @PostMapping(value = "/getList")
-    public ResultBean getList(@RequestParam String ch,String dcpl,String dcpl1) {
+    public ResultBean getList(@RequestParam String ch,String dcpl,String dcpl1,Boolean yqbFlag) {
-        List<Ydjhzz> list=mapper.getYdjhzz(ch,dcpl,dcpl1);
+        if (yqbFlag==null){
+            yqbFlag=true;
+        }
+        List<Ydjhzz> list=mapper.getYdjhzz(ch,dcpl,dcpl1,yqbFlag);
         return new ResultBean(list);
     }
 

src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java

@@ -89,7 +89,7 @@ public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
     void updatezyq(String dcch,String dcpl);
 
     Map<String,Object> getMPSYCLJLJBP(String dcCh,String tzbh);
-    List<Ydjhzz> getYdjhzz(String ch,String dcpl,String dcpl1);
+    List<Ydjhzz> getYdjhzz(String ch,String dcpl,String dcpl1,Boolean yqbFlag);
 
     List<Ydjhzz> getYdjhzz2(String ch,String dcpl,String dcpl1,Boolean yqbFlag);
 

src/main/resources/mappers/jhgk/DmYdjhMapper.xml

@@ -1565,6 +1565,9 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
             <if test=" (dcpl==null or dcpl=='') and dcpl1!=null and dcpl1!=''">
                 and DM_BCLQJBP.dc_pl&lt;=#{dcpl1}
             </if>
+            <if test="!yqbFlag">
+                and isnull(DM_BCLQMXP.BZ,'')=''
+            </if>
         GROUP BY DM_BCLQJBP.DC_CH,DM_BCLQJBP.DC_PL,DM_BCLQJBP.DC_FD
         ORDER BY DM_BCLQJBP.DC_CH,DM_BCLQJBP.DC_PL
     </select>