项目自定义字段导出修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectCustomController.java

@@ -18,6 +18,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -46,7 +47,8 @@ public class ProjectCustomController {
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         List<ProjectCustom> projectCustomList = projectCustomMapper.selectList(new QueryWrapper<ProjectCustom>().eq("company_id", companyId));
         List<String> nameList=new ArrayList<>();
-        projectCustomList.forEach(pc->{
+        List<ProjectCustom> customList = projectCustomList.stream().filter(pl -> pl.getCustomType().equals(projectCustom.getCustomType())).collect(Collectors.toList());
+        customList.forEach(pc->{
             nameList.add(pc.getCustomName());
         });
         if(nameList.contains(projectCustom.getCustomName())){

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -1732,6 +1732,65 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             ProjectSeparate projectSeparate = projectSeparateMapper.selectById(id);
             project.setProjectSeparate(projectSeparate);
         }
+        List<ProjectCustom> proCustomList = projectCustomMapper.selectList(new QueryWrapper<ProjectCustom>().eq("company_id", companyId));
+        //按顺序存储项目自定义字段 对应plate
+        HashMap map=new HashMap();
+        for(int i=0;i<proCustomList.size();i++){
+            String disposePhoto;
+            switch (i){
+                case 0:
+                    disposePhoto= disposePhoto(project.getPlate1());
+                    project.setPlate1(disposePhoto);
+                    map.put(proCustomList.get(i).getCustomName(),project.getPlate1());
+                    break;
+                case 1:
+                    disposePhoto= disposePhoto(project.getPlate2());
+                    project.setPlate2(disposePhoto);
+                    map.put(proCustomList.get(i).getCustomName(),project.getPlate2());
+                    break;
+                case 2:
+                    disposePhoto= disposePhoto(project.getPlate3());
+                    project.setPlate3(disposePhoto);
+                    map.put(proCustomList.get(i).getCustomName(),project.getPlate3());
+                    break;
+                case 3:
+                    disposePhoto= disposePhoto(project.getPlate4());
+                    project.setPlate4(disposePhoto);
+                    map.put(proCustomList.get(i).getCustomName(),project.getPlate4());
+                    break;
+                case 4:
+                    disposePhoto= disposePhoto(project.getPlate5());
+                    project.setPlate5(disposePhoto);
+                    map.put(proCustomList.get(i).getCustomName(),project.getPlate5());
+                    break;
+                case 5:
+                    disposePhoto= disposePhoto(project.getPlate6());
+                    project.setPlate6(disposePhoto);
+                    map.put(proCustomList.get(i).getCustomName(),project.getPlate6());
+                    break;
+                case 6:
+                    disposePhoto= disposePhoto(project.getPlate7());
+                    project.setPlate7(disposePhoto);
+                    map.put(proCustomList.get(i).getCustomName(),project.getPlate7());
+                    break;
+                case 7:
+                    disposePhoto= disposePhoto(project.getPlate8());
+                    project.setPlate8(disposePhoto);
+                    map.put(proCustomList.get(i).getCustomName(),project.getPlate8());
+                    break;
+                case 8:
+                    disposePhoto= disposePhoto(project.getPlate9());
+                    project.setPlate9(disposePhoto);
+                    map.put(proCustomList.get(i).getCustomName(),project.getPlate9());
+                    break;
+                case 9:
+                    disposePhoto= disposePhoto(project.getPlate10());
+                    project.setPlate10(disposePhoto);
+                    map.put(proCustomList.get(i).getCustomName(),project.getPlate10());
+                    break;
+            }
+        }
+        project.setPlateMap(map);
         HttpRespMsg msg = new HttpRespMsg();
         msg.data = project;
 
@@ -1741,10 +1800,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
     @Override
     public HttpRespMsg detailTwo(Integer id, HttpServletRequest request) {
-        HttpRespMsg projectPage = getProjectPage(1, 20, null, 1, 0, null, id, null, null, null, null, null, null, null, null, request);
-        Map<String,Object> mapList= (Map<String, Object>) projectPage.data;
-        List<Project> projectList= (List<Project>) mapList.get("records");
-        Project project = projectList.get(0);
+//        HttpRespMsg projectPage = getProjectPage(1, 20, null, 1, 0, null, id, null, null, null, null, null, null, null, null, request);
+//        Map<String,Object> mapList= (Map<String, Object>) projectPage.data;
+//        List<Project> projectList= (List<Project>) mapList.get("records");
+        Project project = projectMapper.selectById(id);
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         TimeType timeType = timeTypeMapper.selectById(companyId);
         //todo：计算项目预算工时
@@ -5372,6 +5431,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<String> nameList= (List<String>) resultMap.get("nameList");
         Company company = companyMapper.selectById(user.getCompanyId());
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", company.getId()));
+        List<ProjectCustom> projectCustomList = projectCustomMapper.selectList(new QueryWrapper<ProjectCustom>().eq("company_id", company.getId()));
+        List<ProjectCustom> customList = projectCustomList.stream().filter(pl -> pl.getCustomType() != 1).collect(Collectors.toList());
         TimeType timeType = timeTypeMapper.selectById(user.getCompanyId());
         List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", company.getId()));
         List<String> headList = new ArrayList<String>();
@@ -5423,6 +5484,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             headList.add(MessageUtils.message("entry.proLevel"));
             headList.add(MessageUtils.message("entry.contract"));
         }
+        if(timeType.getProjectCustom()==1){
+            customList.forEach(cl->{
+                headList.add(cl.getCustomName());
+            });
+        }
         if(company.getId()==936){
 //            headList.add("合同编号");
 //            headList.add("质保开始时间");
@@ -5581,6 +5647,46 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
                 rowData.add(df.format((Double)projectVO.getContractAmount()));
             }
+            if(timeType.getProjectCustom()==1){
+                for (int i = 0; i < projectCustomList.size(); i++) {
+                    ProjectCustom projectCustom = projectCustomList.get(i);
+                    if(projectCustom.getCustomType()==1){
+                        continue;
+                    }
+                    switch (i){
+                        case 0:
+                            rowData.add(projectVO.getPlate1());
+                            break;
+                        case 1:
+                            rowData.add(projectVO.getPlate2());
+                            break;
+                        case 2:
+                            rowData.add(projectVO.getPlate3());
+                            break;
+                        case 3:
+                            rowData.add(projectVO.getPlate4());
+                            break;
+                        case 4:
+                            rowData.add(projectVO.getPlate5());
+                            break;
+                        case 5:
+                            rowData.add(projectVO.getPlate6());
+                            break;
+                        case 6:
+                            rowData.add(projectVO.getPlate7());
+                            break;
+                        case 7:
+                            rowData.add(projectVO.getPlate8());
+                            break;
+                        case 8:
+                            rowData.add(projectVO.getPlate9());
+                            break;
+                        case 9:
+                            rowData.add(projectVO.getPlate10());
+                            break;
+                    }
+                }
+            }
             if(company.getId()==936){
                 Optional<ProjectSeparate> first = projectSeparateList.stream().filter(ps -> ps.getId().equals(projectVO.getId())).findFirst();
                 if(first.isPresent()){

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -1039,6 +1039,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     //httpRespMsg.setError("操作失败");
                     httpRespMsg.setError(MessageUtils.message("other.operationFail"));
                 }
+            }else{
+                httpRespMsg.setError("原密码错误");
             }
         } catch (NullPointerException e) {
             //httpRespMsg.setError("验证失败");