Merge remote-tracking branch 'origin/master'

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

@@ -47,7 +47,7 @@ public class ZsyzSbbzbController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(ZsyzSbbzb zsyzSbbzb)
     {
-        List<ZsyzSbbzb> list = zsyzSbbzbService.selectZsyzSbbzbList(zsyzSbbzb);
+        List<ZsyzSbbzb> list = zsyzSbbzbService.selectZsyzSbbzbListDc(zsyzSbbzb);
         ExcelUtil<ZsyzSbbzb> util = new ExcelUtil<ZsyzSbbzb>(ZsyzSbbzb.class);
         return util.exportExcel(list, "sbbzb");
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -45,6 +45,16 @@ public class SysDeptController extends BaseController
         return success(depts);
     }
 
+    /**
+     * 获取部门下拉树列表
+     */
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+    }
+
     /**
      * 查询部门列表（排除节点）
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -44,6 +44,15 @@ public class SysNoticeController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 未读消息条数
+     */
+    @GetMapping("/number")
+    public AjaxResult number(SysNotice notice)
+    {
+        return noticeService.selectNoticeNumber(notice);
+    }
+
     /**
      * 根据通知公告编号获取详细信息
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRotographController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.vo.FilleVo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.SysRotograph;
+import com.ruoyi.system.service.ISysRotographService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 轮播图附件Controller
+ * 
+ * @author ruoyi
+ * @date 2023-02-24
+ */
+@RestController
+@RequestMapping("/system/rotograph")
+public class SysRotographController extends BaseController
+{
+    @Autowired
+    private ISysRotographService sysRotographService;
+
+    /**
+     * 查询轮播图附件列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SysRotograph sysRotograph)
+    {
+        startPage();
+        List<SysRotograph> list = sysRotographService.selectSysRotographList(sysRotograph);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出轮播图附件列表
+     */
+    @Log(title = "轮播图附件", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysRotograph sysRotograph)
+    {
+        List<SysRotograph> list = sysRotographService.selectSysRotographList(sysRotograph);
+        ExcelUtil<SysRotograph> util = new ExcelUtil<SysRotograph>(SysRotograph.class);
+        util.exportExcel(response, list, "轮播图附件数据");
+    }
+
+    /**
+     * 获取轮播图附件详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:rotograph:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sysRotographService.selectSysRotographById(id));
+    }
+
+    /**
+     * 新增轮播图附件
+     */
+    @Log(title = "轮播图附件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysRotograph sysRotograph)
+    {
+        return toAjax(sysRotographService.insertSysRotograph(sysRotograph));
+    }
+
+    /**
+     * 修改轮播图附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:rotograph:edit')")
+    @Log(title = "轮播图附件", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody SysRotograph sysRotograph)
+    {
+        return toAjax(sysRotographService.updateSysRotograph(sysRotograph));
+    }
+
+    /**
+     * 删除轮播图附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:rotograph:remove')")
+    @Log(title = "轮播图附件", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sysRotographService.deleteSysRotographByIds(ids));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java

@@ -2,6 +2,8 @@ package com.ruoyi.system.domain;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
+import com.ruoyi.common.annotation.Excel;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -22,15 +24,28 @@ public class SysNotice extends BaseEntity
     /** 公告标题 */
     private String noticeTitle;
 
-    /** 公告类型（1通知 2公告） */
+    /** 公告类型（1系统通知 2待办通知） */
     private String noticeType;
 
     /** 公告内容 */
     private String noticeContent;
 
-    /** 公告状态（0正常 1关闭） */
+    /** 公告状态（0未读 1已读） */
     private String status;
 
+    /** 发件人id */
+    private String senderId;
+
+    /** 发件人姓名 */
+    private String senderName;
+
+    /** 收件人id */
+    private String addresseeId;
+
+    /** 收件人姓名 */
+    private String addresseeName;
+
+
     public Long getNoticeId()
     {
         return noticeId;
@@ -84,6 +99,38 @@ public class SysNotice extends BaseEntity
         return status;
     }
 
+    public String getSenderId() {
+        return senderId;
+    }
+
+    public String getSenderName() {
+        return senderName;
+    }
+
+    public String getAddresseeId() {
+        return addresseeId;
+    }
+
+    public String getAddresseeName() {
+        return addresseeName;
+    }
+
+    public void setSenderId(String senderId) {
+        this.senderId = senderId;
+    }
+
+    public void setSenderName(String senderName) {
+        this.senderName = senderName;
+    }
+
+    public void setAddresseeId(String addresseeId) {
+        this.addresseeId = addresseeId;
+    }
+
+    public void setAddresseeName(String addresseeName) {
+        this.addresseeName = addresseeName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRotograph.java

@@ -0,0 +1,66 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 轮播图附件对象 sys_rotograph
+ * 
+ * @author ruoyi
+ * @date 2023-02-24
+ */
+public class SysRotograph extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 图片地址 */
+    @Excel(name = "图片地址")
+    private String path;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sort;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setPath(String path) 
+    {
+        this.path = path;
+    }
+
+    public String getPath() 
+    {
+        return path;
+    }
+    public void setSort(Long sort) 
+    {
+        this.sort = sort;
+    }
+
+    public Long getSort() 
+    {
+        return sort;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("path", getPath())
+            .append("sort", getSort())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -2,7 +2,9 @@ package com.ruoyi.system.domain.projectV2;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excels;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -23,56 +25,55 @@ public class ZsyzSbbzb extends BaseEntity
     private Long id;
 
     /** 单位名称 */
-    @Excel(name = "单位名称")
+    //@Excel(name = "单位名称")
     private String sbdw;
 
     /** 填表日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "填表日期", width = 30, dateFormat = "yyyy-MM-dd")
+    //@Excel(name = "填表日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date tbrq;
 
     /** 项目负责人 */
-    @Excel(name = "项目负责人")
+    //@Excel(name = "项目负责人")
     private String zszxfzr;
 
-    /** 项目编号 */
-    @Excel(name = "项目编号")
-    private String xmbh;
-
     /** 项目线索名称 */
     @Excel(name = "项目线索名称")
     private String xmxsmc;
 
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String xmbh;
+
     /** 是否为领航信息项目 1：是，2：否 */
-    @Excel(name = "是否为领航信息项目 1：是，2：否")
+    @Excel(name = "是否为领航信息项目 1=是,2=否")
     private String sfwlhxxxm;
 
     /** 引资地区 */
-    @Excel(name = "引资地区")
     private String yzdqId;
 
     /** 引资地区名称 */
-    @Excel(name = "引资地区名称")
+    @Excel(name = "引资地区")
     private String yzdqName;
 
     /** 引资省市名称 */
-    @Excel(name = "引资省市名称")
+    @Excel(name = "引资省市")
     private String yzssName;
 
     /** 拟投资额（亿元） */
-    @Excel(name = "拟投资额", readConverterExp = "亿=元")
+    @Excel(name = "拟投资额(亿元)")
     private String ntze;
 
     /** 产业类型id */
-    @Excel(name = "产业类型id")
+    //@Excel(name = "产业类型id")
     private String cylxId;
 
     /** 产业类型名称 */
-    @Excel(name = "产业类型名称")
+    @Excel(name = "产业类型")
     private String cylxName;
 
     /** 项目类别（1：首位产业，2：工业项目，3：战新产业，4：现代服务业，5：三产融合，6：共引共建项目，7：其他） */
-    @Excel(name = "项目类别", readConverterExp = "1=：首位产业，2：工业项目，3：战新产业，4：现代服务业，5：三产融合，6：共引共建项目，7：其他")
+    @Excel(name = "项目类别", readConverterExp = "1=首位产业,2=工业项目,3=战新产业,4=现代服务业,5=三产融合,6=共引共建项目,7=其他")
     private String xmlb;
 
     /** 投资类别 */
@@ -84,7 +85,7 @@ public class ZsyzSbbzb extends BaseEntity
     private String nlhd;
 
     /** 承载平台 */
-    @Excel(name = "承载平台")
+    //@Excel(name = "承载平台")
     private String czpt;
 
     /** 投资主体 */
@@ -96,19 +97,19 @@ public class ZsyzSbbzb extends BaseEntity
     private String xmjz;
 
     /** 个体投资人身份证号码 */
-    @Excel(name = "个体投资人身份证号码")
+    //@Excel(name = "个体投资人身份证号码")
     private String gtzzrsfzhm;
 
     /** 企业投资人信用证代码 */
-    @Excel(name = "企业投资人信用证代码")
+   // @Excel(name = "企业投资人信用证代码")
     private String qytzrxyzdm;
 
     /** 企业背景（1：500强企业，2：上市公司，3：行业100强，4：头部企业，5：外资企业，6：民营企业，7：高新技术企业，8：其他） */
-    @Excel(name = "企业背景", readConverterExp = "1=：500强企业，2：上市公司，3：行业100强，4：头部企业，5：外资企业，6：民营企业，7：高新技术企业，8：其他")
+    @Excel(name = "企业背景", readConverterExp = "1=500强企业,2=上市公司,3=行业100强,4=头部企业,5=外资企业,6=民营企业,7=高新技术企业,8=其他")
     private String qybj;
 
     /** 投资方简介 */
-    @Excel(name = "投资方简介")
+    //@Excel(name = "投资方简介")
     private String tzfjj;
 
     /** 上年度销售额(万元) */
@@ -153,50 +154,113 @@ public class ZsyzSbbzb extends BaseEntity
     private String zw;
 
     /** 申请人用户ID */
-    @Excel(name = "申请人用户ID")
+    //@Excel(name = "申请人用户ID")
     private Long userId;
 
     /** 申报状态 1:正常 2:暂缓 */
-    @Excel(name = "申报状态 1:正常 2:暂缓")
+    //@Excel(name = "申报状态 1:正常 2:暂缓")
     private String type;
 
     /** 项目进度 1:项目首谈待审核 2:项目首谈已审核 3:线索分发要素部门 4:线索已指派 5:线索已承接 6:签约待审核 7:签约已审核 8:开工待审核 9:开工已审核 10:投产待审核 11:投产已审核 12:项目已入归 */
-    @Excel(name = "项目进度 1:项目首谈待审核 2:项目首谈已审核 3:线索分发要素部门 4:线索已指派 5:线索已承接 6:签约待审核 7:签约已审核 8:开工待审核 9:开工已审核 10:投产待审核 11:投产已审核 12:项目已入归")
+    //@Excel(name = "项目进度 1:项目首谈待审核 2:项目首谈已审核 3:线索分发要素部门 4:线索已指派 5:线索已承接 6:签约待审核 7:签约已审核 8:开工待审核 9:开工已审核 10:投产待审核 11:投产已审核 12:项目已入归")
     private String progress;
 
     /** 申请人部门ID */
-    @Excel(name = "申请人部门ID")
+   // @Excel(name = "申请人部门ID")
     private Long deptId;
 
     /** 是否删除 N:否 Y:是 */
-    @Excel(name = "是否删除 N:否 Y:是")
+    //@Excel(name = "是否删除 N:否 Y:是")
     private String isDel;
 
     /** 承接地id */
-    @Excel(name = "承接地id")
+    //@Excel(name = "承接地id")
     private Long cjdId;
 
     /** 承接地部门名称 */
-    @Excel(name = "承接地部门名称")
+    //@Excel(name = "承接地部门名称")
     private String cjdName;
 
     /** 是否需要会议支持 N:否 Y:是 */
-    @Excel(name = "是否需要会议支持 N:否 Y:是")
+    @Excel(name = "是否需要会议支持 N=否, Y=是")
     private String isMeet;
 
     /** 会议申请备注 */
-    @Excel(name = "会议申请备注")
+    //@Excel(name = "会议申请备注")
     private String meetRemark;
 
     /** 附件集合 */
     private List<ZsyzFj> zsyzFjList;
 
-
     /**
      * 前端使用 指派的类型 1:指派给要素部门 2:指派给承接地
      */
     private String zpType;
 
+
+    /** 签约信息对象 */
+    @Excels({
+            @Excel(name = "企业注册名称+项目名称", targetAttr = "xmmc"),
+            @Excel(name = "建设内容", targetAttr = "jsnr"),
+            @Excel(name = "对方签约人", targetAttr = "dfqyr"),
+            @Excel(name = "我方签约人", targetAttr = "wfqyr"),
+            @Excel(name = "签约日期",targetAttr = "qyrq", width = 30, dateFormat = "yyyy-MM-dd"),
+            @Excel(name = "协议投资额（万元）", targetAttr = "xytze"),
+            @Excel(name = "市外资金（万元）", targetAttr = "swzj"),
+            @Excel(name = "项目所在地", targetAttr = "xmszd"),
+            @Excel(name = "所属行业", targetAttr = "sshy", readConverterExp = "1=智能 (汽车) 制造,2=装备制造,3=轻工制造,4=新材料,5=新能源,6=生物医药,7=石油化工,8=电子元器件 (信息),9=汽车零部件,10=纺织服装,11=农产品深加工,12=食品加工,13=大数据,14=大健康,15=文化旅游,16=现代服务业,17=三产融台,18=其他 "),
+            @Excel(name = "投资方式", targetAttr = "tzfs", readConverterExp = "1=独资,2=合资,3=合作,4=收购,5=参股,6=兼并,7=其他"),
+            @Excel(name = "建设方式", targetAttr = "jsfs", readConverterExp = "1=新建,2=改建,3=扩建,4=租赁"),
+            @Excel(name = "用地面积（亩）", targetAttr = "ydmj"),
+            @Excel(name = "备注", targetAttr = "remark"),
+            @Excel(name = "注册日期", targetAttr = "zcrq", width = 30, dateFormat = "yyyy-MM-dd"),
+            @Excel(name = "注册资本（万元）", targetAttr = "zczb"),
+            @Excel(name = "法人代表", targetAttr = "frdb"),
+            @Excel(name = "联系方式", targetAttr = "lxfs"),
+            @Excel(name = "经营范围", targetAttr = "jyfw"),
+            @Excel(name = "立项日期", targetAttr = "lxrq", width = 30, dateFormat = "yyyy-MM-dd"),
+            @Excel(name = "计划开工日期", targetAttr = "nkgrq", width = 30, dateFormat = "yyyy-MM-dd")
+    })
+    private ZsyzQyxx zsyzQyxx;
+
+
+
+    /** 开工信息对象 */
+    @Excels({
+            @Excel(name = "开工日期", targetAttr = "kgrq", width = 30, dateFormat = "yyyy-MM-dd"),
+            @Excel(name = "拟竣工日期", targetAttr = "njgrq", width = 30, dateFormat = "yyyy-MM-dd"),
+            @Excel(name = "拟投产时间", targetAttr = "ntcsj", width = 30, dateFormat = "yyyy-MM-dd"),
+            //@Excel(name = "分期投资情况", targetAttr = "jsnr"), 没有这个字段吧
+            @Excel(name = "备注", targetAttr = "remark")
+    })
+    private ZsyzKgxx zsyzKgxx;
+
+
+    /** 投产信息对象 */
+    @Excels({
+            @Excel(name = "投产日期", targetAttr = "tcrq", width = 30, dateFormat = "yyyy-MM-dd"),
+            @Excel(name = "实际到资额（万元）", targetAttr = "sjdze"),
+            @Excel(name = "用地面积（亩）", targetAttr = "ydmj"),
+            @Excel(name = "新建厂房（平方米）", targetAttr = "xjcf"),
+            @Excel(name = "设备发票（万元）", targetAttr = "sbfp"),
+            //@Excel(name = "新增应税销售额", targetAttr = "xjcf"),
+            //@Excel(name = "租赁厂房项目增值税抵扣设备投资额", targetAttr = "xjcf"),
+            @Excel(name = "备注", targetAttr = "remark")
+    })
+    private ZsyzTcxx zsyzTcxx;
+
+    // todo 最新进展
+
+   /* @Excels({
+            @Excel(name = "进展情况", targetAttr = "sjdze"),
+            @Excel(name = "存在问题", targetAttr = "ydmj"),
+            @Excel(name = "解决建议", targetAttr = "xjcf"),
+            @Excel(name = "下一步工作计划", targetAttr = "sbfp")
+    })
+    private ZsyzTcxx zsyzTcxx;*/
+
+
+
     public String getZpType() {
         return zpType;
     }
@@ -592,6 +656,30 @@ public class ZsyzSbbzb extends BaseEntity
         this.zsyzFjList = zsyzFjList;
     }
 
+    public ZsyzQyxx getZsyzQyxx() {
+        return zsyzQyxx;
+    }
+
+    public ZsyzKgxx getZsyzKgxx() {
+        return zsyzKgxx;
+    }
+
+    public ZsyzTcxx getZsyzTcxx() {
+        return zsyzTcxx;
+    }
+
+    public void setZsyzQyxx(ZsyzQyxx zsyzQyxx) {
+        this.zsyzQyxx = zsyzQyxx;
+    }
+
+    public void setZsyzKgxx(ZsyzKgxx zsyzKgxx) {
+        this.zsyzKgxx = zsyzKgxx;
+    }
+
+    public void setZsyzTcxx(ZsyzTcxx zsyzTcxx) {
+        this.zsyzTcxx = zsyzTcxx;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/FilleVo.java

@@ -0,0 +1,26 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.system.domain.SysRotograph;
+
+import java.util.List;
+
+/**
+ * 附件保存信息
+ * 
+ * @author ruoyi
+ */
+public class FilleVo
+{
+    /**
+     * 系统附件对象
+     */
+    private List<SysRotograph> sysRotographList;
+
+    public List<SysRotograph> getSysRotographList() {
+        return sysRotographList;
+    }
+
+    public void setSysRotographList(List<SysRotograph> sysRotographList) {
+        this.sysRotographList = sysRotographList;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java

@@ -57,4 +57,8 @@ public interface SysNoticeMapper
      * @return 结果
      */
     public int deleteNoticeByIds(Long[] noticeIds);
+
+    int selectNoticeNumber(SysNotice notice);
+
+    void updateNoticeByAddresseeId(String addresseeId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRotographMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysRotograph;
+
+/**
+ * 轮播图附件Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-02-24
+ */
+public interface SysRotographMapper 
+{
+    /**
+     * 查询轮播图附件
+     * 
+     * @param id 轮播图附件主键
+     * @return 轮播图附件
+     */
+    public SysRotograph selectSysRotographById(Long id);
+
+    /**
+     * 查询轮播图附件列表
+     * 
+     * @param sysRotograph 轮播图附件
+     * @return 轮播图附件集合
+     */
+    public List<SysRotograph> selectSysRotographList(SysRotograph sysRotograph);
+
+    /**
+     * 新增轮播图附件
+     * 
+     * @param sysRotograph 轮播图附件
+     * @return 结果
+     */
+    public int insertSysRotograph(SysRotograph sysRotograph);
+
+    /**
+     * 修改轮播图附件
+     * 
+     * @param sysRotograph 轮播图附件
+     * @return 结果
+     */
+    public int updateSysRotograph(SysRotograph sysRotograph);
+
+    /**
+     * 删除轮播图附件
+     * 
+     * @param id 轮播图附件主键
+     * @return 结果
+     */
+    public int deleteSysRotographById(Long id);
+
+    /**
+     * 批量删除轮播图附件
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysRotographByIds(Long[] ids);
+}

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

@@ -64,4 +64,6 @@ public interface ZsyzSbbzbMapper
      * @return 结果
      */
     public int deleteZsyzSbbzbByIds(Long[] ids);
+
+    List<ZsyzSbbzb> selectZsyzSbbzbListDc(ZsyzSbbzb zsyzSbbzb);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.SysNotice;
 
 /**
@@ -57,4 +59,6 @@ public interface ISysNoticeService
      * @return 结果
      */
     public int deleteNoticeByIds(Long[] noticeIds);
+
+    AjaxResult selectNoticeNumber(SysNotice notice);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRotographService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysRotograph;
+import com.ruoyi.system.domain.vo.FilleVo;
+
+/**
+ * 轮播图附件Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-02-24
+ */
+public interface ISysRotographService 
+{
+    /**
+     * 查询轮播图附件
+     * 
+     * @param id 轮播图附件主键
+     * @return 轮播图附件
+     */
+    public SysRotograph selectSysRotographById(Long id);
+
+    /**
+     * 查询轮播图附件列表
+     * 
+     * @param sysRotograph 轮播图附件
+     * @return 轮播图附件集合
+     */
+    public List<SysRotograph> selectSysRotographList(SysRotograph sysRotograph);
+
+    /**
+     * 新增轮播图附件
+     * 
+     * @param sysRotograph 轮播图附件
+     * @return 结果
+     */
+    public int insertSysRotograph(SysRotograph sysRotograph);
+
+    /**
+     * 修改轮播图附件
+     * 
+     * @param sysRotograph 轮播图附件
+     * @return 结果
+     */
+    public int updateSysRotograph(SysRotograph sysRotograph);
+
+    /**
+     * 批量删除轮播图附件
+     * 
+     * @param ids 需要删除的轮播图附件主键集合
+     * @return 结果
+     */
+    public int deleteSysRotographByIds(Long[] ids);
+
+    /**
+     * 删除轮播图附件信息
+     * 
+     * @param id 轮播图附件主键
+     * @return 结果
+     */
+    public int deleteSysRotographById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java

@@ -1,6 +1,10 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.domain.SysNotice;
@@ -39,7 +43,14 @@ public class SysNoticeServiceImpl implements ISysNoticeService
     @Override
     public List<SysNotice> selectNoticeList(SysNotice notice)
     {
-        return noticeMapper.selectNoticeList(notice);
+
+        //获取当前人员信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        notice.setAddresseeId(String.valueOf(user.getUserId()));
+        List<SysNotice> sysNotice = noticeMapper.selectNoticeList(notice);
+        //将所有消息置位已读
+        noticeMapper.updateNoticeByAddresseeId(notice.getAddresseeId());
+        return sysNotice;
     }
 
     /**
@@ -89,4 +100,10 @@ public class SysNoticeServiceImpl implements ISysNoticeService
     {
         return noticeMapper.deleteNoticeByIds(noticeIds);
     }
+
+    @Override
+    public AjaxResult selectNoticeNumber(SysNotice notice) {
+        int num = noticeMapper.selectNoticeNumber(notice);
+        return AjaxResult.success("成功",num);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRotographServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.system.domain.vo.FilleVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.SysRotographMapper;
+import com.ruoyi.system.domain.SysRotograph;
+import com.ruoyi.system.service.ISysRotographService;
+
+/**
+ * 轮播图附件Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-02-24
+ */
+@Service
+public class SysRotographServiceImpl implements ISysRotographService 
+{
+    @Autowired
+    private SysRotographMapper sysRotographMapper;
+
+    /**
+     * 查询轮播图附件
+     * 
+     * @param id 轮播图附件主键
+     * @return 轮播图附件
+     */
+    @Override
+    public SysRotograph selectSysRotographById(Long id)
+    {
+        return sysRotographMapper.selectSysRotographById(id);
+    }
+
+    /**
+     * 查询轮播图附件列表
+     * 
+     * @param sysRotograph 轮播图附件
+     * @return 轮播图附件
+     */
+    @Override
+    public List<SysRotograph> selectSysRotographList(SysRotograph sysRotograph)
+    {
+        return sysRotographMapper.selectSysRotographList(sysRotograph);
+    }
+
+    /**
+     * 新增轮播图附件
+     * 
+     * @param sysRotograph 轮播图附件
+     * @return 结果
+     */
+    @Override
+    public int insertSysRotograph( SysRotograph sysRotograph)
+    {
+        return sysRotographMapper.insertSysRotograph(sysRotograph);
+    }
+
+    /**
+     * 修改轮播图附件
+     * 
+     * @param sysRotograph 轮播图附件
+     * @return 结果
+     */
+    @Override
+    public int updateSysRotograph(SysRotograph sysRotograph)
+    {
+        return sysRotographMapper.updateSysRotograph(sysRotograph);
+    }
+
+    /**
+     * 批量删除轮播图附件
+     * 
+     * @param ids 需要删除的轮播图附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysRotographByIds(Long[] ids)
+    {
+        return sysRotographMapper.deleteSysRotographByIds(ids);
+    }
+
+    /**
+     * 删除轮播图附件信息
+     * 
+     * @param id 轮播图附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysRotographById(Long id)
+    {
+        return sysRotographMapper.deleteSysRotographById(id);
+    }
+}

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service.impl.projectV2;
 
+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.ZsyzSbbzb;
 import com.ruoyi.system.mapper.projectV2.XmProjectInvestorMapper;
@@ -74,7 +76,10 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
     @Transactional
     public int insertZsyzSbbzb(ZsyzSbbzb zsyzSbbzb)
     {
+        //获取当前人员信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
         zsyzSbbzb.setCreateTime(DateUtils.getNowDate());
+        zsyzSbbzb.setUserId(user.getUserId());
         int count = zsyzSbbzbMapper.insertZsyzSbbzb(zsyzSbbzb);
         //保存附件信息
         List<ZsyzFj> zsyzFjList = zsyzSbbzb.getZsyzFjList();
@@ -161,4 +166,9 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
     public int deleteZsyzSbbzbById(Long id) {
         return zsyzSbbzbMapper.deleteZsyzSbbzbById(id);
     }
+
+    @Override
+    public List<ZsyzSbbzb> selectZsyzSbbzbListDc(ZsyzSbbzb zsyzSbbzb) {
+        return zsyzSbbzbMapper.selectZsyzSbbzbListDc(zsyzSbbzb);
+    }
 }

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

@@ -65,4 +65,6 @@ public interface IZsyzSbbzbService
      * @return 结果
      */
     public int deleteZsyzSbbzbById(Long id);
+
+    List<ZsyzSbbzb> selectZsyzSbbzbListDc(ZsyzSbbzb zsyzSbbzb);
 }

ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -10,6 +10,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="noticeType"     column="notice_type"     />
         <result property="noticeContent"  column="notice_content"  />
         <result property="status"         column="status"          />
+        <result property="senderId"    column="sender_id"    />
+        <result property="senderName"    column="sender_name"    />
+        <result property="addresseeId"    column="addressee_id"    />
+        <result property="addresseeName"    column="addressee_name"    />
         <result property="createBy"       column="create_by"       />
         <result property="createTime"     column="create_time"     />
         <result property="updateBy"       column="update_by"       />
@@ -18,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     
     <sql id="selectNoticeVo">
-        select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark 
+        select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status,sender_id, sender_name, addressee_id, addressee_name, create_by, create_time, update_by, update_time, remark
 		from sys_notice
     </sql>
     
@@ -39,15 +43,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createBy != null and createBy != ''">
 				AND create_by like concat('%', #{createBy}, '%')
 			</if>
+            <if test="senderId != null  and senderId != ''"> and sender_id = #{senderId}</if>
+            <if test="senderName != null  and senderName != ''"> and sender_name like concat('%', #{senderName}, '%')</if>
+            <if test="addresseeId != null  and addresseeId != ''"> and addressee_id = #{addresseeId}</if>
+            <if test="addresseeName != null  and addresseeName != ''"> and addressee_name like concat('%', #{addresseeName}, '%')</if>
 		</where>
     </select>
-    
+    <select id="selectNoticeNumber" resultType="java.lang.Integer">
+        select count(1) from sys_notice
+        where status = '0'
+        and addressee_id = #{addresseeId}
+    </select>
+
     <insert id="insertNotice" parameterType="SysNotice">
         insert into sys_notice (
 			<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
 			<if test="noticeType != null and noticeType != '' ">notice_type, </if>
 			<if test="noticeContent != null and noticeContent != '' ">notice_content, </if>
 			<if test="status != null and status != '' ">status, </if>
+            <if test="senderId != null">sender_id,</if>
+            <if test="senderName != null">sender_name,</if>
+            <if test="addresseeId != null">addressee_id,</if>
+            <if test="addresseeName != null">addressee_name,</if>
 			<if test="remark != null and remark != ''">remark,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
@@ -56,6 +73,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="noticeType != null and noticeType != ''">#{noticeType}, </if>
 			<if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </if>
 			<if test="status != null and status != ''">#{status}, </if>
+            <if test="senderId != null">#{senderId},</if>
+            <if test="senderName != null">#{senderName},</if>
+            <if test="addresseeId != null">#{addresseeId},</if>
+            <if test="addresseeName != null">#{addresseeName},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			sysdate()
@@ -69,12 +90,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if>
             <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
             <if test="status != null and status != ''">status = #{status}, </if>
+            <if test="senderId != null">sender_id = #{senderId},</if>
+            <if test="senderName != null">sender_name = #{senderName},</if>
+            <if test="addresseeId != null">addressee_id = #{addresseeId},</if>
+            <if test="addresseeName != null">addressee_name = #{addresseeName},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
         </set>
         where notice_id = #{noticeId}
     </update>
-	
+    <update id="updateNoticeByAddresseeId">
+        update sys_notice set status = '1' where addressee_id = #{addresseeId}
+    </update>
+
     <delete id="deleteNoticeById" parameterType="Long">
         delete from sys_notice where notice_id = #{noticeId}
     </delete>

ruoyi-system/src/main/resources/mapper/system/SysRotographMapper.xml

@@ -0,0 +1,66 @@
+<?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="com.ruoyi.system.mapper.SysRotographMapper">
+    
+    <resultMap type="SysRotograph" id="SysRotographResult">
+        <result property="id"    column="id"    />
+        <result property="path"    column="path"    />
+        <result property="sort"    column="sort"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSysRotographVo">
+        select id, path, sort, remark from sys_rotograph
+    </sql>
+
+    <select id="selectSysRotographList" parameterType="SysRotograph" resultMap="SysRotographResult">
+        <include refid="selectSysRotographVo"/>
+        <where>  
+            <if test="path != null  and path != ''"> and path = #{path}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+        </where>
+        order by sort
+    </select>
+    
+    <select id="selectSysRotographById" parameterType="Long" resultMap="SysRotographResult">
+        <include refid="selectSysRotographVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSysRotograph" parameterType="SysRotograph">
+        insert into sys_rotograph
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="path != null">path,</if>
+            <if test="sort != null">sort,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="path != null">#{path},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSysRotograph" parameterType="SysRotograph">
+        update sys_rotograph
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="path != null">path = #{path},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSysRotographById" parameterType="Long">
+        delete from sys_rotograph where id = #{id}
+    </delete>
+
+    <delete id="deleteSysRotographByIds" parameterType="String">
+        delete from sys_rotograph where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -52,8 +52,109 @@
         <result property="cjdName" column="cjd_name"/>
         <result property="isMeet" column="is_meet"/>
         <result property="meetRemark" column="meet_remark"/>
+
+
+        <association property="zsyzQyxx"  javaType="ZsyzQyxx" resultMap="ZsyzQyxxResult" />
+        <association property="zsyzKgxx"  javaType="ZsyzKgxx" resultMap="ZsyzKgxxResult" />
+        <association property="zsyzTcxx"  javaType="ZsyzTcxx" resultMap="ZsyzTcxxResult" />
+    </resultMap>
+
+    <!--签约信息-->
+    <resultMap type="ZsyzQyxx" id="ZsyzQyxxResult">
+        <result property="id"    column="id"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="xmbh"    column="xmbh"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="dfqyr"    column="dfqyr"    />
+        <result property="wfqyr"    column="wfqyr"    />
+        <result property="tbrq"    column="tbrq"    />
+        <result property="qyrq"    column="qyrq"    />
+        <result property="xytze"    column="xytze"    />
+        <result property="swzj"    column="swzj"    />
+        <result property="gdzctze"    column="gdzctze"    />
+        <result property="qygjrsjh"    column="qygjrsjh"    />
+        <result property="xmszd"    column="xmszd"    />
+        <result property="sshy"    column="sshy"    />
+        <result property="tzfs"    column="tzfs"    />
+        <result property="jsfs"    column="jsfs"    />
+        <result property="sfys"    column="sfys"    />
+        <result property="jsnr"    column="jsnr"    />
+        <result property="ydmj"    column="ydmj"    />
+        <result property="zcqymc"    column="zcqymc"    />
+        <result property="zcrq"    column="zcrq"    />
+        <result property="zczb"    column="zczb"    />
+        <result property="frdb"    column="frdb"    />
+        <result property="lxfs"    column="lxfs"    />
+        <result property="jyfw"    column="jyfw"    />
+        <result property="lxrq"    column="lxrq"    />
+        <result property="nkgrq"    column="nkgrq"    />
+        <result property="path"    column="path"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
+    <!--开工信息-->
+    <resultMap type="ZsyzKgxx" id="ZsyzKgxxResult">
+        <result property="id"    column="id"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="xmbh"    column="xmbh"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="kgrq"    column="kgrq"    />
+        <result property="njgrq"    column="njgrq"    />
+        <result property="sscrq"    column="sscrq"    />
+        <result property="ntcsj"    column="ntcsj"    />
+        <result property="rtsj"    column="rtsj"    />
+        <result property="nrtsj"    column="nrtsj"    />
+        <result property="kggjrsjh"    column="kggjrsjh"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <!--投产信息-->
+    <resultMap type="ZsyzTcxx" id="ZsyzTcxxResult">
+        <result property="id"    column="id"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="xmbh"    column="xmbh"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="tcrq"    column="tcrq"    />
+        <result property="rgsj"    column="rgsj"    />
+        <result property="nrgsj"    column="nrgsj"    />
+        <result property="tcgjrsjh"    column="tcgjrsjh"    />
+        <result property="sjdze"    column="sjdze"    />
+        <result property="ydmj"    column="ydmj"    />
+        <result property="tdcr"    column="tdcr"    />
+        <result property="xjcf"    column="xjcf"    />
+        <result property="cftr"    column="cftr"    />
+        <result property="sbqd"    column="sbqd"    />
+        <result property="sbfp"    column="sbfp"    />
+        <result property="sbht"    column="sbht"    />
+        <result property="fkpz"    column="fkpz"    />
+        <result property="zlcf"    column="zlcf"    />
+        <result property="zlcftr"    column="zlcftr"    />
+        <result property="zlsbqd"    column="zlsbqd"    />
+        <result property="zlsbfp"    column="zlsbfp"    />
+        <result property="zlsbht"    column="zlsbht"    />
+        <result property="zlfkpz"    column="zlfkpz"    />
+        <result property="sjss"    column="sjss"    />
+        <result property="lxy"    column="lxy"    />
+        <result property="jnsb"    column="jnsb"    />
+        <result property="zbtr"    column="zbtr"    />
+        <result property="ndsjss"    column="ndsjss"    />
+        <result property="qt"    column="qt"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+
     <sql id="selectZsyzSbbzbVo">
         select id, sbdw, tbrq, zszxfzr, xmbh, xmxsmc, sfwlhxxxm, yzdq_id, yzdq_name, yzss_name, ntze, cylx_id, cylx_name, xmlb, tzlb, nlhd, czpt, tzzt, xmjz, gtzzrsfzhm, qytzrxyzdm, qybj, tzfjj, sndxse, sndnse, tzrxm, tzrzw, tzrdh, xmjj, name, strq, phone, zw, user_id, create_by, type, progress, dept_id, create_time, update_by, is_del, update_time, remark, cjd_id, cjd_name, is_meet, meet_remark from zsyz_sbbzb
     </sql>
@@ -111,6 +212,68 @@
         where id = #{id} and is_del = 'N'
     </select>
 
+    <select id="selectZsyzSbbzbListDc" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">
+        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.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,
+        q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq, q.xytze, q.swzj, q.gdzctze, q.qygjrsjh, q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
+        q.ydmj, 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>
+            <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 s.progress = #{progress}</if>
+            <if test="deptId != null ">and s.dept_id = #{deptId}</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>
+        </where>
+    </select>
+
     <insert id="insertZsyzSbbzb" parameterType="ZsyzSbbzb" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_sbbzb
         <trim prefix="(" suffix=")" suffixOverrides=",">