delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/kshzs/KshzsMapper.xml

@@ -44,11 +44,13 @@
     </select>
 
     <select id="selectList" parameterType="com.unis.module.coding.controller.admin.kshzs.vo.paramVo" resultType="map">
-        select round(sum(jjsl/10000),2) kcsl,cdbm xzqhdm from DELIVERY_HWK
+        select round(sum(hw.jjsl/10000),2) kcsl,hw.cdbm xzqhdm,sheng.jd jd,sheng.wd wd from DELIVERY_HWK hw,DELIVERY_SHENG sheng
+            where hw.cdbm = sheng.xzqhbm
         <where>
             <include refid="queryInfo"/>
         </where>
-        order by cdbm
+        group by hw.cdbm,hw.jjsl,sheng.jd,sheng.wd
+        order by hw.cdbm
     </select>
 
     <select id="selectPieChart" parameterType="com.unis.module.coding.controller.admin.kshzs.vo.paramVo" resultType="map">
@@ -82,7 +84,7 @@
         <where>
             <include refid="queryInfo"/>
         </where>
-        group by lspzmc order by FIELD(pzdlmc,'小麦','玉米','稻谷','大豆','其他') asc
+        group by lspzmc order by FIELD(lspzmc,'小麦','玉米','稻谷','大豆','其他') asc
     </select>
 
     <select id="selectCxxList" parameterType="com.unis.module.coding.controller.admin.kshzs.vo.paramVo" resultType="com.unis.module.coding.controller.admin.kshzs.vo.cfxxVo">
@@ -228,14 +230,14 @@
                 </where>) AS crzl,
                 (SELECT NVL(ROUND(SUM(cr.jz), 2), 0) AS cksl
                  FROM DELIVERY_CRKXX cr JOIN DELIVERY_KQXX kq ON cr.kqid = kq.id
-                 WHERE cr.crklx = 0
                 <where>
+                    cr.crklx = 0
                     <include refid="queryShengInfo"/>
                 </where>) AS cksl,
                 (SELECT NVL(ROUND(SUM(cr.jz), 2), 0) AS rksl
                  FROM DELIVERY_CRKXX cr JOIN DELIVERY_KQXX kq ON cr.kqid = kq.id
-                 WHERE cr.crklx = 1
                 <where>
+                    cr.crklx = 1
                     <include refid="queryShengInfo"/>
                 </where>) AS rksl,
                 (SELECT NVL(ROUND(SUM(hw.jjsl) / 10000, 2), 0) AS kcsl