Merge remote-tracking branch 'origin/master'

linwe

2023-11-09 f9a3f18dc49f4d1317b8cb4f04d53d268bd90bbf

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java

@@ -150,5 +150,4 @@
    @TableLogic
    @ApiModelProperty("是否已删除 0:否  1:是")
    private Integer isDeleted;

}

 src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml

@@ -10,6 +10,9 @@
        <if test="placeExt.placeName != null and placeExt.placeName != ''">
            and jp.place_name like concat('%',#{placeExt.placeName},'%')
        </if>
        <if test="placeExt.houseCode != null and placeExt.houseCode != ''">
            and jp.house_code = #{placeExt.houseCode}
        </if>
        <if test="placeExt.confirmFlag != null">
            and jpe.confirm_flag = #{placeExt.confirmFlag}
        </if>

 src/main/java/org/springblade/modules/place/service/IPlaceExtService.java

@@ -52,4 +52,11 @@
     * @return
     */
    boolean checkPlaceExt(PlaceExtEntity placeExt);

    /**
     * 场所详情表 新增
     * @param placeExt
     * @return
     */
    boolean savePlaceExt(PlaceExtEntity placeExt);
}

 src/main/java/org/springblade/modules/place/service/IPlacePoiLabelService.java

@@ -1,8 +1,8 @@
package org.springblade.modules.place.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.entity.PlacePoiLabel;

public interface IPlacePoiLabelService extends IService<PlacePoiLabel> {

}

 src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java

@@ -18,7 +18,9 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceExtVO;
import org.springblade.modules.place.mapper.PlaceExtMapper;
import org.springblade.modules.place.service.IPlaceExtService;
@@ -43,6 +45,9 @@

    @Autowired
    private ITaskService taskService;

    @Autowired
    private IPlaceService placeService;

    /**
     * 自定义查询
@@ -92,4 +97,33 @@
        // 返回
        return flag;
    }

    /**
     * 场所详情表 新增
     * @param placeExt
     * @return
     */
    @Override
    public boolean savePlaceExt(PlaceExtEntity placeExt) {
        PlaceEntity placeEntity = placeService.getById(placeExt.getPlaceId());
        TaskEntity taskEntity = new TaskEntity();
        taskEntity.setId(placeExt.getTaskId());
        taskEntity.setStatus(placeExt.getConfirmFlag());
        taskEntity.setType(1);
        taskEntity.setFrequency(3);
        taskEntity.setName(placeEntity.getPlaceName() + "信息完善任务" + System.currentTimeMillis());
        // 新增任务
        boolean save = taskService.save(taskEntity);
        if (save){
            placeExt.setTaskId(taskEntity.getId());
            placeExt.setConfirmFlag(1);
            placeExt.setCreateTime(new Date());
            placeExt.setUpdateTime(new Date());
            placeExt.setCreateUser(AuthUtil.getUserId());
            placeExt.setUpdateUser(AuthUtil.getUserId());
            // 新增场所详情
            save(placeExt);
        }
        return false;
    }
}

 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java

@@ -22,13 +22,16 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.entity.PlacePoiLabel;
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlacePoiLabelService;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
@@ -44,10 +47,15 @@
 * @since 2023-10-28
 */
@Service
@AllArgsConstructor
public class PlaceServiceImpl extends ServiceImpl<PlaceMapper, PlaceEntity> implements IPlaceService {
    private final IUserService userService;
    private final IPlacePoiLabelService placePoiLabelService;
    @Autowired
    private IUserService userService;

    @Autowired
    private IPlacePoiLabelService placePoiLabelService;

    @Autowired
    private IPlaceExtService placeExtService;

    @Override
    public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
@@ -136,7 +144,10 @@

                // 用户插入后同时给场所详情表插入一条该场所信息
                if (submit){

                    PlaceExtEntity placeExtEntity = new PlaceExtEntity();
                    placeExtEntity.setPlaceId(placeVO.getId());
                    //新增
                    placeExtService.savePlaceExt(placeExtEntity);
                }
            }
        }

 src/main/java/org/springblade/modules/place/vo/PlaceExtVO.java

@@ -37,4 +37,9 @@
     */
    private String placeName;

    /**
     * 地址编码
     */
    private String houseCode;

}

 src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java

