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

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

@@ -75,7 +75,8 @@ public class AmountWaterUsedAmountServiceImpl implements AmountWaterUsedAmountSe
         LoginUser loginUser = UserUtil.getCurrentUser();
         PageHelper.startPage(pageNum, pageSize);
 
-        List<ProgramItem> programItems= UserUtil.getAllSiteProgramItems(loginUser);
+        //List<ProgramItem> programItems= UserUtil.getAllSiteProgramItems(loginUser);
+        List<ProgramItem> programItems= UserUtil.getCurrentSiteProgramItems(loginUser);
 
         List<AmountWaterUsedAmountDto> list = amountWaterUsedAmountMapper.getList(condition,loginUser.getCustomerId(),accountNumber,accountName,meterCode,address,
                 state,amountMin,amountMax,year,month,programItems,loginUser.getSiteId());
@@ -88,7 +89,8 @@ public class AmountWaterUsedAmountServiceImpl implements AmountWaterUsedAmountSe
     Integer amountMin,Integer amountMax, HttpServletResponse httpServletResponse)
     {
         LoginUser loginUser = UserUtil.getCurrentUser();
-        List<ProgramItem> programItems= UserUtil.getAllSiteProgramItems(loginUser);
+        //List<ProgramItem> programItems= UserUtil.getAllSiteProgramItems(loginUser);
+        List<ProgramItem> programItems= UserUtil.getCurrentSiteProgramItems(loginUser);
         List<AmountWaterUsedAmountDto> list = amountWaterUsedAmountMapper.getList(condition,loginUser.getCustomerId(),accountNumber,accountName,meterCode,address,
                 state,amountMin,amountMax,year,month,programItems,loginUser.getSiteId());
         String title = "水量信息";
@@ -153,7 +155,8 @@ public class AmountWaterUsedAmountServiceImpl implements AmountWaterUsedAmountSe
         if(review ==1){
             year = baseClosingAccountInfoDto.getYear();
             month = baseClosingAccountInfoDto.getMonth();
-            List<ProgramItem> programItems = UserUtil.getAllSiteProgramItems(loginUser);
+            //List<ProgramItem> programItems = UserUtil.getAllSiteProgramItems(loginUser);
+            List<ProgramItem> programItems= UserUtil.getCurrentSiteProgramItems(loginUser);
             idList = amountWaterUsedAmountMapper.getIds(condition,loginUser.getCustomerId(),null,null,null,null,
                     1,amountMin,amountMax,year,month,programItems,loginUser.getSiteId());
         }else{
@@ -213,7 +216,8 @@ public class AmountWaterUsedAmountServiceImpl implements AmountWaterUsedAmountSe
         if(baseClosingAccountInfoDto!=null) {
             year = baseClosingAccountInfoDto.getYear();
             month = baseClosingAccountInfoDto.getMonth();
-            List<ProgramItem> programItems = UserUtil.getAllSiteProgramItems(loginUser);
+            //List<ProgramItem> programItems = UserUtil.getAllSiteProgramItems(loginUser);
+            List<ProgramItem> programItems= UserUtil.getCurrentSiteProgramItems(loginUser);
             List<String> idList = amountWaterUsedAmountMapper.getIds(condition, loginUser.getCustomerId(), null, null, null, null,
                     1, amountMin, amountMax, year, month, programItems, loginUser.getSiteId());
             result = idList.size();

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

@@ -89,14 +89,16 @@
 			<if test="state!= null" > and a.state = #{state} </if>
 			<if test="amountMin != null"> and a.payamount >= #{amountMin} </if>
 			<if test="amountMax != null"> and a.payamount <![CDATA[ <= ]]> #{amountMax} </if>
+
 			<if test="programItems != null and programItems.size() != 0">
 				and
 				<foreach collection="programItems" item="item" open="(" separator=" or " close=")">
-				<if test="item.dimensionId == 10">
-					a.${item.dimensionCode} = #{item.dimensionValue}
-				</if>
+					<if test="item.dimensionId == 10">
+						a.${item.dimensionCode} = #{item.dimensionValue}
+					</if>
 				</foreach>
 			</if>
+
 		</where>
 
         order by a.recorddate desc