无诈

lin

2024-04-10 dec7b42d0c46fbe3f0137b901907d1274f01f440

无诈

 src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -93,6 +93,7 @@
    Integer NUMBER_EIGHT = 8;

    Integer NUMBER_SEVEN = 7;
    Integer NUMBER_SIX = 6;

    String RESIDENT = "居民";


 src/main/java/org/springblade/common/constant/DictConstant.java

@@ -57,6 +57,8 @@

    String FIRE_SELF_CHECK_NOTICE = "消防自查";

    String NO_FRAUD_REPORTING = "无诈宣传";

    String RESIDENCE_PERMIT_APPLICATION = "居住证申请";

}

 src/main/java/org/springblade/common/node/TreeStringNode.java

@@ -105,4 +105,8 @@
     */
    @JsonInclude(JsonInclude.Include.NON_EMPTY)
    private Boolean hasChildren;
    /**
     * 无诈类型
     */
    private Integer noExplosionCategory;
}

 src/main/java/org/springblade/modules/circle/service/impl/CircleServiceImpl.java

@@ -23,6 +23,7 @@
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.circle.dto.CircleDTO;
@@ -62,7 +63,7 @@

    @Override
    public IPage<CircleVO> selectCirclePage(IPage<CircleVO> page, CircleVO circle) {
//        CommonParamSet commonParamSet = new CommonParamSet().invoke(CircleVO.class, circle);
        CommonParamSet commonParamSet = new CommonParamSet().invoke(CircleVO.class, circle);
        List<CircleVO> circleVOS = baseMapper.selectCirclePage(page, circle);
        for (CircleVO circleVO : circleVOS) {
            // 获取circleVO中circleId的点赞数

 src/main/java/org/springblade/modules/patrol/controller/PatrolGroupController.java

@@ -130,8 +130,8 @@
     */
    @ApiOperation(value = "查询巡查项树数据", notes = "查询巡查项树数据")
    @GetMapping(value = "/getPatrolGroupTree")
    public R getPatrolGroupTree() {
        return R.data(patrolGroupService.getPatrolGroupTree());
    public R getPatrolGroupTree(@RequestParam(value = "type",required = false)String type,@RequestParam(value = "childType",required = false)String childType) {
        return R.data(patrolGroupService.getPatrolGroupTree(type,childType));
    }

    /**

 src/main/java/org/springblade/modules/patrol/entity/PatrolGroup.java

@@ -58,4 +58,9 @@
    @ApiModelProperty(value = "是否已删除 0： 否 1：是", example = "")
    @TableField("is_deleted")
    private Integer isDeleted;

    /** 1.自查 2.无诈 */
    @ApiModelProperty(value = "1.自查 2.无诈", example = "")
    @TableField("type")
    private Integer type;
}

 src/main/java/org/springblade/modules/patrol/entity/PatrolGroupItem.java

@@ -67,4 +67,9 @@
    @ApiModelProperty(value = "是否已删除 0： 否 1：是", example = "")
    @TableField("is_deleted")
    private Integer isDeleted;

    /** 1.自查 2.“无诈”企业 3.“无诈”工地 4.“无诈”学校 5.“无诈”医院    6.“无诈”村（社区7.“无诈”厂（园）区 8.“无诈”单位 */
    @ApiModelProperty(value = "1.自查 2.“无诈”企业 3.“无诈”工地 4.“无诈”学校 5.“无诈”医院    6.“无诈”村（社区7.“无诈”厂（园）区 8.“无诈”单位", example = "")
    @TableField("type")
    private Integer type;
}

 src/main/java/org/springblade/modules/patrol/mapper/PatrolGroupMapper.java

@@ -21,13 +21,13 @@
     * 查询巡查项树数据
     * @return
     */
    List<TreeNode> getPatrolGroupTree();
    List<TreeNode> getPatrolGroupTree(String type);

    /**
     * 查询巡查项树数据
     * @return
     */
    List<TreeNode> getPatrolGroupItemTree();
    List<TreeNode> getPatrolGroupItemTree( String childType);

    List<PatrolGroup> getPatrolGroupByItemId(@Param("itemIds") String itemIds);


 src/main/java/org/springblade/modules/patrol/mapper/PatrolGroupMapper.xml

@@ -52,18 +52,27 @@
            WHERE
                group_id = spg.id and is_deleted = 0
        ) AS "has_children"
        FROM jczz_patrol_group spg where spg.is_deleted = 0
        FROM jczz_patrol_group spg
        <where>
              spg.is_deleted = 0
            <if test="param1 != null">
                and spg.type = #{param1}
            </if>
        </where>
        order by spg.create_time desc
    </select>

    <!--查询巡查项树数据-->
    <select id="getPatrolGroupItemTree" resultType="org.springblade.core.tool.node.TreeNode" >
        SELECT
            spgi.id,
            spgi.items_name as title,
            spgi.group_id as parentId,
            false AS hasChildren
        spgi.id,
        spgi.items_name as title,
        spgi.group_id as parentId,
        false AS hasChildren
        FROM jczz_patrol_group_item spgi where spgi.is_deleted = 0
        <if test="param1 != null">
            and spgi.type = #{param1}
        </if>
        order by spgi.create_time desc
    </select>
    <select id="getPatrolGroupByItemId" resultType="org.springblade.modules.patrol.entity.PatrolGroup">

 src/main/java/org/springblade/modules/patrol/service/IPatrolGroupService.java

