功能修改

src/main/java/com/nov/KgLowDurable/controller/LdConsumerFormController.java

@@ -34,14 +34,14 @@ public class LdConsumerFormController {
 
     })
     public Result list(@ApiParam(hidden = true)
-                       @RequestParam(required = false) String departmentId,
+                       @RequestParam(required = false) String department,
                        @RequestParam(required = false) String materialName,
                        @RequestParam(required = false ,defaultValue = "1") Integer pageNum,
                        @RequestParam(required = false ,defaultValue = "10") Integer pageSize,
                        @RequestParam(required = false) Integer num
                        ) {
 
-        return Result.OK(consumerFormService.getConsumerFormList(departmentId,materialName,num,pageNum,pageSize));
+        return Result.OK(consumerFormService.getConsumerFormList(department,materialName,num,pageNum,pageSize));
     }
 
     @GetMapping("/getConsumerFormList")

src/main/java/com/nov/KgLowDurable/controller/LdTwoPutStorageController.java

@@ -35,11 +35,11 @@ public class LdTwoPutStorageController {
 					       @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 						   @RequestParam(required = false) Date endTime,
 						   @RequestParam(required = false) String inOperator,
-						   @RequestParam(required = false) String demandDepartment,
+						   @RequestParam(required = false) String demandDepartmentName,
 					       @RequestParam(required = false ,defaultValue = "1") Integer pageNum,
 					       @RequestParam(required = false ,defaultValue = "10") Integer pageSize) {
 
-		return Result.OK(twoPutStorageService.getTwoPutStorageList(startTime,endTime,inOperator,demandDepartment,pageNum,pageSize));
+		return Result.OK(twoPutStorageService.getTwoPutStorageList(startTime,endTime,inOperator,demandDepartmentName,pageNum,pageSize));
 	}
 
 

src/main/java/com/nov/KgLowDurable/mapper/LdConsumerFormMapper.java

@@ -18,7 +18,7 @@ public interface LdConsumerFormMapper extends BaseMapper<LdConsumerForm> {
 
     List<LdConsumerForm> selectByDepartmentId(@Param("departmentId") String departmentId);
 
-    List<LdConsumerForm> selectConsumerFormList(@Param("departmentId") String departmentId, @Param("materialName") String materialName, @Param("num") Integer num);
+    List<LdConsumerForm> selectConsumerFormList(@Param("department") String department, @Param("materialName") String materialName, @Param("num") Integer num);
 
     List<LdTwoInventoryVO> selectByIds(@Param("consumerIds") List<Long> consumerIds);
 }

src/main/java/com/nov/KgLowDurable/mapper/LdTwoPutStorageMapper.java

@@ -16,6 +16,6 @@ public interface LdTwoPutStorageMapper extends BaseMapper<LdTwoPutStorage> {
     List<LdTwoPutStorageVO> selectTwoPutStorageList(@Param("startTime") Date startTime,
                                                     @Param("endTime") Date endTime,
                                                     @Param("inOperator")String inOperator,
-                                                    @Param("demandDepartment") String demandDepartment);
+                                                    @Param("demandDepartmentName") String demandDepartmentName);
 
 }

src/main/java/com/nov/KgLowDurable/service/ILdConsumerFormService.java

@@ -39,7 +39,7 @@ public interface ILdConsumerFormService extends IService<LdConsumerForm> {
      * @param pageSize
      * @return
      */
-    PageInfo<LdConsumerForm> getConsumerFormList(String departmentId, String materialName, Integer num, Integer pageNum, Integer pageSize);
+    PageInfo<LdConsumerForm> getConsumerFormList(String department, String materialName, Integer num, Integer pageNum, Integer pageSize);
 
     /**
      * 根据IDS 查询

src/main/java/com/nov/KgLowDurable/service/ILdTwoPutStorageService.java

@@ -22,7 +22,7 @@ public interface ILdTwoPutStorageService extends IService<LdTwoPutStorage> {
      * @param pageSize
      * @return
      */
-    PageInfo<LdTwoPutStorageVO> getTwoPutStorageList(Date startTime, Date endTime, String inOperator, String demandDepartment, Integer pageNum, Integer pageSize);
+    PageInfo<LdTwoPutStorageVO> getTwoPutStorageList(Date startTime, Date endTime, String inOperator, String demandDepartmentName, Integer pageNum, Integer pageSize);
 
     /**
      * 获取二级入库详情

src/main/resources/mapper/LdConsumerFormMapper.xml

@@ -31,8 +31,8 @@
     </select>
     <select id="selectConsumerFormList" resultType="com.nov.KgLowDurable.pojo.entity.LdConsumerForm">
         select * from ld_consumer_form where 1=1
-        <if test="departmentId != null">
+        <if test="department != null">
-            and department_id = #{departmentId}
+            and department LIKE CONCAT('%', #{department}, '%')
         </if>
         <if test="num != null">
             and num > #{num}

src/main/resources/mapper/LdTwoPutStorageMapper.xml

@@ -29,8 +29,8 @@
         <if test="inOperator != null and inOperator != ''">
             AND s.in_operator_name LIKE CONCAT('%', #{inOperator}, '%')
         </if>
-        <if test="demandDepartment != null and demandDepartment != ''">
+        <if test="demandDepartmentName != null and demandDepartmentName != ''">
-            AND d.demand_department = #{demandDepartment}
+            AND d.demand_department_name LIKE CONCAT('%', #{demandDepartmentName}, '%')
         </if>
         GROUP BY s.id
         ORDER BY s.id