优化退费自动退

java110-bean/src/main/java/com/java110/dto/unit/UnitDto.java

@@ -54,6 +54,10 @@ public class UnitDto extends PageDto implements Serializable {
     private String statusCd = "0";
     private String roomUnit;
 
+    private String communityName;
+
+
+
 
     public String getUnitId() {
         return unitId;
@@ -182,4 +186,12 @@ public class UnitDto extends PageDto implements Serializable {
     public void setFloorName(String floorName) {
         this.floorName = floorName;
     }
+
+    public String getCommunityName() {
+        return communityName;
+    }
+
+    public void setCommunityName(String communityName) {
+        this.communityName = communityName;
+    }
 }

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

@@ -275,6 +275,24 @@
         order by CONVERT(t.layer, SIGNED), CONVERT(t.room_num, SIGNED)
     </select>
 
+    <!-- 查询无效费用 add by wuxw 2018-07-03 -->
+    <select id="queryCommunityUnitTree" parameterType="Map" resultType="Map">
+        select s.community_id communityId,s.name communityName,f.floor_num floorNum,f.`name`,f.floor_id floorId,
+        t.unit_num unitNum,t.unit_id unitId
+        from building_unit t
+        left join f_floor f on t.floor_id = f.floor_id and f.status_cd = '0'
+        left join s_community s on f.community_id = s.community_id and s.status_cd = '0'
+        where t.status_cd = '0'
+        and f.status_cd = '0'
+        and s.status_cd = '0'
+        <if test="communityIds !=null ">
+            and s.community_id in
+            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        order by f.seq ,CONVERT(t.unit_num, SIGNED)
+    </select>
     <select id="queryHisOwnerCarCount" parameterType="Map" resultType="Map">
         select count(1) count
         from business_owner_car t

java110-interface/src/main/java/com/java110/intf/report/IReportCommunityInnerServiceSMO.java

@@ -6,6 +6,7 @@ import com.java110.dto.room.RoomDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.unit.UnitDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -101,4 +102,7 @@ public interface IReportCommunityInnerServiceSMO {
 
     @RequestMapping(value = "/queryHisRooms", method = RequestMethod.POST)
     List<RoomDto> queryHisRooms(@RequestBody RoomDto roomDto);
+
+    @RequestMapping(value = "/queryCommunityUnitTree", method = RequestMethod.POST)
+    List<UnitDto> queryCommunityUnitTree(@RequestBody UnitDto unitDto);
 }

java110-utils/src/main/java/com/java110/utils/util/ListUtil.java

@@ -1,5 +1,7 @@
 package com.java110.utils.util;
 
+import com.java110.dto.room.RoomDto;
+
 import java.util.List;
 
 /**
@@ -27,6 +29,9 @@ public class ListUtil {
 
         return false;
     }
+    public static boolean isNotNull(List values) {
+        return !isNull(values);
+    }
 
     /**
      * 判断 list 是否只有一个结果集
@@ -47,4 +52,6 @@ public class ListUtil {
         return true;
 
     }
+
+
 }

service-job/src/main/java/com/java110/job/task/oa/CycleWorkTaskGeneratorTemplate.java

@@ -1,20 +1,16 @@
 package com.java110.job.task.oa;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.classes.ScheduleClassesStaffDto;
 import com.java110.dto.community.CommunityDto;
 import com.java110.dto.task.TaskDto;
-import com.java110.dto.work.WorkCycleDto;
-import com.java110.dto.work.WorkPoolDto;
-import com.java110.dto.work.WorkPoolFileDto;
-import com.java110.dto.work.WorkTaskDto;
-import com.java110.intf.oa.IWorkCycleV1InnerServiceSMO;
-import com.java110.intf.oa.IWorkPoolFileV1InnerServiceSMO;
-import com.java110.intf.oa.IWorkPoolV1InnerServiceSMO;
-import com.java110.intf.oa.IWorkTaskV1InnerServiceSMO;
+import com.java110.dto.work.*;
+import com.java110.intf.oa.*;
 import com.java110.intf.store.IScheduleClassesStaffV1InnerServiceSMO;
 import com.java110.job.quartz.TaskSystemQuartz;
 import com.java110.po.workPool.WorkPoolFilePo;
+import com.java110.po.workPool.WorkTaskItemPo;
 import com.java110.po.workPool.WorkTaskPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.DateUtil;
@@ -45,6 +41,12 @@ public class CycleWorkTaskGeneratorTemplate extends TaskSystemQuartz {
     @Autowired
     private IWorkPoolFileV1InnerServiceSMO workPoolFileV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IWorkPoolContentV1InnerServiceSMO workPoolContentV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IWorkTaskItemV1InnerServiceSMO workTaskItemV1InnerServiceSMOImpl;
+
     @Override
     protected void process(TaskDto taskDto) throws Exception {
         logger.debug("开始执行周期性工作单任务生成" + taskDto.toString());
@@ -87,7 +89,7 @@ public class CycleWorkTaskGeneratorTemplate extends TaskSystemQuartz {
 
         WorkPoolDto workPoolDto = new WorkPoolDto();
         workPoolDto.setWorkId(tmpWorkCycleDto.getWorkId());
-        List<WorkPoolDto>workPoolDtos = workPoolV1InnerServiceSMOImpl.queryWorkPools(workPoolDto);
+        List<WorkPoolDto> workPoolDtos = workPoolV1InnerServiceSMOImpl.queryWorkPools(workPoolDto);
 
         if(ListUtil.isNull(workPoolDtos)){
             return;
@@ -98,7 +100,7 @@ public class CycleWorkTaskGeneratorTemplate extends TaskSystemQuartz {
         startTimeCal.setTime(startTime);
 
         Calendar nowCal = Calendar.getInstance();
-        nowCal.set(Calendar.HOUR,startTimeCal.get(Calendar.HOUR));
+        nowCal.set(Calendar.HOUR_OF_DAY,startTimeCal.get(Calendar.HOUR_OF_DAY));
         nowCal.set(Calendar.MINUTE,startTimeCal.get(Calendar.MINUTE));
         nowCal.set(Calendar.SECOND,startTimeCal.get(Calendar.SECOND));
 
@@ -139,6 +141,25 @@ public class CycleWorkTaskGeneratorTemplate extends TaskSystemQuartz {
             throw new CmdException("保存数据失败");
         }
 
+        WorkPoolContentDto workPoolContentDto = new WorkPoolContentDto();
+        workPoolContentDto.setWorkId(tmpWorkCycleDto.getWorkId());
+        List<WorkPoolContentDto> workPoolContentDtos
+                = workPoolContentV1InnerServiceSMOImpl.queryWorkPoolContents(workPoolContentDto);
+
+        JSONObject content = null;
+        for (WorkPoolContentDto tWorkPoolContentDto:workPoolContentDtos) {
+            WorkTaskItemPo workTaskItemPo = new WorkTaskItemPo();
+            workTaskItemPo.setDeductionMoney("0");
+            workTaskItemPo.setContentId(tWorkPoolContentDto.getContentId());
+            workTaskItemPo.setStoreId(tWorkPoolContentDto.getStoreId());
+            workTaskItemPo.setWorkId(tWorkPoolContentDto.getWorkId());
+            workTaskItemPo.setItemId(GenerateCodeFactory.getGeneratorId("11"));
+            workTaskItemPo.setState(WorkTaskDto.STATE_WAIT);
+            workTaskItemPo.setCommunityId(tWorkPoolContentDto.getCommunityId());
+            workTaskItemPo.setTaskId(workTaskPo.getTaskId());
+            workTaskItemV1InnerServiceSMOImpl.saveWorkTaskItem(workTaskItemPo);
+        }
+
 
         WorkPoolFileDto workPoolFileDto = new WorkPoolFileDto();
         workPoolFileDto.setWorkId(tmpWorkCycleDto.getWorkId());

service-report/src/main/java/com/java110/report/cmd/community/QueryCommunityUnitTreeCmd.java

@@ -0,0 +1,70 @@
+package com.java110.report.cmd.community;
+
+import com.alibaba.fastjson.JSONArray;
+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.room.RoomDto;
+import com.java110.dto.unit.UnitDto;
+import com.java110.intf.report.IReportCommunityInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.ListUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.text.ParseException;
+import java.util.List;
+
+/**
+ * 查询小区单元树形结构
+ */
+@Java110Cmd(serviceCode = "community.queryCommunityUnitTree")
+public class QueryCommunityUnitTreeCmd extends Cmd {
+
+    @Autowired
+    private IReportCommunityInnerServiceSMO reportCommunityInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        // must be administrator
+        super.validateAdmin(context);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        List<UnitDto> unitDtos = null;
+
+        UnitDto unitDto = new UnitDto();
+
+
+        unitDtos = reportCommunityInnerServiceSMOImpl.queryCommunityUnitTree(unitDto);
+        JSONArray communitys = new JSONArray();
+        if (ListUtil.isNull(unitDtos)) {
+            context.setResponseEntity(ResultVo.createResponseEntity(communitys));
+            return;
+        }
+
+        JSONObject communityInfo = null;
+        for(UnitDto tmpUnitDto:unitDtos){
+            if(!hasInCommunitys(tmpUnitDto,communitys)){
+                communityInfo = new JSONObject();
+                communityInfo.put("id","c_"+tmpUnitDto.getCommunityId());
+                communityInfo.put("communityId",tmpUnitDto.getCommunityId());
+                communityInfo.put("text",tmpUnitDto.getCommunityName());
+                communityInfo.put("icon","/img/org.png");
+                communityInfo.put("children",new JSONArray());
+                communitys.add(communityInfo);
+            }
+        }
+
+    }
+
+    private boolean hasInCommunitys(UnitDto tmpUnitDto,JSONArray communitys) {
+        return true;
+    }
+
+
+}

service-report/src/main/java/com/java110/report/cmd/room/QueryRoomsTreeCmd.java

@@ -10,6 +10,7 @@ import com.java110.intf.report.IReportCommunityInnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
 import com.java110.vo.api.ApiRoomDataVo;
 import com.java110.vo.api.ApiRoomVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +45,7 @@ public class QueryRoomsTreeCmd extends Cmd {
 
         roomDtoList = reportCommunityInnerServiceSMOImpl.queryRoomsTree(roomDto);
         apiRoomVo.setTotal(0);
-        if (roomDtoList != null && roomDtoList.size() > 0) {
+        if (ListUtil.isNotNull(roomDtoList)) {
             apiRoomVo.setTotal(roomDtoList.size());
         }
 

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

@@ -82,6 +82,8 @@ public interface IReportCommunityServiceDao {
 
     List<Map>  queryRoomsTree(Map info);
 
+    List<Map> queryCommunityUnitTree(Map info);
+
     /**
      * 查询车辆变更记录
      * @param info
@@ -111,4 +113,6 @@ public interface IReportCommunityServiceDao {
     int queryHisRoomCount(Map info);
 
     List<Map> queryHisRooms(Map info);
+
+
 }

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

@@ -128,6 +128,15 @@ public class ReportCommunityServiceDaoImpl extends BaseServiceDao implements IRe
         return communityDtos;
     }
 
+    @Override
+    public List<Map> queryCommunityUnitTree(Map info) {
+        logger.debug("查询queryCommunityUnitTree信息 入参 info : {}", JSONObject.toJSONString(info));
+
+        List<Map> infos = sqlSessionTemplate.selectList("reportCommunityServiceDaoImpl.queryCommunityUnitTree", info);
+
+        return infos;
+    }
+
     @Override
     public int queryHisOwnerCarCount(Map info) {
         logger.debug("查询车辆管理数据 入参 info : {}", info);

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

@@ -9,6 +9,7 @@ import com.java110.dto.fee.FeeDto;
 import com.java110.dto.owner.OwnerAttrDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.unit.UnitDto;
 import com.java110.intf.report.IReportCommunityInnerServiceSMO;
 import com.java110.intf.user.IOwnerAttrInnerServiceSMO;
 import com.java110.report.dao.IReportCommunityServiceDao;
@@ -68,6 +69,16 @@ public class ReportCommunityInnerServiceSMOImpl extends BaseServiceSMO implement
         return roomDtos;
     }
 
+    @Override
+    public List<UnitDto> queryCommunityUnitTree(@RequestBody UnitDto unitDto) {
+        //校验是否传了 分页信息
+        List<UnitDto> unitDtos = BeanConvertUtil.covertBeanList(
+                reportCommunityServiceDaoImpl.queryCommunityUnitTree(BeanConvertUtil.beanCovertMap(unitDto)),
+                UnitDto.class);
+
+        return unitDtos;
+    }
+
     @Override
     public int queryHisOwnerCarCount(@RequestBody OwnerCarDto ownerCarDto) {
         return reportCommunityServiceDaoImpl.queryHisOwnerCarCount(BeanConvertUtil.beanCovertMap(ownerCarDto));
@@ -141,6 +152,8 @@ public class ReportCommunityInnerServiceSMOImpl extends BaseServiceSMO implement
         return roomDtos;
     }
 
+
+
     @Override
     public int queryHisFeeCount(@RequestBody FeeDto feeDto) {
         return reportCommunityServiceDaoImpl.queryHisFeeCount(BeanConvertUtil.beanCovertMap(feeDto));