新增省库相关

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

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.projectV2;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.projectV2.ZsyzSkDzje;
+import com.ruoyi.system.service.projectV2.IZsyzSkDzjeService;
+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.common.core.page.TableDataInfo;
+
+/**
+ * 招商引资_省库项目_到资金额Controller
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+@RestController
+@RequestMapping("/projectV2/dzje")
+public class ZsyzSkDzjeController extends BaseController
+{
+    @Autowired
+    private IZsyzSkDzjeService zsyzSkDzjeService;
+
+    /**
+     * 查询招商引资_省库项目_到资金额列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dzje:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZsyzSkDzje zsyzSkDzje)
+    {
+        startPage();
+        List<ZsyzSkDzje> list = zsyzSkDzjeService.selectZsyzSkDzjeList(zsyzSkDzje);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招商引资_省库项目_到资金额列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dzje:export')")
+    @Log(title = "招商引资_省库项目_到资金额", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZsyzSkDzje zsyzSkDzje)
+    {
+        List<ZsyzSkDzje> list = zsyzSkDzjeService.selectZsyzSkDzjeList(zsyzSkDzje);
+        ExcelUtil<ZsyzSkDzje> util = new ExcelUtil<ZsyzSkDzje>(ZsyzSkDzje.class);
+        util.exportExcel(response, list, "招商引资_省库项目_到资金额数据");
+    }
+
+    /**
+     * 获取招商引资_省库项目_到资金额详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dzje:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(zsyzSkDzjeService.selectZsyzSkDzjeById(id));
+    }
+
+    /**
+     * 新增招商引资_省库项目_到资金额
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dzje:add')")
+    @Log(title = "招商引资_省库项目_到资金额", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZsyzSkDzje zsyzSkDzje)
+    {
+        return toAjax(zsyzSkDzjeService.insertZsyzSkDzje(zsyzSkDzje));
+    }
+
+    /**
+     * 修改招商引资_省库项目_到资金额
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dzje:edit')")
+    @Log(title = "招商引资_省库项目_到资金额", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ZsyzSkDzje zsyzSkDzje)
+    {
+        return toAjax(zsyzSkDzjeService.updateZsyzSkDzje(zsyzSkDzje));
+    }
+
+    /**
+     * 删除招商引资_省库项目_到资金额
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dzje:remove')")
+    @Log(title = "招商引资_省库项目_到资金额", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zsyzSkDzjeService.deleteZsyzSkDzjeByIds(ids));
+    }
+}

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

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.projectV2;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.projectV2.ZsyzSkSwtzdw;
+import com.ruoyi.system.service.projectV2.IZsyzSkSwtzdwService;
+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.common.core.page.TableDataInfo;
+
+/**
+ * 招商引资_省库项目_省外投资单位Controller
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+@RestController
+@RequestMapping("/projectV2/swtzdw")
+public class ZsyzSkSwtzdwController extends BaseController
+{
+    @Autowired
+    private IZsyzSkSwtzdwService zsyzSkSwtzdwService;
+
+    /**
+     * 查询招商引资_省库项目_省外投资单位列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:swtzdw:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZsyzSkSwtzdw zsyzSkSwtzdw)
+    {
+        startPage();
+        List<ZsyzSkSwtzdw> list = zsyzSkSwtzdwService.selectZsyzSkSwtzdwList(zsyzSkSwtzdw);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招商引资_省库项目_省外投资单位列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:swtzdw:export')")
+    @Log(title = "招商引资_省库项目_省外投资单位", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZsyzSkSwtzdw zsyzSkSwtzdw)
+    {
+        List<ZsyzSkSwtzdw> list = zsyzSkSwtzdwService.selectZsyzSkSwtzdwList(zsyzSkSwtzdw);
+        ExcelUtil<ZsyzSkSwtzdw> util = new ExcelUtil<ZsyzSkSwtzdw>(ZsyzSkSwtzdw.class);
+        util.exportExcel(response, list, "招商引资_省库项目_省外投资单位数据");
+    }
+
+    /**
+     * 获取招商引资_省库项目_省外投资单位详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:swtzdw:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(zsyzSkSwtzdwService.selectZsyzSkSwtzdwById(id));
+    }
+
+    /**
+     * 新增招商引资_省库项目_省外投资单位
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:swtzdw:add')")
+    @Log(title = "招商引资_省库项目_省外投资单位", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZsyzSkSwtzdw zsyzSkSwtzdw)
+    {
+        return toAjax(zsyzSkSwtzdwService.insertZsyzSkSwtzdw(zsyzSkSwtzdw));
+    }
+
+    /**
+     * 修改招商引资_省库项目_省外投资单位
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:swtzdw:edit')")
+    @Log(title = "招商引资_省库项目_省外投资单位", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ZsyzSkSwtzdw zsyzSkSwtzdw)
+    {
+        return toAjax(zsyzSkSwtzdwService.updateZsyzSkSwtzdw(zsyzSkSwtzdw));
+    }
+
+    /**
+     * 删除招商引资_省库项目_省外投资单位
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:swtzdw:remove')")
+    @Log(title = "招商引资_省库项目_省外投资单位", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zsyzSkSwtzdwService.deleteZsyzSkSwtzdwByIds(ids));
+    }
+}

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

@@ -26,7 +26,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 招商引资_省库项目Controller
  * 
  * @author boman
- * @date 2023-02-24
+ * @date 2023-03-28
  */
 @RestController
 @RequestMapping("/projectV2/skxm")
@@ -102,14 +102,4 @@ public class ZsyzSkxmController extends BaseController
     {
         return toAjax(zsyzSkxmService.deleteZsyzSkxmByIds(ids));
     }
-
-    /**
-     * 招商引资_省库项目审核
-     */
-    @PreAuthorize("@ss.hasPermi('projectV2:skxm:sh')")
-    @GetMapping("/sh")
-    public AjaxResult sh(ZsyzSkxm zsyzSkxm)
-    {
-        return toAjax(zsyzSkxmService.updateZsyzSkxmSh(zsyzSkxm));
-    }
 }

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

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.projectV2.common;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.projectV2.common.ChinaArea;
+import com.ruoyi.system.service.projectV2.common.IChinaAreaService;
+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.common.core.page.TableDataInfo;
+
+/**
+ * 中国行政规划Controller
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+@RestController
+@RequestMapping("/projectV2/area")
+public class ChinaAreaController extends BaseController
+{
+    @Autowired
+    private IChinaAreaService chinaAreaService;
+
+    /**
+     * 查询中国行政规划列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:area:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ChinaArea chinaArea)
+    {
+        startPage();
+        List<ChinaArea> list = chinaAreaService.selectChinaAreaList(chinaArea);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出中国行政规划列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:area:export')")
+    @Log(title = "中国行政规划", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ChinaArea chinaArea)
+    {
+        List<ChinaArea> list = chinaAreaService.selectChinaAreaList(chinaArea);
+        ExcelUtil<ChinaArea> util = new ExcelUtil<ChinaArea>(ChinaArea.class);
+        util.exportExcel(response, list, "中国行政规划数据");
+    }
+
+    /**
+     * 获取中国行政规划详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:area:query')")
+    @GetMapping(value = "/{areaId}")
+    public AjaxResult getInfo(@PathVariable("areaId") String areaId)
+    {
+        return success(chinaAreaService.selectChinaAreaByAreaId(areaId));
+    }
+
+    /**
+     * 新增中国行政规划
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:area:add')")
+    @Log(title = "中国行政规划", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ChinaArea chinaArea)
+    {
+        return toAjax(chinaAreaService.insertChinaArea(chinaArea));
+    }
+
+    /**
+     * 修改中国行政规划
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:area:edit')")
+    @Log(title = "中国行政规划", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ChinaArea chinaArea)
+    {
+        return toAjax(chinaAreaService.updateChinaArea(chinaArea));
+    }
+
+    /**
+     * 删除中国行政规划
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:area:remove')")
+    @Log(title = "中国行政规划", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{areaIds}")
+    public AjaxResult remove(@PathVariable String[] areaIds)
+    {
+        return toAjax(chinaAreaService.deleteChinaAreaByAreaIds(areaIds));
+    }
+}

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

@@ -180,4 +180,27 @@ public class ZsyzCommonController extends BaseController {
         List<ZsyzSbbzb> list = zsyzSbbzbService.selectZsyzSbbzbList(zsyzSbbzb);
         return getDataTable(list);
     }
+
+    /**
+     *省库项目审核
+     *
+     * @return
+     */
+    @PostMapping("/sksh")
+    @PreAuthorize("@ss.hasPermi('projectV2:common:sksh')")
+    public AjaxResult sksh(@RequestBody ZsyzSkxm zsyzSkxm) {
+        return zsyzCommonService.sksh(zsyzSkxm);
+    }
+
+    /**
+     *获取省市
+     *
+     * @return
+     */
+    @GetMapping("/area/{pid}")
+    @PreAuthorize("@ss.hasPermi('projectV2:common:area')")
+    public AjaxResult area(@PathVariable("pid") Long pid ) {
+        //所有审核需要往审核意见表插入数据
+        return zsyzCommonService.area(pid);
+    }
 }

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

@@ -17,6 +17,7 @@ import com.ruoyi.system.domain.projectV2.Vo.ZpVo;
 import com.ruoyi.system.domain.projectV2.common.SendSmsConfig;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.projectV2.*;
+import com.ruoyi.system.mapper.projectV2.common.ChinaAreaMapper;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.projectV2.IZsyzProjectDeptService;
 import com.ruoyi.system.service.projectV2.IZsyzSbbzbService;
@@ -48,17 +49,10 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
     private ZsyzSbbzbMapper zsyzSbbzbMapper;
     @Autowired
     private IZsyzSbbzbService zsyzSbbzbService;
-
     @Autowired
     private ZsyzSkxmMapper zsyzSkxmMapper;
     @Autowired
-    private IZsyzShyjService zsyzShyjService;
-    @Autowired
     private IZsyzProjectDeptService projectDeptService;
-
-    @Autowired
-    private RedisCache redisCache;
-
     @Autowired
     private ZsyzLcjlMapper zsyzLcjlMapper;
     @Autowired
@@ -71,6 +65,10 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
     private ZsyzWczsMapper zsyzWczsMapper;
     @Autowired
     private ZsyzDjksMapper zsyzDjksMapper;
+    @Autowired
+    private ChinaAreaMapper chinaAreaMapper;
+    @Autowired
+    private ZsyzSkDzjeMapper zsyzSkDzjeMapper;
 
 
     //主要功能, 对线索进度进行控制
