领导批示修改

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

@@ -69,6 +69,18 @@ public class ZsyzLdpsController extends BaseController
         return success(zsyzLdpsService.selectZsyzLdpsById(id));
     }
 
+
+    /**
+     * 查询当前账号最新的暂存数据
+     */
+    @PreAuthorize("@ss.hasPermi('system:ldps:queryZc')")
+    @GetMapping(value = "/zc")
+    public AjaxResult getInfoZc(ZsyzLdps zsyzLdps)
+    {
+        return success(zsyzLdpsService.getInfoZc(zsyzLdps));
+    }
+
+
     /**
      * 新增招商引资_领导批示
      */
@@ -93,6 +105,7 @@ public class ZsyzLdpsController extends BaseController
     /**
      * 删除招商引资_领导批示
      */
+    @PreAuthorize("@ss.hasPermi('system:ldps:delete')")
     @Log(title = "招商引资_领导批示", businessType = BusinessType.DELETE)
 	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -60,11 +60,9 @@ public class ZsyzSbbzbController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectV2:sbbzb:ldps:list')")
     public TableDataInfo ldpsList(ZsyzSbbzb zsyzSbbzb)
     {
-        //查询总数
-        long count = zsyzSbbzbService.ldpsListCount(zsyzSbbzb);
         startPage();
         List<ZsyzSbbzb> list = zsyzSbbzbService.ldpsList(zsyzSbbzb);
-        return getDataTable(list,count);
+        return getDataTable(list);
     }
 
     /**

ruoyi-admin/src/main/resources/application.yml

@@ -70,6 +70,6 @@ xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）
-  excludes: /system/notice
+  excludes: /system/notice,/system/app/new
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage").permitAll()
+                .antMatchers("/login", "/register", "/captchaImage","/system/app/new").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzSbbzbServiceImpl.java

@@ -316,13 +316,29 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
     @Override
     public List<ZsyzSbbzb> ldpsList(ZsyzSbbzb zsyzSbbzb) {
 
-        return zsyzSbbzbMapper.ldpsList(zsyzSbbzb);
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        List<ZsyzSbbzb> zsyzSbbzbs = new ArrayList<>();
+        boolean flag = true;
+        if (roles != null){
+            for (SysRole role : roles) {
+                String roleKey = role.getRoleKey();
+                if (YSBM.equals(roleKey)){
+                    //如果是要素部门角色只能看到分派给要素部门的和自己新增的线索
+                    flag = false;
+                    break;
+                }
+            }
+        }
+        if (flag){
+            zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbListPs(zsyzSbbzb);
+        }else {
+            //如果是要素部门角色只能看到分派给要素部门的和自己新增的线索
+            zsyzSbbzb.setDeptId(SecurityUtils.getDeptId());
+            zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbListByZpPs(zsyzSbbzb);
+        }
+        return zsyzSbbzbs;
     }
 
-    @Override
-    public long ldpsListCount(ZsyzSbbzb zsyzSbbzb) {
-        return zsyzSbbzbMapper.ldpsListCount(zsyzSbbzb);
-    }
 
     @Override
     public long selectZsyzSbbzbListCount(ZsyzSbbzb zsyzSbbzb) {

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/common/ZsyzCommonServiceImpL.java

@@ -467,6 +467,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             if (zsyzSkxms != null && zsyzSkxms.size() > 0) {
                 sk = zsyzSkxms.size();
             }
+
         } else {
             //如果不是admin/或者平台管理员 判断是什么角色
             //如果是FALSE 则包含承接地
@@ -487,6 +488,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         int kg = 0;
         int tc = 0;
         int all = 0;
+        int ps = 0;
         if (zsyzSbbzbs != null && zsyzSbbzbs.size() > 0) {
             Map<String, List<ZsyzSbbzb>> collect = zsyzSbbzbs.stream().collect(Collectors.groupingBy(ZsyzSbbzb::getProgress));
 
@@ -535,9 +537,11 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         }
         map.put("wt", wt);
         //统计批示项目数量
-        ZsyzSbbzb zsyzSbb = new ZsyzSbbzb();
-        zsyzSbbzb.setDeptId(deptId);
-        long ps = zsyzSbbzbMapper.ldpsListCount(zsyzSbb);
+        for (ZsyzSbbzb sbbzb : zsyzSbbzbs) {
+            if(StringUtils.isNotEmpty(sbbzb.getPsnr())){
+                ps++;
+            }
+        }
         map.put("ps", ps);
         map.put("all", all);
         return AjaxResult.success(map);

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzLdps.java

@@ -36,10 +36,6 @@ public class ZsyzLdps extends BaseEntity
     private String xmmc;
 
 
-    /** 目标数据id（审核表id） */
-    @Excel(name = "目标数据id", readConverterExp = "审=核表id")
-    private Long sourceId;
-
     /** 批示内容 */
     @Excel(name = "批示内容")
     private String psnr;
