Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzSbbzb.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzSbbzbServiceImpl.java

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

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 招商引资_开工信息对象 zsyz_kgxx
@@ -67,6 +68,9 @@ public class ZsyzKgxx extends BaseEntity
     @Excel(name = "开工跟进人手机号")
     private String kggjrsjh;
 
+    /** 附件集合 */
+    private List<ZsyzFj> zsyzFjList;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -167,6 +171,13 @@ public class ZsyzKgxx extends BaseEntity
         return kggjrsjh;
     }
 
+    public List<ZsyzFj> getZsyzFjList() {
+        return zsyzFjList;
+    }
+
+    public void setZsyzFjList(List<ZsyzFj> zsyzFjList) {
+        this.zsyzFjList = zsyzFjList;
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 招商引资_签约信息对象 zsyz_qyxx
@@ -134,6 +135,9 @@ public class ZsyzQyxx extends BaseEntity
     @Excel(name = "文件地址")
     private String path;
 
+    /** 附件集合 */
+    private List<ZsyzFj> zsyzFjList;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -387,6 +391,14 @@ public class ZsyzQyxx extends BaseEntity
         return path;
     }
 
+    public List<ZsyzFj> getZsyzFjList() {
+        return zsyzFjList;
+    }
+
+    public void setZsyzFjList(List<ZsyzFj> zsyzFjList) {
+        this.zsyzFjList = zsyzFjList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 招商引资_申报_首谈信息_主对象 zsyz_sbbzb
@@ -187,6 +188,10 @@ public class ZsyzSbbzb extends BaseEntity
     @Excel(name = "会议申请备注")
     private String meetRemark;
 
+    /** 附件集合 */
+    private List<ZsyzFj> zsyzFjList;
+
+    public void setId(Long id)
     /**
      * 前端使用 指派的类型 1:指派给要素部门 2:指派给承接地
      */
@@ -579,6 +584,14 @@ public class ZsyzSbbzb extends BaseEntity
         return meetRemark;
     }
 
+    public List<ZsyzFj> getZsyzFjList() {
+        return zsyzFjList;
+    }
+
+    public void setZsyzFjList(List<ZsyzFj> zsyzFjList) {
+        this.zsyzFjList = zsyzFjList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

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

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 招商引资_投产信息对象 zsyz_tcxx
@@ -136,6 +137,9 @@ public class ZsyzTcxx extends BaseEntity
     @Excel(name = "其他")
     private String qt;
 
+    /** 附件集合 */
+    private List<ZsyzFj> zsyzFjList;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -398,6 +402,14 @@ public class ZsyzTcxx extends BaseEntity
         return qt;
     }
 
+    public List<ZsyzFj> getZsyzFjList() {
+        return zsyzFjList;
+    }
+
+    public void setZsyzFjList(List<ZsyzFj> zsyzFjList) {
+        this.zsyzFjList = zsyzFjList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -60,4 +60,6 @@ public interface ZsyzFjMapper
      * @return 结果
      */
     public int deleteZsyzFjByIds(Long[] ids);
+
+    void deleteZsyzFjBySourceId(Long id);
 }

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

@@ -1,11 +1,15 @@
 package com.ruoyi.system.service.impl.projectV2;
 
 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.mapper.projectV2.ZsyzFjMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzKgxxMapper;
 import com.ruoyi.system.service.projectV2.IZsyzKgxxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -21,6 +25,9 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
     @Autowired
     private ZsyzKgxxMapper zsyzKgxxMapper;
 
+    @Autowired
+    private ZsyzFjMapper zsyzFjMapper;
+
     /**
      * 查询招商引资_开工信息
      * 
@@ -28,9 +35,16 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
      * @return 招商引资_开工信息
      */
     @Override
