修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/LinkageUnitMapper.java

@@ -58,7 +58,7 @@ public interface LinkageUnitMapper extends BaseMapper<LinkageUnit> {
      * @return
      */
     Page<List<LinkageUnitDto>> getEmergencyLinkageUnitList(IPage<LinkageUnitDto> page,String unitName,
-			 String linkageUnitType, String linkageUnitTypeCode, String emergencyLinkageUnitCode);
+			 String linkageUnitType, String linkageUnitTypeCode, String emergencyLinkageUnitCode,String inAgreement);
 
     List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode,String emergencyLinkageUnitCode);
     

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/LinkageUnitMapper.xml

@@ -203,9 +203,22 @@
 		FROM
 		cb_linkage_unit clu
 		WHERE clu.is_delete=0
+
 		<if test="unitName != null and unitName != ''">
 			AND clu.unit_name LIKE concat('%',#{unitName}, '%')
 		</if>
+
+
+		<if test="inAgreement != null and inAgreement != ''">
+			<if test='inAgreement != "是"'>
+				AND  now() &lt; clu.agreement_start_date  or   now() &gt; clu.agreement_end_date
+			</if>
+			<if test='inAgreement != "否"'>
+				AND  now() between clu.agreement_start_date and clu.agreement_end_date
+			</if>
+		</if>
+
+
 		<if
 			test="linkageUnitType != null and linkageUnitType != ''">
 			AND clu.linkage_unit_type =#{linkageUnitType}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/LinkageUnitServiceImpl.java

@@ -72,11 +72,13 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 	 */
 	@Override
 	public Page<LinkageUnitDto> queryForLinkageUnitPage(IPage<LinkageUnitDto> page,
+
+
 			 Boolean isDelete, String unitName,
 			String linkageUnitTypeCode,
 			 String linkageUnitType,  String emergencyLinkageUnitCode,
 			String inAgreement) {
-		Page<List<LinkageUnitDto>> linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(page,unitName, linkageUnitType,linkageUnitTypeCode, emergencyLinkageUnitCode);
+		Page<List<LinkageUnitDto>> linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(page,unitName, linkageUnitType,linkageUnitTypeCode, emergencyLinkageUnitCode,inAgreement);
 		List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList.getRecords()), Map.class);
 		
 		List<Map<String, Object>> pageList = dynamicFormInstanceService.listAll(getGroupCode());
@@ -88,6 +90,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 				}
 			});
 		});
+
 		List<LinkageUnitDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(linkageUnitListMap),
 				LinkageUnitDto.class);
 		List<LinkageUnitDto> detaiList = resultDtoList.stream().map(item -> {
@@ -98,9 +101,8 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 			List<SourceFile> sourceFiles = sourceFileServiceImpl.findBySourceId(item.getSequenceNbr());
 			item.setImage(sourceFiles);
 			return item;
-		}).filter(item -> StringUtils.isEmpty(inAgreement) || inAgreement.equals(item.getInAgreement()))
-				.collect(Collectors.toList());
-
+		}).collect(Collectors.toList());
+        //.filter(item -> StringUtils.isEmpty(inAgreement) || inAgreement.equals(item.getInAgreement()))
 		Page<LinkageUnitDto> page1 = new Page<LinkageUnitDto>();
 		page1.setCurrent(page.getCurrent());
 		page1.setSize(page.getSize());