未盘点明细、盘点明细导出修复

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java

@@ -172,7 +172,7 @@ public class TaskQuestController extends BladeController {
 	@GetMapping("/exportContrastStockInfo")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "盘点任务 未盘点数据导出", notes = "传入id")
-	public void exportContrastStockInfo( HttpServletResponse response,QuestDetailDTO questDetailDTO,Query query){
+	public void exportContrastStockInfo( HttpServletResponse response,QuestDetailDTO questDetailDTO){
 //		IPage<QuestDetailVO> page = taskQuestService.selectTaskDataInfo(questDetailDTO,Condition.getPage(query));
 
 		List<TaskQueryDataExcel> data =taskQuestService.exportContrastStockInfo(questDetailDTO);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java

@@ -189,7 +189,7 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
 
 	List<DistributionStockListEntity> findStockList(@Param("param") TaskSearchDTO taskSearchDTO);
 
-	List<TaskQueryDataExcel> selectContrastStockInfo(@Param("questNum") String questNum);
+	List<TaskQueryDataExcel> selectContrastStockInfo(@Param("questNum") String questNum,@Param("questStatus")Integer questStatus);
 
 	QuestDetailEntity findEntityById(@Param("questNum") String questNum,@Param("taskID") Long taskId);
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml

@@ -657,22 +657,28 @@
         </if>
     </select>
     <select id="selectContrastStockInfo" resultType="com.logpm.warehouse.excel.TaskQueryDataExcel">
-        select
+        SELECT
         order_code,
         order_package_code,
-        quest_target,
         tray_name,
         position_code,
-        firsts oneProduct,
-        second as twoProduct,
-        third_product as thirdProduct,
+        firsts AS oneProduct,
+        IF(quest_status = 1 ,'盘点','未盘') AS questStatus,
+        CASE quest_target
+        WHEN 1 THEN '订制品'
+        WHEN 2 THEN '零担'
+        ELSE
+        '库存品'
+        END questTarget,
+        SECOND AS twoProduct,
+        third_product AS thirdProduct,
         market_name,
         material_name,
         stock_num,
         brand_name,
         material_code,
         category_name
-        from ${questNum} lqd where quest_status =0
+        from ${questNum} lqd where quest_status =#{questStatus}
     </select>
 
     <select id="findEntityById" resultType="com.logpm.warehouse.entity.QuestDetailEntity">

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -3459,7 +3459,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	public List<TaskQueryDataExcel> exportContrastStockInfo(QuestDetailDTO questDetailDTO) {
 
 
-		List<TaskQueryDataExcel> datas = baseMapper.selectContrastStockInfo(questDetailDTO.getQuestNum());
+		List<TaskQueryDataExcel> datas = baseMapper.selectContrastStockInfo(questDetailDTO.getQuestNum(),questDetailDTO.getQuestStatus());
 		return datas;