@@ -52,6 +48,8 @@ public class ZsyzLdps extends BaseEntity
     @Excel(name = "部门id")
     private Long deptId;
 
+    /** 批示人id */
+    private Long psnrId;
 
     /** 创建者 */
     private String psr;
@@ -115,16 +113,16 @@ public class ZsyzLdps extends BaseEntity
     {
         return xmbh;
     }
-    public void setSourceId(Long sourceId) 
-    {
-        this.sourceId = sourceId;
+
+    public Long getPsnrId() {
+        return psnrId;
     }
 
-    public Long getSourceId() 
-    {
-        return sourceId;
+    public void setPsnrId(Long psnrId) {
+        this.psnrId = psnrId;
     }
-    public void setPsnr(String psnr) 
+
+    public void setPsnr(String psnr)
     {
         this.psnr = psnr;
     }
@@ -197,7 +195,6 @@ public class ZsyzLdps extends BaseEntity
             .append("id", getId())
             .append("xmId", getXmId())
             .append("xmbh", getXmbh())
-            .append("sourceId", getSourceId())
             .append("psnr", getPsnr())
             .append("remark", getRemark())
             .append("deptId", getDeptId())

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzSbbzb.java

@@ -285,6 +285,19 @@ public class ZsyzSbbzb extends BaseEntity
      */
     private String exportType;
 
+    /***
+     * 最新的一次领导批示内容
+     */
+    private String psnr;
+
+    public String getPsnr() {
+        return psnr;
+    }
+
+    public void setPsnr(String psnr) {
+        this.psnr = psnr;
+    }
+
     public String getShsj() {
         return shsj;
     }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/projectV2/ZsyzLdpsMapper.java

@@ -58,4 +58,6 @@ public interface ZsyzLdpsMapper
      * @return 结果
      */
     public int deleteZsyzLdpsByIds(Long[] ids);
+
+    ZsyzLdps getInfoZc(ZsyzLdps zsyzLdps);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/projectV2/ZsyzSbbzbMapper.java

@@ -90,12 +90,12 @@ public interface ZsyzSbbzbMapper
 
     List<ZsyzSbbzb> selectZsyzSbbzbListDc(ZsyzSbbzb zsyzSbbzb);
 
-    List<ZsyzSbbzb> ldpsList(ZsyzSbbzb zsyzSbbzb);
-
-
-    long ldpsListCount(ZsyzSbbzb zsyzSbb);
 
     long selectZsyzSbbzbListCount(ZsyzSbbzb zsyzSbbzb);
 
     List<ZsyzSbbzb> selectZsyzSbbzbListTz(@Param("year")String year, @Param("deptId")Long deptId);
+
+    List<ZsyzSbbzb> selectZsyzSbbzbListPs(ZsyzSbbzb zsyzSbbzb);
+
+    List<ZsyzSbbzb> selectZsyzSbbzbListByZpPs(ZsyzSbbzb zsyzSbbzb);
 }

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

@@ -2,15 +2,23 @@ package com.ruoyi.system.service.impl.projectV2;
 
 import java.util.List;
 
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.projectV2.ZsyzDbd;
+import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
+import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.projectV2.ZsyzLdpsMapper;
 import com.ruoyi.system.domain.projectV2.ZsyzLdps;
 import com.ruoyi.system.service.projectV2.IZsyzLdpsService;
 
+import static com.ruoyi.common.constant.CommonConstants.LEADER;
+import static com.ruoyi.common.constant.CommonConstants.MANAGE;
+
 /**
  * 招商引资_领导批示Service业务层处理
  * 
@@ -22,6 +30,8 @@ public class ZsyzLdpsServiceImpl implements IZsyzLdpsService
 {
     @Autowired
     private ZsyzLdpsMapper zsyzLdpsMapper;
+    @Autowired
+    private ZsyzSbbzbMapper zsyzSbbzbMapper;
 
     /**
      * 查询招商引资_领导批示
@@ -44,6 +54,18 @@ public class ZsyzLdpsServiceImpl implements IZsyzLdpsService
     @Override
     public List<ZsyzLdps> selectZsyzLdpsList(ZsyzLdps zsyzLdps)
     {
+
+        SysUser currentUser = SecurityUtils.getLoginUser().getUser();
+        String roleKey = "";
+        // 如果是超级管理员/管理员，则不过滤数据
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        if (roles != null && roles.size() > 0) {
+            roleKey = roles.get(0).getRoleKey();
+        }
+        if (LEADER.equals(roleKey)) {
+        //判断账号权限是不是领导，领导只能看见自己的
+            zsyzLdps.setPsnrId(currentUser.getUserId());
+        }
         return zsyzLdpsMapper.selectZsyzLdpsList(zsyzLdps);
     }
 
@@ -59,8 +81,19 @@ public class ZsyzLdpsServiceImpl implements IZsyzLdpsService
         //获取当前人员信息
         SysUser user = SecurityUtils.getLoginUser().getUser();
         zsyzLdps.setDeptId(user.getDeptId());
-        zsyzLdps.setPsr(user.getUserName());
+        zsyzLdps.setPsr(user.getNickName());
+        zsyzLdps.setXgr(user.getUserName());
+        zsyzLdps.setPsnrId(user.getUserId());
+        zsyzLdps.setXgsj(DateUtils.getNowDate());
         zsyzLdps.setCjsj(DateUtils.getNowDate());
+        if(!"1".equals(zsyzLdps.getType())){
+            //修改主表中的领导批示内容
+            ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
+            zsyzSbbzb.setId(zsyzLdps.getXmId());
+            zsyzSbbzb.setPsnr(zsyzLdps.getPsnr());
+            zsyzSbbzbMapper.updateZsyzSbbzb(zsyzSbbzb);
+        }
+
         return zsyzLdpsMapper.insertZsyzLdps(zsyzLdps);
     }
 
@@ -77,8 +110,14 @@ public class ZsyzLdpsServiceImpl implements IZsyzLdpsService
         SysUser user = SecurityUtils.getLoginUser().getUser();
         zsyzLdps.setXgsj(DateUtils.getNowDate());
         zsyzLdps.setXgr(user.getUserName());
+        zsyzLdps.setPsr(user.getNickName());
         if(!"1".equals(zsyzLdps.getType())){
             zsyzLdps.setZcpsnr("");
+            //修改主表中的领导批示内容
+            ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
+            zsyzSbbzb.setId(zsyzLdps.getXmId());
+            zsyzSbbzb.setPsnr(zsyzLdps.getPsnr());
+            zsyzSbbzbMapper.updateZsyzSbbzb(zsyzSbbzb);
         }
         return zsyzLdpsMapper.updateZsyzLdps(zsyzLdps);
     }
@@ -106,4 +145,12 @@ public class ZsyzLdpsServiceImpl implements IZsyzLdpsService
     {
         return zsyzLdpsMapper.deleteZsyzLdpsById(id);
     }
+
+    @Override
+    public ZsyzLdps getInfoZc(ZsyzLdps zsyzLdps) {
+        //获取当前人员信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        zsyzLdps.setPsnrId(user.getUserId());
+        return zsyzLdpsMapper.getInfoZc(zsyzLdps);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/projectV2/IZsyzLdpsService.java

@@ -58,4 +58,6 @@ public interface IZsyzLdpsService
      * @return 结果
      */
     public int deleteZsyzLdpsById(Long id);
+
+    public ZsyzLdps getInfoZc(ZsyzLdps zsyzLdps);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/projectV2/IZsyzSbbzbService.java

@@ -77,7 +77,6 @@ public interface IZsyzSbbzbService
 
     List<ZsyzSbbzb> ldpsList(ZsyzSbbzb zsyzSbbzb);
 
-    long ldpsListCount(ZsyzSbbzb zsyzSbbzb);
 
     long selectZsyzSbbzbListCount(ZsyzSbbzb zsyzSbbzb);
 

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

@@ -9,10 +9,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="xmId"    column="xm_id"    />
         <result property="xmbh"    column="xmbh"    />
         <result property="xmmc"    column="xmmc"    />
-        <result property="sourceId"    column="source_id"    />
         <result property="psnr"    column="psnr"    />
         <result property="remark"    column="remark"    />
         <result property="deptId"    column="dept_id"    />
+        <result property="psnrId"    column="psnr_id"    />
         <result property="psr"    column="psr"    />
         <result property="cjsj"    column="cjsj"    />
         <result property="xgr"    column="xgr"    />
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZsyzLdpsVo">
-        select id, xm_id, xmbh,xmmc, source_id, psnr,zcpsnr, remark, dept_id, psr, cjsj, xgr, xgsj from zsyz_ldps
+        select id, xm_id, xmbh,xmmc, psnr,zcpsnr, remark, dept_id,psnr_id, psr, cjsj, xgr, xgsj from zsyz_ldps
     </sql>
 
     <select id="selectZsyzLdpsList" parameterType="ZsyzLdps" resultMap="ZsyzLdpsResult">
@@ -28,9 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="xmId != null "> and xm_id = #{xmId}</if>
             <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
-            <if test="sourceId != null "> and source_id = #{sourceId}</if>
             <if test="psnr != null  and psnr != ''"> and psnr = #{psnr}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="psnrId != null "> and psnr_id = #{psnrId}</if>
         </where>
     </select>
     
@@ -38,36 +38,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectZsyzLdpsVo"/>
         where id = #{id}
     </select>
-        
+    <select id="getInfoZc" resultMap="ZsyzLdpsResult">
+        <include refid="selectZsyzLdpsVo"/>
+        where psnr_id = #{psnrId}
+        and xm_id = #{xmId}
+        and zcpsnr !=''
+        and zcpsnr is not null
+        and (psnr = '' or psnr is null)
+    </select>
+
     <insert id="insertZsyzLdps" parameterType="ZsyzLdps" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_ldps
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="xmId != null">xm_id,</if>
             <if test="xmbh != null">xmbh,</if>
             <if test="xmmc != null">xmmc,</if>
-            <if test="sourceId != null">source_id,</if>
             <if test="psnr != null">psnr,</if>
             <if test="zcpsnr != null">zcpsnr,</if>
             <if test="remark != null">remark,</if>
             <if test="deptId != null">dept_id,</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="psr != null ">psr,</if>
+            <if test="psnrId != null ">psnr_id,</if>
+            <if test="cjsj != null">cjsj,</if>
+            <if test="xgr != null">xgr,</if>
+            <if test="xgsj != null">xgsj,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmId != null">#{xmId},</if>
             <if test="xmbh != null">#{xmbh},</if>
             <if test="xmmc != null">#{xmmc},</if>
-            <if test="sourceId != null">#{sourceId},</if>
             <if test="psnr != null">#{psnr},</if>
             <if test="zcpsnr != null">#{zcpsnr},</if>
             <if test="remark != null">#{remark},</if>
             <if test="deptId != null">#{deptId},</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="psr != null ">#{psr},</if>
+            <if test="psnrId != null ">#{psnrId},</if>
+            <if test="cjsj != null">#{cjsj},</if>
+            <if test="xgr != null">#{xgr},</if>
+            <if test="xgsj != null">#{xgsj},</if>
          </trim>
     </insert>
 
@@ -77,15 +85,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmId != null">xm_id = #{xmId},</if>
             <if test="xmbh != null">xmbh = #{xmbh},</if>
             <if test="xmmc != null">xmmc = #{xmmc},</if>
-            <if test="sourceId != null">source_id = #{sourceId},</if>
             <if test="psnr != null">psnr = #{psnr},</if>
             <if test="zcpsnr != null">zcpsnr = #{zcpsnr},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="psr != null ">psr = #{psr},</if>
+            <if test="psnrId != null ">psnr_id = #{psnrId},</if>
+            <if test="cjsj != null">cjsj = #{cjsj},</if>
+            <if test="xgr != null">xgr = #{xgr},</if>
+            <if test="xgsj != null">xgsj = #{xgsj},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -55,6 +55,8 @@
         <result property="meetRemark" column="meet_remark"/>
         <result property="shjg" column="shjg"/>
         <result property="shsj" column="shsj"/>
+        <result property="psnr" column="psnr"/>
+
 
 
 
@@ -257,7 +259,7 @@
                cjd_name,
                is_meet,
                meet_remark,
-               shjg
+               shjg,psnr
         from zsyz_sbbzb
     </sql>
 
@@ -268,7 +270,7 @@
         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.xm_status, 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,s.psnr,
         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,
@@ -343,6 +345,90 @@
         order by s.create_time desc
     </select>
 
+
+    <select id="selectZsyzSbbzbListPs" parameterType="ZsyzSbbzb" resultMap="ZsyzSbbzbResult">
+        select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
+        s.ntze, s.cylx_id, s.cylx_name, s.xmlb,
+        s.tzlb, s.nlhd, s.czpt, s.tzzt, s.xmjz, s.gtzzrsfzhm, s.qytzrxyzdm, s.qybj, s.tzfjj, s.sndxse, s.sndnse,
+        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.xm_status, 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.psnr,
+        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' and s.psnr is not null
+            <if test="sbdw != null  and sbdw != ''">and s.sbdw = #{sbdw}</if>
+            <if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
+            <if test="zszxfzr != null  and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
+            <if test="xmbh != null  and xmbh != ''">and s.xmbh = #{xmbh}</if>
+            <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+            <if test="sfwlhxxxm != null  and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
+            <if test="yzdqId != null  and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
+            <if test="yzdqName != null  and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
+            <if test="yzssName != null  and yzssName != ''">and s.yzss_name like concat('%', #{yzssName}, '%')</if>
+            <if test="ntze != null  and ntze != ''">and s.ntze = #{ntze}</if>
+            <if test="cylxId != null  and cylxId != ''">and s.cylx_id = #{cylxId}</if>
+            <if test="cylxName != null  and cylxName != ''">and s.cylx_name like concat('%', #{cylxName}, '%')</if>
+            <if test="xmlb != null  and xmlb != ''">and s.xmlb = #{xmlb}</if>
+            <if test="tzlb != null  and tzlb != ''">and s.tzlb = #{tzlb}</if>
+            <if test="nlhd != null  and nlhd != ''">and s.nlhd = #{nlhd}</if>
+            <if test="czpt != null  and czpt != ''">and s.czpt = #{czpt}</if>
+            <if test="tzzt != null  and tzzt != ''">and s.tzzt = #{tzzt}</if>
+            <if test="xmjz != null  and xmjz != ''">and s.xmjz = #{xmjz}</if>
+            <if test="gtzzrsfzhm != null  and gtzzrsfzhm != ''">and s.gtzzrsfzhm = #{gtzzrsfzhm}</if>
+            <if test="qytzrxyzdm != null  and qytzrxyzdm != ''">and s.qytzrxyzdm = #{qytzrxyzdm}</if>
+            <if test="qybj != null  and qybj != ''">and s.qybj = #{qybj}</if>
+            <if test="tzfjj != null  and tzfjj != ''">and s.tzfjj = #{tzfjj}</if>
+            <if test="sndxse != null  and sndxse != ''">and s.sndxse = #{sndxse}</if>
+            <if test="sndnse != null  and sndnse != ''">and s.sndnse = #{sndnse}</if>
+            <if test="tzrxm != null  and tzrxm != ''">and s.tzrxm = #{tzrxm}</if>
+            <if test="tzrzw != null  and tzrzw != ''">and s.tzrzw = #{tzrzw}</if>
+            <if test="tzrdh != null  and tzrdh != ''">and s.tzrdh = #{tzrdh}</if>
+            <if test="xmjj != null  and xmjj != ''">and s.xmjj = #{xmjj}</if>
+            <if test="name != null  and name != ''">and s.name like concat('%', #{name}, '%')</if>
+            <if test="strq != null ">and s.strq = #{strq}</if>
+            <if test="phone != null  and phone != ''">and s.phone = #{phone}</if>
+            <if test="zw != null  and zw != ''">and s.zw = #{zw}</if>
+            <if test="userId != null ">and s.user_id = #{userId}</if>
+            <if test="type != null  and type != ''">and s.type = #{type}</if>
+            <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
+            <if test="xmStatus != null  and xmStatus != ''">and xm_status = #{xmStatus})</if>
+            <if test="isDel != null  and isDel != ''">and s.is_del = #{isDel}</if>
+            <if test="cjdId != null ">and s.cjd_id = #{cjdId}</if>
+            <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}
+        order by s.create_time desc
+    </select>
+
     <select id="selectZsyzSbbzbById" parameterType="Long" resultMap="ZsyzSbbzbResult">
                 select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
         s.ntze, s.cylx_id, s.cylx_name, s.xmlb,
@@ -350,7 +436,7 @@
         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.xm_status, 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,s.psnr
         from zsyz_sbbzb s
         where s.id = #{id} and s.is_del = 'N'
     </select>
@@ -362,7 +448,7 @@
         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.xm_status, 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.cjd_name, s.is_meet, s.meet_remark,s.psnr,
         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,
@@ -488,7 +574,7 @@
         s.cjd_id,
         s.cjd_name,
         s.is_meet,
-        s.meet_remark
+        s.meet_remark,s.psnr
         from zsyz_project_dept d
         left join zsyz_sbbzb s on s.id = d.xm_id
         where s.is_del = 'N'
@@ -553,7 +639,7 @@
         s.cjd_id,
         s.cjd_name,
         s.is_meet,
-        s.meet_remark
+        s.meet_remark,s.psnr
         from zsyz_sbbzb s
         where s.is_del = 'N'
         <if test="deptId != null  and deptId != ''">and s.dept_id = #{deptId}</if>
@@ -572,126 +658,140 @@
 
         order by d.create_time desc
     </select>
-    <select id="ldpsList" parameterType="ZsyzSbbzb" resultMap="ZsyzSbbzbResult">
-        select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
-        s.ntze, s.cylx_id, s.cylx_name, s.xmlb,
-        s.tzlb, s.nlhd, s.czpt, s.tzzt, s.xmjz, s.gtzzrsfzhm, s.qytzrxyzdm, s.qybj, s.tzfjj, s.sndxse, s.sndnse,
-        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.xm_status, 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,
-        j.id,j.xm_id,j.xmbh,j.xmmc,j.dept_id,j.shrxm,j.xmjd,j.shjg,j.shyj,j.shsj
-        from zsyz_sbbzb s
-        left join zsyz_shyj j on s.id = j.xm_id
-        left join zsyz_ldps l on l.source_id = j.id
-        <where>
-            s.is_del = 'N' and l.psnr is not null
-            <if test="sbdw != null  and sbdw != ''">and s.sbdw = #{sbdw}</if>
-            <if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
-            <if test="zszxfzr != null  and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
-            <if test="xmbh != null  and xmbh != ''">and s.xmbh = #{xmbh}</if>
-            <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
-            <if test="sfwlhxxxm != null  and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
-            <if test="yzdqId != null  and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
-            <if test="yzdqName != null  and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
-            <if test="yzssName != null  and yzssName != ''">and s.yzss_name like concat('%', #{yzssName}, '%')</if>
-            <if test="ntze != null  and ntze != ''">and s.ntze = #{ntze}</if>
-            <if test="cylxId != null  and cylxId != ''">and s.cylx_id = #{cylxId}</if>
-            <if test="cylxName != null  and cylxName != ''">and s.cylx_name like concat('%', #{cylxName}, '%')</if>
-            <if test="xmlb != null  and xmlb != ''">and s.xmlb = #{xmlb}</if>
-            <if test="tzlb != null  and tzlb != ''">and s.tzlb = #{tzlb}</if>
-            <if test="nlhd != null  and nlhd != ''">and s.nlhd = #{nlhd}</if>
-            <if test="czpt != null  and czpt != ''">and s.czpt = #{czpt}</if>
-            <if test="tzzt != null  and tzzt != ''">and s.tzzt = #{tzzt}</if>
-            <if test="xmjz != null  and xmjz != ''">and s.xmjz = #{xmjz}</if>
-            <if test="gtzzrsfzhm != null  and gtzzrsfzhm != ''">and s.gtzzrsfzhm = #{gtzzrsfzhm}</if>
-            <if test="qytzrxyzdm != null  and qytzrxyzdm != ''">and s.qytzrxyzdm = #{qytzrxyzdm}</if>
-            <if test="qybj != null  and qybj != ''">and s.qybj = #{qybj}</if>
-            <if test="tzfjj != null  and tzfjj != ''">and s.tzfjj = #{tzfjj}</if>
-            <if test="sndxse != null  and sndxse != ''">and s.sndxse = #{sndxse}</if>
-            <if test="sndnse != null  and sndnse != ''">and s.sndnse = #{sndnse}</if>
-            <if test="tzrxm != null  and tzrxm != ''">and s.tzrxm = #{tzrxm}</if>
-            <if test="tzrzw != null  and tzrzw != ''">and s.tzrzw = #{tzrzw}</if>
-            <if test="tzrdh != null  and tzrdh != ''">and s.tzrdh = #{tzrdh}</if>
-            <if test="xmjj != null  and xmjj != ''">and s.xmjj = #{xmjj}</if>
-            <if test="name != null  and name != ''">and s.name like concat('%', #{name}, '%')</if>
-            <if test="strq != null ">and s.strq = #{strq}</if>
-            <if test="phone != null  and phone != ''">and s.phone = #{phone}</if>
-            <if test="zw != null  and zw != ''">and s.zw = #{zw}</if>
-            <if test="userId != null ">and s.user_id = #{userId}</if>
-            <if test="type != null  and type != ''">and s.type = #{type}</if>
-            <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
-            <if test="xmStatus != null  and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
-            <if test="cjdId != null ">and s.cjd_id = #{cjdId}</if>
-            <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="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}
-        order by cjsj desc
-    </select>
-    <select id="ldpsListCount" resultType="java.lang.Long">
-        select count(1)
-        from (select s.id
+
+    <select id="selectZsyzSbbzbListByZpPs"  resultMap="ZsyzSbbzbResult">
+        SELECT * from ( select s.id,
+        s.sbdw,
+        s.tbrq,
+        s.zszxfzr,
+        s.xmbh,
+        s.xmxsmc,
+        s.sfwlhxxxm,
+        s.yzdq_id,
+        s.yzdq_name,
+        s.yzss_name,
+        s.ntze,
+        s.cylx_id,
+        s.cylx_name,
+        s.xmlb,
+        s.tzlb,
+        s.nlhd,
+        s.czpt,
+        s.tzzt,
+        s.xmjz,
+        s.gtzzrsfzhm,
+        s.qytzrxyzdm,
+        s.qybj,
+        s.tzfjj,
+        s.sndxse,
+        s.sndnse,
+        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.xm_status,
+        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.psnr
+        from zsyz_project_dept d
+        left join zsyz_sbbzb s on s.id = d.xm_id
+        where s.is_del = 'N'
+        and d.dept_id = #{deptId} and d.is_del = 'N' and d.dept_type = '2'
+        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+        <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
+        <if test="xmStatus != null  and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
+        <if test="cjdId != null ">and cjd_id = #{cjdId}</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>
+
+        UNION
+
+        select s.id,
+        s.sbdw,
+        s.tbrq,
+        s.zszxfzr,
+        s.xmbh,
+        s.xmxsmc,
+        s.sfwlhxxxm,
+        s.yzdq_id,
+        s.yzdq_name,
+        s.yzss_name,
+        s.ntze,
+        s.cylx_id,
+        s.cylx_name,
+        s.xmlb,
+        s.tzlb,
+        s.nlhd,
+        s.czpt,
+        s.tzzt,
+        s.xmjz,
+        s.gtzzrsfzhm,
+        s.qytzrxyzdm,
+        s.qybj,
+        s.tzfjj,
+        s.sndxse,
+        s.sndnse,
+        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.xm_status,
+        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.psnr
         from zsyz_sbbzb s
-        left join zsyz_shyj j on s.id = j.xm_id
-        left join zsyz_ldps l on l.source_id = j.id
-        where s.is_del = 'N' and l.psnr is not null
-        <if test="sbdw != null  and sbdw != ''">and s.sbdw = #{sbdw}</if>
-        <if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
-        <if test="zszxfzr != null  and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
-        <if test="xmbh != null  and xmbh != ''">and s.xmbh = #{xmbh}</if>
+        where s.is_del = 'N'
+        <if test="deptId != null  and deptId != ''">and s.dept_id = #{deptId}</if>
         <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
-        <if test="sfwlhxxxm != null  and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
-        <if test="yzdqId != null  and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
-        <if test="yzdqName != null  and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
-        <if test="yzssName != null  and yzssName != ''">and s.yzss_name like concat('%', #{yzssName}, '%')</if>
-        <if test="ntze != null  and ntze != ''">and s.ntze = #{ntze}</if>
-        <if test="cylxId != null  and cylxId != ''">and s.cylx_id = #{cylxId}</if>
-        <if test="cylxName != null  and cylxName != ''">and s.cylx_name like concat('%', #{cylxName}, '%')</if>
-        <if test="xmlb != null  and xmlb != ''">and s.xmlb = #{xmlb}</if>
-        <if test="tzlb != null  and tzlb != ''">and s.tzlb = #{tzlb}</if>
-        <if test="nlhd != null  and nlhd != ''">and s.nlhd = #{nlhd}</if>
-        <if test="czpt != null  and czpt != ''">and s.czpt = #{czpt}</if>
-        <if test="tzzt != null  and tzzt != ''">and s.tzzt = #{tzzt}</if>
-        <if test="xmjz != null  and xmjz != ''">and s.xmjz = #{xmjz}</if>
-        <if test="gtzzrsfzhm != null  and gtzzrsfzhm != ''">and s.gtzzrsfzhm = #{gtzzrsfzhm}</if>
-        <if test="qytzrxyzdm != null  and qytzrxyzdm != ''">and s.qytzrxyzdm = #{qytzrxyzdm}</if>
-        <if test="qybj != null  and qybj != ''">and s.qybj = #{qybj}</if>
-        <if test="tzfjj != null  and tzfjj != ''">and s.tzfjj = #{tzfjj}</if>
-        <if test="sndxse != null  and sndxse != ''">and s.sndxse = #{sndxse}</if>
-        <if test="sndnse != null  and sndnse != ''">and s.sndnse = #{sndnse}</if>
-        <if test="tzrxm != null  and tzrxm != ''">and s.tzrxm = #{tzrxm}</if>
-        <if test="tzrzw != null  and tzrzw != ''">and s.tzrzw = #{tzrzw}</if>
-        <if test="tzrdh != null  and tzrdh != ''">and s.tzrdh = #{tzrdh}</if>
-        <if test="xmjj != null  and xmjj != ''">and s.xmjj = #{xmjj}</if>
-        <if test="name != null  and name != ''">and s.name like concat('%', #{name}, '%')</if>
-        <if test="strq != null ">and s.strq = #{strq}</if>
-        <if test="phone != null  and phone != ''">and s.phone = #{phone}</if>
-        <if test="zw != null  and zw != ''">and s.zw = #{zw}</if>
-        <if test="userId != null ">and s.user_id = #{userId}</if>
-        <if test="type != null  and type != ''">and s.type = #{type}</if>
-        <if test="progress != null  and progress != ''">and and find_in_set(s.progress , #{progress})</if>
+        <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
         <if test="xmStatus != null  and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
-        <if test="cjdId != null ">and s.cjd_id = #{cjdId}</if>
-        <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="cjdId != null ">and cjd_id = #{cjdId}</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>
-        group by s.id ) a
+
+        )d
+
+        order by d.create_time desc
     </select>
+
     <select id="selectZsyzSbbzbListCount" resultType="java.lang.Long">
         select count(1)
         from (
@@ -813,7 +913,7 @@
         s.cjd_id,
         s.cjd_name,
         s.is_meet,
-        s.meet_remark
+        s.meet_remark,s.psnr
         from zsyz_project_dept d
         left join zsyz_sbbzb s on s.id = d.xm_id
         where s.is_del = 'N'
@@ -866,7 +966,6 @@
         a.xmbh
     </select>
 
-
     <!--<select id="selectZsyzSbbzbListTz" resultMap="ZsyzSbbzbResult">
         SELECT
         a.id,
@@ -953,6 +1052,7 @@
             <if test="isMeet != null">is_meet,</if>
             <if test="meetRemark != null">meet_remark,</if>
             <if test="shjg != null">shjg,</if>
+            <if test="psnr != null">psnr,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sbdw != null and sbdw != ''">#{sbdw},</if>
@@ -1003,6 +1103,7 @@
             <if test="isMeet != null">#{isMeet},</if>
             <if test="meetRemark != null">#{meetRemark},</if>
             <if test="shjg != null">#{shjg},</if>
+            <if test="psnr != null">#{psnr},</if>
         </trim>
     </insert>
 
@@ -1057,6 +1158,7 @@
             <if test="isMeet != null">is_meet = #{isMeet},</if>
             <if test="meetRemark != null">meet_remark = #{meetRemark},</if>
             <if test="shjg != null">shjg = #{shjg},</if>
+            <if test="psnr != null">psnr = #{psnr},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -20,33 +20,11 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
-
-        <collection property="zsyzLdpsList" javaType="java.util.List" resultMap="ZsyzLdpsResult"/>
-    </resultMap>
-
-
-    <resultMap type="ZsyzLdps" id="ZsyzLdpsResult">
-        <result property="ids" column="ids"/>
-        <result property="xmId" column="xm_id"/>
-        <result property="xmbh" column="xmbh"/>
-        <result property="xmmc" column="xmmc"/>
-        <result property="sourceId" column="source_id"/>
-        <result property="psnr" column="psnr"/>
-        <result property="zcpsnr" column="zcpsnr"/>
-        <result property="remark" column="remark"/>
-        <result property="deptId" column="dept_id"/>
-        <result property="psr" column="psr"/>
-        <result property="cjsj" column="cjsj"/>
-        <result property="xgr" column="xgr"/>
-        <result property="xgsj" column="xgsj"/>
     </resultMap>
 
     <sql id="selectZsyzShyjVo">
-        select s.id, s.xm_id, s.xmbh, s.dept_id, s.shrxm, s.xmjd,s.xmmc, s.shjg, s.shyj, s.shsj, s.create_by, s.create_time, s.update_by, s.update_time, s.remark ,
-               l.id as ids, l.xm_id, l.xmbh, l.xmmc, l.source_id, l.psnr, l.zcpsnr, l.remark, l.dept_id, l.psr, l.cjsj, l.xgr, l.xgsj
+        select s.id, s.xm_id, s.xmbh, s.dept_id, s.shrxm, s.xmjd,s.xmmc, s.shjg, s.shyj, s.shsj, s.create_by, s.create_time, s.update_by, s.update_time, s.remark
         from zsyz_shyj s
-        left join   zsyz_ldps l on s.id = l.source_id
-
     </sql>
 
     <select id="selectZsyzShyjList" parameterType="ZsyzShyj" resultMap="ZsyzShyjResult">
@@ -66,7 +44,7 @@
 
     <select id="selectZsyzShyjById" parameterType="Long" resultMap="ZsyzShyjResult">
         <include refid="selectZsyzShyjVo"/>
-        where l.id = #{id}
+        where s.id = #{id}
     </select>