招商引资,后端接口新增项目管理部分

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmConstructionEqController.java

@@ -0,0 +1,111 @@
+package com.ruoyi.web.controller.project;
+
+import java.util.List;
+
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.project.BmConstructionEq;
+import com.ruoyi.system.service.project.IBmConstructionEqService;
+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.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目设备安装
+(最少一条记录)Controller
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+@RestController
+@RequestMapping("/constructionEq/constructionEq")
+public class BmConstructionEqController extends BaseController
+{
+    @Autowired
+    private IBmConstructionEqService bmConstructionEqService;
+
+    /**
+     * 查询项目设备安装
+(最少一条记录)列表
+     */
+    @PreAuthorize("@ss.hasPermi('constructionEq:constructionEq:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BmConstructionEq bmConstructionEq)
+    {
+        startPage();
+        List<BmConstructionEq> list = bmConstructionEqService.selectBmConstructionEqList(bmConstructionEq);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目设备安装
+(最少一条记录)列表
+     */
+    @PreAuthorize("@ss.hasPermi('constructionEq:constructionEq:export')")
+    @Log(title = "项目设备安装 (最少一条记录)", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(BmConstructionEq bmConstructionEq)
+    {
+        List<BmConstructionEq> list = bmConstructionEqService.selectBmConstructionEqList(bmConstructionEq);
+        ExcelUtil<BmConstructionEq> util = new ExcelUtil<BmConstructionEq>(BmConstructionEq.class);
+        return util.exportExcel(list, "constructionEq");
+    }
+
+    /**
+     * 获取项目设备安装
+(最少一条记录)详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('constructionEq:constructionEq:query')")
+    @GetMapping(value = "/{bmProjectId}")
+    public AjaxResult getInfo(@PathVariable("bmProjectId") Long id)
+    {
+        return AjaxResult.success(bmConstructionEqService.selectBmConstructionEqById(id));
+    }
+
+    /**
+     * 新增项目设备安装
+(最少一条记录)
+     */
+    @PreAuthorize("@ss.hasPermi('constructionEq:constructionEq:add')")
+    @Log(title = "项目设备安装 (最少一条记录)", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BmConstructionEq bmConstructionEq)
+    {
+        return toAjax(bmConstructionEqService.insertBmConstructionEq(bmConstructionEq));
+    }
+
+    /**
+     * 修改项目设备安装
+(最少一条记录)
+     */
+    @PreAuthorize("@ss.hasPermi('constructionEq:constructionEq:edit')")
+    @Log(title = "项目设备安装 (最少一条记录)", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BmConstructionEq bmConstructionEq)
+    {
+        return toAjax(bmConstructionEqService.updateBmConstructionEq(bmConstructionEq));
+    }
+
+    /**
+     * 删除项目设备安装
+(最少一条记录)
+     */
+    @PreAuthorize("@ss.hasPermi('constructionEq:constructionEq:remove')")
+    @Log(title = "项目设备安装 (最少一条记录)", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bmConstructionEqService.deleteBmConstructionEqByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmConstructionPayController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.project;
+
+import java.util.List;
+
+import com.ruoyi.system.domain.project.BmConstructionPay;
+import com.ruoyi.system.service.project.IBmConstructionPayService;
+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.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目到资
+(最少一条记录、合计、回写项目单)Controller
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+@RestController
+@RequestMapping("/constructionPay/pay")
+public class BmConstructionPayController extends BaseController
+{
+    @Autowired
+    private IBmConstructionPayService bmConstructionPayService;
+
+    /**
+     * 查询项目到资(最少一条记录、合计、回写项目单)列表
+     */
+    @PreAuthorize("@ss.hasPermi('constructionPay:pay:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BmConstructionPay bmConstructionPay)
+    {
+        startPage();
+        List<BmConstructionPay> list = bmConstructionPayService.selectBmConstructionPayList(bmConstructionPay);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目到资(最少一条记录、合计、回写项目单)列表
+     */
+    @PreAuthorize("@ss.hasPermi('constructionPay:pay:export')")
+    @Log(title = "导出", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(BmConstructionPay bmConstructionPay)
+    {
+        List<BmConstructionPay> list = bmConstructionPayService.selectBmConstructionPayList(bmConstructionPay);
+        ExcelUtil<BmConstructionPay> util = new ExcelUtil<BmConstructionPay>(BmConstructionPay.class);
+        return util.exportExcel(list, "pay");
+    }
+
+    /**
+     * 获取项目到资(最少一条记录、合计、回写项目单)详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('constructionPay:pay:query')")
+    @GetMapping(value = "/{bmProjectId}")
+    public AjaxResult getInfo(@PathVariable("bmProjectId") Long id)
+    {
+        return AjaxResult.success(bmConstructionPayService.selectBmConstructionPayById(id));
+    }
+
+    /**
+     * 新增项目到资(最少一条记录、合计、回写项目单)
+     */
+    @PreAuthorize("@ss.hasPermi('constructionPay:pay:add')")
+    @Log(title = "新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BmConstructionPay bmConstructionPay)
+    {
+        return toAjax(bmConstructionPayService.insertBmConstructionPay(bmConstructionPay));
+    }
+
+    /**
+     * 修改项目到资(最少一条记录、合计、回写项目单)
+     */
+    @PreAuthorize("@ss.hasPermi('constructionPay:pay:edit')")
+    @Log(title = "修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BmConstructionPay bmConstructionPay)
+    {
+        return toAjax(bmConstructionPayService.updateBmConstructionPay(bmConstructionPay));
+    }
+
+    /**
+     * 删除项目到资(最少一条记录、合计、回写项目单)
+     */
+    @PreAuthorize("@ss.hasPermi('constructionPay:pay:remove')")
+    @Log(title = "删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bmConstructionPayService.deleteBmConstructionPayByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmConstructionPayInfoController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.project;
+
+import java.util.List;
+
+import com.ruoyi.system.domain.project.BmConstructionPayInfo;
+import com.ruoyi.system.service.project.IBmConstructionPayInfoService;
+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.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目入统Controller
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+@RestController
+@RequestMapping("/constructionPayInfo/payInfo")
+public class BmConstructionPayInfoController extends BaseController
+{
+    @Autowired
+    private IBmConstructionPayInfoService bmConstructionPayInfoService;
+
+    /**
+     * 查询项目入统列表
+     */
+    @PreAuthorize("@ss.hasPermi('constructionPayInfo:payInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BmConstructionPayInfo bmConstructionPayInfo)
+    {
+        startPage();
+        List<BmConstructionPayInfo> list = bmConstructionPayInfoService.selectBmConstructionPayInfoList(bmConstructionPayInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目入统列表
+     */
+    @PreAuthorize("@ss.hasPermi('constructionPayInfo:payInfo:export')")
+    @Log(title = "项目入统", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(BmConstructionPayInfo bmConstructionPayInfo)
+    {
+        List<BmConstructionPayInfo> list = bmConstructionPayInfoService.selectBmConstructionPayInfoList(bmConstructionPayInfo);
+        ExcelUtil<BmConstructionPayInfo> util = new ExcelUtil<BmConstructionPayInfo>(BmConstructionPayInfo.class);
+        return util.exportExcel(list, "payInfo");
+    }
+
+    /**
+     * 获取项目入统详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('constructionPayInfo:payInfo:query')")
+    @GetMapping(value = "/{bmProjectId}")
+    public AjaxResult getInfo(@PathVariable("bmProjectId") Long id)
+    {
+        return AjaxResult.success(bmConstructionPayInfoService.selectBmConstructionPayInfoById(id));
+    }
+
+    /**
+     * 新增项目入统
+     */
+    @PreAuthorize("@ss.hasPermi('constructionPayInfo:payInfo:add')")
+    @Log(title = "项目入统", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BmConstructionPayInfo bmConstructionPayInfo)
+    {
+        return toAjax(bmConstructionPayInfoService.insertBmConstructionPayInfo(bmConstructionPayInfo));
+    }
+
+    /**
+     * 修改项目入统
+     */
+    @PreAuthorize("@ss.hasPermi('constructionPayInfo:payInfo:edit')")
+    @Log(title = "项目入统", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BmConstructionPayInfo bmConstructionPayInfo)
+    {
+        return toAjax(bmConstructionPayInfoService.updateBmConstructionPayInfo(bmConstructionPayInfo));
+    }
+
+    /**
+     * 删除项目入统
+     */
+    @PreAuthorize("@ss.hasPermi('constructionPayInfo:payInfo:remove')")
+    @Log(title = "项目入统", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bmConstructionPayInfoService.deleteBmConstructionPayInfoByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmConstructionRateController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.project;
+
+import java.util.List;
+
+import com.ruoyi.system.domain.project.BmConstructionRate;
+import com.ruoyi.system.service.project.IBmConstructionRateService;
+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.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目施工进度Controller
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+@RestController
+@RequestMapping("/constructionRate/rate")
+public class BmConstructionRateController extends BaseController
+{
+    @Autowired
+    private IBmConstructionRateService bmConstructionRateService;
+
+    /**
+     * 查询项目施工进度列表
+     */
+    @PreAuthorize("@ss.hasPermi('constructionRate:rate:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BmConstructionRate bmConstructionRate)
+    {
+        startPage();
+        List<BmConstructionRate> list = bmConstructionRateService.selectBmConstructionRateList(bmConstructionRate);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目施工进度列表
+     */
+    @PreAuthorize("@ss.hasPermi('constructionRate:rate:export')")
+    @Log(title = "项目施工进度", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(BmConstructionRate bmConstructionRate)
+    {
+        List<BmConstructionRate> list = bmConstructionRateService.selectBmConstructionRateList(bmConstructionRate);
+        ExcelUtil<BmConstructionRate> util = new ExcelUtil<BmConstructionRate>(BmConstructionRate.class);
+        return util.exportExcel(list, "rate");
+    }
+
+    /**
+     * 获取项目施工进度详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('constructionRate:rate:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(bmConstructionRateService.selectBmConstructionRateById(id));
+    }
+
+    /**
+     * 新增项目施工进度
+     */
+    @PreAuthorize("@ss.hasPermi('constructionRate:rate:add')")
+    @Log(title = "项目施工进度", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BmConstructionRate bmConstructionRate)
+    {
+        return toAjax(bmConstructionRateService.insertBmConstructionRate(bmConstructionRate));
+    }
+
+    /**
+     * 修改项目施工进度
+     */
+    @PreAuthorize("@ss.hasPermi('constructionRate:rate:edit')")
+    @Log(title = "项目施工进度", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BmConstructionRate bmConstructionRate)
+    {
+        return toAjax(bmConstructionRateService.updateBmConstructionRate(bmConstructionRate));
+    }
+
+    /**
+     * 删除项目施工进度
+     */
+    @PreAuthorize("@ss.hasPermi('constructionRate:rate:remove')")
+    @Log(title = "项目施工进度", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bmConstructionRateService.deleteBmConstructionRateByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmDeptPlanController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.project;
+
+import java.util.List;
+
+import com.ruoyi.system.domain.project.BmDeptPlan;
+import com.ruoyi.system.service.project.IBmDeptPlanService;
+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.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ *  部门招商计划Controller
+ * 
+ * @author ruoyi
+ * @date 2021-03-09
+ */
+@RestController
+@RequestMapping("/deptPlan/plan")
+public class BmDeptPlanController extends BaseController
+{
+    @Autowired
+    private IBmDeptPlanService bmDeptPlanService;
+
+    /**
+     * 查询 部门招商计划列表
+     */
+    @PreAuthorize("@ss.hasPermi('deptPlan:Plan:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BmDeptPlan bmDeptPlan)
+    {
+        startPage();
+        List<BmDeptPlan> list = bmDeptPlanService.selectBmDeptPlanList(bmDeptPlan);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出 部门招商计划列表
+     */
+    @PreAuthorize("@ss.hasPermi('deptPlan:Plan:export')")
+    @Log(title = " 部门招商计划", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(BmDeptPlan bmDeptPlan)
+    {
+        List<BmDeptPlan> list = bmDeptPlanService.selectBmDeptPlanList(bmDeptPlan);
+        ExcelUtil<BmDeptPlan> util = new ExcelUtil<BmDeptPlan>(BmDeptPlan.class);
+        return util.exportExcel(list, "Plan");
+    }
+
+    /**
+     * 获取 部门招商计划详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('deptPlan:Plan:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(bmDeptPlanService.selectBmDeptPlanById(id));
+    }
+
+    /**
+     * 新增 部门招商计划
+     */
+    @PreAuthorize("@ss.hasPermi('deptPlan:Plan:add')")
+    @Log(title = " 部门招商计划", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BmDeptPlan bmDeptPlan)
+    {
+        return toAjax(bmDeptPlanService.insertBmDeptPlan(bmDeptPlan));
+    }
+
+    /**
+     * 修改 部门招商计划
+     */
+    @PreAuthorize("@ss.hasPermi('deptPlan:Plan:edit')")
+    @Log(title = " 部门招商计划", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BmDeptPlan bmDeptPlan)
+    {
+        return toAjax(bmDeptPlanService.updateBmDeptPlan(bmDeptPlan));
+    }
+
+    /**
+     * 删除 部门招商计划
+     */
+    @PreAuthorize("@ss.hasPermi('deptPlan:Plan:remove')")
+    @Log(title = " 部门招商计划", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bmDeptPlanService.deleteBmDeptPlanByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectConstructionController.java

@@ -37,7 +37,7 @@ public class BmProjectConstructionController extends BaseController
     /**
      * 查询项目施工列表
      */
-    //@PreAuthorize("@ss.hasPermi('projectConstruction:construction:list')")
+    @PreAuthorize("@ss.hasPermi('projectConstruction:construction:list')")
     @GetMapping("/list")
     public TableDataInfo list(BmProjectConstruction bmProjectConstruction)
     {
@@ -49,7 +49,7 @@ public class BmProjectConstructionController extends BaseController
     /**
      * 导出项目施工列表
      */
-    //@PreAuthorize("@ss.hasPermi('projectConstruction:construction:export')")
+    @PreAuthorize("@ss.hasPermi('projectConstruction:construction:export')")
     @Log(title = "项目施工", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(BmProjectConstruction bmProjectConstruction)
@@ -62,9 +62,9 @@ public class BmProjectConstructionController extends BaseController
     /**
      * 获取项目施工详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('projectConstruction:construction:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    @PreAuthorize("@ss.hasPermi('projectConstruction:construction:query')")
+    @GetMapping(value = "/{bmProjectId}")
+    public AjaxResult getInfo(@PathVariable("bmProjectId") Long id)
     {
         return AjaxResult.success(bmProjectConstructionService.selectBmProjectConstructionById(id));
     }
@@ -72,7 +72,7 @@ public class BmProjectConstructionController extends BaseController
     /**
      * 新增项目施工
      */
-    //@PreAuthorize("@ss.hasPermi('projectConstruction:construction:add')")
+    @PreAuthorize("@ss.hasPermi('projectConstruction:construction:add')")
     @Log(title = "项目施工", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BmProjectConstruction bmProjectConstruction)
@@ -83,18 +83,18 @@ public class BmProjectConstructionController extends BaseController
     /**
      * 修改项目施工
      */
-    //@PreAuthorize("@ss.hasPermi('projectConstruction:construction:edit')")
+    @PreAuthorize("@ss.hasPermi('projectConstruction:construction:edit')")
     @Log(title = "项目施工", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BmProjectConstruction bmProjectConstruction)
     {
-        return toAjax(bmProjectConstructionService.updateBmProjectConstruction(bmProjectConstruction));
+        return bmProjectConstructionService.updateBmProjectConstruction(bmProjectConstruction);
     }
 
     /**
      * 删除项目施工
      */
-    //@PreAuthorize("@ss.hasPermi('projectConstruction:construction:remove')")
+    @PreAuthorize("@ss.hasPermi('projectConstruction:construction:remove')")
     @Log(title = "项目施工", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectController.java

@@ -42,8 +42,6 @@ public class BmProjectController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(BmProject bmProject) {
         startPage();
-        //实例化BmProject对象时会自动赋值,需要重置为null
-        bmProject.setIsBackbussiness(null);
         List<BmProject> list = bmProjectService.selectBmProjectList(bmProject);
         return getDataTable(list);
     }
@@ -99,10 +97,27 @@ public class BmProjectController extends BaseController {
         return toAjax(bmProjectService.deleteBmProjectByIds(ids));
     }
 
+
+    /**
+     * 审核/提交/驳回项目
+     * @param bmProjectStatus
+     * @return
+     */
     @PreAuthorize("@ss.hasPermi('bmProject:project:examine')")
     @PostMapping("/examine")
     public AjaxResult examine(@RequestBody BmProjectStatus bmProjectStatus) {
         return bmProjectService.examine(bmProjectStatus);
     }
 
+    /**
+     * 首页查询待审核列表
+     */
+    //@PreAuthorize("@ss.hasPermi('bmProject:project:toBeReviewedList')")
+    @GetMapping("/toBeReviewedList")
+    public TableDataInfo toBeReviewedList(BmProject bmProject) {
+        startPage();
+        List<BmProject> list = bmProjectService.selectToBeReviewedList(bmProject);
+        return getDataTable(list);
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectInfoController.java

@@ -63,8 +63,8 @@ public class BmProjectInfoController extends BaseController
      * 获取项目-线索信息详细信息
      */
     @PreAuthorize("@ss.hasPermi('projectInfo:info:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    @GetMapping(value = "/{bmProjectId}")
+    public AjaxResult getInfo(@PathVariable("bmProjectId") Long id)
     {
         return AjaxResult.success(bmProjectInfoService.selectBmProjectInfoById(id));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectOrderinfoController.java

@@ -63,8 +63,8 @@ public class BmProjectOrderinfoController extends BaseController
      * 获取项目签约详细信息
      */
     @PreAuthorize("@ss.hasPermi('projectOrderInfo:orderinfo:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    @GetMapping(value = "/{bmProjectId}")
+    public AjaxResult getInfo(@PathVariable("bmProjectId") Long id)
     {
         return AjaxResult.success(bmProjectOrderinfoService.selectBmProjectOrderinfoById(id));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectProductController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.project;
+
+import java.util.List;
+
+import com.ruoyi.system.domain.project.BmProjectProduct;
+import com.ruoyi.system.service.project.IBmProjectProductService;
+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.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目投产Controller
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+@RestController
+@RequestMapping("/projectProduct/product")
+public class BmProjectProductController extends BaseController
+{
+    @Autowired
+    private IBmProjectProductService bmProjectProductService;
+
+    /**
+     * 查询项目投产列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectProduct:product:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BmProjectProduct bmProjectProduct)
+    {
+        startPage();
+        List<BmProjectProduct> list = bmProjectProductService.selectBmProjectProductList(bmProjectProduct);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目投产列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectProduct:product:export')")
+    @Log(title = "项目投产", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(BmProjectProduct bmProjectProduct)
+    {
+        List<BmProjectProduct> list = bmProjectProductService.selectBmProjectProductList(bmProjectProduct);
+        ExcelUtil<BmProjectProduct> util = new ExcelUtil<BmProjectProduct>(BmProjectProduct.class);
+        return util.exportExcel(list, "product");
+    }
+
+    /**
+     * 获取项目投产详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('projectProduct:product:query')")
+    @GetMapping(value = "/{bmProjectId}")
+    public AjaxResult getInfo(@PathVariable("bmProjectId") Long id)
+    {
+        return AjaxResult.success(bmProjectProductService.selectBmProjectProductById(id));
+    }
+
+    /**
+     * 新增项目投产
+     */
+    @PreAuthorize("@ss.hasPermi('projectProduct:product:add')")
+    @Log(title = "项目投产", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BmProjectProduct bmProjectProduct)
+    {
+        return toAjax(bmProjectProductService.insertBmProjectProduct(bmProjectProduct));
+    }
+
+    /**
+     * 修改项目投产
+     */
+    @PreAuthorize("@ss.hasPermi('projectProduct:product:edit')")
+    @Log(title = "项目投产", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BmProjectProduct bmProjectProduct)
+    {
+        return toAjax(bmProjectProductService.updateBmProjectProduct(bmProjectProduct));
+    }
+
+    /**
+     * 删除项目投产
+     */
+    @PreAuthorize("@ss.hasPermi('projectProduct:product:remove')")
+    @Log(title = "项目投产", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bmProjectProductService.deleteBmProjectProductByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectReferralController.java

@@ -37,7 +37,7 @@ public class BmProjectReferralController extends BaseController
     /**
      * 查询项目引荐列表
      */
-    //@PreAuthorize("@ss.hasPermi('projectReferral:referral:list')")
+    @PreAuthorize("@ss.hasPermi('projectReferral:referral:list')")
     @GetMapping("/list")
     public TableDataInfo list(BmProjectReferral bmProjectReferral)
     {
@@ -49,7 +49,7 @@ public class BmProjectReferralController extends BaseController
     /**
      * 导出项目引荐列表
      */
-    //@PreAuthorize("@ss.hasPermi('projectReferral:referral:export')")
+    @PreAuthorize("@ss.hasPermi('projectReferral:referral:export')")
     @Log(title = "项目引荐", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(BmProjectReferral bmProjectReferral)
@@ -62,7 +62,7 @@ public class BmProjectReferralController extends BaseController
     /**
      * 获取项目引荐详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('projectReferral:referral:query')")
+    @PreAuthorize("@ss.hasPermi('projectReferral:referral:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,7 +72,7 @@ public class BmProjectReferralController extends BaseController
     /**
      * 新增项目引荐
      */
-    //@PreAuthorize("@ss.hasPermi('projectReferral:referral:add')")
+    @PreAuthorize("@ss.hasPermi('projectReferral:referral:add')")
     @Log(title = "项目引荐", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BmProjectReferral bmProjectReferral)
@@ -83,7 +83,7 @@ public class BmProjectReferralController extends BaseController
     /**
      * 修改项目引荐
      */
-    //@PreAuthorize("@ss.hasPermi('projectReferral:referral:edit')")
+    @PreAuthorize("@ss.hasPermi('projectReferral:referral:edit')")
     @Log(title = "项目引荐", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BmProjectReferral bmProjectReferral)
@@ -94,7 +94,7 @@ public class BmProjectReferralController extends BaseController
     /**
      * 删除项目引荐
      */
-    //@PreAuthorize("@ss.hasPermi('projectReferral:referral:remove')")
+    @PreAuthorize("@ss.hasPermi('projectReferral:referral:remove')")
     @Log(title = "项目引荐", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmConstructionEq.java

@@ -0,0 +1,99 @@
+package com.ruoyi.system.domain.project;
+
+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;
+
+/**
+ * 项目设备安装
+(最少一条记录)对象 bm_construction_eq
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public class BmConstructionEq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目安装id* */
+    private Long id;
+
+    /** 项目id* */
+    @Excel(name = "项目id*")
+    private Long bmProjectId;
+
+    /** 进度(数据字典：1合同、2进场、3安装、4完工)* */
+    @Excel(name = "进度(数据字典：合同、进场、安装、完工)*")
+    private String eqType;
+
+    /**
+     * 进度
+     */
+    private String eqTypeName;
+
+    /** 照片* */
+    @Excel(name = "照片*")
+    private String photo;
+
+    public String getEqTypeName() {
+        return eqTypeName;
+    }
+
+    public void setEqTypeName(String eqTypeName) {
+        this.eqTypeName = eqTypeName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setBmProjectId(Long bmProjectId) 
+    {
+        this.bmProjectId = bmProjectId;
+    }
+
+    public Long getBmProjectId() 
+    {
+        return bmProjectId;
+    }
+
+    public void setEqType(String eqType) 
+    {
+        this.eqType = eqType;
+    }
+
+    public String getEqType() 
+    {
+        return eqType;
+    }
+    public void setPhoto(String photo) 
+    {
+        this.photo = photo;
+    }
+
+    public String getPhoto() 
+    {
+        return photo;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("bmProjectId", getBmProjectId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("eqType", getEqType())
+            .append("photo", getPhoto())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmConstructionPay.java

@@ -0,0 +1,112 @@
+package com.ruoyi.system.domain.project;
+
+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;
+import org.apache.poi.hpsf.Decimal;
+
+import java.math.BigDecimal;
+
+/**
+ * 项目到资
+(最少一条记录、合计、回写项目单)对象 bm_construction_pay
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public class BmConstructionPay extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目施工id* */
+    private Long id;
+
+    /** 项目id* */
+    @Excel(name = "项目id*")
+    private Long bmProjectId;
+
+
+    /** 进度(数据字典：土地款、租金、设备、工程款、其他)* */
+    @Excel(name = "进度(数据字典：土地款、租金、设备、工程款、其他)*")
+    private String payForType;
+    /**
+     * 进度
+     */
+    private String payForTypeName;
+
+    /**
+     * 到资金额(万)
+     */
+    private BigDecimal payForMoney;
+
+    /** 照片* */
+    @Excel(name = "照片*")
+    private String photo;
+
+    public String getPayForTypeName() {
+        return payForTypeName;
+    }
+
+    public void setPayForTypeName(String payForTypeName) {
+        this.payForTypeName = payForTypeName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setBmProjectId(Long bmProjectId) 
+    {
+        this.bmProjectId = bmProjectId;
+    }
+
+    public Long getBmProjectId() 
+    {
+        return bmProjectId;
+    }
+
+    public String getPayForType() {
+        return payForType;
+    }
+
+    public void setPayForType(String payForType) {
+        this.payForType = payForType;
+    }
+
+
+    public BigDecimal getPayForMoney() {
+        return payForMoney;
+    }
+
+    public void setPayForMoney(BigDecimal payForMoney) {
+        this.payForMoney = payForMoney;
+    }
+
+    public void setPhoto(String photo)
+    {
+        this.photo = photo;
+    }
+
+    public String getPhoto() 
+    {
+        return photo;
+    }
+
+    @Override
+    public String toString() {
+        return "BmConstructionPay{" +
+                "id=" + id +
+                ", bmProjectId=" + bmProjectId +
+                ", payForType='" + payForType + '\'' +
+                ", payForTypeName='" + payForTypeName + '\'' +
+                ", payForMoney=" + payForMoney +
+                ", photo='" + photo + '\'' +
+                '}';
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmConstructionPayInfo.java

@@ -0,0 +1,89 @@
+package com.ruoyi.system.domain.project;
+
+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;
+
+/**
+ * 项目入统对象 bm_construction_payinfo
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public class BmConstructionPayInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目施工id* */
+    private Long id;
+
+    /** 项目id* */
+    @Excel(name = "项目id*")
+    private Long bmProjectId;
+
+
+    /** 入统时间* */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "入统时间*", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date statisticsDate;
+
+    /** 入统截图* */
+    @Excel(name = "入统截图*")
+    private String statisticsPhoto;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setBmProjectId(Long bmProjectId) 
+    {
+        this.bmProjectId = bmProjectId;
+    }
+
+    public Long getBmProjectId() 
+    {
+        return bmProjectId;
+    }
+
+    public void setStatisticsDate(Date statisticsDate) 
+    {
+        this.statisticsDate = statisticsDate;
+    }
+
+    public Date getStatisticsDate() 
+    {
+        return statisticsDate;
+    }
+    public void setStatisticsPhoto(String statisticsPhoto) 
+    {
+        this.statisticsPhoto = statisticsPhoto;
+    }
+
+    public String getStatisticsPhoto() 
+    {
+        return statisticsPhoto;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("bmProjectId", getBmProjectId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("statisticsDate", getStatisticsDate())
+            .append("statisticsPhoto", getStatisticsPhoto())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmConstructionRate.java

@@ -0,0 +1,97 @@
+package com.ruoyi.system.domain.project;
+
+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;
+
+/**
+ * 项目施工进度对象 bm_construction_rate
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public class BmConstructionRate extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id* */
+    private Long id;
+
+    /** 项目id* */
+    @Excel(name = "项目id*")
+    private Long bmProjectId;
+
+
+    /** 进度(数据字典：奠基、基础工程出土面、主体工程完工、土建竣工)* */
+    @Excel(name = "进度(数据字典：奠基、基础工程出土面、主体工程完工、土建竣工)*")
+    private String rateType;
+
+    /** 进度(数据字典：奠基、基础工程出土面、主体工程完工、土建竣工)* */
+    private String rateTypeName;
+
+    /** 照片* */
+    @Excel(name = "照片*")
+    private String photo;
+
+    public String getRateTypeName() {
+        return rateTypeName;
+    }
+
+    public void setRateTypeName(String rateTypeName) {
+        this.rateTypeName = rateTypeName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setBmProjectId(Long bmProjectId) 
+    {
+        this.bmProjectId = bmProjectId;
+    }
+
+    public Long getBmProjectId() 
+    {
+        return bmProjectId;
+    }
+
+    public void setRateType(String rateType) 
+    {
+        this.rateType = rateType;
+    }
+
+    public String getRateType() 
+    {
+        return rateType;
+    }
+    public void setPhoto(String photo) 
+    {
+        this.photo = photo;
+    }
+
+    public String getPhoto() 
+    {
+        return photo;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("bmProjectId", getBmProjectId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("rateType", getRateType())
+            .append("photo", getPhoto())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmDeptPlan.java

@@ -0,0 +1,129 @@
+package com.ruoyi.system.domain.project;
+
+import java.math.BigDecimal;
+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;
+
+/**
+ *  部门招商计划对象 bm_dept_plany
+ * 
+ * @author ruoyi
+ * @date 2021-03-09
+ */
+public class BmDeptPlan extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id* */
+    private Long id;
+
+    /** 年度(数据字典 2016年、2017年等) */
+    @Excel(name = "年度(数据字典 2016年、2017年等)")
+    private String year;
+
+    /** 计划 */
+    @Excel(name = "计划")
+    private Long plan;
+
+    /** 目标签约数 */
+    @Excel(name = "目标签约数")
+    private Long targetSigningNum;
+
+    /** 目标合同金额 */
+    @Excel(name = "目标合同金额")
+    private BigDecimal targetContractAmount;
+
+    /** 目标到资金额 */
+    @Excel(name = "目标到资金额")
+    private BigDecimal targetArrivalAmount;
+
+    /** 目标投产项目数 */
+    @Excel(name = "目标投产项目数")
+    private Long targetInvestmentNum;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setYear(String year) 
+    {
+        this.year = year;
+    }
+
+    public String getYear() 
+    {
+        return year;
+    }
+    public void setPlan(Long plan) 
+    {
+        this.plan = plan;
+    }
+
+    public Long getPlan() 
+    {
+        return plan;
+    }
+    public void setTargetSigningNum(Long targetSigningNum) 
+    {
+        this.targetSigningNum = targetSigningNum;
+    }
+
+    public Long getTargetSigningNum() 
+    {
+        return targetSigningNum;
+    }
+    public void setTargetContractAmount(BigDecimal targetContractAmount) 
+    {
+        this.targetContractAmount = targetContractAmount;
+    }
+
+    public BigDecimal getTargetContractAmount() 
+    {
+        return targetContractAmount;
+    }
+    public void setTargetArrivalAmount(BigDecimal targetArrivalAmount) 
+    {
+        this.targetArrivalAmount = targetArrivalAmount;
+    }
+
+    public BigDecimal getTargetArrivalAmount() 
+    {
+        return targetArrivalAmount;
+    }
+    public void setTargetInvestmentNum(Long targetInvestmentNum) 
+    {
+        this.targetInvestmentNum = targetInvestmentNum;
+    }
+
+    public Long getTargetInvestmentNum() 
+    {
+        return targetInvestmentNum;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("sysDeptId", getSysDeptId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("year", getYear())
+            .append("plan", getPlan())
+            .append("targetSigningNum", getTargetSigningNum())
+            .append("targetContractAmount", getTargetContractAmount())
+            .append("targetArrivalAmount", getTargetArrivalAmount())
+            .append("targetInvestmentNum", getTargetInvestmentNum())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmProjectProduct.java

@@ -0,0 +1,146 @@
+package com.ruoyi.system.domain.project;
+
+import java.math.BigDecimal;
+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;
+
+/**
+ * 项目投产对象 bm_project_product
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public class BmProjectProduct extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目投产id* */
+    private Long id;
+
+    /** 项目id* */
+    @Excel(name = "项目id*")
+    private Long bmProjectId;
+
+    /** 已完成投资额 */
+    @Excel(name = "已完成投资额")
+    private BigDecimal totInvestment;
+
+    /** 设备投资额度 */
+    @Excel(name = "设备投资额度")
+    private BigDecimal macInvestment;
+
+    /** 投产时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "投产时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date productDate;
+
+    /** 投产图片 */
+    @Excel(name = "投产图片")
+    private String productPhoto;
+
+    /** 项目入规(限) */
+    @Excel(name = "项目入规(限)")
+    private String isOk;
+
+    /** 项目入规时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "项目入规时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date okDate;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setBmProjectId(Long bmProjectId) 
+    {
+        this.bmProjectId = bmProjectId;
+    }
+
+    public Long getBmProjectId() 
+    {
+        return bmProjectId;
+    }
+
+    public void setTotInvestment(BigDecimal totInvestment) 
+    {
+        this.totInvestment = totInvestment;
+    }
+
+    public BigDecimal getTotInvestment() 
+    {
+        return totInvestment;
+    }
+    public void setMacInvestment(BigDecimal macInvestment) 
+    {
+        this.macInvestment = macInvestment;
+    }
+
+    public BigDecimal getMacInvestment() 
+    {
+        return macInvestment;
+    }
+    public void setProductDate(Date productDate) 
+    {
+        this.productDate = productDate;
+    }
+
+    public Date getProductDate() 
+    {
+        return productDate;
+    }
+    public void setProductPhoto(String productPhoto) 
+    {
+        this.productPhoto = productPhoto;
+    }
+
+    public String getProductPhoto() 
+    {
+        return productPhoto;
+    }
+    public void setIsOk(String isOk) 
+    {
+        this.isOk = isOk;
+    }
+
+    public String getIsOk() 
+    {
+        return isOk;
+    }
+    public void setOkDate(Date okDate) 
+    {
+        this.okDate = okDate;
+    }
+
+    public Date getOkDate() 
+    {
+        return okDate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("bmProjectId", getBmProjectId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("totInvestment", getTotInvestment())
+            .append("macInvestment", getMacInvestment())
+            .append("productDate", getProductDate())
+            .append("productPhoto", getProductPhoto())
+            .append("isOk", getIsOk())
+            .append("okDate", getOkDate())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmProjectStatus.java

@@ -15,7 +15,7 @@ public class BmProjectStatus {
     private Long code;
 
     /** 项目id* */
-    private Long projectId;
+    private Long bmProjectId;
 
     public Long getCode() {
         return code;
@@ -25,11 +25,11 @@ public class BmProjectStatus {
         this.code = code;
     }
 
-    public Long getProjectId() {
-        return projectId;
+    public Long getBmProjectId() {
+        return bmProjectId;
     }
 
-    public void setProjectId(Long projectId) {
-        this.projectId = projectId;
+    public void setBmProjectId(Long bmProjectId) {
+        this.bmProjectId = bmProjectId;
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/project/BmConstructionEqMapper.java

@@ -0,0 +1,76 @@
+package com.ruoyi.system.mapper.project;
+
+import com.ruoyi.system.domain.project.BmConstructionEq;
+
+import java.util.List;
+
+/**
+ * 项目设备安装
+(最少一条记录)Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public interface BmConstructionEqMapper 
+{
+    /**
+     * 查询项目设备安装
+(最少一条记录)
+     * 
+     * @param id 项目设备安装
+(最少一条记录)ID
+     * @return 项目设备安装
+(最少一条记录)
+     */
+    public BmConstructionEq selectBmConstructionEqById(Long id);
+
+    /**
+     * 查询项目设备安装
+(最少一条记录)列表
+     * 
+     * @param bmConstructionEq 项目设备安装
+(最少一条记录)
+     * @return 项目设备安装
+(最少一条记录)集合
+     */
+    public List<BmConstructionEq> selectBmConstructionEqList(BmConstructionEq bmConstructionEq);
+
+    /**
+     * 新增项目设备安装
+(最少一条记录)
+     * 
+     * @param bmConstructionEq 项目设备安装
+(最少一条记录)
+     * @return 结果
+     */
+    public int insertBmConstructionEq(BmConstructionEq bmConstructionEq);
+
+    /**
+     * 修改项目设备安装
+(最少一条记录)
+     * 
+     * @param bmConstructionEq 项目设备安装
+(最少一条记录)
+     * @return 结果
+     */
+    public int updateBmConstructionEq(BmConstructionEq bmConstructionEq);
+
+    /**
+     * 删除项目设备安装
+(最少一条记录)
+     * 
+     * @param id 项目设备安装
+(最少一条记录)ID
+     * @return 结果
+     */
+    public int deleteBmConstructionEqById(Long id);
+
+    /**
+     * 批量删除项目设备安装
+(最少一条记录)
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBmConstructionEqByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/project/BmConstructionPayInfoMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper.project;
+
+import com.ruoyi.system.domain.project.BmConstructionPayInfo;
+
+import java.util.List;
+
+/**
+ * 项目入统Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public interface BmConstructionPayInfoMapper 
+{
+    /**
+     * 查询项目入统
+     * 
+     * @param id 项目入统ID
+     * @return 项目入统
+     */
+    public BmConstructionPayInfo selectBmConstructionPayInfoById(Long id);
+
+    /**
+     * 查询项目入统列表
+     * 
+     * @param bmConstructionPayInfo 项目入统
+     * @return 项目入统集合
+     */
+    public List<BmConstructionPayInfo> selectBmConstructionPayInfoList(BmConstructionPayInfo bmConstructionPayInfo);
+
+    /**
+     * 新增项目入统
+     * 
+     * @param bmConstructionPayInfo 项目入统
+     * @return 结果
+     */
+    public int insertBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo);
+
+    /**
+     * 修改项目入统
+     * 
+     * @param bmConstructionPayInfo 项目入统
+     * @return 结果
+     */
+    public int updateBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo);
+
+    /**
+     * 删除项目入统
+     * 
+     * @param id 项目入统ID
+     * @return 结果
+     */
+    public int deleteBmConstructionPayInfoById(Long id);
+
+    /**
+     * 批量删除项目入统
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBmConstructionPayInfoByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/project/BmConstructionPayMapper.java

@@ -0,0 +1,76 @@
+package com.ruoyi.system.mapper.project;
+
+import com.ruoyi.system.domain.project.BmConstructionPay;
+
+import java.util.List;
+
+/**
+ * 项目到资
+(最少一条记录、合计、回写项目单)Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public interface BmConstructionPayMapper 
+{
+    /**
+     * 查询项目到资
+(最少一条记录、合计、回写项目单)
+     * 
+     * @param id 项目到资
+(最少一条记录、合计、回写项目单)ID
+     * @return 项目到资
+(最少一条记录、合计、回写项目单)
+     */
+    public BmConstructionPay selectBmConstructionPayById(Long id);
+
+    /**
+     * 查询项目到资
+(最少一条记录、合计、回写项目单)列表
+     * 
+     * @param bmConstructionPay 项目到资
+(最少一条记录、合计、回写项目单)
+     * @return 项目到资
+(最少一条记录、合计、回写项目单)集合
+     */
+    public List<BmConstructionPay> selectBmConstructionPayList(BmConstructionPay bmConstructionPay);
+
+    /**
+     * 新增项目到资
+(最少一条记录、合计、回写项目单)
+     * 
+     * @param bmConstructionPay 项目到资
+(最少一条记录、合计、回写项目单)
+     * @return 结果
+     */
+    public int insertBmConstructionPay(BmConstructionPay bmConstructionPay);
+
+    /**
+     * 修改项目到资
+(最少一条记录、合计、回写项目单)
+     * 
+     * @param bmConstructionPay 项目到资
+(最少一条记录、合计、回写项目单)
+     * @return 结果
+     */
+    public int updateBmConstructionPay(BmConstructionPay bmConstructionPay);
+
+    /**
+     * 删除项目到资
+(最少一条记录、合计、回写项目单)
+     * 
+     * @param id 项目到资
+(最少一条记录、合计、回写项目单)ID
+     * @return 结果
+     */
+    public int deleteBmConstructionPayById(Long id);
+
+    /**
+     * 批量删除项目到资
+(最少一条记录、合计、回写项目单)
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBmConstructionPayByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/project/BmConstructionRateMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper.project;
+
+import com.ruoyi.system.domain.project.BmConstructionRate;
+
+import java.util.List;
+
+/**
+ * 项目施工进度Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public interface BmConstructionRateMapper 
+{
+    /**
+     * 查询项目施工进度
+     * 
+     * @param id 项目施工进度ID
+     * @return 项目施工进度
+     */
+    public BmConstructionRate selectBmConstructionRateById(Long id);
+
+    /**
+     * 查询项目施工进度列表
+     * 
+     * @param bmConstructionRate 项目施工进度
+     * @return 项目施工进度集合
+     */
+    public List<BmConstructionRate> selectBmConstructionRateList(BmConstructionRate bmConstructionRate);
+
+    /**
+     * 新增项目施工进度
+     * 
+     * @param bmConstructionRate 项目施工进度
+     * @return 结果
+     */
+    public int insertBmConstructionRate(BmConstructionRate bmConstructionRate);
+
+    /**
+     * 修改项目施工进度
+     * 
+     * @param bmConstructionRate 项目施工进度
+     * @return 结果
+     */
+    public int updateBmConstructionRate(BmConstructionRate bmConstructionRate);
+
+    /**
+     * 删除项目施工进度
+     * 
+     * @param id 项目施工进度ID
+     * @return 结果
+     */
+    public int deleteBmConstructionRateById(Long id);
+
+    /**
+     * 批量删除项目施工进度
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBmConstructionRateByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/project/BmDeptPlanMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper.project;
+
+import com.ruoyi.system.domain.project.BmDeptPlan;
+
+import java.util.List;
+
+
+/**
+ *  部门招商计划Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-09
+ */
+public interface BmDeptPlanMapper
+{
+    /**
+     * 查询 部门招商计划
+     * 
+     * @param id  部门招商计划ID
+     * @return  部门招商计划
+     */
+    public BmDeptPlan selectBmDeptPlanById(Long id);
+
+    /**
+     * 查询 部门招商计划列表
+     * 
+     * @param bmDeptPlan  部门招商计划
+     * @return  部门招商计划集合
+     */
+    public List<BmDeptPlan> selectBmDeptPlanList(BmDeptPlan bmDeptPlan);
+
+    /**
+     * 新增 部门招商计划
+     * 
+     * @param bmDeptPlan  部门招商计划
+     * @return 结果
+     */
+    public int insertBmDeptPlan(BmDeptPlan bmDeptPlan);
+
+    /**
+     * 修改 部门招商计划
+     * 
+     * @param bmDeptPlan  部门招商计划
+     * @return 结果
+     */
+    public int updateBmDeptPlan(BmDeptPlan bmDeptPlan);
+
+    /**
+     * 删除 部门招商计划
+     * 
+     * @param id  部门招商计划ID
+     * @return 结果
+     */
+    public int deleteBmDeptPlanById(Long id);
+
+    /**
+     * 批量删除 部门招商计划
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBmDeptPlanByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/project/BmProjectMapper.java

@@ -29,6 +29,13 @@ public interface BmProjectMapper
      */
     public List<BmProject> selectBmProjectList(BmProject bmProject);
 
+    /**
+     * 首页查询待审核列表
+     * @param bmProject
+     * @return
+     */
+    public List<BmProject> selectToBeReviewedList(BmProject bmProject);
+
     /**
      * 新增项目(添加线索)
      * 

ruoyi-system/src/main/java/com/ruoyi/system/mapper/project/BmProjectProductMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper.project;
+
+import com.ruoyi.system.domain.project.BmProjectProduct;
+
+import java.util.List;
+
+/**
+ * 项目投产Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public interface BmProjectProductMapper 
+{
+    /**
+     * 查询项目投产
+     * 
+     * @param id 项目投产ID
+     * @return 项目投产
+     */
+    public BmProjectProduct selectBmProjectProductById(Long id);
+
+    /**
+     * 查询项目投产列表
+     * 
+     * @param bmProjectProduct 项目投产
+     * @return 项目投产集合
+     */
+    public List<BmProjectProduct> selectBmProjectProductList(BmProjectProduct bmProjectProduct);
+
+    /**
+     * 新增项目投产
+     * 
+     * @param bmProjectProduct 项目投产
+     * @return 结果
+     */
+    public int insertBmProjectProduct(BmProjectProduct bmProjectProduct);
+
+    /**
+     * 修改项目投产
+     * 
+     * @param bmProjectProduct 项目投产
+     * @return 结果
+     */
+    public int updateBmProjectProduct(BmProjectProduct bmProjectProduct);
+
+    /**
+     * 删除项目投产
+     * 
+     * @param id 项目投产ID
+     * @return 结果
+     */
+    public int deleteBmProjectProductById(Long id);
+
+    /**
+     * 批量删除项目投产
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBmProjectProductByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmConstructionEqServiceImpl.java

@@ -0,0 +1,114 @@
+package com.ruoyi.system.service.impl.project;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.project.BmConstructionEq;
+import com.ruoyi.system.mapper.project.BmConstructionEqMapper;
+import com.ruoyi.system.service.project.IBmConstructionEqService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目设备安装
+(最少一条记录)Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+@Service
+public class BmConstructionEqServiceImpl implements IBmConstructionEqService
+{
+    @Autowired
+    private BmConstructionEqMapper bmConstructionEqMapper;
+
+    /**
+     * 查询项目设备安装
+(最少一条记录)
+     * 
+     * @param id 项目设备安装
+(最少一条记录)ID
+     * @return 项目设备安装
+(最少一条记录)
+     */
+    @Override
+    public BmConstructionEq selectBmConstructionEqById(Long id)
+    {
+        return bmConstructionEqMapper.selectBmConstructionEqById(id);
+    }
+
+    /**
+     * 查询项目设备安装
+(最少一条记录)列表
+     * 
+     * @param bmConstructionEq 项目设备安装
+(最少一条记录)
+     * @return 项目设备安装
+(最少一条记录)
+     */
+    @Override
+    public List<BmConstructionEq> selectBmConstructionEqList(BmConstructionEq bmConstructionEq)
+    {
+        return bmConstructionEqMapper.selectBmConstructionEqList(bmConstructionEq);
+    }
+
+    /**
+     * 新增项目设备安装
+(最少一条记录)
+     * 
+     * @param bmConstructionEq 项目设备安装
+(最少一条记录)
+     * @return 结果
+     */
+    @Override
+    public int insertBmConstructionEq(BmConstructionEq bmConstructionEq)
+    {
+        bmConstructionEq.setCreateTime(DateUtils.getNowDate());
+        bmConstructionEq.setCreateBy(SecurityUtils.getUsername());
+        return bmConstructionEqMapper.insertBmConstructionEq(bmConstructionEq);
+    }
+
+    /**
+     * 修改项目设备安装
+(最少一条记录)
+     * 
+     * @param bmConstructionEq 项目设备安装
+(最少一条记录)
+     * @return 结果
+     */
+    @Override
+    public int updateBmConstructionEq(BmConstructionEq bmConstructionEq)
+    {
+        bmConstructionEq.setUpdateTime(DateUtils.getNowDate());
+        bmConstructionEq.setUpdateBy(SecurityUtils.getUsername());
+        return bmConstructionEqMapper.updateBmConstructionEq(bmConstructionEq);
+    }
+
+    /**
+     * 批量删除项目设备安装
+(最少一条记录)
+     * 
+     * @param ids 需要删除的项目设备安装
+(最少一条记录)ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmConstructionEqByIds(Long[] ids)
+    {
+        return bmConstructionEqMapper.deleteBmConstructionEqByIds(ids);
+    }
+
+    /**
+     * 删除项目设备安装
+(最少一条记录)信息
+     * 
+     * @param id 项目设备安装
+(最少一条记录)ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmConstructionEqById(Long id)
+    {
+        return bmConstructionEqMapper.deleteBmConstructionEqById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmConstructionPayInfoServiceImpl.java

@@ -0,0 +1,100 @@
+package com.ruoyi.system.service.impl.project;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.project.BmConstructionPayInfo;
+import com.ruoyi.system.mapper.project.BmConstructionPayInfoMapper;
+import com.ruoyi.system.service.project.IBmConstructionPayInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目入统Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+@Service
+public class BmConstructionPayInfoServiceImpl implements IBmConstructionPayInfoService
+{
+    @Autowired
+    private BmConstructionPayInfoMapper bmConstructionPayInfoMapper;
+
+    /**
+     * 查询项目入统
+     * 
+     * @param id 项目入统ID
+     * @return 项目入统
+     */
+    @Override
+    public BmConstructionPayInfo selectBmConstructionPayInfoById(Long id)
+    {
+        return bmConstructionPayInfoMapper.selectBmConstructionPayInfoById(id);
+    }
+
+    /**
+     * 查询项目入统列表
+     * 
+     * @param bmConstructionPayInfo 项目入统
+     * @return 项目入统
+     */
+    @Override
+    public List<BmConstructionPayInfo> selectBmConstructionPayInfoList(BmConstructionPayInfo bmConstructionPayInfo)
+    {
+        return bmConstructionPayInfoMapper.selectBmConstructionPayInfoList(bmConstructionPayInfo);
+    }
+
+    /**
+     * 新增项目入统
+     * 
+     * @param bmConstructionPayInfo 项目入统
+     * @return 结果
+     */
+    @Override
+    public int insertBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo)
+    {
+        bmConstructionPayInfo.setCreateTime(DateUtils.getNowDate());
+        bmConstructionPayInfo.setCreateBy(SecurityUtils.getUsername());
+
+        return bmConstructionPayInfoMapper.insertBmConstructionPayInfo(bmConstructionPayInfo);
+    }
+
+    /**
+     * 修改项目入统
+     * 
+     * @param bmConstructionPayInfo 项目入统
+     * @return 结果
+     */
+    @Override
+    public int updateBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo)
+    {
+        bmConstructionPayInfo.setUpdateTime(DateUtils.getNowDate());
+        bmConstructionPayInfo.setUpdateBy(SecurityUtils.getUsername());
+        return bmConstructionPayInfoMapper.updateBmConstructionPayInfo(bmConstructionPayInfo);
+    }
+
+    /**
+     * 批量删除项目入统
+     * 
+     * @param ids 需要删除的项目入统ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmConstructionPayInfoByIds(Long[] ids)
+    {
+        return bmConstructionPayInfoMapper.deleteBmConstructionPayInfoByIds(ids);
+    }
+
+    /**
+     * 删除项目入统信息
+     * 
+     * @param id 项目入统ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmConstructionPayInfoById(Long id)
+    {
+        return bmConstructionPayInfoMapper.deleteBmConstructionPayInfoById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmConstructionPayServiceImpl.java

@@ -0,0 +1,114 @@
+package com.ruoyi.system.service.impl.project;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.project.BmConstructionPay;
+import com.ruoyi.system.mapper.project.BmConstructionPayMapper;
+import com.ruoyi.system.service.project.IBmConstructionPayService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目到资
+(最少一条记录、合计、回写项目单)Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+@Service
+public class BmConstructionPayServiceImpl implements IBmConstructionPayService
+{
+    @Autowired
+    private BmConstructionPayMapper bmConstructionPayMapper;
+
+    /**
+     * 查询项目到资
+(最少一条记录、合计、回写项目单)
+     * 
+     * @param id 项目到资
+(最少一条记录、合计、回写项目单)ID
+     * @return 项目到资
+(最少一条记录、合计、回写项目单)
+     */
+    @Override
+    public BmConstructionPay selectBmConstructionPayById(Long id)
+    {
+        return bmConstructionPayMapper.selectBmConstructionPayById(id);
+    }
+
+    /**
+     * 查询项目到资
+(最少一条记录、合计、回写项目单)列表
+     * 
+     * @param bmConstructionPay 项目到资
+(最少一条记录、合计、回写项目单)
+     * @return 项目到资
+(最少一条记录、合计、回写项目单)
+     */
+    @Override
+    public List<BmConstructionPay> selectBmConstructionPayList(BmConstructionPay bmConstructionPay)
+    {
+        return bmConstructionPayMapper.selectBmConstructionPayList(bmConstructionPay);
+    }
+
+    /**
+     * 新增项目到资
+(最少一条记录、合计、回写项目单)
+     * 
+     * @param bmConstructionPay 项目到资
+(最少一条记录、合计、回写项目单)
+     * @return 结果
+     */
+    @Override
+    public int insertBmConstructionPay(BmConstructionPay bmConstructionPay)
+    {
+        bmConstructionPay.setCreateTime(DateUtils.getNowDate());
+        bmConstructionPay.setCreateBy(SecurityUtils.getUsername());
+        return bmConstructionPayMapper.insertBmConstructionPay(bmConstructionPay);
+    }
+
+    /**
+     * 修改项目到资
+(最少一条记录、合计、回写项目单)
+     * 
+     * @param bmConstructionPay 项目到资
+(最少一条记录、合计、回写项目单)
+     * @return 结果
+     */
+    @Override
+    public int updateBmConstructionPay(BmConstructionPay bmConstructionPay)
+    {
+        bmConstructionPay.setUpdateTime(DateUtils.getNowDate());
+        bmConstructionPay.setUpdateBy(SecurityUtils.getUsername());
+        return bmConstructionPayMapper.updateBmConstructionPay(bmConstructionPay);
+    }
+
+    /**
+     * 批量删除项目到资
+(最少一条记录、合计、回写项目单)
+     * 
+     * @param ids 需要删除的项目到资
+(最少一条记录、合计、回写项目单)ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmConstructionPayByIds(Long[] ids)
+    {
+        return bmConstructionPayMapper.deleteBmConstructionPayByIds(ids);
+    }
+
+    /**
+     * 删除项目到资
+(最少一条记录、合计、回写项目单)信息
+     * 
+     * @param id 项目到资
+(最少一条记录、合计、回写项目单)ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmConstructionPayById(Long id)
+    {
+        return bmConstructionPayMapper.deleteBmConstructionPayById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmConstructionRateServiceImpl.java

@@ -0,0 +1,100 @@
+package com.ruoyi.system.service.impl.project;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.project.BmConstructionRate;
+import com.ruoyi.system.mapper.project.BmConstructionRateMapper;
+import com.ruoyi.system.service.project.IBmConstructionRateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 项目施工进度Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+@Service
+public class BmConstructionRateServiceImpl implements IBmConstructionRateService
+{
+    @Autowired
+    private BmConstructionRateMapper bmConstructionRateMapper;
+
+    /**
+     * 查询项目施工进度
+     * 
+     * @param id 项目施工进度ID
+     * @return 项目施工进度
+     */
+    @Override
+    public BmConstructionRate selectBmConstructionRateById(Long id)
+    {
+        return bmConstructionRateMapper.selectBmConstructionRateById(id);
+    }
+
+    /**
+     * 查询项目施工进度列表
+     * 
+     * @param bmConstructionRate 项目施工进度
+     * @return 项目施工进度
+     */
+    @Override
+    public List<BmConstructionRate> selectBmConstructionRateList(BmConstructionRate bmConstructionRate)
+    {
+        return bmConstructionRateMapper.selectBmConstructionRateList(bmConstructionRate);
+    }
+
+    /**
+     * 新增项目施工进度
+     * 
+     * @param bmConstructionRate 项目施工进度
+     * @return 结果
+     */
+    @Override
+    public int insertBmConstructionRate(BmConstructionRate bmConstructionRate)
+    {
+        bmConstructionRate.setCreateTime(DateUtils.getNowDate());
+        bmConstructionRate.setCreateBy(SecurityUtils.getUsername());
+        return bmConstructionRateMapper.insertBmConstructionRate(bmConstructionRate);
+    }
+
+    /**
+     * 修改项目施工进度
+     * 
+     * @param bmConstructionRate 项目施工进度
+     * @return 结果
+     */
+    @Override
+    public int updateBmConstructionRate(BmConstructionRate bmConstructionRate)
+    {
+        bmConstructionRate.setUpdateTime(DateUtils.getNowDate());
+        bmConstructionRate.setUpdateBy(SecurityUtils.getUsername());
+        return bmConstructionRateMapper.updateBmConstructionRate(bmConstructionRate);
+    }
+
+    /**
+     * 批量删除项目施工进度
+     * 
+     * @param ids 需要删除的项目施工进度ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmConstructionRateByIds(Long[] ids)
+    {
+        return bmConstructionRateMapper.deleteBmConstructionRateByIds(ids);
+    }
+
+    /**
+     * 删除项目施工进度信息
+     * 
+     * @param id 项目施工进度ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmConstructionRateById(Long id)
+    {
+        return bmConstructionRateMapper.deleteBmConstructionRateById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmDeptPlanServiceImpl.java

@@ -0,0 +1,100 @@
+package com.ruoyi.system.service.impl.project;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.project.BmDeptPlan;
+import com.ruoyi.system.mapper.project.BmDeptPlanMapper;
+import com.ruoyi.system.service.project.IBmDeptPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ *  部门招商计划Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-03-09
+ */
+@Service
+public class BmDeptPlanServiceImpl implements IBmDeptPlanService
+{
+    @Autowired
+    private BmDeptPlanMapper bmDeptPlanMapper;
+
+    /**
+     * 查询 部门招商计划
+     * 
+     * @param id  部门招商计划ID
+     * @return  部门招商计划
+     */
+    @Override
+    public BmDeptPlan selectBmDeptPlanById(Long id)
+    {
+        return bmDeptPlanMapper.selectBmDeptPlanById(id);
+    }
+
+    /**
+     * 查询 部门招商计划列表
+     * 
+     * @param bmDeptPlan  部门招商计划
+     * @return  部门招商计划
+     */
+    @Override
+    public List<BmDeptPlan> selectBmDeptPlanList(BmDeptPlan bmDeptPlan)
+    {
+        return bmDeptPlanMapper.selectBmDeptPlanList(bmDeptPlan);
+    }
+
+    /**
+     * 新增 部门招商计划
+     * 
+     * @param bmDeptPlan  部门招商计划
+     * @return 结果
+     */
+    @Override
+    public int insertBmDeptPlan(BmDeptPlan bmDeptPlan)
+    {
+        bmDeptPlan.setCreateTime(DateUtils.getNowDate());
+        bmDeptPlan.setCreateBy(SecurityUtils.getUsername());
+        return bmDeptPlanMapper.insertBmDeptPlan(bmDeptPlan);
+    }
+
+    /**
+     * 修改 部门招商计划
+     * 
+     * @param bmDeptPlan  部门招商计划
+     * @return 结果
+     */
+    @Override
+    public int updateBmDeptPlan(BmDeptPlan bmDeptPlan)
+    {
+        bmDeptPlan.setUpdateTime(DateUtils.getNowDate());
+        bmDeptPlan.setUpdateBy(SecurityUtils.getUsername());
+        return bmDeptPlanMapper.updateBmDeptPlan(bmDeptPlan);
+    }
+
+    /**
+     * 批量删除 部门招商计划
+     * 
+     * @param ids 需要删除的 部门招商计划ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmDeptPlanByIds(Long[] ids)
+    {
+        return bmDeptPlanMapper.deleteBmDeptPlanByIds(ids);
+    }
+
+    /**
+     * 删除 部门招商计划信息
+     * 
+     * @param id  部门招商计划ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmDeptPlanById(Long id)
+    {
+        return bmDeptPlanMapper.deleteBmDeptPlanById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectConstructionServiceImpl.java

@@ -1,10 +1,12 @@
 package com.ruoyi.system.service.impl.project;
 
+import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.project.BmProject;
 import com.ruoyi.system.domain.project.BmProjectConstruction;
 import com.ruoyi.system.mapper.project.BmProjectConstructionMapper;
 import com.ruoyi.system.mapper.project.BmProjectMapper;
@@ -62,17 +64,24 @@ public class BmProjectConstructionServiceImpl implements IBmProjectConstructionS
     public AjaxResult insertBmProjectConstruction(BmProjectConstruction bmProjectConstruction)
     {
         bmProjectConstruction.setCreateTime(DateUtils.getNowDate());
-        //bmProjectConstruction.setCreateBy(SecurityUtils.getUsername());
+        bmProjectConstruction.setCreateBy(SecurityUtils.getUsername());
         //提取出合同约定开工时间/竣工时间
         Long bmProjectId = bmProjectConstruction.getBmProjectId();
         if (bmProjectId == null){
-            AjaxResult.error("缺少项目id");
+            return AjaxResult.error("缺少项目id");
+        }
+        Date orderBeginTime = bmProjectConstruction.getOrderBeginTime();
+        Date orderEndTime = bmProjectConstruction.getOrderEndTime();
+        BmProject bmProject = new BmProject();
+        bmProject.setId(bmProjectId);
+        if (orderBeginTime != null && orderEndTime != null){
+            bmProject.setOrderBeginTime(orderBeginTime);
+            bmProject.setOrderEndTime(orderEndTime);
+            bmProjectMapper.updateBmProject(bmProject);
         }
-
-
         int i = bmProjectConstructionMapper.insertBmProjectConstruction(bmProjectConstruction);
         if (i != 1){
-            AjaxResult.error("添加失败");
+            return AjaxResult.error("添加失败");
         }
         return AjaxResult.success();
     }
@@ -84,11 +93,29 @@ public class BmProjectConstructionServiceImpl implements IBmProjectConstructionS
      * @return 结果
      */
     @Override
-    public int updateBmProjectConstruction(BmProjectConstruction bmProjectConstruction)
+    public AjaxResult updateBmProjectConstruction(BmProjectConstruction bmProjectConstruction)
     {
         bmProjectConstruction.setUpdateTime(DateUtils.getNowDate());
-        //bmProjectConstruction.setUpdateBy(SecurityUtils.getUsername());
-        return bmProjectConstructionMapper.updateBmProjectConstruction(bmProjectConstruction);
+        bmProjectConstruction.setUpdateBy(SecurityUtils.getUsername());
+        //提取出合同约定开工时间/竣工时间
+        Long bmProjectId = bmProjectConstruction.getBmProjectId();
+        if (bmProjectId == null){
+            return AjaxResult.error("缺少项目id");
+        }
+        Date orderBeginTime = bmProjectConstruction.getOrderBeginTime();
+        Date orderEndTime = bmProjectConstruction.getOrderEndTime();
+        BmProject bmProject = new BmProject();
+        bmProject.setId(bmProjectId);
+        if (orderBeginTime != null && orderEndTime != null){
+            bmProject.setOrderBeginTime(orderBeginTime);
+            bmProject.setOrderEndTime(orderEndTime);
+            bmProjectMapper.updateBmProject(bmProject);
+        }
+        int i = bmProjectConstructionMapper.updateBmProjectConstruction(bmProjectConstruction);
+        if (i != 1){
+            return AjaxResult.error("更新失败");
+        }
+        return AjaxResult.success();
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectOrderinfoServiceImpl.java

@@ -55,7 +55,7 @@ public class BmProjectOrderinfoServiceImpl implements IBmProjectOrderinfoService
     public int insertBmProjectOrderinfo(BmProjectOrderinfo bmProjectOrderinfo)
     {
         bmProjectOrderinfo.setCreateTime(DateUtils.getNowDate());
-        //bmProjectOrderinfo.setCreateBy(SecurityUtils.getUsername());
+        bmProjectOrderinfo.setCreateBy(SecurityUtils.getUsername());
         return bmProjectOrderinfoMapper.insertBmProjectOrderinfo(bmProjectOrderinfo);
     }
 
@@ -69,7 +69,7 @@ public class BmProjectOrderinfoServiceImpl implements IBmProjectOrderinfoService
     public int updateBmProjectOrderinfo(BmProjectOrderinfo bmProjectOrderinfo)
     {
         bmProjectOrderinfo.setUpdateTime(DateUtils.getNowDate());
-        //bmProjectOrderinfo.setUpdateBy(SecurityUtils.getUsername());
+        bmProjectOrderinfo.setUpdateBy(SecurityUtils.getUsername());
         return bmProjectOrderinfoMapper.updateBmProjectOrderinfo(bmProjectOrderinfo);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectProductServiceImpl.java

@@ -0,0 +1,99 @@
+package com.ruoyi.system.service.impl.project;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.project.BmProjectProduct;
+import com.ruoyi.system.mapper.project.BmProjectProductMapper;
+import com.ruoyi.system.service.project.IBmProjectProductService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目投产Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+@Service
+public class BmProjectProductServiceImpl implements IBmProjectProductService
+{
+    @Autowired
+    private BmProjectProductMapper bmProjectProductMapper;
+
+    /**
+     * 查询项目投产
+     * 
+     * @param id 项目投产ID
+     * @return 项目投产
+     */
+    @Override
+    public BmProjectProduct selectBmProjectProductById(Long id)
+    {
+        return bmProjectProductMapper.selectBmProjectProductById(id);
+    }
+
+    /**
+     * 查询项目投产列表
+     * 
+     * @param bmProjectProduct 项目投产
+     * @return 项目投产
+     */
+    @Override
+    public List<BmProjectProduct> selectBmProjectProductList(BmProjectProduct bmProjectProduct)
+    {
+        return bmProjectProductMapper.selectBmProjectProductList(bmProjectProduct);
+    }
+
+    /**
+     * 新增项目投产
+     * 
+     * @param bmProjectProduct 项目投产
+     * @return 结果
+     */
+    @Override
+    public int insertBmProjectProduct(BmProjectProduct bmProjectProduct)
+    {
+        bmProjectProduct.setCreateTime(DateUtils.getNowDate());
+        bmProjectProduct.setCreateBy(SecurityUtils.getUsername());
+        return bmProjectProductMapper.insertBmProjectProduct(bmProjectProduct);
+    }
+
+    /**
+     * 修改项目投产
+     * 
+     * @param bmProjectProduct 项目投产
+     * @return 结果
+     */
+    @Override
+    public int updateBmProjectProduct(BmProjectProduct bmProjectProduct)
+    {
+        bmProjectProduct.setUpdateTime(DateUtils.getNowDate());
+        bmProjectProduct.setUpdateBy(SecurityUtils.getUsername());
+        return bmProjectProductMapper.updateBmProjectProduct(bmProjectProduct);
+    }
+
+    /**
+     * 批量删除项目投产
+     * 
+     * @param ids 需要删除的项目投产ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmProjectProductByIds(Long[] ids)
+    {
+        return bmProjectProductMapper.deleteBmProjectProductByIds(ids);
+    }
+
+    /**
+     * 删除项目投产信息
+     * 
+     * @param id 项目投产ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmProjectProductById(Long id)
+    {
+        return bmProjectProductMapper.deleteBmProjectProductById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectServiceImpl.java

@@ -117,14 +117,14 @@ public class BmProjectServiceImpl implements IBmProjectService {
     }
 
     /**
-     * 审核项目状态
+     * 审核项目状态(审核/提交/驳回项目)
      *
      * @param bmProjectStatus 审核请求对象
      * @return
      */
     @Override
     public AjaxResult examine(BmProjectStatus bmProjectStatus) {
-        Long projectId = bmProjectStatus.getProjectId();
+        Long projectId = bmProjectStatus.getBmProjectId();
         if (projectId == null) {
             return AjaxResult.error("项目id为NULL");
         }
@@ -155,4 +155,15 @@ public class BmProjectServiceImpl implements IBmProjectService {
         return AjaxResult.success();
 
     }
+
+    /**
+     * 首页查询待审核列表
+     * @param bmProject
+     * @return
+     */
+    @Override
+    public List<BmProject> selectToBeReviewedList(BmProject bmProject) {
+        List<BmProject> bmProjects = bmProjectMapper.selectToBeReviewedList(bmProject);
+        return bmProjects;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/project/IBmConstructionEqService.java

@@ -0,0 +1,77 @@
+package com.ruoyi.system.service.project;
+
+import com.ruoyi.system.domain.project.BmConstructionEq;
+
+import java.util.List;
+
+/**
+ * 项目设备安装
+(最少一条记录)Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public interface IBmConstructionEqService 
+{
+    /**
+     * 查询项目设备安装
+(最少一条记录)
+     * 
+     * @param id 项目设备安装
+(最少一条记录)ID
+     * @return 项目设备安装
+(最少一条记录)
+     */
+    public BmConstructionEq selectBmConstructionEqById(Long id);
+
+    /**
+     * 查询项目设备安装
+(最少一条记录)列表
+     * 
+     * @param bmConstructionEq 项目设备安装
+(最少一条记录)
+     * @return 项目设备安装
+(最少一条记录)集合
+     */
+    public List<BmConstructionEq> selectBmConstructionEqList(BmConstructionEq bmConstructionEq);
+
+    /**
+     * 新增项目设备安装
+(最少一条记录)
+     * 
+     * @param bmConstructionEq 项目设备安装
+(最少一条记录)
+     * @return 结果
+     */
+    public int insertBmConstructionEq(BmConstructionEq bmConstructionEq);
+
+    /**
+     * 修改项目设备安装
+(最少一条记录)
+     * 
+     * @param bmConstructionEq 项目设备安装
+(最少一条记录)
+     * @return 结果
+     */
+    public int updateBmConstructionEq(BmConstructionEq bmConstructionEq);
+
+    /**
+     * 批量删除项目设备安装
+(最少一条记录)
+     * 
+     * @param ids 需要删除的项目设备安装
+(最少一条记录)ID
+     * @return 结果
+     */
+    public int deleteBmConstructionEqByIds(Long[] ids);
+
+    /**
+     * 删除项目设备安装
+(最少一条记录)信息
+     * 
+     * @param id 项目设备安装
+(最少一条记录)ID
+     * @return 结果
+     */
+    public int deleteBmConstructionEqById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/project/IBmConstructionPayInfoService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.project;
+
+import com.ruoyi.system.domain.project.BmConstructionPayInfo;
+
+import java.util.List;
+
+/**
+ * 项目入统Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public interface IBmConstructionPayInfoService 
+{
+    /**
+     * 查询项目入统
+     * 
+     * @param id 项目入统ID
+     * @return 项目入统
+     */
+    public BmConstructionPayInfo selectBmConstructionPayInfoById(Long id);
+
+    /**
+     * 查询项目入统列表
+     * 
+     * @param bmConstructionPayInfo 项目入统
+     * @return 项目入统集合
+     */
+    public List<BmConstructionPayInfo> selectBmConstructionPayInfoList(BmConstructionPayInfo bmConstructionPayInfo);
+
+    /**
+     * 新增项目入统
+     * 
+     * @param bmConstructionPayInfo 项目入统
+     * @return 结果
+     */
+    public int insertBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo);
+
+    /**
+     * 修改项目入统
+     * 
+     * @param bmConstructionPayInfo 项目入统
+     * @return 结果
+     */
+    public int updateBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo);
+
+    /**
+     * 批量删除项目入统
+     * 
+     * @param ids 需要删除的项目入统ID
+     * @return 结果
+     */
+    public int deleteBmConstructionPayInfoByIds(Long[] ids);
+
+    /**
+     * 删除项目入统信息
+     * 
+     * @param id 项目入统ID
+     * @return 结果
+     */
+    public int deleteBmConstructionPayInfoById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/project/IBmConstructionPayService.java

@@ -0,0 +1,77 @@
+package com.ruoyi.system.service.project;
+
+import com.ruoyi.system.domain.project.BmConstructionPay;
+
+import java.util.List;
+
+/**
+ * 项目到资
+(最少一条记录、合计、回写项目单)Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public interface IBmConstructionPayService 
+{
+    /**
+     * 查询项目到资
+(最少一条记录、合计、回写项目单)
+     * 
+     * @param id 项目到资
+(最少一条记录、合计、回写项目单)ID
+     * @return 项目到资
+(最少一条记录、合计、回写项目单)
+     */
+    public BmConstructionPay selectBmConstructionPayById(Long id);
+
+    /**
+     * 查询项目到资
+(最少一条记录、合计、回写项目单)列表
+     * 
+     * @param bmConstructionPay 项目到资
+(最少一条记录、合计、回写项目单)
+     * @return 项目到资
+(最少一条记录、合计、回写项目单)集合
+     */
+    public List<BmConstructionPay> selectBmConstructionPayList(BmConstructionPay bmConstructionPay);
+
+    /**
+     * 新增项目到资
+(最少一条记录、合计、回写项目单)
+     * 
+     * @param bmConstructionPay 项目到资
+(最少一条记录、合计、回写项目单)
+     * @return 结果
+     */
+    public int insertBmConstructionPay(BmConstructionPay bmConstructionPay);
+
+    /**
+     * 修改项目到资
+(最少一条记录、合计、回写项目单)
+     * 
+     * @param bmConstructionPay 项目到资
+(最少一条记录、合计、回写项目单)
+     * @return 结果
+     */
+    public int updateBmConstructionPay(BmConstructionPay bmConstructionPay);
+
+    /**
+     * 批量删除项目到资
+(最少一条记录、合计、回写项目单)
+     * 
+     * @param ids 需要删除的项目到资
+(最少一条记录、合计、回写项目单)ID
+     * @return 结果
+     */
+    public int deleteBmConstructionPayByIds(Long[] ids);
+
+    /**
+     * 删除项目到资
+(最少一条记录、合计、回写项目单)信息
+     * 
+     * @param id 项目到资
+(最少一条记录、合计、回写项目单)ID
+     * @return 结果
+     */
+    public int deleteBmConstructionPayById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/project/IBmConstructionRateService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.project;
+
+import com.ruoyi.system.domain.project.BmConstructionRate;
+
+import java.util.List;
+
+/**
+ * 项目施工进度Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public interface IBmConstructionRateService 
+{
+    /**
+     * 查询项目施工进度
+     * 
+     * @param id 项目施工进度ID
+     * @return 项目施工进度
+     */
+    public BmConstructionRate selectBmConstructionRateById(Long id);
+
+    /**
+     * 查询项目施工进度列表
+     * 
+     * @param bmConstructionRate 项目施工进度
+     * @return 项目施工进度集合
+     */
+    public List<BmConstructionRate> selectBmConstructionRateList(BmConstructionRate bmConstructionRate);
+
+    /**
+     * 新增项目施工进度
+     * 
+     * @param bmConstructionRate 项目施工进度
+     * @return 结果
+     */
+    public int insertBmConstructionRate(BmConstructionRate bmConstructionRate);
+
+    /**
+     * 修改项目施工进度
+     * 
+     * @param bmConstructionRate 项目施工进度
+     * @return 结果
+     */
+    public int updateBmConstructionRate(BmConstructionRate bmConstructionRate);
+
+    /**
+     * 批量删除项目施工进度
+     * 
+     * @param ids 需要删除的项目施工进度ID
+     * @return 结果
+     */
+    public int deleteBmConstructionRateByIds(Long[] ids);
+
+    /**
+     * 删除项目施工进度信息
+     * 
+     * @param id 项目施工进度ID
+     * @return 结果
+     */
+    public int deleteBmConstructionRateById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/project/IBmDeptPlanService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service.project;
+
+import com.ruoyi.system.domain.project.BmDeptPlan;
+
+import java.util.List;
+
+
+/**
+ *  部门招商计划Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-09
+ */
+public interface IBmDeptPlanService
+{
+    /**
+     * 查询 部门招商计划
+     * 
+     * @param id  部门招商计划ID
+     * @return  部门招商计划
+     */
+    public BmDeptPlan selectBmDeptPlanById(Long id);
+
+    /**
+     * 查询 部门招商计划列表
+     * 
+     * @param bmDeptPlan  部门招商计划
+     * @return  部门招商计划集合
+     */
+    public List<BmDeptPlan> selectBmDeptPlanList(BmDeptPlan bmDeptPlan);
+
+    /**
+     * 新增 部门招商计划
+     * 
+     * @param bmDeptPlan  部门招商计划
+     * @return 结果
+     */
+    public int insertBmDeptPlan(BmDeptPlan bmDeptPlan);
+
+    /**
+     * 修改 部门招商计划
+     * 
+     * @param bmDeptPlan  部门招商计划
+     * @return 结果
+     */
+    public int updateBmDeptPlan(BmDeptPlan bmDeptPlan);
+
+    /**
+     * 批量删除 部门招商计划
+     * 
+     * @param ids 需要删除的 部门招商计划ID
+     * @return 结果
+     */
+    public int deleteBmDeptPlanByIds(Long[] ids);
+
+    /**
+     * 删除 部门招商计划信息
+     * 
+     * @param id  部门招商计划ID
+     * @return 结果
+     */
+    public int deleteBmDeptPlanById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/project/IBmProjectConstructionService.java

@@ -44,7 +44,7 @@ public interface IBmProjectConstructionService
      * @param bmProjectConstruction 项目施工
      * @return 结果
      */
-    public int updateBmProjectConstruction(BmProjectConstruction bmProjectConstruction);
+    public AjaxResult updateBmProjectConstruction(BmProjectConstruction bmProjectConstruction);
 
     /**
      * 批量删除项目施工

ruoyi-system/src/main/java/com/ruoyi/system/service/project/IBmProjectProductService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service.project;
+
+import com.ruoyi.system.domain.project.BmProjectProduct;
+
+import java.util.List;
+
+
+/**
+ * 项目投产Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-08
+ */
+public interface IBmProjectProductService 
+{
+    /**
+     * 查询项目投产
+     * 
+     * @param id 项目投产ID
+     * @return 项目投产
+     */
+    public BmProjectProduct selectBmProjectProductById(Long id);
+
+    /**
+     * 查询项目投产列表
+     * 
+     * @param bmProjectProduct 项目投产
+     * @return 项目投产集合
+     */
+    public List<BmProjectProduct> selectBmProjectProductList(BmProjectProduct bmProjectProduct);
+
+    /**
+     * 新增项目投产
+     * 
+     * @param bmProjectProduct 项目投产
+     * @return 结果
+     */
+    public int insertBmProjectProduct(BmProjectProduct bmProjectProduct);
+
+    /**
+     * 修改项目投产
+     * 
+     * @param bmProjectProduct 项目投产
+     * @return 结果
+     */
+    public int updateBmProjectProduct(BmProjectProduct bmProjectProduct);
+
+    /**
+     * 批量删除项目投产
+     * 
+     * @param ids 需要删除的项目投产ID
+     * @return 结果
+     */
+    public int deleteBmProjectProductByIds(Long[] ids);
+
+    /**
+     * 删除项目投产信息
+     * 
+     * @param id 项目投产ID
+     * @return 结果
+     */
+    public int deleteBmProjectProductById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/project/IBmProjectService.java

@@ -69,4 +69,13 @@ public interface IBmProjectService
      * @return
      */
    public AjaxResult examine(BmProjectStatus bmProjectStatus);
+
+    /**
+     * 首页查询待审核列表
+     * @param bmProject
+     * @return
+     */
+   public List<BmProject> selectToBeReviewedList(BmProject bmProject);
+
+
 }

ruoyi-system/src/main/resources/mapper/system/project/BmCompanyShareholderMapper.xml

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertBmCompanyShareholder" parameterType="BmCompanyShareholder">
+    <insert id="insertBmCompanyShareholder" parameterType="BmCompanyShareholder" useGeneratedKeys="true" keyProperty="id">
         insert into bm_company_shareholder
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="bmProjectId != null">bm_project_id,</if>
@@ -89,14 +89,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteBmCompanyShareholderById" parameterType="Long">
+<!--    <delete id="deleteBmCompanyShareholderById" parameterType="Long">
         delete from bm_company_shareholder where id = #{id}
-    </delete>
+    </delete>-->
 
-    <delete id="deleteBmCompanyShareholderByIds" parameterType="String">
+    <update id="deleteBmCompanyShareholderById" parameterType="Long">
+        update bm_company_shareholder set is_del = '1'  where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmCompanyShareholderByIds" parameterType="String">
         delete from bm_company_shareholder where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </delete>-->
+
+    <update id="deleteBmCompanyShareholderByIds" parameterType="String">
+        update bm_company_shareholder set is_del = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 </mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmConstructionEqMapper.xml

@@ -0,0 +1,124 @@
+<?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.project.BmConstructionEqMapper">
+    
+    <resultMap type="BmConstructionEq" id="BmConstructionEqResult">
+        <result property="id"    column="id"    />
+        <result property="bmProjectId"    column="bm_project_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="isDel"    column="is_del"    />
+        <result property="eqType"    column="eq_type"    />
+        <result property="photo"    column="photo"    />
+    </resultMap>
+
+    <sql id="selectBmConstructionEqVo">
+        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, eq_type, photo from bm_construction_eq
+    </sql>
+
+    <select id="selectBmConstructionEqList" parameterType="BmConstructionEq" resultMap="BmConstructionEqResult">
+        SELECT
+        e.id,
+        e.bm_project_id,
+        e.create_by,
+        e.create_time,
+        e.update_by,
+        e.update_time,
+        e.is_del,
+        e.eq_type,
+        e.photo,
+        d.dict_label as eqTypeName
+        FROM
+        bm_construction_eq e
+        LEFT JOIN sys_dict_data d on e.eq_type = d.dict_value and d.dict_type = 'project_schedule'
+        <where>  
+            <if test="bmProjectId != null "> and e.bm_project_id = #{bmProjectId}</if>
+            <if test="isDel != null "> and e.is_del = #{isDel}</if>
+            <if test="eqType != null  and eqType != ''"> and e.eq_type = #{eqType}</if>
+            <if test="photo != null  and photo != ''"> and e.photo = #{photo}</if>
+        </where>
+    </select>
+    
+    <select id="selectBmConstructionEqById" parameterType="Long" resultMap="BmConstructionEqResult">
+        SELECT
+        e.id,
+        e.bm_project_id,
+        e.create_by,
+        e.create_time,
+        e.update_by,
+        e.update_time,
+        e.is_del,
+        e.eq_type,
+        e.photo,
+        d.dict_label as eqTypeName
+        FROM
+        bm_construction_eq e
+        LEFT JOIN sys_dict_data d on e.eq_type = d.dict_value and d.dict_type = 'project_schedule'
+        where e.bm_project_id = #{id}
+    </select>
+        
+    <insert id="insertBmConstructionEq" parameterType="BmConstructionEq" useGeneratedKeys="true" keyProperty="id">
+        insert into bm_construction_eq
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="bmProjectId != null">bm_project_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="eqType != null">eq_type,</if>
+            <if test="photo != null">photo,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="bmProjectId != null">#{bmProjectId},</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="isDel != null">#{isDel},</if>
+            <if test="eqType != null">#{eqType},</if>
+            <if test="photo != null">#{photo},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBmConstructionEq" parameterType="BmConstructionEq">
+        update bm_construction_eq
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="bmProjectId != null">bm_project_id = #{bmProjectId},</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="isDel != null">is_del = #{isDel},</if>
+            <if test="eqType != null">eq_type = #{eqType},</if>
+            <if test="photo != null">photo = #{photo},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmConstructionEqById" parameterType="Long">
+        delete from bm_construction_eq where id = #{id}
+    </delete>-->
+
+    <update id="deleteBmConstructionEqById" parameterType="Long">
+        update bm_construction_eq set is_del = '1' where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmConstructionEqByIds" parameterType="String">
+        delete from bm_construction_eq where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>-->
+
+    <update id="deleteBmConstructionEqByIds" parameterType="String">
+        update bm_construction_eq set is_del = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmConstructionPayInfoMapper.xml

@@ -0,0 +1,99 @@
+<?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.project.BmConstructionPayInfoMapper">
+    
+    <resultMap type="BmConstructionPayInfo" id="BmConstructionPayInfoResult">
+        <result property="id"    column="id"    />
+        <result property="bmProjectId"    column="bm_project_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="isDel"    column="is_del"    />
+        <result property="statisticsDate"    column="statistics_date"    />
+        <result property="statisticsPhoto"    column="statistics_photo"    />
+    </resultMap>
+
+    <sql id="selectBmConstructionPayInfoVo">
+        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, statistics_date, statistics_photo from bm_construction_payinfo
+    </sql>
+
+    <select id="selectBmConstructionPayInfoList" parameterType="BmConstructionPayInfo" resultMap="BmConstructionPayInfoResult">
+        <include refid="selectBmConstructionPayInfoVo"/>
+        <where>  
+            <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="statisticsDate != null "> and statistics_date = #{statisticsDate}</if>
+            <if test="statisticsPhoto != null  and statisticsPhoto != ''"> and statistics_photo = #{statisticsPhoto}</if>
+        </where>
+    </select>
+    
+    <select id="selectBmConstructionPayInfoById" parameterType="Long" resultMap="BmConstructionPayInfoResult">
+        <include refid="selectBmConstructionPayInfoVo"/>
+        where bm_project_id = #{id}
+    </select>
+        
+    <insert id="insertBmConstructionPayInfo" parameterType="BmConstructionPayInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into bm_construction_payinfo
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="bmProjectId != null">bm_project_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="statisticsDate != null">statistics_date,</if>
+            <if test="statisticsPhoto != null">statistics_photo,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="bmProjectId != null">#{bmProjectId},</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="isDel != null">#{isDel},</if>
+            <if test="statisticsDate != null">#{statisticsDate},</if>
+            <if test="statisticsPhoto != null">#{statisticsPhoto},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBmConstructionPayInfo" parameterType="BmConstructionPayInfo">
+        update bm_construction_payinfo
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="bmProjectId != null">bm_project_id = #{bmProjectId},</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="isDel != null">is_del = #{isDel},</if>
+            <if test="statisticsDate != null">statistics_date = #{statisticsDate},</if>
+            <if test="statisticsPhoto != null">statistics_photo = #{statisticsPhoto},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmConstructionPayInfoById" parameterType="Long">
+        delete from bm_construction_payinfo where id = #{id}
+    </delete>-->
+
+    <update id="deleteBmConstructionPayInfoById" parameterType="Long">
+        update  bm_construction_payinfo set is_del = '1' where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmConstructionPayInfoByIds" parameterType="String">
+        delete from bm_construction_payinfo where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>-->
+
+    <update id="deleteBmConstructionPayInfoByIds" parameterType="String">
+        update  bm_construction_payinfo set is_del = '1'
+        where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmConstructionPayMapper.xml

@@ -0,0 +1,109 @@
+<?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.project.BmConstructionPayMapper">
+    
+    <resultMap type="BmConstructionPay" id="BmConstructionPayResult">
+        <result property="id"    column="id"    />
+        <result property="bmProjectId"    column="bm_project_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="isDel"    column="is_del"    />
+        <result property="payForType"    column="pay_for_type"    />
+        <result property="payForMoney"    column="pay_for_money"    />
+        <result property="photo"    column="photo"    />
+    </resultMap>
+
+    <sql id="selectBmConstructionPayVo">
+        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, pay_for_type, pay_for_money,  photo from bm_construction_pay
+    </sql>
+
+    <select id="selectBmConstructionPayList" parameterType="BmConstructionPay" resultMap="BmConstructionPayResult">
+        select p.id, p.bm_project_id, p.create_by, p.create_time, p.update_by, p.update_time, p.is_del, p.pay_for_type, p.pay_for_money,  p.photo, d.dict_label as payForTypeName
+        from bm_construction_pay p
+        left join sys_dict_data d on p.pay_for_type = d.dict_value and d.dict_type = 'project_pay'
+        <where>  
+            <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="payForType != null  and payForType != ''"> and pay_for_type = #{payForType}</if>
+            <if test="payForMoney != null"> and pay_for_money = #{payForMoney}</if>
+            <if test="photo != null  and photo != ''"> and photo = #{photo}</if>
+        </where>
+    </select>
+    
+    <select id="selectBmConstructionPayById" parameterType="Long" resultMap="BmConstructionPayResult">
+        select p.id, p.bm_project_id, p.create_by, p.create_time, p.update_by, p.update_time, p.is_del, p.pay_for_type, p.pay_for_money,  p.photo, d.dict_label as payForTypeName
+        from bm_construction_pay p
+        left join sys_dict_data d on p.pay_for_type = d.dict_value and d.dict_type = 'project_pay'
+        where bm_project_id = #{id}
+    </select>
+        
+    <insert id="insertBmConstructionPay" parameterType="BmConstructionPay">
+        insert into bm_construction_pay
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="bmProjectId != null">bm_project_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="payForType != null and payForType != ''">pay_for_type,</if>
+            <if test="payForMoney != null">pay_for_money,</if>
+            <if test="photo != null">photo,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="bmProjectId != null">#{bmProjectId},</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="isDel != null">#{isDel},</if>
+            <if test="payForType != null and payForType != ''">#{payForType},</if>
+            <if test="payForMoney != null">#{payForMoney},</if>
+            <if test="photo != null">#{photo},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBmConstructionPay" parameterType="BmConstructionPay">
+        update bm_construction_pay
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="bmProjectId != null">bm_project_id = #{bmProjectId},</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="isDel != null">is_del = #{isDel},</if>
+            <if test="payForType != null">pay_for_type = #{payForType},</if>
+            <if test="payForMoney != null">pay_for_money = #{payForMoney},</if>
+            <if test="photo != null">photo = #{photo},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmConstructionPayById" parameterType="Long">
+        delete from bm_construction_pay where id = #{id}
+    </delete>-->
+
+    <update id="deleteBmConstructionPayById" parameterType="Long">
+        update bm_construction_pay set is_del = '1'
+    </update>
+
+
+
+<!--    <delete id="deleteBmConstructionPayByIds" parameterType="String">
+        delete from bm_construction_pay where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>-->
+
+    <update id="deleteBmConstructionPayByIds" parameterType="String">
+        update bm_construction_pay set is_del = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmConstructionRateMapper.xml

@@ -0,0 +1,102 @@
+<?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.project.BmConstructionRateMapper">
+    
+    <resultMap type="BmConstructionRate" id="BmConstructionRateResult">
+        <result property="id"    column="id"    />
+        <result property="bmProjectId"    column="bm_project_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="isDel"    column="is_del"    />
+        <result property="rateType"    column="rate_type"    />
+        <result property="photo"    column="photo"    />
+    </resultMap>
+
+    <sql id="selectBmConstructionRateVo">
+        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, rate_type, photo from bm_construction_rate
+    </sql>
+
+    <select id="selectBmConstructionRateList" parameterType="BmConstructionRate" resultMap="BmConstructionRateResult">
+        select r.id, r.bm_project_id, r.create_by, r.create_time, r.update_by, r.update_time, r.is_del, r.rate_type, r.photo, d.dict_label as rateTypeName
+        from bm_construction_rate r
+        left join sys_dict_data d on r.rate_type = d.dict_value and d.dict_type = 'project_rate'
+        <where>  
+            <if test="bmProjectId != null "> and r.bm_project_id = #{bmProjectId}</if>
+            <if test="isDel != null "> and r.is_del = #{isDel}</if>
+            <if test="rateType != null  and rateType != ''"> and r.rate_type = #{rateType}</if>
+            <if test="photo != null  and photo != ''"> and r.photo = #{photo}</if>
+        </where>
+    </select>
+    
+    <select id="selectBmConstructionRateById" parameterType="Long" resultMap="BmConstructionRateResult">
+        select r.id, r.bm_project_id, r.create_by, r.create_time, r.update_by, r.update_time, r.is_del, r.rate_type, r.photo, d.dict_label as rateTypeName
+        from bm_construction_rate r
+        left join sys_dict_data d on r.rate_type = d.dict_value and d.dict_type = 'project_rate'
+        where id = #{id}
+    </select>
+        
+    <insert id="insertBmConstructionRate" parameterType="BmConstructionRate" useGeneratedKeys="true" keyProperty="id">
+        insert into bm_construction_rate
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="bmProjectId != null">bm_project_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="rateType != null">rate_type,</if>
+            <if test="photo != null">photo,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="bmProjectId != null">#{bmProjectId},</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="isDel != null">#{isDel},</if>
+            <if test="rateType != null">#{rateType},</if>
+            <if test="photo != null">#{photo},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBmConstructionRate" parameterType="BmConstructionRate">
+        update bm_construction_rate
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="bmProjectId != null">bm_project_id = #{bmProjectId},</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="isDel != null">is_del = #{isDel},</if>
+            <if test="rateType != null">rate_type = #{rateType},</if>
+            <if test="photo != null">photo = #{photo},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmConstructionRateById" parameterType="Long">
+        delete from bm_construction_rate where id = #{id}
+    </delete>-->
+
+    <update id="deleteBmConstructionRateById" parameterType="Long">
+        update  bm_construction_rate set is_del = '1' where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmConstructionRateByIds" parameterType="String">
+        delete from bm_construction_rate where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>-->
+
+    <update id="deleteBmConstructionRateByIds" parameterType="String">
+        update  bm_construction_rate set is_del = '1'where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmDeptPlanMapper.xml

@@ -0,0 +1,107 @@
+<?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.project.BmDeptPlanMapper">
+    
+    <resultMap type="BmDeptPlan" id="BmDeptPlanResult">
+        <result property="id"    column="id"    />
+        <result property="sysDeptId"    column="sys_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="isDel"    column="is_del"    />
+        <result property="year"    column="year"    />
+        <result property="plan"    column="plan"    />
+        <result property="targetSigningNum"    column="target_signing_num"    />
+        <result property="targetContractAmount"    column="target_contract_amount"    />
+        <result property="targetArrivalAmount"    column="target_arrival_amount"    />
+        <result property="targetInvestmentNum"    column="target_investment_num"    />
+    </resultMap>
+
+    <sql id="selectBmDeptPlanVo">
+        select id, sys_dept_id, create_by, create_time, update_by, update_time, is_del, year, plan, target_signing_num, target_contract_amount, target_arrival_amount, target_investment_num from bm_dept_Plan
+    </sql>
+
+    <select id="selectBmDeptPlanList" parameterType="BmDeptPlan" resultMap="BmDeptPlanResult">
+        <include refid="selectBmDeptPlanVo"/>
+        <where>  
+            <if test="sysDeptId != null "> and sys_dept_id = #{sysDeptId}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="year != null  and year != ''"> and year = #{year}</if>
+            <if test="plan != null "> and plan = #{plan}</if>
+            <if test="targetSigningNum != null "> and target_signing_num = #{targetSigningNum}</if>
+            <if test="targetContractAmount != null "> and target_contract_amount = #{targetContractAmount}</if>
+            <if test="targetArrivalAmount != null "> and target_arrival_amount = #{targetArrivalAmount}</if>
+            <if test="targetInvestmentNum != null "> and target_investment_num = #{targetInvestmentNum}</if>
+        </where>
+    </select>
+    
+    <select id="selectBmDeptPlanById" parameterType="Long" resultMap="BmDeptPlanResult">
+        <include refid="selectBmDeptPlanVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertBmDeptPlan" parameterType="BmDeptPlan" useGeneratedKeys="true" keyProperty="id">
+        insert into bm_dept_Plan
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="sysDeptId != null">sys_dept_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="year != null">year,</if>
+            <if test="plan != null">plan,</if>
+            <if test="targetSigningNum != null">target_signing_num,</if>
+            <if test="targetContractAmount != null">target_contract_amount,</if>
+            <if test="targetArrivalAmount != null">target_arrival_amount,</if>
+            <if test="targetInvestmentNum != null">target_investment_num,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="sysDeptId != null">#{sysDeptId},</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="isDel != null">#{isDel},</if>
+            <if test="year != null">#{year},</if>
+            <if test="plan != null">#{plan},</if>
+            <if test="targetSigningNum != null">#{targetSigningNum},</if>
+            <if test="targetContractAmount != null">#{targetContractAmount},</if>
+            <if test="targetArrivalAmount != null">#{targetArrivalAmount},</if>
+            <if test="targetInvestmentNum != null">#{targetInvestmentNum},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBmDeptPlan" parameterType="BmDeptPlan">
+        update bm_dept_Plan
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="sysDeptId != null">sys_dept_id = #{sysDeptId},</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="isDel != null">is_del = #{isDel},</if>
+            <if test="year != null">year = #{year},</if>
+            <if test="plan != null">plan = #{plan},</if>
+            <if test="targetSigningNum != null">target_signing_num = #{targetSigningNum},</if>
+            <if test="targetContractAmount != null">target_contract_amount = #{targetContractAmount},</if>
+            <if test="targetArrivalAmount != null">target_arrival_amount = #{targetArrivalAmount},</if>
+            <if test="targetInvestmentNum != null">target_investment_num = #{targetInvestmentNum},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBmDeptPlanById" parameterType="Long">
+        delete from bm_dept_Plan where id = #{id}
+    </delete>
+
+    <delete id="deleteBmDeptPlanByIds" parameterType="String">
+        delete from bm_dept_Plan where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmProjectConstructionMapper.xml

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectBmProjectConstructionById" parameterType="Long" resultMap="BmProjectConstructionResult">
         <include refid="selectBmProjectConstructionVo"/>
-        where id = #{id}
+        where bm_project_id = #{id}
     </select>
         
     <insert id="insertBmProjectConstruction" parameterType="BmProjectConstruction" useGeneratedKeys="true" keyProperty="id">
@@ -94,14 +94,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteBmProjectConstructionById" parameterType="Long">
+<!--    <delete id="deleteBmProjectConstructionById" parameterType="Long">
         delete from bm_project_construction where id = #{id}
-    </delete>
+    </delete>-->
+
+    <update id="deleteBmProjectConstructionById" parameterType="Long">
+        update  bm_project_construction set is_del = '1' where id = #{id}
+    </update>
 
-    <delete id="deleteBmProjectConstructionByIds" parameterType="String">
+<!--    <delete id="deleteBmProjectConstructionByIds" parameterType="String">
         delete from bm_project_construction where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </delete>-->
+
+    <update id="deleteBmProjectConstructionByIds" parameterType="String">
+        update  bm_project_construction set is_del = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 </mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmProjectInfoMapper.xml

@@ -70,10 +70,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectBmProjectInfoById" parameterType="Long" resultMap="BmProjectInfoResult">
         <include refid="selectBmProjectInfoVo"/>
-        where id = #{id}
+        where bm_project_id = #{id}
     </select>
         
-    <insert id="insertBmProjectInfo" parameterType="BmProjectInfo">
+    <insert id="insertBmProjectInfo" parameterType="BmProjectInfo" useGeneratedKeys="true" keyProperty="id">
         insert into bm_project_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="bmProjectId != null">bm_project_id,</if>
@@ -169,14 +169,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteBmProjectInfoById" parameterType="Long">
+<!--    <delete id="deleteBmProjectInfoById" parameterType="Long">
         delete from bm_project_info where id = #{id}
-    </delete>
+    </delete>-->
+
+    <update id="deleteBmProjectInfoById" parameterType="Long">
+        update  bm_project_info set id_del = '1' where id = #{id}
+    </update>
 
-    <delete id="deleteBmProjectInfoByIds" parameterType="String">
+<!--    <delete id="deleteBmProjectInfoByIds" parameterType="String">
         delete from bm_project_info where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </delete>-->
+
+    <update id="deleteBmProjectInfoByIds" parameterType="String">
+        update  bm_project_info set id_del = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 </mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmProjectInvestorMapper.xml

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertBmProjectInvestor" parameterType="BmProjectInvestor" useGeneratedKeys="true" keyProperty="bmProjectId">
+    <insert id="insertBmProjectInvestor" parameterType="BmProjectInvestor" useGeneratedKeys="true" keyProperty="id">
         insert into bm_project_investor
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="bmProjectId != null">bm_project_id,</if>
@@ -88,14 +88,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteBmProjectInvestorById" parameterType="Long">
+<!--    <delete id="deleteBmProjectInvestorById" parameterType="Long">
         delete from bm_project_investor where id = #{id}
-    </delete>
+    </delete>-->
 
-    <delete id="deleteBmProjectInvestorByIds" parameterType="String">
+    <update id="deleteBmProjectInvestorById" parameterType="Long">
+        update  bm_project_investor set id_del = '1' where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmProjectInvestorByIds" parameterType="String">
         delete from bm_project_investor where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </delete>-->
+
+    <update id="deleteBmProjectInvestorByIds" parameterType="String">
+        update  bm_project_investor set id_del = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 </mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmProjectMapper.xml

@@ -65,6 +65,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null "> and p.create_time &lt;= #{endTime}</if>
         </where>
     </select>
+
+    <select id="selectToBeReviewedList" parameterType="BmProject" resultMap="BmProjectResult">
+        SELECT
+        p.id,
+        p.create_by,
+        p.create_time,
+        p.update_by,
+        p.update_time,
+        p.NAME,
+        p.industry_category,
+        p.industry,
+        p.is_backbussiness,
+        p.project_status,
+        p.dept_id,
+        p.tot_amt,
+        p.is_del,
+        p.order_begin_time,
+        p.order_end_time,
+        p.remark ,
+        sdd.dict_label
+        FROM
+        bm_project p
+        left join sys_dict_data sdd on p.project_status = sdd.dict_value and sdd.dict_type = 'project_status'
+        where
+        sdd.dict_value=(sdd.dict_value<![CDATA[>>]]>1)<![CDATA[<<]]>1
+    </select>
     
     <select id="selectBmProjectById" parameterType="Long" resultMap="BmProjectResult">
                SELECT
@@ -153,14 +179,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteBmProjectById" parameterType="Long">
+<!--    <delete id="deleteBmProjectById" parameterType="Long">
         delete from bm_project where id = #{id}
-    </delete>
+    </delete>-->
 
-    <delete id="deleteBmProjectByIds" parameterType="String">
+    <update id="deleteBmProjectById" parameterType="Long">
+        update  bm_project set id_del = '1' where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmProjectByIds" parameterType="String">
         delete from bm_project where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </delete>-->
+
+    <update id="deleteBmProjectByIds" parameterType="String">
+        update  bm_project set id_del = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 </mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmProjectOrderinfoMapper.xml

@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectBmProjectOrderinfoById" parameterType="Long" resultMap="BmProjectOrderinfoResult">
         <include refid="selectBmProjectOrderinfoVo"/>
-        where id = #{id}
+        where bm_project_id = #{id}
     </select>
         
     <insert id="insertBmProjectOrderinfo" parameterType="BmProjectOrderinfo" useGeneratedKeys="true" keyProperty="id">
@@ -309,12 +309,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteBmProjectOrderinfoById" parameterType="Long">
+<!--    <delete id="deleteBmProjectOrderinfoById" parameterType="Long">
         delete from bm_project_orderinfo where id = #{id}
-    </delete>
+    </delete>-->
+
+    <update id="deleteBmProjectOrderinfoById" parameterType="Long">
+        update  bm_project_orderinfo set is_del = '1' where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmProjectOrderinfoByIds" parameterType="String">
+        delete from bm_project_orderinfo where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>-->
 
     <delete id="deleteBmProjectOrderinfoByIds" parameterType="String">
-        delete from bm_project_orderinfo where id in 
+        update  bm_project_orderinfo set is_del = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

ruoyi-system/src/main/resources/mapper/system/project/BmProjectPersionMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertBmProjectPersion" parameterType="BmProjectPersion">
+    <insert id="insertBmProjectPersion" parameterType="BmProjectPersion" useGeneratedKeys="true" keyProperty="id">
         insert into bm_project_persion
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="bmProjectId != null">bm_project_id,</if>
@@ -84,14 +84,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteBmProjectPersionById" parameterType="Long">
+<!--    <delete id="deleteBmProjectPersionById" parameterType="Long">
         delete from bm_project_persion where id = #{id}
-    </delete>
+    </delete>-->
 
-    <delete id="deleteBmProjectPersionByIds" parameterType="String">
+    <update id="deleteBmProjectPersionById" parameterType="Long">
+        update  bm_project_persion set is_del = '1' where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmProjectPersionByIds" parameterType="String">
         delete from bm_project_persion where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </delete>-->
+
+    <update id="deleteBmProjectPersionByIds" parameterType="String">
+        update  bm_project_persion set is_del = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 </mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmProjectProductMapper.xml

@@ -0,0 +1,118 @@
+<?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.project.BmProjectProductMapper">
+    
+    <resultMap type="BmProjectProduct" id="BmProjectProductResult">
+        <result property="id"    column="id"    />
+        <result property="bmProjectId"    column="bm_project_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="isDel"    column="is_del"    />
+        <result property="totInvestment"    column="tot_investment"    />
+        <result property="macInvestment"    column="mac_investment"    />
+        <result property="productDate"    column="product_date"    />
+        <result property="productPhoto"    column="product_photo"    />
+        <result property="isOk"    column="is_ok"    />
+        <result property="okDate"    column="ok_date"    />
+    </resultMap>
+
+    <sql id="selectBmProjectProductVo">
+        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, tot_investment, mac_investment, product_date, product_photo, is_ok, ok_date from bm_project_product
+    </sql>
+
+    <select id="selectBmProjectProductList" parameterType="BmProjectProduct" resultMap="BmProjectProductResult">
+        <include refid="selectBmProjectProductVo"/>
+        <where>  
+            <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="totInvestment != null "> and tot_investment = #{totInvestment}</if>
+            <if test="macInvestment != null "> and mac_investment = #{macInvestment}</if>
+            <if test="productDate != null "> and product_date = #{productDate}</if>
+            <if test="productPhoto != null  and productPhoto != ''"> and product_photo = #{productPhoto}</if>
+            <if test="isOk != null  and isOk != ''"> and is_ok = #{isOk}</if>
+            <if test="okDate != null "> and ok_date = #{okDate}</if>
+        </where>
+    </select>
+    
+    <select id="selectBmProjectProductById" parameterType="Long" resultMap="BmProjectProductResult">
+        <include refid="selectBmProjectProductVo"/>
+        where bm_project_id = #{id}
+    </select>
+        
+    <insert id="insertBmProjectProduct" parameterType="BmProjectProduct" useGeneratedKeys="true" keyProperty="id">
+        insert into bm_project_product
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="bmProjectId != null">bm_project_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="totInvestment != null">tot_investment,</if>
+            <if test="macInvestment != null">mac_investment,</if>
+            <if test="productDate != null">product_date,</if>
+            <if test="productPhoto != null">product_photo,</if>
+            <if test="isOk != null">is_ok,</if>
+            <if test="okDate != null">ok_date,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="bmProjectId != null">#{bmProjectId},</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="isDel != null">#{isDel},</if>
+            <if test="totInvestment != null">#{totInvestment},</if>
+            <if test="macInvestment != null">#{macInvestment},</if>
+            <if test="productDate != null">#{productDate},</if>
+            <if test="productPhoto != null">#{productPhoto},</if>
+            <if test="isOk != null">#{isOk},</if>
+            <if test="okDate != null">#{okDate},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBmProjectProduct" parameterType="BmProjectProduct">
+        update bm_project_product
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="bmProjectId != null">bm_project_id = #{bmProjectId},</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="isDel != null">is_del = #{isDel},</if>
+            <if test="totInvestment != null">tot_investment = #{totInvestment},</if>
+            <if test="macInvestment != null">mac_investment = #{macInvestment},</if>
+            <if test="productDate != null">product_date = #{productDate},</if>
+            <if test="productPhoto != null">product_photo = #{productPhoto},</if>
+            <if test="isOk != null">is_ok = #{isOk},</if>
+            <if test="okDate != null">ok_date = #{okDate},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmProjectProductById" parameterType="Long">
+        delete from bm_project_product where id = #{id}
+    </delete>-->
+
+    <update id="deleteBmProjectProductById" parameterType="Long">
+        update  bm_project_product set is_del = '1' where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmProjectProductByIds" parameterType="String">
+        delete from bm_project_product where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>-->
+
+    <update id="deleteBmProjectProductByIds" parameterType="String">
+        update  bm_project_product set is_del = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmProjectReferralMapper.xml

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertBmProjectReferral" parameterType="BmProjectReferral">
+    <insert id="insertBmProjectReferral" parameterType="BmProjectReferral" useGeneratedKeys="true" keyProperty="id">
         insert into bm_project_referral
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="bmProjectId != null">bm_project_id,</if>
@@ -89,14 +89,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteBmProjectReferralById" parameterType="Long">
+<!--    <delete id="deleteBmProjectReferralById" parameterType="Long">
         delete from bm_project_referral where id = #{id}
-    </delete>
+    </delete>-->
 
-    <delete id="deleteBmProjectReferralByIds" parameterType="String">
+    <update id="deleteBmProjectReferralById" parameterType="Long">
+        update  bm_project_referral set  is_del = '1' where id = #{id}
+    </update>
+
+<!--    <delete id="deleteBmProjectReferralByIds" parameterType="String">
         delete from bm_project_referral where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </delete>-->
+
+    <update id="deleteBmProjectReferralByIds" parameterType="String">
+        update  bm_project_referral set  is_del = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 </mapper>