@@ -89,7 +89,7 @@
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入taskReportForRepairs")
    public R save(@Valid @RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
        return R.status(taskReportForRepairsService.save(taskReportForRepairs));
        return R.status(taskReportForRepairsService.saveTaskReportForRepairs(taskReportForRepairs));
    }

    /**
@@ -100,6 +100,25 @@
    @ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
    public R update(@Valid @RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
        return R.status(taskReportForRepairsService.updateById(taskReportForRepairs));
    }

    /**
     * 报事报修任务表 自定义修改
     */
    @PostMapping("/updateTaskReportForRepairs")
    @ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
    public R updateTaskReportForRepairs(@RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
        return R.status(taskReportForRepairsService.updateTaskReportForRepairs(taskReportForRepairs));
    }

    /**
     * 报事报修任务表 审核
     */
    @PostMapping("/checkReportForRepairs")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
    public R checkReportForRepairs(@RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
        return R.status(taskReportForRepairsService.checkReportForRepairs(taskReportForRepairs));
    }

    /**
@@ -122,6 +141,10 @@
        return R.status(taskReportForRepairsService.deleteLogic(Func.toLongList(ids)));
    }

    /**
     * 查询报事报修统计
     * @return
     */
    @GetMapping("/getStatisticsCount")
    public R statisticsCount(){
        return R.data(taskReportForRepairsService.getStatisticsCount());

 src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java

@@ -17,6 +17,9 @@
package org.springblade.modules.task.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +27,8 @@
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;
import sun.rmi.runtime.Log;

/**
 * 报事报修任务表 实体类
@@ -38,10 +43,23 @@
public class TaskReportForRepairsEntity extends BaseEntity {

    /**
     * 类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报
     * 类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报,5企业商户上报
     */
    @ApiModelProperty(value = "类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报")
    @ApiModelProperty(value = "类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报,5企业商户上报")
    private Integer type;

    /**
     * 任务id
     */
    @ApiModelProperty(value = "任务id")
    private Long taskId;

    /**
     * 门牌地址编码
     */
    @ApiModelProperty(value = "门牌地址编码")
    private String addressCode;

    /**
     * 姓名
     */
@@ -62,4 +80,28 @@
     */
    @ApiModelProperty(value = "图片路径")
    private String imageUrls;

    /**
     * 确认用户ID
     */
    @ApiModelProperty(value = "确认用户ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long confirmUserId;
    /**
     * 确认时间
     */
    @ApiModelProperty(value = "确认时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date confirmTime;
    /**
     * 确认标记  1：待处理  2：处理中  3：已处理
     */
    @ApiModelProperty(value = "确认标记  1：待处理  2：处理中  3：已处理")
    private Integer confirmFlag;
    /**
     * 确认意见
     */
    @ApiModelProperty(value = "确认意见")
    private String confirmNotion;
}

 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java

@@ -44,5 +44,10 @@
    List<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage page,@Param("vo") TaskReportForRepairsVO taskReportForRepairs);


    TaskReportStatistics getStatisticsCount();
    /**
     * 查询报事报修统计
     * @param userId
     * @return
     */
    TaskReportStatistics getStatisticsCount(@Param("userId") Long userId);
}

 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml

@@ -17,25 +17,40 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>


    <select id="selectTaskReportForRepairsPage" resultMap="taskReportForRepairsResultMap">
        select * from jczz_task_report_for_repairs where is_deleted = 0
    <!--自定义分页查询-->
    <select id="selectTaskReportForRepairsPage" resultType="org.springblade.modules.task.vo.TaskReportForRepairsVO">
        select
        jtrfr.*,
        jda.address_name as addressName
        from jczz_task_report_for_repairs jtrfr
        left join jczz_doorplate_address jda on jda.address_code = jtrfr.address_code
        where jtrfr.is_deleted = 0
        <if test="vo.createUser != null and vo.createUser != ''">
            AND create_user = #{vo.createUser}
            AND jtrfr.create_user = #{vo.createUser}
        </if>
        <if test="vo.type != null and vo.type != ''">
            AND type = #{vo.type}
        <if test="vo.type != null">
            AND jtrfr.type = #{vo.type}
        </if>
        ORDER BY create_time DESC
        <if test="vo.realName != null and vo.realName != ''">
            AND jtrfr.real_name like concat('%',#{vo.realName},'%')
        </if>
        <if test="vo.phone != null and vo.phone != ''">
            AND jtrfr.phone like concat('%',#{vo.phone},'%')
        </if>
        <if test="vo.confirmFlag != null">
            AND jtrfr.confirm_flag = #{vo.confirmFlag}
        </if>
        ORDER BY jtrfr.create_time DESC
    </select>
    <select id="getStatisticsCount" resultType="org.springblade.modules.task.vo.TaskReportStatistics">
        SELECT
            COUNT( 1 ) AS total,
            SUM( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END ) AS handle
        FROM
            jczz_task_report_for_repairs
        WHERE
            is_deleted = 0
            ifnull(SUM( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END ),0) AS handle
        FROM jczz_task_report_for_repairs
        WHERE is_deleted = 0
        <if test="userId != null">
            and create_user = #{userId}
        </if>
    </select>



 src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java

@@ -39,6 +39,30 @@
     */
    IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs);


    /**
     * 查询报事报修统计
     * @return
     */
    TaskReportStatistics getStatisticsCount();

    /**
     * 报事报修任务表 新增
     * @param taskReportForRepairs
     * @return
     */
    boolean saveTaskReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs);

    /**
     * 报事报修任务表 自定义修改
     * @param taskReportForRepairs
     * @return
     */
    boolean updateTaskReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs);

    /**
     * 报事报修任务表 审核
     * @param taskReportForRepairs
     * @return
     */
    boolean checkReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs);
}

 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java

