111

src/main/java/com/spring/modules/customer/vo/CustomerInformationVo.java

@@ -16,6 +16,7 @@ public class CustomerInformationVo extends CustomerInformationEntity {
      * 联系人
      **/
     private String contactName;
+    private String customerIndustry;
     /**
      * 联系电话
      **/

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

@@ -590,13 +590,15 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_
                pci.turnover_of_year,
                pci.potential_revenue_of_year,
                pci.customer_status,
+                pci.customer_type,
+                     dbo.plm_get_dictDataLabel('plm_customer_information_customer_industry', pci.customer_industry,
+                                         pci.site)                            as customer_industry,
                case
                    when pci.customer_status = 'Y' then '启用'
                    when pci.customer_status = 'N' then '停用'
                    else '' end                                            as customerStatusDesc,
                pci.customer_description,
                dbo.plm_get_dictDataLabel('plm_customer_information_important_customer', pci.important_customer, ppi.site) as important_customer,
-               pci.customer_industry,
                pci.customer_group
         from plm_project_info ppi
         left join dbo.plm_customer_information pci on ppi.customer_id = pci.customer_no

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

@@ -64,12 +64,12 @@
            dbo.get_userDisPlay(a.csOperater)                                             csOperaterName
             ,
            a.dccOperater,
-           dbo.get_userDisPlay(a.dccOperater)                                            dccOperaterName,
+            dbo.get_technicalSpecificationTeamNames(a.site, a.code_no, 'dcc')               dccOperaterName,
            d.is_reject,
            d.node_id,
            d.node_name,
            pcpi.customer_part_no,
-               dbo.get_plm_Approval_username (a.site, prh.workflow_id,d.node_id,a.code_no) as sp
+               dbo.get_plm_Approval_username (a.site, prh.workflow_id,d.node_id,a.code_no) as sp,a.remarkPage
     FROM plm_technical_specification_sheet a
              left join view_Project_final_Part b
                        on a.site = b.site and a.project_id = b.project_id and a.test_part_no = b.test_part_no