+    @Transactional
     public ZsyzKgxx selectZsyzKgxxById(Long id)
     {
-        return zsyzKgxxMapper.selectZsyzKgxxById(id);
+        ZsyzKgxx zsyzKgxx = zsyzKgxxMapper.selectZsyzKgxxById(id);
+        ZsyzFj zsyzFj = new ZsyzFj();
+        zsyzFj.setSourceId(id);
+        List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
+        zsyzKgxx.setZsyzFjList(zsyzFjList);
+        return zsyzKgxx;
+
     }
 
     /**
@@ -52,10 +66,21 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertZsyzKgxx(ZsyzKgxx zsyzKgxx)
     {
         zsyzKgxx.setCreateTime(DateUtils.getNowDate());
-        return zsyzKgxxMapper.insertZsyzKgxx(zsyzKgxx);
+        int count = zsyzKgxxMapper.insertZsyzKgxx(zsyzKgxx);
+        //保存附件信息
+        List<ZsyzFj> zsyzFjList = zsyzKgxx.getZsyzFjList();
+        for (ZsyzFj zsyzFj : zsyzFjList) {
+            zsyzFj.setSourceId(zsyzKgxx.getId());
+            zsyzFj.setType("3");
+            zsyzFj.setXmId(zsyzKgxx.getXmId());
+            zsyzFj.setXmbh(zsyzKgxx.getXmbh());
+            zsyzFjMapper.insertZsyzFj(zsyzFj);
+        }
+        return count;
     }
 
     /**
@@ -65,10 +90,27 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateZsyzKgxx(ZsyzKgxx zsyzKgxx)
     {
+
         zsyzKgxx.setUpdateTime(DateUtils.getNowDate());
-        return zsyzKgxxMapper.updateZsyzKgxx(zsyzKgxx);
+        int count = zsyzKgxxMapper.updateZsyzKgxx(zsyzKgxx);
+        //修改附件
+        if(zsyzKgxx.getZsyzFjList()!=null && zsyzKgxx.getZsyzFjList().size()>0){
+            //先删除相关附件
+            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzKgxx.getId());
+            //再将文件新增进数据库
+            List<ZsyzFj> zsyzFjList = zsyzKgxx.getZsyzFjList();
+            for (ZsyzFj zsyzFj : zsyzFjList) {
+                zsyzFj.setSourceId(zsyzKgxx.getId());
+                zsyzFj.setType("3");
+                zsyzFj.setXmId(zsyzKgxx.getXmId());
+                zsyzFj.setXmbh(zsyzKgxx.getXmbh());
+                zsyzFjMapper.insertZsyzFj(zsyzFj);
+            }
+        }
+        return count;
     }
 
     /**

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

@@ -1,11 +1,14 @@
 package com.ruoyi.system.service.impl.projectV2;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.projectV2.ZsyzFj;
 import com.ruoyi.system.domain.projectV2.ZsyzQyxx;
+import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzQyxxMapper;
 import com.ruoyi.system.service.projectV2.IZsyzQyxxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -21,6 +24,9 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService
     @Autowired
     private ZsyzQyxxMapper zsyzQyxxMapper;
 
+    @Autowired
+    private ZsyzFjMapper zsyzFjMapper;
+
     /**
      * 查询招商引资_签约信息
      * 
@@ -28,9 +34,15 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService
      * @return 招商引资_签约信息
      */
     @Override
