ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java

@@ -324,6 +324,15 @@
    @PostMapping(value = "/confirmSettlement")
    public R<Boolean> confirmSettlement(String id) {
        TContract contract = contractService.getById(id);

        // 查询验收记录
        long count = checkAcceptRecordService.count(Wrappers.lambdaQuery(TCheckAcceptRecord.class)
                .eq(TCheckAcceptRecord::getStatus,1)
                .eq(TCheckAcceptRecord::getContractId, id));
        if (count == 0) {
            return R.fail("请先完成验收");
        }

        contract.setStatus("8");
        contractService.updateById(contract);
        // 将所有未缴费账单设置未已失效
@@ -553,13 +562,17 @@
    private BigDecimal extracted(TContract contract,TContractDTO dto) {
        TContractRentType tContractRentType = null;
        if (contract.getIsIncreasing()){
            tContractRentType = new TContractRentType();
            tContractRentType.setContractId(contract.getId());
            tContractRentType.setIncreasingDecreasing(dto.getIncreasingDecreasing());
            tContractRentType.setIncreasingDecreasingType(dto.getIncreasingDecreasingType());
            tContractRentType.setNumericalValue(dto.getNumericalValue());
            tContractRentType.setChangeTime(dto.getChangeTime());
            tContractRentType.setCycleTime(dto.getCycleTime());
            tContractRentType = contractRentTypeService.lambdaQuery().eq(TContractRentType::getContractId, contract.getId())
                    .last("limit 1").one();
            if (tContractRentType==null){
                tContractRentType = new TContractRentType();
                tContractRentType.setContractId(contract.getId());
                tContractRentType.setIncreasingDecreasing(dto.getIncreasingDecreasing());
                tContractRentType.setIncreasingDecreasingType(dto.getIncreasingDecreasingType());
                tContractRentType.setNumericalValue(dto.getNumericalValue());
                tContractRentType.setChangeTime(dto.getChangeTime());
                tContractRentType.setCycleTime(dto.getCycleTime());
            }
        }
        // 生成第一笔账单
        // 第一次应缴费日期

 ruoyi-applet/src/main/resources/application-prod.yml

@@ -221,10 +221,10 @@
  client:
    accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
    secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
    bucket: xzgttest-1305134071
    bucket: xzgt-1305134071
    bucketAddr: ap-chengdu
    rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
    location: xizang
    rootSrc: https://xzgt-1305134071.cos.ap-chengdu.myqcloud.com
    location: /xizang
sms:
  enable: true
  appId: 1400957506

 ruoyi-system/src/main/java/com/ruoyi/system/dto/TContractDTO.java

@@ -21,9 +21,7 @@
    @ApiModelProperty(value = "数值")
    private BigDecimal numericalValue;

    @ApiModelProperty(value = "递增或递减时点")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime changeTime;

    @ApiModelProperty(value = "周期 单位年")
    private Integer cycleTime;
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java

@@ -37,6 +37,7 @@
import com.ruoyi.system.bo.*;
import com.ruoyi.system.mapper.StateProcessTemplateMapper;
import com.ruoyi.system.mapper.TContractMapper;
import com.ruoyi.system.mapper.TContractRentTypeMapper;
import com.ruoyi.system.model.*;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.ProcessDetailVO;
@@ -85,6 +86,8 @@
    private ISysUserService sysUserService;
    @Autowired
    private TContractMapper contractMapper;
    @Autowired
    private TContractRentTypeMapper contractRentTypeMapper;

    /**
     * 流程模版分页
@@ -1301,6 +1304,12 @@
        }
        BeanUtil.copyProperties(contract, processDetailVO);

        // 查询递增递减
        TContractRentType tContractRentType = contractRentTypeMapper.selectOne(Wrappers.lambdaQuery(TContractRentType.class)
                .eq(TContractRentType::getContractId, contract.getId())
                .last("LIMIT 1"));
        processDetailVO.setContractRentType(tContractRentType);

        // 查询历史任务
        List<FlwHisTask> flwHisTasks = flwHisTaskMapper.selectList(Wrappers.<FlwHisTask>lambdaQuery().eq(FlwHisTask::getInstanceId, instanceId));
        processDetailVO.setInstanceId(String.valueOf(instanceId));

 ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessDetailVO.java

@@ -3,6 +3,7 @@
import com.aizuda.bpm.engine.entity.FlwHisTask;
import com.ruoyi.system.model.StateProcessInstanceAction;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.TContractRentType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,4 +19,7 @@
    @ApiModelProperty(value = "历史任务")
    private List<FlwHisTask> flwHisTasks;

    @ApiModelProperty(value = "合同递增递减")
    private TContractRentType contractRentType;

}

 ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml

@@ -342,6 +342,7 @@
                </foreach>
            </if>
            AND b.bill_type = 3
            AND b.pay_fees_status != 3
        </where>
    </select>
    <select id="getStreetRentRank" resultType="com.ruoyi.system.vo.ScreenRentRankVO">