@@ -27,7 +27,7 @@
     * 查询巡查项树数据
     * @return
     */
    Object getPatrolGroupTree();
    Object getPatrolGroupTree(String type,String childType);

    /**
     * 获取组

 src/main/java/org/springblade/modules/patrol/service/impl/PatrolGroupServiceImpl.java

@@ -35,11 +35,11 @@
     * @return
     */
    @Override
    public Object getPatrolGroupTree() {
    public Object getPatrolGroupTree(String type,String childType) {
        // 查询父树目录
        List<TreeNode> patrolGroupTree = baseMapper.getPatrolGroupTree();
        List<TreeNode> patrolGroupTree = baseMapper.getPatrolGroupTree(type);
        // 查询孩子树目录
        List<TreeNode> patrolGroupItemTree = baseMapper.getPatrolGroupItemTree();
        List<TreeNode> patrolGroupItemTree = baseMapper.getPatrolGroupItemTree(childType);
        // 数据处理
        return NodeTreeUtil.getNodeTree(patrolGroupTree,patrolGroupItemTree);
    }

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

@@ -199,4 +199,9 @@
    @ApiModelProperty(value = "1：是 2：否  三级消防单位", example = "")
    @TableField("three_fire_protection")
    private Integer threeFireProtection;

    /** 无炸类别 */
    @ApiModelProperty(value = "无炸类别", example = "")
    @TableField("no_explosion_category")
    private Integer noExplosionCategory;
}

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

@@ -283,6 +283,7 @@
               jp.place_name AS   NAME,
               jp.is_nine AS isNine,
               jp.is_front AS isFront,
               jp.no_explosion_category AS noExplosionCategory,
               br.name neiName,
               jg.community_code neiCode,
               FALSE         AS   hasChildren

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

New file
@@ -0,0 +1,157 @@
/*
 *      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.log.annotation.ApiLog;
import org.springblade.core.log.logger.BladeLogger;
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.jackson.JsonUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.task.dto.TaskNoFraudReportingDTO;
import org.springblade.modules.task.dto.TaskPlaceSelfCheckDTO;
import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.task.service.ITaskNoFraudReportingService;
import org.springblade.modules.task.vo.TaskPlaceSelfCheckVO;
import org.springblade.modules.task.wrapper.TaskNoFraudReportingWrapper;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.task.entity.TaskNoFraudReportingEntity;
import org.springblade.modules.task.vo.TaskNoFraudReportingVO;
import org.springblade.core.boot.ctrl.BladeController;

/**
 * 无炸上报任务表 控制器
 *
 * @author BladeX
 * @since 2024-04-10
 */
@RestController
@AllArgsConstructor
@RequestMapping("blade-taskNoFraudReporting/taskNoFraudReporting")
@Api(value = "无炸上报任务表", tags = "无炸上报任务表接口")
public class TaskNoFraudReportingController extends BladeController {

    private final ITaskNoFraudReportingService taskNoFraudReportingService;