+    @Transactional
     public ZsyzQyxx selectZsyzQyxxById(Long id)
     {
-        return zsyzQyxxMapper.selectZsyzQyxxById(id);
+        ZsyzQyxx zsyzQyxx = zsyzQyxxMapper.selectZsyzQyxxById(id);
+        ZsyzFj zsyzFj = new ZsyzFj();
+        zsyzFj.setSourceId(id);
+        List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
+        zsyzQyxx.setZsyzFjList(zsyzFjList);
+        return zsyzQyxx;
     }
 
     /**
@@ -52,10 +64,23 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertZsyzQyxx(ZsyzQyxx zsyzQyxx)
     {
+
         zsyzQyxx.setCreateTime(DateUtils.getNowDate());
-        return zsyzQyxxMapper.insertZsyzQyxx(zsyzQyxx);
+        int count = zsyzQyxxMapper.insertZsyzQyxx(zsyzQyxx);
+        //保存附件信息
+        List<ZsyzFj> zsyzFjList = zsyzQyxx.getZsyzFjList();
+        for (ZsyzFj zsyzFj : zsyzFjList) {
+            zsyzFj.setSourceId(zsyzQyxx.getId());
+            zsyzFj.setType("2");
+            zsyzFj.setXmId(zsyzQyxx.getXmId());
+            zsyzFj.setXmbh(zsyzQyxx.getXmbh());
+            zsyzFjMapper.insertZsyzFj(zsyzFj);
+        }
+        return count;
+
     }
 
     /**
@@ -65,10 +90,27 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateZsyzQyxx(ZsyzQyxx zsyzQyxx)
     {
+
         zsyzQyxx.setUpdateTime(DateUtils.getNowDate());
-        return zsyzQyxxMapper.updateZsyzQyxx(zsyzQyxx);
+        int count = zsyzQyxxMapper.updateZsyzQyxx(zsyzQyxx);
+        //修改附件
+        if(zsyzQyxx.getZsyzFjList()!=null && zsyzQyxx.getZsyzFjList().size()>0){
+            //先删除相关附件
+            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzQyxx.getId());
+            //再将文件新增进数据库
+            List<ZsyzFj> zsyzFjList = zsyzQyxx.getZsyzFjList();
+            for (ZsyzFj zsyzFj : zsyzFjList) {
+                zsyzFj.setSourceId(zsyzQyxx.getId());
+                zsyzFj.setType("2");
+                zsyzFj.setXmId(zsyzQyxx.getXmId());
+                zsyzFj.setXmbh(zsyzQyxx.getXmbh());
+                zsyzFjMapper.insertZsyzFj(zsyzFj);
+            }
+        }
+        return count;
     }
 
     /**

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

@@ -1,12 +1,16 @@
 package com.ruoyi.system.service.impl.projectV2;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.projectV2.ZsyzFj;
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
+import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
 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 java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -20,6 +24,9 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
     @Autowired
     private ZsyzSbbzbMapper zsyzSbbzbMapper;
 
+    @Autowired
+    private ZsyzFjMapper zsyzFjMapper;
+
     /**
      * 查询招商引资_申报_首谈信息_主
      *
@@ -27,8 +34,15 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
      * @return 招商引资_申报_首谈信息_主
      */
     @Override
