ruoyi-applet/src/main/resources/application.yml
@@ -1,4 +1,4 @@ # 项目相关配置 spring: profiles: active: test active: prod ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java
@@ -307,6 +307,7 @@ TContractRentType tContractRentType = contractRentTypes.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null); // 生成第一笔账单 // 第一次应缴费日期 LocalDateTime firstPayTime = contract.getStartTime().plusDays(10).withHour(0).withMinute(0).withSecond(0); TBill rentBill = new TBill(); rentBill.setContractId(contract.getId()); @@ -1043,7 +1044,7 @@ } case CATEGORY3: { // 合同提前终止审批 int submitStatus = status == 0 ? 4 : (status == 1 ? 7 : 5); int submitStatus = status == 0 ? 4 : (status == 1 ? 7 : 4); contractService.updateContractAuditStatus(processParameter.getString("projectId"), submitStatus); // 生成验收记录 TContract contract = contractService.getById(processParameter.getString("projectId")); ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
@@ -580,6 +580,13 @@ if (processTaskListBO.getSortBy() == 2) { stateTaskQuery.orderByDesc(BaseModel::getCreateTime); } // 查询合同信息 List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery()); List<String> contractIds = tContracts.stream().map(TContract::getId).collect(Collectors.toList()); if(CollectionUtils.isEmpty(contractIds)){ return new PageInfo<>(); } stateTaskQuery.in(StateTaskCenter::getProjectId, contractIds); stateTaskQuery.in(StateTaskCenter::getFlowId, instanceIds); PageInfo pageInfo = new PageInfo(processTaskListBO.getPageNum(), processTaskListBO.getPageSize()); PageInfo<StateTaskCenter> taskCenters = stateTaskCenterService.page(pageInfo,stateTaskQuery); ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -329,6 +329,7 @@ save.setPayType(3); save.setPayer(dto.getPayer()); save.setPayTime(billSave.getPayFeesTime()); save.setBusinessDeptId(bill.getBusinessDeptId()); save.setSysSerialNumber(OrderNos.getDid(30)); save.setFlowType(1); save.setPaymentBillId(back.getId()); ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
@@ -157,28 +157,28 @@ </select> <select id="statisticsAllRent" resultType="java.math.BigDecimal"> SELECT ifnull(sum(payable_fees_money),0) as amount FROM t_bill SELECT ifnull(sum(payable_fees_money),0) as amount FROM t_bill where pay_fees_status!='5' <if test='busDeptId != null and busDeptId != "" and busDeptId!="0"'> where business_dept_id = #{busDeptId} and business_dept_id = #{busDeptId} </if> </select> <select id="statisticsNoPay" resultType="java.math.BigDecimal"> SELECT ifnull(sum(outstanding_money),0) as amount FROM t_bill where pay_fees_status!=3 SELECT ifnull(sum(outstanding_money),0) as amount FROM t_bill where pay_fees_status!='3' and pay_fees_status!='5' <if test='busDeptId != null and busDeptId != "" and busDeptId!="0"'> and business_dept_id = #{busDeptId} </if> </select> <select id="statisticsPayed" resultType="java.math.BigDecimal"> SELECT ifnull(sum(pay_fees_money),0) as amount FROM t_bill SELECT ifnull(sum(pay_fees_money),0) as amount FROM t_bill where pay_fees_status!='5' <if test='busDeptId != null and busDeptId != "" and busDeptId!="0"'> where business_dept_id = #{busDeptId} and business_dept_id = #{busDeptId} </if> </select> <select id="statisticsOverdue" resultType="java.math.BigDecimal"> SELECT ifnull(sum(outstanding_money),0) as amount FROM t_bill where pay_fees_status=4 SELECT ifnull(sum(outstanding_money),0) as amount FROM t_bill where pay_fees_status='4' <if test='busDeptId != null and busDeptId != "" and busDeptId!="0"'> and business_dept_id = #{busDeptId} </if>
