Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/ZsyzSbbzbController.java

@@ -93,6 +93,7 @@ public class ZsyzSbbzbController extends BaseController
     /**
      * 修改招商引资_申报_首谈信息_主
      */
+    @PreAuthorize("@ss.hasPermi('projectV2:sbbzb:edit')")
     @Log(title = "招商引资_申报_首谈信息_主", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZsyzSbbzb zsyzSbbzb)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/common/ZsyzCommonController.java

@@ -11,11 +11,9 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.projectV2.ZsyzFj;
-import com.ruoyi.system.domain.projectV2.ZsyzProjectDept;
-import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
-import com.ruoyi.system.domain.projectV2.ZsyzShyj;
+import com.ruoyi.system.domain.projectV2.*;
 import com.ruoyi.system.service.projectV2.IZsyzFjService;
+import com.ruoyi.system.service.projectV2.IZsyzLcjlService;
 import com.ruoyi.system.service.projectV2.IZsyzProjectDeptService;
 import com.ruoyi.system.service.projectV2.IZsyzSbbzbService;
 import com.ruoyi.system.service.projectV2.common.IZsyzCommonService;
@@ -50,6 +48,8 @@ public class ZsyzCommonController extends BaseController {
 
     @Autowired
     private IZsyzCommonService zsyzCommonService;
+    @Autowired
+    private IZsyzLcjlService zsyzLcjlService;
 
     /**
      * 首页统计
@@ -139,6 +139,7 @@ public class ZsyzCommonController extends BaseController {
                     return AjaxResult.error("该线索已被指派,请勿重复指派或等待当前指派承接地放弃承接");
                 }
             }
+
             ArrayList<SysDept> deptList = zsyzSbbzb.getDeptList();
             if (deptList != null && deptList.size() > 0){
                 for (SysDept sysDept : deptList) {
@@ -151,10 +152,32 @@ public class ZsyzCommonController extends BaseController {
                     //指派给要素部门
                     zsyzProjectDeptService.insertZsyzProjectDept(zsyzProjectDept);
                 }
+                //插入流程记录表
+                SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
+                ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
+                zsyzLcjl.setXmId(zsyzSbbzb.getId());
+                zsyzLcjl.setXmmc(zsyzSbbzb.getXmxsmc());
+                zsyzLcjl.setXmbh(zsyzSbbzb.getXmbh());
+                zsyzLcjl.setDeptId(dept.getDeptId());
+                String deptName = dept.getDeptName();
+                zsyzLcjl.setDeptName(deptName);
+                zsyzLcjl.setProgress(THR);
+                zsyzLcjlService.insertZsyzLcjl(zsyzLcjl);
             }
             zsyzSbbzb.setProgress(FOR);
             zsyzSbbzbService.updateZsyzSbbzbCjd(zsyzSbbzb);
         }
+        //插入流程记录表
+        SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
+        ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
+        zsyzLcjl.setXmId(zsyzSbbzb.getId());
+        zsyzLcjl.setXmmc(zsyzSbbzb.getXmxsmc());
+        zsyzLcjl.setXmbh(zsyzSbbzb.getXmbh());
+        zsyzLcjl.setDeptId(dept.getDeptId());
+        String deptName = dept.getDeptName();
+        zsyzLcjl.setDeptName(deptName);
+        zsyzLcjl.setProgress(zsyzSbbzb.getProgress());
+        zsyzLcjlService.insertZsyzLcjl(zsyzLcjl);
         return AjaxResult.success();
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzKgxxServiceImpl.java

@@ -1,12 +1,12 @@
 package com.ruoyi.system.service.impl.projectV2;
 
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.system.domain.projectV2.ZsyzFj;
-import com.ruoyi.system.domain.projectV2.ZsyzKgxx;
-import com.ruoyi.system.domain.projectV2.ZsyzQyxx;
-import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.projectV2.*;
 import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzKgxxMapper;
+import com.ruoyi.system.mapper.projectV2.ZsyzLcjlMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
 import com.ruoyi.system.service.projectV2.IZsyzKgxxService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +34,9 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
 
     @Autowired
     private ZsyzSbbzbMapper zsyzSbbzbMapper;
+
+    @Autowired
+    private ZsyzLcjlMapper zsyzLcjlMapper;
     /**
      * 查询招商引资_开工信息
      * 
@@ -95,7 +98,17 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
                 zsyzFjMapper.insertZsyzFj(zsyzFj);
             }
         }
-
+        //插入流程记录表
+        SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
+        ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
+        zsyzLcjl.setXmId(zsyzSbbzb.getId());
+        zsyzLcjl.setXmmc(zsyzSbbzb.getXmxsmc());
+        zsyzLcjl.setXmbh(zsyzSbbzb.getXmbh());
+        zsyzLcjl.setDeptId(dept.getDeptId());
+        String deptName = dept.getDeptName();
+        zsyzLcjl.setDeptName(deptName);
+        zsyzLcjl.setProgress(zsyzSbbzb.getProgress());
+        zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
         return count;
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzQyxxServiceImpl.java

@@ -1,10 +1,15 @@
 package com.ruoyi.system.service.impl.projectV2;
 
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.projectV2.ZsyzFj;
+import com.ruoyi.system.domain.projectV2.ZsyzLcjl;
 import com.ruoyi.system.domain.projectV2.ZsyzQyxx;
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
+import com.ruoyi.system.mapper.projectV2.ZsyzLcjlMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzQyxxMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
 import com.ruoyi.system.service.projectV2.IZsyzQyxxService;
@@ -32,6 +37,8 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
     private ZsyzFjMapper zsyzFjMapper;
     @Autowired
     private ZsyzSbbzbMapper zsyzSbbzbMapper;
+    @Autowired
+    private ZsyzLcjlMapper zsyzLcjlMapper;
 
     /**
      * 查询招商引资_签约信息
@@ -72,7 +79,7 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int insertZsyzQyxx(ZsyzQyxx zsyzQyxx) {
         zsyzQyxx.setCreateTime(DateUtils.getNowDate());
         ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
@@ -91,7 +98,17 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
                 zsyzFjMapper.insertZsyzFj(zsyzFj);
             }
         }
-
+        //插入流程记录表
+        SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
+        ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
+        zsyzLcjl.setXmId(zsyzSbbzb.getId());
+        zsyzLcjl.setXmmc(zsyzSbbzb.getXmxsmc());
+        zsyzLcjl.setXmbh(zsyzSbbzb.getXmbh());
+        zsyzLcjl.setDeptId(dept.getDeptId());
+        String deptName = dept.getDeptName();
+        zsyzLcjl.setDeptName(deptName);
+        zsyzLcjl.setProgress(zsyzSbbzb.getProgress());
+        zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
         return count;
 
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzSbbzbServiceImpl.java

@@ -10,21 +10,23 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.common.utils.sign.Md5Utils;
 import com.ruoyi.system.domain.projectV2.ZsyzFj;
+import com.ruoyi.system.domain.projectV2.ZsyzLcjl;
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
-import com.ruoyi.system.mapper.projectV2.XmProjectInvestorMapper;
-import com.ruoyi.system.mapper.projectV2.XmProjectPersionMapper;
-import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
-import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
+import com.ruoyi.system.mapper.projectV2.*;
 import com.ruoyi.system.service.projectV2.IZsyzSbbzbService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.ruoyi.common.constant.CommonConstants.ONE;
+
 /**
  * 招商引资_申报_首谈信息_主Service业务层处理
  *
@@ -45,6 +47,9 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
     @Autowired
     private XmProjectInvestorMapper xmProjectInvestorMapper;
 
+    @Autowired
+    private ZsyzLcjlMapper zsyzLcjlMapper;
+
     /**
      * 企查查
      */
@@ -92,12 +97,13 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int insertZsyzSbbzb(ZsyzSbbzb zsyzSbbzb) {
         //获取当前人员信息
         SysUser user = SecurityUtils.getLoginUser().getUser();
         zsyzSbbzb.setCreateTime(DateUtils.getNowDate());
         zsyzSbbzb.setUserId(user.getUserId());
+        zsyzSbbzb.setDeptId(user.getDeptId());
         int count = zsyzSbbzbMapper.insertZsyzSbbzb(zsyzSbbzb);
         //保存附件信息
         List<ZsyzFj> zsyzFjList = zsyzSbbzb.getZsyzFjList();
@@ -111,8 +117,19 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
             }
         }
         //将项目投资方-自然人、企业两张表赋值项目ID
