Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/dto/RoomDto.java

@@ -71,8 +71,6 @@ public class RoomDto extends PageDto implements Serializable {
 
     private Date createTime;
 
-    private String startTime;
-    private String endTime;
 
     private String statusCd = "0";
 
@@ -366,19 +364,5 @@ public class RoomDto extends PageDto implements Serializable {
         this.roomSubTypeName = roomSubTypeName;
     }
 
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
 
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
 }

java110-bean/src/main/java/com/java110/po/room/RoomPo.java

@@ -30,8 +30,6 @@ public class RoomPo implements Serializable {
     private String roomSubType;
     private String roomRent;
     private String roomArea;
-    private String startTime;
-    private String endTime;
 
     public String getRoomId() {
         return roomId;
@@ -169,19 +167,4 @@ public class RoomPo implements Serializable {
         this.roomArea = roomArea;
     }
 
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
 }

java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml

@@ -8,10 +8,10 @@
     <insert id="saveBusinessRoomInfo" parameterType="Map">
         insert into business_building_room(
         fee_coefficient,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id,
-        room_type,room_sub_type,room_rent,room_area,start_time,end_time
+        room_type,room_sub_type,room_rent,room_area
         ) values (
         #{feeCoefficient},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
-        #{communityId},#{roomType},#{roomSubType},#{roomRent},#{roomArea},#{startTime},#{endTime}
+        #{communityId},#{roomType},#{roomSubType},#{roomRent},#{roomArea}
         )
     </insert>
 
@@ -24,7 +24,7 @@
         roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,t.community_id,t.community_id
         communityId,t.room_type,t.room_type roomType,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type
         roomSubType,
-        t.room_rent roomRent,t.room_area roomArea,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+        t.room_rent roomRent,t.room_area roomArea
         from business_building_room t
         where 1 =1
         <if test="feeCoefficient !=null and feeCoefficient != ''">
@@ -75,12 +75,7 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
-            and t.start_time= #{startTime}
-        </if>
-        <if test="endTime !=null">
-            and t.end_time= #{endTime}
-        </if>
+
     </select>
 
 
@@ -88,10 +83,10 @@
     <insert id="saveRoomInfoInstance" parameterType="Map">
         insert into building_room(
         fee_coefficient,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id,
-        room_type,room_sub_type,room_rent,room_area,start_time,end_time
+        room_type,room_sub_type,room_rent,room_area
         ) select
         t.fee_coefficient,t.section,'0',t.remark,t.user_id,t.room_id,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id,
-        t.room_type,t.room_sub_type,t.room_rent,t.room_area,t.start_time,t.end_time
+        t.room_type,t.room_sub_type,t.room_rent,t.room_area
         from business_building_room t where 1=1
         <if test="feeCoefficient !=null and feeCoefficient != ''">
             and t.fee_coefficient= #{feeCoefficient}
@@ -139,12 +134,6 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
-            and t.start_time= #{startTime}
-        </if>
-        <if test="endTime !=null">
-            and t.end_time= #{endTime}
-        </if>
     </insert>
 
     <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
@@ -153,8 +142,7 @@
         statusCd,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area
         builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id
         bId,t.apartment,t.state,t.community_id,t.community_id communityId,t.room_type,t.room_type roomType,
-        t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea,
-        t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+        t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
         from building_room t
         where 1 =1
         <if test="feeCoefficient !=null and feeCoefficient != ''">
@@ -211,12 +199,7 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
-            and t.start_time= #{startTime}
-        </if>
-        <if test="endTime !=null">
-            and t.end_time= #{endTime}
-        </if>
+
         order by t.create_time desc
         <if test="page != -1 and page != null">
             limit #{page},#{row}
@@ -268,12 +251,6 @@
         <if test="roomArea !=null and roomArea != ''">
             , t.room_area= #{roomArea}
         </if>
-        <if test="startTime !=null">
-            , t.start_time= #{startTime}
-        </if>
-        <if test="endTime !=null">
-            , t.end_time= #{endTime}
-        </if>
         where 1=1
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
@@ -339,12 +316,7 @@
         <if test="roomSubType !=null and roomSubType != ''">
             and t.room_sub_type= #{roomSubType}
         </if>
-        <if test="startTime !=null">
-            and t.start_time= #{startTime}
-        </if>
-        <if test="endTime !=null">
-            and t.end_time= #{endTime}
-        </if>
+        
     </select>
 
     <!-- 查询小区房屋数量 add by wuxw 2018-07-03 -->
@@ -418,12 +390,7 @@
         <if test="unitNum !=null and unitNum != ''">
             and u.unit_num= #{unitNum}
         </if>
-        <if test="startTime !=null">
-            and t.start_time= #{startTime}
-        </if>
-        <if test="endTime !=null">
-            and t.end_time= #{endTime}
-        </if>
+      
     </select>
 
     <!-- 查询小区房屋数量 add by wuxw 2018-07-03 -->
@@ -489,12 +456,6 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
-            and t.start_time= #{startTime}
-        </if>
-        <if test="endTime !=null">
-            and t.end_time= #{endTime}
-        </if>
         and borr.`room_id` is null
     </select>
 
@@ -561,12 +522,6 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
-            and t.start_time= #{startTime}
-        </if>
-        <if test="endTime !=null">
-            and t.end_time= #{endTime}
-        </if>
         AND borr.`room_id` is not null
     </select>
 
@@ -578,7 +533,7 @@
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num`
         unitNum,f.floor_num floorNum
         ,t.room_type roomType,t.room_type,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type
-        roomSubType,t.room_rent roomRent,t.room_area roomArea,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+        roomSubType,t.room_rent roomRent,t.room_area roomArea
         FROM
         building_room t
         INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
@@ -638,12 +593,7 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
-            and t.start_time= #{startTime}
-        </if>
-        <if test="endTime !=null">
-            and t.end_time= #{endTime}
-        </if>
+        
         and borr.`room_id` is null
         <if test="page != -1 and page != null">
             limit #{page},#{row}
@@ -657,7 +607,7 @@
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
         t.room_type roomType,t.room_type,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent
-        roomRent,t.room_area roomArea,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+        roomRent,t.room_area roomArea
         FROM
         building_room t
         INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
@@ -717,12 +667,6 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
-            and t.start_time= #{startTime}
-        </if>
-        <if test="endTime !=null">
-            and t.end_time= #{endTime}
-        </if>
         AND borr.`room_id` is not null
         <if test="page != -1 and page != null">
             limit #{page},#{row}
@@ -737,8 +681,8 @@
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
         u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum,f.floor_area floorArea,u.unit_area unitArea,td.name
         stateName,t.room_type roomType,t.room_type,t.`community_id` communityId,td1.`name` roomSubTypeName
-        ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea,
-        t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+        ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
+
         FROM building_room t
         inner join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
         inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` =
@@ -822,12 +766,7 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
-            and t.start_time= #{startTime}
-        </if>
-        <if test="endTime !=null">
-            and t.end_time= #{endTime}
-        </if>
+
         order by f.floor_num ,u.unit_num,t.room_num
         <if test="page != -1 and page != null">
             limit #{page},#{row}
@@ -842,8 +781,8 @@
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num`
         unitNum,f.`floor_num` floorNum,t.room_type roomType,t.room_type,f.floor_id floorId
-        ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea,
-        t.start_time,t.start_time startTime,t.end_time ,t.end_time endTime
+        ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
+
         FROM
         building_owner bo,building_room t,building_owner_room_rel borr,building_unit u,f_floor f
         WHERE
@@ -898,12 +837,7 @@
         <if test="ownerTypeCd !=null and ownerTypeCd != ''">
             and bo.owner_type_cd= #{ownerTypeCd}
         </if>
-        <if test="startTime !=null">
-            and t.start_time= #{startTime}
-        </if>
-        <if test="endTime !=null">
-            and t.end_time= #{endTime}
-        </if>
+
     </select>
 
     <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
@@ -913,8 +847,8 @@
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
         t.room_type roomType,t.room_type,f.floor_num floorNum
-        ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea,
-        t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+        ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
+
         FROM
         building_room t
         INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
@@ -957,12 +891,6 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
-            and t.start_time= #{startTime}
-        </if>
-        <if test="endTime !=null">
-            and t.end_time= #{endTime}
-        </if>
         <if test="page != -1 and page != null">
             limit #{page},#{row}
         </if>

java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml

@@ -89,9 +89,7 @@
         update report_fee_month_statistics t set
         t.owe_amount= #{oweAmount}
         where 1=1
-        <if test="statisticsId !=null and statisticsId != ''">
             and t.statistics_id= #{statisticsId}
-        </if>
         <if test="curMaxTime !=null ">
             and t.cur_max_time &lt;= #{curMaxTime}
         </if>
@@ -160,6 +158,26 @@
 
     </update>
 
+    <!-- 修改费用月统计信息 add by wuxw 2018-07-03 -->
+    <update id="deleteReportFeeMonthStatisticsInfo" parameterType="Map">
+        update report_fee_month_statistics t set t.status_cd = '1'
+        where 1=1
+        <if test="statisticsId !=null and statisticsId != ''">
+            and t.statistics_id= #{statisticsId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+
+    </update>
+
+
     <!-- 查询费用月统计数量 add by wuxw 2018-07-03 -->
     <select id="queryReportFeeMonthStatisticssCount" parameterType="Map" resultType="Map">
         select count(1) count

java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml

@@ -63,7 +63,8 @@
         storeTypeCd,
         t.community_id communityId,pfa.value importFeeName,ifd.end_time importFeeEndTime,mw.cur_degrees
         curDegrees,mw.pre_degrees preDegrees,
-        mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,mw.price mwPrice
+        mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,mw.price mwPrice,
+        pfa2.`value` ownerTel,   pfa3.`value` ownerName
         from pay_fee t
         INNER JOIN pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
         left join building_room br on t.payer_obj_id = br.room_id and t.payer_obj_type = '3333' and br.status_cd = '0'
@@ -72,6 +73,8 @@
         left join s_store ss on t.income_obj_id = ss.store_id and ss.status_cd = '0'
         LEFT JOIN pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002' and pfa.status_cd = '0'
         LEFT JOIN pay_fee_attrs pfa1 on t.fee_id = pfa1.fee_id and pfa1.spec_cd = '390010' and pfa1.status_cd = '0'
+        LEFT JOIN pay_fee_attrs pfa2 on t.fee_id = pfa2.fee_id and pfa2.spec_cd = '390009' and pfa2.status_cd = '0'
+        LEFT JOIN pay_fee_attrs pfa3 on t.fee_id = pfa3.fee_id and pfa3.spec_cd = '390008' and pfa3.status_cd = '0'
         left join import_fee_detail ifd on t.fee_id = ifd.fee_id and ifd.status_cd = '0' and t.fee_flag = '2006012'
         LEFT JOIN meter_water mw on t.fee_id = mw.fee_id and mw.status_cd = '0' and mw.community_id = t.community_id
         where t.status_cd = '0'
@@ -87,6 +90,9 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
         <if test="feeFlag !=null and feeFlag != ''">
             and t.fee_flag= #{feeFlag}
         </if>

java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionServiceDaoImplMapper.xml

@@ -178,6 +178,21 @@
 
     </update>
 
+    <update id="deleteReportFeeYearCollectionInfo" parameterType="Map">
+        update report_fee_year_collection t set t.status_cd = '1'
+        where 1=1
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="collectionId !=null and collectionId != ''">
+            and t.collection_id= #{collectionId}
+        </if>
+
+    </update>
+
     <!-- 查询费用年收费数量 add by wuxw 2018-07-03 -->
     <select id="queryReportFeeYearCollectionsCount" parameterType="Map" resultType="Map">
         select count(DISTINCT t.collection_id) count

java110-interface/src/main/java/com/java110/intf/fee/IPayFeeDetailDiscountInnerServiceSMO.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "fee-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/payFeeDetailDiscountApi")
 public interface IPayFeeDetailDiscountInnerServiceSMO {
 

service-api/src/main/java/com/java110/api/listener/fee/SaveParkingSpaceCreateFeeListener.java

@@ -113,9 +113,11 @@ public class SaveParkingSpaceCreateFeeListener extends AbstractServiceApiListene
         OwnerCarDto ownerCarDto = new OwnerCarDto();
 
         if ("1000".equals(reqJson.getString("locationTypeCd"))) {//小区
-            ownerCarDto.setCommunityId(reqJson.getString("communityId"));
-            ownerCarDto.setValid("1");
-            ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+//            ownerCarDto.setCommunityId(reqJson.getString("communityId"));
+//            ownerCarDto.setValid("1");
+//            ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+            reqJson.put("locationObjId","");//刷成空
+            ownerCarDtos = getOwnerCarByParkingArea(reqJson);
         } else if ("2000".equals(reqJson.getString("locationTypeCd"))) {//车辆
             //ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
             ownerCarDto.setCarTypeCd("1001"); //1001 业主车辆   1002 成员车辆

service-api/src/main/java/com/java110/api/listener/ownerRepair/ListStaffFinishRepairsListener.java

@@ -78,12 +78,14 @@ public class ListStaffFinishRepairsListener extends AbstractServiceApiListener {
         String userId = reqJson.getString("userId");
         String viewListStaffRepairs = MappingCache.getValue("viewListStaffRepairs");
         List<Map> privileges = null;
-//        if("ON".equals(viewListStaffRepairs)) {//是否让管理员看到所有工单
+        //这里加开关 其实让管理员看到所有单子这么做，不太优雅，建议 单独开发页面功能
+        // 不要影响已办功能，add by 吴学文 2021-09-09
+        if("ON".equals(viewListStaffRepairs)) {//是否让管理员看到所有工单
             BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
             basePrivilegeDto.setResource("/listStaffFinishRepairs");
             basePrivilegeDto.setUserId(userId);
             privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
-//        }
+        }
         if (privileges == null || privileges.size()==0) {
             ownerRepairDto.setStaffId(reqJson.getString("userId"));
         }

service-api/src/main/java/com/java110/api/listener/ownerRepair/SaveOwnerRepairListener.java

@@ -26,6 +26,7 @@ import com.java110.utils.constant.ServiceCodeOwnerRepairConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -95,7 +96,7 @@ public class SaveOwnerRepairListener extends AbstractServiceApiPlusListener {
         List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
         //取出开关映射的值(维修师傅未处理最大单数)
         String repairFeeNumber = MappingCache.getValue(DOMAIN_COMMON, REPAIR_FEE_NUMBER);
-        if (feeDtos != null && feeDtos.size() >= Integer.parseInt(repairFeeNumber)) {
+        if (feeDtos != null && StringUtil.isInteger(repairFeeNumber) && feeDtos.size() >= Integer.parseInt(repairFeeNumber)) {
             ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "该房屋存在" + Integer.parseInt(repairFeeNumber) + "条未处理的费用，请缴费后再进行报修！");
             context.setResponseEntity(responseEntity);
             return;

service-api/src/main/java/com/java110/api/listener/returnPayFee/ListReturnPayFeesListener.java

@@ -70,28 +70,9 @@ public class ListReturnPayFeesListener extends AbstractServiceApiListener {
         List<ApiReturnPayFeeDataVo> returnPayFees = new ArrayList<>();
 
         if (count > 0) {
-            List<ApiReturnPayFeeDataVo> apiReturnPayFeeDataVos = BeanConvertUtil.covertBeanList(returnPayFeeInnerServiceSMOImpl.queryReturnPayFees(returnPayFeeDto), ApiReturnPayFeeDataVo.class);
-            for (ApiReturnPayFeeDataVo apiReturnPayFeeDataVo : apiReturnPayFeeDataVos) {
-                //获取周期
-                String cycles = apiReturnPayFeeDataVo.getCycles();
-                if (!StringUtil.isEmpty(cycles) && cycles.contains("-")) {
-                    String substring = cycles.substring(1);
-                    apiReturnPayFeeDataVo.setCycles(substring);
-                }
-                //获取应收金额
-                String receivableAmount = apiReturnPayFeeDataVo.getReceivableAmount();
-                if (!StringUtil.isEmpty(receivableAmount) && receivableAmount.contains("-")) {
-                    String substring = receivableAmount.substring(1);
-                    apiReturnPayFeeDataVo.setReceivableAmount(substring);
-                }
-                //获取实收金额
-                String receivedAmount = apiReturnPayFeeDataVo.getReceivedAmount();
-                if (!StringUtil.isEmpty(receivedAmount) && receivedAmount.contains("-")) {
-                    String substring = receivedAmount.substring(1);
-                    apiReturnPayFeeDataVo.setReceivedAmount(substring);
-                }
-                returnPayFees.add(apiReturnPayFeeDataVo);
-            }
+            //注意这里处理 记得测试退费逻辑
+
+            returnPayFees = BeanConvertUtil.covertBeanList(returnPayFeeInnerServiceSMOImpl.queryReturnPayFees(returnPayFeeDto), ApiReturnPayFeeDataVo.class);
         } else {
             returnPayFees = new ArrayList<>();
         }

service-api/src/main/java/com/java110/api/listener/returnPayFee/UpdateReturnPayFeeListener.java

@@ -17,6 +17,7 @@ import com.java110.intf.fee.IPayFeeDetailDiscountInnerServiceSMO;
 import com.java110.utils.constant.ServiceCodeReturnPayFeeConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 
@@ -54,6 +55,13 @@ public class UpdateReturnPayFeeListener extends AbstractServiceApiPlusListener {
         Assert.hasKeyAndValue(reqJson, "state", "state不能为空");
         Assert.hasKeyAndValue(reqJson, "feeId", "feeId不能为空");
 
+        if(reqJson.containsKey("cycles")){
+            String cycles = reqJson.getString("cycles");
+            if(!cycles.startsWith("-")){
+                throw new IllegalArgumentException("退费周期必须负数");// 这里必须传入负数，否则费用自动相加不会退费
+            }
+        }
+
         FeeDetailDto feeDetailDto = new FeeDetailDto();
         feeDetailDto.setDetailId(reqJson.getString("detailId"));
         feeDetailDto.setFeeId(reqJson.getString("feeId"));
@@ -71,13 +79,14 @@ public class UpdateReturnPayFeeListener extends AbstractServiceApiPlusListener {
 
         //退费审核通过
         if ("1100".equals(reqJson.getString("state"))) {
+            //判断退费周期是否为负数如果不是 抛出异常
+            String cycles = reqJson.getString("cycles");
             reqJson.put("state", "1300");
             reqJson.put("startTime", DateUtil.getFormatTimeString(feeDetailDto.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
             reqJson.put("endTime", DateUtil.getFormatTimeString(feeDetailDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
             returnPayFeeBMOImpl.addFeeDetail(reqJson, context);
 
             reqJson.put("state", "1100");
-            String cycles = (String) reqJson.get("cycles");
             String receivableAmount = (String) reqJson.get("receivableAmount");
             String receivedAmount = (String) reqJson.get("receivedAmount");
             reqJson.put("cycles", unum(cycles));

service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowUserInnerServiceSMOImpl.java

@@ -18,17 +18,8 @@ import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
-import org.activiti.bpmn.model.BpmnModel;
-import org.activiti.bpmn.model.EndEvent;
-import org.activiti.bpmn.model.FlowElement;
-import org.activiti.bpmn.model.FlowNode;
-import org.activiti.bpmn.model.SequenceFlow;
-import org.activiti.bpmn.model.UserTask;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.ProcessEngine;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
+import org.activiti.bpmn.model.*;
+import org.activiti.engine.*;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.history.HistoricTaskInstanceQuery;
@@ -562,6 +553,7 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
         List<SequenceFlow> outgoingFlows = flowNode.getOutgoingFlows();
         JSONObject taskObj = null;
         taskObj = new JSONObject();
+        taskObj.put("assignee", "-1"); //  默认 不需要指定下一个处理人 表示结束
         boolean isReturn = false;
         //遍历输出连线
         for (SequenceFlow outgoingFlow : outgoingFlows) {
@@ -584,21 +576,31 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
                     taskObj.put("backIndex", outgoingFlow.getTargetFlowElement().getName());
                     isReturn = true;
                 }
+                //结束
+                vars.put("auditCode", "1500");
+                if (isCondition(outgoingFlow.getConditionExpression(), vars)) {
+                    //true 获取输出节点名称
+                    taskObj.put("exit", outgoingFlow.getTargetFlowElement().getName());
+                    isReturn = true;
+                }
                 if (!isReturn) {
                     String assignee = ((UserTask) targetFlowElement).getAssignee();
                     if (!StringUtil.isEmpty(assignee) && assignee.indexOf("${") < 0) {
                         taskObj.put("assignee", assignee); // 下一节点处理人
                     }
+                    if ("${startUserId}".equals(assignee)) {
+                        taskObj.put("assignee", reqJson.getString("startUserId")); // 开始人
+                    }
+                    if ("${nextUserId}".equals(assignee)) {
+                        taskObj.put("assignee", "-2"); // 需要前台指定
+                    }
+                    taskObj.put("next", outgoingFlow.getTargetFlowElement().getName());
                 }
             }
-
             //如果下一个为 结束节点
             if (targetFlowElement instanceof EndEvent) {
-                Map vars = new HashMap();
-                vars.put("auditCode", "1100");
-                if (isCondition(outgoingFlow.getConditionExpression(), vars)) {
-                    taskObj.put("assignee", "-1"); // 没有下一处理人了
-                }
+                //true 获取输出节点名称
+                taskObj.put("exit", "1");
             }
         }
         tasks.add(taskObj);

service-community/src/main/java/com/java110/community/listener/room/AbstractRoomBusinessServiceDataFlowListener.java

@@ -54,8 +54,6 @@ public abstract class AbstractRoomBusinessServiceDataFlowListener extends Abstra
         businessRoomInfo.put("roomSubType", businessRoomInfo.get("room_sub_type"));
         businessRoomInfo.put("roomRent", businessRoomInfo.get("room_rent"));
         businessRoomInfo.put("roomArea", businessRoomInfo.get("room_area"));
-        businessRoomInfo.put("startTime", businessRoomInfo.get("start_time"));
-        businessRoomInfo.put("endTime", businessRoomInfo.get("end_time"));
         businessRoomInfo.remove("bId");
         businessRoomInfo.put("statusCd", statusCd);
     }
@@ -97,8 +95,6 @@ public abstract class AbstractRoomBusinessServiceDataFlowListener extends Abstra
         currentRoomInfo.put("roomSubType", currentRoomInfo.get("room_sub_type"));
         currentRoomInfo.put("roomRent", currentRoomInfo.get("room_rent"));
         currentRoomInfo.put("roomArea", currentRoomInfo.get("room_area"));
-        currentRoomInfo.put("startTime", currentRoomInfo.get("start_time"));
-        currentRoomInfo.put("endTime", currentRoomInfo.get("end_time"));
 
         currentRoomInfo.put("operate", StatusConstant.OPERATE_DEL);
         getRoomServiceDaoImpl().saveBusinessRoomInfo(currentRoomInfo);

service-fee/src/main/java/com/java110/fee/FeeServiceApplicationStart.java

@@ -37,6 +37,7 @@ import java.nio.charset.Charset;
         "com.java110.intf.order",
         "com.java110.intf.community",
         "com.java110.intf.job",
+        "com.java110.intf.acct",
         "com.java110.intf.store"})
 public class FeeServiceApplicationStart {
 

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java

@@ -300,7 +300,8 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
         reqJson.put("startUserId", formDatas.get(0).get("create_user_id"));
 
         //业务办理
-        if ("1100".equals(reqJson.getString("auditCode"))) { //办理操作
+        if ("1100".equals(reqJson.getString("auditCode"))
+                || "1500".equals(reqJson.getString("auditCode"))) { //办理操作
             reqJson.put("nextUserId", reqJson.getString("staffId"));
             boolean isLastTask = oaWorkflowUserInnerServiceSMOImpl.completeTask(reqJson);
             if (isLastTask) {
@@ -334,6 +335,24 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
 
     @Override
     public ResponseEntity<String> getNextTask(JSONObject reqJson) {
+//流程表单是否存在
+        OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
+        oaWorkflowFormDto.setFlowId(reqJson.get("flowId").toString());
+        oaWorkflowFormDto.setStoreId(reqJson.get("storeId").toString());
+        oaWorkflowFormDto.setRow(1);
+        oaWorkflowFormDto.setPage(1);
+        List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
+        Assert.listOnlyOne(oaWorkflowFormDtos, "未包含流程表单，请先设置表单");
+
+        Map paramMap = new HashMap();
+        paramMap.put("storeId", reqJson.getString("storeId"));
+        paramMap.put("id", reqJson.getString("id"));
+        paramMap.put("tableName", oaWorkflowFormDto.getTableName());
+        paramMap.put("page", 1);
+        paramMap.put("row", 1);
+        List<Map> formDatas = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormDatas(paramMap);
+        Assert.listOnlyOne(formDatas, "表单数据不存在");
+        reqJson.put("startUserId", formDatas.get(0).get("create_user_id"));
         List<JSONObject> tasks = oaWorkflowUserInnerServiceSMOImpl.nextAllNodeTaskList(reqJson);
         return ResultVo.createResponseEntity(tasks);
     }

service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java

@@ -14,9 +14,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service("getReportOweFeeBMOImpl")
 public class GetReportOweFeeBMOImpl implements IGetReportOweFeeBMO {
@@ -41,7 +39,15 @@ public class GetReportOweFeeBMOImpl implements IGetReportOweFeeBMO {
         } else {
             reportOweFeeDtos = new ArrayList<>();
         }
-
+        //按照 amountOwed 降序排列
+        // reportOweFeeDtos.sort(Comparator.comparing(ReportOweFeeDto :: getAmountOwed).reversed());
+        Collections.sort(reportOweFeeDtos, new Comparator<ReportOweFeeDto>() {
+            @Override
+            public int compare(ReportOweFeeDto o1, ReportOweFeeDto o2) {
+                //降序
+                return o2.getAmountOwed().compareTo(o1.getAmountOwed());
+            }
+        });
         ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportOweFeeDto.getRow()), count, reportOweFeeDtos);
 
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);

service-report/src/main/java/com/java110/report/dao/IReportFeeMonthStatisticsServiceDao.java

@@ -325,4 +325,6 @@ public interface IReportFeeMonthStatisticsServiceDao {
     int queryHuaningOweFeeDetailCount(Map paramInfo);
 
     List<Map> queryHuaningOweFeeDetail(Map beanCovertMap);
+
+    void deleteReportFeeMonthStatisticsInfo(Map beanCovertMap);
 }

service-report/src/main/java/com/java110/report/dao/IReportFeeYearCollectionServiceDao.java

@@ -50,6 +50,13 @@ public interface IReportFeeYearCollectionServiceDao {
      */
     void updateReportFeeYearCollectionInfo(Map info) throws DAOException;
 
+    /**
+     * 修改费用年收费信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void deleteReportFeeYearCollectionInfo(Map info) throws DAOException;
+
 
     /**
      * 查询费用年收费总数

service-report/src/main/java/com/java110/report/dao/impl/ReportFeeMonthStatisticsServiceDaoImpl.java

@@ -75,6 +75,18 @@ public class ReportFeeMonthStatisticsServiceDaoImpl extends BaseServiceDao imple
         }
     }
 
+
+    @Override
+    public void deleteReportFeeMonthStatisticsInfo(Map info) {
+        logger.debug("deleteReportFeeMonthStatisticsInfo 入参 info : {}", info);
+
+        int saveFlag = sqlSessionTemplate.update("reportFeeMonthStatisticsServiceDaoImpl.deleteReportFeeMonthStatisticsInfo", info);
+
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改费用月统计信息Instance数据失败：" + JSONObject.toJSONString(info));
+        }
+    }
+
     /**
      * 修改费用月统计信息
      *
@@ -333,6 +345,7 @@ public class ReportFeeMonthStatisticsServiceDaoImpl extends BaseServiceDao imple
         return businessReportFeeMonthStatisticsInfos;
     }
 
+
     @Override
     public Map queryPayFeeDetailCount(Map info) {
         logger.debug("查询费用月统计数据 入参 info : {}", info);

service-report/src/main/java/com/java110/report/dao/impl/ReportFeeYearCollectionServiceDaoImpl.java

@@ -1,15 +1,13 @@
 package com.java110.report.dao.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.exception.DAOException;
-import com.java110.utils.util.DateUtil;
 import com.java110.core.base.dao.BaseServiceDao;
 import com.java110.report.dao.IReportFeeYearCollectionServiceDao;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -25,51 +23,52 @@ public class ReportFeeYearCollectionServiceDaoImpl extends BaseServiceDao implem
     private static Logger logger = LoggerFactory.getLogger(ReportFeeYearCollectionServiceDaoImpl.class);
 
 
-
-
-
     /**
      * 保存费用年收费信息 到 instance
-     * @param info   bId 信息
+     *
+     * @param info bId 信息
      * @throws DAOException DAO异常
      */
     @Override
     public void saveReportFeeYearCollectionInfo(Map info) throws DAOException {
-        logger.debug("保存费用年收费信息Instance 入参 info : {}",info);
+        logger.debug("保存费用年收费信息Instance 入参 info : {}", info);
 
-        int saveFlag = sqlSessionTemplate.insert("reportFeeYearCollectionServiceDaoImpl.saveReportFeeYearCollectionInfo",info);
+        int saveFlag = sqlSessionTemplate.insert("reportFeeYearCollectionServiceDaoImpl.saveReportFeeYearCollectionInfo", info);
 
-        if(saveFlag < 1){
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存费用年收费信息Instance数据失败："+ JSONObject.toJSONString(info));
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存费用年收费信息Instance数据失败：" + JSONObject.toJSONString(info));
         }
     }
 
 
     /**
      * 查询费用年收费信息（instance）
+     *
      * @param info bId 信息
      * @return List<Map>
      * @throws DAOException DAO异常
      */
     @Override
     public List<Map> getReportFeeYearCollectionInfo(Map info) throws DAOException {
-        logger.debug("查询费用年收费信息 入参 info : {}",info);
+        logger.debug("查询费用年收费信息 入参 info : {}", info);
 
-        List<Map> businessReportFeeYearCollectionInfos = sqlSessionTemplate.selectList("reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfo",info);
+        List<Map> businessReportFeeYearCollectionInfos = sqlSessionTemplate.selectList("reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfo", info);
 
         return businessReportFeeYearCollectionInfos;
     }
+
     /**
      * 查询费用年收费信息（instance）
+     *
      * @param info bId 信息
      * @return List<Map>
      * @throws DAOException DAO异常
      */
     @Override
     public List<Map> getReportFeeYearCollectionInfos(Map info) throws DAOException {
-        logger.debug("查询费用年收费信息 入参 info : {}",info);
+        logger.debug("查询费用年收费信息 入参 info : {}", info);
 
-        List<Map> businessReportFeeYearCollectionInfos = sqlSessionTemplate.selectList("reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfos",info);
+        List<Map> businessReportFeeYearCollectionInfos = sqlSessionTemplate.selectList("reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfos", info);
 
         return businessReportFeeYearCollectionInfos;
     }
@@ -77,28 +76,47 @@ public class ReportFeeYearCollectionServiceDaoImpl extends BaseServiceDao implem
 
     /**
      * 修改费用年收费信息
+     *
      * @param info 修改信息
      * @throws DAOException DAO异常
      */
     @Override
     public void updateReportFeeYearCollectionInfo(Map info) throws DAOException {
-        logger.debug("修改费用年收费信息Instance 入参 info : {}",info);
+        logger.debug("修改费用年收费信息Instance 入参 info : {}", info);
 
-        int saveFlag = sqlSessionTemplate.update("reportFeeYearCollectionServiceDaoImpl.updateReportFeeYearCollectionInfo",info);
+        int saveFlag = sqlSessionTemplate.update("reportFeeYearCollectionServiceDaoImpl.updateReportFeeYearCollectionInfo", info);
 
-        if(saveFlag < 1){
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改费用年收费信息Instance数据失败："+ JSONObject.toJSONString(info));
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改费用年收费信息Instance数据失败：" + JSONObject.toJSONString(info));
         }
     }
 
-     /**
+    /**
+     * 修改费用年收费信息
+     *
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void deleteReportFeeYearCollectionInfo(Map info) throws DAOException {
+        logger.debug("deleteReportFeeYearCollectionInfo 入参 info : {}", info);
+
+        int saveFlag = sqlSessionTemplate.update("reportFeeYearCollectionServiceDaoImpl.deleteReportFeeYearCollectionInfo", info);
+
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改费用年收费信息Instance数据失败：" + JSONObject.toJSONString(info));
+        }
+    }
+
+    /**
      * 查询费用年收费数量
+     *
      * @param info 费用年收费信息
      * @return 费用年收费数量
      */
     @Override
     public int queryReportFeeYearCollectionsCount(Map info) {
-        logger.debug("查询费用年收费数据 入参 info : {}",info);
+        logger.debug("查询费用年收费数据 入参 info : {}", info);
 
         List<Map> businessReportFeeYearCollectionInfos = sqlSessionTemplate.selectList("reportFeeYearCollectionServiceDaoImpl.queryReportFeeYearCollectionsCount", info);
         if (businessReportFeeYearCollectionInfos.size() < 1) {

service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java

@@ -56,7 +56,7 @@ public class ReportFeeMonthStatisticsInnerServiceSMOImpl extends BaseServiceSMO
     public int deleteReportFeeMonthStatistics(@RequestBody ReportFeeMonthStatisticsPo reportFeeMonthStatisticsPo) {
         int saveFlag = 1;
         reportFeeMonthStatisticsPo.setStatusCd("1");
-        reportFeeMonthStatisticsServiceDaoImpl.updateReportFeeMonthStatisticsInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsPo));
+        reportFeeMonthStatisticsServiceDaoImpl.deleteReportFeeMonthStatisticsInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsPo));
         return saveFlag;
     }
 

service-report/src/main/java/com/java110/report/smo/impl/ReportFeeYearCollectionInnerServiceSMOImpl.java

@@ -54,7 +54,7 @@ public class ReportFeeYearCollectionInnerServiceSMOImpl extends BaseServiceSMO i
     public int deleteReportFeeYearCollection(@RequestBody ReportFeeYearCollectionPo reportFeeYearCollectionPo) {
         int saveFlag = 1;
         reportFeeYearCollectionPo.setStatusCd("1");
-        reportFeeYearCollectionServiceDaoImpl.updateReportFeeYearCollectionInfo(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionPo));
+        reportFeeYearCollectionServiceDaoImpl.deleteReportFeeYearCollectionInfo(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionPo));
         return saveFlag;
     }