任务单加上一个工位的操作转出确认时间

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

@@ -43,9 +43,9 @@ public class ExportExcelApi {
         MDC.put("ip", remoteAddr);
         JSONObject jsonObject = JSONObject.fromObject(list);
         JSONArray jsonArray = JSONArray.fromObject(jsonObject.get("list"));
-//        String type = jsonObject.get("type").toString();
+        String isHistory = jsonObject.get("isHistory").toString();
         String name = jsonObject.get("name").toString();
-        List<Map<String, Object>> mapList = detailReceiptListService.selectPostDetails(jsonArray, name);
+        List<Map<String, Object>> mapList = detailReceiptListService.selectPostDetails(jsonArray, name,isHistory);
         response.setContentType("application/x-download");
         response.setCharacterEncoding("UTF-8");
         String dateTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd");

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

@@ -192,12 +192,12 @@ public class TaskListApi {
         String remoteAddr = requ.getRemoteAddr();
         MDC.put("ip", remoteAddr);
         List<Object> objects = new ArrayList <>();
-        try {
+//        try {
             objects = taskListService.selectByCountyAtAuxiliary(Long.valueOf(process) - 1);
-        }catch (Exception e){
-            logger.error("工序：" + process);
-            logger.error("Exception 查询任务单详情(辅助库)（下发、数据核验、膜打印）异常", e);
-        }
+//        }catch (Exception e){
+//            logger.error("工序：" + process);
+//            logger.error("Exception 查询任务单详情(辅助库)（下发、数据核验、膜打印）异常", e);
+//        }
         return objects;
     }
 

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

@@ -10,7 +10,7 @@ import java.util.Map;
  * 2019/3/9   14:55
  */
 public interface DetailReceiptListService {
-    public List<Map<String,Object>> selectPostDetails(List<Integer> stringList,String name);
+    public List<Map<String,Object>> selectPostDetails(List<Integer> stringList,String name,String isHistory);
 
     public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID);
 

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

 package com.yxproject.start.service.impl;
 
 import com.yxproject.start.entity.DetailReceiptListEntity;
-import com.yxproject.start.mapper.DetailReceiptListMapper;
-import com.yxproject.start.service.DetailReceiptListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.yxproject.start.service.DetailReceiptListService;
+import com.yxproject.start.mapper.DetailReceiptListMapper;
 
 import java.util.List;
 import java.util.Map;
@@ -14,12 +14,12 @@ import java.util.Map;
  * 2019/3/9   14:55
  */
 @Service
-public class DetailReceiptListServiceImpl implements DetailReceiptListService {
+public class DetailReceiptListServiceImpl implements  DetailReceiptListService {
     @Autowired
     private DetailReceiptListMapper detailReceiptListMapper;
 
     @Override
-    public List<Map<String, Object>> selectPostDetails(List<Integer> stringList,String name) {
+    public List<Map<String, Object>> selectPostDetails(List<Integer> stringList,String name,String isHistory) {
         String str ="";
         for (int i =0;i<stringList.size();i++){
             if (i==stringList.size()-1){
@@ -30,7 +30,9 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService {
         }
 //        str+=")";
 
-        detailReceiptListMapper.updateReceiptListEntityByCardId(str,name);
+        if ("0".equals(isHistory)){
+            detailReceiptListMapper.updateReceiptListEntityByCardId(str,name);
+        }
         return detailReceiptListMapper.selectPostDetails(str);
     }
     @Override

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

@@ -781,7 +781,7 @@ public class TaskListServiceImpl implements TaskListService {
 
         }
         Map<String, Object> datemap = new LinkedHashMap<>();
-        datemap.put("date", "合计");
+        datemap.put("date", "总计");
         datemap.put("yi", yi);
         datemap.put("gangao", gangao);
         datemap.put("kuai", kuai);