盖章暂存修改

src/main/java/com/jeeplus/modules/sealApplyFor/dao/SealApplyForDao.java

@@ -81,4 +81,10 @@ public interface SealApplyForDao extends CrudDao<SealApplyForInfo> {
      * @return
      */
     String getProjectInfoByReportNum(String reportNum);
+
+    /**
+     * 根据报告号删除与该盖章信息关联的盖章材料信息表信息
+     * @param reportNum
+     */
+    void deleteMaterialByNum(String reportNum);
 }

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

@@ -79,6 +79,15 @@ public class SealApplyForService extends CrudService<SealApplyForDao, SealApplyF
     private SealMaterialService sealMaterialService;
 
     /**
+     * 根据报告号删除与该盖章信息关联的盖章材料信息表信息
+     * @param reportNum
+     */
+    @Transactional(readOnly = false)
+    public void deleteMaterialByNum(String reportNum){
+        dao.deleteMaterialByNum(reportNum);
+    }
+
+    /**
      * 根据项目报告号获取项目名称和报告号
      * @param reportNum
      * @return
@@ -237,12 +246,18 @@ public class SealApplyForService extends CrudService<SealApplyForDao, SealApplyF
 
             //将已有的文件信息进行保存
             //对文件名称为空、数量为空或者是删除的数据进行删除
-
+            //插入前先删除
+            //根据id获取报告号
+            List<String> reportNum = dao.getReportNumById(sealApplyForInfo.getId());
+            //根据报告号删除
+            reportNum.forEach(num->{
+                dao.deleteMaterialByNum(num);
+            });
             if(null != sealMaterialInfoImportList){
                 User loginUser = UserUtils.getUser();
                 Integer sort = 1;
                 for (SealMaterialInfoImport info: sealMaterialInfoImportList) {
-                    info.setProjectId(sealApplyForInfo.getProjectId());
+                    info.setProjectId(sealApplyForInfo.getWorkInvoiceProjectRelationList().get(0).getProjectId());
                     info.setAgent(loginUser);
                     info.setSort(sort);
                     sort ++ ;

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

@@ -672,6 +672,13 @@ public class SealApplyForController extends BaseController {
         }
         //删除项目与盖章关系表中的数据
         //插入前先删除关联信息
+        //将盖章材料信息列表中的数据删除 根据报告号删除
+        //根据id获取报告号
+        List<String> reportNum = service.getReportNumById(sealApplyForInfo.getId());
+        //根据报告号删除
+        reportNum.forEach(num->{
+            service.deleteMaterialByNum(num);
+        });
         service.deleteProjectInfo(sealApplyForInfo.getId());
         service.delete(sealApplyForInfo);
         addMessage(redirectAttributes, "删除盖章申请成功");

src/main/resources/mappings/modules/sealApplyFor/SealApplyForDao.xml

@@ -13,7 +13,7 @@
 		a.status As "status",
 		a.remarks As "remarks",
 		a.process_instance_id As "processInstanceId" ,
-		a.project_id As "projectId",
+		safpi.project_id As "projectId",
 		a.seal_company As "sealCompany",
 		so.id AS "office.id",
 		so.name AS "office.name",
@@ -443,4 +443,7 @@
 	<delete id="deleteProjectInfo">
 		delete from seal_apply_for_project_info where id = #{id}
 	</delete>
+	<delete id="deleteMaterialByNum">
+		delete from seal_material_info where report_number = #{reportNum}
+	</delete>
 </mapper>

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

@@ -306,7 +306,7 @@
 
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改盖章申请', '${ctx}/sealApplyFor/sealApplyFor/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改盖章申请', '${ctx}/sealApplyFor/sealApplyFor/form?id=" + d.id +"&projectId=" + d.projectId + "','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {