开发更新

jiangping

2024-11-28 d798c557fd8df9a7d5f43455455fb30658259d6e

开发更新

 admin/src/views/workorder/components/detail.vue

@@ -71,7 +71,7 @@
                <div class="time">操作时间：{{ item.createDate }}</div>
                <div class="creator">操作人：{{ item.param1 }}</div>
              </div>
            </div>  
            </div>
          </div>
        </div>
      </div>

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java

@@ -518,7 +518,8 @@
    }

    private void dealDetailListBiz(YwContract model) {
        List<YwContractDetail> details = new ArrayList<>();
        List<YwContractDetail> details1 = new ArrayList<>();
        List<YwContractDetail> details2 = new ArrayList<>();
        int num = 0;
        if(Constants.equalsInteger(model.getType(),Constants.ZERO )
                || Constants.equalsInteger(model.getType(),Constants.TWO)){
@@ -530,7 +531,7 @@
               d.setType(Constants.ZERO);
               d.setSortnum(num++);
               d.setStatus(Constants.ZERO);
               details.add(d);
               details1.add(d);
            }
        }
        num = 0;
@@ -544,22 +545,28 @@
                d.setContractId(model.getId());
                d.setSortnum(num++);
                d.setStatus(Constants.ZERO);
                details.add(d);
                details2.add(d);
            }
        }
        if(model.getId()!=null){
            ywContractDetailMapper.insert(details);//批量插入条款信息信息
            if(details1.size()>0){
                ywContractDetailMapper.insert(details1);//批量插入条款信息信息
            }
            if(details2.size()>0){
                ywContractDetailMapper.insert(details2);//批量插入条款信息信息
            }
        }
        //处理账单信息
        dealBillListBiz(model,details);
        dealBillListBiz(model,details1,details2);
    }

    /**
     * 支付方式 0=一次性付款；1=每三个月一付；2=六个月一付；3=一年一付
     * @param model
     * @param details
     * @param details1 租赁条款
     * @param details2 物业条款
     */
    private void dealBillListBiz(YwContract model, List<YwContractDetail> details) {
    private void dealBillListBiz(YwContract model, List<YwContractDetail> details1, List<YwContractDetail> details2) {
        List<YwContractBill> billList1 = new ArrayList<>();
        List<YwContractBill> billList2 = new ArrayList<>();
        if(Constants.equalsInteger(model.getType(),Constants.ZERO )
@@ -567,20 +574,20 @@
            //如果有租赁条款
            if(Constants.formatBigdecimal(model.getZlDeposit()).compareTo(new BigDecimal(0))>0){
                    //如果有租赁押金
                billList1.add(initDepoistBill(Constants.TWO,model,details));
                billList1.add(initDepoistBill(Constants.TWO,model));
            }
            if(Constants.equalsInteger(model.getZlPayType(), Constants.ZERO)){
                //如果是一次性付清
                billList1.addAll(getBillsByParamOnce(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
                billList1.addAll(getBillsByParamOnce(model,details1,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
            }else if(Constants.equalsInteger(model.getZlPayType(), Constants.ONE)){
                //如果每三个月一付
                billList1.addAll(getBillsByParam3Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
                billList1.addAll(getBillsByParam3Months(model,details1,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
            }else if(Constants.equalsInteger(model.getZlPayType(), Constants.TWO)){
                //如果六个月一付
                billList1.addAll(getBillsByParam6Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
                billList1.addAll(getBillsByParam6Months(model,details1,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
            }else if(Constants.equalsInteger(model.getZlPayType(), Constants.THREE)){
                //如果一年一付
                billList1.addAll(getBillsByParam1Year(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
                billList1.addAll(getBillsByParam1Year(model,details1,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
            }
        }
        if(Constants.equalsInteger(model.getType(),Constants.ZERO )
@@ -588,20 +595,20 @@
            //如果物业条款
            if(Constants.formatBigdecimal(model.getWyDeposit()).compareTo(new BigDecimal(0))>0){
                //如果有租赁押金
                billList2.add(initDepoistBill(Constants.THREE,model,details));
                billList2.add(initDepoistBill(Constants.THREE,model));
            }
            if(Constants.equalsInteger(model.getWyPayType(), Constants.ZERO)){
                //如果是一次性付清
                billList2.addAll(getBillsByParamOnce(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
                billList2.addAll(getBillsByParamOnce(model,details2,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
            }else if(Constants.equalsInteger(model.getWyPayType(), Constants.ONE)){
                //如果每三个月一付
                billList2.addAll(getBillsByParam3Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
                billList2.addAll(getBillsByParam3Months(model,details2,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
            }else if(Constants.equalsInteger(model.getWyPayType(), Constants.TWO)){
                //如果六个月一付
                billList2.addAll(getBillsByParam6Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
                billList2.addAll(getBillsByParam6Months(model,details2,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
            }else if(Constants.equalsInteger(model.getWyPayType(), Constants.THREE)){
                //如果一年一付
                billList2.addAll(getBillsByParam1Year(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
                billList2.addAll(getBillsByParam1Year(model,details2,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
            }
        }

@@ -628,7 +635,7 @@
        }
    }

    private YwContractBill initDepoistBill(int type,  YwContract model, List<YwContractDetail> details) {
    private YwContractBill initDepoistBill(int type,  YwContract model ) {
        YwContractBill bill  = new YwContractBill();
        bill.setCreateDate(model.getEditDate());
        bill.setCreator(model.getEditor());