添加copyTenderProject方法，补selectExpertTenderProjectList方法

com.gx.obe.service/src/main/java/com/gx/obe/server/common/utils/UuidUtils.java

+package com.gx.obe.server.common.utils;
+
+import java.io.PrintStream;
+import java.util.UUID;
+
+public class UuidUtils
+{
+  public static String getUUID()
+  {
+    String uuid = UUID.randomUUID().toString();
+    return uuid.replace("-", "");
+  }
+  
+  public static void main(String[] arges)
+  {
+    System.out.println(UUID.randomUUID().toString());
+    System.out.println(UUID.randomUUID().toString());
+    System.out.println(UUID.randomUUID().toString());
+    System.out.println(UUID.randomUUID().toString());
+    System.out.println(getUUID());
+    
+    String uuid = getUUID();
+    uuid = uuid.substring(uuid.length() - 12, uuid.length());
+    uuid = uuid.toUpperCase();
+    StringBuilder trialMac = new StringBuilder();
+    for (int i = 0; i < 12; i++)
+    {
+      trialMac.append(uuid.charAt(i));
+      if ((i % 2 != 0) && (i < 11)) {
+        trialMac.append("-");
+      }
+    }
+    System.out.println(trialMac);
+  }
+}

com.gx.obe.service/src/main/java/com/gx/obe/server/management/project/controller/TenderProjectController.java

@@ -5,11 +5,7 @@ import java.util.List;
 import java.util.Map;
 
 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.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -797,4 +793,9 @@ public class TenderProjectController  extends BaseController<TenderProjectServic
 		 return tenderProjectService.isUploadEvalResult(tenderId);
 	 }
 
+	 @PostMapping({"/copyTenderProject"})
+	 public String copyTenderProject(@RequestParam("tenderNo") String tenderNo, @RequestParam("stageId") String stageId, @RequestParam("tenderNonumber") String tenderNonumber, @RequestParam("username") String username, @RequestParam("password") String password, @RequestParam("copyStatus") String copyStatus) {
+		 return this.tenderProjectService.copyProject(tenderNo, stageId, tenderNonumber, username, password, copyStatus);
+	 }
+
 }
\ No newline at end of file

com.gx.obe.service/src/main/java/com/gx/obe/server/management/project/dao/TenderProjectMapper.java

@@ -407,4 +407,6 @@ public interface TenderProjectMapper extends BaseMapper<TenderProject> {
 	 * @return
 	 */
 	String getUploadEvalResultStatus(@Param("tenderId")String tenderId);
+
+    String getTenderId(@Param("tenderNo")String tenderNo, @Param("stageId")String stageId, @Param("tenderNonumber")String tenderNonumber);
 }
\ No newline at end of file

com.gx.obe.service/src/main/java/com/gx/obe/server/management/project/service/TenderProjectService.java

@@ -510,5 +510,7 @@ public interface TenderProjectService extends IService<TenderProject> {
 	 * @return
 	 */
 	public boolean updateEvaluationComplateStatus(String tenderId, String parentId, String archiveStatus, Date date);
+
+     String copyProject(String tenderNo, String stageId, String tenderNonumber, String username, String password, String copyStatus);
  }
 

com.gx.obe.service/src/main/java/com/gx/obe/server/management/supplier/entity/Supplier.java

