liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-新采购-首页'

Browse Source 
# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java
This commit is contained in:
yss
2025-02-14 20:04:09 +08:00
parent a555a1042e 596bdba9a8
commit 550f85966a
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java
View File

@ -257,7 +257,9 @@ public class ProjectCommonUtil {
* 项目采购方式 公开比选 * 项目采购方式 公开比选
*/ */
public static final String PROCUREMENT_MODE_3 = "procurement_mode_3"; public static final String PROCUREMENT_MODE_3 = "procurement_mode_3";
//询比采购 /**
* 项目采购方式 询比
*/
public static final String PROCUREMENT_MODE_13 = "procurement_mode_13"; public static final String PROCUREMENT_MODE_13 = "procurement_mode_13";
/** /**
@ -269,16 +271,14 @@ public class ProjectCommonUtil {
* 项目采购方式 竞争性谈判 * 项目采购方式 竞争性谈判
*/ */
public static final String PROCUREMENT_MODE_5 = "procurement_mode_5"; public static final String PROCUREMENT_MODE_5 = "procurement_mode_5";
/**
* 谈判
*/
public static final String PROCUREMENT_MODE_15 = "procurement_mode_15";
/** /**
* 项目采购方式 单一来源 * 项目采购方式 单一来源
*/ */
public static final String PROCUREMENT_MODE_6 = "procurement_mode_6"; public static final String PROCUREMENT_MODE_6 = "procurement_mode_6";
//直接采购 /**
* 项目采购方式 直采
*/
public static final String PROCUREMENT_MODE_16 = "procurement_mode_16"; public static final String PROCUREMENT_MODE_16 = "procurement_mode_16";
/** /**
@ -563,12 +563,13 @@ public class ProjectCommonUtil {
public static final Map<String,String[]> PROCUREMENT_MODE_MAP = new HashMap<String,String[]>(){{ public static final Map<String,String[]> PROCUREMENT_MODE_MAP = new HashMap<String,String[]>(){{
String[] biddingArray = {PROCUREMENT_MODE_1,PROCUREMENT_MODE_2}; String[] biddingArray = {PROCUREMENT_MODE_1,PROCUREMENT_MODE_2};
String[] recruitArray = {PROCUREMENT_MODE_4}; // String[] recruitArray = {PROCUREMENT_MODE_4};
String[] negotiationArray = {PROCUREMENT_MODE_5,PROCUREMENT_MODE_15,PROCUREMENT_MODE_6,PROCUREMENT_MODE_16}; String[] xbArray = {PROCUREMENT_MODE_13};
String[] negotiationArray = {PROCUREMENT_MODE_16};
//招标 //招标
this.put("01",biddingArray); this.put("01",biddingArray);
//招募 //询比
this.put("03",recruitArray); this.put("03",xbArray);
//谈判 //谈判
this.put("04",negotiationArray); this.put("04",negotiationArray);
}}; }};

15
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml
View File

@ -111,11 +111,14 @@
delete from biz_project_record where id = #{id} delete from biz_project_record where id = #{id}
</delete> </delete>
<select id="getUserProjectRecordCount" parameterType="com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO" resultType="java.util.Map"> <select id="getUserProjectRecordCount" parameterType="com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO" resultType="java.util.Map">
SELECT bid_method_dict as bidMethodDict, SELECT dict.code as bidMethodDict,
count(id) projectCount count(xm.id) projectCount
from biz_project_record from dict_project dict
where date_format(create_date, '%Y%m') = #{vo.selectDate} LEFT JOIN
and app_manager_id = #{vo.appManagerId} (
GROUP BY bid_method_dict ORDER BY bid_method_dict SELECT bid_method_dict,id from biz_project_record where date_format(create_date, '%Y%m') = #{vo.selectDate} and app_manager_id = #{vo.appManagerId}
) xm ON dict.code= xm.bid_method_dict
where dict.code in ('procurement_mode_1','procurement_mode_2','procurement_mode_13','procurement_mode_5','procurement_mode_16')
GROUP BY dict.code ORDER BY dict.code;
</select> </select>
</mapper> </mapper>