    private final BladeLogger bladeLogger;


    /**
     * 无炸上报任务表 详情
     */
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入taskNoFraudReporting")
    public R<TaskNoFraudReportingVO> detail(TaskNoFraudReportingEntity taskNoFraudReporting) {
        TaskNoFraudReportingEntity detail = taskNoFraudReportingService.getOne(Condition.getQueryWrapper(taskNoFraudReporting));
        return R.data(TaskNoFraudReportingWrapper.build().entityVO(detail));
    }

    @ApiOperation("无诈详细信息")
    @ApiLog("无诈详细信息")
    @GetMapping(value = "/getInfo")
    public R<TaskNoFraudReportingVO> getInfo(TaskNoFraudReportingEntity taskNoFraudReporting){
        bladeLogger.info("无诈表详细信息", JsonUtil.toJson(taskNoFraudReporting));
        TaskNoFraudReportingVO taskNoFraudReportingVo = taskNoFraudReportingService.selectTaskNoFraudReportingById(taskNoFraudReporting);
        return R.data(taskNoFraudReportingVo);
    }
    /**
     * 无炸上报任务表 分页
     */
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入taskNoFraudReporting")
    public R<IPage<TaskNoFraudReportingVO>> list(TaskNoFraudReportingEntity taskNoFraudReporting, Query query) {
        IPage<TaskNoFraudReportingEntity> pages = taskNoFraudReportingService.page(Condition.getPage(query), Condition.getQueryWrapper(taskNoFraudReporting));
        return R.data(TaskNoFraudReportingWrapper.build().pageVO(pages));
    }

    /**
     * 无炸上报任务表 自定义分页
     */
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入taskNoFraudReporting")
    public R<IPage<TaskNoFraudReportingVO>> page(TaskNoFraudReportingVO taskNoFraudReporting, Query query) {
        IPage<TaskNoFraudReportingVO> pages = taskNoFraudReportingService.selectTaskNoFraudReportingPage(Condition.getPage(query), taskNoFraudReporting);
        return R.data(pages);
    }

    /**
     * 无炸上报任务表 新增
     */
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入taskNoFraudReporting")
    public R save(@Valid @RequestBody TaskNoFraudReportingEntity taskNoFraudReporting) {
        return R.status(taskNoFraudReportingService.save(taskNoFraudReporting));
    }

    /**
     *  新增
     */
    @PostMapping("/saveTwo")
    @ApiLog(" 新增")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "无诈自定义新增", notes = "传入taskPlaceSelfCheck")
    public R saveTwo(@Valid @RequestBody TaskNoFraudReportingVO taskNoFraudReporting) throws Exception {
        bladeLogger.info("无诈 新增", JsonUtil.toJson(taskNoFraudReporting));
        return R.status(taskNoFraudReportingService.saveNoFraudReporting(taskNoFraudReporting));
    }

    /**
     * 无炸上报任务表 修改
     */
    @PostMapping("/update")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入taskNoFraudReporting")
    public R update(@Valid @RequestBody TaskNoFraudReportingEntity taskNoFraudReporting) {
        return R.status(taskNoFraudReportingService.updateById(taskNoFraudReporting));
    }

    /**
     * 无炸上报任务表 新增或修改
     */
    @PostMapping("/submit")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入taskNoFraudReporting")
    public R submit(@Valid @RequestBody TaskNoFraudReportingEntity taskNoFraudReporting) {
        return R.status(taskNoFraudReportingService.saveOrUpdate(taskNoFraudReporting));
    }

    /**
     * 无炸上报任务表 删除
     */
    @PostMapping("/remove")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "逻辑删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        return R.status(taskNoFraudReportingService.removeBatchByIds(Func.toLongList(ids)));
    }


}

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

