fix 修改招商引资问题

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

@@ -0,0 +1,111 @@
+package com.ruoyi.web.controller.project;
+
+import java.util.List;
+
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.project.BmConstructionEntry;
+import com.ruoyi.system.service.project.IBmConstructionEntryService;
+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.core.page.TableDataInfo;
+
+/**
+ * 项目入规
+(跟项目一对一)Controller
+ * 
+ * @author ruoyi
+ * @date 2021-12-20
+ */
+@RestController
+@RequestMapping("/constructionEntry/entry")
+public class BmConstructionEntryController extends BaseController
+{
+    @Autowired
+    private IBmConstructionEntryService bmConstructionEntryService;
+
+    /**
+     * 查询项目入规
+(跟项目一对一)列表
+     */
+    @PreAuthorize("@ss.hasPermi('constructionEntry:entry:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BmConstructionEntry bmConstructionEntry)
+    {
+        startPage();
+        List<BmConstructionEntry> list = bmConstructionEntryService.selectBmConstructionEntryList(bmConstructionEntry);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目入规
+(跟项目一对一)列表
+     */
+    @PreAuthorize("@ss.hasPermi('constructionEntry:entry:export')")
+    @Log(title = "项目入规 (跟项目一对一)", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(BmConstructionEntry bmConstructionEntry)
+    {
+        List<BmConstructionEntry> list = bmConstructionEntryService.selectBmConstructionEntryList(bmConstructionEntry);
+        ExcelUtil<BmConstructionEntry> util = new ExcelUtil<BmConstructionEntry>(BmConstructionEntry.class);
+        return util.exportExcel(list, "entry");
+    }
+
+    /**
+     * 获取项目入规
+(跟项目一对一)详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('constructionEntry:entry:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(bmConstructionEntryService.selectBmConstructionEntryById(id));
+    }
+
+    /**
+     * 新增项目入规
+(跟项目一对一)
+     */
+    @PreAuthorize("@ss.hasPermi('constructionEntry:entry:add')")
+    @Log(title = "项目入规 (跟项目一对一)", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BmConstructionEntry bmConstructionEntry)
+    {
+        return toAjax(bmConstructionEntryService.insertBmConstructionEntry(bmConstructionEntry));
+    }
+
+    /**
+     * 修改项目入规
+(跟项目一对一)
+     */
+    @PreAuthorize("@ss.hasPermi('constructionEntry:entry:edit')")
+    @Log(title = "项目入规 (跟项目一对一)", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BmConstructionEntry bmConstructionEntry)
+    {
+        return toAjax(bmConstructionEntryService.updateBmConstructionEntry(bmConstructionEntry));
+    }
+
+    /**
+     * 删除项目入规
+(跟项目一对一)
+     */
+    @PreAuthorize("@ss.hasPermi('constructionEntry:entry:remove')")
+    @Log(title = "项目入规 (跟项目一对一)", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bmConstructionEntryService.deleteBmConstructionEntryByIds(ids));
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.ruoyi.web.controller.project;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.project.BmProjectShareholder;
+import com.ruoyi.system.service.project.IBmProjectShareholderService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+
+
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 签约信息-添加股东构成Controller
+ * 
+ * @author ruoyi
+ * @date 2021-12-20
+ */
+@RestController
+@RequestMapping("/projectShareholder/shareholder")
+public class BmProjectShareholderController extends BaseController
+{
+    @Autowired
+    private IBmProjectShareholderService bmProjectShareholderService;
+
+    /**
+     * 查询签约信息-添加股东构成列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectShareholder:shareholder:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BmProjectShareholder bmProjectShareholder)
+    {
+        startPage();
+        List<BmProjectShareholder> list = bmProjectShareholderService.selectBmProjectShareholderList(bmProjectShareholder);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出签约信息-添加股东构成列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectShareholder:shareholder:export')")
+    @Log(title = "签约信息-添加股东构成", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(BmProjectShareholder bmProjectShareholder)
+    {
+        List<BmProjectShareholder> list = bmProjectShareholderService.selectBmProjectShareholderList(bmProjectShareholder);
+        ExcelUtil<BmProjectShareholder> util = new ExcelUtil<BmProjectShareholder>(BmProjectShareholder.class);
+        return util.exportExcel(list, "shareholder");
+    }
+
+    /**
+     * 获取签约信息-添加股东构成详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('projectShareholder:shareholder:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(bmProjectShareholderService.selectBmProjectShareholderById(id));
+    }
+
+    /**
+     * 新增签约信息-添加股东构成
+     */
+    @PreAuthorize("@ss.hasPermi('projectShareholder:shareholder:add')")
+    @Log(title = "签约信息-添加股东构成", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BmProjectShareholder bmProjectShareholder)
+    {
+        return toAjax(bmProjectShareholderService.insertBmProjectShareholder(bmProjectShareholder));
+    }
+
+    /**
+     * 修改签约信息-添加股东构成
+     */
+    @PreAuthorize("@ss.hasPermi('projectShareholder:shareholder:edit')")
+    @Log(title = "签约信息-添加股东构成", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BmProjectShareholder bmProjectShareholder)
+    {
+        return toAjax(bmProjectShareholderService.updateBmProjectShareholder(bmProjectShareholder));
+    }
+
+    /**
+     * 删除签约信息-添加股东构成
+     */
+    @PreAuthorize("@ss.hasPermi('projectShareholder:shareholder:remove')")
+    @Log(title = "签约信息-添加股东构成", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bmProjectShareholderService.deleteBmProjectShareholderByIds(ids));
+    }
+}

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.101.11:3306/zhaoshang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.101.10:3306/zhaoshang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 123456
+                password: Boman123
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -9,8 +9,8 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-#  profile: D:/ruoyi/uploadPath
-  profile: /usr/local/zhaoshang/upload
+  profile: D:/ruoyi/uploadPath
+#  profile: /usr/local/zhaoshang/upload
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

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

@@ -0,0 +1,93 @@
+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_entry
+ * 
+ * @author ruoyi
+ * @date 2021-12-20
+ */
+public class BmConstructionEntry extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目施工id* */
+    private Long id;
+
+    /** 项目id* */
+    @Excel(name = "项目id*")
+    private Long bmProjectId;
+
+    /** 是否删除(0未删除、1已删除)* */
+    @Excel(name = "是否删除(0未删除、1已删除)*")
+    private Long isDel;
+
+    /** 入规时间* */
+    @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/BmProjectOrderinfo.java

@@ -140,6 +140,9 @@ public class BmProjectOrderinfo extends BaseEntity
     /** 对方合同签约人* */
     @Excel(name = "对方合同签约人*")
     private String partner;
+    /** 对方职务* */
+    @Excel(name = "对方职务*")
+    private String partnerJob;
 
     /** 合同签约我方* */
     @Excel(name = "合同签约我方*")
@@ -149,6 +152,10 @@ public class BmProjectOrderinfo extends BaseEntity
     @Excel(name = "我方合同签约人*")
     private String signUs;
 
+    /** 我方职务* */
+    @Excel(name = "我方职务*")
+    private String usJob;
+
     /** 第三方 */
     @Excel(name = "第三方")
     private String agreementThird;
@@ -156,6 +163,9 @@ public class BmProjectOrderinfo extends BaseEntity
     /** 第三方签约人 */
     @Excel(name = "第三方签约人")
     private String third;
+    /** 第三方职务 */
+    @Excel(name = "第三方职务")
+    private String thirdJob;
 
     /** 合同url* */
     @Excel(name = "合同url*")
@@ -225,7 +235,32 @@ public class BmProjectOrderinfo extends BaseEntity
     @Excel(name = "联系方式*")
     private String contactPersonPhone;
 
-    public void setId(Long id) 
+
+    public String getPartnerJob() {
+        return partnerJob;
+    }
+
+    public void setPartnerJob(String partnerJob) {
+        this.partnerJob = partnerJob;
+    }
+
+    public String getUsJob() {
+        return usJob;
+    }
+
+    public void setUsJob(String usJob) {
+        this.usJob = usJob;
+    }
+
+    public String getThirdJob() {
+        return thirdJob;
+    }
+
+    public void setThirdJob(String thirdJob) {
+        this.thirdJob = thirdJob;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

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

@@ -63,6 +63,19 @@ public class BmProjectProduct extends BaseEntity
     @Excel(name = "项目入规时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date okDate;
 
+    /**
+     * 入规截图
+     */
+    private String entryPhoto;
+
+    public String getEntryPhoto() {
+        return entryPhoto;
+    }
+
+    public void setEntryPhoto(String entryPhoto) {
+        this.entryPhoto = entryPhoto;
+    }
+
     public String getArrivalListPhoto() {
         return arrivalListPhoto;
     }

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

@@ -0,0 +1,117 @@
+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_project_shareholder
+ * 
+ * @author ruoyi
+ * @date 2021-12-20
+ */
+public class BmProjectShareholder extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目投资方id* */
+    private Long id;
+
+    /** 项目id* */
+    @Excel(name = "项目id*")
+    private Long bmProjectId;
+
+    /** 是否删除(0未删除、1已删除)* */
+    @Excel(name = "是否删除(0未删除、1已删除)*")
+    private Long isDel;
+
+    /** 企业名称* */
+    @Excel(name = "企业名称*")
+    private String companyName;
+
+    /** 股权比例* */
+    @Excel(name = "股权比例*")
+    private String equityRatio;
+
+    /** 统一社会信用代码* */
+    @Excel(name = "统一社会信用代码*")
+    private String companyCode;
+
+    /** 企业股东营业执照* */
+    @Excel(name = "企业股东营业执照*")
+    private String businessPhoto;
+
+    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 setCompanyName(String companyName) 
+    {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyName() 
+    {
+        return companyName;
+    }
+    public void setEquityRatio(String equityRatio) 
+    {
+        this.equityRatio = equityRatio;
+    }
+
+    public String getEquityRatio() 
+    {
+        return equityRatio;
+    }
+    public void setCompanyCode(String companyCode) 
+    {
+        this.companyCode = companyCode;
+    }
+
+    public String getCompanyCode() 
+    {
+        return companyCode;
+    }
+    public void setBusinessPhoto(String businessPhoto) 
+    {
+        this.businessPhoto = businessPhoto;
+    }
+
+    public String getBusinessPhoto() 
+    {
+        return businessPhoto;
+    }
+
+    @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("companyName", getCompanyName())
+            .append("equityRatio", getEquityRatio())
+            .append("companyCode", getCompanyCode())
+            .append("businessPhoto", getBusinessPhoto())
+            .toString();
+    }
+}

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

@@ -0,0 +1,76 @@
+package com.ruoyi.system.mapper.project;
+
+import com.ruoyi.system.domain.project.BmConstructionEntry;
+
+import java.util.List;
+
+/**
+ * 项目入规
+(跟项目一对一)Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-12-20
+ */
+public interface BmConstructionEntryMapper 
+{
+    /**
+     * 查询项目入规
+(跟项目一对一)
+     * 
+     * @param id 项目入规
+(跟项目一对一)ID
+     * @return 项目入规
+(跟项目一对一)
+     */
+    public BmConstructionEntry selectBmConstructionEntryById(Long id);
+
+    /**
+     * 查询项目入规
+(跟项目一对一)列表
+     * 
+     * @param bmConstructionEntry 项目入规
+(跟项目一对一)
+     * @return 项目入规
+(跟项目一对一)集合
+     */
+    public List<BmConstructionEntry> selectBmConstructionEntryList(BmConstructionEntry bmConstructionEntry);
+
+    /**
+     * 新增项目入规
+(跟项目一对一)
+     * 
+     * @param bmConstructionEntry 项目入规
+(跟项目一对一)
+     * @return 结果
+     */
+    public int insertBmConstructionEntry(BmConstructionEntry bmConstructionEntry);
+
+    /**
+     * 修改项目入规
+(跟项目一对一)
+     * 
+     * @param bmConstructionEntry 项目入规
+(跟项目一对一)
+     * @return 结果
+     */
+    public int updateBmConstructionEntry(BmConstructionEntry bmConstructionEntry);
+
+    /**
+     * 删除项目入规
+(跟项目一对一)
+     * 
+     * @param id 项目入规
+(跟项目一对一)ID
+     * @return 结果
+     */
+    public int deleteBmConstructionEntryById(Long id);
+
+    /**
+     * 批量删除项目入规
+(跟项目一对一)
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBmConstructionEntryByIds(Long[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper.project;
+
+import com.ruoyi.system.domain.project.BmProjectShareholder;
+
+import java.util.List;
+
+/**
+ * 签约信息-添加股东构成Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-12-20
+ */
+public interface BmProjectShareholderMapper 
+{
+    /**
+     * 查询签约信息-添加股东构成
+     * 
+     * @param id 签约信息-添加股东构成ID
+     * @return 签约信息-添加股东构成
+     */
+    public BmProjectShareholder selectBmProjectShareholderById(Long id);
+
+    /**
+     * 查询签约信息-添加股东构成列表
+     * 
+     * @param bmProjectShareholder 签约信息-添加股东构成
+     * @return 签约信息-添加股东构成集合
+     */
+    public List<BmProjectShareholder> selectBmProjectShareholderList(BmProjectShareholder bmProjectShareholder);
+
+    /**
+     * 新增签约信息-添加股东构成
+     * 
+     * @param bmProjectShareholder 签约信息-添加股东构成
+     * @return 结果
+     */
+    public int insertBmProjectShareholder(BmProjectShareholder bmProjectShareholder);
+
+    /**
+     * 修改签约信息-添加股东构成
+     * 
+     * @param bmProjectShareholder 签约信息-添加股东构成
+     * @return 结果
+     */
+    public int updateBmProjectShareholder(BmProjectShareholder bmProjectShareholder);
+
+    /**
+     * 删除签约信息-添加股东构成
+     * 
+     * @param id 签约信息-添加股东构成ID
+     * @return 结果
+     */
+    public int deleteBmProjectShareholderById(Long id);
+
+    /**
+     * 批量删除签约信息-添加股东构成
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBmProjectShareholderByIds(Long[] ids);
+}

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

@@ -0,0 +1,111 @@
+package com.ruoyi.system.service.impl.project;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.project.BmConstructionEntry;
+import com.ruoyi.system.mapper.project.BmConstructionEntryMapper;
+import com.ruoyi.system.service.project.IBmConstructionEntryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目入规
+(跟项目一对一)Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-12-20
+ */
+@Service
+public class BmConstructionEntryServiceImpl implements IBmConstructionEntryService
+{
+    @Autowired
+    private BmConstructionEntryMapper bmConstructionEntryMapper;
+
+    /**
+     * 查询项目入规
+(跟项目一对一)
+     * 
+     * @param id 项目入规
+(跟项目一对一)ID
+     * @return 项目入规
+(跟项目一对一)
+     */
+    @Override
+    public BmConstructionEntry selectBmConstructionEntryById(Long id)
+    {
+        return bmConstructionEntryMapper.selectBmConstructionEntryById(id);
+    }
+
+    /**
+     * 查询项目入规
+(跟项目一对一)列表
+     * 
+     * @param bmConstructionEntry 项目入规
+(跟项目一对一)
+     * @return 项目入规
+(跟项目一对一)
+     */
+    @Override
+    public List<BmConstructionEntry> selectBmConstructionEntryList(BmConstructionEntry bmConstructionEntry)
+    {
+        return bmConstructionEntryMapper.selectBmConstructionEntryList(bmConstructionEntry);
+    }
+
+    /**
+     * 新增项目入规
+(跟项目一对一)
+     * 
+     * @param bmConstructionEntry 项目入规
+(跟项目一对一)
+     * @return 结果
+     */
+    @Override
+    public int insertBmConstructionEntry(BmConstructionEntry bmConstructionEntry)
+    {
+        bmConstructionEntry.setCreateTime(DateUtils.getNowDate());
+        return bmConstructionEntryMapper.insertBmConstructionEntry(bmConstructionEntry);
+    }
+
+    /**
+     * 修改项目入规
+(跟项目一对一)
+     * 
+     * @param bmConstructionEntry 项目入规
+(跟项目一对一)
+     * @return 结果
+     */
+    @Override
+    public int updateBmConstructionEntry(BmConstructionEntry bmConstructionEntry)
+    {
+        bmConstructionEntry.setUpdateTime(DateUtils.getNowDate());
+        return bmConstructionEntryMapper.updateBmConstructionEntry(bmConstructionEntry);
+    }
+
+    /**
+     * 批量删除项目入规
+(跟项目一对一)
+     * 
+     * @param ids 需要删除的项目入规
+(跟项目一对一)ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmConstructionEntryByIds(Long[] ids)
+    {
+        return bmConstructionEntryMapper.deleteBmConstructionEntryByIds(ids);
+    }
+
+    /**
+     * 删除项目入规
+(跟项目一对一)信息
+     * 
+     * @param id 项目入规
+(跟项目一对一)ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmConstructionEntryById(Long id)
+    {
+        return bmConstructionEntryMapper.deleteBmConstructionEntryById(id);
+    }
+}

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

@@ -3,6 +3,7 @@ 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.common.utils.StringUtils;
 import com.ruoyi.system.domain.project.BmConstructionEq;
 import com.ruoyi.system.mapper.project.BmConstructionEqMapper;
 import com.ruoyi.system.service.project.IBmConstructionEqService;

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

@@ -240,14 +240,18 @@ public class BmProjectServiceImpl implements IBmProjectService {
                 if (projectStatus.equals(EXAMINE_PASS)) {
                     //提交签约审核申请,判断bm_company_shareholder和bm_project_orderinfo
                     BmProjectOrderinfo bmProjectOrderinfo = bmProjectOrderinfoMapper.selectBmProjectOrderinfoById(projectId);
-                    if (bmProjectOrderinfo != null) {
+                    if (bmProjectOrderinfo == null){
+                        return AjaxResult.error("信息不全,请补全后重新提交");
+                    }
+                    //非必填
+/*                    if (bmProjectOrderinfo != null) {
                         BmCompanyShareholder bmCompanyShareholder = bmCompanyShareholderMapper.selectBmCompanyShareholderByProjectId(projectId);
                         if (bmCompanyShareholder == null) {
                             return AjaxResult.error("信息不全,请补全后重新提交");
                         }
                     } else {
                         return AjaxResult.error("信息不全,请补全后重新提交");
-                    }
+                    }*/
                 }
 
                 if (projectStatus.equals(EXAMINE_FIVE)) {
@@ -257,8 +261,9 @@ public class BmProjectServiceImpl implements IBmProjectService {
                     BmConstructionRate bmConstructionRate = bmConstructionRateMapper.selectBmConstructionRateByProjectId(projectId);
                     BmConstructionEq bmConstructionEq = bmConstructionEqMapper.selectBmConstructionEqByProjectId(projectId);
                     BmConstructionPay bmConstructionPay = bmConstructionPayMapper.selectBmConstructionPayByProjectId(projectId);
-                    BmConstructionPayInfo bmConstructionPayInfo = bmConstructionPayInfoMapper.selectBmConstructionPayInfoById(projectId);
-                    if (bmProjectConstruction == null || bmConstructionRate == null || bmConstructionEq == null || bmConstructionPay == null || bmConstructionPayInfo == null) {
+                    //项目入统设置为非必填
+                    //BmConstructionPayInfo bmConstructionPayInfo = bmConstructionPayInfoMapper.selectBmConstructionPayInfoById(projectId);
+                    if (bmProjectConstruction == null || bmConstructionRate == null || bmConstructionEq == null || bmConstructionPay == null) {
                         return AjaxResult.error("信息不全,请补全后重新提交");
                     }
                 }

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

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl.project;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.project.BmProjectShareholder;
+import com.ruoyi.system.mapper.project.BmProjectShareholderMapper;
+import com.ruoyi.system.service.project.IBmProjectShareholderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 签约信息-添加股东构成Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-12-20
+ */
+@Service
+public class BmProjectShareholderServiceImpl implements IBmProjectShareholderService
+{
+    @Autowired
+    private BmProjectShareholderMapper bmProjectShareholderMapper;
+
+    /**
+     * 查询签约信息-添加股东构成
+     * 
+     * @param id 签约信息-添加股东构成ID
+     * @return 签约信息-添加股东构成
+     */
+    @Override
+    public BmProjectShareholder selectBmProjectShareholderById(Long id)
+    {
+        return bmProjectShareholderMapper.selectBmProjectShareholderById(id);
+    }
+
+    /**
+     * 查询签约信息-添加股东构成列表
+     * 
+     * @param bmProjectShareholder 签约信息-添加股东构成
+     * @return 签约信息-添加股东构成
+     */
+    @Override
+    public List<BmProjectShareholder> selectBmProjectShareholderList(BmProjectShareholder bmProjectShareholder)
+    {
+        return bmProjectShareholderMapper.selectBmProjectShareholderList(bmProjectShareholder);
+    }
+
+    /**
+     * 新增签约信息-添加股东构成
+     * 
+     * @param bmProjectShareholder 签约信息-添加股东构成
+     * @return 结果
+     */
+    @Override
+    public int insertBmProjectShareholder(BmProjectShareholder bmProjectShareholder)
+    {
+        bmProjectShareholder.setCreateTime(DateUtils.getNowDate());
+        return bmProjectShareholderMapper.insertBmProjectShareholder(bmProjectShareholder);
+    }
+
+    /**
+     * 修改签约信息-添加股东构成
+     * 
+     * @param bmProjectShareholder 签约信息-添加股东构成
+     * @return 结果
+     */
+    @Override
+    public int updateBmProjectShareholder(BmProjectShareholder bmProjectShareholder)
+    {
+        bmProjectShareholder.setUpdateTime(DateUtils.getNowDate());
+        return bmProjectShareholderMapper.updateBmProjectShareholder(bmProjectShareholder);
+    }
+
+    /**
+     * 批量删除签约信息-添加股东构成
+     * 
+     * @param ids 需要删除的签约信息-添加股东构成ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmProjectShareholderByIds(Long[] ids)
+    {
+        return bmProjectShareholderMapper.deleteBmProjectShareholderByIds(ids);
+    }
+
+    /**
+     * 删除签约信息-添加股东构成信息
+     * 
+     * @param id 签约信息-添加股东构成ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmProjectShareholderById(Long id)
+    {
+        return bmProjectShareholderMapper.deleteBmProjectShareholderById(id);
+    }
+}

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

@@ -0,0 +1,78 @@
+package com.ruoyi.system.service.project;
+
+import com.ruoyi.system.domain.project.BmConstructionEntry;
+
+import java.util.List;
+
+
+/**
+ * 项目入规
+(跟项目一对一)Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-12-20
+ */
+public interface IBmConstructionEntryService 
+{
+    /**
+     * 查询项目入规
+(跟项目一对一)
+     * 
+     * @param id 项目入规
+(跟项目一对一)ID
+     * @return 项目入规
+(跟项目一对一)
+     */
+    public BmConstructionEntry selectBmConstructionEntryById(Long id);
+
+    /**
+     * 查询项目入规
+(跟项目一对一)列表
+     * 
+     * @param bmConstructionEntry 项目入规
+(跟项目一对一)
+     * @return 项目入规
+(跟项目一对一)集合
+     */
+    public List<BmConstructionEntry> selectBmConstructionEntryList(BmConstructionEntry bmConstructionEntry);
+
+    /**
+     * 新增项目入规
+(跟项目一对一)
+     * 
+     * @param bmConstructionEntry 项目入规
+(跟项目一对一)
+     * @return 结果
+     */
+    public int insertBmConstructionEntry(BmConstructionEntry bmConstructionEntry);
+
+    /**
+     * 修改项目入规
+(跟项目一对一)
+     * 
+     * @param bmConstructionEntry 项目入规
+(跟项目一对一)
+     * @return 结果
+     */
+    public int updateBmConstructionEntry(BmConstructionEntry bmConstructionEntry);
+
+    /**
+     * 批量删除项目入规
+(跟项目一对一)
+     * 
+     * @param ids 需要删除的项目入规
+(跟项目一对一)ID
+     * @return 结果
+     */
+    public int deleteBmConstructionEntryByIds(Long[] ids);
+
+    /**
+     * 删除项目入规
+(跟项目一对一)信息
+     * 
+     * @param id 项目入规
+(跟项目一对一)ID
+     * @return 结果
+     */
+    public int deleteBmConstructionEntryById(Long id);
+}

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

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service.project;
+
+import com.ruoyi.system.domain.project.BmProjectShareholder;
+
+import java.util.List;
+
+
+/**
+ * 签约信息-添加股东构成Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-12-20
+ */
+public interface IBmProjectShareholderService 
+{
+    /**
+     * 查询签约信息-添加股东构成
+     * 
+     * @param id 签约信息-添加股东构成ID
+     * @return 签约信息-添加股东构成
+     */
+    public BmProjectShareholder selectBmProjectShareholderById(Long id);
+
+    /**
+     * 查询签约信息-添加股东构成列表
+     * 
+     * @param bmProjectShareholder 签约信息-添加股东构成
+     * @return 签约信息-添加股东构成集合
+     */
+    public List<BmProjectShareholder> selectBmProjectShareholderList(BmProjectShareholder bmProjectShareholder);
+
+    /**
+     * 新增签约信息-添加股东构成
+     * 
+     * @param bmProjectShareholder 签约信息-添加股东构成
+     * @return 结果
+     */
+    public int insertBmProjectShareholder(BmProjectShareholder bmProjectShareholder);
+
+    /**
+     * 修改签约信息-添加股东构成
+     * 
+     * @param bmProjectShareholder 签约信息-添加股东构成
+     * @return 结果
+     */
+    public int updateBmProjectShareholder(BmProjectShareholder bmProjectShareholder);
+
+    /**
+     * 批量删除签约信息-添加股东构成
+     * 
+     * @param ids 需要删除的签约信息-添加股东构成ID
+     * @return 结果
+     */
+    public int deleteBmProjectShareholderByIds(Long[] ids);
+
+    /**
+     * 删除签约信息-添加股东构成信息
+     * 
+     * @param id 签约信息-添加股东构成ID
+     * @return 结果
+     */
+    public int deleteBmProjectShareholderById(Long id);
+}

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

@@ -0,0 +1,87 @@
+<?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.BmConstructionEntryMapper">
+    
+    <resultMap type="BmConstructionEntry" id="BmConstructionEntryResult">
+        <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="selectBmConstructionEntryVo">
+        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, statistics_date, statistics_photo from bm_construction_entry
+    </sql>
+
+    <select id="selectBmConstructionEntryList" parameterType="BmConstructionEntry" resultMap="BmConstructionEntryResult">
+        <include refid="selectBmConstructionEntryVo"/>
+        <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="selectBmConstructionEntryById" parameterType="Long" resultMap="BmConstructionEntryResult">
+        <include refid="selectBmConstructionEntryVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertBmConstructionEntry" parameterType="BmConstructionEntry" useGeneratedKeys="true" keyProperty="id">
+        insert into bm_construction_entry
+        <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="updateBmConstructionEntry" parameterType="BmConstructionEntry">
+        update bm_construction_entry
+        <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="deleteBmConstructionEntryById" parameterType="Long">
+        delete from bm_construction_entry where id = #{id}
+    </delete>
+
+    <delete id="deleteBmConstructionEntryByIds" parameterType="String">
+        delete from bm_construction_entry where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -40,10 +40,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="agreementEnddate"    column="agreement_enddate"    />
         <result property="agreementPartner"    column="agreement_partner"    />
         <result property="partner"    column="partner"    />
+        <result property="partnerJob"    column="partner_job"    />
         <result property="agreementUs"    column="agreement_us"    />
         <result property="signUs"    column="sign_us"    />
+        <result property="usJob"    column="us_job"    />
         <result property="agreementThird"    column="agreement_third"    />
         <result property="third"    column="third"    />
+        <result property="thirdJob"    column="third_job"    />
         <result property="agreementUrl"    column="agreement_url"    />
         <result property="name"    column="name"    />
         <result property="legalRep"    column="legal_rep"    />
@@ -64,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBmProjectOrderinfoVo">
-        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, order_date, investment_type, is_out_investment, tot_investment, fixed_assets, overseas_investment, jnsw_investm, snsw_investm, snxw_investm, xn_investm, is_independent_lan, land_area, land_address, land_photo, circulation_land, circulation_addres, circulation_doc, circulation_photo, lease_plant_area, lease_plant_address, lease_plant_doc, lease_plant_photo, agreement_tot, agreement_tax, agreement_startdate, agreement_enddate, agreement_partner, partner, agreement_us, sign_us, agreement_third, third, agreement_url, name, legal_rep, tot_money, address, code, bussiness_url, record_name, record_code, record_tot, record_time, record_url, contact_leader, contact_phone, contact_company, contact_person, contact_person_phone from bm_project_orderinfo
+        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, order_date, investment_type, is_out_investment, tot_investment, fixed_assets, overseas_investment, jnsw_investm, snsw_investm, snxw_investm, xn_investm, is_independent_lan, land_area, land_address, land_photo, circulation_land, circulation_addres, circulation_doc, circulation_photo, lease_plant_area, lease_plant_address, lease_plant_doc, lease_plant_photo, agreement_tot, agreement_tax, agreement_startdate, agreement_enddate, agreement_partner, partner,partner_job, agreement_us, sign_us, us_job, agreement_third, third,third_job, agreement_url, name, legal_rep, tot_money, address, code, bussiness_url, record_name, record_code, record_tot, record_time, record_url, contact_leader, contact_phone, contact_company, contact_person, contact_person_phone from bm_project_orderinfo
     </sql>
 
     <select id="selectBmProjectOrderinfoList" parameterType="BmProjectOrderinfo" resultMap="BmProjectOrderinfoResult">
@@ -167,10 +170,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="agreementEnddate != null">agreement_enddate,</if>
             <if test="agreementPartner != null">agreement_partner,</if>
             <if test="partner != null">partner,</if>
+            <if test="partnerJob != null">partner_job,</if>
             <if test="agreementUs != null">agreement_us,</if>
             <if test="signUs != null">sign_us,</if>
+            <if test="usJob != null">us_job,</if>
             <if test="agreementThird != null">agreement_third,</if>
             <if test="third != null">third,</if>
+            <if test="thirdJob != null">third_job,</if>
             <if test="agreementUrl != null">agreement_url,</if>
             <if test="name != null">name,</if>
             <if test="legalRep != null">legal_rep,</if>
@@ -224,10 +230,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="agreementEnddate != null">#{agreementEnddate},</if>
             <if test="agreementPartner != null">#{agreementPartner},</if>
             <if test="partner != null">#{partner},</if>
+            <if test="partnerJob != null">#{partnerJob},</if>
             <if test="agreementUs != null">#{agreementUs},</if>
             <if test="signUs != null">#{signUs},</if>
+            <if test="usJob != null">#{usJob},</if>
             <if test="agreementThird != null">#{agreementThird},</if>
             <if test="third != null">#{third},</if>
+            <if test="thirdJob != null">#{thirdJob},</if>
             <if test="agreementUrl != null">#{agreementUrl},</if>
             <if test="name != null">#{name},</if>
             <if test="legalRep != null">#{legalRep},</if>
@@ -285,10 +294,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="agreementEnddate != null">agreement_enddate = #{agreementEnddate},</if>
             <if test="agreementPartner != null">agreement_partner = #{agreementPartner},</if>
             <if test="partner != null">partner = #{partner},</if>
+            <if test="partnerJob != null">partner_job = #{partnerJob},</if>
             <if test="agreementUs != null">agreement_us = #{agreementUs},</if>
             <if test="signUs != null">sign_us = #{signUs},</if>
+            <if test="usJob != null">us_job = #{usJob},</if>
             <if test="agreementThird != null">agreement_third = #{agreementThird},</if>
             <if test="third != null">third = #{third},</if>
+            <if test="thirdJob != null">third_job = #{thirdJob},</if>
             <if test="agreementUrl != null">agreement_url = #{agreementUrl},</if>
             <if test="name != null">name = #{name},</if>
             <if test="legalRep != null">legal_rep = #{legalRep},</if>

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

@@ -20,10 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderContractPhoto"    column="order_contract_photo"    />
         <result property="isOk"    column="is_ok"    />
         <result property="okDate"    column="ok_date"    />
+        <result property="entryPhoto"    column="entry_photo"    />
     </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, arrival_list_photo, order_contract_photo, is_ok, ok_date from bm_project_product
+        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, tot_investment, mac_investment, product_date, product_photo, arrival_list_photo, order_contract_photo, is_ok, ok_date,entry_photo from bm_project_product
     </sql>
 
     <select id="selectBmProjectProductList" parameterType="BmProjectProduct" resultMap="BmProjectProductResult">
@@ -66,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderContractPhoto != null">order_contract_photo,</if>
             <if test="isOk != null">is_ok,</if>
             <if test="okDate != null">ok_date,</if>
+            <if test="entryPhoto != null">entry_photo,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="bmProjectId != null">#{bmProjectId},</if>
@@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderContractPhoto != null">#{orderContractPhoto},</if>
             <if test="isOk != null">#{isOk},</if>
             <if test="okDate != null">#{okDate},</if>
+            <if test="entryPhoto != null">#{entryPhoto},</if>
          </trim>
     </insert>
 
@@ -102,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderContractPhoto != null">order_contract_photo = #{orderContractPhoto},</if>
             <if test="isOk != null">is_ok = #{isOk},</if>
             <if test="okDate != null">ok_date = #{okDate},</if>
+            <if test="entryPhoto != null">entry_photo = #{entryPhoto},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -0,0 +1,97 @@
+<?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.BmProjectShareholderMapper">
+    
+    <resultMap type="BmProjectShareholder" id="BmProjectShareholderResult">
+        <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="companyName"    column="company_name"    />
+        <result property="equityRatio"    column="equity_ratio"    />
+        <result property="companyCode"    column="company_code"    />
+        <result property="businessPhoto"    column="business_photo"    />
+    </resultMap>
+
+    <sql id="selectBmProjectShareholderVo">
+        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, company_name, equity_ratio, company_code, business_photo from bm_project_shareholder
+    </sql>
+
+    <select id="selectBmProjectShareholderList" parameterType="BmProjectShareholder" resultMap="BmProjectShareholderResult">
+        <include refid="selectBmProjectShareholderVo"/>
+        <where>  
+            <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
+            <if test="equityRatio != null  and equityRatio != ''"> and equity_ratio = #{equityRatio}</if>
+            <if test="companyCode != null  and companyCode != ''"> and company_code = #{companyCode}</if>
+            <if test="businessPhoto != null  and businessPhoto != ''"> and business_photo = #{businessPhoto}</if>
+        </where>
+    </select>
+    
+    <select id="selectBmProjectShareholderById" parameterType="Long" resultMap="BmProjectShareholderResult">
+        <include refid="selectBmProjectShareholderVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertBmProjectShareholder" parameterType="BmProjectShareholder" useGeneratedKeys="true" keyProperty="id">
+        insert into bm_project_shareholder
+        <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="companyName != null">company_name,</if>
+            <if test="equityRatio != null">equity_ratio,</if>
+            <if test="companyCode != null">company_code,</if>
+            <if test="businessPhoto != null">business_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="companyName != null">#{companyName},</if>
+            <if test="equityRatio != null">#{equityRatio},</if>
+            <if test="companyCode != null">#{companyCode},</if>
+            <if test="businessPhoto != null">#{businessPhoto},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBmProjectShareholder" parameterType="BmProjectShareholder">
+        update bm_project_shareholder
+        <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="companyName != null">company_name = #{companyName},</if>
+            <if test="equityRatio != null">equity_ratio = #{equityRatio},</if>
+            <if test="companyCode != null">company_code = #{companyCode},</if>
+            <if test="businessPhoto != null">business_photo = #{businessPhoto},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBmProjectShareholderById" parameterType="Long">
+        delete from bm_project_shareholder where id = #{id}
+    </delete>
+
+    <delete id="deleteBmProjectShareholderByIds" parameterType="String">
+        delete from bm_project_shareholder where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>