java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -2317,10 +2317,10 @@ sum(t.cur_received_amount+t.his_owe_received_amount) oweReceivedAmount from report_fee_month_statistics t inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' inner join building_room br on br.room_id = t.obj_id and t.obj_type = '3333' and br.community_id = left join building_room br on br.room_id = t.obj_id and t.obj_type = '3333' and br.community_id = t.community_id and br.status_cd = '0' inner join building_unit bu on bu.unit_id = br.unit_id and bu.status_cd = '0' inner join f_floor f on f.floor_id = bu.floor_id and f.status_cd = '0' left join building_unit bu on bu.unit_id = br.unit_id and bu.status_cd = '0' left join f_floor f on f.floor_id = bu.floor_id and f.status_cd = '0' where 1=1 and t.fee_year= #{feeYear} and t.fee_month= #{feeMonth} service-api/src/main/java/com/java110/api/listener/resourceStoreType/ListResourceStoreTypesListener.java
File was deleted service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeMonthStatisticsInnerServiceSMOImpl.java
@@ -244,7 +244,7 @@ reportFeeMonthStatisticsDto.setCommunityId(tmpReportCarDto.getCommunityId()); reportFeeMonthStatisticsDto.setConfigId(tmpReportFeeDto.getConfigId()); reportFeeMonthStatisticsDto.setObjId(tmpReportFeeDto.getPayerObjId()); //reportFeeMonthStatisticsDto.setFeeId(tmpReportFeeDto.getFeeId()); reportFeeMonthStatisticsDto.setFeeId(tmpReportFeeDto.getFeeId());//这里不能注释 如果一个费用创建多条时会有bug reportFeeMonthStatisticsDto.setObjType(tmpReportFeeDto.getPayerObjType()); reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear() + ""); reportFeeMonthStatisticsDto.setFeeMonth(DateUtil.getMonth() + ""); @@ -442,7 +442,7 @@ reportFeeMonthStatisticsDto.setCommunityId(reportRoomDto.getCommunityId()); reportFeeMonthStatisticsDto.setConfigId(tmpReportFeeDto.getConfigId()); reportFeeMonthStatisticsDto.setObjId(tmpReportFeeDto.getPayerObjId()); //reportFeeMonthStatisticsDto.setFeeId(tmpReportFeeDto.getFeeId()); reportFeeMonthStatisticsDto.setFeeId(tmpReportFeeDto.getFeeId()); //这里不能注释，因为一个费用多次创建时会存在覆盖 存在bug问题 reportFeeMonthStatisticsDto.setObjType(tmpReportFeeDto.getPayerObjType()); reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear() + ""); reportFeeMonthStatisticsDto.setFeeMonth(DateUtil.getMonth() + ""); service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java
@@ -385,9 +385,9 @@ = BeanConvertUtil.covertBeanList(reportFeeYearCollectionDetailServiceDaoImpl.getReportFeeYearCollectionDetailInfo(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionDetailDto)), ReportFeeYearCollectionDetailDto.class); if (!ListUtil.isNull(reportFeeYearCollectionDetailDtos) && year != curYear) { // 说明已经处理过了 不再处理 return; } // if (!ListUtil.isNull(reportFeeYearCollectionDetailDtos) && year != curYear) { // 说明已经处理过了 不再处理 // return; // } double receivableAmount = feeDto.getFeePrice();
New file @@ -0,0 +1,68 @@ package com.java110.store.cmd.resourceStore; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.resourceStoreType.ResourceStoreTypeDto; import com.java110.intf.store.IResourceStoreTypeInnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.StringUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import java.util.ArrayList; import java.util.List; @Java110Cmd(serviceCode = "resourceStoreType.listResourceStoreTypes") public class ListResourceStoreTypesCmd extends Cmd { @Autowired private IResourceStoreTypeInnerServiceSMO resourceStoreTypeInnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { if (!reqJson.containsKey("storeId")) { String storeId = context.getReqHeaders().get("store-id"); reqJson.put("storeId", storeId); } super.validatePageInfo(reqJson); } @Override public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { if (reqJson.containsKey("flag") && reqJson.getString("flag").equals("0")) { reqJson.put("parentId", reqJson.getString("rstId")); reqJson.put("rstId", null); reqJson.put("name", null); } if (reqJson.containsKey("rsId") && !StringUtil.isEmpty(reqJson.getString("rsId"))) { reqJson.put("rstId", reqJson.getString("rsId")); } if (reqJson.containsKey("rstName") && !StringUtil.isEmpty(reqJson.getString("rstName"))) { reqJson.put("name", reqJson.getString("rstName")); } ResourceStoreTypeDto resourceStoreTypeDto = BeanConvertUtil.covertBean(reqJson, ResourceStoreTypeDto.class); int count = resourceStoreTypeInnerServiceSMOImpl.queryResourceStoreTypesCount(resourceStoreTypeDto); List<ResourceStoreTypeDto> resourceStoreTypeDtos = null; if (count > 0) { resourceStoreTypeDtos = resourceStoreTypeInnerServiceSMOImpl.queryResourceStoreTypes(resourceStoreTypeDto); } else { resourceStoreTypeDtos = new ArrayList<>(); } ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, resourceStoreTypeDtos); ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK); context.setResponseEntity(responseEntity); } }
