11111

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/controller/FbsArrivalVouchsController.java

@@ -77,8 +77,23 @@ public class FbsArrivalVouchsController {
 		 return result;
 	 }
 
+	@RequestMapping(value = "/getLastSixMonthQualityTargetCompare")
+	public Result<List<Map<String,Object>>> getLastSixMonthQualityTargetCompare(){
+		Result<List<Map<String,Object>>> result=new Result<>();
 
+		try {
+
+			List<Map<String,Object>> map = fbsArrivalVouchsService.getLastSixMonthQualityTargetCompare();
+			result.setResult(map);
+			result.success("操作成功");
 
+		} catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+
+		 return result;
+	}
 
 
 

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/FbsArrivalVouchsMapper.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsPuArrivalvouch.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.fbsPuArrivalvouch.entity.FbsArrivalVouchs;
@@ -19,4 +20,10 @@ public interface FbsArrivalVouchsMapper extends BaseMapper<FbsArrivalVouchs> {
      */
     public List<FbsArrivalVouchs> getWillArriveList();
 
+    /**
+     * 近6个月质量目标合格率比较
+     * @return
+     */
+    public List<Map<String,Object>> getLastSixMonthQualityTargetCompare();
+
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsArrivalVouchsMapper.xml

@@ -5,13 +5,35 @@
     <select id="getWillArriveList" resultType="org.jeecg.modules.fbsPuArrivalvouch.entity.FbsArrivalVouchs">
 
         select top 5 CONVERT(varchar(100), b.dDate, 23) arriveDate,c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,
-        a.iQuantity arriveSum,d.cInvStd specs,b.cMemo memo
+          a.iQuantity arriveSum,d.cInvStd specs,b.cMemo memo
             from PU_ArrivalVouchs a
             left join PU_ArrivalVouch b on a.id = b.id
             left join Vendor c on c.cVenCode = b.cVenCode
             left join Inventory d on d.cInvCode = a.cInvCode
-           where DATEDIFF(dd,getdate()+3,b.dDate) &gt; 0 and DATEDIFF(dd,getdate()+3,b.dDate) &lt; 4
-   order by b.dDate
+            where DATEDIFF(dd,getdate()+3,b.dDate) &gt; 0 and DATEDIFF(dd,getdate()+3,b.dDate) &lt; 4
+        order by b.dDate
     </select>
 
+   <!-- <select id="getWillArriveList" resultType="org.jeecg.modules.fbsPuArrivalvouch.entity.FbsArrivalVouchs">
+
+       select top 5 CONVERT(varchar(100), b.dDate, 23) arriveDate,c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,
+          a.fValidQuantity arriveSum,d.cInvStd specs,b.cMemo memo
+            from PU_ArrivalVouchs a
+            left join PU_ArrivalVouch b on a.id = b.id
+            left join Vendor c on c.cVenCode = b.cVenCode
+            left join Inventory d on d.cInvCode = a.cInvCode
+           where fValidQuantity - fValidInQuan > 0
+        order by b.dDate
+    </select>-->
+
+    <select id="getLastSixMonthQualityTargetCompare" resultType="java.util.HashMap">
+
+        select  CONVERT(varchar(7), b.dDate,23) month, sum(a.iQuantity) target, sum(a.fRealQuantity ),
+        sum(a.fValidQuantity) real,sum(a.fValidInQuan)
+        from  PU_ArrivalVouchs a
+        left join PU_ArrivalVouch b on a.id = b.id
+        group by CONVERT(varchar(7), b.dDate,23)
+        order by CONVERT(varchar(7), b.dDate,23) desc
+
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/IFbsArrivalVouchsService.java

@@ -4,6 +4,7 @@ import org.jeecg.modules.fbsPuArrivalvouch.entity.FbsArrivalVouchs;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 采购到货退货单主表（表体）
@@ -15,4 +16,6 @@ public interface IFbsArrivalVouchsService extends IService<FbsArrivalVouchs> {
 
     public List<FbsArrivalVouchs> getWillArriveList();
 
+    public List<Map<String,Object>> getLastSixMonthQualityTargetCompare();
+
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/impl/FbsArrivalVouchsServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 采购到货退货单主表（表体）
@@ -28,4 +29,13 @@ public class FbsArrivalVouchsServiceImpl extends ServiceImpl<FbsArrivalVouchsMap
     public List<FbsArrivalVouchs> getWillArriveList() {
         return fbsArrivalVouchsMapper.getWillArriveList();
     }
+
+    /**
+     * 近6个月质量目标合格率比较
+     * @return
+     */
+    @Override
+    public List<Map<String,Object>> getLastSixMonthQualityTargetCompare(){
+        return fbsArrivalVouchsMapper.getLastSixMonthQualityTargetCompare();
+    }
 }