修改查询卡机统计报表详情 添加卡机类型

src/main/java/com/yxproject/start/api/MaterialManagementApi.java

@@ -76,9 +76,9 @@ public class MaterialManagementApi {
      * @return
      */
     @RequestMapping("selectCardBodyManagement")
-    public Map<String,Object> selectCardBodyManagement(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name){
+    public Map<String,Object> selectCardBodyManagement(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name,@Param("cardBodyType")String cardBodyType){
         Map<String,Object> resultMap = new HashMap<>();
-        List<CardBodyEntity> cardBodyEntities = materialManagementService.selectCardBody(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
+        List<CardBodyEntity> cardBodyEntities = materialManagementService.selectCardBody(replaceDate(beginDate),replaceDate(endDate),typeCode,name,cardBodyType);
         String cardCount1 = materialManagementService.selectCardCount1(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
         String cardCount2 = materialManagementService.selectCardCount2(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
         resultMap.put("cardBody",cardBodyEntities);

src/main/java/com/yxproject/start/mapper/MaterialManagementMapper.java

@@ -62,8 +62,11 @@ public interface MaterialManagementMapper {
             "<if test='typeCode != 0 '>" +
             " and card_type =#{typeCode} " +
             "</if>" +
+            "<if test='cardBodyType != 0 '>" +
+            " and card_Body_Type =#{cardBodyType} " +
+            "</if>" +
             "</script>")
-    public List<CardBodyEntity> selectCardBody(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
+    public List<CardBodyEntity> selectCardBody(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name,@Param("cardBodyType")String cardBodyType);
 
     @Select("<script>" +
             "select sum(TOTAL_COUNT) cardType1 from CARD_BODY where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and CARD_TYPE=1" +

src/main/java/com/yxproject/start/service/MaterialManagementService.java

@@ -16,7 +16,7 @@ public interface MaterialManagementService {
 
     public boolean insertCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note, String name,String cardBodyType);
 
-    public List<CardBodyEntity> selectCardBody(@Param("beginDate")String beginDate, @Param("endDate")String endDate,String typeCode, String name);
+    public List<CardBodyEntity> selectCardBody(@Param("beginDate")String beginDate, @Param("endDate")String endDate,String typeCode, String name,String cardBodyType);
 
     public String selectFilmCount1(@Param("beginDate") String beginDate,@Param("endDate")String endDate,String typeCode, String name);
 

src/main/java/com/yxproject/start/service/impl/MaterialManagementServiceImpl.java

@@ -34,8 +34,8 @@ public class MaterialManagementServiceImpl implements MaterialManagementService
     }
 
     @Override
-    public List<CardBodyEntity> selectCardBody(String beginDate, String endDate,String typeCode, String name) {
-        List<CardBodyEntity> resultList = materialManagementMapper.selectCardBody(beginDate, endDate, typeCode,  name);
+    public List<CardBodyEntity> selectCardBody(String beginDate, String endDate,String typeCode, String name,String cardBodyType) {
+        List<CardBodyEntity> resultList = materialManagementMapper.selectCardBody(beginDate, endDate, typeCode,  name,cardBodyType);
         return resultList;
     }