New file
@@ -0,0 +1,34 @@
/*
 *      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.dto;

import org.springblade.modules.task.entity.TaskNoFraudReportingEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * 无炸上报任务表 数据传输对象实体类
 *
 * @author BladeX
 * @since 2024-04-10
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class TaskNoFraudReportingDTO extends TaskNoFraudReportingEntity {
    private static final long serialVersionUID = 1L;

}

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

@@ -63,7 +63,7 @@
    private String houseCode;

    /** 事件类型（1：取保候审，2旅馆 3打金店 4二手手机 5二手车 6 校园安全） */
    @ApiModelProperty(value = "事件类型（1：取保候审，2.居住证申请 5二手交易  7.消防自查任务 8 九小整改任务 ）", example = "")
    @ApiModelProperty(value = "事件类型（1：取保候审，2.居住证申请 5二手交易 6.无诈 7.消防自查任务 8 九小整改任务  ）", example = "")
    @TableField("report_type")
    private Integer reportType;
    /**

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

New file
@@ -0,0 +1,104 @@
/*
 *      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.*;
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-04-10
 */
@Data
@TableName("jczz_task_no_fraud_reporting")
@ApiModel(value = "TaskNoFraudReporting对象", description = "无炸上报任务表")
public class TaskNoFraudReportingEntity  {

    private static final long serialVersionUID = 1L;


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

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

    /** 任务名称 */
    @ApiModelProperty(value = "任务名称", example = "")
    @TableField("task_name")
    private String taskName;

    /** 场所名称 */
    @ApiModelProperty(value = "场所名称", example = "")
    @TableField("place_name")
    private String placeName;

    /** 内容 */
    @ApiModelProperty(value = "内容", example = "")
    @TableField("remark")
    private String remark;

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

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

    /** 门牌地址编码 */
    @ApiModelProperty(value = "门牌地址编码", example = "")
    @TableField("house_code")
    private String houseCode;

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

    /** 图片 */
    @ApiModelProperty(value = "图片", example = "")
    @TableField("image_urls")
    private String imageUrls;

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

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

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

@@ -16,10 +16,7 @@
 */
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.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import io.swagger.annotations.ApiModel;
@@ -81,7 +78,7 @@
    /** 修改时间 */
    @ApiModelProperty(value = "修改时间", example = "")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("create_time")
    @TableField(value = "create_time",fill = FieldFill.INSERT)
    private Date createTime;

    /** 是否删除 0： 否 1：是 */
@@ -104,4 +101,9 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("rectification_time")
    private Date rectificationTime;

    /** 1 自查 2.无诈 */
    @ApiModelProperty(value = "1 自查 2.无诈", example = "")
    @TableField("type")
    private String type;
}

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

New file
@@ -0,0 +1,65 @@
/*
 *      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.dto.TaskNoFraudReportingDTO;
import org.springblade.modules.task.entity.TaskNoFraudReportingEntity;
import org.springblade.modules.task.vo.TaskNoFraudReportingVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;

/**
 * 无炸上报任务表 Mapper 接口
 *
 * @author BladeX
 * @since 2024-04-10
 */
public interface TaskNoFraudReportingMapper extends BaseMapper<TaskNoFraudReportingEntity> {

    /**
     * 自定义分页
     *
     * @param page
     * @param taskNoFraudReporting
     * @return
     */
    List<TaskNoFraudReportingVO> selectTaskNoFraudReportingPage(IPage page,
                                                                @Param("place") TaskNoFraudReportingVO taskNoFraudReporting,
                                                                @Param("isAdministrator") Integer isAdministrator,
                                                                @Param("regionChildCodesList") List<String> regionChildCodesList,
                                                                @Param("gridCodeList") List<String> gridCodeList);


    /**
     * 查询无炸上报任务表
     *
     * @param id 无炸上报任务表ID
     * @return 无炸上报任务表
     */
    public TaskNoFraudReportingVO selectTaskNoFraudReportingById(@Param("reporting") TaskNoFraudReportingEntity taskNoFraudReporting);

    /**
     * 查询无炸上报任务表列表
     *
     * @param taskNoFraudReportingDTO 无炸上报任务表
     * @return 无炸上报任务表集合
     */
    public List<TaskNoFraudReportingDTO> selectTaskNoFraudReportingList(TaskNoFraudReportingDTO taskNoFraudReportingDTO);
}

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

