Merge branch 'develop' into feature-licancan

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/DateUtil.java

@@ -1247,6 +1247,12 @@ public class DateUtil {
           return sdf.format(cal.getTime());
      }
 
+	 /**
+	  * @Description: 增减（月）
+	  * @Author: hgw
+	  * @Date: 2022/8/3 9:17
+	  * @return: java.util.Date
+	  **/
 	 public static Date addMonthByDate(Date date, int mnt) {
           Calendar cal = Calendar.getInstance();
 		  if (date != null) {
@@ -1256,6 +1262,21 @@ public class DateUtil {
           return cal.getTime();
      }
 
+	 /**
+	  * @Description: 增减（日）
+	  * @Author: hgw
+	  * @Date: 2022/8/3 9:17
+	  * @return: java.util.Date
+	  **/
+	 public static Date addDayByDate(Date date, int mnt) {
+          Calendar cal = Calendar.getInstance();
+		  if (date != null) {
+			  cal.setTime(date);
+		  }
+          cal.add(Calendar.DATE, mnt);
+          return cal.getTime();
+     }
+
      /**
       * @param mnt 增减日的 值
       * @Description: 增减日

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

@@ -140,7 +140,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 
 		// 将上一个无截止月的增加截止月（本次起始月的上一个月）
 		if (lastBase != null) {
-			lastBase.setApplyEndDate(DateUtil.addMonthByDate(sysBaseSetInfo.getApplyStartDate(), -1));
+			lastBase.setApplyEndDate(DateUtil.addDayByDate(sysBaseSetInfo.getApplyStartDate(), -1));
 			this.updateById(lastBase);
 		}
 		this.saveOrUpdateBaseAndFundPro(sysBaseSetInfo);

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

@@ -447,7 +447,7 @@
             <include refid="tDispatchInfo_where"/>
         </where>
 		order by a.CREATE_TIME desc
-		<if test="tSocialFundInfo.limitStart != null">
+		<if test="tDispatchInfo.limitStart != null">
 			limit #{tDispatchInfo.limitStart},#{tDispatchInfo.limitEnd}
 		</if>
     </select>

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

@@ -265,9 +265,9 @@
                 a.EMP_IDCARD,
                 a.EMP_TYPE,
                 a.SETTLE_DOMAIN,
-                concat(ifnull(a.SETTLE_DOMAIN_CODE,""),if(a.SETTLE_DOMAIN_CODE is null or a.SETTLE_DOMAIN_CODE_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_CODE_FUND,"")) SETTLE_DOMAIN_CODE,
-				concat(ifnull(a.SETTLE_DOMAIN_NAME,""),if(a.SETTLE_DOMAIN_NAME is null or a.SETTLE_DOMAIN_NAME_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_NAME_FUND,"")) SETTLE_DOMAIN_NAME,
-				concat(ifnull(a.UNIT_NAME,""),if(a.UNIT_NAME is null or a.UNIT_NAME_FUND is null,"",","),ifnull(a.UNIT_NAME_FUND,"")) UNIT_NAME,
+                if(a.SETTLE_DOMAIN_CODE = a.SETTLE_DOMAIN_CODE_FUND,a.SETTLE_DOMAIN_CODE,concat(ifnull(a.SETTLE_DOMAIN_CODE,""),if(a.SETTLE_DOMAIN_CODE is null or a.SETTLE_DOMAIN_CODE_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_CODE_FUND,""))) SETTLE_DOMAIN_CODE,
+				if(a.SETTLE_DOMAIN_NAME = a.SETTLE_DOMAIN_NAME_FUND,a.SETTLE_DOMAIN_NAME,concat(ifnull(a.SETTLE_DOMAIN_NAME,""),if(a.SETTLE_DOMAIN_NAME is null or a.SETTLE_DOMAIN_NAME_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_NAME_FUND,""))) SETTLE_DOMAIN_NAME,
+				if(a.UNIT_NAME = a.UNIT_NAME_FUND,a.UNIT_NAME,concat(ifnull(a.UNIT_NAME,""),if(a.UNIT_NAME is null or a.UNIT_NAME_FUND is null,"",","),ifnull(a.UNIT_NAME_FUND,""))) UNIT_NAME,
                 a.UNIT_ID,
  				a.SETTLE_DOMAIN_FUND,
 				a.SETTLE_DOMAIN_CODE_FUND,
@@ -790,9 +790,9 @@
 			a.EMP_IDCARD,
 			a.EMP_TYPE,
 			d.EMP_MOBILE,
-		concat(ifnull(a.SETTLE_DOMAIN_CODE,""),if(a.SETTLE_DOMAIN_CODE is null or a.SETTLE_DOMAIN_CODE_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_CODE_FUND,"")) SETTLE_DOMAIN_CODE,
-		concat(ifnull(a.SETTLE_DOMAIN_NAME,""),if(a.SETTLE_DOMAIN_NAME is null or a.SETTLE_DOMAIN_NAME_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_NAME_FUND,"")) SETTLE_DOMAIN_NAME,
-		concat(ifnull(a.UNIT_NAME,""),if(a.UNIT_NAME is null or a.UNIT_NAME_FUND is null,"",","),ifnull(a.UNIT_NAME_FUND,"")) UNIT_NAME,
+		if(a.SETTLE_DOMAIN_CODE = a.SETTLE_DOMAIN_CODE_FUND,a.SETTLE_DOMAIN_CODE,concat(ifnull(a.SETTLE_DOMAIN_CODE,""),if(a.SETTLE_DOMAIN_CODE is null or a.SETTLE_DOMAIN_CODE_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_CODE_FUND,""))) SETTLE_DOMAIN_CODE,
+		if(a.SETTLE_DOMAIN_NAME = a.SETTLE_DOMAIN_NAME_FUND,a.SETTLE_DOMAIN_NAME,concat(ifnull(a.SETTLE_DOMAIN_NAME,""),if(a.SETTLE_DOMAIN_NAME is null or a.SETTLE_DOMAIN_NAME_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_NAME_FUND,""))) SETTLE_DOMAIN_NAME,
+		if(a.UNIT_NAME = a.UNIT_NAME_FUND,a.UNIT_NAME,concat(ifnull(a.UNIT_NAME,""),if(a.UNIT_NAME is null or a.UNIT_NAME_FUND is null,"",","),ifnull(a.UNIT_NAME_FUND,""))) UNIT_NAME,
 			d.ID_CARD_PROVINCE,
 			d.ID_CARD_CITY,
 			d.ID_CARD_TOWN,