@@ -125,6 +123,40 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         return AjaxResult.error("未查询到当前项目信息");
     }
 
+    /**
+     * 省库项目审核
+     * @param zsyzSkxm
+     * @return
+     */
+    @Override
+    public AjaxResult sksh(ZsyzSkxm zsyzSkxm) {
+        ZsyzSkxm zsyzSkxmOld = zsyzSkxmMapper.selectZsyzSkxmById(zsyzSkxm.getId());
+        if (zsyzSkxmOld != null){
+            String isHs = zsyzSkxmOld.getIsHs();
+            if (!ONE.equals(isHs)){
+                return AjaxResult.error("当前项目已审核");
+            }
+        }
+        zsyzSkxm.setShTime(DateUtils.getNowDate());
+        zsyzSkxm.setShName(SecurityUtils.getUsername());
+        zsyzSkxmMapper.updateZsyzSkxm(zsyzSkxm);
+        ZsyzSkDzje zsyzSkDzje = new ZsyzSkDzje();
+        zsyzSkDzje.setSkId(zsyzSkxm.getId());
+        zsyzSkDzje.setIsSh(zsyzSkxm.getIsSh());
+        zsyzSkDzjeMapper.updateZsyzSkDzjeSkId(zsyzSkDzje);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 获取行政规划
+     * @param pid
+     * @return
+     */
+    @Override
+    public AjaxResult area(Long pid) {
+        return chinaAreaMapper.selectChinaAreaByAreaId(pid);
+    }
+
     /**
      * Cjd的项目审核/驳回接口
      * 参数是审核建议

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

@@ -0,0 +1,129 @@
+package com.ruoyi.system.domain.projectV2;
+
+import java.util.Date;
+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;
+
+/**
+ * 招商引资_省库项目_到资金额对象 zsyz_sk_dzje
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+public class ZsyzSkDzje extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 省库项目ID */
+    @Excel(name = "省库项目ID")
+    private Long skId;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String xmmc;
+
+    /** 单位名称 */
+    @Excel(name = "单位名称")
+    private String dwmc;
+
+    /** 注资金额 */
+    @Excel(name = "注资金额")
+    private Long zzje;
+
+    /** 到位日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "到位日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dwrq;
+
+    /** 是否审核 1:未审核 2:已审核 3:已拒绝 */
+    @Excel(name = "是否审核 1:未审核 2:已审核 3:已拒绝")
+    private String isSh;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setSkId(Long skId) 
+    {
+        this.skId = skId;
+    }
+
+    public Long getSkId() 
+    {
+        return skId;
+    }
+    public void setXmmc(String xmmc) 
+    {
+        this.xmmc = xmmc;
+    }
+
+    public String getXmmc() 
+    {
+        return xmmc;
+    }
+    public void setDwmc(String dwmc) 
+    {
+        this.dwmc = dwmc;
+    }
+
+    public String getDwmc() 
+    {
+        return dwmc;
+    }
+
+    public Long getZzje() {
+        return zzje;
+    }
+
+    public void setZzje(Long zzje) {
+        this.zzje = zzje;
+    }
+
+    public void setDwrq(Date dwrq)
+    {
+        this.dwrq = dwrq;
+    }
+
+    public Date getDwrq() 
+    {
+        return dwrq;
+    }
+    public void setIsSh(String isSh) 
+    {
+        this.isSh = isSh;
+    }
+
+    public String getIsSh() 
+    {
+        return isSh;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("skId", getSkId())
+            .append("xmmc", getXmmc())
+            .append("dwmc", getDwmc())
+            .append("zzje", getZzje())
+            .append("dwrq", getDwrq())
+            .append("isSh", getIsSh())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,168 @@
+package com.ruoyi.system.domain.projectV2;
+
+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;
+
+/**
+ * 招商引资_省库项目_省外投资单位对象 zsyz_sk_swtzdw
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+public class ZsyzSkSwtzdw extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 省库项目ID */
+    @Excel(name = "省库项目ID")
+    private Long skId;
+
+    /** 单位名称 */
+    @Excel(name = "单位名称")
+    private String dwmc;
+
+    /** 注册资金 */
+    @Excel(name = "注册资金")
+    private String zczj;
+
+    /** 投资金额 */
+    @Excel(name = "投资金额")
+    private String tzje;
+
+    /** 省 */
+    @Excel(name = "省")
+    private String province;
+
+    /** 省_id */
+    @Excel(name = "省_id")
+    private String provinceId;
+
+    /** 市 */
+    @Excel(name = "市")
+    private String city;
+
+    /** 市id */
+    @Excel(name = "市id")
+    private String cityId;
+
+    /** 单位简介 */
+    @Excel(name = "单位简介")
+    private String dwjj;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setSkId(Long skId) 
+    {
+        this.skId = skId;
+    }
+
+    public Long getSkId() 
+    {
+        return skId;
+    }
+    public void setDwmc(String dwmc) 
+    {
+        this.dwmc = dwmc;
+    }
+
+    public String getDwmc() 
+    {
+        return dwmc;
+    }
+    public void setZczj(String zczj) 
+    {
+        this.zczj = zczj;
+    }
+
+    public String getZczj() 
+    {
+        return zczj;
+    }
+    public void setTzje(String tzje) 
+    {
+        this.tzje = tzje;
+    }
+
+    public String getTzje() 
+    {
+        return tzje;
+    }
+    public void setProvince(String province) 
+    {
+        this.province = province;
+    }
+
+    public String getProvince() 
+    {
+        return province;
+    }
+    public void setProvinceId(String provinceId) 
+    {
+        this.provinceId = provinceId;
+    }
+
+    public String getProvinceId() 
+    {
+        return provinceId;
+    }
+    public void setCity(String city) 
+    {
+        this.city = city;
+    }
+
+    public String getCity() 
+    {
+        return city;
+    }
+    public void setCityId(String cityId) 
+    {
+        this.cityId = cityId;
+    }
+
+    public String getCityId() 
+    {
+        return cityId;
+    }
+    public void setDwjj(String dwjj) 
+    {
+        this.dwjj = dwjj;
+    }
+
+    public String getDwjj() 
+    {
+        return dwjj;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("skId", getSkId())
+            .append("dwmc", getDwmc())
+            .append("zczj", getZczj())
+            .append("tzje", getTzje())
+            .append("province", getProvince())
+            .append("provinceId", getProvinceId())
+            .append("city", getCity())
+            .append("cityId", getCityId())
+            .append("dwjj", getDwjj())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain.projectV2;
 
 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;
@@ -11,7 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 招商引资_省库项目对象 zsyz_skxm
  * 
  * @author boman
- * @date 2023-02-24
+ * @date 2023-03-28
  */
 public class ZsyzSkxm extends BaseEntity
 {
@@ -20,62 +22,91 @@ public class ZsyzSkxm extends BaseEntity
     /** ID */
     private Long id;
 
+    /** 是否徽商项目 N:否 Y:是 */
+    @Excel(name = "是否徽商项目 N:否 Y:是")
+    private String isHs;
+
     /** 项目名称 */
     @Excel(name = "项目名称")
     private String xmmc;
 
-    /** 批准文号（请统一填写为项目编码） */
-    @Excel(name = "批准文号（请统一填写为项目编码）")
+    /** 批准文号 */
+    @Excel(name = "批准文号")
     private String pzwh;
 
-    /** 投资单位 */
-    @Excel(name = "投资单位")
-    private String tzdw;
+    /** 企业营业执照 */
+    @Excel(name = "企业营业执照")
+    private String yyzz;
 
-    /** 项目所在地 */
-    @Excel(name = "项目所在地")
-    private String xmszd;
+    /** 所在地区编码 */
+    @Excel(name = "所在地区编码")
+    private String szdqId;
+
+    /** 所在地区名称 */
+    @Excel(name = "所在地区名称")
+    private String szdqName;
 
     /** 所属产业 */
     @Excel(name = "所属产业")
     private String sscy;
 
-    /** 总投资额(万元) */
-    @Excel(name = "总投资额(万元)")
-    private String ztze;
+    /** 新兴产业 */
+    @Excel(name = "新兴产业")
+    private String xxcy;
 
-    /** 省外资金(万元) */
-    @Excel(name = "省外资金(万元)")
-    private String swzj;
+    /** 主导产业 */
+    @Excel(name = "主导产业")
+    private String zdcy;
 
-    /** 实际到位资金(万元) */
-    @Excel(name = "实际到位资金(万元)")
-    private String sjdz;
+    /** 是否龙头企业 */
+    @Excel(name = "是否龙头企业")
+    private String isLt;
 
-    /** 当月到位(万元) */
-    @Excel(name = "当月到位(万元)")
-    private String dydw;
+    /** 是否非住宅类房地产业 */
+    @Excel(name = "是否非住宅类房地产业")
+    private String isFzzlfdcy;
 
-    /** 入库日期 */
+    /** 投资方式 */
+    @Excel(name = "投资方式")
+    private String tzfs;
+
+    /** 项目入库时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "项目入库时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date rkTime;
 
-    /** 签约通报时间 */
+    /** 开工建设日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "签约通报时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date qytbTime;
+    @Excel(name = "开工建设日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date kgjsTime;
 
-    /** 是否徽商项目 N:否 Y:是 */
-    @Excel(name = "是否徽商项目",readConverterExp = "N=否 Y=是")
-    private String isHs;
+    /** 建设完成日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "建设完成日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date jswcTime;
+
+    /** 总投资额(万元) */
+    @Excel(name = "总投资额(万元)")
+    private String ztze;
+
+    /** 省外资金(万元) */
+    @Excel(name = "省外资金(万元)")
+    private String swzj;
 
     /** 最新建设进度 （简要填写，新建项目是否出正负零，在建项目突出关键建设节点） */
-    @Excel(name = "最新建设进度 ")
+    @Excel(name = "最新建设进度 ", readConverterExp = "简=要填写，新建项目是否出正负零，在建项目突出关键建设节点")
     private String jsjd;
 
-    /** 是否审核 1:未审核 2:已审核 3.已拒绝 */
-    @Excel(name = "是否审核",readConverterExp = "1=未审核,2=已审核,3=已拒绝")
+    /** 项目内容 */
+    @Excel(name = "项目内容")
+    private String xmnr;
+
+    /** 存在问题 */
+    @Excel(name = "存在问题")
+    private String czwt;
+
+    /** 是否审核 1:未审核 2:已审核 3:已拒绝 */
+    @Excel(name = "是否审核 1:未审核 2:已审核 3:已拒绝")
     private String isSh;
 
     /** 审核人 */
@@ -87,18 +118,59 @@ public class ZsyzSkxm extends BaseEntity
     @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date shTime;
 
-    /** 审核建议 */
-    @Excel(name = "审核建议")
+    /** 审核建议(原因) */
+    @Excel(name = "审核建议(原因)")
     private String shJy;
-    //部门id
+
+    /** 部门id */
+    @Excel(name = "部门id")
     private Long deptId;
+    /**
+     * 省外投资单位
+     */
+    private List<ZsyzSkSwtzdw> zsyzSkSwtzdwList;
+    /**
+     * 到资金额
+     */
+    private List<ZsyzSkDzje> zsyzSkDzjeList;
 
-    public Long getDeptId() {
-        return deptId;
+    /** 注资金额 */
+    @Excel(name = "注资金额")
+    private Long zzje;
+
+    /** 附件集合 */
+    private List<ZsyzFj> zsyzFjList;
+
+    public List<ZsyzFj> getZsyzFjList() {
+        return zsyzFjList;
     }
 
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
+    public void setZsyzFjList(List<ZsyzFj> zsyzFjList) {
+        this.zsyzFjList = zsyzFjList;
+    }
+
+    public Long getZzje() {
+        return zzje;
+    }
+
+    public void setZzje(Long zzje) {
+        this.zzje = zzje;
+    }
+
+    public List<ZsyzSkSwtzdw> getZsyzSkSwtzdwList() {
+        return zsyzSkSwtzdwList;
+    }
+
+    public void setZsyzSkSwtzdwList(List<ZsyzSkSwtzdw> zsyzSkSwtzdwList) {
+        this.zsyzSkSwtzdwList = zsyzSkSwtzdwList;
+    }
+
+    public List<ZsyzSkDzje> getZsyzSkDzjeList() {
+        return zsyzSkDzjeList;
+    }
+
+    public void setZsyzSkDzjeList(List<ZsyzSkDzje> zsyzSkDzjeList) {
+        this.zsyzSkDzjeList = zsyzSkDzjeList;
     }
 
     public void setId(Long id)
@@ -110,6 +182,15 @@ public class ZsyzSkxm extends BaseEntity
     {
         return id;
     }
+    public void setIsHs(String isHs) 
+    {
+        this.isHs = isHs;
+    }
+
+    public String getIsHs() 
+    {
+        return isHs;
+    }
     public void setXmmc(String xmmc) 
     {
         this.xmmc = xmmc;
@@ -128,23 +209,32 @@ public class ZsyzSkxm extends BaseEntity
     {
         return pzwh;
     }
-    public void setTzdw(String tzdw) 
+    public void setYyzz(String yyzz) 
+    {
+        this.yyzz = yyzz;
+    }
+
+    public String getYyzz() 
+    {
+        return yyzz;
+    }
+    public void setSzdqId(String szdqId) 
     {
-        this.tzdw = tzdw;
+        this.szdqId = szdqId;
     }
 
-    public String getTzdw() 
+    public String getSzdqId() 
     {
-        return tzdw;
+        return szdqId;
     }
-    public void setXmszd(String xmszd) 
+    public void setSzdqName(String szdqName) 
     {
-        this.xmszd = xmszd;
+        this.szdqName = szdqName;
     }
 
-    public String getXmszd() 
+    public String getSzdqName() 
     {
-        return xmszd;
+        return szdqName;
     }
     public void setSscy(String sscy) 
     {
@@ -155,41 +245,50 @@ public class ZsyzSkxm extends BaseEntity
     {
         return sscy;
     }
-    public void setZtze(String ztze) 
+    public void setXxcy(String xxcy) 
     {
-        this.ztze = ztze;
+        this.xxcy = xxcy;
     }
 
-    public String getZtze() 
+    public String getXxcy() 
     {
-        return ztze;
+        return xxcy;
     }
-    public void setSwzj(String swzj) 
+    public void setZdcy(String zdcy) 
     {
-        this.swzj = swzj;
+        this.zdcy = zdcy;
     }
 
-    public String getSwzj() 
+    public String getZdcy() 
     {
-        return swzj;
+        return zdcy;
     }
-    public void setSjdz(String sjdz) 
+    public void setIsLt(String isLt) 
     {
-        this.sjdz = sjdz;
+        this.isLt = isLt;
     }
 
-    public String getSjdz() 
+    public String getIsLt() 
     {
-        return sjdz;
+        return isLt;
     }
-    public void setDydw(String dydw) 
+    public void setIsFzzlfdcy(String isFzzlfdcy) 
     {
-        this.dydw = dydw;
+        this.isFzzlfdcy = isFzzlfdcy;
     }
 
-    public String getDydw() 
+    public String getIsFzzlfdcy() 
+    {
+        return isFzzlfdcy;
+    }
+    public void setTzfs(String tzfs) 
     {
-        return dydw;
+        this.tzfs = tzfs;
+    }
+
+    public String getTzfs() 
+    {
+        return tzfs;
     }
     public void setRkTime(Date rkTime) 
     {
@@ -200,23 +299,41 @@ public class ZsyzSkxm extends BaseEntity
     {
         return rkTime;
     }
-    public void setQytbTime(Date qytbTime) 
+    public void setKgjsTime(Date kgjsTime) 
     {
-        this.qytbTime = qytbTime;
+        this.kgjsTime = kgjsTime;
     }
 
-    public Date getQytbTime() 
+    public Date getKgjsTime() 
     {
-        return qytbTime;
+        return kgjsTime;
     }
-    public void setIsHs(String isHs) 
+    public void setJswcTime(Date jswcTime) 
     {
-        this.isHs = isHs;
+        this.jswcTime = jswcTime;
     }
 
-    public String getIsHs() 
+    public Date getJswcTime() 
     {
-        return isHs;
+        return jswcTime;
+    }
+    public void setZtze(String ztze) 
+    {
+        this.ztze = ztze;
+    }
+
+    public String getZtze() 
+    {
+        return ztze;
+    }
+    public void setSwzj(String swzj) 
+    {
+        this.swzj = swzj;
+    }
+
+    public String getSwzj() 
+    {
+        return swzj;
     }
     public void setJsjd(String jsjd) 
     {
@@ -227,6 +344,24 @@ public class ZsyzSkxm extends BaseEntity
     {
         return jsjd;
     }
+    public void setXmnr(String xmnr) 
+    {
+        this.xmnr = xmnr;
+    }
+
+    public String getXmnr() 
+    {
+        return xmnr;
+    }
+    public void setCzwt(String czwt) 
+    {
+        this.czwt = czwt;
+    }
+
+    public String getCzwt() 
+    {
+        return czwt;
+    }
     public void setIsSh(String isSh) 
     {
         this.isSh = isSh;
@@ -263,25 +398,40 @@ public class ZsyzSkxm extends BaseEntity
     {
         return shJy;
     }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
 
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
+            .append("isHs", getIsHs())
             .append("xmmc", getXmmc())
             .append("pzwh", getPzwh())
-            .append("tzdw", getTzdw())
-            .append("xmszd", getXmszd())
+            .append("yyzz", getYyzz())
+            .append("szdqId", getSzdqId())
+            .append("szdqName", getSzdqName())
             .append("sscy", getSscy())
+            .append("xxcy", getXxcy())
+            .append("zdcy", getZdcy())
+            .append("isLt", getIsLt())
+            .append("isFzzlfdcy", getIsFzzlfdcy())
+            .append("tzfs", getTzfs())
+            .append("rkTime", getRkTime())
+            .append("kgjsTime", getKgjsTime())
+            .append("jswcTime", getJswcTime())
             .append("ztze", getZtze())
             .append("swzj", getSwzj())
-            .append("sjdz", getSjdz())
-            .append("dydw", getDydw())
-            .append("rkTime", getRkTime())
-            .append("qytbTime", getQytbTime())
-            .append("isHs", getIsHs())
             .append("jsjd", getJsjd())
+            .append("xmnr", getXmnr())
+            .append("czwt", getCzwt())
             .append("isSh", getIsSh())
             .append("shName", getShName())
             .append("shTime", getShTime())
@@ -292,6 +442,7 @@ public class ZsyzSkxm extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("zzje", getZzje())
             .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/common/ChinaArea.java

@@ -0,0 +1,79 @@
+package com.ruoyi.system.domain.projectV2.common;
+
+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;
+
+/**
+ * 中国行政规划对象 china_area
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+public class ChinaArea extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 区域主键 */
+    private String areaId;
+
+    /** 区域名称 */
+    @Excel(name = "区域名称")
+    private String name;
+
+    /** 区域上级标识 */
+    @Excel(name = "区域上级标识")
+    private String pid;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sort;
+
+    public void setAreaId(String areaId) 
+    {
+        this.areaId = areaId;
+    }
+
+    public String getAreaId() 
+    {
+        return areaId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setPid(String pid) 
+    {
+        this.pid = pid;
+    }
+
+    public String getPid() 
+    {
+        return pid;
+    }
+    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("areaId", getAreaId())
+            .append("name", getName())
+            .append("pid", getPid())
+            .append("sort", getSort())
+            .toString();
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzSkDzje;
+
+import java.util.List;
+
+/**
+ * 招商引资_省库项目_到资金额Mapper接口
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+public interface ZsyzSkDzjeMapper 
+{
+    /**
+     * 查询招商引资_省库项目_到资金额
+     * 
+     * @param id 招商引资_省库项目_到资金额主键
+     * @return 招商引资_省库项目_到资金额
+     */
+    public ZsyzSkDzje selectZsyzSkDzjeById(Long id);
+
+    /**
+     * 查询合计到资金额
+     * @param id
+     * @return
+     */
+    public Long selectCountBySkId(Long id);
+
+    /**
+     * 查询招商引资_省库项目_到资金额列表
+     * 
+     * @param zsyzSkDzje 招商引资_省库项目_到资金额
+     * @return 招商引资_省库项目_到资金额集合
+     */
+    public List<ZsyzSkDzje> selectZsyzSkDzjeList(ZsyzSkDzje zsyzSkDzje);
+
+    /**
+     * 新增招商引资_省库项目_到资金额
+     * 
+     * @param zsyzSkDzje 招商引资_省库项目_到资金额
+     * @return 结果
+     */
+    public int insertZsyzSkDzje(ZsyzSkDzje zsyzSkDzje);
+
+    /**
+     * 修改招商引资_省库项目_到资金额
+     * 
+     * @param zsyzSkDzje 招商引资_省库项目_到资金额
+     * @return 结果
+     */
+    public int updateZsyzSkDzje(ZsyzSkDzje zsyzSkDzje);
+    public int updateZsyzSkDzjeSkId(ZsyzSkDzje zsyzSkDzje);
+
+    /**
+     * 删除招商引资_省库项目_到资金额
+     * 
+     * @param id 招商引资_省库项目_到资金额主键
+     * @return 结果
+     */
+    public int deleteZsyzSkDzjeById(Long id);
+
+    /**
+     * 批量删除招商引资_省库项目_到资金额
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZsyzSkDzjeByIds(Long[] ids);
+}

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

@@ -0,0 +1,70 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzSkSwtzdw;
+
+import java.util.List;
+
+/**
+ * 招商引资_省库项目_省外投资单位Mapper接口
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+public interface ZsyzSkSwtzdwMapper 
+{
+    /**
+     * 查询招商引资_省库项目_省外投资单位
+     * 
+     * @param id 招商引资_省库项目_省外投资单位主键
+     * @return 招商引资_省库项目_省外投资单位
+     */
+    public ZsyzSkSwtzdw selectZsyzSkSwtzdwById(Long id);
+
+    /**
+     * 根据省库项目id查询
+     * @param id
+     * @return
+     */
+    public List<ZsyzSkSwtzdw> selectZsyzSkSwtzdwBySkId(Long id);
+
+    /**
+     * 查询招商引资_省库项目_省外投资单位列表
+     * 
+     * @param zsyzSkSwtzdw 招商引资_省库项目_省外投资单位
+     * @return 招商引资_省库项目_省外投资单位集合
+     */
+    public List<ZsyzSkSwtzdw> selectZsyzSkSwtzdwList(ZsyzSkSwtzdw zsyzSkSwtzdw);
+
+    /**
+     * 新增招商引资_省库项目_省外投资单位
+     * 
+     * @param zsyzSkSwtzdw 招商引资_省库项目_省外投资单位
+     * @return 结果
+     */
+    public int insertZsyzSkSwtzdw(ZsyzSkSwtzdw zsyzSkSwtzdw);
+
+    /**
+     * 修改招商引资_省库项目_省外投资单位
+     * 
+     * @param zsyzSkSwtzdw 招商引资_省库项目_省外投资单位
+     * @return 结果
+     */
+    public int updateZsyzSkSwtzdw(ZsyzSkSwtzdw zsyzSkSwtzdw);
+
+    /**
+     * 删除招商引资_省库项目_省外投资单位
+     * 
+     * @param id 招商引资_省库项目_省外投资单位主键
+     * @return 结果
+     */
+    public int deleteZsyzSkSwtzdwById(Long id);
+    public int deleteZsyzSkSwtzdwBySkId(Long id);
+
+    /**
+     * 批量删除招商引资_省库项目_省外投资单位
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZsyzSkSwtzdwByIds(Long[] ids);
+}

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

@@ -8,7 +8,7 @@ import java.util.List;
  * 招商引资_省库项目Mapper接口
  * 
  * @author boman
- * @date 2023-02-24
+ * @date 2023-03-28
  */
 public interface ZsyzSkxmMapper 
 {
@@ -43,7 +43,6 @@ public interface ZsyzSkxmMapper
      * @return 结果
      */
     public int updateZsyzSkxm(ZsyzSkxm zsyzSkxm);
-    public int updateZsyzSkxmSh(ZsyzSkxm zsyzSkxm);
 
     /**
      * 删除招商引资_省库项目

ruoyi-system/src/main/java/com/ruoyi/system/mapper/projectV2/common/ChinaAreaMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper.projectV2.common;
+
+import com.ruoyi.system.domain.projectV2.common.ChinaArea;
+
+import java.util.List;
+
+/**
+ * 中国行政规划Mapper接口
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+public interface ChinaAreaMapper 
+{
+    /**
+     * 查询中国行政规划
+     * 
+     * @param areaId 中国行政规划主键
+     * @return 中国行政规划
+     */
+    public ChinaArea selectChinaAreaByAreaId(String areaId);
+    public List<ChinaArea> selectChinaAreaByPId(String areaId);
+
+    /**
+     * 查询中国行政规划列表
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 中国行政规划集合
+     */
+    public List<ChinaArea> selectChinaAreaList(ChinaArea chinaArea);
+
+    /**
+     * 新增中国行政规划
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 结果
+     */
+    public int insertChinaArea(ChinaArea chinaArea);
+
+    /**
+     * 修改中国行政规划
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 结果
+     */
+    public int updateChinaArea(ChinaArea chinaArea);
+
+    /**
+     * 删除中国行政规划
+     * 
+     * @param areaId 中国行政规划主键
+     * @return 结果
+     */
+    public int deleteChinaAreaByAreaId(String areaId);
+
+    /**
+     * 批量删除中国行政规划
+     * 
+     * @param areaIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteChinaAreaByAreaIds(String[] areaIds);
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl.projectV2;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.projectV2.ZsyzSkDzje;
+import com.ruoyi.system.mapper.projectV2.ZsyzSkDzjeMapper;
+import com.ruoyi.system.service.projectV2.IZsyzSkDzjeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 招商引资_省库项目_到资金额Service业务层处理
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+@Service
+public class ZsyzSkDzjeServiceImpl implements IZsyzSkDzjeService
+{
+    @Autowired
+    private ZsyzSkDzjeMapper zsyzSkDzjeMapper;
+
+    /**
+     * 查询招商引资_省库项目_到资金额
+     * 
+     * @param id 招商引资_省库项目_到资金额主键
+     * @return 招商引资_省库项目_到资金额
+     */
+    @Override
+    public ZsyzSkDzje selectZsyzSkDzjeById(Long id)
+    {
+        return zsyzSkDzjeMapper.selectZsyzSkDzjeById(id);
+    }
+
+    /**
+     * 查询招商引资_省库项目_到资金额列表
+     * 
+     * @param zsyzSkDzje 招商引资_省库项目_到资金额
+     * @return 招商引资_省库项目_到资金额
+     */
+    @Override
+    public List<ZsyzSkDzje> selectZsyzSkDzjeList(ZsyzSkDzje zsyzSkDzje)
+    {
+        return zsyzSkDzjeMapper.selectZsyzSkDzjeList(zsyzSkDzje);
+    }
+
+    /**
+     * 新增招商引资_省库项目_到资金额
+     * 
+     * @param zsyzSkDzje 招商引资_省库项目_到资金额
+     * @return 结果
+     */
+    @Override
+    public int insertZsyzSkDzje(ZsyzSkDzje zsyzSkDzje)
+    {
+        zsyzSkDzje.setCreateTime(DateUtils.getNowDate());
+        return zsyzSkDzjeMapper.insertZsyzSkDzje(zsyzSkDzje);
+    }
+
+    /**
+     * 修改招商引资_省库项目_到资金额
+     * 
+     * @param zsyzSkDzje 招商引资_省库项目_到资金额
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzSkDzje(ZsyzSkDzje zsyzSkDzje)
+    {
+        zsyzSkDzje.setUpdateTime(DateUtils.getNowDate());
+        return zsyzSkDzjeMapper.updateZsyzSkDzje(zsyzSkDzje);
+    }
+
+    /**
+     * 批量删除招商引资_省库项目_到资金额
+     * 
+     * @param ids 需要删除的招商引资_省库项目_到资金额主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzSkDzjeByIds(Long[] ids)
+    {
+        return zsyzSkDzjeMapper.deleteZsyzSkDzjeByIds(ids);
+    }
+
+    /**
+     * 删除招商引资_省库项目_到资金额信息
+     * 
+     * @param id 招商引资_省库项目_到资金额主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzSkDzjeById(Long id)
+    {
+        return zsyzSkDzjeMapper.deleteZsyzSkDzjeById(id);
+    }
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl.projectV2;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.projectV2.ZsyzSkSwtzdw;
+import com.ruoyi.system.mapper.projectV2.ZsyzSkSwtzdwMapper;
+import com.ruoyi.system.service.projectV2.IZsyzSkSwtzdwService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 招商引资_省库项目_省外投资单位Service业务层处理
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+@Service
+public class ZsyzSkSwtzdwServiceImpl implements IZsyzSkSwtzdwService
+{
+    @Autowired
+    private ZsyzSkSwtzdwMapper zsyzSkSwtzdwMapper;
+
+    /**
+     * 查询招商引资_省库项目_省外投资单位
+     * 
+     * @param id 招商引资_省库项目_省外投资单位主键
+     * @return 招商引资_省库项目_省外投资单位
+     */
+    @Override
+    public ZsyzSkSwtzdw selectZsyzSkSwtzdwById(Long id)
+    {
+        return zsyzSkSwtzdwMapper.selectZsyzSkSwtzdwById(id);
+    }
+
+    /**
+     * 查询招商引资_省库项目_省外投资单位列表
+     * 
+     * @param zsyzSkSwtzdw 招商引资_省库项目_省外投资单位
+     * @return 招商引资_省库项目_省外投资单位
+     */
+    @Override
+    public List<ZsyzSkSwtzdw> selectZsyzSkSwtzdwList(ZsyzSkSwtzdw zsyzSkSwtzdw)
+    {
+        return zsyzSkSwtzdwMapper.selectZsyzSkSwtzdwList(zsyzSkSwtzdw);
+    }
+
+    /**
+     * 新增招商引资_省库项目_省外投资单位
+     * 
+     * @param zsyzSkSwtzdw 招商引资_省库项目_省外投资单位
+     * @return 结果
+     */
+    @Override
+    public int insertZsyzSkSwtzdw(ZsyzSkSwtzdw zsyzSkSwtzdw)
+    {
+        zsyzSkSwtzdw.setCreateTime(DateUtils.getNowDate());
+        return zsyzSkSwtzdwMapper.insertZsyzSkSwtzdw(zsyzSkSwtzdw);
+    }
+
+    /**
+     * 修改招商引资_省库项目_省外投资单位
+     * 
+     * @param zsyzSkSwtzdw 招商引资_省库项目_省外投资单位
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzSkSwtzdw(ZsyzSkSwtzdw zsyzSkSwtzdw)
+    {
+        zsyzSkSwtzdw.setUpdateTime(DateUtils.getNowDate());
+        return zsyzSkSwtzdwMapper.updateZsyzSkSwtzdw(zsyzSkSwtzdw);
+    }
+
+    /**
+     * 批量删除招商引资_省库项目_省外投资单位
+     * 
+     * @param ids 需要删除的招商引资_省库项目_省外投资单位主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzSkSwtzdwByIds(Long[] ids)
+    {
+        return zsyzSkSwtzdwMapper.deleteZsyzSkSwtzdwByIds(ids);
+    }
+
+    /**
+     * 删除招商引资_省库项目_省外投资单位信息
+     * 
+     * @param id 招商引资_省库项目_省外投资单位主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzSkSwtzdwById(Long id)
+    {
+        return zsyzSkSwtzdwMapper.deleteZsyzSkSwtzdwById(id);
+    }
+}

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

@@ -1,29 +1,35 @@
 package com.ruoyi.system.service.impl.projectV2;
 
-import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.projectV2.ZsyzSkDzje;
+import com.ruoyi.system.domain.projectV2.ZsyzSkSwtzdw;
 import com.ruoyi.system.domain.projectV2.ZsyzSkxm;
+import com.ruoyi.system.mapper.projectV2.ZsyzSkDzjeMapper;
+import com.ruoyi.system.mapper.projectV2.ZsyzSkSwtzdwMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzSkxmMapper;
 import com.ruoyi.system.service.projectV2.IZsyzSkxmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import static com.ruoyi.common.constant.CommonConstants.ONE;
 
 /**
  * 招商引资_省库项目Service业务层处理
  *
  * @author boman
- * @date 2023-02-24
+ * @date 2023-03-28
  */
 @Service
 public class ZsyzSkxmServiceImpl implements IZsyzSkxmService {
     @Autowired
     private ZsyzSkxmMapper zsyzSkxmMapper;
+    @Autowired
+    private ZsyzSkSwtzdwMapper zsyzSkSwtzdwMapper;
+    @Autowired
+    private ZsyzSkDzjeMapper zsyzSkDzjeMapper;
 
     /**
      * 查询招商引资_省库项目
@@ -33,7 +39,14 @@ public class ZsyzSkxmServiceImpl implements IZsyzSkxmService {
      */
     @Override
     public ZsyzSkxm selectZsyzSkxmById(Long id) {
-        return zsyzSkxmMapper.selectZsyzSkxmById(id);
+        ZsyzSkxm zsyzSkxm = zsyzSkxmMapper.selectZsyzSkxmById(id);
+        if (zsyzSkxm != null) {
+            List<ZsyzSkSwtzdw> zsyzSkSwtzdws = zsyzSkSwtzdwMapper.selectZsyzSkSwtzdwBySkId(zsyzSkxm.getId());
+            if (zsyzSkSwtzdws != null && zsyzSkSwtzdws.size() > 0) {
+                zsyzSkxm.setZsyzSkSwtzdwList(zsyzSkSwtzdws);
+            }
+        }
+        return zsyzSkxm;
     }
 
     /**
@@ -44,7 +57,15 @@ public class ZsyzSkxmServiceImpl implements IZsyzSkxmService {
      */
     @Override
     public List<ZsyzSkxm> selectZsyzSkxmList(ZsyzSkxm zsyzSkxm) {
-        return zsyzSkxmMapper.selectZsyzSkxmList(zsyzSkxm);
+        List<ZsyzSkxm> zsyzSkxms = zsyzSkxmMapper.selectZsyzSkxmList(zsyzSkxm);
+        //查询实际到资金额
+        if (zsyzSkxms != null && zsyzSkxms.size() > 0) {
+            for (ZsyzSkxm skxm : zsyzSkxms) {
+                Long aLong = zsyzSkDzjeMapper.selectCountBySkId(skxm.getId());
+                skxm.setZzje(aLong);
+            }
+        }
+        return zsyzSkxms;
     }
 
     /**
@@ -55,9 +76,25 @@ public class ZsyzSkxmServiceImpl implements IZsyzSkxmService {
      */
     @Override
     public int insertZsyzSkxm(ZsyzSkxm zsyzSkxm) {
-        zsyzSkxm.setDeptId(SecurityUtils.getDeptId());
         zsyzSkxm.setCreateTime(DateUtils.getNowDate());
-        return zsyzSkxmMapper.insertZsyzSkxm(zsyzSkxm);
+        zsyzSkxm.setDeptId(SecurityUtils.getDeptId());
+        int i = zsyzSkxmMapper.insertZsyzSkxm(zsyzSkxm);
+        List<ZsyzSkSwtzdw> zsyzSkSwtzdwList = zsyzSkxm.getZsyzSkSwtzdwList();
+        if (zsyzSkSwtzdwList != null && zsyzSkSwtzdwList.size() > 0) {
+            for (ZsyzSkSwtzdw zsyzSkSwtzdw : zsyzSkSwtzdwList) {
+                zsyzSkSwtzdw.setSkId(zsyzSkxm.getId());
+                zsyzSkSwtzdwMapper.insertZsyzSkSwtzdw(zsyzSkSwtzdw);
+            }
+        }
+        List<ZsyzSkDzje> zsyzSkDzjeList = zsyzSkxm.getZsyzSkDzjeList();
+        if (zsyzSkDzjeList != null && zsyzSkDzjeList.size() > 0) {
+            for (ZsyzSkDzje zsyzSkDzje : zsyzSkDzjeList) {
+                zsyzSkDzje.setXmmc(zsyzSkxm.getXmmc());
+                zsyzSkDzje.setSkId(zsyzSkxm.getId());
+                zsyzSkDzjeMapper.insertZsyzSkDzje(zsyzSkDzje);
+            }
+        }
+        return i;
     }
 
     /**
@@ -69,21 +106,25 @@ public class ZsyzSkxmServiceImpl implements IZsyzSkxmService {
     @Override
     public int updateZsyzSkxm(ZsyzSkxm zsyzSkxm) {
         zsyzSkxm.setUpdateTime(DateUtils.getNowDate());
-        return zsyzSkxmMapper.updateZsyzSkxm(zsyzSkxm);
-    }
-
-    /**
-     * 招商引资_省库项目审核
-     *
-     * @param zsyzSkxm
-     * @return
-     */
-    @Override
-    public int updateZsyzSkxmSh(ZsyzSkxm zsyzSkxm) {
-         String deptName = SecurityUtils.getLoginUser().getUser().getDept().getDeptName();
-        zsyzSkxm.setShName(deptName);
-        zsyzSkxm.setShTime(new Date());
-        return zsyzSkxmMapper.updateZsyzSkxmSh(zsyzSkxm);
+        zsyzSkxm.setIsHs(ONE);
+        int i = zsyzSkxmMapper.updateZsyzSkxm(zsyzSkxm);
+        List<ZsyzSkSwtzdw> zsyzSkSwtzdwList = zsyzSkxm.getZsyzSkSwtzdwList();
+        if (zsyzSkSwtzdwList != null && zsyzSkSwtzdwList.size() > 0) {
+            zsyzSkSwtzdwMapper.deleteZsyzSkSwtzdwBySkId(zsyzSkxm.getId());
+            for (ZsyzSkSwtzdw zsyzSkSwtzdw : zsyzSkSwtzdwList) {
+                zsyzSkSwtzdw.setSkId(zsyzSkxm.getId());
+                zsyzSkSwtzdwMapper.insertZsyzSkSwtzdw(zsyzSkSwtzdw);
+            }
+        }
+        List<ZsyzSkDzje> zsyzSkDzjeList = zsyzSkxm.getZsyzSkDzjeList();
+        if (zsyzSkDzjeList != null && zsyzSkDzjeList.size() > 0) {
+            for (ZsyzSkDzje zsyzSkDzje : zsyzSkDzjeList) {
+                zsyzSkDzje.setXmmc(zsyzSkxm.getXmmc());
+                zsyzSkDzje.setSkId(zsyzSkxm.getId());
+                zsyzSkDzjeMapper.updateZsyzSkDzje(zsyzSkDzje);
+            }
+        }
+        return i;
     }
 
     /**

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

@@ -0,0 +1,95 @@
+package com.ruoyi.system.service.impl.projectV2.common;
+
+import java.util.List;
+
+import com.ruoyi.system.domain.projectV2.common.ChinaArea;
+import com.ruoyi.system.mapper.projectV2.common.ChinaAreaMapper;
+import com.ruoyi.system.service.projectV2.common.IChinaAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 中国行政规划Service业务层处理
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+@Service
+public class ChinaAreaServiceImpl implements IChinaAreaService
+{
+    @Autowired
+    private ChinaAreaMapper chinaAreaMapper;
+
+    /**
+     * 查询中国行政规划
+     * 
+     * @param areaId 中国行政规划主键
+     * @return 中国行政规划
+     */
+    @Override
+    public ChinaArea selectChinaAreaByAreaId(String areaId)
+    {
+        return chinaAreaMapper.selectChinaAreaByAreaId(areaId);
+    }
+
+    /**
+     * 查询中国行政规划列表
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 中国行政规划
+     */
+    @Override
+    public List<ChinaArea> selectChinaAreaList(ChinaArea chinaArea)
+    {
+        return chinaAreaMapper.selectChinaAreaList(chinaArea);
+    }
+
+    /**
+     * 新增中国行政规划
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 结果
+     */
+    @Override
+    public int insertChinaArea(ChinaArea chinaArea)
+    {
+        return chinaAreaMapper.insertChinaArea(chinaArea);
+    }
+
+    /**
+     * 修改中国行政规划
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 结果
+     */
+    @Override
+    public int updateChinaArea(ChinaArea chinaArea)
+    {
+        return chinaAreaMapper.updateChinaArea(chinaArea);
+    }
+
+    /**
+     * 批量删除中国行政规划
+     * 
+     * @param areaIds 需要删除的中国行政规划主键
+     * @return 结果
+     */
+    @Override
+    public int deleteChinaAreaByAreaIds(String[] areaIds)
+    {
+        return chinaAreaMapper.deleteChinaAreaByAreaIds(areaIds);
+    }
+
+    /**
+     * 删除中国行政规划信息
+     * 
+     * @param areaId 中国行政规划主键
+     * @return 结果
+     */
+    @Override
+    public int deleteChinaAreaByAreaId(String areaId)
+    {
+        return chinaAreaMapper.deleteChinaAreaByAreaId(areaId);
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzSkDzje;
+
+import java.util.List;
+
+/**
+ * 招商引资_省库项目_到资金额Service接口
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+public interface IZsyzSkDzjeService 
+{
+    /**
+     * 查询招商引资_省库项目_到资金额
+     * 
+     * @param id 招商引资_省库项目_到资金额主键
+     * @return 招商引资_省库项目_到资金额
+     */
+    public ZsyzSkDzje selectZsyzSkDzjeById(Long id);
+
+    /**
+     * 查询招商引资_省库项目_到资金额列表
+     * 
+     * @param zsyzSkDzje 招商引资_省库项目_到资金额
+     * @return 招商引资_省库项目_到资金额集合
+     */
+    public List<ZsyzSkDzje> selectZsyzSkDzjeList(ZsyzSkDzje zsyzSkDzje);
+
+    /**
+     * 新增招商引资_省库项目_到资金额
+     * 
+     * @param zsyzSkDzje 招商引资_省库项目_到资金额
+     * @return 结果
+     */
+    public int insertZsyzSkDzje(ZsyzSkDzje zsyzSkDzje);
+
+    /**
+     * 修改招商引资_省库项目_到资金额
+     * 
+     * @param zsyzSkDzje 招商引资_省库项目_到资金额
+     * @return 结果
+     */
+    public int updateZsyzSkDzje(ZsyzSkDzje zsyzSkDzje);
+
+    /**
+     * 批量删除招商引资_省库项目_到资金额
+     * 
+     * @param ids 需要删除的招商引资_省库项目_到资金额主键集合
+     * @return 结果
+     */
+    public int deleteZsyzSkDzjeByIds(Long[] ids);
+
+    /**
+     * 删除招商引资_省库项目_到资金额信息
+     * 
+     * @param id 招商引资_省库项目_到资金额主键
+     * @return 结果
+     */
+    public int deleteZsyzSkDzjeById(Long id);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzSkSwtzdw;
+
+import java.util.List;
+
+/**
+ * 招商引资_省库项目_省外投资单位Service接口
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+public interface IZsyzSkSwtzdwService 
+{
+    /**
+     * 查询招商引资_省库项目_省外投资单位
+     * 
+     * @param id 招商引资_省库项目_省外投资单位主键
+     * @return 招商引资_省库项目_省外投资单位
+     */
+    public ZsyzSkSwtzdw selectZsyzSkSwtzdwById(Long id);
+
+    /**
+     * 查询招商引资_省库项目_省外投资单位列表
+     * 
+     * @param zsyzSkSwtzdw 招商引资_省库项目_省外投资单位
+     * @return 招商引资_省库项目_省外投资单位集合
+     */
+    public List<ZsyzSkSwtzdw> selectZsyzSkSwtzdwList(ZsyzSkSwtzdw zsyzSkSwtzdw);
+
+    /**
+     * 新增招商引资_省库项目_省外投资单位
+     * 
+     * @param zsyzSkSwtzdw 招商引资_省库项目_省外投资单位
+     * @return 结果
+     */
+    public int insertZsyzSkSwtzdw(ZsyzSkSwtzdw zsyzSkSwtzdw);
+
+    /**
+     * 修改招商引资_省库项目_省外投资单位
+     * 
+     * @param zsyzSkSwtzdw 招商引资_省库项目_省外投资单位
+     * @return 结果
+     */
+    public int updateZsyzSkSwtzdw(ZsyzSkSwtzdw zsyzSkSwtzdw);
+
+    /**
+     * 批量删除招商引资_省库项目_省外投资单位
+     * 
+     * @param ids 需要删除的招商引资_省库项目_省外投资单位主键集合
+     * @return 结果
+     */
+    public int deleteZsyzSkSwtzdwByIds(Long[] ids);
+
+    /**
+     * 删除招商引资_省库项目_省外投资单位信息
+     * 
+     * @param id 招商引资_省库项目_省外投资单位主键
+     * @return 结果
+     */
+    public int deleteZsyzSkSwtzdwById(Long id);
+}

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

@@ -4,12 +4,11 @@ import com.ruoyi.system.domain.projectV2.ZsyzSkxm;
 
 import java.util.List;
 
-
 /**
  * 招商引资_省库项目Service接口
  * 
  * @author boman
- * @date 2023-02-24
+ * @date 2023-03-28
  */
 public interface IZsyzSkxmService 
 {
@@ -45,13 +44,6 @@ public interface IZsyzSkxmService
      */
     public int updateZsyzSkxm(ZsyzSkxm zsyzSkxm);
 
-    /**
-     * 招商引资_省库项目审核
-     * @param zsyzSkxm
-     * @return
-     */
-    public int updateZsyzSkxmSh(ZsyzSkxm zsyzSkxm);
-
     /**
      * 批量删除招商引资_省库项目
      * 

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.projectV2.common;
+
+import com.ruoyi.system.domain.projectV2.common.ChinaArea;
+
+import java.util.List;
+
+/**
+ * 中国行政规划Service接口
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+public interface IChinaAreaService 
+{
+    /**
+     * 查询中国行政规划
+     * 
+     * @param areaId 中国行政规划主键
+     * @return 中国行政规划
+     */
+    public ChinaArea selectChinaAreaByAreaId(String areaId);
+
+    /**
+     * 查询中国行政规划列表
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 中国行政规划集合
+     */
+    public List<ChinaArea> selectChinaAreaList(ChinaArea chinaArea);
+
+    /**
+     * 新增中国行政规划
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 结果
+     */
+    public int insertChinaArea(ChinaArea chinaArea);
+
+    /**
+     * 修改中国行政规划
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 结果
+     */
+    public int updateChinaArea(ChinaArea chinaArea);
+
+    /**
+     * 批量删除中国行政规划
+     * 
+     * @param areaIds 需要删除的中国行政规划主键集合
+     * @return 结果
+     */
+    public int deleteChinaAreaByAreaIds(String[] areaIds);
+
+    /**
+     * 删除中国行政规划信息
+     * 
+     * @param areaId 中国行政规划主键
+     * @return 结果
+     */
+    public int deleteChinaAreaByAreaId(String areaId);
+}

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

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.projectV2.Vo.ZpVo;
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 import com.ruoyi.system.domain.projectV2.ZsyzShyj;
+import com.ruoyi.system.domain.projectV2.ZsyzSkxm;
 import com.ruoyi.system.domain.projectV2.common.SendSms;
 
 import java.util.List;
@@ -21,6 +22,20 @@ public interface IZsyzCommonService
     //主要功能, 对线索进度进行控制
   public AjaxResult xssh(ZsyzShyj zsyzShyj);
 
+  /**
+   * 省库项目审核
+   * @param zsyzSkxm
+   * @return
+   */
+  public AjaxResult sksh(ZsyzSkxm zsyzSkxm);
+
+  /**
+   * 获取行政规划
+   * @param pid
+   * @return
+   */
+  public AjaxResult area(Long pid);
+
   /**
    * Cjd的项目审核/驳回接口
    * 参数是审核建议

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

@@ -0,0 +1,122 @@
+<?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.projectV2.ZsyzSkDzjeMapper">
+    
+    <resultMap type="ZsyzSkDzje" id="ZsyzSkDzjeResult">
+        <result property="id"    column="id"    />
+        <result property="skId"    column="sk_id"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="dwmc"    column="dwmc"    />
+        <result property="zzje"    column="zzje"    />
+        <result property="dwrq"    column="dwrq"    />
+        <result property="isSh"    column="is_sh"    />
+        <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="selectZsyzSkDzjeVo">
+        select id, sk_id, xmmc, dwmc, zzje, dwrq, is_sh, create_by, create_time, update_by, update_time, remark from zsyz_sk_dzje
+    </sql>
+
+    <select id="selectZsyzSkDzjeList" parameterType="ZsyzSkDzje" resultMap="ZsyzSkDzjeResult">
+        <include refid="selectZsyzSkDzjeVo"/>
+        <where>  
+            <if test="skId != null "> and sk_id = #{skId}</if>
+            <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
+            <if test="dwmc != null  and dwmc != ''"> and dwmc = #{dwmc}</if>
+            <if test="zzje != null  and zzje != ''"> and zzje = #{zzje}</if>
+            <if test="dwrq != null "> and dwrq = #{dwrq}</if>
+            <if test="isSh != null  and isSh != ''"> and is_sh = #{isSh}</if>
+        </where>
+    </select>
+    
+    <select id="selectZsyzSkDzjeById" parameterType="Long" resultMap="ZsyzSkDzjeResult">
+        <include refid="selectZsyzSkDzjeVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectCountBySkId" parameterType="Long" resultType="java.lang.Long">
+
+        select ifnull(sum(zzje),0) from zsyz_sk_dzje where sk_id = #{id}
+    </select>
+
+    <insert id="insertZsyzSkDzje" parameterType="ZsyzSkDzje" useGeneratedKeys="true" keyProperty="id">
+        insert into zsyz_sk_dzje
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="skId != null">sk_id,</if>
+            <if test="xmmc != null and xmmc != ''">xmmc,</if>
+            <if test="dwmc != null">dwmc,</if>
+            <if test="zzje != null">zzje,</if>
+            <if test="dwrq != null">dwrq,</if>
+            <if test="isSh != null">is_sh,</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="skId != null">#{skId},</if>
+            <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
+            <if test="dwmc != null">#{dwmc},</if>
+            <if test="zzje != null">#{zzje},</if>
+            <if test="dwrq != null">#{dwrq},</if>
+            <if test="isSh != null">#{isSh},</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="updateZsyzSkDzje" parameterType="ZsyzSkDzje">
+        update zsyz_sk_dzje
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="skId != null">sk_id = #{skId},</if>
+            <if test="xmmc != null and xmmc != ''">xmmc = #{xmmc},</if>
+            <if test="dwmc != null">dwmc = #{dwmc},</if>
+            <if test="zzje != null">zzje = #{zzje},</if>
+            <if test="dwrq != null">dwrq = #{dwrq},</if>
+            <if test="isSh != null">is_sh = #{isSh},</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="updateZsyzSkDzjeSkId" parameterType="ZsyzSkDzje">
+        update zsyz_sk_dzje
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xmmc != null and xmmc != ''">xmmc = #{xmmc},</if>
+            <if test="dwmc != null">dwmc = #{dwmc},</if>
+            <if test="zzje != null">zzje = #{zzje},</if>
+            <if test="dwrq != null">dwrq = #{dwrq},</if>
+            <if test="isSh != null">is_sh = #{isSh},</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 sk_id = #{id}
+    </update>
+
+    <delete id="deleteZsyzSkDzjeById" parameterType="Long">
+        delete from zsyz_sk_dzje where id = #{id}
+    </delete>
+
+    <delete id="deleteZsyzSkDzjeByIds" parameterType="String">
+        delete from zsyz_sk_dzje where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,123 @@
+<?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.projectV2.ZsyzSkSwtzdwMapper">
+    
+    <resultMap type="ZsyzSkSwtzdw" id="ZsyzSkSwtzdwResult">
+        <result property="id"    column="id"    />
+        <result property="skId"    column="sk_id"    />
+        <result property="dwmc"    column="dwmc"    />
+        <result property="zczj"    column="zczj"    />
+        <result property="tzje"    column="tzje"    />
+        <result property="province"    column="province"    />
+        <result property="provinceId"    column="province_id"    />
+        <result property="city"    column="city"    />
+        <result property="cityId"    column="city_id"    />
+        <result property="dwjj"    column="dwjj"    />
+        <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="selectZsyzSkSwtzdwVo">
+        select id, sk_id, dwmc, zczj, tzje, province, province_id, city, city_id, dwjj, create_by, create_time, update_by, update_time, remark from zsyz_sk_swtzdw
+    </sql>
+
+    <select id="selectZsyzSkSwtzdwList" parameterType="ZsyzSkSwtzdw" resultMap="ZsyzSkSwtzdwResult">
+        <include refid="selectZsyzSkSwtzdwVo"/>
+        <where>  
+            <if test="skId != null "> and sk_id = #{skId}</if>
+            <if test="dwmc != null  and dwmc != ''"> and dwmc = #{dwmc}</if>
+            <if test="zczj != null  and zczj != ''"> and zczj = #{zczj}</if>
+            <if test="tzje != null  and tzje != ''"> and tzje = #{tzje}</if>
+            <if test="province != null  and province != ''"> and province = #{province}</if>
+            <if test="provinceId != null  and provinceId != ''"> and province_id = #{provinceId}</if>
+            <if test="city != null  and city != ''"> and city = #{city}</if>
+            <if test="cityId != null  and cityId != ''"> and city_id = #{cityId}</if>
+            <if test="dwjj != null  and dwjj != ''"> and dwjj = #{dwjj}</if>
+        </where>
+    </select>
+    
+    <select id="selectZsyzSkSwtzdwById" parameterType="Long" resultMap="ZsyzSkSwtzdwResult">
+        <include refid="selectZsyzSkSwtzdwVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectZsyzSkSwtzdwBySkId" parameterType="Long" resultMap="ZsyzSkSwtzdwResult">
+        <include refid="selectZsyzSkSwtzdwVo"/>
+        where sk_id = #{id}
+    </select>
+
+    <insert id="insertZsyzSkSwtzdw" parameterType="ZsyzSkSwtzdw" useGeneratedKeys="true" keyProperty="id">
+        insert into zsyz_sk_swtzdw
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="skId != null">sk_id,</if>
+            <if test="dwmc != null">dwmc,</if>
+            <if test="zczj != null">zczj,</if>
+            <if test="tzje != null">tzje,</if>
+            <if test="province != null">province,</if>
+            <if test="provinceId != null">province_id,</if>
+            <if test="city != null">city,</if>
+            <if test="cityId != null">city_id,</if>
+            <if test="dwjj != null">dwjj,</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="skId != null">#{skId},</if>
+            <if test="dwmc != null">#{dwmc},</if>
+            <if test="zczj != null">#{zczj},</if>
+            <if test="tzje != null">#{tzje},</if>
+            <if test="province != null">#{province},</if>
+            <if test="provinceId != null">#{provinceId},</if>
+            <if test="city != null">#{city},</if>
+            <if test="cityId != null">#{cityId},</if>
+            <if test="dwjj != null">#{dwjj},</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="updateZsyzSkSwtzdw" parameterType="ZsyzSkSwtzdw">
+        update zsyz_sk_swtzdw
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="skId != null">sk_id = #{skId},</if>
+            <if test="dwmc != null">dwmc = #{dwmc},</if>
+            <if test="zczj != null">zczj = #{zczj},</if>
+            <if test="tzje != null">tzje = #{tzje},</if>
+            <if test="province != null">province = #{province},</if>
+            <if test="provinceId != null">province_id = #{provinceId},</if>
+            <if test="city != null">city = #{city},</if>
+            <if test="cityId != null">city_id = #{cityId},</if>
+            <if test="dwjj != null">dwjj = #{dwjj},</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="deleteZsyzSkSwtzdwById" parameterType="Long">
+        delete from zsyz_sk_swtzdw where id = #{id}
+    </delete>
+
+    <delete id="deleteZsyzSkSwtzdwByIds" parameterType="String">
+        delete from zsyz_sk_swtzdw where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteZsyzSkSwtzdwBySkId">
+                delete from zsyz_sk_swtzdw where sk_id = #{id}
+    </delete>
+</mapper>

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

@@ -1,92 +1,106 @@
 <?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">
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.projectV2.ZsyzSkxmMapper">
-
+    
     <resultMap type="ZsyzSkxm" id="ZsyzSkxmResult">
-        <result property="id" column="id"/>
-        <result property="xmmc" column="xmmc"/>
-        <result property="pzwh" column="pzwh"/>
-        <result property="tzdw" column="tzdw"/>
-        <result property="xmszd" column="xmszd"/>
-        <result property="sscy" column="sscy"/>
-        <result property="ztze" column="ztze"/>
-        <result property="swzj" column="swzj"/>
-        <result property="sjdz" column="sjdz"/>
-        <result property="dydw" column="dydw"/>
-        <result property="rkTime" column="rk_time"/>
-        <result property="qytbTime" column="qytb_time"/>
-        <result property="isHs" column="is_hs"/>
-        <result property="jsjd" column="jsjd"/>
-        <result property="isSh" column="is_sh"/>
-        <result property="shName" column="sh_name"/>
-        <result property="shTime" column="sh_time"/>
-        <result property="shJy" column="sh_jy"/>
-        <result property="deptId" column="dept_id"/>
-        <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"/>
+        <result property="id"    column="id"    />
+        <result property="isHs"    column="is_hs"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="pzwh"    column="pzwh"    />
+        <result property="yyzz"    column="yyzz"    />
+        <result property="szdqId"    column="szdq_id"    />
+        <result property="szdqName"    column="szdq_name"    />
+        <result property="sscy"    column="sscy"    />
+        <result property="xxcy"    column="xxcy"    />
+        <result property="zdcy"    column="zdcy"    />
+        <result property="isLt"    column="is_lt"    />
+        <result property="isFzzlfdcy"    column="is_fzzlfdcy"    />
+        <result property="tzfs"    column="tzfs"    />
+        <result property="rkTime"    column="rk_time"    />
+        <result property="kgjsTime"    column="kgjs_time"    />
+        <result property="jswcTime"    column="jswc_time"    />
+        <result property="ztze"    column="ztze"    />
+        <result property="swzj"    column="swzj"    />
+        <result property="jsjd"    column="jsjd"    />
+        <result property="xmnr"    column="xmnr"    />
+        <result property="czwt"    column="czwt"    />
+        <result property="isSh"    column="is_sh"    />
+        <result property="shName"    column="sh_name"    />
+        <result property="shTime"    column="sh_time"    />
+        <result property="shJy"    column="sh_jy"    />
+        <result property="deptId"    column="dept_id"    />
+        <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="selectZsyzSkxmVo">
-        select id, xmmc, pzwh, tzdw, xmszd, sscy, ztze, swzj, sjdz, dydw, rk_time, qytb_time, is_hs, jsjd, is_sh, sh_name, sh_time, sh_jy,dept_id, create_by, create_time, update_by, update_time, remark from zsyz_skxm
+        select id, is_hs, xmmc, pzwh, yyzz, szdq_id, szdq_name, sscy, xxcy, zdcy, is_lt, is_fzzlfdcy, tzfs, rk_time, kgjs_time, jswc_time, ztze, swzj, jsjd, xmnr, czwt, is_sh, sh_name, sh_time, sh_jy, dept_id, create_by, create_time, update_by, update_time, remark from zsyz_skxm
     </sql>
 
     <select id="selectZsyzSkxmList" parameterType="ZsyzSkxm" resultMap="ZsyzSkxmResult">
         <include refid="selectZsyzSkxmVo"/>
-        <where>
-            <if test="xmmc != null  and xmmc != ''">and xmmc like concat( #{xmmc}, '%') </if>
-            <if test="pzwh != null  and pzwh != ''">and pzwh = #{pzwh}</if>
-            <if test="tzdw != null  and tzdw != ''">and tzdw = #{tzdw}</if>
-            <if test="xmszd != null  and xmszd != ''">and xmszd = #{xmszd}</if>
-            <if test="sscy != null  and sscy != ''">and sscy = #{sscy}</if>
-            <if test="ztze != null  and ztze != ''">and ztze = #{ztze}</if>
-            <if test="swzj != null  and swzj != ''">and swzj = #{swzj}</if>
-            <if test="sjdz != null  and sjdz != ''">and sjdz = #{sjdz}</if>
-            <if test="dydw != null  and dydw != ''">and dydw = #{dydw}</if>
-            <if test="rkTime != null ">and rk_time = #{rkTime}</if>
-            <if test="qytbTime != null ">and qytb_time = #{qytbTime}</if>
-            <if test="isHs != null  and isHs != ''">and is_hs = #{isHs}</if>
-            <if test="jsjd != null  and jsjd != ''">and jsjd = #{jsjd}</if>
-            <if test="isSh != null  and isSh != ''">and is_sh = #{isSh}</if>
-            <if test="shName != null  and shName != ''">and sh_name like concat('%', #{shName}, '%')</if>
-            <if test="shTime != null ">and sh_time = #{shTime}</if>
-            <if test="shJy != null  and shJy != ''">and sh_jy = #{shJy}</if>
-            <if test="deptId != null  and deptId != ''">and dept_id = #{deptId}</if>
-            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
-            </if>
-            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
-            </if>
+        <where>  
+            <if test="isHs != null  and isHs != ''"> and is_hs = #{isHs}</if>
+            <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
+            <if test="pzwh != null  and pzwh != ''"> and pzwh = #{pzwh}</if>
+            <if test="yyzz != null  and yyzz != ''"> and yyzz = #{yyzz}</if>
+            <if test="szdqId != null  and szdqId != ''"> and szdq_id = #{szdqId}</if>
+            <if test="szdqName != null  and szdqName != ''"> and szdq_name like concat('%', #{szdqName}, '%')</if>
+            <if test="sscy != null  and sscy != ''"> and sscy = #{sscy}</if>
+            <if test="xxcy != null  and xxcy != ''"> and xxcy = #{xxcy}</if>
+            <if test="zdcy != null  and zdcy != ''"> and zdcy = #{zdcy}</if>
+            <if test="isLt != null  and isLt != ''"> and is_lt = #{isLt}</if>
+            <if test="isFzzlfdcy != null  and isFzzlfdcy != ''"> and is_fzzlfdcy = #{isFzzlfdcy}</if>
+            <if test="tzfs != null  and tzfs != ''"> and tzfs = #{tzfs}</if>
+            <if test="rkTime != null "> and rk_time = #{rkTime}</if>
+            <if test="kgjsTime != null "> and kgjs_time = #{kgjsTime}</if>
+            <if test="jswcTime != null "> and jswc_time = #{jswcTime}</if>
+            <if test="ztze != null  and ztze != ''"> and ztze = #{ztze}</if>
+            <if test="swzj != null  and swzj != ''"> and swzj = #{swzj}</if>
+            <if test="jsjd != null  and jsjd != ''"> and jsjd = #{jsjd}</if>
+            <if test="xmnr != null  and xmnr != ''"> and xmnr = #{xmnr}</if>
+            <if test="czwt != null  and czwt != ''"> and czwt = #{czwt}</if>
+            <if test="isSh != null  and isSh != ''"> and is_sh = #{isSh}</if>
+            <if test="shName != null  and shName != ''"> and sh_name like concat('%', #{shName}, '%')</if>
+            <if test="shTime != null "> and sh_time = #{shTime}</if>
+            <if test="shJy != null  and shJy != ''"> and sh_jy = #{shJy}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
         </where>
-        order by create_time desc
     </select>
-
+    
     <select id="selectZsyzSkxmById" parameterType="Long" resultMap="ZsyzSkxmResult">
         <include refid="selectZsyzSkxmVo"/>
         where id = #{id}
     </select>
-
+        
     <insert id="insertZsyzSkxm" parameterType="ZsyzSkxm" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_skxm
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="isHs != null and isHs != ''">is_hs,</if>
             <if test="xmmc != null">xmmc,</if>
             <if test="pzwh != null">pzwh,</if>
-            <if test="tzdw != null">tzdw,</if>
-            <if test="xmszd != null">xmszd,</if>
+            <if test="yyzz != null">yyzz,</if>
+            <if test="szdqId != null">szdq_id,</if>
+            <if test="szdqName != null">szdq_name,</if>
             <if test="sscy != null">sscy,</if>
+            <if test="xxcy != null">xxcy,</if>
+            <if test="zdcy != null">zdcy,</if>
+            <if test="isLt != null">is_lt,</if>
+            <if test="isFzzlfdcy != null">is_fzzlfdcy,</if>
+            <if test="tzfs != null">tzfs,</if>
+            <if test="rkTime != null">rk_time,</if>
+            <if test="kgjsTime != null">kgjs_time,</if>
+            <if test="jswcTime != null">jswc_time,</if>
             <if test="ztze != null">ztze,</if>
             <if test="swzj != null">swzj,</if>
-            <if test="sjdz != null and sjdz != ''">sjdz,</if>
-            <if test="dydw != null and dydw != ''">dydw,</if>
-            <if test="rkTime != null">rk_time,</if>
-            <if test="qytbTime != null">qytb_time,</if>
-            <if test="isHs != null and isHs != ''">is_hs,</if>
             <if test="jsjd != null">jsjd,</if>
+            <if test="xmnr != null">xmnr,</if>
+            <if test="czwt != null">czwt,</if>
             <if test="isSh != null">is_sh,</if>
             <if test="shName != null">sh_name,</if>
             <if test="shTime != null">sh_time,</if>
@@ -97,21 +111,28 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-        </trim>
+         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="isHs != null and isHs != ''">#{isHs},</if>
             <if test="xmmc != null">#{xmmc},</if>
             <if test="pzwh != null">#{pzwh},</if>
-            <if test="tzdw != null">#{tzdw},</if>
-            <if test="xmszd != null">#{xmszd},</if>
+            <if test="yyzz != null">#{yyzz},</if>
+            <if test="szdqId != null">#{szdqId},</if>
+            <if test="szdqName != null">#{szdqName},</if>
             <if test="sscy != null">#{sscy},</if>
+            <if test="xxcy != null">#{xxcy},</if>
+            <if test="zdcy != null">#{zdcy},</if>
+            <if test="isLt != null">#{isLt},</if>
+            <if test="isFzzlfdcy != null">#{isFzzlfdcy},</if>
+            <if test="tzfs != null">#{tzfs},</if>
+            <if test="rkTime != null">#{rkTime},</if>
+            <if test="kgjsTime != null">#{kgjsTime},</if>
+            <if test="jswcTime != null">#{jswcTime},</if>
             <if test="ztze != null">#{ztze},</if>
             <if test="swzj != null">#{swzj},</if>
-            <if test="sjdz != null and sjdz != ''">#{sjdz},</if>
-            <if test="dydw != null and dydw != ''">#{dydw},</if>
-            <if test="rkTime != null">#{rkTime},</if>
-            <if test="qytbTime != null">#{qytbTime},</if>
-            <if test="isHs != null and isHs != ''">#{isHs},</if>
             <if test="jsjd != null">#{jsjd},</if>
+            <if test="xmnr != null">#{xmnr},</if>
+            <if test="czwt != null">#{czwt},</if>
             <if test="isSh != null">#{isSh},</if>
             <if test="shName != null">#{shName},</if>
             <if test="shTime != null">#{shTime},</if>
@@ -122,25 +143,32 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-        </trim>
+         </trim>
     </insert>
 
     <update id="updateZsyzSkxm" parameterType="ZsyzSkxm">
         update zsyz_skxm
         <trim prefix="SET" suffixOverrides=",">
+            <if test="isHs != null and isHs != ''">is_hs = #{isHs},</if>
             <if test="xmmc != null">xmmc = #{xmmc},</if>
             <if test="pzwh != null">pzwh = #{pzwh},</if>
-            <if test="tzdw != null">tzdw = #{tzdw},</if>
-            <if test="xmszd != null">xmszd = #{xmszd},</if>
+            <if test="yyzz != null">yyzz = #{yyzz},</if>
+            <if test="szdqId != null">szdq_id = #{szdqId},</if>
+            <if test="szdqName != null">szdq_name = #{szdqName},</if>
             <if test="sscy != null">sscy = #{sscy},</if>
+            <if test="xxcy != null">xxcy = #{xxcy},</if>
+            <if test="zdcy != null">zdcy = #{zdcy},</if>
+            <if test="isLt != null">is_lt = #{isLt},</if>
+            <if test="isFzzlfdcy != null">is_fzzlfdcy = #{isFzzlfdcy},</if>
+            <if test="tzfs != null">tzfs = #{tzfs},</if>
+            <if test="rkTime != null">rk_time = #{rkTime},</if>
+            <if test="kgjsTime != null">kgjs_time = #{kgjsTime},</if>
+            <if test="jswcTime != null">jswc_time = #{jswcTime},</if>
             <if test="ztze != null">ztze = #{ztze},</if>
             <if test="swzj != null">swzj = #{swzj},</if>
-            <if test="sjdz != null and sjdz != ''">sjdz = #{sjdz},</if>
-            <if test="dydw != null and dydw != ''">dydw = #{dydw},</if>
-            <if test="rkTime != null">rk_time = #{rkTime},</if>
-            <if test="qytbTime != null">qytb_time = #{qytbTime},</if>
-            <if test="isHs != null and isHs != ''">is_hs = #{isHs},</if>
             <if test="jsjd != null">jsjd = #{jsjd},</if>
+            <if test="xmnr != null">xmnr = #{xmnr},</if>
+            <if test="czwt != null">czwt = #{czwt},</if>
             <if test="isSh != null">is_sh = #{isSh},</if>
             <if test="shName != null">sh_name = #{shName},</if>
             <if test="shTime != null">sh_time = #{shTime},</if>
@@ -154,17 +182,13 @@
         </trim>
         where id = #{id}
     </update>
-    <update id="updateZsyzSkxmSh" parameterType="ZsyzSkxm">
-        update zsyz_skxm set is_sh = #{isSh} ,sh_time = sysdate()
-        where id = #{id}
-    </update>
 
     <delete id="deleteZsyzSkxmById" parameterType="Long">
         delete from zsyz_skxm where id = #{id}
     </delete>
 
     <delete id="deleteZsyzSkxmByIds" parameterType="String">
-        delete from zsyz_skxm where id in
+        delete from zsyz_skxm where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

ruoyi-system/src/main/resources/mapper/system/projectV2/common/ChinaAreaMapper.xml

@@ -0,0 +1,72 @@
+<?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.projectV2.common.ChinaAreaMapper">
+    
+    <resultMap type="com.ruoyi.system.domain.projectV2.common.ChinaArea" id="ChinaAreaResult">
+        <result property="areaId"    column="area_id"    />
+        <result property="name"    column="name"    />
+        <result property="pid"    column="pid"    />
+        <result property="sort"    column="sort"    />
+    </resultMap>
+
+    <sql id="selectChinaAreaVo">
+        select area_id, name, pid, sort from china_area
+    </sql>
+
+    <select id="selectChinaAreaList" parameterType="com.ruoyi.system.domain.projectV2.common.ChinaArea" resultMap="ChinaAreaResult">
+        <include refid="selectChinaAreaVo"/>
+        <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="pid != null  and pid != ''"> and pid = #{pid}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+        </where>
+    </select>
+    
+    <select id="selectChinaAreaByAreaId" parameterType="String" resultMap="ChinaAreaResult">
+        <include refid="selectChinaAreaVo"/>
+        where area_id = #{areaId}
+    </select>
+    <select id="selectChinaAreaByPId" resultType="com.ruoyi.system.domain.projectV2.common.ChinaArea" resultMap="ChinaAreaResult">
+        <include refid="selectChinaAreaVo"/>
+        where pid = #{areaId}
+    </select>
+
+    <insert id="insertChinaArea" parameterType="com.ruoyi.system.domain.projectV2.common.ChinaArea">
+        insert into china_area
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="areaId != null">area_id,</if>
+            <if test="name != null">name,</if>
+            <if test="pid != null">pid,</if>
+            <if test="sort != null">sort,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="areaId != null">#{areaId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="pid != null">#{pid},</if>
+            <if test="sort != null">#{sort},</if>
+         </trim>
+    </insert>
+
+    <update id="updateChinaArea" parameterType="com.ruoyi.system.domain.projectV2.common.ChinaArea">
+        update china_area
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="pid != null">pid = #{pid},</if>
+            <if test="sort != null">sort = #{sort},</if>
+        </trim>
+        where area_id = #{areaId}
+    </update>
+
+    <delete id="deleteChinaAreaByAreaId" parameterType="String">
+        delete from china_area where area_id = #{areaId}
+    </delete>
+
+    <delete id="deleteChinaAreaByAreaIds" parameterType="String">
+        delete from china_area where area_id in 
+        <foreach item="areaId" collection="array" open="(" separator="," close=")">
+            #{areaId}
+        </foreach>
+    </delete>
+</mapper>