@@ -294,6 +294,17 @@ public class Supplier extends Model<Supplier> {
     @TableField("QUALIFIED_STATUS")
     private String qualifiedStatus ; // 供应商合格状态
 
+    @TableField("SOURCE_ID")
+    private String sourceId;
+
+    public String getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(String sourceId) {
+        this.sourceId = sourceId;
+    }
+
     public String getId() {
 		return id;
 	}

com.gx.obe.service/src/main/resources/mapper/TenderProjectMapper.xml

@@ -1379,7 +1379,7 @@
     </select>
     
     
- 	<select  id="selectUniqueTedderProjectCount" resultType="Integer">	
+ 	<select  id="selectUniqueTedderProjectCount" resultType="java.lang.Integer">
     	SELECT
 			COUNT( t.TENDER_ID ) COUNT 
 		FROM
@@ -1403,7 +1403,7 @@
     
     
         <!-- parameterType="List" -->
-    <select id="getTenderIdList" resultType="String">
+    <select id="getTenderIdList" resultType="java.lang.String">
    	 	SELECT
    	 		TENDER_ID
    	 	FROM obe_tender_project 
@@ -1411,7 +1411,7 @@
     </select> 
     
     <!-- 是否进入评审阶段 -->
-     <select id="isInEvaluation"  resultType="Integer">
+     <select id="isInEvaluation"  resultType="java.lang.Integer">
    		SELECT
 			COUNT( t.USER_ID ) 
 		FROM
@@ -1515,7 +1515,7 @@
    </update>
 
    <!-- 查询项目下的所有包件的开标信息 -->
-   <select id="selectTenderPackOpeningInfoList"  resultType="java.util.HashMap">
+   <select id="selectTenderPackOpeningInfoList"  resultType="java.util.Map">
 		SELECT
 			t.TENDER_ID,
 			t.TENDER_NO,
@@ -1686,7 +1686,7 @@
    	</select>
    	
    	<!-- 获得最新获取投标信息状态 -->
-   	<select id="getLatestBidinfo" resultType="String">
+   	<select id="getLatestBidinfo" resultType="java.lang.String">
    		SELECT
   			(
   				CASE 
@@ -1701,7 +1701,7 @@
    	</select>
    	
    		<!-- 是否完成开标 -->
-   	<select id="getBidOpeningStatus" resultType="String">
+   	<select id="getBidOpeningStatus" resultType="java.lang.String">
    		SELECT
 			t.BID_OPENING_STATUS 
 		FROM
@@ -1711,7 +1711,7 @@
    	</select>
    	
    	<!-- 评标是否结束 -->
-   	<select id="getComplateStatus" resultType="String">
+   	<select id="getComplateStatus" resultType="java.lang.String">
    		SELECT
 			<!-- t.COMPLATE_STATUS --> 
 			t.UPLOAD_EVALUATION_RESULT_STATUS
@@ -1721,7 +1721,7 @@
 			t.TENDER_ID = #{tenderId}
    	</select>
    	
-   	<select id="queryTenderIdListByTenderNoAndparentId" resultType="String">
+   	<select id="queryTenderIdListByTenderNoAndparentId" resultType="java.lang.String">
    		SELECT
    	 		TENDER_ID
    	 	FROM obe_tender_project 
@@ -1730,7 +1730,7 @@
    	</select>
    	
    	<!--  -->
-   	<select id="queryTenderProjectIdsList" resultType="java.util.HashMap">
+   	<select id="queryTenderProjectIdsList" resultType="java.util.Map">
 		SELECT DISTINCT
 			t.TENDER_ID,
 			t.TENDER_PARENT_ID 
@@ -1771,7 +1771,7 @@
 			t.TENDER_NO	   	
    	</select>
    	
-   	<select id="getTenderPackEvaluationInfoList" resultType="java.util.HashMap">
+   	<select id="getTenderPackEvaluationInfoList" resultType="java.util.Map">
 	   	SELECT
 			T.TENDER_ID,
 			T.TENDER_NO,
@@ -1797,7 +1797,7 @@
    	</select>
    	
    	<!-- 获得可生成报表的包件信息 -->
-   	<select id="getReportTenderPackInfoList"  resultType="java.util.HashMap">
+   	<select id="getReportTenderPackInfoList"  resultType="java.util.Map">
 	   	SELECT
 			T.TENDER_ID,
 			T.TENDER_NO,
@@ -1836,7 +1836,7 @@
 		ORDER BY T.SORT_NO, T.CREATE_TIME
    	</select>
    	<!-- 获得当前项目下所有标段专家信息 -->
-   	<select id="getTenderPackExpertInfoList" resultType="java.util.HashMap">
+   	<select id="getTenderPackExpertInfoList" resultType="java.util.Map">
    		SELECT
 			T.TENDER_ID,
 			T.TENDER_NO,
@@ -1881,7 +1881,7 @@
    	</update>
    	
  	<!-- 验证项目是否已经完成指定阶段的开标 -->
-   	<select id="isComplateProjectOpeningByStage" resultType="Integer">
+   	<select id="isComplateProjectOpeningByStage" resultType="java.lang.Integer">
           
 	  	SELECT
 	  		COUNT(TENDER_ID)
@@ -1930,7 +1930,7 @@
      </delete>
 
 	<!-- 评标是已上传评标结果 -->
-	<select id="getUploadEvalResultStatus" resultType="String">
+	<select id="getUploadEvalResultStatus" resultType="java.lang.String">
 		SELECT
 			t.UPLOAD_EVALUATION_RESULT_STATUS
 		FROM
@@ -1939,4 +1939,20 @@
 			t.TENDER_ID = #{tenderId}
 	</select>
 
+	<select id="getTenderId" resultType="java.lang.String">
+		SELECT
+			TENDER_ID
+		FROM
+			OBE_TENDER_PROJECT
+		WHERE
+			TENDER_NO = #{tenderNo}
+			AND STAGE_ID = #{stageId}
+			AND TENDERNO_NUMBER = #{tenderNonumber}
+			AND USER_ID != ''
+	</select>
+	<select id="selectExpertTenderProjectList"
+			resultType="com.gx.obe.server.management.project.entity.TenderProject"></select>
+	<select id="findSignBidTenderPackagePageList"
+			resultType="com.gx.obe.server.management.project.entity.TenderProject"></select>
+
 </mapper>