feature-wzb :公积金表格修改

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -6695,7 +6695,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		if(houseName!=null) {
 			HouseNameConfigVo vo = getFundSumExportVoTwo(houseName, searchVo);
 			if (vo == null) {
-				a = "单位名称(签章): " + ""        + "                       单位公积金账号:"   + ""                 + "                    单边缴纳比例:" + ""  ;
+				a = "单位名称(签章): " + houseName        + "                       单位公积金账号:"   + ""                 + "                    单边缴纳比例:" + ""  ;
 			} else {
 
 				if (vo.getCustomerNo() == null) {

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -2148,12 +2148,12 @@
 		A.TYPE = '1'
 		AND A.`NAME` IN (#{houseName})
 		AND E.`STATUS` = '0'
-		GROUP BY A.`NAME`
 		AND
 		(PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( E.APPLY_START_DATE , "%Y-%m" ), '-', '' )))>0
 		and
-		(PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( E.APPLY_END_DATE , "%Y-%m" ), '-', '' )))  <0
-		OR ( APPLY_END_DATE IS NULL OR APPLY_END_DATE = '' )
+		((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( E.APPLY_END_DATE , "%Y-%m" ), '-', '' ))) <![CDATA[ < ]]>0
+		OR ( APPLY_END_DATE IS NULL OR APPLY_END_DATE = '' ))
+		GROUP BY A.`NAME`
 	</select>
 
 </mapper>