盖章信息修改

src/main/java/com/jeeplus/modules/sealApplyFor/service/SealApplyForService.java

@@ -846,5 +846,4 @@ public class SealApplyForService extends CrudService<SealApplyForDao, SealApplyF
         dao.deleteProjectInfo(id);
     }
 
-
 }

src/main/java/com/jeeplus/modules/sealApplyFor/web/SealApplyForController.java

@@ -121,6 +121,28 @@ public class SealApplyForController extends BaseController {
         }
         //获取项目信息
         Page<SealApplyForInfo> page = service.findPage(new Page<SealApplyForInfo>(request, response), sealApplyForInfo);
+        List<SealApplyForInfo> list = page.getList();
+        for (int i=0;i<list.size();i++){
+                //根据id查其他关联的项目id
+                List<String> projectIdList = service.getProjectIdById(list.get(i).getId());
+                String proName = "";
+                String reportNumber = "";
+                for (int j=0;j<projectIdList.size();j++) {
+                    SealApplyForInfo forInfo = service.getProjectInfoByProId(projectIdList.get(j));
+                    if (proName.equals("")){
+                        proName = forInfo.getProjectName();
+                    } else {
+                        proName += "," + forInfo.getProjectName();
+                    }
+                    if (StringUtils.isBlank(reportNumber)){
+                        reportNumber = forInfo.getReportDataNum();
+                    } else {
+                        reportNumber = reportNumber + "," + forInfo.getReportDataNum();
+                    }
+                }
+                list.get(i).getProjectRecords().setProjectName(proName);
+                list.get(i).getProjectRecords().setProjectReportNumber(reportNumber);
+            }
         model.addAttribute("page", page);
         return "modules/sealApplyFor/sealApplyForList";
     }

src/main/java/com/jeeplus/modules/sealMaterial/dao/SealMaterialDao.java

