Merge remote-tracking branch 'origin/master'

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

@@ -991,13 +991,13 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
         THEN 1 ELSE 0 END) AS qg_count3k,
         SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and dm_ydjh.kw in (15,4)
         THEN 1 ELSE 0 END) AS qg_count4k,
-        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and dm_ydjh.kw in (1,7,8) and ISNULL(dm_ydjh.slxhth, '') != ''
+        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and ISNULL(dm_ydjh.slxhth, '') != '' and (dm_ydjh.kw in (1,7,8) and dm_ydjh.zyq='FP2Q') or (dm_ydjh.kw not in (13,14,3,6) and dm_ydjh.zyq='FP2Q')
         THEN 1 ELSE 0 END) AS qg_count1kw,
-        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and dm_ydjh.kw in (10,11,12,2,5,9) and ISNULL(dm_ydjh.slxhth, '') != ''
+        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and ISNULL(dm_ydjh.slxhth, '') != '' and dm_ydjh.zyq='FP3Q'
         THEN 1 ELSE 0 END) AS qg_count2kw,
-        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and dm_ydjh.kw in (13,14,3,6) and ISNULL(dm_ydjh.slxhth, '') != ''
+        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and ISNULL(dm_ydjh.slxhth, '') != '' and dm_ydjh.kw in (13,14,3,6) and dm_ydjh.zyq='FP2Q'
         THEN 1 ELSE 0 END) AS qg_count3kw,
-        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and dm_ydjh.kw in (15,4) and ISNULL(dm_ydjh.slxhth, '') != ''
+        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and ISNULL(dm_ydjh.slxhth, '') != '' and dm_ydjh.zyq='FP4Q'
         THEN 1 ELSE 0 END) AS qg_count4kw
         FROM
         dm_ydjh