瀏覽代碼

节点安排

LIVE_YE 2 年之前
父節點
當前提交
f53cd2bbd7
共有 19 個文件被更改,包括 1999 次插入0 次删除
  1. 129 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/fgw/FgwJdapController.java
  2. 104 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/fgw/FgwJdapDwController.java
  3. 104 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/fgw/FgwJdapFjController.java
  4. 220 0
      ruoyi-system/src/main/java/com/ruoyi/system/domain/fgw/FgwJdap.java
  5. 110 0
      ruoyi-system/src/main/java/com/ruoyi/system/domain/fgw/FgwJdapDw.java
  6. 94 0
      ruoyi-system/src/main/java/com/ruoyi/system/domain/fgw/FgwJdapFj.java
  7. 19 0
      ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/JdapVo.java
  8. 65 0
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/fgw/FgwJdapDwMapper.java
  9. 65 0
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/fgw/FgwJdapFjMapper.java
  10. 64 0
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/fgw/FgwJdapMapper.java
  11. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/fgw/IFgwJdapDwService.java
  12. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/fgw/IFgwJdapFjService.java
  13. 68 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/fgw/IFgwJdapService.java
  14. 96 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwJdapDwServiceImpl.java
  15. 93 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwJdapFjServiceImpl.java
  16. 325 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwJdapServiceImpl.java
  17. 105 0
      ruoyi-system/src/main/resources/mapper/system/fgw/FgwJdapDwMapper.xml
  18. 84 0
      ruoyi-system/src/main/resources/mapper/system/fgw/FgwJdapFjMapper.xml
  19. 132 0
      ruoyi-system/src/main/resources/mapper/system/fgw/FgwJdapMapper.xml

+ 129 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fgw/FgwJdapController.java

