Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

liukangdong

2024-11-28 c462126d2eaf08e95c7bbb7f5db0a1a826356a75

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

 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/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -214,6 +214,9 @@
     * @return
     */
    public static String getPayTypeByNum(Integer zlPayType) {
        if(zlPayType == null){
            return  "";
        }
        if(zlPayType == 1){
            return "3个月一付";
        }else   if(zlPayType == 2){
@@ -1358,9 +1361,9 @@
        WORKORDER_CREATE(0, "工单创建", "工单创建"),
        WORKORDER_DISPATCH(1, "工单指派", "工单指派"),
        WORKORDER_DEAL(2, "工单处理 ", "工单处理 "),
        CONTRACT_CREATE(3, "合同创建 ", "合同创建 "),
        CONTRACT_UPDATE(4, "合同变更 ", "合同变更 "),
        CONTRACT_BACK(5, "合同退租 ", "合同退租 "),
        CONTRACT_CREATE(3, "合同新建 ", "新建 "),
        CONTRACT_UPDATE(4, "合同变更 ", "变更 "),
        CONTRACT_BACK(5, "合同退租 ", "退租 "),

        ;
        // æˆå‘˜å˜é‡

 server/system_service/src/main/java/com/doumee/core/utils/DateCompare.java

@@ -67,14 +67,23 @@
        BigDecimal monthFloat = new BigDecimal(month) ;

        int yearDays = day - DateUtil.daysBetweenDates(DateUtil.addYearToDate(fromDate,year),fromDate) ;
        if(yearDays>0){
        if(yearDays!=0){
            yearFloat = yearFloat.add(new BigDecimal(yearDays).divide(new BigDecimal(365), 2,RoundingMode.FLOOR));
        }
        int monthDays = day - DateUtil.daysBetweenDates(DateUtil.addMonthToDate(fromDate,month),fromDate) ;
        if(monthDays>0){
            monthFloat = monthFloat.add(new BigDecimal(monthDays).divide(new BigDecimal(30), 2,RoundingMode.FLOOR));
        if(monthDays!=0){
            monthFloat = monthFloat.add(new BigDecimal(monthDays*12).divide(new BigDecimal(365), 2,RoundingMode.FLOOR));
        }
        return DateCompare.builder().day(day).month(month).year(year).yearFloat(yearFloat).monthFloat(monthFloat).yearDays(yearDays).monthDays(monthDays).build();
    }

    public static void main(String[] args) {
        DateCompare dateCompare =   DateCompare.dayCompare(DateUtil.getDateFromString("2024-12-01 00:00:00"),DateUtil.getDateByString("2025-03-01 00:00:00")
                ,DateUtil.getDateFromString("2024-12-01 00:00:00"),DateUtil.getDateFromString("2024-12-03 00:00:00"));
        System.out.println(dateCompare.monthFloat);
        System.out.println(dateCompare.yearFloat);
        System.out.println(dateCompare.yearFloat);
        System.out.println(dateCompare.yearFloat);
    }
    public static DateCompare monthYearCompare(Date fromDate,Date toDate ){
        //开始时间往后延伸，除去有效时期
@@ -96,12 +105,12 @@
        BigDecimal monthFloat = new BigDecimal(month) ;

        int yearDays = day - DateUtil.daysBetweenDates(DateUtil.addYearToDate(fromDate,year),fromDate) ;
        if(yearDays>0){
        if(yearDays!=0){
            yearFloat = yearFloat.add(new BigDecimal(yearDays).divide(new BigDecimal(365), 2,RoundingMode.FLOOR));
        }
        int monthDays = day - DateUtil.daysBetweenDates(DateUtil.addMonthToDate(fromDate,month),fromDate) ;
        if(monthDays>0){
            monthFloat = monthFloat.add(new BigDecimal(monthDays).divide(new BigDecimal(30), 2,RoundingMode.FLOOR));
        if(monthDays!=0){
            monthFloat = monthFloat.add(new BigDecimal(monthDays*12).divide(new BigDecimal(365), 2,RoundingMode.FLOOR));
        }
        return DateCompare.builder().day(day).month(month).year(year).yearFloat(yearFloat).monthFloat(monthFloat).yearDays(yearDays).monthDays(monthDays).build();
    }

 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -2851,7 +2851,7 @@
//            System.out.println(DateUtil.afterMinutesDate(-5));


            DateUtil.getBeforDays(new Date(),7);
          System.out.println(DateUtil.getPlusTime2(addMonthToDate(new Date(),3)));

//            Date startTime = DateUtil.StringToDate("2024-05-01 08:00:00" ,"yyyy-MM-dd HH:mm:ss");
//            Date endTime = DateUtil.StringToDate("2024-05-01 17:00:00" ,"yyyy-MM-dd HH:mm:ss");

 server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java

@@ -86,6 +86,13 @@
    @GetMapping("/timer/sms/sendWaitingSmsNotice")
    ApiResponse sendWaitingSmsNotice();

    @ApiOperation("【阜宁运维】定时处理合同账单编码")
    @GetMapping("/timer/yw/ywDealContractBillCodeTimer")
    ApiResponse ywDealContractBillCodeTimer();

    @ApiOperation("【阜宁运维】定时处理合同过期")
    @GetMapping("/timer/yw/ywDealContractTimeOutTimer")
    ApiResponse ywDealContractTimeOutTimer();


}

 server/system_timer/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: systemTimer
    # å®‰å…¨é…ç½®

 server/visits/admin_timer/src/main/java/com/doumee/api/YwTimerController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,69 @@
package com.doumee.api;

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.model.ApiResponse;
import com.doumee.dao.business.model.YwContract;
import com.doumee.service.business.PlatformJobService;
import com.doumee.service.business.YwContractBillService;
import com.doumee.service.business.YwContractService;
import com.doumee.service.system.SystemDictDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2024/11/28 10:58
 */
@Api(tags = "阜宁运维系统定时器接口")
@RestController
@RequestMapping("/timer/yw")
public class YwTimerController  extends BaseController {
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Autowired
    private SystemDictDataService systemDictDataService;

    @Autowired
    private YwContractBillService ywContractBillService;

    @Autowired
    private YwContractService ywContractService;


    @ApiOperation("定时处理合同账单编码")
    @GetMapping("/ywDealContractBillCodeTimer")
    public ApiResponse ywDealContractBillCodeTimer() {
        ywContractBillService.dealDayBillCode();
        return ApiResponse.success("定时处理合同账单编码");
    }


    @ApiOperation("定时处理合同过期与执行中")
    @GetMapping("/ywDealContractTimeOutTimer")
    public ApiResponse ywDealContractTimeOutTimer() {
        ywContractService.dealTimeOut();
        return ApiResponse.success("定时处理合同过期与执行中");
    }















}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java

@@ -151,6 +151,7 @@
    @PostMapping("/updateStatusById")
    @CloudRequiredPermission("business:company:update")
    public ApiResponse updateStatusById(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        company.setLoginUserInfo(getLoginUser(token));
        companyService.updateStatusById(company);
        return ApiResponse.success(null);
    }

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java

@@ -54,9 +54,10 @@
    @ExcelColumn(name="合同摘要")
    private String remark;

    @ApiModelProperty(value = "状态 0待执行 1执行中 2已到期 3已退租", example = "1")
    @ExcelColumn(name="状态 0待执行 1执行中 2已到期 3已退租")
    @ApiModelProperty(value = "状态 0待执行 1执行中 2已到期 3退租中 4已退租", example = "1")
    @ExcelColumn(name="状态 0待执行 1执行中 2已到期 3退租中 4已退租")
    private Integer status;

    @ApiModelProperty(value = "账单结清状态： 0待付款 1部分收款 2已结清 3已关闭", example = "1")
    @ExcelColumn(name="账单结清状态： 0待付款 1部分收款 2已结清 3已关闭")
    private Integer billStatus;
@@ -75,14 +76,17 @@

    @ApiModelProperty(value = "签订日期")
    @ExcelColumn(name="签订日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date signDate;

    @ApiModelProperty(value = "开始日期")
    @ExcelColumn(name="开始日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date startDate;

    @ApiModelProperty(value = "结束日期")
    @ExcelColumn(name="结束日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date endDate;

    @ApiModelProperty(value = "项目编码（关联yw_project)", example = "1")
@@ -126,6 +130,7 @@

    @ApiModelProperty(value = "退租日期")
    @ExcelColumn(name="退租日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date btDate;

    @ApiModelProperty(value = "退租经办人编码", example = "1")
@@ -134,6 +139,7 @@

    @ApiModelProperty(value = "退租签到日期")
    @ExcelColumn(name="退租签到日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date btSignDate;

    @ApiModelProperty(value = "退租结算金额合计", example = "1")
@@ -161,10 +167,12 @@

    @ApiModelProperty(value = "租赁免租期开始日期")
    @ExcelColumn(name="租赁免租期开始日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date zlFreeStartDate;

    @ApiModelProperty(value = "租赁免租期结束日期")
    @ExcelColumn(name="租赁免租期结束日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date zlFreeEndDate;

    @ApiModelProperty(value = "物业押金（元）", example = "1")
@@ -177,10 +185,12 @@

    @ApiModelProperty(value = "物业免租期开始日期")
    @ExcelColumn(name="物业免租期开始日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date wyFreeStartDate;

    @ApiModelProperty(value = "物业免租期结束日期")
    @ExcelColumn(name="物业免租期结束日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date wyFreeEndDate;

    @ApiModelProperty(value = "租赁总金额", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java

@@ -12,6 +12,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
@@ -60,9 +62,11 @@

    @ApiModelProperty(value = "开始时间")
    @ExcelColumn(name="计费开始日期",index = 10,width = 6,dateFormat = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date startDate;
    @ApiModelProperty(value = "结束时间")
    @ExcelColumn(name="计费结束日期",index = 11,width = 6,dateFormat = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date endDate;

    @ApiModelProperty(value = "实际付款日")
@@ -70,7 +74,8 @@
    private Date actPayDate;

    @ApiModelProperty(value = "计划付款日")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date planPayDate;

    @ApiModelProperty(value = "合同条款编码（关联yw_contract_detail)", example = "1")
@@ -177,7 +182,7 @@
    @ApiModelProperty(value = "实收金额")
    @TableField(exist = false)
    @ExcelColumn(name="实收金额",index = 6,width = 6)
    private BigDecimal actReceivableFee;
    private BigDecimal actReceivableFee = BigDecimal.ZERO;

    @ApiModelProperty(value = "需收金额")
    @TableField(exist = false)

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

@@ -100,5 +100,7 @@

    Integer backRent(YwContract ywContract);

    void dealTimeOut();


}

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

@@ -492,7 +492,7 @@
            queryWrapper.apply(" t.id in ( select hdp.COMPANY_ID from hidden_danger_param hdp where hdp.ISDELETED = 0 and hdp.STATUS = 0 and hdp.TYPE = 0  ) ");
        }
        queryWrapper.orderByDesc(Company::getCreateDate);
        queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
        queryWrapper.leftJoin("company t1 on t1.id=t.parent_id");
        queryWrapper.select(" t.* ")
                .select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum") ;
        queryWrapper.select("t1.name",Company::getParentName);
@@ -500,7 +500,7 @@
        queryWrapper.apply(" t.isdeleted = 0 ") ;
        queryWrapper.eq(Objects.nonNull(company.getStatus()),Company::getStatus,Constants.ZERO);
        queryWrapper.like(StringUtils.isNotBlank(company.getName()),Company::getName,company.getName());
        queryWrapper.like(StringUtils.isNotBlank(company.getParentName()),"c.name",company.getParentName());
        queryWrapper.like(StringUtils.isNotBlank(company.getParentName()),"t1.name",company.getParentName());
        return companyMapper.selectList(queryWrapper);
    }

@@ -604,9 +604,7 @@
            queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(pageWrap.getModel().getFsDate()));
        }
        queryWrapper.orderByDesc(Company::getCreateDate);
        queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
        /*        .leftJoin(Member.class, Member::getId,Company::getHeadId)*/
      /*  queryWrapper.leftJoin(" company c on c.id=t.parent_id");*/
        queryWrapper.leftJoin("company t1 on t1.id=t.parant_id");
        queryWrapper.selectAll(Company.class)
                .select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) ",Company::getCountNum)
                .select("(select count(m.id) from yw_account m where m.COMPANY_ID=t.id and m.ISDELETED=0)",Company::getAccountNum) ;
@@ -614,14 +612,14 @@
        queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,Constants.ZERO);
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"c.name",pageWrap.getModel().getParentName());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"t1.name",pageWrap.getModel().getParentName());
        IPage<Company> companyIPage = companyJoinMapper.selectJoinPage(page, Company.class, queryWrapper);
        return PageData.from(companyIPage);
    }

    @Override
    public void updateStatusById(Company company) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        LoginUserInfo loginUserInfo = company.getLoginUserInfo();
        if(loginUserInfo==null){
            loginUserInfo = company.getLoginUserInfo();
        }

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

@@ -1043,6 +1043,7 @@
            loginUserInfo = member.getLoginUserInfo();
        }
        Member update = new Member();
        update.setId(model.getId());
        update.setEditDate(new Date());
        update.setEditor(loginUserInfo.getId());
        update.setStatus(member.getStatus());

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

@@ -200,6 +200,7 @@
                        .selectAs(SystemUser::getRealname,Multifile::getUserName)
                        .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
                .eq(Multifile::getObjId,id)
                .eq(Multifile::getIsdeleted,Constants.ZERO)
                .eq(Multifile::getObjType,Constants.MultiFile.FN_CONTRACT_BILL_FILE.getKey()));
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
@@ -271,25 +272,27 @@
            }
            //楼宇名称
            List<YwContractRoom> ywContractRoomList = ywContractBill.getYwContractRoomList();
            StringBuilder roomPathName = new StringBuilder();
            for (YwContractRoom ywContractRoom:ywContractRoomList) {
                if(StringUtils.isNotBlank(ywContractRoom.getProjectName())){
                    roomPathName.append(ywContractRoom.getProjectName());
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRoomList)){
                StringBuilder roomPathName = new StringBuilder();
                for (YwContractRoom ywContractRoom:ywContractRoomList) {
                    if(StringUtils.isNotBlank(ywContractRoom.getProjectName())){
                        roomPathName.append(ywContractRoom.getProjectName()+"/");
                    }
                    if(StringUtils.isNotBlank(ywContractRoom.getBuildingName())){
                        roomPathName.append(ywContractRoom.getBuildingName()+"/");
                    }
                    if(StringUtils.isNotBlank(ywContractRoom.getFloorName())){
                        roomPathName.append(ywContractRoom.getFloorName()+"/");
                    }
                    if(StringUtils.isNotBlank(ywContractRoom.getRoomName())){
                        roomPathName.append(ywContractRoom.getRoomName());
                    }
                    if(StringUtils.isNotBlank(roomPathName)){
                        roomPathName.append(";");
                    }
                }
                if(StringUtils.isNotBlank(ywContractRoom.getBuildingName())){
                    roomPathName.append(ywContractRoom.getBuildingName());
                }
                if(StringUtils.isNotBlank(ywContractRoom.getFloorName())){
                    roomPathName.append(ywContractRoom.getFloorName());
                }
                if(StringUtils.isNotBlank(ywContractRoom.getRoomName())){
                    roomPathName.append(ywContractRoom.getRoomName());
                }
                if(StringUtils.isNotBlank(roomPathName)){
                    roomPathName.append(";");
                }
                ywContractBill.setRoomPathName(roomPathName.toString());
            }
            ywContractBill.setRoomPathName(roomPathName.toString());
        }

        return PageData.from(iPage);
@@ -299,29 +302,56 @@
        //查询账单下的楼宇数据
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractBillList)){
            //获取所有数据
            List<Integer> billIdList = ywContractBillList.stream().map(i->i.getId()).collect(Collectors.toList());
            List<Integer> billIdList = ywContractBillList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).map(i->i.getId()).collect(Collectors.toList());
            List<Integer> contractIdList = ywContractBillList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).map(i->i.getContractId()).collect(Collectors.toList());
            List<YwContractRoom> ywContractRoomList  = new ArrayList<>();
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(billIdList)){
                List<YwContractRoom> ywContractRoomList  = ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()
                ywContractRoomList.addAll( ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()
                        .selectAll(YwContractRoom.class)
                        .selectAs(YwProject::getName,YwRoom::getProjectName)
                        .selectAs(YwFloor::getName,YwRoom::getFloorName)
                        .selectAs(YwBuilding::getName,YwRoom::getBuildingName)
                        .selectAs(YwRoom::getName,YwContractRoom::getRoomName)
                        .selectAs(YwRoom::getCode,YwContractRoom::getRoomName)
                        .leftJoin(YwRoom.class,YwRoom::getId,YwContractRoom::getRoomId)
                        .leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor)
                        .leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId)
                        .leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
                        .in(YwContractRoom::getContractId,billIdList)
                        .eq(YwContractRoom::getType,Constants.ONE)
                );
                if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRoomList)){
                    for (YwContractBill ywContractBill:ywContractBillList) {
                ));

            }
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(contractIdList)){
                ywContractRoomList.addAll( ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()
                        .selectAll(YwContractRoom.class)
                        .selectAs(YwProject::getName,YwRoom::getProjectName)
                        .selectAs(YwFloor::getName,YwRoom::getFloorName)
                        .selectAs(YwBuilding::getName,YwRoom::getBuildingName)
                        .selectAs(YwRoom::getCode,YwContractRoom::getRoomName)
                        .leftJoin(YwRoom.class,YwRoom::getId,YwContractRoom::getRoomId)
                        .leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor)
                        .leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId)
                        .leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
                        .in(YwContractRoom::getContractId,contractIdList)
                        .eq(YwContractRoom::getType,Constants.ZERO)
                ));
            }

            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRoomList)){
                for (YwContractBill ywContractBill:ywContractBillList) {
                    if(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO)){
                        ywContractBill.setYwContractRoomList(
                                ywContractRoomList.stream().filter(i->Constants.equalsInteger(i.getContractId(),ywContractBill.getId())).collect(Collectors.toList())
                                ywContractRoomList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)&&Constants.equalsInteger(i.getContractId(),ywContractBill.getContractId())).collect(Collectors.toList())
                        );
                    }else{
                        ywContractBill.setYwContractRoomList(
                                ywContractRoomList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getContractId(),ywContractBill.getId())).collect(Collectors.toList())
                        );
                    }

                }
            }

        }
    }

