盖章bug修改

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

@@ -473,13 +473,14 @@ public class SealApplyForController extends BaseController {
         List<String> reportNum = service.getAllReport();
         Page<ProjectRecords> page = service.ruralFindPageByReimbur(new Page<ProjectRecords>(request, response), project,"");
         List<ProjectRecords> list = page.getList();
+        List<ProjectRecords> newList = new ArrayList<>();
         if (null != list){
             for (int i=0;i<list.size();i++){
-                if (reportNum.contains(list.get(i).getReportData().getNumber())){
-                    list.remove(list.get(i));
+                if (!reportNum.contains(list.get(i).getReportData().getNumber())){
+                    newList.add(list.get(i));
                 }
             }
-            page.setList(list);
+            page.setList(newList);
         }
 
         try {

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

@@ -421,8 +421,8 @@
 		select name as "projectName",number as "reportDataNum" from project_report_data where project_id = #{projectId} and del_flag = 0
 	</select>
 	<select id="getAllReport" resultType="java.lang.String">
-		SELECT b.number FROM seal_apply_for_project_info a
-		LEFT JOIN project_report_data b on a.project_id = b.project_id WHERE b.del_flag = 0
+		SELECT distinct b.number FROM seal_apply_for_project_info a
+		LEFT JOIN project_report_data b on a.project_id = b.project_id WHERE b.del_flag = 0 ORDER BY b.number desc
 	</select>
 	<select id="getReportNumById" resultType="java.lang.String">
 		SELECT b.number FROM seal_apply_for_project_info a

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

@@ -47,11 +47,54 @@
         var clientCount = 0;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
-                var size = $("#sealMaterialInfoList tr").length;
+                // var size = $("#sealMaterialInfoList tr").length;
+                // if(size < 1){
+                //     parent.layer.msg("盖章文件至少存在一条!", {icon: 5});
+                //     return false;
+                // }
+
+                var size = $("#workInvoiceProjectRelationList tr").length;
                 if(size < 1){
+                    parent.layer.msg("项目信息至少存在一条!", {icon: 5});
+                    return false;
+                }
+                var size2 = $("#sealMaterialInfoList tr").length;
+                var flag = 0;
+                for (var i = 0; i < size2; i++) {
+                    var delFalg = $("#sealMaterialInfoList").find("tr").eq(i).find("input").eq(1).val();
+                    if(1 != delFalg){
+                        flag = 1
+                    }
+                }
+                console.log(121312)
+
+                if(flag == 0){
                     parent.layer.msg("盖章文件至少存在一条!", {icon: 5});
                     return false;
                 }
+
+                var arr = [];
+                for (var j=0;j<size;j++){
+                    var val = $("#workInvoiceProjectRelationList").find("tr").eq(j).find("input").eq(6).val();
+                    arr.push(val);
+                }
+                console.log('arr', arr)
+                for (var i = 0; i < size2; i++) {
+                    // var delFlag = $("#workInvoiceProjectRelationList").val()
+                    // var val = $("#workInvoiceProjectRelationList").find("tr").eq(i).find("input").eq(6).val();
+                    var delFalg = $("#sealMaterialInfoList").find("tr").eq(j).find("input").eq(1).val();
+                    if(1 != delFalg){
+                        var val = $("#sealMaterialInfoList").find("tr").eq(i).find("input").eq(3).val();
+                        console.log('val', val)
+                        if (arr.includes(val)){
+
+                        }else {
+                            parent.layer.msg("盖章文件的报告号必须与所选项目信息的报告号相同!", {icon: 5});
+                            return false;
+                        }
+                    }
+                }
+
                 $("#inputForm").submit();
                 return true;
             }else{