New file
@@ -0,0 +1,225 @@
<?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.TaskNoFraudReportingMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="taskNoFraudReportingResultMap" type="org.springblade.modules.task.vo.TaskNoFraudReportingVO">
        <result property="id" column="id"/>
        <result property="taskId" column="task_id"/>
        <result property="taskName" column="task_name"/>
        <result property="placeName" column="place_name"/>
        <result property="remark" column="remark"/>
        <result property="updateTime" column="update_time"/>
        <result property="createTime" column="create_time"/>
        <result property="houseCode" column="house_code"/>
        <result property="createUser" column="create_user"/>
        <result property="imageUrls" column="image_urls"/>
        <result property="status" column="status"/>
        <result property="deleteFlag" column="delete_flag"/>
        <collection property="taskPlaceRecordVOList" column="id" select="selectPatrolRecordList"
                    javaType="java.util.List" ofType="org.springblade.modules.task.vo.TaskPlaceRecordVO"
                    autoMapping="true">
        </collection>
    </resultMap>


    <select id="selectTaskNoFraudReportingPage" resultMap="taskNoFraudReportingResultMap">
        select jtnfr.* from jczz_task_no_fraud_reporting jtnfr
        LEFT JOIN jczz_place jp ON jtnfr.house_code = jp.house_code and jp.is_deleted = 0
        LEFT JOIN jczz_grid jg ON jg.grid_code = jp.grid_code and jg.is_deleted = 0
        LEFT JOIN blade_region br ON br.`code` = jg.community_code
        LEFT JOIN jczz_place_ext jpe ON jpe.place_id = jp.id and jpe.is_deleted = 0
        LEFT JOIN blade_user bu ON bu.id = jtnfr.create_user and bu.is_deleted = 0
        LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
        <where>
            <if test="place.id != null ">and jtnfr.id = #{place.id}</if>
            <if test="place.taskId != null ">and jtnfr.task_id = #{place.taskId}</if>
            <if test="place.taskName != null  and place.taskName != ''">and jtnfr.task_name = #{place.taskName}</if>
            <if test="place.placeName != null  and place.placeName != ''">and jtnfr.place_name = #{place.placeName}</if>
            <if test="place.remark != null  and place.remark != ''">and jtnfr.remark = #{place.remark}</if>
            <if test="place.updateTime != null ">and jtnfr.update_time = #{place.updateTime}</if>
            <if test="place.createTime != null ">and jtnfr.create_time = #{place.createTime}</if>
            <if test="place.houseCode != null  and place.houseCode != ''">and jtnfr.house_code = #{place.houseCode}</if>
            <if test="place.createUser != null ">and jtnfr.create_user = #{createUser}</if>
            <if test="place.imageUrls != null  and place.imageUrls != ''">and jtnfr.image_urls = #{place.imageUrls}</if>
            <if test="place.status != null ">and jtnfr.status = #{place.status}</if>
            <if test="place.deleteFlag != null ">and jtnfr.delete_flag = #{place.deleteFlag}</if>

            <if test="isAdministrator==2">
                <choose>
                    <when test="place.roleName != null and place.roleName != ''">
                        <if test="place.roleName=='wgy'">
                            <choose>
                                <when test="gridCodeList !=null and gridCodeList.size()>0">
                                    and jp.grid_code in
                                    <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                                        #{code}
                                    </foreach>
                                </when>
                                <otherwise>
                                    and jp.grid_code in ('')
                                </otherwise>
                            </choose>
                        </if>
                        <if test="place.roleName=='mj'">
                            <choose>
                                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                                    and jpag.community_code in
                                    <foreach collection="regionChildCodesList" item="code" open="(" close=")"
                                             separator=",">
                                        #{code}
                                    </foreach>
                                </when>
                                <otherwise>
                                    and jpag.community_code in ('')
                                </otherwise>
                            </choose>
                        </if>
                    </when>
                    <otherwise>
                        <choose>
                            <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                                and
                                (
                                jg.grid_code in
                                <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                                    #{code}
                                </foreach>
                                or
                                jpag.community_code in
                                <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                                    #{code}
                                </foreach>
                                )
                            </when>
                            <otherwise>

                            </otherwise>
                        </choose>
                    </otherwise>
                </choose>
            </if>
            order by jtnfr.create_time desc
        </where>
    </select>

    <select id="selectPatrolRecordList" parameterType="Long"
            resultType="org.springblade.modules.task.vo.TaskPlaceRecordVO">
        select jpr.id,
               jpr.item_id,
               jpr.task_place_self_check_id,
               jpr.state,
               jpr.remark,
               jpr.image_urls,
               jpr.create_user,
               jpr.create_time,
               jpr.is_deleted,
               jpr.rectification_image_urls,
               jpr.rectification_remark,
               jpr.rectification_time,
               jpgi.items_name
        from jczz_task_place_record jpr
                 LEFT JOIN jczz_patrol_group_item jpgi on jpr.item_id = jpgi.id
        where task_place_self_check_id = #{id}
          and jpr.type = '2'
    </select>

    <resultMap type="org.springblade.modules.task.vo.TaskNoFraudReportingVO" id="TaskNoFraudReportingDTOResult">
        <result property="id" column="id"/>
        <result property="taskId" column="task_id"/>
        <result property="taskName" column="task_name"/>
        <result property="placeName" column="place_name"/>
        <result property="remark" column="remark"/>
        <result property="updateTime" column="update_time"/>
        <result property="createTime" column="create_time"/>
        <result property="houseCode" column="house_code"/>
        <result property="createUser" column="create_user"/>
        <result property="imageUrls" column="image_urls"/>
        <result property="status" column="status"/>
        <result property="deleteFlag" column="delete_flag"/>

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

    <sql id="selectTaskNoFraudReporting">
        select id,
               task_id,
               task_name,
               place_name,
               remark,
               update_time,
               create_time,
               house_code,
               create_user,
               image_urls,
               status,
               delete_flag
        from jczz_task_no_fraud_reporting
    </sql>

    <select id="selectTaskNoFraudReportingById" parameterType="long" resultMap="TaskNoFraudReportingDTOResult">
        SELECT
        jtnfpr.id,
        jtnfpr.task_id,
        jtnfpr.task_name,
        jtnfpr.place_name,
        jtnfpr.remark,
        jtnfpr.update_time,
        jtnfpr.create_time,
        jtnfpr.house_code,
        jtnfpr.create_user,
        jtnfpr.image_urls,
        jtnfpr.status,
        jtnfpr.delete_flag,
        jp.id jpid,
        jp.place_name,
        jp.location,
        jg.grid_name,
        jp.principal,
        jp.principal_phone,
        br.town_name,
        br.village_name,
        bu.`name`,
        jpe.legal_tel,
        jpe.legal_person,
        jt.remark reasonFailure,
        jda.address_name
        FROM
        jczz_task_no_fraud_reporting jtnfpr
        LEFT JOIN jczz_task jt ON jt.id = jtnfpr.task_id
        LEFT JOIN jczz_place jp ON jtnfpr.house_code = jp.house_code
        LEFT JOIN jczz_grid jg ON jg.grid_code = jp.grid_code
        LEFT JOIN blade_region br ON br.`code` = jg.community_code
        LEFT JOIN jczz_place_ext jpe ON jpe.place_id = jp.id
        LEFT JOIN blade_user bu ON bu.id = jtnfpr.create_user
        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jtnfpr.house_code
        <where>
            <if test="reporting.id != null ">and jtnfpr.id = #{reporting.id}</if>
            <if test="reporting.taskId != null ">and jtnfpr.task_id = #{reporting.taskId}</if>
        </where>
    </select>

    <select id="selectTaskNoFraudReportingList" parameterType="org.springblade.modules.task.vo.TaskNoFraudReportingVO"
            resultMap="TaskNoFraudReportingDTOResult">
        <include refid="selectTaskNoFraudReporting"/>
        <where>
            <if test="id != null ">and id = #{id}</if>
            <if test="taskId != null ">and task_id = #{taskId}</if>
            <if test="taskName != null  and taskName != ''">and task_name = #{taskName}</if>
            <if test="placeName != null  and placeName != ''">and place_name = #{placeName}</if>
            <if test="remark != null  and remark != ''">and remark = #{remark}</if>
            <if test="updateTime != null ">and update_time = #{updateTime}</if>
            <if test="createTime != null ">and create_time = #{createTime}</if>
            <if test="houseCode != null  and houseCode != ''">and house_code = #{houseCode}</if>
            <if test="createUser != null ">and create_user = #{createUser}</if>
            <if test="imageUrls != null  and imageUrls != ''">and image_urls = #{imageUrls}</if>
            <if test="status != null ">and status = #{status}</if>
            <if test="deleteFlag != null ">and delete_flag = #{deleteFlag}</if>
        </where>
    </select>