@@ -359,16 +389,17 @@
                            .isNotNull(YwContractBill::getCode)
                            .apply(" CREATE_DATE like '"+codeDate+"%' ")
                            .orderByDesc(YwContractBill::getId)
                            .last(" limit  1 ")
                    );
                    Integer maxCode = Constants.ONE;
                    Integer maxCode = Constants.ZERO;
                    if(Objects.nonNull(ywContractBill)){
                        maxCode = Integer.valueOf(ywContractBill.getCode().replace("ZD"+codeDate,""));
                        maxCode = Integer.valueOf(ywContractBill.getCode().replace(("ZD"+codeDate+"-"),""));
                    }
                    for (YwContractBill contractBill:codeDateBillList) {
                        maxCode = maxCode + 1;
                        contractBill.setCode("ZD" + codeDate + "-" + StringUtils.leftPad(maxCode.toString() , 4,"0"));
                        ywContractBillMapper.update(null, new UpdateWrapper<YwContractBill>().lambda().set(YwContractBill::getCode,contractBill.getCode())
                                .eq(YwContractBill::getId,ywContractBill.getId()));
                                .eq(YwContractBill::getId,contractBill.getId()));
                    }
                }
            }

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

@@ -6,6 +6,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
@@ -322,14 +323,14 @@
        ywContractBillMapper.update(null,new UpdateWrapper<YwContractBill>().lambda()
                .set(YwContractBill::getPayStatus,ywContractBill.getPayStatus())
                .set(YwContractBill::getEditor,loginUserInfo.getId())
                .set(YwContractBill::getEditDate," now() ")
                .set(YwContractBill::getEditDate, DateUtil.getCurrDateTime())
                .eq(YwContractBill::getId,ywContractBill.getId())
        );

        ywContractRevenueMapper.update(null,new UpdateWrapper<YwContractRevenue>().lambda()
                .set(YwContractRevenue::getStatus,Constants.ONE)
                .set(YwContractRevenue::getEditor,loginUserInfo.getId())
                .set(YwContractRevenue::getEditDate," now() ")
                .set(YwContractRevenue::getEditDate,DateUtil.getCurrDateTime())
                .eq(YwContractRevenue::getId,id));
    }


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

