1、修复其他信息图片录入逻辑；2、修复其他信息图片展示逻辑。

ttc-app/src/main/java/cn/ubitech/ttc/controller/DataToolsController.java

@@ -7,6 +7,7 @@ import cn.ubitech.ttc.excel.entry.PolicyBasicInfoExcelData;
 import cn.ubitech.ttc.model.common.*;
 import cn.ubitech.ttc.model.datatools.dataentry.ConnectioninfoModel;
 import cn.ubitech.ttc.model.export.InterviewExportParam;
+import cn.ubitech.ttc.model.information.InfoPageModel;
 import cn.ubitech.ttc.model.organization.OrganizationModel;
 import cn.ubitech.ttc.model.researchcost.CheckParam;
 import cn.ubitech.ttc.model.user.RoleModel;
@@ -968,7 +969,8 @@ public class DataToolsController {
         ResultModel resultModel = new ResultModel();
         log.info("connid:{},userid:{},node:{},pagecode:{}",connid,userid,node,pagecode);
         try {
-            resultModel.setData(interviewDataEntryService.getConnectioninfoAllDetail(connid, userid, node, pagecode, innertype));
+            InfoPageModel infoPageModel = interviewDataEntryService.getConnectioninfoAllDetail(connid, userid, node, pagecode, innertype);
+            resultModel.setData(infoPageModel);
         } catch (Exception e) {
             resultModel.setCode(Constant.INTERFACE_STATUS_CODE_3351);
             resultModel.setData(e.toString());

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/datatools/InterviewDataEntryServiceImpl.java

@@ -279,7 +279,7 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
                 System.out.println("connId: " + connId);
                 List<ResDtLk> resDtLkList = resDtLkMapper.selectList(new EntityWrapper<ResDtLk>()
                         .eq("connid", connId)
-                        .orderBy(true,"id",false));
+                        .orderBy(true, "id", false));
 
                 System.out.println("resDtLkList: " + resDtLkList);
 
@@ -292,7 +292,7 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
                 List<ConnOrgLk> countlist = connOrgLkMapper.selectList(new EntityWrapper<ConnOrgLk>()
                         .eq("orgid", l.getId())
                         .eq("creator", userid)
-                        .orderBy(true,"id",false));
+                        .orderBy(true, "id", false));
 
                 System.out.println("countlist: " + countlist);
                 l.setCount(countlist.size());
@@ -341,7 +341,7 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
             Long connId = l.getConnid();
             List<ResDtLk> resDtLkList = resDtLkMapper.selectList(new EntityWrapper<ResDtLk>()
                     .eq("connid", connId)
-                    .orderBy(true,"id",false));
+                    .orderBy(true, "id", false));
 
             List<Long> resourceIdList = resDtLkList.stream().map(r -> r.getResid())
                     .collect(Collectors.toList());
@@ -349,7 +349,7 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
 
             List<ConnOrgLk> countlist = connOrgLkMapper.selectList(new EntityWrapper<ConnOrgLk>()
                     .eq("orgid", l.getId()).eq("creator", userid)
-                    .orderBy(true,"id",false));
+                    .orderBy(true, "id", false));
             l.setCount(countlist.size());
             List<UserModel> userlist = new ArrayList<UserModel>();
             UserModel userModel = userService.getUserBaseInfo(userid);
@@ -485,7 +485,7 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
                 Long connId = l.getConnid();
                 List<ResDtLk> resDtLkList = resDtLkMapper.selectList(new EntityWrapper<ResDtLk>()
                         .eq("connid", connId)
-                        .orderBy(true,"id",false));
+                        .orderBy(true, "id", false));
 
                 List<Long> resourceIdList = resDtLkList.stream().map(r -> r.getResid()).collect(Collectors.toList());
                 l.setResourceIdList(resourceIdList);
@@ -2169,42 +2169,67 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
             }
         }
         pageModel.setTypecodemap(typecodemap);