-        xmProjectPersionMapper.updateXmProjectPersionByXmbh(zsyzSbbzb.getId(),zsyzSbbzb.getXmxsmc(), zsyzSbbzb.getXmbh());
-        xmProjectInvestorMapper.updateXmProjectInvestorByXmbh(zsyzSbbzb.getId(),zsyzSbbzb.getXmxsmc(), zsyzSbbzb.getXmbh());
+        xmProjectPersionMapper.updateXmProjectPersionByXmbh(zsyzSbbzb.getId(), zsyzSbbzb.getXmbh());
+        xmProjectInvestorMapper.updateXmProjectInvestorByXmbh(zsyzSbbzb.getId(), zsyzSbbzb.getXmbh());
+
+        //插入流程记录表
+        ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
+        zsyzLcjl.setXmId(zsyzSbbzb.getId());
+        zsyzLcjl.setXmmc(zsyzSbbzb.getXmxsmc());
+        zsyzLcjl.setXmbh(zsyzSbbzb.getXmbh());
+        zsyzLcjl.setDeptId(user.getDeptId());
+        String deptName = user.getDept().getDeptName();
+        zsyzLcjl.setDeptName(deptName);
+        zsyzLcjl.setProgress(ONE);
+        zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
         return count;
     }
 
@@ -198,6 +215,7 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
     }
 
     @Override