@@ -0,0 +1,129 @@
+package com.ruoyi.web.controller.fgw;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.vo.JdapVo;
+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.fgw.FgwJdap;
+import com.ruoyi.system.service.fgw.IFgwJdapService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 发改委_节点安排Controller
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+@RestController
+@RequestMapping("/fgw/jdap")
+public class FgwJdapController extends BaseController
+{
+    @Autowired
+    private IFgwJdapService fgwJdapService;
+
+    /**
+     * 查询发改委_节点安排列表
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:jdap:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FgwJdap fgwJdap)
+    {
+        startPage();
+        List<FgwJdap> list = fgwJdapService.selectFgwJdapList(fgwJdap);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出发改委_节点安排列表
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:jdap:export')")
+    @Log(title = "发改委_节点安排", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FgwJdap fgwJdap)
+    {
+        List<FgwJdap> list = fgwJdapService.selectFgwJdapList(fgwJdap);
+        ExcelUtil<FgwJdap> util = new ExcelUtil<FgwJdap>(FgwJdap.class);
+        util.exportExcel(response, list, "发改委_节点安排数据");
+    }
+
+    /**
+     * 获取发改委_节点安排详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:jdap:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(fgwJdapService.selectFgwJdapById(id));
+    }
+
+    /**
+     * 新增发改委_节点安排
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:jdap:add')")
+    @Log(title = "发改委_节点安排", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JdapVo jdapVo)
+    {
+        return fgwJdapService.insertFgwJdap(jdapVo);
+    }
+
+    /**
+     * 修改发改委_节点安排
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:jdap:edit')")
+    @Log(title = "发改委_节点安排", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody FgwJdap fgwJdap)
+    {
+        return fgwJdapService.updateFgwJdap(fgwJdap);
+    }
+
+    /**
+     * 审核发改委_节点安排
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:jdap:jdsh')")
+    @Log(title = "发改委_节点安排_jdsh", businessType = BusinessType.UPDATE)
+    @GetMapping("/jdsh")
+    public AjaxResult jdsh(String ids,String shyj,String shjg)
+    {
+        return toAjax(fgwJdapService.jdsh(ids,shyj,shjg));
+    }
+
+    /**
+     * 发改委_节点安排_催报
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:jdap:jdcb')")
+    @Log(title = "发改委_节点安排_jdsh", businessType = BusinessType.UPDATE)
+    @GetMapping("/cb/{id}")
+    public AjaxResult cb(@PathVariable Long id)
+    {
+        return toAjax(fgwJdapService.cb(id));
+    }
+
+
+    /**
+     * 删除发改委_节点安排
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:jdap:remove')")
+    @Log(title = "发改委_节点安排", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(fgwJdapService.deleteFgwJdapByIds(ids));
+    }
+}

+ 104 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fgw/FgwJdapDwController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.fgw;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.fgw.FgwJdapDw;
+import com.ruoyi.system.service.fgw.IFgwJdapDwService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 发改委_节点安排_单位Controller
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+@RestController
+@RequestMapping("/fgw/dw")
+public class FgwJdapDwController extends BaseController
+{
+    @Autowired
+    private IFgwJdapDwService fgwJdapDwService;
+
+    /**
+     * 查询发改委_节点安排_单位列表
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:dw:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FgwJdapDw fgwJdapDw)
+    {
+        startPage();
+        List<FgwJdapDw> list = fgwJdapDwService.selectFgwJdapDwList(fgwJdapDw);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出发改委_节点安排_单位列表
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:dw:export')")
+    @Log(title = "发改委_节点安排_单位", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FgwJdapDw fgwJdapDw)
+    {
+        List<FgwJdapDw> list = fgwJdapDwService.selectFgwJdapDwList(fgwJdapDw);
+        ExcelUtil<FgwJdapDw> util = new ExcelUtil<FgwJdapDw>(FgwJdapDw.class);
+        util.exportExcel(response, list, "发改委_节点安排_单位数据");
+    }
+
+    /**
+     * 获取发改委_节点安排_单位详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:dw:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(fgwJdapDwService.selectFgwJdapDwById(id));
+    }
+
+    /**
+     * 新增发改委_节点安排_单位
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:dw:add')")
+    @Log(title = "发改委_节点安排_单位", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FgwJdapDw fgwJdapDw)
+    {
+        return toAjax(fgwJdapDwService.insertFgwJdapDw(fgwJdapDw));
+    }
+
+    /**
+     * 修改发改委_节点安排_单位
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:dw:edit')")
+    @Log(title = "发改委_节点安排_单位", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FgwJdapDw fgwJdapDw)
+    {
+        return toAjax(fgwJdapDwService.updateFgwJdapDw(fgwJdapDw));
+    }
+
+    /**
+     * 删除发改委_节点安排_单位
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:dw:remove')")
+    @Log(title = "发改委_节点安排_单位", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(fgwJdapDwService.deleteFgwJdapDwByIds(ids));
+    }
+}

+ 104 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fgw/FgwJdapFjController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.fgw;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.fgw.FgwJdapFj;
+import com.ruoyi.system.service.fgw.IFgwJdapFjService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 发改委_节点安排_附件Controller
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+@RestController
+@RequestMapping("/system/fj")
+public class FgwJdapFjController extends BaseController
+{
+    @Autowired
+    private IFgwJdapFjService fgwJdapFjService;
+
+    /**
+     * 查询发改委_节点安排_附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:fj:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FgwJdapFj fgwJdapFj)
+    {
+        startPage();
+        List<FgwJdapFj> list = fgwJdapFjService.selectFgwJdapFjList(fgwJdapFj);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出发改委_节点安排_附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:fj:export')")
+    @Log(title = "发改委_节点安排_附件", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FgwJdapFj fgwJdapFj)
+    {
+        List<FgwJdapFj> list = fgwJdapFjService.selectFgwJdapFjList(fgwJdapFj);
+        ExcelUtil<FgwJdapFj> util = new ExcelUtil<FgwJdapFj>(FgwJdapFj.class);
+        util.exportExcel(response, list, "发改委_节点安排_附件数据");
+    }
+
+    /**
+     * 获取发改委_节点安排_附件详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:fj:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(fgwJdapFjService.selectFgwJdapFjById(id));
+    }
+
+    /**
+     * 新增发改委_节点安排_附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:fj:add')")
+    @Log(title = "发改委_节点安排_附件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FgwJdapFj fgwJdapFj)
+    {
+        return toAjax(fgwJdapFjService.insertFgwJdapFj(fgwJdapFj));
+    }
+
+    /**
+     * 修改发改委_节点安排_附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:fj:edit')")
+    @Log(title = "发改委_节点安排_附件", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FgwJdapFj fgwJdapFj)
+    {
+        return toAjax(fgwJdapFjService.updateFgwJdapFj(fgwJdapFj));
+    }
+
+    /**
+     * 删除发改委_节点安排_附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:fj:remove')")
+    @Log(title = "发改委_节点安排_附件", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(fgwJdapFjService.deleteFgwJdapFjByIds(ids));
+    }
+}

+ 220 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/fgw/FgwJdap.java

@@ -0,0 +1,220 @@
+package com.ruoyi.system.domain.fgw;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 发改委_节点安排对象 fgw_jdap
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+public class FgwJdap extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 项目ID */
+    @Excel(name = "项目ID")
+    private Long xmId;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String xmmc;
+
+    /** 节点完成年份 */
+    @Excel(name = "节点完成年份")
+    private String year;
+
+    /** 月 */
+    @Excel(name = "月")
+    private String month;
+
+    /** 节点完成时间 */
+    //@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @Excel(name = "节点完成时间", width = 30)
+    private String jdsj;
+
+    /** 节点安排内容 */
+    @Excel(name = "节点安排内容")
+    private String jdannr;
+
+    /** 审核结果:0:未审核,1:审核通过,2:审核未通过 */
+    @Excel(name = "审核结果:0:未审核,1:审核通过,2:审核未通过")
+    private String shjg;
+
+    /** 审核意见 */
+    @Excel(name = "审核意见")
+    private String shyj;
+
+    /** 完成情况:0:无状态,1:未处理,2:未完成,3:已完成 */
+    @Excel(name = "完成情况:0:无状态,1:未处理,2:未完成,3:已完成")
+    private String sfwc;
+
+    /** 超期天数 */
+    @Excel(name = "超期天数")
+    private Long cqts;
+
+    /** 节点安排-责任单位 */
+    private List<FgwJdapDw> fgwJdapZrDwList;
+
+    /** 节点安排-协同单位 */
+    private List<FgwJdapDw> fgwJdapXtDwList;
+
+    /** 节点安排-附件 */
+    private List<FgwJdapFj> fgwJdapFjList;
+
+    public List<FgwJdapFj> getFgwJdapFjList() {
+        return fgwJdapFjList;
+    }
+
+    public void setFgwJdapFjList(List<FgwJdapFj> fgwJdapFjList) {
+        this.fgwJdapFjList = fgwJdapFjList;
+    }
+
+    public List<FgwJdapDw> getFgwJdapZrDwList() {
+        return fgwJdapZrDwList;
+    }
+
+    public List<FgwJdapDw> getFgwJdapXtDwList() {
+        return fgwJdapXtDwList;
+    }
+
+    public void setFgwJdapZrDwList(List<FgwJdapDw> fgwJdapZrDwList) {
+        this.fgwJdapZrDwList = fgwJdapZrDwList;
+    }
+
+    public void setFgwJdapXtDwList(List<FgwJdapDw> fgwJdapXtDwList) {
+        this.fgwJdapXtDwList = fgwJdapXtDwList;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setXmId(Long xmId) 
+    {
+        this.xmId = xmId;
+    }
+
+    public Long getXmId() 
+    {
+        return xmId;
+    }
+    public void setXmmc(String xmmc) 
+    {
+        this.xmmc = xmmc;
+    }
+
+    public String getXmmc() 
+    {
+        return xmmc;
+    }
+    public void setYear(String year) 
+    {
+        this.year = year;
+    }
+
+    public String getYear() 
+    {
+        return year;
+    }
+    public void setMonth(String month) 
+    {
+        this.month = month;
+    }
+
+    public String getMonth() 
+    {
+        return month;
+    }
+    public void setJdsj(String jdsj)
+    {
+        this.jdsj = jdsj;
+    }
+
+    public String getJdsj()
+    {
+        return jdsj;
+    }
+    public void setJdannr(String jdannr) 
+    {
+        this.jdannr = jdannr;
+    }
+
+    public String getJdannr() 
+    {
+        return jdannr;
+    }
+    public void setShjg(String shjg) 
+    {
+        this.shjg = shjg;
+    }
+
+    public String getShjg() 
+    {
+        return shjg;
+    }
+    public void setShyj(String shyj) 
+    {
+        this.shyj = shyj;
+    }
+
+    public String getShyj() 
+    {
+        return shyj;
+    }
+    public void setSfwc(String sfwc) 
+    {
+        this.sfwc = sfwc;
+    }
+
+    public String getSfwc() 
+    {
+        return sfwc;
+    }
+    public void setCqts(Long cqts) 
+    {
+        this.cqts = cqts;
+    }
+
+    public Long getCqts() 
+    {
+        return cqts;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xmId", getXmId())
+            .append("xmmc", getXmmc())
+            .append("year", getYear())
+            .append("month", getMonth())
+            .append("jdsj", getJdsj())
+            .append("jdannr", getJdannr())
+            .append("shjg", getShjg())
+            .append("shyj", getShyj())
+            .append("sfwc", getSfwc())
+            .append("cqts", getCqts())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 110 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/fgw/FgwJdapDw.java

@@ -0,0 +1,110 @@
+package com.ruoyi.system.domain.fgw;
+
+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;
+
+/**
+ * 发改委_节点安排_单位对象 fgw_jdap_dw
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+public class FgwJdapDw extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 项目ID */
+    @Excel(name = "项目ID")
+    private Long xmId;
+
+    /** 节点安排ID */
+    @Excel(name = "节点安排ID")
+    private Long jdapId;
+
+    /** 部门类型  0:责任单位,1:协同单位 */
+    @Excel(name = "部门类型  0:责任单位,1:协同单位")
+    private String deptType;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    private String deptName;
+
+    public String getDeptType() {
+        return deptType;
+    }
+
+    public void setDeptType(String deptType) {
+        this.deptType = deptType;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setXmId(Long xmId) 
+    {
+        this.xmId = xmId;
+    }
+
+    public Long getXmId() 
+    {
+        return xmId;
+    }
+    public void setJdapId(Long jdapId) 
+    {
+        this.jdapId = jdapId;
+    }
+
+    public Long getJdapId() 
+    {
+        return jdapId;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+    public void setDeptName(String deptName) 
+    {
+        this.deptName = deptName;
+    }
+
+    public String getDeptName() 
+    {
+        return deptName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xmId", getXmId())
+            .append("jdapId", getJdapId())
+            .append("deptId", getDeptId())
+            .append("deptName", getDeptName())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 94 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/fgw/FgwJdapFj.java

@@ -0,0 +1,94 @@
+package com.ruoyi.system.domain.fgw;
+
+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;
+
+/**
+ * 发改委_节点安排_附件对象 fgw_jdap_fj
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+public class FgwJdapFj extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 项目ID */
+    @Excel(name = "项目ID")
+    private Long xmId;
+
+    /** 节点安排ID */
+    @Excel(name = "节点安排ID")
+    private Long jdapId;
+
+    /** 附件名称 */
+    @Excel(name = "附件名称")
+    private String fjName;
+
+    /** 附件地址 */
+    @Excel(name = "附件地址")
+    private String path;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setXmId(Long xmId) 
+    {
+        this.xmId = xmId;
+    }
+
+    public Long getXmId() 
+    {
+        return xmId;
+    }
+    public void setJdapId(Long jdapId) 
+    {
+        this.jdapId = jdapId;
+    }
+
+    public Long getJdapId() 
+    {
+        return jdapId;
+    }
+    public void setFjName(String fjName) 
+    {
+        this.fjName = fjName;
+    }
+
+    public String getFjName() 
+    {
+        return fjName;
+    }
+    public void setPath(String path) 
+    {
+        this.path = path;
+    }
+
+    public String getPath() 
+    {
+        return path;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xmId", getXmId())
+            .append("jdapId", getJdapId())
+            .append("fjName", getFjName())
+            .append("path", getPath())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 19 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/JdapVo.java

@@ -0,0 +1,19 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.system.domain.fgw.FgwJdap;
+
+import java.util.List;
+
+public class JdapVo {
+
+    //发改委_节点安排数组
+    private List<FgwJdap> fgwJdapList;
+
+    public List<FgwJdap> getFgwJdapList() {
+        return fgwJdapList;
+    }
+
+    public void setFgwJdapList(List<FgwJdap> fgwJdapList) {
+        this.fgwJdapList = fgwJdapList;
+    }
+}

+ 65 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/fgw/FgwJdapDwMapper.java

@@ -0,0 +1,65 @@
+package com.ruoyi.system.mapper.fgw;
+
+import java.util.List;
+import com.ruoyi.system.domain.fgw.FgwJdapDw;
+
+/**
+ * 发改委_节点安排_单位Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+public interface FgwJdapDwMapper 
+{
+    /**
+     * 查询发改委_节点安排_单位
+     * 
+     * @param id 发改委_节点安排_单位主键
+     * @return 发改委_节点安排_单位
+     */
+    public FgwJdapDw selectFgwJdapDwById(Long id);
+
+    /**
+     * 查询发改委_节点安排_单位列表
+     * 
+     * @param fgwJdapDw 发改委_节点安排_单位
+     * @return 发改委_节点安排_单位集合
+     */
+    public List<FgwJdapDw> selectFgwJdapDwList(FgwJdapDw fgwJdapDw);
+
+    /**
+     * 新增发改委_节点安排_单位
+     * 
+     * @param fgwJdapDw 发改委_节点安排_单位
+     * @return 结果
+     */
+    public int insertFgwJdapDw(FgwJdapDw fgwJdapDw);
+
+    /**
+     * 修改发改委_节点安排_单位
+     * 
+     * @param fgwJdapDw 发改委_节点安排_单位
+     * @return 结果
+     */
+    public int updateFgwJdapDw(FgwJdapDw fgwJdapDw);
+
+    /**
+     * 删除发改委_节点安排_单位
+     * 
+     * @param id 发改委_节点安排_单位主键
+     * @return 结果
+     */
+    public int deleteFgwJdapDwById(Long id);
+
+    /**
+     * 批量删除发改委_节点安排_单位
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFgwJdapDwByIds(Long[] ids);
+
+    void deleteFgwJdapDwByJdids(Long[] ids);
+
+    void deleteFgwJdapDwByJdid(Long id);
+}

+ 65 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/fgw/FgwJdapFjMapper.java

@@ -0,0 +1,65 @@
+package com.ruoyi.system.mapper.fgw;
+
+import java.util.List;
+import com.ruoyi.system.domain.fgw.FgwJdapFj;
+
+/**
+ * 发改委_节点安排_附件Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+public interface FgwJdapFjMapper 
+{
+    /**
+     * 查询发改委_节点安排_附件
+     * 
+     * @param id 发改委_节点安排_附件主键
+     * @return 发改委_节点安排_附件
+     */
+    public FgwJdapFj selectFgwJdapFjById(Long id);
+
+    /**
+     * 查询发改委_节点安排_附件列表
+     * 
+     * @param fgwJdapFj 发改委_节点安排_附件
+     * @return 发改委_节点安排_附件集合
+     */
+    public List<FgwJdapFj> selectFgwJdapFjList(FgwJdapFj fgwJdapFj);
+
+    /**
+     * 新增发改委_节点安排_附件
+     * 
+     * @param fgwJdapFj 发改委_节点安排_附件
+     * @return 结果
+     */
+    public int insertFgwJdapFj(FgwJdapFj fgwJdapFj);
+
+    /**
+     * 修改发改委_节点安排_附件
+     * 
+     * @param fgwJdapFj 发改委_节点安排_附件
+     * @return 结果
+     */
+    public int updateFgwJdapFj(FgwJdapFj fgwJdapFj);
+
+    /**
+     * 删除发改委_节点安排_附件
+     * 
+     * @param id 发改委_节点安排_附件主键
+     * @return 结果
+     */
+    public int deleteFgwJdapFjById(Long id);
+
+    /**
+     * 批量删除发改委_节点安排_附件
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFgwJdapFjByIds(Long[] ids);
+
+    void deleteFgwJdapFjByJdId(Long id);
+
+    void deleteFgwJdapFjByJdIds(Long[] ids);
+}

+ 64 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/fgw/FgwJdapMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.system.mapper.fgw;
+
+import java.util.List;
+import com.ruoyi.system.domain.fgw.FgwJdap;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 发改委_节点安排Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+public interface FgwJdapMapper 
+{
+    /**
+     * 查询发改委_节点安排
+     * 
+     * @param id 发改委_节点安排主键
+     * @return 发改委_节点安排
+     */
+    public FgwJdap selectFgwJdapById(Long id);
+
+    /**
+     * 查询发改委_节点安排列表
+     * 
+     * @param fgwJdap 发改委_节点安排
+     * @return 发改委_节点安排集合
+     */
+    public List<FgwJdap> selectFgwJdapList(FgwJdap fgwJdap);
+
+    /**
+     * 新增发改委_节点安排
+     * 
+     * @param fgwJdap 发改委_节点安排
+     * @return 结果
+     */
+    public int insertFgwJdap(FgwJdap fgwJdap);
+
+    /**
+     * 修改发改委_节点安排
+     * 
+     * @param fgwJdap 发改委_节点安排
+     * @return 结果
+     */
+    public int updateFgwJdap(FgwJdap fgwJdap);
+
+    /**
+     * 删除发改委_节点安排
+     * 
+     * @param id 发改委_节点安排主键
+     * @return 结果
+     */
+    public int deleteFgwJdapById(Long id);
+
+    /**
+     * 批量删除发改委_节点安排
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFgwJdapByIds(Long[] ids);
+
+    int updateFgwJdapJdsh(@Param("ids") String[] ids, @Param("shyj")String shyj, @Param("shjg")String shjg);
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/fgw/IFgwJdapDwService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service.fgw;
+
+import java.util.List;
+import com.ruoyi.system.domain.fgw.FgwJdapDw;
+
+/**
+ * 发改委_节点安排_单位Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+public interface IFgwJdapDwService 
+{
+    /**
+     * 查询发改委_节点安排_单位
+     * 
+     * @param id 发改委_节点安排_单位主键
+     * @return 发改委_节点安排_单位
+     */
+    public FgwJdapDw selectFgwJdapDwById(Long id);
+
+    /**
+     * 查询发改委_节点安排_单位列表
+     * 
+     * @param fgwJdapDw 发改委_节点安排_单位
+     * @return 发改委_节点安排_单位集合
+     */
+    public List<FgwJdapDw> selectFgwJdapDwList(FgwJdapDw fgwJdapDw);
+
+    /**
+     * 新增发改委_节点安排_单位
+     * 
+     * @param fgwJdapDw 发改委_节点安排_单位
+     * @return 结果
+     */
+    public int insertFgwJdapDw(FgwJdapDw fgwJdapDw);
+
+    /**
+     * 修改发改委_节点安排_单位
+     * 
+     * @param fgwJdapDw 发改委_节点安排_单位
+     * @return 结果
+     */
+    public int updateFgwJdapDw(FgwJdapDw fgwJdapDw);
+
+    /**
+     * 批量删除发改委_节点安排_单位
+     * 
+     * @param ids 需要删除的发改委_节点安排_单位主键集合
+     * @return 结果
+     */
+    public int deleteFgwJdapDwByIds(Long[] ids);
+
+    /**
+     * 删除发改委_节点安排_单位信息
+     * 
+     * @param id 发改委_节点安排_单位主键
+     * @return 结果
+     */
+    public int deleteFgwJdapDwById(Long id);
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/fgw/IFgwJdapFjService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service.fgw;
+
+import java.util.List;
+import com.ruoyi.system.domain.fgw.FgwJdapFj;
+
+/**
+ * 发改委_节点安排_附件Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+public interface IFgwJdapFjService 
+{
+    /**
+     * 查询发改委_节点安排_附件
+     * 
+     * @param id 发改委_节点安排_附件主键
+     * @return 发改委_节点安排_附件
+     */
+    public FgwJdapFj selectFgwJdapFjById(Long id);
+
+    /**
+     * 查询发改委_节点安排_附件列表
+     * 
+     * @param fgwJdapFj 发改委_节点安排_附件
+     * @return 发改委_节点安排_附件集合
+     */
+    public List<FgwJdapFj> selectFgwJdapFjList(FgwJdapFj fgwJdapFj);
+
+    /**
+     * 新增发改委_节点安排_附件
+     * 
+     * @param fgwJdapFj 发改委_节点安排_附件
+     * @return 结果
+     */
+    public int insertFgwJdapFj(FgwJdapFj fgwJdapFj);
+
+    /**
+     * 修改发改委_节点安排_附件
+     * 
+     * @param fgwJdapFj 发改委_节点安排_附件
+     * @return 结果
+     */
+    public int updateFgwJdapFj(FgwJdapFj fgwJdapFj);
+
+    /**
+     * 批量删除发改委_节点安排_附件
+     * 
+     * @param ids 需要删除的发改委_节点安排_附件主键集合
+     * @return 结果
+     */
+    public int deleteFgwJdapFjByIds(Long[] ids);
+
+    /**
+     * 删除发改委_节点安排_附件信息
+     * 
+     * @param id 发改委_节点安排_附件主键
+     * @return 结果
+     */
+    public int deleteFgwJdapFjById(Long id);
+}

+ 68 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/fgw/IFgwJdapService.java

@@ -0,0 +1,68 @@
+package com.ruoyi.system.service.fgw;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.fgw.FgwJdap;
+import com.ruoyi.system.domain.vo.JdapVo;
+
+/**
+ * 发改委_节点安排Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+public interface IFgwJdapService 
+{
+    /**
+     * 查询发改委_节点安排
+     * 
+     * @param id 发改委_节点安排主键
+     * @return 发改委_节点安排
+     */
+    public FgwJdap selectFgwJdapById(Long id);
+
+    /**
+     * 查询发改委_节点安排列表
+     * 
+     * @param fgwJdap 发改委_节点安排
+     * @return 发改委_节点安排集合
+     */
+    public List<FgwJdap> selectFgwJdapList(FgwJdap fgwJdap);
+
+    /**
+     * 新增发改委_节点安排
+     * 
+     * @param jdapVo 发改委_节点安排
+     * @return 结果
+     */
+    public AjaxResult insertFgwJdap(JdapVo jdapVo);
+
+    /**
+     * 修改发改委_节点安排
+     * 
+     * @param fgwJdap 发改委_节点安排
+     * @return 结果
+     */
+    public AjaxResult updateFgwJdap(FgwJdap fgwJdap);
+
+    /**
+     * 批量删除发改委_节点安排
+     * 
+     * @param ids 需要删除的发改委_节点安排主键集合
+     * @return 结果
+     */
+    public int deleteFgwJdapByIds(Long[] ids);
+
+    /**
+     * 删除发改委_节点安排信息
+     * 
+     * @param id 发改委_节点安排主键
+     * @return 结果
+     */
+    public int deleteFgwJdapById(Long id);
+
+    int jdsh(String ids, String shyj,String shjg);
+
+    int cb(Long id);
+}

+ 96 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwJdapDwServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl.fgw;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.fgw.FgwJdapDwMapper;
+import com.ruoyi.system.domain.fgw.FgwJdapDw;
+import com.ruoyi.system.service.fgw.IFgwJdapDwService;
+
+/**
+ * 发改委_节点安排_单位Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+@Service
+public class FgwJdapDwServiceImpl implements IFgwJdapDwService 
+{
+    @Autowired
+    private FgwJdapDwMapper fgwJdapDwMapper;
+
+    /**
+     * 查询发改委_节点安排_单位
+     * 
+     * @param id 发改委_节点安排_单位主键
+     * @return 发改委_节点安排_单位
+     */
+    @Override
+    public FgwJdapDw selectFgwJdapDwById(Long id)
+    {
+        return fgwJdapDwMapper.selectFgwJdapDwById(id);
+    }
+
+    /**
+     * 查询发改委_节点安排_单位列表
+     * 
+     * @param fgwJdapDw 发改委_节点安排_单位
+     * @return 发改委_节点安排_单位
+     */
+    @Override
+    public List<FgwJdapDw> selectFgwJdapDwList(FgwJdapDw fgwJdapDw)
+    {
+        return fgwJdapDwMapper.selectFgwJdapDwList(fgwJdapDw);
+    }
+
+    /**
+     * 新增发改委_节点安排_单位
+     * 
+     * @param fgwJdapDw 发改委_节点安排_单位
+     * @return 结果
+     */
+    @Override
+    public int insertFgwJdapDw(FgwJdapDw fgwJdapDw)
+    {
+        fgwJdapDw.setCreateTime(DateUtils.getNowDate());
+        return fgwJdapDwMapper.insertFgwJdapDw(fgwJdapDw);
+    }
+
+    /**
+     * 修改发改委_节点安排_单位
+     * 
+     * @param fgwJdapDw 发改委_节点安排_单位
+     * @return 结果
+     */
+    @Override
+    public int updateFgwJdapDw(FgwJdapDw fgwJdapDw)
+    {
+        fgwJdapDw.setUpdateTime(DateUtils.getNowDate());
+        return fgwJdapDwMapper.updateFgwJdapDw(fgwJdapDw);
+    }
+
+    /**
+     * 批量删除发改委_节点安排_单位
+     * 
+     * @param ids 需要删除的发改委_节点安排_单位主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFgwJdapDwByIds(Long[] ids)
+    {
+        return fgwJdapDwMapper.deleteFgwJdapDwByIds(ids);
+    }
+
+    /**
+     * 删除发改委_节点安排_单位信息
+     * 
+     * @param id 发改委_节点安排_单位主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFgwJdapDwById(Long id)
+    {
+        return fgwJdapDwMapper.deleteFgwJdapDwById(id);
+    }
+}

+ 93 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwJdapFjServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.system.service.impl.fgw;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.fgw.FgwJdapFjMapper;
+import com.ruoyi.system.domain.fgw.FgwJdapFj;
+import com.ruoyi.system.service.fgw.IFgwJdapFjService;
+
+/**
+ * 发改委_节点安排_附件Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+@Service
+public class FgwJdapFjServiceImpl implements IFgwJdapFjService 
+{
+    @Autowired
+    private FgwJdapFjMapper fgwJdapFjMapper;
+
+    /**
+     * 查询发改委_节点安排_附件
+     * 
+     * @param id 发改委_节点安排_附件主键
+     * @return 发改委_节点安排_附件
+     */
+    @Override
+    public FgwJdapFj selectFgwJdapFjById(Long id)
+    {
+        return fgwJdapFjMapper.selectFgwJdapFjById(id);
+    }
+
+    /**
+     * 查询发改委_节点安排_附件列表
+     * 
+     * @param fgwJdapFj 发改委_节点安排_附件
+     * @return 发改委_节点安排_附件
+     */
+    @Override
+    public List<FgwJdapFj> selectFgwJdapFjList(FgwJdapFj fgwJdapFj)
+    {
+        return fgwJdapFjMapper.selectFgwJdapFjList(fgwJdapFj);
+    }
+
+    /**
+     * 新增发改委_节点安排_附件
+     * 
+     * @param fgwJdapFj 发改委_节点安排_附件
+     * @return 结果
+     */
+    @Override
+    public int insertFgwJdapFj(FgwJdapFj fgwJdapFj)
+    {
+        return fgwJdapFjMapper.insertFgwJdapFj(fgwJdapFj);
+    }
+
+    /**
+     * 修改发改委_节点安排_附件
+     * 
+     * @param fgwJdapFj 发改委_节点安排_附件
+     * @return 结果
+     */
+    @Override
+    public int updateFgwJdapFj(FgwJdapFj fgwJdapFj)
+    {
+        return fgwJdapFjMapper.updateFgwJdapFj(fgwJdapFj);
+    }
+
+    /**
+     * 批量删除发改委_节点安排_附件
+     * 
+     * @param ids 需要删除的发改委_节点安排_附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFgwJdapFjByIds(Long[] ids)
+    {
+        return fgwJdapFjMapper.deleteFgwJdapFjByIds(ids);
+    }
+
+    /**
+     * 删除发改委_节点安排_附件信息
+     * 
+     * @param id 发改委_节点安排_附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFgwJdapFjById(Long id)
+    {
+        return fgwJdapFjMapper.deleteFgwJdapFjById(id);
+    }
+}

+ 325 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwJdapServiceImpl.java

@@ -0,0 +1,325 @@
+package com.ruoyi.system.service.impl.fgw;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.fgw.FgwJdapDw;
+import com.ruoyi.system.domain.fgw.FgwJdapFj;
+import com.ruoyi.system.domain.vo.JdapVo;
+import com.ruoyi.system.mapper.fgw.FgwJdapDwMapper;
+import com.ruoyi.system.mapper.fgw.FgwJdapFjMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.fgw.FgwJdapMapper;
+import com.ruoyi.system.domain.fgw.FgwJdap;
+import com.ruoyi.system.service.fgw.IFgwJdapService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 发改委_节点安排Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-04-11
+ */
+@Service
+public class FgwJdapServiceImpl implements IFgwJdapService {
+    @Autowired
+    private FgwJdapMapper fgwJdapMapper;
+    @Autowired
+    private FgwJdapDwMapper fgwJdapDwMapper;
+    @Autowired
+    private FgwJdapFjMapper fgwJdapFjMapper;
+
+    /**
+     * 查询发改委_节点安排
+     *
+     * @param id 发改委_节点安排主键
+     * @return 发改委_节点安排
+     */
+    @Override
+    public FgwJdap selectFgwJdapById(Long id) {
+        FgwJdap fgwJdap = fgwJdapMapper.selectFgwJdapById(id);
+        //查询当前项目的所有人员
+        FgwJdapDw fgwJdapDw = new FgwJdapDw();
+        fgwJdapDw.setJdapId(id);
+        List<FgwJdapDw> fgwJdapDwList = fgwJdapDwMapper.selectFgwJdapDwList(fgwJdapDw);
+
+        List<FgwJdapDw> fgwJdapZrDwList = new ArrayList<>();
+        List<FgwJdapDw> fgwJdapXtDwList = new ArrayList<>();
+        if (fgwJdapDwList != null && fgwJdapDwList.size() > 0) {
+            for (FgwJdapDw jdapDw : fgwJdapDwList) {
+                if ("0".equals(jdapDw.getDeptType())) {
+                    fgwJdapZrDwList.add(jdapDw);
+                } else {
+                    fgwJdapXtDwList.add(jdapDw);
+                }
+            }
+        }
+        fgwJdap.setFgwJdapZrDwList(fgwJdapZrDwList);
+        fgwJdap.setFgwJdapXtDwList(fgwJdapXtDwList);
+        //查询附件
+        FgwJdapFj fgwJdapFj = new FgwJdapFj();
+        fgwJdapFj.setJdapId(id);
+        List<FgwJdapFj> fgwJdapFjList = fgwJdapFjMapper.selectFgwJdapFjList(fgwJdapFj);
+        fgwJdap.setFgwJdapFjList(fgwJdapFjList);
+        return fgwJdap;
+    }
+
+    /**
+     * 查询发改委_节点安排列表
+     *
+     * @param fgwJdap 发改委_节点安排
+     * @return 发改委_节点安排
+     */
+    @Override
+    public List<FgwJdap> selectFgwJdapList(FgwJdap fgwJdap) {
+
+        List<FgwJdap> fgwJdapList = fgwJdapMapper.selectFgwJdapList(fgwJdap);
+        //查询当前项目的所有人员
+        FgwJdapDw fgwJdapDw = new FgwJdapDw();
+        fgwJdapDw.setXmId(fgwJdap.getXmId());
+        List<FgwJdapDw> fgwJdapDwList = fgwJdapDwMapper.selectFgwJdapDwList(fgwJdapDw);
+        //查询附件
+        FgwJdapFj fgwJdapFj = new FgwJdapFj();
+        fgwJdapFj.setXmId(fgwJdap.getXmId());
+        List<FgwJdapFj> fgwJdapFjList = fgwJdapFjMapper.selectFgwJdapFjList(fgwJdapFj);
+        for (FgwJdap jdap : fgwJdapList) {
+            List<FgwJdapDw> fgwJdapZrDwList = new ArrayList<>();
+            List<FgwJdapDw> fgwJdapXtDwList = new ArrayList<>();
+            List<FgwJdapFj> fgwJdapFjs = new ArrayList<>();
+            if (fgwJdapDwList != null && fgwJdapDwList.size() > 0) {
+                for (FgwJdapDw jdapDw : fgwJdapDwList) {
+                    if (jdap.getId().equals(jdapDw.getJdapId())) {
+                        if ("0".equals(jdapDw.getDeptType())) {
+                            fgwJdapZrDwList.add(jdapDw);
+                        } else {
+                            fgwJdapXtDwList.add(jdapDw);
+                        }
+                    }
+                }
+            }
+            if (fgwJdapFjList != null && fgwJdapFjList.size() > 0) {
+                for (FgwJdapFj jdapFj : fgwJdapFjList) {
+                    if (jdap.getId().equals(jdapFj.getJdapId())) {
+                        fgwJdapFjs.add(jdapFj);
+                    }
+                }
+            }
+            jdap.setFgwJdapZrDwList(fgwJdapZrDwList);
+            jdap.setFgwJdapXtDwList(fgwJdapXtDwList);
+            jdap.setFgwJdapFjList(fgwJdapFjs);
+        }
+
+        return fgwJdapList;
+    }
+
+    /**
+     * 新增发改委_节点安排
+     *
+     * @param jdapVo 发改委_节点安排
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public AjaxResult insertFgwJdap(JdapVo jdapVo) {
+        List<FgwJdap> fgwJdapList = jdapVo.getFgwJdapList();
+
+        //判断新增节点中有没有重复的
+        for (FgwJdap fgwJdap : fgwJdapList) {
+            String[] t = String.valueOf(fgwJdap.getJdsj()).split("-");
+            fgwJdap.setYear(t[0]);
+            fgwJdap.setMonth(t[1]);
+            int i = 0;
+            for (FgwJdap fgwJdapz : fgwJdapList) {
+                String[] t1 = String.valueOf(fgwJdapz.getJdsj()).split("-");
+                fgwJdapz.setYear(t1[0]);
+                fgwJdapz.setMonth(t1[1]);
+                if(fgwJdap.getYear().equals(fgwJdapz.getYear()) && fgwJdap.getMonth().equals(fgwJdapz.getMonth())){
+                    i++;
+                }
+            }
+            if(i>1){
+                return AjaxResult.error("存在相同的月份数据,请检查后重新保存");
+            }
+        }
+
+        for (FgwJdap fgwJdap : fgwJdapList) {
+            //截取时间字符串
+            if (StringUtils.isNotEmpty(fgwJdap.getJdsj())) {
+                String[] t = String.valueOf(fgwJdap.getJdsj()).split("-");
+
+                //判断库里是否存在相同年份和月份的数据
+                FgwJdap fgwJdaps = new FgwJdap();
+                fgwJdaps.setYear(t[0]);
+                fgwJdaps.setMonth(t[1]);
+                fgwJdaps.setXmId(fgwJdap.getXmId());
+                List<FgwJdap> fgwJdapss = fgwJdapMapper.selectFgwJdapList(fgwJdaps);
+                if(fgwJdapss!=null && fgwJdapss              .size()>0){
+                    return AjaxResult.error("存在相同的月份数据,请检查后重新保存");
+                }
+
+                fgwJdap.setYear(t[0]);
+                fgwJdap.setMonth(t[1]);
+                fgwJdap.setCreateTime(DateUtils.getNowDate());
+                fgwJdap.setUpdateTime(DateUtils.getNowDate());
+                fgwJdapMapper.insertFgwJdap(fgwJdap);
+
+                List<FgwJdapDw> fgwJdapZrDwList = fgwJdap.getFgwJdapZrDwList();
+                List<FgwJdapDw> fgwJdapXtDwList = fgwJdap.getFgwJdapXtDwList();
+
+
+                if (fgwJdapZrDwList != null && fgwJdapZrDwList.size() > 0) {
+                    for (FgwJdapDw fgwJdapDw : fgwJdapZrDwList) {
+                        fgwJdapDw.setXmId(fgwJdap.getXmId());
+                        fgwJdapDw.setJdapId(fgwJdap.getId());
+                        fgwJdapDw.setDeptType("0");
+                        fgwJdapDw.setCreateTime(DateUtils.getNowDate());
+                        fgwJdapDw.setUpdateTime(DateUtils.getNowDate());
+                        fgwJdapDwMapper.insertFgwJdapDw(fgwJdapDw);
+                    }
+                }
+
+                if (fgwJdapXtDwList != null && fgwJdapXtDwList.size() > 0) {
+                    for (FgwJdapDw fgwJdapDw : fgwJdapXtDwList) {
+                        fgwJdapDw.setXmId(fgwJdap.getXmId());
+                        fgwJdapDw.setJdapId(fgwJdap.getId());
+                        fgwJdapDw.setDeptType("1");
+                        fgwJdapDw.setCreateTime(DateUtils.getNowDate());
+                        fgwJdapDw.setUpdateTime(DateUtils.getNowDate());
+                        fgwJdapDwMapper.insertFgwJdapDw(fgwJdapDw);
+                    }
+                }
+
+                List<FgwJdapFj> fgwJdapFjList = fgwJdap.getFgwJdapFjList();
+                if (fgwJdapFjList != null && fgwJdapFjList.size() > 0) {
+                    for (FgwJdapFj fgwJdapFj : fgwJdapFjList) {
+                        fgwJdapFj.setXmId(fgwJdap.getXmId());
+                        fgwJdapFj.setJdapId(fgwJdap.getId());
+                        fgwJdapFjMapper.insertFgwJdapFj(fgwJdapFj);
+                    }
+                }
+            }
+        }
+        return AjaxResult.success("保存成功");
+    }
+
+    /**
+     * 修改发改委_节点安排
+     *
+     * @param fgwJdap 发改委_节点安排
+     * @return 结果
+     */
+    @Override
+    public AjaxResult updateFgwJdap(FgwJdap fgwJdap) {
+        //截取时间字符串
+        String[] t = String.valueOf(fgwJdap.getJdsj()).split("-");
+        fgwJdap.setYear(t[0]);
+        fgwJdap.setMonth(t[1]);
+        fgwJdap.setUpdateTime(DateUtils.getNowDate());
+
+        //判断库里是否存在相同年份和月份的数据
+        FgwJdap fgwJdaps = new FgwJdap();
+        fgwJdaps.setYear(t[0]);
+        fgwJdaps.setMonth(t[1]);
+        fgwJdaps.setXmId(fgwJdap.getXmId());
+        List<FgwJdap> fgwJdapList = fgwJdapMapper.selectFgwJdapList(fgwJdaps);
+        if(fgwJdapList!=null && fgwJdapList.size()>0){
+            if(fgwJdapList.size()==1 && fgwJdapList.get(0).getId().equals(fgwJdap.getId())){
+            }else{
+                return AjaxResult.error("存在相同的月份数据,请检查后重新保存");
+            }
+
+        }
+
+
+        //先删除人员信息
+        fgwJdapDwMapper.deleteFgwJdapDwByJdid(fgwJdap.getId());
+        //删除附件
+        fgwJdapFjMapper.deleteFgwJdapFjByJdId(fgwJdap.getId());
+
+
+        List<FgwJdapDw> fgwJdapZrDwList = fgwJdap.getFgwJdapZrDwList();
+        List<FgwJdapDw> fgwJdapXtDwList = fgwJdap.getFgwJdapXtDwList();
+
+
+        if (fgwJdapZrDwList != null && fgwJdapZrDwList.size() > 0) {
+            for (FgwJdapDw fgwJdapDw : fgwJdapZrDwList) {
+                fgwJdapDw.setXmId(fgwJdap.getXmId());
+                fgwJdapDw.setJdapId(fgwJdap.getId());
+                fgwJdapDw.setDeptType("0");
+                fgwJdapDw.setCreateTime(DateUtils.getNowDate());
+                fgwJdapDw.setUpdateTime(DateUtils.getNowDate());
+                fgwJdapDwMapper.insertFgwJdapDw(fgwJdapDw);
+            }
+        }
+
+        if (fgwJdapXtDwList != null && fgwJdapXtDwList.size() > 0) {
+            for (FgwJdapDw fgwJdapDw : fgwJdapXtDwList) {
+                fgwJdapDw.setXmId(fgwJdap.getXmId());
+                fgwJdapDw.setJdapId(fgwJdap.getId());
+                fgwJdapDw.setDeptType("1");
+                fgwJdapDw.setCreateTime(DateUtils.getNowDate());
+                fgwJdapDw.setUpdateTime(DateUtils.getNowDate());
+                fgwJdapDwMapper.insertFgwJdapDw(fgwJdapDw);
+            }
+        }
+        List<FgwJdapFj> fgwJdapFjList = fgwJdap.getFgwJdapFjList();
+        if (fgwJdapFjList != null && fgwJdapFjList.size() > 0) {
+            for (FgwJdapFj fgwJdapFj : fgwJdapFjList) {
+                fgwJdapFj.setXmId(fgwJdap.getXmId());
+                fgwJdapFj.setJdapId(fgwJdap.getId());
+                fgwJdapFjMapper.insertFgwJdapFj(fgwJdapFj);
+            }
+        }
+        int i = fgwJdapMapper.updateFgwJdap(fgwJdap);
+        return i>0?AjaxResult.success("操作成功"):AjaxResult.error("操作失败");
+    }
+
+    /**
+     * 批量删除发改委_节点安排
+     *
+     * @param ids 需要删除的发改委_节点安排主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFgwJdapByIds(Long[] ids) {
+        //删除发改委节点
+        int i = fgwJdapMapper.deleteFgwJdapByIds(ids);
+        //删除人员信息
+        fgwJdapDwMapper.deleteFgwJdapDwByJdids(ids);
+        //删除附件信息
+        fgwJdapFjMapper.deleteFgwJdapFjByJdIds(ids);
+        return i;
+    }
+
+    /**
+     * 删除发改委_节点安排信息
+     *
+     * @param id 发改委_节点安排主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFgwJdapById(Long id) {
+        //删除发改委节点
+        int i = fgwJdapMapper.deleteFgwJdapById(id);
+        //删除人员信息
+        fgwJdapDwMapper.deleteFgwJdapDwByJdid(id);
+        //删除附件信息
+        fgwJdapFjMapper.deleteFgwJdapFjByJdId(id);
+        return i;
+    }
+
+    @Override
+    public int jdsh(String ids, String shyj, String shjg) {
+        String []idss = ids.split(",");
+        return fgwJdapMapper.updateFgwJdapJdsh(idss, shyj, shjg);
+    }
+
+    @Override
+    public int cb(Long id) {
+        return 0;
+    }
+}

+ 105 - 0
ruoyi-system/src/main/resources/mapper/system/fgw/FgwJdapDwMapper.xml

@@ -0,0 +1,105 @@
+<?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.fgw.FgwJdapDwMapper">
+    
+    <resultMap type="FgwJdapDw" id="FgwJdapDwResult">
+        <result property="id"    column="id"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="jdapId"    column="jdap_id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="deptType"    column="dept_type"    />
+        <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="selectFgwJdapDwVo">
+        select id, xm_id, jdap_id, dept_id, dept_name,dept_type, create_by, create_time, update_by, update_time, remark from fgw_jdap_dw
+    </sql>
+
+    <select id="selectFgwJdapDwList" parameterType="FgwJdapDw" resultMap="FgwJdapDwResult">
+        <include refid="selectFgwJdapDwVo"/>
+        <where>  
+            <if test="xmId != null "> and xm_id = #{xmId}</if>
+            <if test="jdapId != null "> and jdap_id = #{jdapId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptType != null "> and dept_type = #{deptType}</if>
+        </where>
+    </select>
+    
+    <select id="selectFgwJdapDwById" parameterType="Long" resultMap="FgwJdapDwResult">
+        <include refid="selectFgwJdapDwVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertFgwJdapDw" parameterType="FgwJdapDw" useGeneratedKeys="true" keyProperty="id">
+        insert into fgw_jdap_dw
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">xm_id,</if>
+            <if test="jdapId != null">jdap_id,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null and deptName != ''">dept_name,</if>
+            <if test="deptType != null ">dept_type,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">#{xmId},</if>
+            <if test="jdapId != null">#{jdapId},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null and deptName != ''">#{deptName},</if>
+            <if test="deptType != null ">#{deptType},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFgwJdapDw" parameterType="FgwJdapDw">
+        update fgw_jdap_dw
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xmId != null">xm_id = #{xmId},</if>
+            <if test="jdapId != null">jdap_id = #{jdapId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+            <if test="deptType != null ">dept_type = #{deptType},</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="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFgwJdapDwById" parameterType="Long">
+        delete from fgw_jdap_dw where id = #{id}
+    </delete>
+
+    <delete id="deleteFgwJdapDwByIds" parameterType="String">
+        delete from fgw_jdap_dw where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteFgwJdapDwByJdids">
+        delete from fgw_jdap_dw where jdap_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteFgwJdapDwByJdid">
+        delete from fgw_jdap_dw where jdap_id = #{id}
+    </delete>
+</mapper>

+ 84 - 0
ruoyi-system/src/main/resources/mapper/system/fgw/FgwJdapFjMapper.xml

@@ -0,0 +1,84 @@
+<?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.fgw.FgwJdapFjMapper">
+    
+    <resultMap type="FgwJdapFj" id="FgwJdapFjResult">
+        <result property="id"    column="id"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="jdapId"    column="jdap_id"    />
+        <result property="fjName"    column="fj_name"    />
+        <result property="path"    column="path"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectFgwJdapFjVo">
+        select id, xm_id, jdap_id, fj_name, path, remark from fgw_jdap_fj
+    </sql>
+
+    <select id="selectFgwJdapFjList" parameterType="FgwJdapFj" resultMap="FgwJdapFjResult">
+        <include refid="selectFgwJdapFjVo"/>
+        <where>  
+            <if test="xmId != null "> and xm_id = #{xmId}</if>
+            <if test="jdapId != null "> and jdap_id = #{jdapId}</if>
+            <if test="fjName != null  and fjName != ''"> and fj_name like concat('%', #{fjName}, '%')</if>
+            <if test="path != null  and path != ''"> and path = #{path}</if>
+        </where>
+    </select>
+    
+    <select id="selectFgwJdapFjById" parameterType="Long" resultMap="FgwJdapFjResult">
+        <include refid="selectFgwJdapFjVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertFgwJdapFj" parameterType="FgwJdapFj" useGeneratedKeys="true" keyProperty="id">
+        insert into fgw_jdap_fj
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">xm_id,</if>
+            <if test="jdapId != null">jdap_id,</if>
+            <if test="fjName != null and fjName != ''">fj_name,</if>
+            <if test="path != null">path,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">#{xmId},</if>
+            <if test="jdapId != null">#{jdapId},</if>
+            <if test="fjName != null and fjName != ''">#{fjName},</if>
+            <if test="path != null">#{path},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFgwJdapFj" parameterType="FgwJdapFj">
+        update fgw_jdap_fj
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xmId != null">xm_id = #{xmId},</if>
+            <if test="jdapId != null">jdap_id = #{jdapId},</if>
+            <if test="fjName != null and fjName != ''">fj_name = #{fjName},</if>
+            <if test="path != null">path = #{path},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFgwJdapFjById" parameterType="Long">
+        delete from fgw_jdap_fj where id = #{id}
+    </delete>
+
+    <delete id="deleteFgwJdapFjByIds" parameterType="String">
+        delete from fgw_jdap_fj where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteFgwJdapFjByJdId">
+        delete from fgw_jdap_fj where jdap_id = #{id}
+    </delete>
+    <delete id="deleteFgwJdapFjByJdIds">
+        delete from fgw_jdap_fj where jdap_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 132 - 0
ruoyi-system/src/main/resources/mapper/system/fgw/FgwJdapMapper.xml

@@ -0,0 +1,132 @@
+<?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.fgw.FgwJdapMapper">
+    
+    <resultMap type="FgwJdap" id="FgwJdapResult">
+        <result property="id"    column="id"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="year"    column="year"    />
+        <result property="month"    column="month"    />
+        <result property="jdsj"    column="jdsj"    />
+        <result property="jdannr"    column="jdannr"    />
+        <result property="shjg"    column="shjg"    />
+        <result property="shyj"    column="shyj"    />
+        <result property="sfwc"    column="sfwc"    />
+        <result property="cqts"    column="cqts"    />
+        <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="selectFgwJdapVo">
+        select id, xm_id, xmmc, year, month, jdsj, jdannr, shjg, shyj, sfwc, cqts, create_by, create_time, update_by, update_time, remark from fgw_jdap
+    </sql>
+
+    <select id="selectFgwJdapList" parameterType="FgwJdap" resultMap="FgwJdapResult">
+        <include refid="selectFgwJdapVo"/>
+        <where>  
+            <if test="xmId != null "> and xm_id = #{xmId}</if>
+            <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
+            <if test="year != null  and year != ''"> and year = #{year}</if>
+            <if test="month != null  and month != ''"> and month = #{month}</if>
+            <if test="jdsj != null "> and jdsj = #{jdsj}</if>
+            <if test="jdannr != null  and jdannr != ''"> and jdannr = #{jdannr}</if>
+            <if test="shjg != null  and shjg != ''"> and shjg = #{shjg}</if>
+            <if test="shyj != null  and shyj != ''"> and shyj = #{shyj}</if>
+            <if test="sfwc != null  and sfwc != ''"> and sfwc = #{sfwc}</if>
+            <if test="cqts != null "> and cqts = #{cqts}</if>
+        </where>
+    </select>
+    
+    <select id="selectFgwJdapById" parameterType="Long" resultMap="FgwJdapResult">
+        <include refid="selectFgwJdapVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertFgwJdap" parameterType="FgwJdap" useGeneratedKeys="true" keyProperty="id">
+        insert into fgw_jdap
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">xm_id,</if>
+            <if test="xmmc != null and xmmc != ''">xmmc,</if>
+            <if test="year != null and year != ''">year,</if>
+            <if test="month != null">month,</if>
+            <if test="jdsj != null">jdsj,</if>
+            <if test="jdannr != null and jdannr != ''">jdannr,</if>
+            <if test="shjg != null">shjg,</if>
+            <if test="shyj != null">shyj,</if>
+            <if test="sfwc != null">sfwc,</if>
+            <if test="cqts != null">cqts,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">#{xmId},</if>
+            <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
+            <if test="year != null and year != ''">#{year},</if>
+            <if test="month != null">#{month},</if>
+            <if test="jdsj != null">#{jdsj},</if>
+            <if test="jdannr != null and jdannr != ''">#{jdannr},</if>
+            <if test="shjg != null">#{shjg},</if>
+            <if test="shyj != null">#{shyj},</if>
+            <if test="sfwc != null">#{sfwc},</if>
+            <if test="cqts != null">#{cqts},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFgwJdap" parameterType="FgwJdap">
+        update fgw_jdap
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xmId != null">xm_id = #{xmId},</if>
+            <if test="xmmc != null and xmmc != ''">xmmc = #{xmmc},</if>
+            <if test="year != null and year != ''">year = #{year},</if>
+            <if test="month != null">month = #{month},</if>
+            <if test="jdsj != null">jdsj = #{jdsj},</if>
+            <if test="jdannr != null and jdannr != ''">jdannr = #{jdannr},</if>
+            <if test="shjg != null">shjg = #{shjg},</if>
+            <if test="shyj != null">shyj = #{shyj},</if>
+            <if test="sfwc != null">sfwc = #{sfwc},</if>
+            <if test="cqts != null">cqts = #{cqts},</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="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+    <update id="updateFgwJdapJdsh">
+        update fgw_jdap
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="shjg != null">shjg = #{shjg},</if>
+            <if test="shyj != null">shyj = #{shyj},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <delete id="deleteFgwJdapById" parameterType="Long">
+        delete from fgw_jdap where id = #{id}
+    </delete>
+
+    <delete id="deleteFgwJdapByIds" parameterType="String">
+        delete from fgw_jdap where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>