归档批次0.2.9

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

@@ -384,7 +384,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             projectFilingBatch.setFilingStatus(ProjectStatusEnum.REJECTED.getValue());
             for (RuralProjectRecords projectRecords:projectFilingBatch.getProject()){
                 ProjectFilingbatchRelation relation=projectFilingbatchRelationDao.getProjectId(projectRecords.getId());
-                relation.setStatus(ProjectStatusEnum.REJECTED.getValue());
+                relation.setStatus(ProjectStatusEnum.IN_APRL.getValue());
                 this.updateByid(relation);
             }
 

src/main/resources/mappings/modules/projectGuidang/ProjectFilingBatchDao.xml

@@ -134,7 +134,7 @@
 		SELECT
 		<include refid="aa"/>
 		FROM project_filingbatch a
-		WHERE a.filing_batch = #{filingBatch}
+		WHERE a.filing_batch = #{filingBatch} and a.del_flag=0
 	</select>
 <!--	<select id="findByFilingBatch"-->
 <!--			resultType="com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch">-->

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

@@ -1412,7 +1412,7 @@
 			</if>
 
 			and a.del_flag = 0 and a.project_type in (1,2) and prd.`status`=5
-			and a.id not in (select project_id	FROM project_flingbatch_relation r left join project_filingbatch f on f.filing_batch=r.filing_batch	where f.filing_status in(2,3,5) )
+			and a.id not in (select project_id	FROM project_flingbatch_relation r left join project_filingbatch f on f.filing_batch=r.filing_batch	where f.filing_status = 4 )
 			and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
 			<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} )