java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java
@@ -46,6 +46,7 @@ private String memberCarNumLike; private String[] carNums; private String communityId; private String[] communityIds; private String psId; private String[] psIds; private String[] paIds; @@ -585,4 +586,12 @@ public void setMemberIds(String[] memberIds) { this.memberIds = memberIds; } public String[] getCommunityIds() { return communityIds; } public void setCommunityIds(String[] communityIds) { this.communityIds = communityIds; } } java110-bean/src/main/java/com/java110/dto/parking/ParkingAreaDto.java
@@ -21,6 +21,7 @@ private String[] paIds; private String remark; private String communityId; private String[] communityIds; private String communityName; private List<ParkingAreaAttrDto> attrs; @@ -109,4 +110,12 @@ public void setCommunityName(String communityName) { this.communityName = communityName; } public String[] getCommunityIds() { return communityIds; } public void setCommunityIds(String[] communityIds) { this.communityIds = communityIds; } } java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
@@ -246,6 +246,12 @@ <if test="communityId !=null and communityId != ''"> and t.community_id= #{communityId} </if> <if test="communityIds !=null"> and t.community_id in <foreach collection="communityIds" item="item" index="index" open="(" close=")" separator=","> #{item} </foreach> </if> <if test="state !=null and state != ''"> and t.state= #{state} </if> @@ -436,6 +442,12 @@ <if test="communityId !=null and communityId != ''"> and t.community_id= #{communityId} </if> <if test="communityIds !=null"> and t.community_id in <foreach collection="communityIds" item="item" index="index" open="(" close=")" separator=","> #{item} </foreach> </if> <if test="state !=null and state != ''"> and t.state= #{state} </if> service-job/src/main/java/com/java110/job/task/oa/CycleWorkTaskGeneratorTemplate.java
@@ -163,6 +163,19 @@ workTaskItemV1InnerServiceSMOImpl.saveWorkTaskItem(workTaskItemPo); } // 将抄送状态修改为待处理 WorkCopyDto workCopyDto = new WorkCopyDto(); workCopyDto.setWorkId(tmpWorkCycleDto.getWorkId()); List<WorkCopyDto> workCopyDtos = workCopyV1InnerServiceSMOImpl.queryWorkCopys(workCopyDto); if(!ListUtil.isNull(workCopyDtos)){ WorkCopyPo workCopyPo = new WorkCopyPo(); workCopyPo.setCopyId(workCopyDtos.get(0).getCopyId()); workCopyPo.setState(WorkCopyDto.STATE_DOING); workCopyPo.setRemark("待处理"); workCopyV1InnerServiceSMOImpl.updateWorkCopy(workCopyPo); } WorkPoolFileDto workPoolFileDto = new WorkPoolFileDto(); workPoolFileDto.setWorkId(tmpWorkCycleDto.getWorkId()); @@ -185,20 +198,9 @@ workPoolFileV1InnerServiceSMOImpl.saveWorkPoolFile(workPoolFilePo); } // 将抄送状态修改为待处理 WorkCopyDto workCopyDto = new WorkCopyDto(); workCopyDto.setWorkId(tmpWorkCycleDto.getWorkId()); List<WorkCopyDto> workCopyDtos = workCopyV1InnerServiceSMOImpl.queryWorkCopys(workCopyDto); if(ListUtil.isNull(workCopyDtos)){ return; } WorkCopyPo workCopyPo = new WorkCopyPo(); workCopyPo.setCopyId(workCopyDtos.get(0).getCopyId()); workCopyPo.setState(WorkCopyDto.STATE_DOING); workCopyPo.setRemark("待处理"); workCopyV1InnerServiceSMOImpl.updateWorkCopy(workCopyPo); }
@@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.context.CmdContextUtils; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; @@ -12,6 +13,7 @@ import com.java110.dto.unit.UnitDto; import com.java110.intf.dev.IDictV1InnerServiceSMO; import com.java110.intf.report.IReportCommunityInnerServiceSMO; import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.ListUtil; import com.java110.utils.util.StringUtil; @@ -33,6 +35,9 @@ @Autowired private IDictV1InnerServiceSMO dictV1InnerServiceSMOImpl; @Autowired private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { // must be administrator @@ -46,6 +51,14 @@ ParkingAreaDto parkingAreaDto = new ParkingAreaDto(); String staffId = CmdContextUtils.getUserId(context); List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId); if (!ListUtil.isNull(communityIds)) { parkingAreaDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()])); } parkingAreaDtos = reportCommunityInnerServiceSMOImpl.queryCommunityParkingTree(parkingAreaDto); JSONArray communitys = new JSONArray(); service-user/src/main/java/com/java110/user/cmd/owner/QueryAdminOwnerCarsCmd.java
@@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.context.CmdContextUtils; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; @@ -18,6 +19,7 @@ import com.java110.intf.community.IRoomInnerServiceSMO; import com.java110.intf.user.IOwnerCarInnerServiceSMO; import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO; import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; @@ -52,6 +54,9 @@ @Autowired private IMachineTranslateV1InnerServiceSMO machineTranslateV1InnerServiceSMOImpl; @Autowired private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException { super.validateAdmin(cmdDataFlowContext); @@ -62,6 +67,14 @@ public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException { OwnerCarDto ownerCarDto = BeanConvertUtil.covertBean(reqJson, OwnerCarDto.class); String staffId = CmdContextUtils.getUserId(cmdDataFlowContext); List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId); if (!ListUtil.isNull(communityIds)) { ownerCarDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()])); } int row = reqJson.getIntValue("row"); //查询总记录数 int total = ownerCarInnerServiceSMOImpl.queryOwnerCarsCount(ownerCarDto); service-user/src/main/java/com/java110/user/dao/impl/OwnerCarServiceDaoImpl.java
@@ -6,6 +6,7 @@ import com.java110.utils.util.DateUtil; import com.java110.core.base.dao.BaseServiceDao; import com.java110.user.dao.IOwnerCarServiceDao; import com.java110.utils.util.ListUtil; import org.slf4j.Logger; import com.java110.core.log.LoggerFactory; import org.springframework.stereotype.Service; @@ -54,9 +55,9 @@ logger.debug("查询车辆管理信息 入参 info : {}", info); List<Map> businessOwnerCarInfos = sqlSessionTemplate.selectList("ownerCarServiceDaoImpl.getBusinessOwnerCarInfo", info); List<Map> infos = sqlSessionTemplate.selectList("ownerCarServiceDaoImpl.getBusinessOwnerCarInfo", info); return businessOwnerCarInfos; return infos; } @@ -122,24 +123,24 @@ public int queryOwnerCarsCount(Map info) { logger.debug("查询车辆管理数据 入参 info : {}", info); List<Map> businessOwnerCarInfos = sqlSessionTemplate.selectList("ownerCarServiceDaoImpl.queryOwnerCarsCount", info); if (businessOwnerCarInfos.size() < 1) { List<Map> infos = sqlSessionTemplate.selectList("ownerCarServiceDaoImpl.queryOwnerCarsCount", info); if (ListUtil.isNull(infos)) { return 0; } return Integer.parseInt(businessOwnerCarInfos.get(0).get("count").toString()); return Integer.parseInt(infos.get(0).get("count").toString()); } @Override public long queryOwnerParkingSpaceCount(Map info) { logger.debug("查询车辆管理数据 入参 info : {}", info); List<Map> businessOwnerCarInfos = sqlSessionTemplate.selectList("ownerCarServiceDaoImpl.queryOwnerParkingSpaceCount", info); if (businessOwnerCarInfos.size() < 1) { List<Map> infos = sqlSessionTemplate.selectList("ownerCarServiceDaoImpl.queryOwnerParkingSpaceCount", info); if (ListUtil.isNull(infos)) { return 0; } return Integer.parseInt(businessOwnerCarInfos.get(0).get("count").toString()); return Integer.parseInt(infos.get(0).get("count").toString()); }
@@ -13,6 +13,7 @@ import com.java110.user.dao.IOwnerCarServiceDao; import com.java110.utils.constant.StatusConstant; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.ListUtil; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -150,7 +151,7 @@ carNums.add(importRoomFee.getCarNum()); } if (carNums.size() < 1) { if (ListUtil.isNull(carNums)) { return tmpImportCarFees; } Map<String, Object> info = new HashMap<>();