@@ -16,14 +16,20 @@
 */
package org.springblade.modules.task.service.impl;

import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.mapper.TaskReportForRepairsMapper;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.task.vo.TaskReportStatistics;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.Date;

/**
 * 报事报修任务表 服务实现类
@@ -34,15 +40,87 @@
@Service
public class TaskReportForRepairsServiceImpl extends BaseServiceImpl<TaskReportForRepairsMapper, TaskReportForRepairsEntity> implements ITaskReportForRepairsService {

    @Autowired
    private ITaskService taskService;

    /**
     * 自定义分页
     *
     * @param page
     * @param taskReportForRepairs
     * @return
     */
    @Override
    public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
        return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs));
    }

    /**
     * 查询报事报修统计
     * @return
     */
    @Override
    public TaskReportStatistics getStatisticsCount() {
        return baseMapper.getStatisticsCount();
        return baseMapper.getStatisticsCount(AuthUtil.getUserId());
    }

    /**
     * 报事报修任务表 新增
     * @param taskReportForRepairs
     * @return
     */
    @Override
    public boolean saveTaskReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
        boolean flag = false;
        // 任务新增
        TaskEntity taskEntity = new TaskEntity();
        taskEntity.setName("报事报修"+ System.currentTimeMillis());
        taskEntity.setStatus(1);
        taskEntity.setType(1);
        taskEntity.setFrequency(3);
        // 新增
        boolean save = taskService.save(taskEntity);
        if (save){
            taskReportForRepairs.setTaskId(taskEntity.getId());
            flag = save(taskReportForRepairs);
        }
        return flag;
    }

    /**
     * 报事报修任务表 自定义修改
     * @param taskReportForRepairs
     * @return
     */
    @Override
    public boolean updateTaskReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
        // 设置参数
        taskReportForRepairs.setUpdateTime(new Date());
        taskReportForRepairs.setUpdateUser(AuthUtil.getUserId());
        // 更新
        return updateById(taskReportForRepairs);
    }

    /**
     * 报事报修任务表 审核
     * @param taskReportForRepairs
     * @return
     */
    @Override
    public boolean checkReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
        boolean flag = false;
        // 设置更新时间
        taskReportForRepairs.setConfirmTime(new Date());
        // 更新数据
        boolean b = updateById(taskReportForRepairs);
        if (b) {
            // 更新任务表状态
            TaskEntity taskEntity = new TaskEntity();
            taskEntity.setId(taskReportForRepairs.getTaskId());
            taskEntity.setStatus(taskReportForRepairs.getConfirmFlag());
            flag = taskService.updateById(taskEntity);
        }
        // 返回
        return flag;
    }
}

 src/main/java/org/springblade/modules/task/vo/TaskReportForRepairsVO.java

@@ -32,4 +32,9 @@
public class TaskReportForRepairsVO extends TaskReportForRepairsEntity {
    private static final long serialVersionUID = 1L;

    /**
     * 地址名称
     */
    private String addressName;

}

 src/main/resources/application.yml

@@ -46,6 +46,8 @@
        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
        session-stat-enable: true
        session-stat-max-count: 10
  main:
    allow-circular-references: true

# mybatis
mybatis-plus:
@@ -201,7 +203,12 @@
    #接口放行
    skip-url:
      - /blade-test/**
      - /blade-doorplateAddress/doorplateAddress/**
#      - /blade-doorplateAddress/doorplateAddress/**
      - /blade-house/house/**
      - /blade-label/label/**
      - /blade-houseRental/houseRental/**
      - /blade-resource/oss/**
      - /blade-place/**
    #授权认证配置
    auth:
      - method: ALL