2022/7/21

src/main/java/com/jeeplus/modules/projectmaterialstorage/service/ProjectMaterialStorageService.java

@@ -113,10 +113,6 @@ public class ProjectMaterialStorageService extends CrudService<ProjectMaterialSt
             map.put("failure",stringBuilder);
             return map;
         }
-
-
-
-
     }
 
     /**

src/main/java/com/jeeplus/modules/projectmaterialstorage/web/ProjectMaterialStorageController.java

@@ -97,7 +97,6 @@ public class ProjectMaterialStorageController extends BaseController {
 //        此处需要修改为迭代器形式
         Iterator<ProjectMaterialStorageImport> iterator = projectMaterialStorageList2.iterator();
         while (iterator.hasNext()){
-
            ProjectMaterialStorageImport projectMaterialStorageImport = iterator.next();
             if(projectMaterialStorageImport.getPrice() == null || projectMaterialStorageImport.getMaterialName() == null || projectMaterialStorageImport.getUnit()== null || "1".equals(projectMaterialStorageImport.getDelFlag())){
                 iterator.remove();

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

@@ -661,6 +661,9 @@ END) as projectScale*/
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
 			</if>
+			<if test="projectMaterialStorageStatus !=null and projectMaterialStorageStatus!=''">
+				AND a.project_material_storage_status= #{projectMaterialStorageStatus}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -878,6 +878,17 @@
 								</form:select>
 							</div>
 						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label double-line">材料库==：</label>
+							<div class="layui-input-block readOnlyFFF">
+								<form:select path="projectMaterialStorageStatus" class="form-control simple-select">
+									<form:option value="" label=""/>
+									<form:option value="0" label="无文件"/>
+									<form:option value="1" label="有文件"/>
+									<form:option value="2" label="已处理"/>
+								</form:select>
+							</div>
+						</div>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>