居住证申请

lin

2024-03-14 d2ef8745f1370566fdca904726df21103bf36ed5

居住证申请

 src/main/java/org/springblade/modules/checkInRecords/service/impl/CheckInRecordsServiceImpl.java

@@ -19,24 +19,16 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.checkInRecords.dto.CheckInRecordsDTO;
import org.springblade.modules.checkInRecords.entity.CheckInRecordsEntity;
import org.springblade.modules.checkInRecords.vo.CheckInRecordsVO;
import org.springblade.modules.checkInRecords.mapper.CheckInRecordsMapper;
import org.springblade.modules.checkInRecords.service.ICheckInRecordsService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * 打卡记录表 服务实现类

 src/main/java/org/springblade/modules/develop/controller/CodeController.java

@@ -90,7 +90,7 @@
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入code")
    public R<IPage<Code>> list(@ApiIgnore @RequestParam Map<String, Object> code, Query query) {
        IPage<Code> pages = codeService.page(Condition.getPage(query), Condition.getQueryWrapper(code, Code.class));
        IPage<Code> pages = codeService.page(Condition.getPage(query), Condition.getQueryWrapper(code, Code.class).orderByDesc("id"));
        return R.data(pages);
    }


 src/main/java/org/springblade/modules/develop/controller/ModelController.java

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.develop.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
@@ -82,7 +83,7 @@
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入model")
    public R<IPage<Model>> list(Model model, Query query) {
        IPage<Model> pages = modelService.page(Condition.getPage(query), Condition.getQueryWrapper(model));
        IPage<Model> pages = modelService.page(Condition.getPage(query), Condition.getQueryWrapper(model).orderByDesc("create_time"));
        return R.data(pages);
    }


 src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java

@@ -55,7 +55,6 @@
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

 src/main/java/org/springblade/modules/place/controller/PlaceController.java

@@ -26,18 +26,12 @@
import javax.validation.Valid;

import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.house.excel.HouseAndHoldExcel;
import org.springblade.modules.house.excel.HouseAndHoldImporter;
import org.springblade.modules.place.excel.*;
import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.place.entity.PlaceEntity;

 src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java

