diff --git a/oms_web/oms_vue/src/api/project/info.js b/oms_web/oms_vue/src/api/project/info.js
index 4d6708a6..a02b777e 100644
--- a/oms_web/oms_vue/src/api/project/info.js
+++ b/oms_web/oms_vue/src/api/project/info.js
@@ -52,3 +52,22 @@ export function exportProject(query) {
params: query
})
}
+
+// 项目收藏
+export function addCollect(data) {
+ return request({
+ url: '/project/collect/add',
+ method: 'post',
+ data: data,
+ needLoading:true
+ })
+}
+export function editJoinTrial(data) {
+ return request({
+ url: '/sip/project/vue/joinTrial',
+ method: 'put',
+ data: data,
+ needLoading:true
+ })
+}
+
diff --git a/oms_web/oms_vue/src/views/project/info/index.vue b/oms_web/oms_vue/src/views/project/info/index.vue
index 03efba46..5aae6ee4 100644
--- a/oms_web/oms_vue/src/views/project/info/index.vue
+++ b/oms_web/oms_vue/src/views/project/info/index.vue
@@ -84,6 +84,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -190,6 +202,17 @@
{{ parseTime(scope.row.lastWorkUpdateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
生成订单
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectUserCollectInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectUserCollectInfoController.java
new file mode 100644
index 00000000..3417cf73
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectUserCollectInfoController.java
@@ -0,0 +1,102 @@
+package com.ruoyi.sip.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.sip.domain.ProjectUserCollectInfo;
+import com.ruoyi.sip.service.IProjectUserCollectInfoService;
+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 2026-01-06
+ */
+@Controller
+@RequestMapping("/project/collect")
+public class ProjectUserCollectInfoController extends BaseController
+{
+
+
+ @Autowired
+ private IProjectUserCollectInfoService projectUserCollectInfoService;
+
+
+
+ /**
+ * 查询产品库存列表
+ */
+ @RequiresPermissions("sip:projectCollect:list")
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(ProjectUserCollectInfo projectUserCollectInfo)
+ {
+ startPage();
+ List list = projectUserCollectInfoService.selectProjectUserCollectInfoList(projectUserCollectInfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出产品库存列表
+ */
+ @RequiresPermissions("sip:projectCollect:export")
+ @Log(title = "产品库存", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ @ResponseBody
+ public AjaxResult export(ProjectUserCollectInfo projectUserCollectInfo)
+ {
+ List list = projectUserCollectInfoService.selectProjectUserCollectInfoList(projectUserCollectInfo);
+ ExcelUtil util = new ExcelUtil(ProjectUserCollectInfo.class);
+ return util.exportExcel(list, "产品库存数据");
+ }
+
+
+
+ /**
+ * 新增保存产品库存
+ */
+
+ @Log(title = "产品库存", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ @ResponseBody
+ public AjaxResult addSave( @RequestBody ProjectUserCollectInfo projectUserCollectInfo)
+ {
+ projectUserCollectInfo.setUserId(getUserId());
+ return toAjax(projectUserCollectInfoService.insertProjectUserCollectInfo(projectUserCollectInfo));
+ }
+
+
+
+ /**
+ * 修改保存产品库存
+ */
+ @RequiresPermissions("sip:projectCollect:edit")
+ @Log(title = "产品库存", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ @ResponseBody
+ public AjaxResult editSave(ProjectUserCollectInfo projectUserCollectInfo)
+ {
+ return toAjax(projectUserCollectInfoService.updateProjectUserCollectInfo(projectUserCollectInfo));
+ }
+
+ /**
+ * 删除产品库存
+ */
+ @RequiresPermissions("sip:projectCollect:remove")
+ @Log(title = "产品库存", businessType = BusinessType.DELETE)
+ @PostMapping( "/remove")
+ @ResponseBody
+ public AjaxResult remove(String ids)
+ {
+ return toAjax(projectUserCollectInfoService.deleteProjectUserCollectInfoByIds(ids));
+ }
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectInfoController.java
index 572e3398..f323bc77 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectInfoController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectInfoController.java
@@ -42,6 +42,7 @@ public class VueProjectInfoController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(ProjectInfo projectInfo) {
startPage();
+ projectInfo.setCurrentUserId(getUserId());
List list = projectInfoService.selectProjectInfoList(projectInfo);
return getDataTable(list);
}
@@ -91,6 +92,12 @@ public class VueProjectInfoController extends BaseController {
public AjaxResult edit(@RequestBody ProjectInfo projectInfo) {
return toAjax(projectInfoService.updateProjectInfo(projectInfo));
}
+ @RequiresPermissions("sip:project:edit")
+ @Log(title = "项目管理", businessType = BusinessType.UPDATE)
+ @PutMapping("/joinTrial")
+ public AjaxResult editJoinTrial(@RequestBody ProjectInfo projectInfo) {
+ return toAjax(projectInfoService.editJoinTrial(projectInfo));
+ }
/**
* 删除项目管理
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java
index 26e707e9..7634bfda 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java
@@ -140,6 +140,12 @@ public class ProjectInfo extends BaseEntity
@Excel(name = "服务器配置")
private String serverConfiguration;
+ /** 会审 0 否 1是*/
+ @Excel(name = "会审")
+ private String jointTrial;
+ /** 个人收藏 0 否 1是*/
+ private String collect;
+ private Long currentUserId;
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectUserCollectInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectUserCollectInfo.java
new file mode 100644
index 00000000..55104d63
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectUserCollectInfo.java
@@ -0,0 +1,38 @@
+package com.ruoyi.sip.domain;
+
+import lombok.Data;
+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 java.util.List;
+
+/**
+ * 产品库存对象 project_user_collect_info
+ *
+ * @author ruoyi
+ * @date 2026-01-06
+ */
+@Data
+public class ProjectUserCollectInfo extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** */
+ private Long id;
+
+ /** */
+ @Excel(name = "")
+ private Long projectId;
+ private List projectIdList;
+
+ /** */
+ @Excel(name = "")
+ private Long userId;
+
+ /** 是否收藏 0:未 1:已收藏 */
+ @Excel(name = "是否收藏 0:未 1:已收藏")
+ private String collect;
+
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectUserCollectInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectUserCollectInfoMapper.java
new file mode 100644
index 00000000..f3596a7f
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectUserCollectInfoMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.sip.mapper;
+
+import java.util.List;
+import com.ruoyi.sip.domain.ProjectUserCollectInfo;
+
+/**
+ * 产品库存Mapper接口
+ *
+ * @author ruoyi
+ * @date 2026-01-06
+ */
+public interface ProjectUserCollectInfoMapper
+{
+ /**
+ * 查询产品库存
+ *
+ * @param id 产品库存主键
+ * @return 产品库存
+ */
+ public ProjectUserCollectInfo selectProjectUserCollectInfoById(Long id);
+
+ /**
+ * 查询产品库存列表
+ *
+ * @param projectUserCollectInfo 产品库存
+ * @return 产品库存集合
+ */
+ public List selectProjectUserCollectInfoList(ProjectUserCollectInfo projectUserCollectInfo);
+
+ /**
+ * 新增产品库存
+ *
+ * @param projectUserCollectInfo 产品库存
+ * @return 结果
+ */
+ public int insertProjectUserCollectInfo(ProjectUserCollectInfo projectUserCollectInfo);
+
+ /**
+ * 修改产品库存
+ *
+ * @param projectUserCollectInfo 产品库存
+ * @return 结果
+ */
+ public int updateProjectUserCollectInfo(ProjectUserCollectInfo projectUserCollectInfo);
+
+ /**
+ * 删除产品库存
+ *
+ * @param id 产品库存主键
+ * @return 结果
+ */
+ public int deleteProjectUserCollectInfoById(Long id);
+
+ /**
+ * 批量删除产品库存
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteProjectUserCollectInfoByIds(String[] ids);
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectInfoService.java
index 48a2c63c..e6c09fb3 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectInfoService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectInfoService.java
@@ -68,4 +68,6 @@ public interface IProjectInfoService
ProjectInfo selectProjectInfoByOrderCode(String orderCode);
+
+ int editJoinTrial(ProjectInfo projectInfo);
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectUserCollectInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectUserCollectInfoService.java
new file mode 100644
index 00000000..ba78cb86
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectUserCollectInfoService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.sip.service;
+
+import java.util.List;
+import com.ruoyi.sip.domain.ProjectUserCollectInfo;
+
+/**
+ * 产品库存Service接口
+ *
+ * @author ruoyi
+ * @date 2026-01-06
+ */
+public interface IProjectUserCollectInfoService
+{
+ /**
+ * 查询产品库存
+ *
+ * @param id 产品库存主键
+ * @return 产品库存
+ */
+ public ProjectUserCollectInfo selectProjectUserCollectInfoById(Long id);
+
+ /**
+ * 查询产品库存列表
+ *
+ * @param projectUserCollectInfo 产品库存
+ * @return 产品库存集合
+ */
+ public List selectProjectUserCollectInfoList(ProjectUserCollectInfo projectUserCollectInfo);
+
+ /**
+ * 新增产品库存
+ *
+ * @param projectUserCollectInfo 产品库存
+ * @return 结果
+ */
+ public int insertProjectUserCollectInfo(ProjectUserCollectInfo projectUserCollectInfo);
+
+ /**
+ * 修改产品库存
+ *
+ * @param projectUserCollectInfo 产品库存
+ * @return 结果
+ */
+ public int updateProjectUserCollectInfo(ProjectUserCollectInfo projectUserCollectInfo);
+
+ /**
+ * 批量删除产品库存
+ *
+ * @param ids 需要删除的产品库存主键集合
+ * @return 结果
+ */
+ public int deleteProjectUserCollectInfoByIds(String ids);
+
+ /**
+ * 删除产品库存信息
+ *
+ * @param id 产品库存主键
+ * @return 结果
+ */
+ public int deleteProjectUserCollectInfoById(Long id);
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
index 9b867ddd..b2c28c93 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
@@ -67,6 +67,8 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
@Autowired
private ICustomerInfoService customerInfoService;
+ @Autowired
+ private IProjectUserCollectInfoService projectUserCollectInfoService;
@Autowired
private IProjectOrderInfoService orderInfoService;
private static final String PROJECT_CODE_PREFIX = "V";
@@ -143,13 +145,20 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
List idList = projectInfos.stream().map(ProjectInfo::getId).collect(Collectors.toList());
List projectOrderInfos = orderInfoService.selectProjectOrderInfoByProjectId(idList);
Map orderInfoMap = projectOrderInfos.stream().collect(Collectors.toMap(ProjectOrderInfo::getProjectId, Function.identity(), (v1, v2) -> v1));
+ ProjectUserCollectInfo queryInfo = new ProjectUserCollectInfo();
+ queryInfo.setUserId(ShiroUtils.getUserId());
+ queryInfo.setProjectIdList(idList);
+ List projectUserCollectInfos = projectUserCollectInfoService.selectProjectUserCollectInfoList(queryInfo);
+ Map projectCollectMap = projectUserCollectInfos.stream().collect(
+ Collectors.toMap(ProjectUserCollectInfo::getProjectId, ProjectUserCollectInfo::getCollect, (v1, v2) -> v1));
+
LocalDate now = LocalDate.now();
for (ProjectInfo info : projectInfos) {
CustomerInfo customerInfo = customerInfoMap.get(info.getCustomerCode());
if (customerInfo != null) {
info.setCustomerAddress(customerInfo.getAddress());
}
- info.setCanGenerate(orderInfoMap.get(info.getId()) == null);
+ info.setCanGenerate(orderInfoMap.get(info.getId()) == null && "1".equals(info.getJointTrial()));
if (info.getLastWorkUpdateTime() != null) {
LocalDate localDate = info.getLastWorkUpdateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
Period between = Period.between(localDate, now);
@@ -157,8 +166,7 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
} else {
info.setHighlight(false);
}
-
-
+ info.setCollect(projectCollectMap.getOrDefault(info.getId(),"0"));
}
return projectInfos;
}
@@ -244,7 +252,7 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
}
//变更属地校验
List projectOrderInfos = orderInfoService.selectProjectOrderInfoByProjectId(Collections.singletonList(projectInfo.getId()));
- if (!projectInfo.getAgentCode().equals(oldProjectInfo.getAgentCode())) {
+ if (!oldProjectInfo.getAgentCode().equals(projectInfo.getAgentCode())) {
//查询订单信息 如果有抛出异常
if (CollUtil.isNotEmpty(projectOrderInfos)) {
throw new ServiceException("该项目存在订单流转，无法更改代表处");
@@ -594,11 +602,26 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
return projectInfoMapper.selectProjectInfoByOrderCode(orderCode);
}
+ @Override
+ public int editJoinTrial(ProjectInfo projectInfo) {
+ return projectInfoMapper.updateProjectInfo(projectInfo);
+ }
+
private List fetchProjectInfos(ProjectInfo projectInfo) {
+ projectInfo.setCurrentUserId(ShiroUtils.getUserId());
List projectInfos = projectInfoMapper.selectProjectInfoList(projectInfo);
if (CollUtil.isEmpty(projectInfos)) {
throw new ServiceException("未找到符合条件的项目信息");
}
+ ProjectUserCollectInfo queryInfo = new ProjectUserCollectInfo();
+ queryInfo.setUserId(ShiroUtils.getUserId());
+ queryInfo.setProjectIdList(projectInfos.stream().map(ProjectInfo::getId).collect(Collectors.toList()));
+ List projectUserCollectInfos = projectUserCollectInfoService.selectProjectUserCollectInfoList(queryInfo);
+ Map projectCollectMap = projectUserCollectInfos.stream().collect(
+ Collectors.toMap(ProjectUserCollectInfo::getProjectId, ProjectUserCollectInfo::getCollect, (v1, v2) -> v1));
+ projectInfos.forEach(item -> {
+ item.setCollect(projectCollectMap.getOrDefault(item.getId(),"0"));
+ });
return projectInfos;
}
@@ -728,6 +751,8 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
headerList.add(Collections.singletonList("项目描述"));
headerList.add(Collections.singletonList("服务器配置"));
headerList.add(Collections.singletonList("更新时间"));
+ headerList.add(Collections.singletonList("收藏"));
+ headerList.add(Collections.singletonList("会审"));
// 添加软件产品列
@@ -796,6 +821,8 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
row.add(info.getProjectDesc());
row.add(info.getServerConfiguration());
row.add(DateUtil.format(info.getUpdateTime(), "yyyy-MM-dd"));
+ row.add("1".equals(info.getCollect())?"是":"否");
+ row.add("1".equals(info.getJointTrial())?"是":"否");
BigDecimal totalPrice = BigDecimal.ZERO;
// 添加软件产品列
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectUserCollectInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectUserCollectInfoServiceImpl.java
new file mode 100644
index 00000000..dbaeeec1
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectUserCollectInfoServiceImpl.java
@@ -0,0 +1,94 @@
+package com.ruoyi.sip.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.sip.mapper.ProjectUserCollectInfoMapper;
+import com.ruoyi.sip.domain.ProjectUserCollectInfo;
+import com.ruoyi.sip.service.IProjectUserCollectInfoService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 产品库存Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2026-01-06
+ */
+@Service
+public class ProjectUserCollectInfoServiceImpl implements IProjectUserCollectInfoService
+{
+ @Autowired
+ private ProjectUserCollectInfoMapper projectUserCollectInfoMapper;
+
+ /**
+ * 查询产品库存
+ *
+ * @param id 产品库存主键
+ * @return 产品库存
+ */
+ @Override
+ public ProjectUserCollectInfo selectProjectUserCollectInfoById(Long id)
+ {
+ return projectUserCollectInfoMapper.selectProjectUserCollectInfoById(id);
+ }
+
+ /**
+ * 查询产品库存列表
+ *
+ * @param projectUserCollectInfo 产品库存
+ * @return 产品库存
+ */
+ @Override
+ public List selectProjectUserCollectInfoList(ProjectUserCollectInfo projectUserCollectInfo)
+ {
+ return projectUserCollectInfoMapper.selectProjectUserCollectInfoList(projectUserCollectInfo);
+ }
+
+ /**
+ * 新增产品库存
+ *
+ * @param projectUserCollectInfo 产品库存
+ * @return 结果
+ */
+ @Override
+ public int insertProjectUserCollectInfo(ProjectUserCollectInfo projectUserCollectInfo)
+ {
+ return projectUserCollectInfoMapper.insertProjectUserCollectInfo(projectUserCollectInfo);
+ }
+
+ /**
+ * 修改产品库存
+ *
+ * @param projectUserCollectInfo 产品库存
+ * @return 结果
+ */
+ @Override
+ public int updateProjectUserCollectInfo(ProjectUserCollectInfo projectUserCollectInfo)
+ {
+ return projectUserCollectInfoMapper.updateProjectUserCollectInfo(projectUserCollectInfo);
+ }
+
+ /**
+ * 批量删除产品库存
+ *
+ * @param ids 需要删除的产品库存主键
+ * @return 结果
+ */
+ @Override
+ public int deleteProjectUserCollectInfoByIds(String ids)
+ {
+ return projectUserCollectInfoMapper.deleteProjectUserCollectInfoByIds(Convert.toStrArray(ids));
+ }
+
+ /**
+ * 删除产品库存信息
+ *
+ * @param id 产品库存主键
+ * @return 结果
+ */
+ @Override
+ public int deleteProjectUserCollectInfoById(Long id)
+ {
+ return projectUserCollectInfoMapper.deleteProjectUserCollectInfoById(id);
+ }
+}
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
index b70731f3..d1ede57e 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
@@ -32,12 +32,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
select id, project_code, project_name,bg_property, customer_code, customer_name, industry_type, agent_code, project_stage, project_grasp_degree, hz_support_user, operate_institution
, partner_code, partner_name, contact_way, estimated_amount, currency_type, estimated_order_time, estimated_deliver_time, competitor, country_product, server_configuration
- , key_problem, project_desc, create_by, create_time, update_by, update_time,customer_user_name,customer_phone,partner_email,partner_user_name,h3c_person,h3c_phone,poc from project_info t1
+ , key_problem, project_desc, create_by, create_time, update_by, update_time,customer_user_name,customer_phone,partner_email,partner_user_name,h3c_person,h3c_phone,poc,joint_trial from project_info t1
select t1.id,
@@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t1.create_time,
t1.update_by,
t1.update_time,
+ t1.joint_trial,
t1.customer_user_name,t1.customer_phone,t1.partner_user_name,t1.h3c_person,t1.poc,t1.h3c_phone,
t2.agent_name,t2.contact_email,t2.contact_phone,t2.contact_person,
t3.user_name as hz_support_user_name,
@@ -96,6 +98,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and t1.customer_name like concat('%', #{customerName}, '%')
and t1.industry_type = #{industryType}
and t1.bg_property = #{bgProperty}
+ and t1.joint_trial = #{jointTrial}
+
+
+
+ and t1.id in (select project_id from project_user_collect_info where user_id=#{currentUserId} and collect = '1')
+
+
+ and t1.id not in (select project_id from project_user_collect_info where user_id=#{currentUserId} and collect = '1')
+
+
+
and find_in_set(t1.project_stage , #{projectStage})
and t1.project_grasp_degree = #{projectGraspDegree}
@@ -244,6 +257,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
create_time,
update_by,
update_time,
+ joint_trial ,
#{projectCode},
@@ -280,6 +294,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{createTime},
#{updateBy},
#{updateTime},
+ #{jointTrial},
@@ -322,6 +337,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
create_time = #{createTime},
update_by = #{updateBy},
update_time = #{updateTime},
+ joint_trial = #{jointTrial},
where id = #{id}
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectUserCollectInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectUserCollectInfoMapper.xml
new file mode 100644
index 00000000..5892efa1
--- /dev/null
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectUserCollectInfoMapper.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ select id, project_id, user_id, collect from project_user_collect_info
+
+
+
+
+
+
+
+ insert into project_user_collect_info
+
+ project_id,
+ user_id,
+ collect,
+
+
+ #{projectId},
+ #{userId},
+ #{collect},
+
+ on duplicate key update collect=values(collect)
+
+
+
+
+ update project_user_collect_info
+
+ project_id = #{projectId},
+ user_id = #{userId},
+ collect = #{collect},
+
+ where id = #{id}
+
+
+
+ delete from project_user_collect_info where id = #{id}
+
+
+
+ delete from project_user_collect_info where id in
+
+ #{id}
+
+
+
+
\ No newline at end of file