+    @DataScope(deptAlias = "s")
     public List<ZsyzSbbzb> selectZsyzSbbzbListDc(ZsyzSbbzb zsyzSbbzb) {
         return zsyzSbbzbMapper.selectZsyzSbbzbListDc(zsyzSbbzb);
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzTcxxServiceImpl.java

@@ -1,11 +1,11 @@
 package com.ruoyi.system.service.impl.projectV2;
 
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.system.domain.projectV2.ZsyzFj;
-import com.ruoyi.system.domain.projectV2.ZsyzQyxx;
-import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
-import com.ruoyi.system.domain.projectV2.ZsyzTcxx;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.projectV2.*;
 import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
+import com.ruoyi.system.mapper.projectV2.ZsyzLcjlMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzTcxxMapper;
 import com.ruoyi.system.service.projectV2.IZsyzTcxxService;
@@ -35,6 +35,8 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
     @Autowired
     private ZsyzSbbzbMapper zsyzSbbzbMapper;
 
+    @Autowired
+    private ZsyzLcjlMapper zsyzLcjlMapper;
     /**
      * 查询招商引资_投产信息
      *
@@ -74,7 +76,7 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int insertZsyzTcxx(ZsyzTcxx zsyzTcxx) {
 
         zsyzTcxx.setCreateTime(DateUtils.getNowDate());
@@ -95,6 +97,17 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
                 zsyzFjMapper.insertZsyzFj(zsyzFj);
             }
         }
+        //插入流程记录表
+        SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
+        ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
+        zsyzLcjl.setXmId(zsyzSbbzb.getId());
+        zsyzLcjl.setXmmc(zsyzSbbzb.getXmxsmc());
+        zsyzLcjl.setXmbh(zsyzSbbzb.getXmbh());
+        zsyzLcjl.setDeptId(dept.getDeptId());
+        String deptName = dept.getDeptName();
+        zsyzLcjl.setDeptName(deptName);
+        zsyzLcjl.setProgress(zsyzSbbzb.getProgress());
+        zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
         return count;
 
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/common/ZsyzCommonServiceImpL.java

@@ -9,10 +9,8 @@ import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.projectV2.ZsyzProjectDept;
-import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
-import com.ruoyi.system.domain.projectV2.ZsyzShyj;
-import com.ruoyi.system.domain.projectV2.ZsyzSkxm;
+import com.ruoyi.system.domain.projectV2.*;
+import com.ruoyi.system.mapper.projectV2.ZsyzLcjlMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzShyjMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzSkxmMapper;
@@ -57,6 +55,9 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
     @Autowired
     private RedisCache redisCache;
 
+    @Autowired
+    private ZsyzLcjlMapper zsyzLcjlMapper;
+
     //主要功能, 对线索进度进行控制
     @Override
     public AjaxResult xssh(ZsyzShyj zsyzShyj) {
@@ -100,6 +101,17 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             zsyzSbbzb.setShjg(TWO);
             zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         }
+
+        //插入流程记录表
+        ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
+        zsyzLcjl.setXmId(zsyzSbbzb.getId());
+        zsyzLcjl.setXmmc(zsyzSbbzb.getXmxsmc());
+        zsyzLcjl.setXmbh(zsyzSbbzb.getXmbh());
+        zsyzLcjl.setDeptId(dept.getDeptId());
+        String deptName = dept.getDeptName();
+        zsyzLcjl.setDeptName(deptName);
+        zsyzLcjl.setProgress(zsyzSbbzb.getProgress());
+        zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
         return AjaxResult.success();
     }
 

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzLcjlMapper.xml

@@ -57,13 +57,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmmc != null and xmmc != ''">xmmc,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="deptName != null and deptName != ''">dept_name,</if>
-            <if test="clTime != null">cl_time,</if>
             <if test="progress != null">progress,</if>
             <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            cl_time,
+            create_time
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmId != null">#{xmId},</if>
@@ -71,13 +71,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="deptName != null and deptName != ''">#{deptName},</if>
-            <if test="clTime != null">#{clTime},</if>
             <if test="progress != null">#{progress},</if>
             <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            sysdate(),
+            sysdate()
          </trim>
     </insert>
 

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzSbbzbMapper.xml

@@ -236,8 +236,25 @@
         s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
         s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, s.dept_id, s.create_time, s.update_by,
         s.is_del, s.update_time, s.remark, s.cjd_id,
-        s.cjd_name, s.is_meet, s.meet_remark,s.shjg
+        s.cjd_name, s.is_meet, s.meet_remark,s.shjg,
+        q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq,q.xytzely, q.xytze, q.swzj, q.gdzctze,
+        q.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
+        q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
+        q.zlcf,q.gdmj, q.zcqymc, q.zcrq, q.zczb, q.frdb, q.lxfs, q.jyfw, q.lxrq, q.nkgrq,q. path, q.create_by,
+        q.create_time,
+        q.update_by, q.update_time, q.remark,
+        k.id, k.xm_id, k.xmbh, k.xmmc, k.kgrq, k.njgrq, k.sscrq, k.ntcsj, k.rtsj, k.nrtsj, k.kggjrsjh, k.create_by,
+        k.create_time, k.update_by,
+        k.update_time, k.remark,
+        t.id, t.xm_id, t.xmbh, t.xmmc, t.tcrq, t.rgsj, t.nrgsj, t.tcgjrsjh, t.sjdze, t.ydmj, t.tdcr, t.xjcf, t.cftr,
+        t.sbqd, t.sbfp, t.sbht, t.fkpz, t.zlcf,
+        t.zlcftr, t.zlsbqd, t.zlsbfp, t.zlsbht, t.zlfkpz, t.sjss, t.lxy, t.jnsb, t.zbtr, t.ndsjss, t.qt, t.create_by,
+        t.create_time, t.update_by,
+        t.update_time, t.remark
         from zsyz_sbbzb s
+        left join zsyz_qyxx q on s.id = q.xm_id
+        left join zsyz_kgxx k on s.id = k.xm_id
+        left join zsyz_tcxx t on s.id = t.xm_id
         <where>
             s.is_del = 'N'
             <if test="sbdw != null  and sbdw != ''">and s.sbdw = #{sbdw}</if>
@@ -373,7 +390,16 @@
             <if test="cjdName != null  and cjdName != ''">and s.cjd_name like concat('%', #{cjdName}, '%')</if>
             <if test="isMeet != null  and isMeet != ''">and s.is_meet = #{isMeet}</if>
             <if test="meetRemark != null  and meetRemark != ''">and s.meet_remark = #{meetRemark}</if>
+            <if test="shjg != null  and shjg != ''">and s.shjg = #{shjg}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(s.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(s.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+            </if>
         </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
     <select id="selectZsyzSbbzbListByZp" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">
         select s.id,