-    public ZsyzSbbzb selectZsyzSbbzbById(Long id) {
-        return zsyzSbbzbMapper.selectZsyzSbbzbById(id);
+    @Transactional
+    public ZsyzSbbzb selectZsyzSbbzbById(Long id)
+    {
+        ZsyzSbbzb zsyzSbbzb = zsyzSbbzbMapper.selectZsyzSbbzbById(id);
+        ZsyzFj zsyzFj = new ZsyzFj();
+        zsyzFj.setSourceId(id);
+        List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
+        zsyzSbbzb.setZsyzFjList(zsyzFjList);
+        return zsyzSbbzb;
     }
 
     /**
@@ -49,9 +63,21 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
      * @return 结果
      */
     @Override
-    public int insertZsyzSbbzb(ZsyzSbbzb zsyzSbbzb) {
+    @Transactional
+    public int insertZsyzSbbzb(ZsyzSbbzb zsyzSbbzb)
+    {
         zsyzSbbzb.setCreateTime(DateUtils.getNowDate());
-        return zsyzSbbzbMapper.insertZsyzSbbzb(zsyzSbbzb);
+        int count = zsyzSbbzbMapper.insertZsyzSbbzb(zsyzSbbzb);
+        //保存附件信息
+        List<ZsyzFj> zsyzFjList = zsyzSbbzb.getZsyzFjList();
+        for (ZsyzFj zsyzFj : zsyzFjList) {
+            zsyzFj.setSourceId(zsyzSbbzb.getId());
+            zsyzFj.setType("1");
+            zsyzFj.setXmId(zsyzSbbzb.getId());
+            zsyzFj.setXmbh(zsyzSbbzb.getXmbh());
+            zsyzFjMapper.insertZsyzFj(zsyzFj);
+        }
+        return count;
     }
 
     /**
@@ -61,9 +87,28 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
      * @return 结果
      */
     @Override
-    public int updateZsyzSbbzb(ZsyzSbbzb zsyzSbbzb) {
+    @Transactional
+    public int updateZsyzSbbzb(ZsyzSbbzb zsyzSbbzb)
+    {
+
         zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
-        return zsyzSbbzbMapper.updateZsyzSbbzb(zsyzSbbzb);
+        int count = zsyzSbbzbMapper.updateZsyzSbbzb(zsyzSbbzb);
+        //修改附件
+        if(zsyzSbbzb.getZsyzFjList()!=null && zsyzSbbzb.getZsyzFjList().size()>0){
+            //先删除相关附件
+            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzSbbzb.getId());
+            //再将文件新增进数据库
+            List<ZsyzFj> zsyzFjList = zsyzSbbzb.getZsyzFjList();
+            for (ZsyzFj zsyzFj : zsyzFjList) {
+                zsyzFj.setSourceId(zsyzSbbzb.getId());
+                zsyzFj.setType("1");
+                zsyzFj.setXmId(zsyzSbbzb.getId());
+                zsyzFj.setXmbh(zsyzSbbzb.getXmbh());
+                zsyzFjMapper.insertZsyzFj(zsyzFj);
+            }
+        }
+
+        return count;
     }
 
     /**

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

@@ -1,11 +1,15 @@
 package com.ruoyi.system.service.impl.projectV2;
 
 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.ZsyzTcxx;
+import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzTcxxMapper;
 import com.ruoyi.system.service.projectV2.IZsyzTcxxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -22,6 +26,9 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService
     @Autowired
     private ZsyzTcxxMapper zsyzTcxxMapper;
 
+    @Autowired
+    private ZsyzFjMapper zsyzFjMapper;
+
     /**
      * 查询招商引资_投产信息
      * 
@@ -29,9 +36,16 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService
      * @return 招商引资_投产信息
      */
     @Override
+    @Transactional
     public ZsyzTcxx selectZsyzTcxxById(Long id)
     {
-        return zsyzTcxxMapper.selectZsyzTcxxById(id);
+
+        ZsyzTcxx zsyzTcxx = zsyzTcxxMapper.selectZsyzTcxxById(id);
+        ZsyzFj zsyzFj = new ZsyzFj();
+        zsyzFj.setSourceId(id);
+        List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
+        zsyzTcxx.setZsyzFjList(zsyzFjList);
+        return zsyzTcxx;
     }
 
     /**
@@ -53,10 +67,23 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertZsyzTcxx(ZsyzTcxx zsyzTcxx)
     {
+
         zsyzTcxx.setCreateTime(DateUtils.getNowDate());
-        return zsyzTcxxMapper.insertZsyzTcxx(zsyzTcxx);
+        int count = zsyzTcxxMapper.insertZsyzTcxx(zsyzTcxx);
+        //保存附件信息
+        List<ZsyzFj> zsyzFjList = zsyzTcxx.getZsyzFjList();
+        for (ZsyzFj zsyzFj : zsyzFjList) {
+            zsyzFj.setSourceId(zsyzTcxx.getId());
+            zsyzFj.setType("4");
+            zsyzFj.setXmId(zsyzTcxx.getXmId());
+            zsyzFj.setXmbh(zsyzTcxx.getXmbh());
+            zsyzFjMapper.insertZsyzFj(zsyzFj);
+        }
+        return count;
+
     }
 
     /**
@@ -66,10 +93,28 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateZsyzTcxx(ZsyzTcxx zsyzTcxx)
     {
+
         zsyzTcxx.setUpdateTime(DateUtils.getNowDate());
-        return zsyzTcxxMapper.updateZsyzTcxx(zsyzTcxx);
+        int count = zsyzTcxxMapper.updateZsyzTcxx(zsyzTcxx);
+        //修改附件
+        if(zsyzTcxx.getZsyzFjList()!=null && zsyzTcxx.getZsyzFjList().size()>0){
+            //先删除相关附件
+            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzTcxx.getId());
+            //再将文件新增进数据库
+            List<ZsyzFj> zsyzFjList = zsyzTcxx.getZsyzFjList();
+            for (ZsyzFj zsyzFj : zsyzFjList) {
+                zsyzFj.setSourceId(zsyzTcxx.getId());
+                zsyzFj.setType("4");
+                zsyzFj.setXmId(zsyzTcxx.getXmId());
+                zsyzFj.setXmbh(zsyzTcxx.getXmbh());
+                zsyzFjMapper.insertZsyzFj(zsyzFj);
+            }
+        }
+        return count;
+
     }
 
     /**

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

@@ -82,4 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteZsyzFjBySourceId">
+        delete from zsyz_fj where source_id = #{id}
+    </delete>
 </mapper>