+        log.info("thread***:{}", JSON.toJSONString(pageModel.getInfoSectionList()));
+
         return pageModel;
     }
 
-   @Data
-   @AllArgsConstructor
-   class InterviewOtherInfoClass extends Thread {
-       InfoPageModel pageModel;
-       long connid;
-       String node;
-       Integer pagecode;
-       Integer innertype;
-       long oid;
-       long userid;
-       Map<Integer, List<AuthoritySetupModel>> typecodemap;
-
-       public void run() {
-           List<Connectionotherinfo> otherinfoList = connectionotherinfoMapper.selectList(new EntityWrapper<Connectionotherinfo>()
-                   .eq("connid", connid));
-           log.info("otherinfo size:{}",otherinfoList.size());
-           if (otherinfoList != null && otherinfoList.size() > 0) {
-               List<InfoUnitModel> unitModelList = new ArrayList<>();
-               List<List<InfoUnitModel>> unititems = new ArrayList<>();
-               InfoSectionModel sectionModel = infoPageService.getInfoSection(Connectionotherinfo.class, node, pagecode, innertype);
-               sectionModel.setCount(otherinfoList.size());
-               for (Connectionotherinfo connectionotherinfo : otherinfoList) {
-                   commonService.getObjectAuthorityShowCode(connectionotherinfo, userid, connectionotherinfo.getOrgname(), node, pagecode, 0, innertype, false, oid);
-                   typecodemap = commonService.mapCombine(typecodemap, connectionotherinfo.getInfoSectionModel().getTypecodemap());
-                   unitModelList.addAll(connectionotherinfo.getInfoSectionModel().getUnitlist());
-                   unititems.add(connectionotherinfo.getInfoSectionModel().getUnitlist());
-                   sectionModel.setUnitlist(unitModelList);
-                   sectionModel.setUnitItems(unititems);
-                   pageModel.getInfoSectionList().add(sectionModel);
-               }
-           }
-       }
-   }
+    @Data
+    @AllArgsConstructor
+    class InterviewOtherInfoClass extends Thread {
+        InfoPageModel pageModel;
+        long connid;
+        String node;
+        Integer pagecode;
+        Integer innertype;
+        long oid;
+        long userid;
+        Map<Integer, List<AuthoritySetupModel>> typecodemap;
+
+        public void run() {
+            List<Connectionotherinfo> otherinfoList = connectionotherinfoMapper.selectList(new EntityWrapper<Connectionotherinfo>()
+                    .eq("connid", connid));
+            log.info("otherinfo size:{}", otherinfoList.size());
+            if (otherinfoList != null && otherinfoList.size() > 0) {
+                List<InfoUnitModel> unitModelList = new ArrayList<>();
+                List<List<InfoUnitModel>> unititems = new ArrayList<>();
+                InfoSectionModel sectionModel = infoPageService.getInfoSection(Connectionotherinfo.class, node, pagecode, innertype);
+                sectionModel.setCount(otherinfoList.size());
+                System.err.println("run11***" + JSON.toJSONString(otherinfoList));
+                for (Connectionotherinfo connectionotherinfo : otherinfoList) {
+                    commonService.getObjectAuthorityShowCode(connectionotherinfo, userid, connectionotherinfo.getOrgname(), node, pagecode, 0, innertype, false, oid);
+                    log.info("other typecodemap:{}",JSON.toJSONString(connectionotherinfo.getInfoSectionModel().getTypecodemap()));
+                    typecodemap = commonService.mapCombine(typecodemap, connectionotherinfo.getInfoSectionModel().getTypecodemap());
+                    unitModelList.addAll(connectionotherinfo.getInfoSectionModel().getUnitlist());
+                    unititems.add(connectionotherinfo.getInfoSectionModel().getUnitlist());
+                }
+                sectionModel.setUnitlist(unitModelList);
+                System.err.println("unititems size***" + unititems.size());
+                for (List<InfoUnitModel> unititem : unititems) {
+                    for (InfoUnitModel infoUnitModel : unititem) {
+                        if ("images".equals(infoUnitModel.getDictionary())) {
+                            Map<String,Object> map = new HashMap<>();
+                            Long infoid = otherinfoList.size() > 0 ? otherinfoList.get(0).getId() : 0L;
+                            map.put("infoid",infoid);
+                            map.put("moduleid",3760);
+                            List<SystemPicture> systemPictures = systemPictureMapper.selectByMap(map);
+                            System.err.println(connid + ",infoid:" + infoid + ",pic***:{}" + JSON.toJSONString(systemPictures));
+                            infoUnitModel.setContent(JSON.toJSONString(systemPictures));
+                            // infoUnitModel.setPagecode(1000003L);
+                        }
+                    }
+                }
+                sectionModel.setUnitItems(unititems);
+
+
+
+                pageModel.getInfoSectionList().add(sectionModel);
+
+            }
+        }
+
+
+    }
 
     @Data
     @AllArgsConstructor
