Merge remote-tracking branch 'origin/20200908' into 20200908

smart-city-platform/src/main/java/com/bz/smart_city/service/pay/archives/impl/PayBaseCustomerandmeterrelaServiceImpl.java

@@ -700,11 +700,11 @@ public class PayBaseCustomerandmeterrelaServiceImpl implements PayBaseCustomeran
             if(!oldWaterPropertyId.equals(newWaterPropertyId)){
                 //如果有更换用水性质则需要先判断本账期是否审核水量
                 //根据客户查找是否有本账期未审核的水量信息
-                BaseClosingAccountInfoDto baseClosingAccountInfoDto= baseClosingAccountInfoMapper.getLastClosingAccount(loginUser.getSiteId(),loginUser.getCustomerId());
+                /*BaseClosingAccountInfoDto baseClosingAccountInfoDto= baseClosingAccountInfoMapper.getLastClosingAccount(loginUser.getSiteId(),loginUser.getCustomerId());
                 Integer state = amountWaterUsedAmountMapper.getwaterUserdAmount(baseClosingAccountInfoDto.getYear(),baseClosingAccountInfoDto.getMonth(),loginUser.getSiteId(),loginUser.getCurrentSiteId(),saveAccount.getId());
                 if(state != null && state == 1){
                     throw new ServiceException(-900, "修改失败，本账期有未审核的水量。");
-                }
+                }*/
             }
             saveAccount.setName(payBaseCustomerandmeterrela.getAccountname());
             saveAccount.setIdtype(payBaseCustomerandmeterrela.getIdtype());

smart-city-platform/src/main/resources/mapper/PayBaseCustomerandmeterrelaMapper.xml

@@ -90,7 +90,7 @@
                 and metercode =#{metercode}
             </if>
         </where>
-
+        limit 1
     </select>
 
     <select id="getWaterPropertyId" resultType="com.bz.smart_city.entity.pay.archives.PayBaseCustomerandmeterrela">

smart-city-platform/src/main/resources/mapper/pay/AmountWaterUsedAmountMapper.xml

@@ -92,8 +92,9 @@
 			<if test="programItems != null and programItems.size() != 0">
 				and
 				<foreach collection="programItems" item="item" open="(" separator=" or " close=")">
-						a.${item.dimensionCode} = #{item.dimensionValue}
-
+				<if test="item.dimensionId == 10">
+					a.${item.dimensionCode} = #{item.dimensionValue}
+				</if>
 				</foreach>
 			</if>
 		</where>