</mapper>

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

@@ -224,25 +224,24 @@

    <select id="selectPatrolRecordList" parameterType="Long"
            resultType="org.springblade.modules.task.vo.TaskPlaceRecordVO">
            select
            jpr.id,
            jpr.item_id,
            jpr.task_place_self_check_id,
            jpr.state,
            jpr.remark,
            jpr.image_urls,
            jpr.create_user,
            jpr.create_time,
            jpr.is_deleted,
            jpr.rectification_image_urls,
            jpr.rectification_remark,
            jpr.rectification_time,
            jpgi.items_name
        from
            jczz_task_place_record  jpr
            LEFT JOIN jczz_patrol_group_item jpgi on jpr.item_id= jpgi.id
             where task_place_self_check_id = #{id}
        </select>
        select jpr.id,
               jpr.item_id,
               jpr.task_place_self_check_id,
               jpr.state,
               jpr.remark,
               jpr.image_urls,
               jpr.create_user,
               jpr.create_time,
               jpr.is_deleted,
               jpr.rectification_image_urls,
               jpr.rectification_remark,
               jpr.rectification_time,
               jpgi.items_name
        from jczz_task_place_record jpr
                 LEFT JOIN jczz_patrol_group_item jpgi on jpr.item_id = jpgi.id
        where task_place_self_check_id = #{id}
          and jpr.type = '1'
    </select>

    <sql id="selectTaskPlaceSelfCheck">
        select

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