@@ -152,7 +152,7 @@
    /**
     * 统计少数民族和未成年数量
     */
    @PostMapping("/countByType")
    @GetMapping("/countByType")
    @ApiOperationSupport(order = 8)
    @ApiOperation(value = "统计少数民族和未成年数量", notes = "")
    public R countByType() {

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

@@ -19,12 +19,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xxl.job.core.util.FileUtil;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.param.CommonParamSet;
@@ -32,25 +29,19 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.patrol.entity.PatrolRecord;
import org.springblade.modules.patrol.service.IPatrolRecordService;
import org.springblade.modules.place.dto.PlaceCheckDTO;
import org.springblade.modules.place.entity.PlaceCheckEntity;
import org.springblade.modules.place.excel.NinePlaceExcel;
import org.springblade.modules.place.excel.PlaceCheckExcel;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceCheckVO;
import org.springblade.modules.place.mapper.PlaceCheckMapper;
import org.springblade.modules.place.service.IPlaceCheckService;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.service.IDictBizService;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskLabelReportingEventVO;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
import org.springblade.modules.task.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.task.service.ITaskPlaceRectificationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRecord/controller/TaskPlaceRecordController.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRecord.controller;
package org.springblade.modules.task.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,17 +23,16 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.taskPlaceRecord.entity.TaskPlaceRecordEntity;
import org.springblade.modules.taskPlaceRecord.vo.TaskPlaceRecordVO;
import org.springblade.modules.taskPlaceRecord.wrapper.TaskPlaceRecordWrapper;
import org.springblade.modules.taskPlaceRecord.service.ITaskPlaceRecordService;
import org.springblade.modules.task.entity.TaskPlaceRecordEntity;
import org.springblade.modules.task.vo.TaskPlaceRecordVO;
import org.springblade.modules.task.wrapper.TaskPlaceRecordWrapper;
import org.springblade.modules.task.service.ITaskPlaceRecordService;
import org.springblade.core.boot.ctrl.BladeController;

/**

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRectification.controller;
package org.springblade.modules.task.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,27 +26,22 @@
import javax.validation.Valid;

import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.house.excel.HouseAndHoldExcel;
import org.springblade.modules.house.excel.HouseAndHoldImporter;
import org.springblade.modules.house.excel.HouseExcel;
import org.springblade.modules.house.vo.HouseVO;
import org.springblade.modules.taskPlaceRectification.dto.TaskPlaceRectificationDTO;
import org.springblade.modules.taskPlaceRectification.excel.PlaceRectificationsExcel;
import org.springblade.modules.taskPlaceRectification.excel.PlaceRectificationsImporter;
import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO;
import org.springblade.modules.task.dto.TaskPlaceRectificationDTO;
import org.springblade.modules.task.excel.PlaceRectificationsExcel;
import org.springblade.modules.task.excel.PlaceRectificationsImporter;
import org.springblade.modules.task.excel.TaskPlaceRectificationExcel;
import org.springblade.modules.task.vo.TaskPlaceRectificationsVO;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO;
import org.springblade.modules.taskPlaceRectification.wrapper.TaskPlaceRectificationWrapper;
import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
import org.springblade.modules.task.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.task.vo.TaskPlaceRectificationVO;
import org.springblade.modules.task.wrapper.TaskPlaceRectificationWrapper;
import org.springblade.modules.task.service.ITaskPlaceRectificationService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springframework.web.multipart.MultipartFile;


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

File was renamed from src/main/java/org/springblade/modules/taskPlaceSelfCheck/controller/TaskPlaceSelfCheckController.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceSelfCheck.controller;
package org.springblade.modules.task.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,23 +26,20 @@
import javax.validation.Valid;

import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.place.excel.PlaceCheckExcel;
import org.springblade.modules.place.vo.PlaceCheckVO;
import org.springblade.modules.taskPlaceSelfCheck.dto.TaskPlaceSelfCheckDTO;
import org.springblade.modules.taskPlaceSelfCheck.excel.TaskPlaceSelfCheckExcel;
import org.springblade.modules.task.dto.TaskPlaceSelfCheckDTO;
import org.springblade.modules.task.excel.TaskPlaceSelfCheckExcel;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.taskPlaceSelfCheck.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import org.springblade.modules.taskPlaceSelfCheck.wrapper.TaskPlaceSelfCheckWrapper;
import org.springblade.modules.taskPlaceSelfCheck.service.ITaskPlaceSelfCheckService;
import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.task.vo.TaskPlaceSelfCheckVO;
import org.springblade.modules.task.wrapper.TaskPlaceSelfCheckWrapper;
import org.springblade.modules.task.service.ITaskPlaceSelfCheckService;
import org.springblade.core.boot.ctrl.BladeController;

import java.util.List;

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

New file
@@ -0,0 +1,125 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.task.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity;
import org.springblade.modules.task.vo.TaskResidencePermitApplyVO;
import org.springblade.modules.task.wrapper.TaskResidencePermitApplyWrapper;
import org.springblade.modules.task.service.ITaskResidencePermitApplyService;
import org.springblade.core.boot.ctrl.BladeController;

/**
 * 居住证申请 控制器
 *
 * @author BladeX
 * @since 2024-03-14
 */
@RestController
@AllArgsConstructor
@RequestMapping("blade-taskResidencePermitApply/taskResidencePermitApply")
@Api(value = "居住证申请", tags = "居住证申请接口")
public class TaskResidencePermitApplyController extends BladeController {

    private final ITaskResidencePermitApplyService taskResidencePermitApplyService;

    /**
     * 居住证申请 详情
     */
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入taskResidencePermitApply")
    public R<TaskResidencePermitApplyVO> detail(TaskResidencePermitApplyEntity taskResidencePermitApply) {
        TaskResidencePermitApplyEntity detail = taskResidencePermitApplyService.getOne(Condition.getQueryWrapper(taskResidencePermitApply));
        return R.data(TaskResidencePermitApplyWrapper.build().entityVO(detail));
    }
    /**
     * 居住证申请 分页
     */
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入taskResidencePermitApply")
    public R<IPage<TaskResidencePermitApplyVO>> list(TaskResidencePermitApplyEntity taskResidencePermitApply, Query query) {
        IPage<TaskResidencePermitApplyEntity> pages = taskResidencePermitApplyService.page(Condition.getPage(query), Condition.getQueryWrapper(taskResidencePermitApply));
        return R.data(TaskResidencePermitApplyWrapper.build().pageVO(pages));
    }

    /**
     * 居住证申请 自定义分页
     */
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入taskResidencePermitApply")
    public R<IPage<TaskResidencePermitApplyVO>> page(TaskResidencePermitApplyVO taskResidencePermitApply, Query query) {
        IPage<TaskResidencePermitApplyVO> pages = taskResidencePermitApplyService.selectTaskResidencePermitApplyPage(Condition.getPage(query), taskResidencePermitApply);
        return R.data(pages);
    }

    /**
     * 居住证申请 新增
     */
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入taskResidencePermitApply")
    public R save(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
        return R.status(taskResidencePermitApplyService.save(taskResidencePermitApply));
    }

    /**
     * 居住证申请 修改
     */
    @PostMapping("/update")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入taskResidencePermitApply")
    public R update(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
        return R.status(taskResidencePermitApplyService.updateById(taskResidencePermitApply));
    }

    /**
     * 居住证申请 新增或修改
     */
    @PostMapping("/submit")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入taskResidencePermitApply")
    public R submit(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
        return R.status(taskResidencePermitApplyService.saveOrUpdate(taskResidencePermitApply));
    }

    /**
     * 居住证申请 删除
     */
    @PostMapping("/remove")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "逻辑删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        return R.status(taskResidencePermitApplyService.removeBatchByIds(Func.toLongList(ids)));
    }


}

 src/main/java/org/springblade/modules/task/dto/TaskPlaceRecordDTO.java

File was renamed from src/main/java/org/springblade/modules/taskPlaceRecord/dto/TaskPlaceRecordDTO.java
@@ -14,9 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRecord.dto;
package org.springblade.modules.task.dto;

import org.springblade.modules.taskPlaceRecord.entity.TaskPlaceRecordEntity;
import org.springblade.modules.task.entity.TaskPlaceRecordEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


 src/main/java/org/springblade/modules/task/dto/TaskPlaceRectificationDTO.java

File was renamed from src/main/java/org/springblade/modules/taskPlaceRectification/dto/TaskPlaceRectificationDTO.java
@@ -14,13 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRectification.dto;
package org.springblade.modules.task.dto;

