bug修改

xuhy

2025-07-02 0f7254953cf629f4a6cbbf18c39292b5984d2b71

bug修改

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

@@ -38,6 +38,7 @@
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
@@ -164,45 +165,47 @@
                }
            }
            TTemplate tTemplate = templates.stream().filter(e -> e.getId().equals(record.getTemplateId())).findFirst().orElse(null);
            // todo 应生成计划数
            record.setNum1(1);
            LocalDateTime createTime = tTemplate.getCreateTime();
            // 转化为yyyy-MM-dd字符串
            StringBuilder stringBuilder = new StringBuilder();
            stringBuilder.append(createTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))).append(" 至 ");
            List<TTemplateDetail> tTemplateDetail = templateDetails.stream().filter(e -> e.getTemplateId().equals(record.getTemplateId())).collect(Collectors.toList());
            int temp = 0;
            if (!tTemplateDetail.isEmpty()) {
                for (TTemplateDetail templateDetail : tTemplateDetail) {
                    Integer cycle = templateDetail.getCycle();
                    Integer cycleType = templateDetail.getCycleType();
                    switch (cycleType) {
                        case 1:
                            temp = cycle;
                            break;
                        case 2:
                            temp = cycle * 7;
            if(Objects.nonNull(tTemplate)){
                // todo 应生成计划数
                LocalDateTime createTime = tTemplate.getCreateTime();
                // 转化为yyyy-MM-dd字符串
                StringBuilder stringBuilder = new StringBuilder();
                stringBuilder.append(createTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))).append(" 至 ");
                List<TTemplateDetail> tTemplateDetail = templateDetails.stream().filter(e -> e.getTemplateId().equals(record.getTemplateId())).collect(Collectors.toList());
                int temp = 0;
                if (!tTemplateDetail.isEmpty()) {
                    for (TTemplateDetail templateDetail : tTemplateDetail) {
                        Integer cycle = templateDetail.getCycle();
                        Integer cycleType = templateDetail.getCycleType();
                        switch (cycleType) {
                            case 1:
                                temp = cycle;
                                break;
                            case 2:
                                temp = cycle * 7;

                            break;
                        case 3:
                            temp = cycle * 30;
                            break;
                        case 4:
                            temp = cycle * 90;
                            break;
                        case 5:
                            temp = cycle * 365;
                            break;
                                break;
                            case 3:
                                temp = cycle * 30;
                                break;
                            case 4:
                                temp = cycle * 90;
                                break;
                            case 5:
                                temp = cycle * 365;
                                break;
                        }
                    }
                    LocalDateTime localDateTime = tTemplate.getCreateTime().plusDays(temp);
                    stringBuilder.append(localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
                    record.setTemplateDate(stringBuilder.toString());
                }
                LocalDateTime localDateTime = tTemplate.getCreateTime().plusDays(temp);
                stringBuilder.append(localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
                record.setTemplateDate(stringBuilder.toString());
                if (record.getNum2() != 0) {
                    record.setNum4(new BigDecimal((double) record.getNum2() / (double) record.getNum1() * 100).setScale(2, RoundingMode.HALF_DOWN));
                } else {
                    record.setNum4(new BigDecimal(0));
                }
            }
            if (record.getNum2() != 0) {
                record.setNum4(new BigDecimal((double) record.getNum2() / (double) record.getNum1() * 100).setScale(2, RoundingMode.HALF_DOWN));
            } else {
                record.setNum4(new BigDecimal(0));
            }
            String templateId = record.getTemplateId();
            Long count = leaveService.lambdaQuery()

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

@@ -65,7 +65,7 @@
            leaveListVO.setLeaveTime(start+"至"+end);
            if (leaveListVO.getDeptType() == 1){
                TProjectDept tProjectDept = projectDeptMapper.selectById(leaveListVO.getDeptId());
                if (!tProjectDept.getParentId().equals("0")){
                if (!"0".equals(tProjectDept.getParentId())){
                    TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
                    leaveListVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
                }else{

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

@@ -23,5 +23,5 @@
    @ApiModelProperty("部门类型 前端忽略")
    private Integer deptType;
    @ApiModelProperty("部门id 前端忽略")
    private Integer deptId;
    private String deptId;
}

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

@@ -27,7 +27,7 @@
        select t1.*,t2.location_name as locationName,t3.location_name as locationTypeName,
        t4.nick_name as patrolInspectorName,
        t4.phonenumber as phonenumber,
        t3.location_type_icon as locationTypeIcon
        t3.location_icon as locationTypeIcon
        from t_appeal t1
        left join t_task t5 on t5.id  = t1.task_id
        left join sys_user t4 on t5.patrol_inspector = t4.user_id

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

@@ -29,9 +29,9 @@
        , create_time, update_time, create_by, update_by, disabled, leave_person, start_time, end_time, leave_type, leave_day, leave_cause, pictures, audit_status, audit_id, audit_time, audit_remark
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.system.LeaveListVO">
        select t1.*, t2.nick_name as nickName, t2.phonenumber as phone,t2.deptType
        select t1.*, t2.nick_name as nickName, t2.phonenumber as phone,t2.deptType,t2.deptId
        from t_leave t1
                 left join sys_user t2 on t1.leave_person = t2.id
                 left join sys_user t2 on t1.leave_person = t2.user_id
        where
            t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        <if test="query.nickName != null and query.nickName != ''">