New file
@@ -0,0 +1,48 @@
/*
 *      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.dto.TaskNoFraudReportingDTO;
import org.springblade.modules.task.dto.TaskPlaceSelfCheckDTO;
import org.springblade.modules.task.entity.TaskNoFraudReportingEntity;
import org.springblade.modules.task.vo.TaskNoFraudReportingVO;
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;

/**
 * 无炸上报任务表 服务类
 *
 * @author BladeX
 * @since 2024-04-10
 */
public interface ITaskNoFraudReportingService extends IService<TaskNoFraudReportingEntity> {

    /**
     * 自定义分页
     *
     * @param page
     * @param taskNoFraudReporting
     * @return
     */
    IPage<TaskNoFraudReportingVO> selectTaskNoFraudReportingPage(IPage<TaskNoFraudReportingVO> page, TaskNoFraudReportingVO taskNoFraudReporting);


    Boolean saveNoFraudReporting(TaskNoFraudReportingVO taskNoFraudReporting);

    TaskNoFraudReportingVO selectTaskNoFraudReportingById(TaskNoFraudReportingEntity taskNoFraudReporting);
}

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

New file
@@ -0,0 +1,101 @@
/*
 *      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.apache.commons.lang3.StringUtils;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.task.dto.TaskNoFraudReportingDTO;
import org.springblade.modules.task.dto.TaskPlaceSelfCheckDTO;
import org.springblade.modules.task.entity.TaskPlaceRecordEntity;
import org.springblade.modules.task.mapper.TaskNoFraudReportingMapper;
import org.springblade.modules.task.service.ITaskNoFraudReportingService;
import org.springblade.modules.task.entity.TaskNoFraudReportingEntity;
import org.springblade.modules.task.service.ITaskPlaceRecordService;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskNoFraudReportingVO;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.task.vo.TaskPlaceRecordVO;
import org.springblade.modules.task.vo.TaskPlaceSelfCheckVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

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

/**
 * 无炸上报任务表 服务实现类
 *
 * @author BladeX
 * @since 2024-04-10
 */
@Service
public class TaskNoFraudReportingServiceImpl extends ServiceImpl<TaskNoFraudReportingMapper, TaskNoFraudReportingEntity> implements ITaskNoFraudReportingService {