@@ -45,6 +45,20 @@ public interface SealMaterialDao extends CrudDao<SealMaterialInfoImport> {
      * @param
      * @return
      */
+    List<SealMaterialInfoExport> findExportList2(String id);
+
+    /**
+     * 导出数据
+     * @param
+     * @return
+     */
+    List<SealMaterialInfoExport> findExportAll2(@Param("idList")List<String> idList);
+
+    /**
+     * 导出数据
+     * @param
+     * @return
+     */
     List<SealMaterialInfoExport> findExportAll(@Param("idList")List<String> idList);
 
     /**

src/main/java/com/jeeplus/modules/sealMaterial/service/SealMaterialService.java

@@ -94,6 +94,15 @@ public class SealMaterialService extends CrudService<SealMaterialDao,SealMateria
     /**
      * 查询分页导出用
      */
+    public List<SealMaterialInfoExport> findPageExport2(Page<SealMaterialInfoExport> page, SealMaterialInfoExport sealMaterialInfoExport) {
+        sealMaterialInfoExport.setPage(page);
+        List<SealMaterialInfoExport> sealMaterialInfoExports = sealMaterialDao.findExportList2(sealMaterialInfoExport.getId());
+        return sealMaterialInfoExports;
+    }
+
+    /**
+     * 查询分页导出用
+     */
     public List<SealMaterialInfoExport> findPageExport(Page<SealMaterialInfoExport> page, SealMaterialInfoExport sealMaterialInfoExport) {
         sealMaterialInfoExport.setPage(page);
         List<SealMaterialInfoExport> sealMaterialInfoExports = sealMaterialDao.findExportList(sealMaterialInfoExport.getProjectId());
@@ -103,6 +112,14 @@ public class SealMaterialService extends CrudService<SealMaterialDao,SealMateria
     /**
      * 查询分页导出用
      */
+    public List<SealMaterialInfoExport> findPageExportAll2(List<String> idList) {
+        List<SealMaterialInfoExport> sealMaterialInfoExports = sealMaterialDao.findExportAll2(idList);
+        return sealMaterialInfoExports;
+    }
+
+    /**
+     * 查询分页导出用
+     */
     public List<SealMaterialInfoExport> findPageExportAll(List<String> idList) {
         List<SealMaterialInfoExport> sealMaterialInfoExports = sealMaterialDao.findExportAll(idList);
         return sealMaterialInfoExports;

src/main/java/com/jeeplus/modules/sealMaterial/web/SealMaterialController.java

@@ -93,35 +93,18 @@ public class SealMaterialController extends BaseController{
             //添加查询类型
             String fileName = "盖章材料表"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
             //根据id查出所有与盖章关联的项目id
-            List<String> projectIdList = applyForService.getProjectIdById(sealMaterialInfoExport.getId());
-            if (projectIdList.contains(sealMaterialInfoExport.getProjectId())){
-                projectIdList.remove(sealMaterialInfoExport.getProjectId());
-            }
-            //根据项目id查询项目信息
-            String proName = "";
-            String reportNum = "";
-            for (int i=0;i<projectIdList.size();i++) {
-                SealApplyForInfo forInfo = applyForService.getProjectInfoByProId(projectIdList.get(i));
-                if (StringUtils.isBlank(proName)){
-                    proName = forInfo.getProjectName();
-                } else {
-                    proName = proName + "," + forInfo.getProjectName();
-                }
-                if (StringUtils.isBlank(reportNum)){
-                    reportNum = forInfo.getReportDataNum();
-                } else {
-                    reportNum = reportNum + "," + forInfo.getReportDataNum();
-                }
+//            List<String> projectIdList = applyForService.getProjectIdById(sealMaterialInfoExport.getId());
+//            if (projectIdList.contains(sealMaterialInfoExport.getProjectId())){
+//                projectIdList.remove(sealMaterialInfoExport.getProjectId());
+//            }
+//            //根据项目id查询项目信息
+//            for (int i=0;i<projectIdList.size();i++) {
+//                SealApplyForInfo forInfo = applyForService.getProjectInfoByProId(projectIdList.get(i));
+//            }
+            //根据报告号查导出信息
+//            List<SealMaterialInfoExport> list = sealMaterialService.findPageExport(new Page<SealMaterialInfoExport>(request, response, -1), sealMaterialInfoExport);
+            List<SealMaterialInfoExport> list = sealMaterialService.findPageExport2(new Page<SealMaterialInfoExport>(request, response, -1), sealMaterialInfoExport);
 
-            }
-
-            List<SealMaterialInfoExport> list = sealMaterialService.findPageExport(new Page<SealMaterialInfoExport>(request, response, -1), sealMaterialInfoExport);
-            String finalProName = proName;
-            String finalReportNum = reportNum;
-            list.forEach(li->{
-                li.setProjectName(li.getProjectName() + "," + finalProName);
-                li.setProjectReportNum(li.getProjectReportNum() + "," + finalReportNum);
-            });
             new ExportExcel("盖章材料", SealMaterialInfoExport.class).setDataList(list).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {
@@ -145,15 +128,16 @@ public class SealMaterialController extends BaseController{
             String fileName = "盖章材料表"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
 
             //根据id查出所有与盖章关联的项目的报告号
-            List<String> reportNum = new ArrayList<>();
-            for (int i=0;i<idList.size();i++){
-                List<String> projectIdById = applyForService.getReportNumById(idList.get(i));
-                reportNum.addAll(projectIdById);
-            }
+//            List<String> reportNum = new ArrayList<>();
+//            for (int i=0;i<idList.size();i++){
+//                List<String> projectIdById = applyForService.getReportNumById(idList.get(i));
+//                reportNum.addAll(projectIdById);
+//            }
 
 
-            List<SealMaterialInfoExport> list = sealMaterialService.findPageExportAll(idList);
-            for (int i=0;i<list.size();i++){
+            List<SealMaterialInfoExport> list = sealMaterialService.findPageExportAll2(idList);
+//            List<SealMaterialInfoExport> list = sealMaterialService.findPageExportAll(idList);
+            /*for (int i=0;i<list.size();i++){
                 //根据报告号去查与盖章关联的项目信息
                 String id = applyForService.getProjectInfoByReportNum(list.get(i).getProjectReportNum());
                 //根据id查其他关联的项目id
@@ -175,13 +159,7 @@ public class SealMaterialController extends BaseController{
                 }
                 list.get(i).setProjectName(proName);
                 list.get(i).setProjectReportNum(reportNumber);
-            }
-//            String finalProName = proName;
-//            String finalReportNum = reportNum;
-//            list.forEach(li->{
-//                li.setProjectName(li.getProjectName() + "," + finalProName);
-//                li.setProjectReportNum(li.getProjectReportNum() + "," + finalReportNum);
-//            });
+            }*/
             new ExportExcel("盖章材料", SealMaterialInfoExport.class).setDataList(list).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {

src/main/resources/mappings/modules/sealMaterial/sealMaterialDao.xml

@@ -130,6 +130,41 @@
 		</where>
 		order by prd.number desc,s.sort asc
 	</select>
+	<select id="findExportList2" resultType="com.jeeplus.modules.sealMaterial.entity.SealMaterialInfoExport">
+		select
+		s.seal_material_name as "sealMaterialName",
+		s.amount as "amount",
+		s.main_contents as "mainContents",
+		DATE_FORMAT(s.use_seal_time,'%Y-%m-%d') as "useSealTime",
+		s.seal_contents_remarks as "sealMaterialImportRemarks",
+		prd.name as projectName,
+		prd.number as projectReportNum
+		from seal_material_info s
+		left join project_report_data prd on s.report_number = prd.number
+		left join seal_apply_for_project_info saf on saf.project_id = prd.project_id
+		WHERE prd.number is not null and saf.id = #{id}
+	</select>
+	<select id="findExportAll2" resultType="com.jeeplus.modules.sealMaterial.entity.SealMaterialInfoExport">
+		select
+		s.seal_material_name as "sealMaterialName",
+		s.amount as "amount",
+		s.main_contents as "mainContents",
+		DATE_FORMAT(s.use_seal_time,'%Y-%m-%d') as "useSealTime",
+		s.seal_contents_remarks as "sealMaterialImportRemarks",
+		prd.name as projectName,
+		prd.number as projectReportNum
+		from seal_material_info s
+		left join project_report_data prd on s.report_number = prd.number
+		left join seal_apply_for_project_info saf on saf.project_id = prd.project_id
+		<where>
+			prd.number is not null and
+			saf.id in
+			<foreach collection="idList" item="id" separator="," open="(" close=")">
+				#{id}
+			</foreach>
+		</where>
+		order by prd.number desc,s.sort asc
+	</select>
 
 	<update id="updateById">
 		update seal_material_info

src/main/webapp/webpage/modules/sealApplyFor/sealApplyForList.jsp

@@ -266,16 +266,17 @@
             ,cols: [[
 				{checkbox: true, fixed: true},
                 {field:'index',align:'center', title: '序号',width:55}
-                <%--,{field:'projName',align:'center', title: '项目名称',minWidth:250,templet:function(d){--%>
-				<%--		return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看信息', '${ctx}/sealApplyFor/sealApplyFor/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";--%>
-                <%--    }}--%>
-				,{field:'projName',align:'center', title: '项目名称',minWidth:250,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/sealApplyFor/sealApplyFor/projectview?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
-					}}
+                ,{field:'projName',align:'center', title: '项目名称',minWidth:250,templet:function(d){
+						return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看信息', '${ctx}/sealApplyFor/sealApplyFor/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+                    }}
+				<%--,{field:'projName',align:'center', title: '项目名称',minWidth:250,templet:function(d){--%>
+				<%--		return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/sealApplyFor/sealApplyFor/projectview?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";--%>
+				<%--	}}--%>
 				/*,{field:'projId',align:'center', title: '项目编号',  width:180}*/
 				,{field: 'projectReportNumber', align:'center', title: '报告号',width:220,templet: function(d){
 						if(""!= d.projectReportNumber){
-							return d.projectReportNumber;
+							return "<a class=\"attention-info\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/sealApplyFor/sealApplyFor/projectview?id=" + d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+							// return d.projectReportNumber;
 						}else{
 							return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
 						}