去掉创建人跟业务员ID

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/MOMainController.java

@@ -9,8 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import lombok.extern.log4j.Log4j2;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.DateUtils;
+
 import org.jeecg.modules.openApi.entity.DxpDataPlan;
 import org.jeecg.modules.openApi.service.IDxpDataPlanService;
 import org.jeecg.modules.openApi.service.ISenYuDataSourceOne;
@@ -81,14 +80,14 @@ public class MOMainController implements ApplicationContextAware {
                 String pkorgStr = str;
                 String pkorgValue[] = pkorgStr.split(":");
                 String ac = pkorgValue[1];
-                if (pkorgValue[0].equals("one")) {
+                if (pkorgValue[0].equals("one")) {//mo.cPersonCode as 'salerId',hr.cPsn_Num as 'buyerId',
                     String sql = "select mo.MOID as 'headerAttributeString6',mo.MOID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus'," +
                             "mo.cCode as 'poNum','SUBCONTRACTOR_PO' as 'poType','0085' as 'supplierNumber','森鑫' as 'supplierName'," +
-                            "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone',mo.cPersonCode as 'salerId'," +
+                            "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone'," +
                             "hr1.cPsn_Name as 'salerCode',mo.cVenPerson as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
                             "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate','' as 'supplierPromiseDate', mo.cMemo as 'remark'," +
-                            "'' as 'sourceDocNum',mo.cMaker as 'buyerCode',hr.cPsn_Num as 'buyerId',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
+                            "'' as 'sourceDocNum',mo.cMaker as 'buyerCode',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
                             "0 as 'totalAmount','' as 'headerAttributeString1', mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3'," +
                             "'' as 'headerAttributeString4'  from OM_MOMain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             " left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr " +
@@ -106,15 +105,15 @@ public class MOMainController implements ApplicationContextAware {
                     List<Map<String, Object>> list = senYuDataSourceOne.queryForList(sql);
                     for(Map<String, Object> map:list){
                         sumlist.add(map);
-                    }
+                    }//mo.cPersonCode as 'salerId',hr.cPsn_Num as 'buyerId',
                 }else if(pkorgValue[0].equals("two")){
                     String sql = "select mo.MOID as 'headerAttributeString6',mo.MOID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus'," +
                             "mo.cCode as 'poNum','SUBCONTRACTOR_PO' as 'poType','0085' as 'supplierNumber','森鑫' as 'supplierName'," +
-                            "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone',mo.cPersonCode as 'salerId'," +
+                            "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone'," +
                             "hr1.cPsn_Name as 'salerCode',mo.cVenPerson as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
                             "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate','' as 'supplierPromiseDate', mo.cMemo as 'remark'," +
-                            "'' as 'sourceDocNum',mo.cMaker as 'buyerCode',hr.cPsn_Num as 'buyerId',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
+                            "'' as 'sourceDocNum',mo.cMaker as 'buyerCode',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
                             "0 as 'totalAmount','' as 'headerAttributeString1', mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3'," +
                             "'' as 'headerAttributeString4'  from OM_MOMain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             " left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr " +
@@ -128,15 +127,15 @@ public class MOMainController implements ApplicationContextAware {
                     List<Map<String, Object>> list = senYuDataSourceTwo.queryForList(sql);
                     for(Map<String, Object> map:list){
                         sumlist.add(map);
-                    }
+                    }//mo.cPersonCode as 'salerId',hr.cPsn_Num as 'buyerId',
                 }else if(pkorgValue[0].equals("three")){
                     String sql = "select mo.MOID as 'headerAttributeString6',mo.MOID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus'," +
                             "mo.cCode as 'poNum','SUBCONTRACTOR_PO' as 'poType','0085' as 'supplierNumber','森鑫' as 'supplierName'," +
-                            "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone',mo.cPersonCode as 'salerId'," +
+                            "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone'," +
                             "hr1.cPsn_Name as 'salerCode',mo.cVenPerson as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
                             "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate','' as 'supplierPromiseDate', mo.cMemo as 'remark'," +
-                            "'' as 'sourceDocNum',mo.cMaker as 'buyerCode',hr.cPsn_Num as 'buyerId',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
+                            "'' as 'sourceDocNum',mo.cMaker as 'buyerCode',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
                             "0 as 'totalAmount','' as 'headerAttributeString1', mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3'," +
                             "'' as 'headerAttributeString4'  from OM_MOMain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             " left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr " +

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/POPomainController.java

@@ -73,7 +73,7 @@ public class POPomainController implements ApplicationContextAware {
                 String pkorgValue[] = pkorgStr.split(":");
                 String ac = pkorgValue[1];
                 if (pkorgValue[0].equals("one")) {
-                    //ven.cVenName，mo.cVenCode
+                    //ven.cVenName，mo.cVenCode mo.cPersonCode as salerId,hr.cPsn_Num as 'buyerId',
                     //cAuditTime>'"+lasttimeSf+"' and mo.iverifystateex = 2
                     String sql = "select mo.POID as 'headerAttributeString6','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus',mo.cPOID as 'poNum','STANDARD_PO' as 'poType'," +
                             "'0085' as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode','森鑫' as 'supplierName'," +
@@ -81,7 +81,7 @@ public class POPomainController implements ApplicationContextAware {
                             "mo.cPOID as headerAttributeString2,'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTotalAmount'," +
                             "'0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode',mo.iTaxRate as 'headerTaxRate'," +
                             "mo.dPODate as 'customerDemandDate','' as 'supplierPromiseDate', mo.cMemo as 'remark','' as 'sourceDocNum'," +
-                            "hr.cPsn_Num as 'buyerId',mo.cMaker as 'buyerCode',mo.cPersonCode as salerId,hr1.cPsn_Name as salerCode," +
+                            "mo.cMaker as 'buyerCode',hr1.cPsn_Name as salerCode," +
                             " mo.cmaketime  as 'publishDate'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             "left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr " +
                             "on mo.cMaker = hr.cPsn_Name " +
@@ -94,7 +94,7 @@ public class POPomainController implements ApplicationContextAware {
                     for(Map<String, Object> map:list){
                         sumlist.add(map);
                     }
-
+//mo.cPersonCode as salerId,hr.cPsn_Num as 'buyerId',
                 }else if(pkorgValue[0].equals("two")){
                     String sql = "select mo.POID as 'headerAttributeString6','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus',mo.cPOID as 'poNum','STANDARD_PO' as 'poType'," +
                             "'0085' as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode','森鑫' as 'supplierName'," +
@@ -102,7 +102,7 @@ public class POPomainController implements ApplicationContextAware {
                             "mo.cPOID as headerAttributeString2,'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTotalAmount'," +
                             "'0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode',mo.iTaxRate as 'headerTaxRate'," +
                             "mo.dPODate as 'customerDemandDate','' as 'supplierPromiseDate', mo.cMemo as 'remark','' as 'sourceDocNum'," +
-                            "hr.cPsn_Num as 'buyerId',mo.cMaker as 'buyerCode',mo.cPersonCode as salerId,hr1.cPsn_Name as salerCode," +
+                            "mo.cMaker as 'buyerCode',hr1.cPsn_Name as salerCode," +
                             " mo.cmaketime  as 'publishDate'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             "left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr " +
                             "on mo.cMaker = hr.cPsn_Name " +
@@ -115,7 +115,7 @@ public class POPomainController implements ApplicationContextAware {
                     for(Map<String, Object> map:list){
                         sumlist.add(map);
                     }
-
+//hr.cPsn_Num as 'buyerId',mo.cPersonCode as salerId,
                 }else if(pkorgValue[0].equals("three")){
                     String sql = "select mo.POID as 'headerAttributeString6','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus',mo.cPOID as 'poNum','STANDARD_PO' as 'poType'," +
                             "'0085' as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode','森鑫' as 'supplierName'," +
@@ -123,7 +123,7 @@ public class POPomainController implements ApplicationContextAware {
                             "mo.cPOID as headerAttributeString2,'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTotalAmount'," +
                             "'0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode',mo.iTaxRate as 'headerTaxRate'," +
                             "mo.dPODate as 'customerDemandDate','' as 'supplierPromiseDate', mo.cMemo as 'remark','' as 'sourceDocNum'," +
-                            "hr.cPsn_Num as 'buyerId',mo.cMaker as 'buyerCode',mo.cPersonCode as salerId,hr1.cPsn_Name as salerCode," +
+                            "mo.cMaker as 'buyerCode',hr1.cPsn_Name as salerCode," +
                             " mo.cmaketime  as 'publishDate'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             "left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr " +
                             "on mo.cMaker = hr.cPsn_Name " +