@@ -45,6 +45,8 @@
    @Autowired
    private YwContractMapper ywContractMapper;
    @Autowired
    private YwContractRoomMapper ywContractRoomMapper;
    @Autowired
    private YwContractDetailMapper ywContractDetailMapper;
    @Autowired
    private YwContractBillMapper ywContractBillMapper;
@@ -82,11 +84,32 @@
        ywContractMapper.insert(model);
        dealDetailListBiz(model);//处理条款信息
        dealMultifileBiz(model);//处理附件信息
        dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,null,null);//记录新建日志
        dealRoomsForContract(model);//处理房源关联表
        dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,model.getLoginUserInfo().getRealname(),"【"+model.getRemark().replace("合同摘要：","")+"】");//记录新建日志

        return model.getId();
    }

    private void dealRoomsForContract(YwContract model) {
        List<YwContractRoom> list = new ArrayList<>();
        for(YwRoom room :model.getRoomList()){
            YwContractRoom t = new YwContractRoom();
            t.setContractId(model.getId());
            t.setRoomId(room.getId());
            t.setCreator(model.getCreator());
            t.setIsdeleted(Constants.ZERO);
            t.setCreateDate(model.getCreateDate());
            t.setEditDate(model.getCreateDate());
            t.setEditor(model.getCreator());
            t.setType(Constants.ZERO);
            list.add(t);
        }
        ywContractRoomMapper.insert(list);
    }

    @Override
    public   List<YwContractBill> getBillList(YwContract model){

        isParamValidForBill(model);
        model.setCreateDate(new Date());
        model.setEditDate(model.getCreateDate());
@@ -120,6 +143,8 @@
                    ||model.getZlDetailList().size() ==0){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请按页面要求填写租赁条款信息");
            }
            model.setType(Constants.TWO);
            model.setWyDetailList(null);
            if(!(model.getZlFreeEndDate()==null &&  model.getZlFreeStartDate()==null) && (
                    (model.getZlFreeEndDate()!=null &&  model.getZlFreeStartDate()==null)
                            ||(model.getZlFreeEndDate()==null &&  model.getZlFreeStartDate()!=null)
@@ -158,6 +183,8 @@
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请按页面要求填写物业条款信息");
            }
            model.setType(Constants.ONE);
            model.setZlDetailList(null);
            if(!(model.getWyFreeEndDate()==null &&  model.getWyFreeStartDate()==null) && (
                    (model.getWyFreeEndDate()!=null &&  model.getWyFreeStartDate()==null)
                            ||(model.getWyFreeEndDate()==null &&  model.getWyFreeStartDate()!=null)
@@ -184,7 +211,7 @@
            }
        }

        YwProject project = projectMapper.selectById(model.getCompanyId());
        YwProject project = projectMapper.selectById(model.getProjectId());
        if(project ==null || Constants.equalsInteger(project.getIsdeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，请选择正确的项目信息！");
        }
@@ -202,13 +229,12 @@
        for(YwRoom r : rooms){
            model.setTotalArea(model.getTotalArea().add(Constants.formatBigdecimal(r.getArea())));
        }
        model.setRoomList(rooms);
    }

    private String getRemarlByParam(YwContract model) {

        String str = "";
        YwContractDetail zl = model.getZlDetailList()!=null&&model.getZlDetailList().size()>0?model.getZlDetailList().get(0):null;
        YwContractDetail yw = model.getWyDetailList()!=null&&model.getWyDetailList().size()>0?model.getWyDetailList().get(0):null;
        //起租日2024/06/01，租赁数为500㎡。首期租赁三月一付，租金单价35元/㎡·月。首期物业三月一付，物业单价4.3元/㎡·月
        String str0 = "合同摘要：起租日{param1}，租赁数为{param2}㎡。首期租赁{param3}，租金单价{param4}元{param5}。首期物业{param6}，物业单价{param7}{param8}";
        String str1 = "合同摘要：起租日{param1}，租赁数为{param2}㎡。首期租赁{param3}，租金单价{param4}元{param5}。";
@@ -216,20 +242,20 @@
        if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
            str= str0;
        }
        if(Constants.equalsInteger(model.getType(),Constants.ONE)){
        if(Constants.equalsInteger(model.getType(),Constants.TWO)){
            str= str1;
        }
        if(Constants.equalsInteger(model.getType(),Constants.TWO)){
        if(Constants.equalsInteger(model.getType(),Constants.ONE)){
            str= str2;
        }
        str = str.replace("{param1}",DateUtil.getDateLongSlash(model.getStartDate()))
                .replace("{param2}",model.getTotalArea().intValue()+"")
                .replace("{param3}",Constants.getPayTypeByNum(model.getZlPayType()))
                .replace("{param4}",zl!=null&&zl.getPrice()!=null?(zl.getPrice().intValue()+""):"0")
                .replace("{param5}",Constants.getPayTypeByNum(model.getWyPayType()))
                .replace("{param6}",Constants.getUnitTypeByNum(zl!=null?zl.getCircleType():null))
                .replace("{param7}",zl!=null&&yw.getPrice()!=null?(zl.getPrice().intValue()+""):"0")
                .replace("{param8}",Constants.getUnitTypeByNum(yw!=null?yw.getCircleType():null));
                .replace("{param4}",Constants.formatBigdecimal(model.getZlFirstPrice()).intValue()+"")
                .replace("{param5}",Constants.getUnitTypeByNum(model.getZlFirstCircle())
                .replace("{param6}",Constants.getPayTypeByNum(model.getWyPayType()))
                .replace("{param7}",Constants.formatBigdecimal(model.getWyFirstPrice()).intValue()+"")
                .replace("{param8}",Constants.getUnitTypeByNum(model.getWyFirstCircle())));
        return  str;
    }
    private String getbackRentRemarkByParam(YwContract model) {
@@ -241,6 +267,14 @@
                .replace("{param4}",(fee.compareTo(new BigDecimal(0)) >=0?
                        Constants.formatBigdecimal(model.getBtFee()).intValue()
                        :(Constants.formatBigdecimal(model.getBtFee()).intValue() * -1))+"" );
        return  str;
    }
    private String getbackRentLogByParam(YwContract model) {
        BigDecimal fee = Constants.formatBigdecimal(model.getBtFee());
        String str = "【退租日{param1}，退租原因：{param2},退租协议中统计的费用总计{param3}元。】";
        str = str.replace("{param1}",DateUtil.getDateLongSlash(model.getBtDate()))
                .replace("{param2}",StringUtils.defaultString(model.getBtInfo(),""))
                .replace("{param3}",Constants.formatBigdecimal2Float(model.getBtFee()).doubleValue()+"");
        return  str;
    }

@@ -260,11 +294,16 @@
        //处理
        dealBackRentBillBiz(param);
        YwContract update = new YwContract();
        update.setId(param.getId());
        update.setEditDate(new Date());
        update.setEditor(param.getLoginUserInfo().getId());
        update.setBtActDate(update.getEditDate());
        update.setBtActUserId(update.getEditor());
        update.setStatus(Constants.THREE);
        if(Objects.nonNull(param.getBtWaitBill()) && param.getBtWaitBill() > Constants.ZERO){
            update.setStatus(Constants.THREE);
        }else{
            update.setStatus(Constants.FOUR);
        }
        update.setBtInfo(param.getBtInfo());
        update.setBtDate(param.getBtDate());
        update.setBtType(param.getBtType());
@@ -272,8 +311,32 @@
        update.setBtFee(param.getBtFee());
        update.setBtRemark(getbackRentRemarkByParam(param));
        ywContractMapper.updateById(update);
        dealLogBiz(param,Constants.YwLogType.CONTRACT_BACK,null,null);
        dealLogBiz(param,Constants.YwLogType.CONTRACT_BACK, param.getLoginUserInfo().getRealname(),getbackRentLogByParam(param));
        return param.getId();
    }


    @Override
    public  void dealTimeOut(){
        //定时处理合同执行中
        ywContractMapper.update(new UpdateWrapper<YwContract>()
                .lambda()
                .set(YwContract::getStatus,Constants.ONE)
                .set(YwContract::getEditDate,DateUtil.getCurrDateTime())
                .eq(YwContract::getIsdeleted,Constants.ZERO)
                .in(YwContract::getStatus,Constants.ZERO)
                .apply(" START_DATE < NOW()  AND END_DATE > NOW() ")
        );
        //定时处理合同已过期
        ywContractMapper.update(new UpdateWrapper<YwContract>()
                        .lambda()
                .set(YwContract::getStatus,Constants.TWO)
                .set(YwContract::getEditDate,DateUtil.getCurrDateTime())
                .eq(YwContract::getIsdeleted,Constants.ZERO)
                .in(YwContract::getStatus,Constants.ONE,Constants.ZERO)
                .apply(" END_DATE < NOW() ")
        );

    }

    private void dealBackRentBillBiz(YwContract param) {
@@ -294,7 +357,7 @@
                //付款状态：0=待收款；1=已结清；2=部分结清；3=待付款；4=待退款；5=已关闭
                // å¦‚果是押金或者保证金，不支持退款，保持原来的状态， 0=租赁费；1=物业费；2=租赁押金；3=物业押金；4=水电费；5=杂项费；6=其他;7=保证金
                if(Constants.equalsInteger(Constants.THREE,bill.getCostType())
                        ||  Constants.equalsInteger(Constants.FOUR,bill.getCostType())
                        ||  Constants.equalsInteger(Constants.TWO,bill.getCostType())
                        ||Constants.equalsInteger(Constants.SEVEN,bill.getCostType())){
                    //押金和保证金
                    yjBills.add(bill);
@@ -432,7 +495,7 @@
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，合同信息不存在，请返回列表刷新重试！");
        }

        SystemUser user = systemUserMapper.selectById(param.getUserId());
        SystemUser user = systemUserMapper.selectById(param.getBtUserId());
        if(user ==null ||  (user.getDeleted()!=null&& user.getDeleted() )){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，经办人信息不存在！");
        }
@@ -455,10 +518,11 @@
    }

    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.ONE)){
                || Constants.equalsInteger(model.getType(),Constants.TWO)){
            for(YwContractDetail d :model.getZlDetailList()){
               d.setCreateDate(model.getEditDate());
               d.setCreator(model.getEditor());
@@ -467,12 +531,12 @@
               d.setType(Constants.ZERO);
               d.setSortnum(num++);
               d.setStatus(Constants.ZERO);
               details.add(d);
               details1.add(d);
            }
        }
        num = 0;
        if(Constants.equalsInteger(model.getType(),Constants.ZERO )
                || Constants.equalsInteger(model.getType(),Constants.TWO)){
                || Constants.equalsInteger(model.getType(),Constants.ONE)){
            for(YwContractDetail d :model.getWyDetailList()){
                d.setCreateDate(model.getEditDate());
                d.setCreator(model.getEditor());
@@ -481,85 +545,97 @@
                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 )
                || Constants.equalsInteger(model.getType(),Constants.ONE)){
                || Constants.equalsInteger(model.getType(),Constants.TWO)){
            //如果有租赁条款
            if(Constants.formatBigdecimal(model.getZlDeposit()).compareTo(new BigDecimal(0))>0){
                    //如果有租赁押金
                billList1.add(initDepoistBill(Constants.THREE,model));
                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 )
                || Constants.equalsInteger(model.getType(),Constants.TWO)){
                || Constants.equalsInteger(model.getType(),Constants.ONE)){
            //如果物业条款
            if(Constants.formatBigdecimal(model.getWyDeposit()).compareTo(new BigDecimal(0))>0){
                //如果有租赁押金
                billList2.add(initDepoistBill(Constants.FOUR,model));
                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()));
            }
        }

        if(model.getBillType() == 0){
            model.setBillList(billList1);
        }else  if(model.getBillType() == 0){
        }else  if(model.getBillType() == 1){
            model.setBillList(billList2);
        }
        int num =1;
        for(int i=0;i<billList1.size();i++){
            if(Constants.equalsInteger( billList1.get(i).getCostType(),Constants.ZERO)){
                billList1.get(i).setSortnum(num++);
            }
        }
          num =1;
        for(int i=0;i<billList2.size();i++){
            if(Constants.equalsInteger( billList2.get(i).getCostType(),Constants.ONE)){
                billList2.get(i).setSortnum(num++);
            }
        }
        if(model.getId()!=null){
            for(int i=0;i<billList1.size();i++){
                billList1.get(i).setSortnum(i+1);
            }
            for(int i=0;i<billList2.size();i++){
                billList2.get(i).setSortnum(i+1);
            }
            ywContractBillMapper.insert(billList1);
            ywContractBillMapper.insert(billList2);
        }
    }

    private YwContractBill initDepoistBill(int type,  YwContract model) {
    private YwContractBill initDepoistBill(int type,  YwContract model ) {
        YwContractBill bill  = new YwContractBill();
        bill.setCreateDate(model.getEditDate());
        bill.setCreator(model.getEditor());
@@ -572,8 +648,13 @@
        bill.setEndDate(model.getEndDate());
        bill.setType(Constants.ZERO);
        bill.setCostType(type);
        bill.setPlanPayDate(bill.getStartDate());
        bill.setTotleFee(type==Constants.THREE?model.getZlDeposit():model.getWyDeposit());//押金费用
        bill.setReceivableFee(bill.getTotleFee());
        bill.setBillType(Constants.ZERO);
        bill.setPayStatus(Constants.ZERO);
        bill.setSortnum(0);
        bill.setCompanyId(model.getCompanyId());
        return bill;
    }

@@ -620,13 +701,12 @@
        int monthSix = months / 6;//6个月维度数量
        int restMonth = months % 6;//剩余的整月
        int monthDays =   dateCompare.getMonthDays();//不满一个月的天数
        Date date = new Date();
        List<Date> list = new ArrayList<>();
        for (int i = 0; i < monthSix; i++) {
            list.add(DateUtil.addMonthToDate(date,i*6));
            list.add(DateUtil.addMonthToDate(startDate,i*6));
        }
        if(restMonth>0 || monthDays>0){
            list.add(DateUtil.addDaysToDate(date,monthSix));
            list.add(DateUtil.addMonthToDate(startDate,monthSix*6));
        }
        return list;
    }
