禅道 导出的bug修复

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -423,11 +423,11 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
         if (query.getClientId() == null) {
             return BaseResponse.errorMsg("请选择委托单位");
         }
-        if (query.getProjectId() == null || StringUtils.isEmpty(query.getProjectCode())) {
+       /* if (query.getProjectId() == null || StringUtils.isEmpty(query.getProjectCode())) {
             if (StringUtils.isEmpty(query.getProjectName())) {
                 return BaseResponse.errorMsg("请填写项目名称或选择已有项目");
             }
-        }
+        }*/
         if (StringUtils.isEmpty(query.getSendName()) || StringUtils.isEmpty(query.getSendPhone())) {
             return BaseResponse.errorMsg("请填写送样人信息");
         }
@@ -442,6 +442,18 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             return BaseResponse.errorMsg("信息错误");
         }
 
+        if(entrust.getProjectId() == null){
+            if(query.getProjectId() == null){
+                return BaseResponse.errorMsg("请添加项目信息");
+            }
+            Project project = projectMapper.selectById(entrust.getId());
+            if(project == null){
+                return BaseResponse.errorMsg("项目信息有误");
+            }
+            entrust.setProjectCode(project.getCode())
+                    .setProjectName(project.getName());
+        }
+
         String entrustCode = entrust.getProjectCode()+"-"+query.getSampleList().get(0).getCementCode();
         entrust.setEntrustCode(entrustCode);
 
@@ -463,6 +475,9 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             if(StringUtils.isEmpty(query.getProjectType())){
                 return BaseResponse.errorMsg("请选择项目类型");
             }
+            if(entrust.getProjectId() == null){
+                return BaseResponse.errorMsg("请选择项目类型");
+            }
             entrust.setStatus(9); //修改待确认
             entrust.setProjectType(query.getProjectType());
         }
@@ -1291,15 +1306,15 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
         }
         Entrust entrust = entrustMapper.selectById(entrustVo.getId());
         if(entrust.getProjectId() == null){
-            if(query.getProjectId() == null){
-                return BaseResponse.errorMsg("请添加项目信息");
-            }
-            Project project = projectMapper.selectById(entrust.getId());
-            if(project == null){
-                return BaseResponse.errorMsg("项目信息有误");
-            }
-            entrust.setProjectCode(project.getCode())
-                    .setProjectName(project.getName());
+                if(query.getProjectId() == null){
+                    return BaseResponse.errorMsg("请添加项目信息");
+                }
+                Project project = projectMapper.selectById(entrust.getId());
+                if(project == null){
+                    return BaseResponse.errorMsg("项目信息有误");
+                }
+                entrust.setProjectCode(project.getCode())
+                        .setProjectName(project.getName());
         }
       /*  //如果项目id或者项目编号为空，根据项目名称获取项目信息
         if (StringUtils.isEmpty(entrust.getProjectCode())) {

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EquipmentServiceImpl.java

@@ -685,7 +685,7 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 		params.put("supplierId", supplierId);
 		params.put("name", name);
 		params.put("code", code);
-		List<Map<String, Object>> list = scrapMapper.exportList(params);
+		List<Map<String, Object>> list = useMapper.exportList(params);
 		if (!CollectionUtils.isEmpty(list)) {
 			Map<String, Object> map = list.get(0);
 			String[] headers = new String[map.size()];