导出文件模板修改

application-facade/src/main/java/com/factory/controller/web/FirstArticleController.java

@@ -206,14 +206,14 @@ public class FirstArticleController {
 		return firstArticleService.getFaCheckRecordList(req);
 	}
 
-	@ApiOperation(value = "导出检查记录列表")
+	@ApiOperation(value = "导出点检结果")
 	@ApiOperationSupport(order = 18)
 	@PostMapping("/exportFaCheckRecordList")
 	public ResponseBean<FileRes> exportFaCheckRecordList(@RequestBody SearchFaCheckRecordListReq req) {
 		return firstArticleService.exportFaCheckRecordList(req);
 	}
 
-	@ApiOperation(value = "首件受控文件Excel")
+	@ApiOperation(value = "首件导出受控文件")
 	@PostMapping("/exportInitialPlanDetails")
 	public ResponseBean<FileRes> exportInitialPlanDetails(@RequestBody ExportInitialPlanDetailsReq req) {
 		return firstArticleService.exportInitialPlanDetails(req);

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -1314,6 +1314,8 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
             workMap.remove("firstArticleItemList");
             workMap.remove("allCheckFlag");
             workMap.remove("id");
+
+            AtomicInteger id = new AtomicInteger(1);
             //返回巡检结果
             item.getFirstArticleItemList().forEach(item1 -> {
 
@@ -1325,8 +1327,8 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 
                 List<String> frequencyList = new ArrayList<>();
                 boolean numType = item1.getValFlag().equals(0);
-                String greadScope = numType ? item1.getSnoStart().toString() + "Nm - " + item1.getSnoEnd().toString() + "Nm" : (item1.getValOk().equals(0) ? "OK" : "NoK");
-                beanMap.put("valFlag", greadScope);
+                String greadScope = numType ? item1.getSnoStart().toString() + "Nm - " + item1.getSnoEnd().toString() + "Nm" : "OK/NoK";
+                beanMap.put("scop", greadScope);
 
                 if (item1.getFirstFlag().equals(1)) {
                     frequencyList.add("首件");
@@ -1380,6 +1382,8 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 beanMap.put("frequency", collect);
                 beanMap.put("toolDesc", new Integer(1).equals(item1.getReleaseFlag()) ? "存在" : "无");
                 beanMap.put("tool", item1.getToolId().equals("-1") ? "非工具校验" : item1.getToolId().toString());
+                beanMap.put("id", String.valueOf(id.get()));
+                id.getAndIncrement();
                 arrayList.add(beanMap);
             });
 

common-user/src/main/java/com/factory/user/service/impl/CommonServiceImpl.java

@@ -22,6 +22,7 @@ import com.factory.user.entity.vo.res.RoleListRes;
 import com.factory.user.entity.vo.res.UserMenuRes;
 import com.factory.user.mapper.DeptMapper;
 import com.factory.user.service.*;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -32,6 +33,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 public class CommonServiceImpl implements CommonService {
     @Resource
@@ -195,6 +197,7 @@ public class CommonServiceImpl implements CommonService {
         HashMap<String, Object> fileUploadMap = new HashMap<>();
         fileUploadMap.put("file", tempFile);
         try {
+            log.debug(">>>>>>>>>>{}<<<<<", "http://127.0.0.1:40045/file/file/uploadOne");
             HttpResponse response = HttpRequest.post("http://127.0.0.1:40045/file/file/uploadOne")
                     .form(fileUploadMap)
                     .header("content-type", "multipart/form-data")
@@ -204,7 +207,7 @@ public class CommonServiceImpl implements CommonService {
                 fileInfo = JSONObject.toJavaObject(JSON.parseObject(response.body()).getJSONObject("data"), FileRes.class);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("下载文件保错", e);
             return ResponseBeanBuilder.fail("获取文件服务失败,请重试");
 
         }