    @Override
    public IPage<TaskNoFraudReportingVO> selectTaskNoFraudReportingPage(IPage<TaskNoFraudReportingVO> page, TaskNoFraudReportingVO taskNoFraudReporting) {
        CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskNoFraudReportingVO.class, taskNoFraudReporting);
        List<TaskNoFraudReportingVO> taskNoFraudReportingVOS = baseMapper.selectTaskNoFraudReportingPage(page,
            taskNoFraudReporting,
            commonParamSet.getIsAdministrator(),
            commonParamSet.getRegionChildCodesList(),
            commonParamSet.getGridCodeList());
        return page.setRecords(taskNoFraudReportingVOS);
    }

    @Override
    public TaskNoFraudReportingVO selectTaskNoFraudReportingById(TaskNoFraudReportingEntity taskNoFraudReporting) {
        return this.baseMapper.selectTaskNoFraudReportingById(taskNoFraudReporting);
    }

    @Override
    public Boolean saveNoFraudReporting(TaskNoFraudReportingVO taskNoFraudReporting) {
        taskNoFraudReporting.setCreateUser(AuthUtil.getUserId());
        // 1.保存任务表
        ITaskService bean2 = SpringUtils.getBean(ITaskService.class);
        Long aLong = bean2.saveTask(CommonConstant.NUMBER_ONE, DictConstant.NO_FRAUD_REPORTING, 1,
            "", AuthUtil.getUserId(), taskNoFraudReporting.getHouseCode(), CommonConstant.NUMBER_SIX, 1);
        if (aLong <= 0) {
            return false;
        }
        taskNoFraudReporting.setTaskId(aLong);
        // 2.保存任务详情
        boolean save = save(taskNoFraudReporting);
        if (save) {
            // 3.保存题目记录
            List<TaskPlaceRecordVO> taskPlaceRecordList = taskNoFraudReporting.getTaskPlaceRecordVOList();
            ITaskPlaceRecordService bean = SpringUtil.getBean(ITaskPlaceRecordService.class);
            taskPlaceRecordList.stream().forEach(item -> {
                item.setTaskPlaceSelfCheckId(taskNoFraudReporting.getId());
                item.setCreateUser(AuthUtil.getUserId());
                item.setType("2");
            });
            List<TaskPlaceRecordEntity> collect = taskPlaceRecordList.stream().filter(item -> StringUtils.isNotBlank(item.getImageUrls())).collect(Collectors.toList());
            if (collect.size() > 0) {
                bean.saveBatch(collect);
            }
            updateById(taskNoFraudReporting);
            return save;
        }
        return false;
    }
}

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

@@ -155,6 +155,7 @@
            taskPlaceRecordList.stream().forEach(item -> {
                item.setTaskPlaceSelfCheckId(taskPlaceSelfCheck.getId());
                item.setCreateUser(AuthUtil.getUserId());
                item.setType("1");
            });
            List<TaskPlaceRecordEntity> collect = taskPlaceRecordList.stream().filter(item -> item.getState().equals(0)).collect(Collectors.toList());
            if (collect.size() > 0) {

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

New file
@@ -0,0 +1,42 @@
/*
 *      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.vo;

import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.task.entity.TaskNoFraudReportingEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.List;

/**
 * 无炸上报任务表 视图实体类
 *
 * @author BladeX
 * @since 2024-04-10
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class TaskNoFraudReportingVO extends TaskNoFraudReportingEntity {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "隐患项目", example = "")
    private List<TaskPlaceRecordVO> taskPlaceRecordVOList;

    @ApiModelProperty(value = "场所名称", example = "")
    private String placeName;
}

 src/main/java/org/springblade/modules/task/wrapper/TaskNoFraudReportingWrapper.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.TaskNoFraudReportingEntity;
import org.springblade.modules.task.vo.TaskNoFraudReportingVO;
import java.util.Objects;

/**
 * 无炸上报任务表 包装类,返回视图层所需的字段
 *
 * @author BladeX
 * @since 2024-04-10
 */
public class TaskNoFraudReportingWrapper extends BaseEntityWrapper<TaskNoFraudReportingEntity, TaskNoFraudReportingVO>  {

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

    @Override
    public TaskNoFraudReportingVO entityVO(TaskNoFraudReportingEntity taskNoFraudReporting) {
        TaskNoFraudReportingVO taskNoFraudReportingVO = Objects.requireNonNull(BeanUtil.copy(taskNoFraudReporting, TaskNoFraudReportingVO.class));

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

        return taskNoFraudReportingVO;
    }


}