import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.patrol.entity.PatrolRecord;
import org.springblade.modules.patrol.vo.PatrolRecordVO;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.task.entity.TaskPlaceRectificationEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


 src/main/java/org/springblade/modules/task/dto/TaskPlaceSelfCheckDTO.java

File was renamed from src/main/java/org/springblade/modules/taskPlaceSelfCheck/dto/TaskPlaceSelfCheckDTO.java
@@ -14,15 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceSelfCheck.dto;
package org.springblade.modules.task.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.patrol.vo.PatrolRecordVO;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
import org.springblade.modules.taskPlaceRecord.entity.TaskPlaceRecordEntity;
import org.springblade.modules.taskPlaceRecord.vo.TaskPlaceRecordVO;
import org.springblade.modules.taskPlaceSelfCheck.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.task.vo.TaskPlaceRecordVO;
import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


 src/main/java/org/springblade/modules/task/dto/TaskResidencePermitApplyDTO.java

copy from src/main/java/org/springblade/modules/taskPlaceRecord/dto/TaskPlaceRecordDTO.java
copy to src/main/java/org/springblade/modules/task/dto/TaskResidencePermitApplyDTO.java
File was copied from src/main/java/org/springblade/modules/taskPlaceRecord/dto/TaskPlaceRecordDTO.java
@@ -14,21 +14,21 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRecord.dto;
package org.springblade.modules.task.dto;

