From 804ccc99e9f3c9f90dbc2d65f5c2cd7e34972e85 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 17 Jun 2019 14:08:42 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=A3=E7=A0=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxPropertyContractController.java | 7 +-- .../service/WxPropertyContractService.java | 2 +- .../service/impl/WxFlowServiceImpl.java | 25 +++++++--- .../impl/WxPropertyContractServiceImpl.java | 46 ++++++++----------- .../impl/WxRentContractServiceImpl.java | 1 - 5 files changed, 44 insertions(+), 37 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index a005bf9d8..75c9c675f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -65,7 +65,7 @@ public class WxPropertyContractController extends BaseController { if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); } - return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), EnumFromType.OTHER.getCode()); + return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); } @PostMapping("updateRentStartTime") @@ -83,7 +83,7 @@ public class WxPropertyContractController extends BaseController { propertyContract.setTenantId(user.getTenantId()); propertyContract.setAdjustPeriodHandle(); propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); - return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(),EnumFromType.SWITCH.getCode()); + return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName()); } @@ -94,7 +94,8 @@ public class WxPropertyContractController extends BaseController { MallUserInfo user = getUser(); wxPropertyContract.setTenantId(user.getTenantId()); wxPropertyContract.setAdjustPeriodHandle(); - return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(),EnumFromType.OTHER.getCode()); + //第三步提交 SWITCH + return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); } @GetMapping("/del") diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 01929644c..acdb8e1a9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -36,7 +36,7 @@ public interface WxPropertyContractService { * @param userId * @return */ - ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName,int from); + ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index f5fc81f72..2f9e0f59f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -492,9 +492,14 @@ public class WxFlowServiceImpl implements WxFlowService { //设置当前节点代办人信息 String[] assigneeArray = assignee.get("assignee").split(","); String userName = ""; - for (String userid:assigneeArray) { + for (int j = 0; j < assigneeArray.length; j++) { + String userid = assigneeArray[j]; MallUserInfo mallUserInfo = this.mallUserInfoService.getById(Long.parseLong(userid)); - userName += mallUserInfo.getName()+" "; + if(j != assigneeArray.length-1){ + userName += mallUserInfo.getName()+","; + }else{ + userName += mallUserInfo.getName()+""; + } } WxFlowRecord wxFlowRecord = new WxFlowRecord(); wxFlowRecord.setUserName(userName.trim()); @@ -527,9 +532,10 @@ public class WxFlowServiceImpl implements WxFlowService { } }else{ List taskList = taskService.createTaskQuery().processInstanceId(pi.getId()).list(); - //Map mapInfo = taskService.getVariables(task.getId()); - WxFlowModel flowModelDb = getModelByType(flowType,tenantId); - WxFlowModel flowModel = (WxFlowModel)JsonUtil.readValue(flowModelDb.getFlow(),WxFlowModel.class); + Map mapInfo = taskService.getVariables(taskList.get(0).getId()); + //WxFlowModel flowModelDb = getModelByType(flowType,tenantId); + String flowJson = (String)mapInfo.get("taskAssignee"); + WxFlowModel flowModel = (WxFlowModel)JsonUtil.readValue(flowJson,WxFlowModel.class); List taskAssigneeList = flowModel.getLists(); for (int i = 0; i < taskAssigneeList.size(); i++) { UserTaskVo assignee = taskAssigneeList.get(i); @@ -555,7 +561,14 @@ public class WxFlowServiceImpl implements WxFlowService { for (FlowUserVo userVo:assignee.getUserList()) { userName += userVo.getName()+" "; } - + for (int j = 0; j < assignee.getUserList().size(); j++) { + FlowUserVo userVo = assignee.getUserList().get(j); + if(j != assignee.getUserList().size() - 1){ + userName += userVo.getName()+","; + }else{ + userName += userVo.getName()+""; + } + } wxFlowRecord = new WxFlowRecord(); wxFlowRecord.setUserName(userName.trim()); wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 2e622bcea..37405981d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -200,7 +200,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override @Transactional(rollbackFor = {Exception.class}) - public ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName,int from) { + public ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName) { // 保存调整金额(预账单调整) boolean haspreview = false; if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ @@ -285,27 +285,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService message = "保存物业合同信息成功"; } else {//更新物业合同信息 - WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(record.getId()); - if (wxPropertyContract == null) { - return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); - } - if(from != 1){ - record.setRentalStartDate(wxRentContract.getRentalStartDate()); - } - record.setRentalEndDate(wxRentContract.getRentalEndDate()); - record.setStartDate(wxRentContract.getStartDate()); - record.setEndDate(wxRentContract.getEndDate()); - record.setPrice(record.getPrice() != null ? record.getPrice() : 0); - record.setDeposit(record.getDeposit() != null ? record.getDeposit() : 0); - record.setUpdatetime(new Date()); - record.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); - try { - wxPropertyContractMapper.updateByPrimaryKeySelective(record); - } catch (Exception e) { - logger.error("更新物业合同信息失败,e:" + e.getMessage()); - throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); - } - //查询预账单用于展示 WxBillProperty wxBillRent = new WxBillProperty(); wxBillRent.setPropertyContractId(record.getId()); @@ -320,15 +299,30 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //删除预账单,重新生成 wxBillPropertyMapper.deletePreviewBill(record); //重新生成 - wxPropertyContract.setPrice(record.getPrice()); - wxPropertyContract.setDeposit(record.getDeposit()); - wxPropertyContract.setReceivePeriod(record.getReceivePeriod()); - wxPropertyContract.setPayAccount(record.getPayAccount()); billList = buildProperty(new WxMerchant(),userId,record,EnumIsPreview.YES.getCode()); record.setPreviewBillRentList(billList); } } + WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(record.getId()); + if (wxPropertyContract == null) { + return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); + } + record.setRentalStartDate(wxPropertyContract.getRentalStartDate()); + record.setRentalEndDate(wxRentContract.getRentalEndDate()); + record.setStartDate(wxRentContract.getStartDate()); + record.setEndDate(wxRentContract.getEndDate()); + record.setPrice(record.getPrice() != null ? record.getPrice() : 0); + record.setDeposit(record.getDeposit() != null ? record.getDeposit() : 0); + record.setUpdatetime(new Date()); + record.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); + try { + wxPropertyContractMapper.updateByPrimaryKeySelective(record); + } catch (Exception e) { + logger.error("更新物业合同信息失败,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + } + message = "更新物业合同信息成功"; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 7e89d7ca7..0901ef87b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -433,7 +433,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { } } - // 保存调整金额(预账单调整) if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ wxBillRentMapper.updateBills(record.getPreviewBillRentList());