@@ -2743,7 +2768,10 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
         public void run() {
             // 技术需求
             List<CompanyTechrequirementLk> techrequirementLkList = companyTechrequirementLkMapper.
-                    selectList(new EntityWrapper<CompanyTechrequirementLk>().eq("connid", connid).eq("isenabled", Constant.ONE));
+                    selectList(new EntityWrapper<CompanyTechrequirementLk>()
+                            .eq("connid", connid)
+                            .eq("isenabled", Constant.ONE));
+            log.info("jishuxuqiu***:{}", JSON.toJSONString(techrequirementLkList));
             if (techrequirementLkList != null && techrequirementLkList.size() > 0) {
                 List<InfoUnitModel> unitModelList = new ArrayList<>();
                 List<List<InfoUnitModel>> unititems = new ArrayList<>();
@@ -2751,6 +2779,7 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
                 sectionModel.setCount(techrequirementLkList.size());
                 for (CompanyTechrequirementLk t : techrequirementLkList) {
                     commonService.getObjectAuthorityShowCode(t, userid, t.getTechrequirementname(), node, pagecode, 0, innertype, false, oid);
+                    log.info("tech typecodemap:{}",JSON.toJSONString(t.getInfoSectionModel().getTypecodemap()));
                     typecodemap = commonService.mapCombine(typecodemap, t.getInfoSectionModel().getTypecodemap());
                     unitModelList.addAll(t.getInfoSectionModel().getUnitlist());
                     unititems.add(t.getInfoSectionModel().getUnitlist());
@@ -6089,17 +6118,18 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
         System.err.println("images ***:" + otherinfo.getImages());
         System.err.println("images ***:" + otherinfo.getImagelists());
         OrganizationInfo organizationInfo = organizationInfoMapper.selectById(otherinfo.getCompanyid());
-        if(null != organizationInfo){
-            log.info("organizationinfo orgid:{},orgname:{}",organizationInfo.getId(),organizationInfo.getName());
+        if (null != organizationInfo) {
+            log.info("organizationinfo orgid:{},orgname:{}", organizationInfo.getId(), organizationInfo.getName());
             otherinfo.setOrgname(organizationInfo.getName());
         }
         if (otherinfo.getId() == null || otherinfo.getId() == 0) {
             connectionotherinfoMapper.insert(otherinfo);
         } else {
             connectionotherinfoMapper.updateById(otherinfo);
-            if (otherinfo.getImagelists() != null && !otherinfo.getImagelists().equals("")) {
-                upsertSystemPicture(otherinfo.getImagelists(), otherinfo.getTablename(), 0, otherinfo.getId());
-            }
+
+        }
+        if (otherinfo.getImagelists() != null && !otherinfo.getImagelists().equals("")) {
+            upsertSystemPicture(otherinfo.getImagelists(), otherinfo.getTablename(), 0, otherinfo.getId());
         }
         log.info("otherinfo***:{}", JSON.toJSONString(otherinfo));
         return otherinfo;