项目列表添加签发状态搜索字段(报告状态改为复核状态)

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -417,14 +417,16 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
         }
         //获取前端选择的项目信息
         //保存要归档的项目
-        for (int i=0;i<proId.length;i++){
-            String id=proId[i].split("/")[0];
-            ProjectFilingbatchRelation filingbatchRelation=new ProjectFilingbatchRelation();
-            filingbatchRelation.setFilingBatch(projectFilingBatch.getId());
-            filingbatchRelation.setProjectId(id);
-            filingbatchRelation.setStatus(2);
-            filingbatchRelation.preInsert();
-            projectFilingbatchRelationDao.insert(filingbatchRelation);
+        if(null!=proId){
+            for (int i=0;i<proId.length;i++){
+                String id=proId[i].split("/")[0];
+                ProjectFilingbatchRelation filingbatchRelation=new ProjectFilingbatchRelation();
+                filingbatchRelation.setFilingBatch(projectFilingBatch.getId());
+                filingbatchRelation.setProjectId(id);
+                filingbatchRelation.setStatus(2);
+                filingbatchRelation.preInsert();
+                projectFilingbatchRelationDao.insert(filingbatchRelation);
+            }
         }
         //新增项目树形信息
         if (null != proInfos && proInfos.length!=0 ){

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -397,7 +397,7 @@ public class ProjectFilingBatchController extends BaseController {
      */
     @RequiresPermissions(value = {"projectFilingBatch:projectFilingBatchInfo:add"}, logical = Logical.OR)
     @RequestMapping(value = "holdSave")
-    public String holdSave(ProjectFilingBatch projectFilingBatch, Model model, RedirectAttributes redirectAttributes, @RequestParam("proId")String[] proId, String[] proInfos,String[] flags) throws Exception {
+    public String holdSave(ProjectFilingBatch projectFilingBatch, Model model, RedirectAttributes redirectAttributes, @RequestParam(required = false,value = "proId")String[] proId, String[] proInfos,String[] flags) throws Exception {
         if (!beanValidator(model, projectFilingBatch)){
             return form(projectFilingBatch, model);
         }

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -239,7 +239,16 @@
 					</choose>
 				</otherwise>
 			</choose>
-
+			<choose>
+				<when test="projectReportStatusTwo == 0">
+					AND prdt.status is null
+				</when>
+				<otherwise>
+					<if test="projectReportStatusTwo!=null and projectReportStatusTwo !=''">
+						AND prdt.status = #{projectReportStatusTwo}
+					</if>
+				</otherwise>
+			</choose>
 			<if test="typeList !=null and typeList !=''">
 				and project_type in
 				<foreach collection="typeList" item="id" index="index" open="(" close=")" separator=",">
@@ -278,6 +287,7 @@
             LEFT JOIN work_client_info wct on wci.client_id = wct.id
         </if>
 		left join project_report_data prd on prd.project_id = a.id
+		left join project_report_data_two prdt on prdt.project_id = a.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id= a.id
@@ -386,7 +396,16 @@
 					</choose>
 				</otherwise>
 			</choose>
-
+			<choose>
+				<when test="projectReportStatusTwo == 0">
+					AND prdt.status is null
+				</when>
+				<otherwise>
+					<if test="projectReportStatusTwo!=null and projectReportStatusTwo !=''">
+						AND prdt.status = #{projectReportStatusTwo}
+					</if>
+				</otherwise>
+			</choose>
 			<if test="typeList !=null and typeList !=''">
 				and project_type in
 				<foreach collection="typeList" item="id" index="index" open="(" close=")" separator=",">

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -478,7 +478,16 @@
 			<if test="projectType != null and projectType != ''">
 				AND a.project_type = #{projectType}
 			</if>
-
+			<choose>
+				<when test="projectReportStatusTwo == 0">
+					AND prdt.status is null
+				</when>
+				<otherwise>
+					<if test="projectReportStatusTwo!=null and projectReportStatusTwo !=''">
+						AND prdt.status = #{projectReportStatusTwo}
+					</if>
+				</otherwise>
+			</choose>
 
             AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
             <if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
@@ -511,6 +520,7 @@
             LEFT JOIN work_client_info wct on wci.client_id = wct.id
         </if>
 		left join project_report_data prd on prd.project_id = a.id
+		left join project_report_data_two prdt on prdt.project_id = a.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id= a.id
@@ -624,7 +634,16 @@
 					</choose>
 				</otherwise>
 			</choose>
-
+			<choose>
+				<when test="projectReportStatusTwo == 0">
+					AND prdt.status is null
+				</when>
+				<otherwise>
+					<if test="projectReportStatusTwo!=null and projectReportStatusTwo !=''">
+						AND prdt.status = #{projectReportStatusTwo}
+					</if>
+				</otherwise>
+			</choose>
 			<if test="projectType != null and projectType != ''">
 				AND a.project_type = #{projectType}
 			</if>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchForm.jsp

@@ -8,6 +8,7 @@
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+    <script src="${ctxStatic}/common/html/js/script.js"></script>
     <%@include file="/webpage/include/treetable.jsp" %>
     <style>
         #projectDesc-error{
@@ -56,8 +57,12 @@
                             return false
                         }
                     }
-                    $("#inputForm").attr("action","${ctx}/projectFilingBatch/projectFilingBatchInfo/save");
-
+                    var flags=judgment();
+                    if (flags){
+                        $("#inputForm").attr("action","${ctx}/projectFilingBatch/projectFilingBatchInfo/save");
+                    }else{
+                        return flags;
+                    }
                 }else{
                     $("#inputForm").attr("action","${ctx}/projectFilingBatch/projectFilingBatchInfo/holdSave");
                 }
@@ -1001,7 +1006,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span style="color: red">*</span>归档名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="filingName" placeholder="请输入归档名称" htmlEscape="false" class="form-control  layui-input required"/>
+                        <form:input path="filingName" placeholder="请输入归档名称" htmlEscape="false" class="form-control  layui-input judgment"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7 with-textarea">