1127

src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java

@@ -20,7 +20,7 @@ public class PlmProjectInfo extends QueryPage {
      * 源项目编码
      */
     private String oriProjectId;
-
+    private String productSet;
     /**
      * 项目类型编码
      */
@@ -289,5 +289,13 @@ public class PlmProjectInfo extends QueryPage {
     public void setCustomerProjectNo(String customerProjectNo) {
         this.customerProjectNo = customerProjectNo;
     }
+
+    public String getProductSet() {
+        return productSet;
+    }
+
+    public void setProductSet(String productSet) {
+        this.productSet = productSet;
+    }
 }
 

src/main/resources/mapper/project/ProjectDao.xml

@@ -10,7 +10,7 @@
         dbo.plm_get_projectBaseDesc(status,'project_status') projectStatusDesc,dbo.plm_get_dictDataLabel('project_info_source',project_source,site) projectSourceDesc,
         dbo.plm_get_customer_desc(site,customer_id) customerName,dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,need_date,
         dbo.get_projectUserRoleName(site,project_id) userRoleName,parent_project_no,
-        final_customer_id,dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site) finalCustomerName
+        final_customer_id,dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site) finalCustomerName,productSet
         FROM plm_project_info
         <where>
             <if test="site != null and site != ''">
@@ -36,7 +36,7 @@
         dbo.plm_get_projectBaseDesc(status,'project_status') projectStatusDesc,dbo.plm_get_dictDataLabel('project_info_source',project_source,site) projectSourceDesc,
         dbo.plm_get_customer_desc(site,customer_id) customerName,dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,need_date,
         dbo.get_projectUserRoleName(site,project_id) userRoleName,parent_project_no,customer_project_no,
-        final_customer_id,dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site) finalCustomerName
+        final_customer_id,dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site) finalCustomerName,productSet
         FROM plm_project_info
         <where>
              <if test="query.id != null">
@@ -70,7 +70,7 @@
     ,dbo.get_projectTeamName(site,project_id,'manager') ProjectManagerName,dbo.plm_get_dictDataLabel('project_info_type_db',project_type_db,site) projectType,
     dbo.plm_get_projectBaseDesc(status,'project_status') projectStatusDesc,dbo.plm_get_dictDataLabel('project_info_source',project_source,site) projectSourceDesc,
     dbo.plm_get_customer_desc(site,customer_id) customerName,dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,need_date,
-    dbo.get_projectUserRoleName(site,project_id) userRoleName,parent_project_no
+    dbo.get_projectUserRoleName(site,project_id) userRoleName,parent_project_no,productSet
     FROM plm_project_info where id=#{id}
 </select>
 
@@ -127,16 +127,16 @@
     insert into plm_project_info
     (project_id,ori_project_id,project_type_db,project_name,status,project_source,customer_id,create_by,
     create_date,priority,site,project_desc,customer_remark,remark,need_date,parent_project_no,final_customer_id,
-    customer_Project_No) values
+    customer_Project_No,productSet ) values
     (#{projectId},#{projectId},#{projectTypeDb},#{projectName},#{status},#{projectSource},#{customerId},
     #{createBy},GetDate(),#{priority},#{site},#{projectDesc},#{customerRemark},#{remark},#{needDate},#{parentProjectNo}
-    ,#{finalCustomerId},#{customerProjectNo})
+    ,#{finalCustomerId},#{customerProjectNo},#{productSet})
 
 </insert>
 <update id="updateProjectInfo">
     update plm_project_info set project_type_db=#{projectTypeDb},project_name=#{projectName},project_source=#{projectSource},status=#{status},
     customer_id=#{customerId},priority=#{priority},project_desc=#{projectDesc},customer_remark=#{customerRemark},remark=#{remark},need_date=#{needDate},
-    update_by=#{updateBy},update_date=GetDate(),parent_project_no = #{parentProjectNo},final_customer_id=#{finalCustomerId}
+    update_by=#{updateBy},update_date=GetDate(),parent_project_no = #{parentProjectNo},final_customer_id=#{finalCustomerId},productSet=#{productSet}
     ,customer_Project_No=#{customerProjectNo} where id=#{id}
 </update>
 <delete id="deletePlmProjectTeam">

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -1074,6 +1074,9 @@ step_id,reject_flag,reject_step_id,mpOperator,pod
             <if test="finalPartNo!= null and finalPartNo != ''">
                 AND a.Final_Part_No like #{finalPartNo}
             </if>
+            <if test="customerPartNo!= null and customerPartNo != ''">
+                AND pcpi.customer_part_no like #{customerPartNo}
+            </if>
             <if test="testPartNo!= null and testPartNo != ''">
                 AND a.Test_part_no like #{testPartNo}
             </if>

src/main/resources/mapper/sys/SysUserDao.xml

@@ -76,7 +76,13 @@
 
 		<where>
 		    <if test="query.username != null and query.username !=''">
-				AND username like '%' + #{query.username} + '%'
+				AND username like  #{query.username}
+			</if>
+			   <if test="query.userDisplay != null and query.userDisplay !=''">
+				AND user_display like #{query.userDisplay}
+			</if>
+			   <if test="query.domainControlAccount != null and query.domainControlAccount !=''">
+				AND domain_Control_Account like  #{query.domainControlAccount}
 			</if>
 			<!--<if test="query.createUserId != null">
 				AND create_user_id = #{query.createUserId}