@@ -636,13 +716,12 @@
        int monthThree = months / 3;//3个月维度数量
        int restMonth = months % 3;//剩余的整月
        int monthDays =   dateCompare.getMonthDays();//不满一个月的天数
        Date date = new Date();
        List<Date> list = new ArrayList<>();
        for (int i = 0; i < monthThree; i++) {
            list.add(DateUtil.addMonthToDate(date,i*3));
            list.add(DateUtil.addMonthToDate(startDate,i*3));
        }
        if(restMonth>0 || monthDays>0){
            list.add(DateUtil.addDaysToDate(date,monthThree));
            list.add(DateUtil.addMonthToDate(startDate,monthThree*3));
        }
        return list;
    }
@@ -667,30 +746,36 @@
    }

    private void dealCircleDateBillBiz(  List<Date> dateList ,YwContract model, YwContractDetail d, Date freeStart, Date freeEnd, List<YwContractBill> list ) {
        int temp = 0;
        for(Date start : dateList){
            Date end = DateUtil.addDaysToDate(DateUtil.addYearToDate(start,1),-1);//结束日期为下一个周期的前一天
            if(end.getTime()> d.getEndDate().getTime() ){
                end = d.getEndDate();
            Date end = d.getEndDate();
            if(temp+1 < dateList.size()){
                end =DateUtil.addDaysToDate(dateList.get(temp+1),-1);
            }
            temp++;
            YwContractBill bill = initCreateBillModel(model,d );
            bill.setStartDate(start);//账单开始
            bill.setEndDate(end);//账单结束
            bill.setPlanPayDate(DateUtil.addDaysToDate(d.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1));
            BigDecimal totalFee =getTotalFeeByStartEnd(model,d,freeStart,freeEnd);
            Date planPayDate = DateUtil.addDaysToDate(bill.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1);
            bill.setPlanPayDate(planPayDate.getTime()>System.currentTimeMillis()?planPayDate:new Date());
            BigDecimal totalFee =getTotalFeeByStartEnd(model,d,bill,freeStart,freeEnd);
            bill.setTotleFee(totalFee);
            bill.setReceivableFee(totalFee);
            bill.setBillType(Constants.ZERO);


            bill.setCompanyId(model.getCompanyId());
            list.add(bill);
        }
    }



    private BigDecimal getTotalFeeByStartEnd(YwContract model, YwContractDetail d,Date freeStart,Date freeEnd) {
    private BigDecimal getTotalFeeByStartEnd(YwContract model, YwContractDetail d, YwContractBill bill,Date freeStart,Date freeEnd) {
        BigDecimal totalFee = new BigDecimal(0);
        DateCompare dateCompare =   DateCompare.dayCompare(d.getStartDate(),d.getEndDate(),freeStart,freeEnd);
        DateCompare dateCompare =   DateCompare.dayCompare(bill.getStartDate(),DateUtil.addDaysToDate(bill.getEndDate(),1),freeStart,DateUtil.addDaysToDate(freeEnd,1));
        if(Constants.equalsInteger(d.getCircleType(),Constants.ZERO)){
            //0=元每平米天
            int days = dateCompare.getDay();
            int days = dateCompare.getDay() ;
            BigDecimal areas = getAreasNumBYRooms(model.getRoomList());
            totalFee = new BigDecimal(days).multiply(areas).multiply(Constants.formatBigdecimal(d.getPrice()));//总价格
        }else  if(Constants.equalsInteger(d.getCircleType(),Constants.ONE)){
@@ -705,7 +790,7 @@
            totalFee = year.multiply(areas).multiply(Constants.formatBigdecimal(d.getPrice()));//总价格
        }else  if(Constants.equalsInteger(d.getCircleType(),Constants.THREE)){
            //3=元每天
            int days = dateCompare.getDay();
            int days = dateCompare.getDay() ;
            totalFee = new BigDecimal(days).multiply(Constants.formatBigdecimal(d.getPrice()));//总价格
        }else  if(Constants.equalsInteger(d.getCircleType(),Constants.FOUR)){
            //4=元每月
@@ -733,13 +818,12 @@
        DateCompare dateCompare =   DateCompare.monthYearCompare(startDate, endDate );
        int years = dateCompare.getYear();
        int yeardays = dateCompare.getYearDays();
        Date date = new Date();
        List<Date> list = new ArrayList<>();
        for (int i = 0; i < years; i++) {
            list.add(DateUtil.addYearToDate(date,i));
            list.add(DateUtil.addYearToDate(startDate,i));
        }
        if(yeardays>0){
            list.add(DateUtil.addYearToDate(date,years));
            list.add(DateUtil.addYearToDate(startDate,years));
        }
        return list;
    }
@@ -757,8 +841,10 @@
            YwContractBill bill = initCreateBillModel(model,d);
            bill.setStartDate(d.getStartDate());//账单开始
            bill.setEndDate(d.getEndDate());//账单结束
            bill.setPlanPayDate(DateUtil.addDaysToDate(d.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1));
            bill.setTotleFee(getTotalFeeByStartEnd(model,d,freeStart,freeEnd));
            bill.setPlanPayDate(DateUtil.addDaysToDate(bill.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1));
            bill.setTotleFee(getTotalFeeByStartEnd(model,d,bill,freeStart,freeEnd));
            bill.setReceivableFee(bill.getTotleFee());
            bill.setBillType(Constants.ZERO);
            list.add(bill);
        }
        return list;
@@ -774,6 +860,7 @@
        bill.setIsdeleted(Constants.ZERO);
        bill.setContractId(model.getId());
        bill.setStatus(Constants.ZERO);
        bill.setPayStatus(Constants.ZERO);
        bill.setDetailId(d.getId());
        bill.setCostType(d.getType());
        bill.setType(Constants.ZERO);
@@ -783,15 +870,21 @@

    private BigDecimal getAreasNumBYRooms(List<YwRoom> roomList) {
        BigDecimal data= new BigDecimal(0);
        for(YwRoom r :roomList){
            data = data.add(Constants.formatBigdecimal(r.getArea()));
        if(roomList!=null){
            for(YwRoom r :roomList){
                data = data.add(Constants.formatBigdecimal(r.getArea()));
            }
        }

        return  data;
    }

    private void initFiles(YwContract model) {
        List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
                .eq(Multifile::getObjId, model.getId() )
        List<Multifile> multifiles = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>()
                .selectAll(Multifile.class)
                .selectAs(SystemUser::getRealname,Multifile::getUserName)
                .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
                .eq(Multifile::getObjId,model.getId())
                .in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.YW_CONTRACT_FILE.getKey()}))
                .eq(Multifile::getIsdeleted,Constants.ZERO));
        if(multifiles!=null){
@@ -857,9 +950,8 @@

            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，合同有效期结束时间不得早于开始时间！");
        }

        if(Constants.equalsInteger(model.getType(),Constants.ZERO )
                || Constants.equalsInteger(model.getType(),Constants.ONE)){
                || Constants.equalsInteger(model.getType(),Constants.TWO)){
            if(  model.getZlDeposit() == null
                    ||model.getZlPayType() == null
                    || model.getZlPayType()>3
@@ -868,12 +960,18 @@
                    ||model.getZlDetailList().size() ==0){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请按页面要求填写租赁条款信息");
            }

            if(!(model.getZlFreeEndDate()==null &&  model.getZlFreeStartDate()==null) && (
                        (model.getZlFreeEndDate()!=null &&  model.getZlFreeStartDate()==null)
                        ||(model.getZlFreeEndDate()==null &&  model.getZlFreeStartDate()!=null)
                        ||model.getZlFreeEndDate().getTime()<= model.getZlFreeStartDate().getTime())
                  ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请选择正确的租赁条款免租期信息！");
            }
            if((model.getZlFreeStartDate()!=null && model.getZlFreeEndDate()!=null)
                    && (model.getZlFreeEndDate().getTime()>model.getEndDate().getTime()
                    || model.getZlFreeStartDate().getTime()<model.getStartDate().getTime())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，免租期开始日期和结束日期限制在合同时间范围内！");
            }
            for(YwContractDetail d :model.getZlDetailList()){
                if(  d.getStartDate() == null
@@ -888,6 +986,9 @@
                if(d.getEndDate().getTime()<= d.getStartDate().getTime()){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，租赁条款有效期结束时间不得早于开始时间！");
                }
                if(d.getEndDate().getTime()>model.getEndDate().getTime() ||d.getStartDate().getTime()<model.getStartDate().getTime()){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，条款开始日期和结束日期限制在合同时间范围内！");
                }
                if(!Constants.equalsInteger(model.getWyPayType(),Constants.ZERO) &&
                        Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，租赁条款只有选择一次性付款时，才能选择该按每场收费；");
@@ -899,7 +1000,7 @@
            }
        }
        if(Constants.equalsInteger(model.getType(),Constants.ZERO )
                || Constants.equalsInteger(model.getType(),Constants.TWO)){
                || Constants.equalsInteger(model.getType(),Constants.ONE)){
            if(  model.getWyDeposit() == null
                    ||model.getWyPayType() == null
                    || model.getWyPayType()>3
@@ -909,15 +1010,21 @@
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请按页面要求填写物业条款信息");
            }

            if(!(model.getWyFreeEndDate()==null &&  model.getWyFreeStartDate()==null) && (
                    (model.getWyFreeEndDate()!=null &&  model.getWyFreeStartDate()==null)
                            ||(model.getWyFreeEndDate()==null &&  model.getWyFreeStartDate()!=null)
                            ||model.getWyFreeEndDate().getTime()<= model.getWyFreeStartDate().getTime())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请选择正确的物业条款免租期信息！");
            }
            if((model.getWyFreeStartDate()!=null && model.getWyFreeEndDate()!=null)
                    && (model.getWyFreeEndDate().getTime()>model.getEndDate().getTime()
                    || model.getWyFreeStartDate().getTime()<model.getStartDate().getTime())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，免租期开始日期和结束日期限制在合同时间范围内！");
            }
            for(YwContractDetail d :model.getWyDetailList()){
                if(  d.getStartDate() == null
                        ||d.getEditDate() == null
                        ||d.getEndDate() == null
                        ||d.getPrice() == null
                        ||d.getCircleType() == null
                        || d.getCircleType()>6
@@ -927,6 +1034,9 @@
                }
                if(d.getEndDate().getTime()<= d.getStartDate().getTime()){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，物业条款有效期结束时间不得早于开始时间！");
                }
                if(d.getEndDate().getTime()>model.getEndDate().getTime() ||d.getStartDate().getTime()<model.getStartDate().getTime()){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，条款开始日期和结束日期限制在合同时间范围内！");
                }
                if(!Constants.equalsInteger(model.getWyPayType(),Constants.ZERO) &&
                        Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
@@ -940,7 +1050,7 @@
            }
        }

        YwProject project = projectMapper.selectById(model.getCompanyId());
        YwProject project = projectMapper.selectById(model.getProjectId());
        if(project ==null || Constants.equalsInteger(project.getIsdeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，请选择正确的项目信息！");
        }
@@ -958,6 +1068,7 @@
        for(YwRoom r : rooms){
            model.setTotalArea(model.getTotalArea().add(Constants.formatBigdecimal(r.getArea())));
        }
        model.setRoomList(rooms);
        YwCustomer customer = customerMapper.selectById(model.getRenterId());
        if(customer ==null || Constants.equalsInteger(customer.getIsdeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，选择租客信息不存在，请返回刷新重试！");
@@ -1026,6 +1137,7 @@
        log.setObjType(type.getKey());
        log.setParam1(param1);
        log.setParam2(param2);
        log.setContent(param2);
        log.setTitle(type.getNoteinfo());
        ywWorkorderLogMapper.insert(log);
    }
@@ -1037,12 +1149,14 @@
                .selectAs(SystemUser::getRealname,YwContract::getUserName )
                .selectAs(YwCustomer::getName,YwContract::getRenterName )
                .selectAs(YwProject::getName,YwContract::getProjectName )
                .select("t4.realname",YwContract::getCreatorName )
                .select("t3.realname",YwContract::getCreatorName )
                .select("(select sum(r.area) from yw_contract_room cr left join yw_room r on r.id = cr.room_id where r.isdeleted=0 and cr.contract_id =t.id)",YwContract::getTotalArea )
                .leftJoin(Company.class,Company::getId,YwContract::getCompanyId)
                .leftJoin(SystemUser.class,SystemUser::getId,YwContract::getUserId)
                .leftJoin(SystemUser.class,SystemUser::getId,YwContract::getCreator)
                .leftJoin(YwProject.class,YwProject::getId,YwContract::getProjectId)
                .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId);
                .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
                .eq( YwContract::getId,id);
        YwContract model = ywContractMapper.selectJoinOne(YwContract.class,queryWrapper);
        if(model != null){
            //合同附件
@@ -1057,7 +1171,7 @@
                    .leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
                    .leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor)
                    .eq(YwRoom::getIsdeleted,Constants.ZERO)
                    .exists("(select a.id from yw_contract_room a where a.isdeleted=1 and a.room_id=t.id and a.contract_id="+model.getId()+")");
                    .exists("(select a.id from yw_contract_room a where a.isdeleted=0 and a.type=0 and a.room_id=t.id and a.contract_id="+model.getId()+")");
            model.setRoomList(roomMapper.selectJoinList(YwRoom.class,rw));
            model.setWyFirstCircleStr(Constants.getUnitTypeByNum(model.getWyFirstCircle()));
            model.setZlFirstCircleStr(Constants.getUnitTypeByNum(model.getZlFirstCircle()));
@@ -1146,8 +1260,10 @@
        MPJLambdaWrapper<YwContract> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(YwContract.class )
                .selectAs(Company::getName,YwContract::getCompanyName )
                .selectAs(YwCustomer::getName,YwContract::getRenterName )
                .select("(select sum(r.area) from yw_contract_room cr left join yw_room r on r.id = cr.room_id where r.isdeleted=0 and cr.contract_id =t.id)",YwContract::getTotalArea )
                .leftJoin(Company.class,Company::getId,YwContract::getCompanyId);
                .leftJoin(Company.class,Company::getId,YwContract::getCompanyId)
                .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId);
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.eq(YwContract::getId, pageWrap.getModel().getId());

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

@@ -7,6 +7,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwDeviceMapper;
import com.doumee.dao.business.model.Category;
@@ -86,7 +87,7 @@
    @Override
    public void deleteById(Integer id, LoginUserInfo user) {
        ywDeviceMapper.update(new UpdateWrapper<YwDevice>().lambda().set(YwDevice::getIsdeleted,Constants.ONE)
                .set(YwDevice::getEditDate," now() ")
                .set(YwDevice::getEditDate, DateUtil.getCurrDateTime())
                .set(YwDevice::getEditor,user.getId())
                .eq(YwDevice::getId,user.getId())
        );

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

@@ -65,6 +65,7 @@
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"巡检点配置错误");
            }
            ywLinePoint.setId(null);
            ywLinePoint.setCreateDate(new Date());
            ywLinePoint.setCreator(loginUserInfo.getId());
            ywLinePoint.setIsdeleted(Constants.ZERO);
@@ -117,6 +118,7 @@
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"巡检点配置错误");
            }
            ywLinePoint.setId(null);
            ywLinePoint.setLineId(ywPatrolLine.getId());
            ywLinePoint.setCreateDate(new Date());
            ywLinePoint.setCreator(loginUserInfo.getId());

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

@@ -7,6 +7,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwPatrolPointMapper;
import com.doumee.dao.business.model.Category;
@@ -82,7 +83,7 @@
    @Override
    public void deleteById(Integer id, LoginUserInfo user) {
        ywPatrolPointMapper.update(new UpdateWrapper<YwPatrolPoint>().lambda().set(YwPatrolPoint::getIsdeleted,Constants.ONE)
                .set(YwPatrolPoint::getEditDate," now() ")
                .set(YwPatrolPoint::getEditDate, DateUtil.getCurrDateTime())
                .set(YwPatrolPoint::getEditor,user.getId())
                .eq(YwPatrolPoint::getId,user.getId())
        );