111

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectManagementRuleServiceImpl.java

@@ -48,6 +48,7 @@ public class ComProjectManagementRuleServiceImpl extends BaseServiceImpl<ComProj
                 if (!isObjectNull(list.get(i))) {
                     list.get(i).setObjectId(objectId);
                     list.get(i).setShowIndex(i + 1);
+                    list.get(i).setFileId(list.get(i).getDownloadId());
                     ComProjectManagementRule comProjectManagementRule = convert2Entity(list.get(i));
                     this.insert(comProjectManagementRule);
                 }

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

@@ -259,6 +259,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             dto.setDepositBankAddress(null);
             dto.setInterbankNumber(null);
         }
+
         //经费表
         List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getList(projType);
         dto.setBudget(budgetList);
@@ -297,13 +298,13 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         if (null != comUnitDTO) {
             dto.setAppUnitName(comUnitDTO.getUnitName());
             dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
-            dto.setOrganizationCode(null);
-            dto.setAddress(comUnitDTO.getUnitAddress());
-            dto.setLegalPerson(null);
-            dto.setDepositBank(null);
-            dto.setBankAccount(null);
-            dto.setDepositBankAddress(null);
-            dto.setInterbankNumber(null);
+//            dto.setOrganizationCode(null);
+//            dto.setAddress(comUnitDTO.getUnitAddress());
+//            dto.setLegalPerson(null);
+//            dto.setDepositBank(null);
+//            dto.setBankAccount(null);
+//            dto.setDepositBankAddress(null);
+//            dto.setInterbankNumber(null);
         }
 
         // 项目合作单位

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectSubServiceImpl.java

@@ -49,6 +49,7 @@ public class ComProjectSubServiceImpl extends BaseServiceImpl<ComProjectSubDAO,
                 if (!isObjectNull(list.get(i))) {
                     list.get(i).setObjectId(objectId);
                     list.get(i).setShowIndex(i + 1);
+                    list.get(i).setFileId(list.get(i).getDownloadId());
                     ComProjectSub comProjectSub = convert2Entity(list.get(i));
                     this.insert(comProjectSub);
                 }

science-admin/src/main/resources/mapper/ComProjectManagementRuleDAO.xml

@@ -7,8 +7,9 @@
         t.id as id, t.object_id as objectId, t.unit_name as unitName, t.unit_address as unitAddress, t.project_work as projectWork
     </sql>
     <select id="getListByObjectId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectManagementRuleDTO">
-        SELECT a.*
+        SELECT a.*,b.id download_id,b.download_url,b.file_name
         FROM com_project_management_rule a
+        left join com_download b on a.file_id=b.id
         where object_id=#{objectId} order by a.show_index asc
     </select>
 </mapper>
\ No newline at end of file

science-admin/src/main/resources/mapper/ComProjectSubDAO.xml

@@ -7,8 +7,9 @@
         t.id as id, t.object_id as objectId, t.unit_name as unitName, t.unit_address as unitAddress, t.project_work as projectWork
     </sql>
     <select id="getListByObjectId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectSubDTO">
-        SELECT a.*
+        SELECT a.*,b.id download_id,b.download_url,b.file_name
         FROM com_project_sub a
+        left join com_download b on a.file_id=b.id
         where object_id=#{objectId} order by a.show_index asc
     </select>
 </mapper>
\ No newline at end of file