添加查询操作人信息

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

@@ -155,14 +155,14 @@ public class MaterialManagementApi {
      * 查询卡基报表统计数据
      * @param beginDate 开始时间
      * @param endDate 结束时间
-     * @param typeCode 出入库类型
+     * @param operateType 出入库类型
      * @param name 操作人
      * @param cardBodyType 卡体类型
      * @return
      */
     @RequestMapping("queryCardBodyReport")
-    public Map<String,Object> queryCardBodyReport(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("typeCode")String typeCode, @Param("name")String name, @Param("cardBodyType")String cardBodyType, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
-        Map<String, Object> map = materialManagementService.selectCardBodyReport(replaceDate(beginDate), replaceDate(endDate), typeCode, name, cardBodyType,(Long.valueOf(currPage)-1)*Long.valueOf(pageSize)+1,Long.valueOf(currPage)*Long.valueOf(pageSize));
+    public Map<String,Object> queryCardBodyReport(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("operateType")String operateType, @Param("name")String name, @Param("cardBodyType")String cardBodyType, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
+        Map<String, Object> map = materialManagementService.selectCardBodyReport(replaceDate(beginDate), replaceDate(endDate), operateType, name, cardBodyType,(Long.valueOf(currPage)-1)*Long.valueOf(pageSize)+1,Long.valueOf(currPage)*Long.valueOf(pageSize));
         return map;
 
     }
@@ -171,27 +171,38 @@ public class MaterialManagementApi {
      * 查询卡基报表统计数量
      * @param beginDate 开始时间
      * @param endDate 结束时间
-     * @param typeCode 出入库类型
+     * @param operateType 出入库类型
      * @param name 操作人
      * @param cardBodyType 卡体类型
      * @return
      */
     @RequestMapping("queryCardBodyReportCount")
-    public int queryCardBodyReportCount(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("typeCode")String typeCode, @Param("name")String name, @Param("cardBodyType")String cardBodyType){
-        int i = materialManagementService.selectCardBodyReportCount(replaceDate(beginDate), replaceDate(endDate), typeCode, name, cardBodyType);
+    public int queryCardBodyReportCount(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("operateType")String operateType, @Param("name")String name, @Param("cardBodyType")String cardBodyType){
+        int i = materialManagementService.selectCardBodyReportCount(replaceDate(beginDate), replaceDate(endDate), operateType, name, cardBodyType);
         return i;
 
+    }
+    /**
+     * 查询卡基操作人
+     */
+    @RequestMapping("queryCardBodyOperation")
+    public List<Map<String,Object>> queryCardBodyOperation(){
+        List<Map<String, Object>> maps = materialManagementService.selectCardBodyOperation();
+        return maps;
+
     }
 
     /**
      * 查询膜报表统计数据
-     * @param beginDate
-     * @param endDate
+     * @param beginDate 开始时间
+     * @param endDate 结束时间
+     * @param operateType 出入库类型
+     * @param name 操作人
      * @return
      */
     @RequestMapping("queryPlasticFilmReport")
-    public Map<String,Object> queryPlasticFilmReport(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
-        Map<String, Object> map = materialManagementService.selectPlasticFilmReport(replaceDate(beginDate), replaceDate(endDate), typeCode, name,(Long.valueOf(currPage)-1)*Long.valueOf(pageSize)+1,Long.valueOf(currPage)*Long.valueOf(pageSize));
+    public Map<String,Object> queryPlasticFilmReport(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("operateType")String operateType,@Param("name")String name, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
+        Map<String, Object> map = materialManagementService.selectPlasticFilmReport(replaceDate(beginDate), replaceDate(endDate), operateType, name,(Long.valueOf(currPage)-1)*Long.valueOf(pageSize)+1,Long.valueOf(currPage)*Long.valueOf(pageSize));
         return map;
     }
 
@@ -199,20 +210,26 @@ public class MaterialManagementApi {
      * 查询膜报表统计数量
      * @param beginDate 开始时间
      * @param endDate 结束时间
-     * @param typeCode 出入库类型
+     * @param operateType 出入库类型
      * @param name 操作人
      * @return
      */
     @RequestMapping("queryPlasticFilmReportCount")
-    public int queryPlasticFilmReportCount(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("typeCode")String typeCode, @Param("name")String name){
-        int i = materialManagementService.selectPlasticFilmReportCount(replaceDate(beginDate), replaceDate(endDate), typeCode, name);
+    public int queryPlasticFilmReportCount(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("operateType")String operateType, @Param("name")String name){
+        int i = materialManagementService.selectPlasticFilmReportCount(replaceDate(beginDate), replaceDate(endDate), operateType, name);
         return i;
 
     }
 
+    /**
+     * 查询膜操作人
+     */
+    @RequestMapping("queryCardBodyOperation")
+    public List<Map<String,Object>> queryPlasticFilmOperation(){
+        List<Map<String, Object>> maps = materialManagementService.selectPlasticFilmOperation();
+        return maps;
 
-
-
+    }
 
     /**
      * 去除字符串中中线

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

@@ -190,4 +190,14 @@ public interface MaterialManagementMapper {
             "from (select name,CARD_TYPE,to_Char(SAVE_DATE,'yyyyMMdd') save_date, decode(card_type,2,0,total_count) count1 ,decode(card_type,1,0,total_count) count2 from PLASTIC_FILM)")
     public List<Map<String,Object>> selectPlasticFilmTotalCount();
 
+    @Select("select user_info.* from user_info \n" +
+            "left join SYS_USER_ROLE on SYS_USER_ROLE.USER_ID = user_info.ID\n" +
+            "where SYS_USER_ROLE.ROLE_ID = 33 or SYS_USER_ROLE.ROLE_ID = 33")
+    public List<Map<String,Object>> selectCardBodyOperation();
+
+    @Select("select user_info.* from user_info \n" +
+            "left join SYS_USER_ROLE on SYS_USER_ROLE.USER_ID = user_info.ID\n" +
+            "where SYS_USER_ROLE.ROLE_ID = 31 or SYS_USER_ROLE.ROLE_ID = 31")
+    public List<Map<String,Object>> selectPlasticFilmOperation();
+
 }

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

@@ -41,4 +41,7 @@ public interface MaterialManagementService {
 
     public int selectPlasticFilmReportCount(String beginDate, String endDate, String typeCode, String name);
 
+    public List<Map<String,Object>> selectCardBodyOperation();
+
+    public List<Map<String,Object>> selectPlasticFilmOperation();
 }

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

@@ -144,4 +144,15 @@ public class MaterialManagementServiceImpl implements MaterialManagementService
         List<Map<String, Object>> maps = materialManagementMapper.selectPlasticFilmReportCount(beginDate, endDate, typeCode, name);
         return maps.size();
     }
+
+    @Override
+    public List<Map<String, Object>> selectCardBodyOperation() {
+        List<Map<String, Object>> maps = materialManagementMapper.selectCardBodyOperation();
+        return maps;
+    }
+    @Override
+    public List<Map<String, Object>> selectPlasticFilmOperation() {
+        List<Map<String, Object>> maps = materialManagementMapper.selectPlasticFilmOperation();
+        return maps;
+    }
 }