联讯物业系统后台
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wuxw
2022-07-19 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 
 service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java


@@ -11,6 +11,7 @@


import com.java110.community.bmo.roomRenovationRecord.IDeleteRoomRenovationRecordBMO;


import com.java110.community.bmo.roomRenovationRecord.IGetRoomRenovationRecordBMO;


import com.java110.community.bmo.roomRenovationRecord.ISaveRoomRenovationRecordBMO;


import com.java110.core.annotation.Java110Transactional;


import com.java110.core.factory.GenerateCodeFactory;


import com.java110.dto.RoomDto;


import com.java110.dto.communitySetting.CommunitySettingDto;


@@ -23,10 +24,10 @@


import com.java110.dto.roomRenovation.RoomRenovationDto;


import com.java110.dto.roomRenovationDetail.RoomRenovationDetailDto;


import com.java110.dto.user.UserDto;


import com.java110.intf.IRoomRenovationInnerServiceSMO;


import com.java110.intf.common.IFileInnerServiceSMO;


import com.java110.intf.common.IFileRelInnerServiceSMO;


import com.java110.intf.community.ICommunitySettingInnerServiceSMO;


import com.java110.intf.community.IRoomRenovationInnerServiceSMO;


import com.java110.intf.fee.IFeeAttrInnerServiceSMO;


import com.java110.intf.fee.IFeeConfigInnerServiceSMO;


import com.java110.intf.fee.IFeeInnerServiceSMO;


@@ -44,12 +45,7 @@


import com.java110.vo.ResultVo;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.http.ResponseEntity;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestHeader;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RequestMethod;


import org.springframework.web.bind.annotation.RequestParam;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.bind.annotation.*;




import java.text.ParseException;


import java.text.SimpleDateFormat;


@@ -222,6 +218,7 @@


                payFeePo.setState(FeeDto.STATE_DOING);


                payFeePo.setConfigId(configId);


                payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);


                payFeePo.setBatchId("-1");


                payFeePos.add(payFeePo);


                FeeAttrPo feeAttrPo1 = new FeeAttrPo();


                feeAttrPo1.setFeeId(payFeePo.getFeeId());


@@ -244,7 +241,7 @@


                feeAttrPo3.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK); //联系方式


                feeAttrPo3.setValue(reqJson.getString("personTel"));


                feeAttrOwnerLinkPos.add(feeAttrPo3);


                if (FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {//一次性费用


                if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {//一次性费用


                    FeeAttrPo feeAttrPo4 = new FeeAttrPo();


                    feeAttrPo4.setFeeId(payFeePo.getFeeId());


                    feeAttrPo4.setCommunityId(reqJson.getString("communityId"));


@@ -541,6 +538,9 @@


                                                      @RequestParam(value = "personTel", required = false) String personTel,


                                                      @RequestParam(value = "state", required = false) String state,


                                                      @RequestParam(value = "isPostpone", required = false) String isPostpone,


                                                      @RequestParam(value = "renovationTime", required = false) String renovationTime,


                                                      @RequestParam(value = "renovationStartTime", required = false) String renovationStartTime,


                                                      @RequestParam(value = "renovationEndTime", required = false) String renovationEndTime,


                                                      @RequestHeader(value = "user-id") String userId,


                                                      @RequestParam(value = "page", required = false) int page,


                                                      @RequestParam(value = "row", required = false) int row) {


@@ -555,6 +555,9 @@


        roomRenovationDto.setState(state);


        roomRenovationDto.setUserId(userId);


        roomRenovationDto.setIsPostpone(isPostpone);


        roomRenovationDto.setRenovationTime(renovationTime);


        roomRenovationDto.setRenovationStartTime(renovationStartTime);


        roomRenovationDto.setRenovationEndTime(renovationEndTime);


        return getRoomRenovationBMOImpl.get(roomRenovationDto);


    }




@@ -568,6 +571,7 @@


     * @path /app/roomRenovation/saveRoomRenovationDetail


     */


    @RequestMapping(value = "/saveRoomRenovationDetail", method = RequestMethod.POST)


    @Java110Transactional


    public ResponseEntity<String> saveRoomRenovationDetail(@RequestHeader(value = "user-id") String userId,


                                                           @RequestHeader(value = "user-name") String userName,


                                                           @RequestBody JSONObject reqJson) {


@@ -575,9 +579,18 @@


        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");


        Assert.hasKeyAndValue(reqJson, "detailType", "请求报文中未包含detailType");


        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");




        UserDto userDto = new UserDto();


        userDto.setUserId(userId);


        userDto.setPage(1);


        userDto.setRow(1);


        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);




        Assert.listOnlyOne(userDtos, "用户不存在");




        RoomRenovationDetailPo roomRenovationDetailPo = BeanConvertUtil.covertBean(reqJson, RoomRenovationDetailPo.class);


        roomRenovationDetailPo.setStaffId(userId);


        roomRenovationDetailPo.setStaffName(userName);


        roomRenovationDetailPo.setStaffName(userDtos.get(0).getName());


        RoomRenovationPo roomRenovationPo = new RoomRenovationPo();


        roomRenovationPo.setrId(roomRenovationDetailPo.getrId());


        roomRenovationPo.setState(roomRenovationDetailPo.getState());