import org.springblade.modules.taskPlaceRecord.entity.TaskPlaceRecordEntity;
import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * 消防自查详情记录表 数据传输对象实体类
 * 居住证申请 数据传输对象实体类
 *
 * @author BladeX
 * @since 2024-02-04
 * @since 2024-03-14
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class TaskPlaceRecordDTO extends TaskPlaceRecordEntity {
public class TaskResidencePermitApplyDTO extends TaskResidencePermitApplyEntity {
    private static final long serialVersionUID = 1L;

}

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRecord/entity/TaskPlaceRecordEntity.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRecord.entity;
package org.springblade.modules.task.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRectification/entity/TaskPlaceRectificationEntity.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRectification.entity;
package org.springblade.modules.task.entity;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceSelfCheck/entity/TaskPlaceSelfCheckEntity.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceSelfCheck.entity;
package org.springblade.modules.task.entity;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;

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

New file
@@ -0,0 +1,115 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.task.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;

import java.util.Date;

/**
 * 居住证申请 实体类
 *
 * @author BladeX
 * @since 2024-03-14
 */
@Data
@TableName("jczz_task_residence_permit_apply")
@ApiModel(value = "TaskResidencePermitApply对象", description = "居住证申请")
public class TaskResidencePermitApplyEntity  {

    /** id */
    @ApiModelProperty(value = "主键ID", example = "")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Long id;

    /** 名称 */
    @ApiModelProperty(value = "名称", example = "")
    @TableField("name")
    private String name;

    /** 联系电话 */
    @ApiModelProperty(value = "联系电话", example = "")
    @TableField("phone")
    private String phone;

    /** 身份证 */
    @ApiModelProperty(value = "身份证", example = "")
    @TableField("id_card")
    private String idCard;

    /** 地址 */
    @ApiModelProperty(value = "地址", example = "")
    @TableField("address")
    private String address;

    /** 房屋编码 */
    @ApiModelProperty(value = "房屋编码", example = "")
    @TableField("house_code")
    private String houseCode;

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

    /** 创建时间 */
    @ApiModelProperty(value = "创建时间", example = "")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("create_time")
    private Date createTime;

    /** 更新时间 */
    @ApiModelProperty(value = "更新时间", example = "")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("update_time")
    private Date updateTime;

    /** 状态 1：待审核  2：审核通过  3：审核不通过 4: 待提交(待接收) */
    @ApiModelProperty(value = "状态 1：待审核  2：审核通过  3：审核不通过 4: 待提交(待接收)", example = "")
    @TableField("status")
    private Integer status;

    /** 创建人 */
    @ApiModelProperty(value = "创建人", example = "")
    @TableField("create_user")
    private Long createUser;

    /** 出租屋id */
    @ApiModelProperty(value = "出租屋id", example = "")
    @TableField("house_rental_id")
    private Long houseRentalId;

    /** 0：否 1：是 */
    @ApiModelProperty(value = "0：否 1：是", example = "")
    @TableField("is_deleted")
    private Integer isDeleted;

    /** 申请事由 */
    @ApiModelProperty(value = "申请事由", example = "")
    @TableField("remak")
    private String remak;

}

 src/main/java/org/springblade/modules/task/excel/PlaceRectificationsExcel.java

File was renamed from src/main/java/org/springblade/modules/taskPlaceRectification/excel/PlaceRectificationsExcel.java
@@ -1,4 +1,4 @@
package org.springblade.modules.taskPlaceRectification.excel;
package org.springblade.modules.task.excel;

import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;

 src/main/java/org/springblade/modules/task/excel/PlaceRectificationsImporter.java

File was renamed from src/main/java/org/springblade/modules/taskPlaceRectification/excel/PlaceRectificationsImporter.java
@@ -14,13 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRectification.excel;
package org.springblade.modules.task.excel;

import lombok.RequiredArgsConstructor;
import org.springblade.core.excel.support.ExcelImporter;
import org.springblade.modules.house.excel.HouseAndHoldExcel;
import org.springblade.modules.house.service.IHouseService;
import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
import org.springblade.modules.task.service.ITaskPlaceRectificationService;

import java.util.List;


 src/main/java/org/springblade/modules/task/excel/TaskPlaceRectificationExcel.java

File was renamed from src/main/java/org/springblade/modules/taskPlaceRectification/excel/TaskPlaceRectificationExcel.java
@@ -14,22 +14,17 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRectification.excel;
package org.springblade.modules.task.excel;

import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springblade.common.excel.ExcelDictConverter;
import org.springblade.common.excel.ExcelDictItemLabel;
import org.springblade.modules.patrol.vo.PatrolRecordVO;
import org.springblade.modules.place.vo.PlacePoiLabelVO;

import java.util.Date;
import java.util.List;

/**

 src/main/java/org/springblade/modules/task/excel/TaskPlaceSelfCheckExcel.java

File was renamed from src/main/java/org/springblade/modules/taskPlaceSelfCheck/excel/TaskPlaceSelfCheckExcel.java
@@ -1,4 +1,4 @@
package org.springblade.modules.taskPlaceSelfCheck.excel;
package org.springblade.modules.task.excel;

import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRecord/mapper/TaskPlaceRecordMapper.java
@@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRecord.mapper;
package org.springblade.modules.task.mapper;

import org.springblade.modules.taskPlaceRecord.dto.TaskPlaceRecordDTO;
import org.springblade.modules.taskPlaceRecord.entity.TaskPlaceRecordEntity;
import org.springblade.modules.taskPlaceRecord.vo.TaskPlaceRecordVO;
import org.springblade.modules.task.dto.TaskPlaceRecordDTO;
import org.springblade.modules.task.entity.TaskPlaceRecordEntity;
import org.springblade.modules.task.vo.TaskPlaceRecordVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRecord/mapper/TaskPlaceRecordMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.taskPlaceRecord.mapper.TaskPlaceRecordMapper">
<mapper namespace="org.springblade.modules.task.mapper.TaskPlaceRecordMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="taskPlaceRecordResultMap" type="org.springblade.modules.taskPlaceRecord.entity.TaskPlaceRecordEntity">
    <resultMap id="taskPlaceRecordResultMap" type="org.springblade.modules.task.entity.TaskPlaceRecordEntity">
    </resultMap>


@@ -12,7 +12,7 @@
    </select>


    <resultMap type="org.springblade.modules.taskPlaceRecord.dto.TaskPlaceRecordDTO" id="TaskPlaceRecordDTOResult">
    <resultMap type="org.springblade.modules.task.dto.TaskPlaceRecordDTO" id="TaskPlaceRecordDTOResult">
        <result property="id"    column="id"    />
        <result property="itemId"    column="item_id"    />
        <result property="taskPlaceSelfCheckId"    column="task_place_self_check_id"    />
@@ -51,7 +51,7 @@
        id = #{id}
    </select>

    <select id="selectTaskPlaceRecordList" parameterType="org.springblade.modules.taskPlaceRecord.dto.TaskPlaceRecordDTO" resultMap="TaskPlaceRecordDTOResult">
    <select id="selectTaskPlaceRecordList" parameterType="org.springblade.modules.task.dto.TaskPlaceRecordDTO" resultMap="TaskPlaceRecordDTOResult">
        <include refid="selectTaskPlaceRecord"/>
        <where>
            <if test="id != null "> and id = #{id}</if>

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java
@@ -14,18 +14,16 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRectification.mapper;
package org.springblade.modules.task.mapper;

import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.house.excel.HouseExcel;
import org.springblade.modules.taskPlaceRectification.dto.TaskPlaceRectificationDTO;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO;
import org.springblade.modules.task.dto.TaskPlaceRectificationDTO;
import org.springblade.modules.task.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.task.excel.TaskPlaceRectificationExcel;
import org.springblade.modules.task.vo.TaskPlaceRectificationVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO;
import org.springblade.modules.task.vo.TaskPlaceRectificationsVO;

import java.util.List;
import java.util.Map;

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.taskPlaceRectification.mapper.TaskPlaceRectificationMapper">
<mapper namespace="org.springblade.modules.task.mapper.TaskPlaceRectificationMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="taskPlaceRectificationResultMap"
               type="org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity">
               type="org.springblade.modules.task.entity.TaskPlaceRectificationEntity">
    </resultMap>


@@ -12,7 +12,7 @@
        select * from jczz_task_place_rectification where is_deleted = 0
    </select>

    <resultMap type="org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO"
    <resultMap type="org.springblade.modules.task.vo.TaskPlaceRectificationVO"
               id="TaskPlaceRectificationDTOResult">
        <result property="id" column="id"/>
        <result property="placeCheckId" column="place_check_id"/>
@@ -163,7 +163,7 @@
    </select>

    <select id="selectTaskPlaceRectificationList"
            parameterType="org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO"
            parameterType="org.springblade.modules.task.vo.TaskPlaceRectificationVO"
            resultMap="TaskPlaceRectificationDTOResult">
        SELECT
        jtpr.id,
@@ -422,7 +422,7 @@

    </select>

    <resultMap type="org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel"
    <resultMap type="org.springblade.modules.task.excel.TaskPlaceRectificationExcel"
               id="TaskPlaceRectificationExcelResult">
        <result property="placeName" column="place_name"/>
        <result property="createTime" column="create_time"/>

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceSelfCheck/mapper/TaskPlaceSelfCheckMapper.java
@@ -14,13 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceSelfCheck.mapper;
package org.springblade.modules.task.mapper;

import org.apache.ibatis.annotations.Param;
import org.springblade.modules.taskPlaceSelfCheck.dto.TaskPlaceSelfCheckDTO;
import org.springblade.modules.taskPlaceSelfCheck.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.taskPlaceSelfCheck.excel.TaskPlaceSelfCheckExcel;
import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import org.springblade.modules.task.dto.TaskPlaceSelfCheckDTO;
import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.task.excel.TaskPlaceSelfCheckExcel;
import org.springblade.modules.task.vo.TaskPlaceSelfCheckVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;


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

File was renamed from src/main/java/org/springblade/modules/taskPlaceSelfCheck/mapper/TaskPlaceSelfCheckMapper.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.taskPlaceSelfCheck.mapper.TaskPlaceSelfCheckMapper">
<mapper namespace="org.springblade.modules.task.mapper.TaskPlaceSelfCheckMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="taskPlaceSelfCheckResultMap"
               type="org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO">
               type="org.springblade.modules.task.vo.TaskPlaceSelfCheckVO">
        <result property="id" column="id"/>
        <result property="taskId" column="task_id"/>
        <result property="taskName" column="task_name"/>
@@ -31,7 +31,7 @@
        </collection>

        <collection property="taskPlaceRecordVOList" column="id" select="selectPatrolRecordList"
                    javaType="java.util.List" ofType="org.springblade.modules.taskPlaceRecord.vo.TaskPlaceRecordVO"
                    javaType="java.util.List" ofType="org.springblade.modules.task.vo.TaskPlaceRecordVO"
                    autoMapping="true">
        </collection>
    </resultMap>
@@ -169,7 +169,7 @@
        order by jpc.create_time desc
    </select>

    <resultMap type="org.springblade.modules.taskPlaceSelfCheck.dto.TaskPlaceSelfCheckDTO"
    <resultMap type="org.springblade.modules.task.dto.TaskPlaceSelfCheckDTO"
               id="TaskPlaceSelfCheckDTOResult">
        <result property="id" column="id"/>
        <result property="taskId" column="task_id"/>
@@ -197,7 +197,7 @@
        </collection>

        <collection property="taskPlaceRecordVOList" column="id" select="selectPatrolRecordList"
                    javaType="java.util.List" ofType="org.springblade.modules.taskPlaceRecord.vo.TaskPlaceRecordVO"
                    javaType="java.util.List" ofType="org.springblade.modules.task.vo.TaskPlaceRecordVO"
                    autoMapping="true">
        </collection>

@@ -223,7 +223,7 @@


    <select id="selectPatrolRecordList" parameterType="Long"
            resultType="org.springblade.modules.taskPlaceRecord.vo.TaskPlaceRecordVO">
            resultType="org.springblade.modules.task.vo.TaskPlaceRecordVO">
            select
            jpr.id,
            jpr.item_id,
@@ -317,7 +317,7 @@
    </select>

    <select id="selectTaskPlaceSelfCheckList"
            parameterType="org.springblade.modules.taskPlaceSelfCheck.dto.TaskPlaceSelfCheckDTO"
            parameterType="org.springblade.modules.task.dto.TaskPlaceSelfCheckDTO"
            resultMap="TaskPlaceSelfCheckDTOResult">
        <include refid="selectTaskPlaceSelfCheck"/>
        <where>
@@ -349,7 +349,7 @@

    <!--导出消防自查信息-->
    <select id="exportTaskPlaceSelfCheck"
            resultType="org.springblade.modules.taskPlaceSelfCheck.excel.TaskPlaceSelfCheckExcel">
            resultType="org.springblade.modules.task.excel.TaskPlaceSelfCheckExcel">
        select
        jpc.id,
        case when jpc.status=1 then '待审核'

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

New file
@@ -0,0 +1,44 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.task.mapper;

import org.apache.ibatis.annotations.Param;
import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity;
import org.springblade.modules.task.vo.TaskResidencePermitApplyVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;

/**
 * 居住证申请 Mapper 接口
 *
 * @author BladeX
 * @since 2024-03-14
 */
public interface TaskResidencePermitApplyMapper extends BaseMapper<TaskResidencePermitApplyEntity> {

    /**
     * 自定义分页
     *
     * @param page
     * @param taskResidencePermitApply
     * @return
     */
    List<TaskResidencePermitApplyVO> selectTaskResidencePermitApplyPage(IPage page, @Param("residen") TaskResidencePermitApplyVO taskResidencePermitApply);


}

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

New file
@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.task.mapper.TaskResidencePermitApplyMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="taskResidencePermitApplyResultMap"
               type="org.springblade.modules.task.entity.TaskResidencePermitApplyEntity">
    </resultMap>


    <select id="selectTaskResidencePermitApplyPage" resultMap="taskResidencePermitApplyResultMap">
        select * from jczz_task_residence_permit_apply
        <where>
            <if test="residen.id != null ">and id = #{residen.id}</if>
            <if test="residen.name != null  and residen.name != ''">and name = #{residen.name}</if>
            <if test="residen.phone != null  and residen.phone != ''">and phone = #{residen.phone}</if>
            <if test="residen.idCard != null  and residen.idCard != ''">and id_card = #{residen.idCard}</if>
            <if test="residen.address != null  and residen.address != ''">and address = #{residen.address}</if>
            <if test="residen.houseCode != null  and residen.houseCode != ''">and house_code = #{residen.houseCode}</if>
            <if test="residen.taskId != null ">and task_id = #{residen.taskId}</if>
            <if test="residen.createTime != null ">and create_time = #{residen.createTime}</if>
            <if test="residen.updateTime != null ">and update_time = #{residen.updateTime}</if>
            <if test="residen.status != null ">and status = #{residen.status}</if>
            <if test="residen.createUser != null ">and create_user = #{residen.createUser}</if>
            <if test="residen.houseRentalId != null ">and house_rental_id = #{residen.houseRentalId}</if>
            <if test="residen.isDeleted != null ">and is_deleted = #{residen.isDeleted}</if>
            <if test="residen.remak != null  and residen.remak != ''">and remak = #{residen.remak}</if>
            and is_deleted = 0
        </where>
    </select>

    <resultMap type="org.springblade.modules.task.dto.TaskResidencePermitApplyDTO"
               id="TaskResidencePermitApplyDTOResult">
        <result property="id" column="id"/>
        <result property="name" column="name"/>
        <result property="phone" column="phone"/>
        <result property="idCard" column="id_card"/>
        <result property="address" column="address"/>
        <result property="houseCode" column="house_code"/>
        <result property="taskId" column="task_id"/>
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
        <result property="status" column="status"/>
        <result property="createUser" column="create_user"/>
        <result property="houseRentalId" column="house_rental_id"/>
        <result property="isDeleted" column="is_deleted"/>
        <result property="remak" column="remak"/>
    </resultMap>

    <sql id="selectTaskResidencePermitApply">
        select id,
               name,
               phone,
               id_card,
               address,
               house_code,
               task_id,
               create_time,
               update_time,
               status,
               create_user,
               house_rental_id,
               is_deleted,
               remak
        from jczz_task_residence_permit_apply
    </sql>


</mapper>

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRecord/service/ITaskPlaceRecordService.java
@@ -14,13 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRecord.service;
package org.springblade.modules.task.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.taskPlaceRecord.dto.TaskPlaceRecordDTO;
import org.springblade.modules.taskPlaceRecord.entity.TaskPlaceRecordEntity;
import org.springblade.modules.taskPlaceRecord.vo.TaskPlaceRecordVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.modules.task.dto.TaskPlaceRecordDTO;
import org.springblade.modules.task.entity.TaskPlaceRecordEntity;
import org.springblade.modules.task.vo.TaskPlaceRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRectification/service/ITaskPlaceRectificationService.java
@@ -14,16 +14,16 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRectification.service;
package org.springblade.modules.task.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.taskPlaceRectification.dto.TaskPlaceRectificationDTO;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.taskPlaceRectification.excel.PlaceRectificationsExcel;
import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO;
import org.springblade.modules.task.dto.TaskPlaceRectificationDTO;
import org.springblade.modules.task.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.task.excel.PlaceRectificationsExcel;
import org.springblade.modules.task.excel.TaskPlaceRectificationExcel;
import org.springblade.modules.task.vo.TaskPlaceRectificationVO;
import org.springblade.modules.task.vo.TaskPlaceRectificationsVO;

import java.util.List;


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

File was renamed from src/main/java/org/springblade/modules/taskPlaceSelfCheck/service/ITaskPlaceSelfCheckService.java
@@ -14,14 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceSelfCheck.service;
package org.springblade.modules.task.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.taskPlaceSelfCheck.dto.TaskPlaceSelfCheckDTO;
import org.springblade.modules.taskPlaceSelfCheck.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.taskPlaceSelfCheck.excel.TaskPlaceSelfCheckExcel;
import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.modules.task.dto.TaskPlaceSelfCheckDTO;
import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.task.excel.TaskPlaceSelfCheckExcel;
import org.springblade.modules.task.vo.TaskPlaceSelfCheckVO;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;

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

New file
@@ -0,0 +1,43 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.task.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity;
import org.springblade.modules.task.vo.TaskResidencePermitApplyVO;
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;

/**
 * 居住证申请 服务类
 *
 * @author BladeX
 * @since 2024-03-14
 */
public interface ITaskResidencePermitApplyService extends IService<TaskResidencePermitApplyEntity> {

    /**
     * 自定义分页
     *
     * @param page
     * @param taskResidencePermitApply
     * @return
     */
    IPage<TaskResidencePermitApplyVO> selectTaskResidencePermitApplyPage(IPage<TaskResidencePermitApplyVO> page, TaskResidencePermitApplyVO taskResidencePermitApply);


}

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRecord/service/impl/TaskPlaceRecordServiceImpl.java
@@ -14,15 +14,14 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRecord.service.impl;
package org.springblade.modules.task.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.modules.taskPlaceRecord.dto.TaskPlaceRecordDTO;
import org.springblade.modules.taskPlaceRecord.entity.TaskPlaceRecordEntity;
import org.springblade.modules.taskPlaceRecord.vo.TaskPlaceRecordVO;
import org.springblade.modules.taskPlaceRecord.mapper.TaskPlaceRecordMapper;
import org.springblade.modules.taskPlaceRecord.service.ITaskPlaceRecordService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.task.dto.TaskPlaceRecordDTO;
import org.springblade.modules.task.entity.TaskPlaceRecordEntity;
import org.springblade.modules.task.vo.TaskPlaceRecordVO;
import org.springblade.modules.task.mapper.TaskPlaceRecordMapper;
import org.springblade.modules.task.service.ITaskPlaceRecordService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;


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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRectification.service.impl;
package org.springblade.modules.task.service.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -49,14 +49,14 @@
import org.springblade.modules.system.vo.RegionVO;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.taskPlaceRectification.dto.TaskPlaceRectificationDTO;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.taskPlaceRectification.excel.PlaceRectificationsExcel;
import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel;
import org.springblade.modules.taskPlaceRectification.mapper.TaskPlaceRectificationMapper;
import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO;
import org.springblade.modules.task.dto.TaskPlaceRectificationDTO;
import org.springblade.modules.task.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.task.excel.PlaceRectificationsExcel;
import org.springblade.modules.task.excel.TaskPlaceRectificationExcel;
import org.springblade.modules.task.mapper.TaskPlaceRectificationMapper;
import org.springblade.modules.task.service.ITaskPlaceRectificationService;
import org.springblade.modules.task.vo.TaskPlaceRectificationVO;
import org.springblade.modules.task.vo.TaskPlaceRectificationsVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


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

File was renamed from src/main/java/org/springblade/modules/taskPlaceSelfCheck/service/impl/TaskPlaceSelfCheckServiceImpl.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceSelfCheck.service.impl;
package org.springblade.modules.task.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -28,25 +28,18 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.patrol.entity.PatrolRecord;
import org.springblade.modules.patrol.service.IPatrolRecordService;
import org.springblade.modules.place.excel.NinePlaceExcel;
import org.springblade.modules.place.vo.PlaceCheckVO;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.service.IDictBizService;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.taskPlaceRecord.entity.TaskPlaceRecordEntity;
import org.springblade.modules.taskPlaceRecord.service.ITaskPlaceRecordService;
import org.springblade.modules.taskPlaceRecord.vo.TaskPlaceRecordVO;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
import org.springblade.modules.taskPlaceSelfCheck.dto.TaskPlaceSelfCheckDTO;
import org.springblade.modules.taskPlaceSelfCheck.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.taskPlaceSelfCheck.excel.TaskPlaceSelfCheckExcel;
import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import org.springblade.modules.taskPlaceSelfCheck.mapper.TaskPlaceSelfCheckMapper;
import org.springblade.modules.taskPlaceSelfCheck.service.ITaskPlaceSelfCheckService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.task.entity.TaskPlaceRecordEntity;
import org.springblade.modules.task.service.ITaskPlaceRecordService;
import org.springblade.modules.task.vo.TaskPlaceRecordVO;
import org.springblade.modules.task.dto.TaskPlaceSelfCheckDTO;
import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.task.excel.TaskPlaceSelfCheckExcel;
import org.springblade.modules.task.vo.TaskPlaceSelfCheckVO;
import org.springblade.modules.task.mapper.TaskPlaceSelfCheckMapper;
import org.springblade.modules.task.service.ITaskPlaceSelfCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -54,7 +47,6 @@

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;

/**

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

@@ -19,7 +19,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.RoleUtil;
import org.springblade.common.utils.SpringUtils;
@@ -29,18 +28,12 @@
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.house.entity.HouseEntity;
import org.springblade.modules.house.service.IHouseService;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.sse.server.SSEServer;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.mapper.TaskReportForRepairsMapper;
@@ -48,7 +41,6 @@
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.vo.TaskReportStatistics;
import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

New file
@@ -0,0 +1,43 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.task.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity;
import org.springblade.modules.task.vo.TaskResidencePermitApplyVO;
import org.springblade.modules.task.mapper.TaskResidencePermitApplyMapper;
import org.springblade.modules.task.service.ITaskResidencePermitApplyService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

/**
 * 居住证申请 服务实现类
 *
 * @author BladeX
 * @since 2024-03-14
 */
@Service
public class TaskResidencePermitApplyServiceImpl extends ServiceImpl<TaskResidencePermitApplyMapper, TaskResidencePermitApplyEntity> implements ITaskResidencePermitApplyService {

    @Override
    public IPage<TaskResidencePermitApplyVO> selectTaskResidencePermitApplyPage(IPage<TaskResidencePermitApplyVO> page, TaskResidencePermitApplyVO taskResidencePermitApply) {
        return page.setRecords(baseMapper.selectTaskResidencePermitApplyPage(page, taskResidencePermitApply));
    }


}

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

@@ -24,7 +24,6 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
@@ -46,9 +45,9 @@
import org.springblade.modules.task.mapper.TaskMapper;
import org.springblade.modules.task.service.*;
import org.springblade.modules.task.vo.TaskVO;
import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
import org.springblade.modules.taskPlaceSelfCheck.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.taskPlaceSelfCheck.service.ITaskPlaceSelfCheckService;
import org.springblade.modules.task.service.ITaskPlaceRectificationService;
import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.task.service.ITaskPlaceSelfCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRecord/vo/TaskPlaceRecordVO.java
@@ -14,10 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRecord.vo;
package org.springblade.modules.task.vo;

import org.springblade.modules.taskPlaceRecord.entity.TaskPlaceRecordEntity;
import org.springblade.core.tool.node.INode;
import org.springblade.modules.task.entity.TaskPlaceRecordEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRectification/vo/TaskPlaceRectificationVO.java
@@ -14,21 +14,16 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRectification.vo;
package org.springblade.modules.task.vo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.patrol.entity.PatrolRecord;
import org.springblade.modules.patrol.vo.PatrolRecordVO;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import org.springblade.core.tool.node.INode;
import org.springblade.modules.task.entity.TaskPlaceRectificationEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;
import java.util.List;

/**

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceRectification/vo/TaskPlaceRectificationsVO.java
@@ -14,18 +14,15 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRectification.vo;
package org.springblade.modules.task.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.modules.patrol.vo.PatrolRecordVO;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.task.entity.TaskPlaceRectificationEntity;

import java.util.Date;
import java.util.List;

/**
 * 场所整改任务表 视图实体类

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

File was renamed from src/main/java/org/springblade/modules/taskPlaceSelfCheck/vo/TaskPlaceSelfCheckVO.java
@@ -14,16 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceSelfCheck.vo;
package org.springblade.modules.task.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.patrol.entity.PatrolRecord;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
import org.springblade.modules.taskPlaceRecord.entity.TaskPlaceRecordEntity;
import org.springblade.modules.taskPlaceRecord.vo.TaskPlaceRecordVO;
import org.springblade.modules.taskPlaceSelfCheck.entity.TaskPlaceSelfCheckEntity;
import org.springblade.core.tool.node.INode;
import org.springblade.modules.task.vo.TaskPlaceRecordVO;
import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


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

copy from src/main/java/org/springblade/modules/taskPlaceRecord/dto/TaskPlaceRecordDTO.java
copy to src/main/java/org/springblade/modules/task/vo/TaskResidencePermitApplyVO.java
File was copied from src/main/java/org/springblade/modules/taskPlaceRecord/dto/TaskPlaceRecordDTO.java
@@ -14,21 +14,21 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRecord.dto;
package org.springblade.modules.task.vo;

import org.springblade.modules.taskPlaceRecord.entity.TaskPlaceRecordEntity;
import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * 消防自查详情记录表 数据传输对象实体类
 * 居住证申请 视图实体类
 *
 * @author BladeX
 * @since 2024-02-04
 * @since 2024-03-14
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class TaskPlaceRecordDTO extends TaskPlaceRecordEntity {
public class TaskResidencePermitApplyVO extends TaskResidencePermitApplyEntity {
    private static final long serialVersionUID = 1L;

}

 src/main/java/org/springblade/modules/task/wrapper/TaskPlaceRecordWrapper.java

File was renamed from src/main/java/org/springblade/modules/taskPlaceRecord/wrapper/TaskPlaceRecordWrapper.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRecord.wrapper;
package org.springblade.modules.task.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.taskPlaceRecord.entity.TaskPlaceRecordEntity;
import org.springblade.modules.taskPlaceRecord.vo.TaskPlaceRecordVO;
import org.springblade.modules.task.entity.TaskPlaceRecordEntity;
import org.springblade.modules.task.vo.TaskPlaceRecordVO;
import java.util.Objects;

/**

 src/main/java/org/springblade/modules/task/wrapper/TaskPlaceRectificationWrapper.java

File was renamed from src/main/java/org/springblade/modules/taskPlaceRectification/wrapper/TaskPlaceRectificationWrapper.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceRectification.wrapper;
package org.springblade.modules.task.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO;
import org.springblade.modules.task.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.task.vo.TaskPlaceRectificationVO;
import java.util.Objects;

/**

 src/main/java/org/springblade/modules/task/wrapper/TaskPlaceSelfCheckWrapper.java

File was renamed from src/main/java/org/springblade/modules/taskPlaceSelfCheck/wrapper/TaskPlaceSelfCheckWrapper.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.taskPlaceSelfCheck.wrapper;
package org.springblade.modules.task.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.taskPlaceSelfCheck.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.task.vo.TaskPlaceSelfCheckVO;
import java.util.Objects;

/**

 src/main/java/org/springblade/modules/task/wrapper/TaskResidencePermitApplyWrapper.java

New file
@@ -0,0 +1,50 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.task.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity;
import org.springblade.modules.task.vo.TaskResidencePermitApplyVO;
import java.util.Objects;

/**
 * 居住证申请 包装类,返回视图层所需的字段
 *
 * @author BladeX
 * @since 2024-03-14
 */
public class TaskResidencePermitApplyWrapper extends BaseEntityWrapper<TaskResidencePermitApplyEntity, TaskResidencePermitApplyVO>  {

    public static TaskResidencePermitApplyWrapper build() {
        return new TaskResidencePermitApplyWrapper();
     }

    @Override
    public TaskResidencePermitApplyVO entityVO(TaskResidencePermitApplyEntity taskResidencePermitApply) {
        TaskResidencePermitApplyVO taskResidencePermitApplyVO = Objects.requireNonNull(BeanUtil.copy(taskResidencePermitApply, TaskResidencePermitApplyVO.class));

        //User createUser = UserCache.getUser(taskResidencePermitApply.getCreateUser());
        //User updateUser = UserCache.getUser(taskResidencePermitApply.getUpdateUser());
        //taskResidencePermitApplyVO.setCreateUserName(createUser.getName());
        //taskResidencePermitApplyVO.setUpdateUserName(updateUser.getName());

        return taskResidencePermitApplyVO;
    }


}