Merge remote-tracking branch 'origin/MVP1.5' into MVP1.5

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java

@@ -93,4 +93,6 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
 
 	int updateForecastById(@Param("tForecastLibrary") TForecastLibrary tForecastLibrary);
 
+	int updateForecastStatusById(@Param("tForecastLibrary") TForecastLibrary tForecastLibrary);
+
 }

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

@@ -317,7 +317,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		}
 		return R.ok();
 	}
-
 	/**
 	 * 通过ID获取缴费库 及社保、公积金明细
 	 *
@@ -3341,7 +3340,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 								library.setPaySettleFlag(viewVo.getPaySettleFlag());
 								library.setPayCollectFlag(viewVo.getPayCollectFlag());
 							}
-							tForecastLibraryMapper.updateById(library);
+							tForecastLibraryMapper.updateForecastStatusById(library);
 						}
 					}
 				}

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

@@ -919,4 +919,26 @@
 		ID = #{tForecastLibrary.id}
 	</update>
 
+	<!-- 根据id更新 -->
+	<update id="updateForecastStatusById">
+		update
+		t_forecast_library
+		set
+		<if test="tForecastLibrary.incomeSettleFlag != null and tForecastLibrary.incomeSettleFlag.trim() != ''">
+			INCOME_SETTLE_FLAG = #{tForecastLibrary.incomeSettleFlag},
+		</if>
+		<if test="tForecastLibrary.incomeCollectFlag != null and tForecastLibrary.incomeCollectFlag.trim() != ''">
+			INCOME_COLLECT_FLAG = #{tForecastLibrary.incomeCollectFlag},
+		</if>
+		<if test="tForecastLibrary.paySettleFlag != null and tForecastLibrary.paySettleFlag.trim() != ''">
+			PAY_SETTLE_FLAG = #{tForecastLibrary.paySettleFlag},
+		</if>
+		<if test="tForecastLibrary.payCollectFlag != null and tForecastLibrary.payCollectFlag.trim() != ''">
+			PAY_COLLECT_FLAG = #{tForecastLibrary.payCollectFlag},
+		</if>
+		UPDATE_TIME = now()
+		where
+		ID = #{tForecastLibrary.id}
+	</update>
+
 </mapper>