整理

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/domain/MetaEmployee.java

@@ -0,0 +1,669 @@
+package com.dgtly.sync.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.dgtly.common.annotation.Excel;
+import com.dgtly.common.core.domain.BaseEntity;
+import java.util.Date;
+
+/**
+ * MetaEmployeeMapper对象 meta_employee_diy_copy1
+ * 
+ * @author dgtly
+ * @date 2023-07-05
+ */
+public class MetaEmployee extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** null */
+    @Excel(name = "null")
+    private String name;
+
+    /** null */
+    @Excel(name = "null")
+    private String loginName;
+
+    /** null */
+    @Excel(name = "null")
+    private String email;
+
+    /** null */
+    @Excel(name = "null")
+    private String mobile;
+
+    /** null */
+    @Excel(name = "null")
+    private String sapEmployeeId;
+
+    /** null */
+    @Excel(name = "null")
+    private String sapCostCenterCode;
+
+    /** null */
+    @Excel(name = "null")
+    private String sapCostCenter;
+
+    /** null */
+    @Excel(name = "null")
+    private String sapCompanyCode;
+
+    /** null */
+    @Excel(name = "null")
+    private Long status;
+
+    /** null */
+    @Excel(name = "null")
+    private String contract;
+
+    /** null */
+    @Excel(name = "null")
+    private String contractName;
+
+    /** null */
+    @Excel(name = "null")
+    private String contractBegin;
+
+    /** null */
+    @Excel(name = "null")
+    private String duty;
+
+    /** null */
+    @Excel(name = "null")
+    private String dutyName;
+
+    /** null */
+    @Excel(name = "null")
+    private String org;
+
+    /** null */
+    @Excel(name = "null")
+    private String orgName;
+
+    /** null */
+    @Excel(name = "null")
+    private String employeePost;
+
+    /** null */
+    @Excel(name = "null")
+    private String employeePostName;
+
+    /** null */
+    @Excel(name = "null")
+    private String posty;
+
+    /** null */
+    @Excel(name = "null")
+    private String poste;
+
+    /** null */
+    @Excel(name = "null")
+    private String posnc;
+
+    /** null */
+    @Excel(name = "null")
+    private String bossEmployeeId;
+
+    /** null */
+    @Excel(name = "null")
+    private String bossName;
+
+    /** null */
+    @Excel(name = "null")
+    private String bossEmployeePost;
+
+    /** null */
+    @Excel(name = "null")
+    private String sex;
+
+    /** null */
+    @Excel(name = "null")
+    private String objid1;
+
+    /** null */
+    @Excel(name = "null")
+    private String stext1;
+
+    /** null */
+    @Excel(name = "null")
+    private String objid2;
+
+    /** null */
+    @Excel(name = "null")
+    private String stext2;
+
+    /** null */
+    @Excel(name = "null")
+    private String objid3;
+
+    /** null */
+    @Excel(name = "null")
+    private String stext3;
+
+    /** null */
+    @Excel(name = "null")
+    private String objid4;
+
+    /** null */
+    @Excel(name = "null")
+    private String stext4;
+
+    /** null */
+    @Excel(name = "null")
+    private String objid5;
+
+    /** null */
+    @Excel(name = "null")
+    private String stext5;
+
+    /** null */
+    @Excel(name = "null")
+    private String objid6;
+
+    /** null */
+    @Excel(name = "null")
+    private String stext6;
+
+    /** null */
+    @Excel(name = "null")
+    private String objid7;
+
+    /** null */
+    @Excel(name = "null")
+    private String stext7;
+
+    /** null */
+    @Excel(name = "null")
+    private String objidQy;
+
+    /** null */
+    @Excel(name = "null")
+    private String stextQy;
+
+    /** null */
+    @Excel(name = "null", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date etlCreatime;
+
+    /** null */
+    @Excel(name = "null")
+    private String dataversion;
+
+    /** null */
+    @Excel(name = "null")
+    private String lineId;
+
+    /** null */
+    @Excel(name = "null")
+    private String packageId;
+
+    /** null */
+    @Excel(name = "null")
+    private String businessUnit;
+
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setLoginName(String loginName) 
+    {
+        this.loginName = loginName;
+    }
+
+    public String getLoginName() 
+    {
+        return loginName;
+    }
+    public void setEmail(String email) 
+    {
+        this.email = email;
+    }
+
+    public String getEmail() 
+    {
+        return email;
+    }
+    public void setMobile(String mobile) 
+    {
+        this.mobile = mobile;
+    }
+
+    public String getMobile() 
+    {
+        return mobile;
+    }
+    public void setSapEmployeeId(String sapEmployeeId) 
+    {
+        this.sapEmployeeId = sapEmployeeId;
+    }
+
+    public String getSapEmployeeId() 
+    {
+        return sapEmployeeId;
+    }
+    public void setSapCostCenterCode(String sapCostCenterCode) 
+    {
+        this.sapCostCenterCode = sapCostCenterCode;
+    }
+
+    public String getSapCostCenterCode() 
+    {
+        return sapCostCenterCode;
+    }
+    public void setSapCostCenter(String sapCostCenter) 
+    {
+        this.sapCostCenter = sapCostCenter;
+    }
+
+    public String getSapCostCenter() 
+    {
+        return sapCostCenter;
+    }
+    public void setSapCompanyCode(String sapCompanyCode) 
+    {
+        this.sapCompanyCode = sapCompanyCode;
+    }
+
+    public String getSapCompanyCode() 
+    {
+        return sapCompanyCode;
+    }
+    public void setStatus(Long status) 
+    {
+        this.status = status;
+    }
+
+    public Long getStatus() 
+    {
+        return status;
+    }
+    public void setContract(String contract) 
+    {
+        this.contract = contract;
+    }
+
+    public String getContract() 
+    {
+        return contract;
+    }
+    public void setContractName(String contractName) 
+    {
+        this.contractName = contractName;
+    }
+
+    public String getContractName() 
+    {
+        return contractName;
+    }
+    public void setContractBegin(String contractBegin) 
+    {
+        this.contractBegin = contractBegin;
+    }
+
+    public String getContractBegin() 
+    {
+        return contractBegin;
+    }
+    public void setDuty(String duty) 
+    {
+        this.duty = duty;
+    }
+
+    public String getDuty() 
+    {
+        return duty;
+    }
+    public void setDutyName(String dutyName) 
+    {
+        this.dutyName = dutyName;
+    }
+
+    public String getDutyName() 
+    {
+        return dutyName;
+    }
+    public void setOrg(String org) 
+    {
+        this.org = org;
+    }
+
+    public String getOrg() 
+    {
+        return org;
+    }
+    public void setOrgName(String orgName) 
+    {
+        this.orgName = orgName;
+    }
+
+    public String getOrgName() 
+    {
+        return orgName;
+    }
+    public void setEmployeePost(String employeePost) 
+    {
+        this.employeePost = employeePost;
+    }
+
+    public String getEmployeePost() 
+    {
+        return employeePost;
+    }
+    public void setEmployeePostName(String employeePostName) 
+    {
+        this.employeePostName = employeePostName;
+    }
+
+    public String getEmployeePostName() 
+    {
+        return employeePostName;
+    }
+    public void setPosty(String posty) 
+    {
+        this.posty = posty;
+    }
+
+    public String getPosty() 
+    {
+        return posty;
+    }
+    public void setPoste(String poste) 
+    {
+        this.poste = poste;
+    }
+
+    public String getPoste() 
+    {
+        return poste;
+    }
+    public void setPosnc(String posnc) 
+    {
+        this.posnc = posnc;
+    }
+
+    public String getPosnc() 
+    {
+        return posnc;
+    }
+    public void setBossEmployeeId(String bossEmployeeId) 
+    {
+        this.bossEmployeeId = bossEmployeeId;
+    }
+
+    public String getBossEmployeeId() 
+    {
+        return bossEmployeeId;
+    }
+    public void setBossName(String bossName) 
+    {
+        this.bossName = bossName;
+    }
+
+    public String getBossName() 
+    {
+        return bossName;
+    }
+    public void setBossEmployeePost(String bossEmployeePost) 
+    {
+        this.bossEmployeePost = bossEmployeePost;
+    }
+
+    public String getBossEmployeePost() 
+    {
+        return bossEmployeePost;
+    }
+    public void setSex(String sex) 
+    {
+        this.sex = sex;
+    }
+
+    public String getSex() 
+    {
+        return sex;
+    }
+    public void setObjid1(String objid1) 
+    {
+        this.objid1 = objid1;
+    }
+
+    public String getObjid1() 
+    {
+        return objid1;
+    }
+    public void setStext1(String stext1) 
+    {
+        this.stext1 = stext1;
+    }
+
+    public String getStext1() 
+    {
+        return stext1;
+    }
+    public void setObjid2(String objid2) 
+    {
+        this.objid2 = objid2;
+    }
+
+    public String getObjid2() 
+    {
+        return objid2;
+    }
+    public void setStext2(String stext2) 
+    {
+        this.stext2 = stext2;
+    }
+
+    public String getStext2() 
+    {
+        return stext2;
+    }
+    public void setObjid3(String objid3) 
+    {
+        this.objid3 = objid3;
+    }
+
+    public String getObjid3() 
+    {
+        return objid3;
+    }
+    public void setStext3(String stext3) 
+    {
+        this.stext3 = stext3;
+    }
+
+    public String getStext3() 
+    {
+        return stext3;
+    }
+    public void setObjid4(String objid4) 
+    {
+        this.objid4 = objid4;
+    }
+
+    public String getObjid4() 
+    {
+        return objid4;
+    }
+    public void setStext4(String stext4) 
+    {
+        this.stext4 = stext4;
+    }
+
+    public String getStext4() 
+    {
+        return stext4;
+    }
+    public void setObjid5(String objid5) 
+    {
+        this.objid5 = objid5;
+    }
+
+    public String getObjid5() 
+    {
+        return objid5;
+    }
+    public void setStext5(String stext5) 
+    {
+        this.stext5 = stext5;
+    }
+
+    public String getStext5() 
+    {
+        return stext5;
+    }
+    public void setObjid6(String objid6) 
+    {
+        this.objid6 = objid6;
+    }
+
+    public String getObjid6() 
+    {
+        return objid6;
+    }
+    public void setStext6(String stext6) 
+    {
+        this.stext6 = stext6;
+    }
+
+    public String getStext6() 
+    {
+        return stext6;
+    }
+    public void setObjid7(String objid7) 
+    {
+        this.objid7 = objid7;
+    }
+
+    public String getObjid7() 
+    {
+        return objid7;
+    }
+    public void setStext7(String stext7) 
+    {
+        this.stext7 = stext7;
+    }
+
+    public String getStext7() 
+    {
+        return stext7;
+    }
+    public void setObjidQy(String objidQy) 
+    {
+        this.objidQy = objidQy;
+    }
+
+    public String getObjidQy() 
+    {
+        return objidQy;
+    }
+    public void setStextQy(String stextQy) 
+    {
+        this.stextQy = stextQy;
+    }
+
+    public String getStextQy() 
+    {
+        return stextQy;
+    }
+    public void setEtlCreatime(Date etlCreatime) 
+    {
+        this.etlCreatime = etlCreatime;
+    }
+
+    public Date getEtlCreatime() 
+    {
+        return etlCreatime;
+    }
+    public void setDataversion(String dataversion) 
+    {
+        this.dataversion = dataversion;
+    }
+
+    public String getDataversion() 
+    {
+        return dataversion;
+    }
+    public void setLineId(String lineId) 
+    {
+        this.lineId = lineId;
+    }
+
+    public String getLineId() 
+    {
+        return lineId;
+    }
+    public void setPackageId(String packageId) 
+    {
+        this.packageId = packageId;
+    }
+
+    public String getPackageId() 
+    {
+        return packageId;
+    }
+    public void setBusinessUnit(String businessUnit) 
+    {
+        this.businessUnit = businessUnit;
+    }
+
+    public String getBusinessUnit() 
+    {
+        return businessUnit;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("name", getName())
+            .append("loginName", getLoginName())
+            .append("email", getEmail())
+            .append("mobile", getMobile())
+            .append("sapEmployeeId", getSapEmployeeId())
+            .append("sapCostCenterCode", getSapCostCenterCode())
+            .append("sapCostCenter", getSapCostCenter())
+            .append("sapCompanyCode", getSapCompanyCode())
+            .append("status", getStatus())
+            .append("contract", getContract())
+            .append("contractName", getContractName())
+            .append("contractBegin", getContractBegin())
+            .append("duty", getDuty())
+            .append("dutyName", getDutyName())
+            .append("org", getOrg())
+            .append("orgName", getOrgName())
+            .append("employeePost", getEmployeePost())
+            .append("employeePostName", getEmployeePostName())
+            .append("posty", getPosty())
+            .append("poste", getPoste())
+            .append("posnc", getPosnc())
+            .append("bossEmployeeId", getBossEmployeeId())
+            .append("bossName", getBossName())
+            .append("bossEmployeePost", getBossEmployeePost())
+            .append("sex", getSex())
+            .append("objid1", getObjid1())
+            .append("stext1", getStext1())
+            .append("objid2", getObjid2())
+            .append("stext2", getStext2())
+            .append("objid3", getObjid3())
+            .append("stext3", getStext3())
+            .append("objid4", getObjid4())
+            .append("stext4", getStext4())
+            .append("objid5", getObjid5())
+            .append("stext5", getStext5())
+            .append("objid6", getObjid6())
+            .append("stext6", getStext6())
+            .append("objid7", getObjid7())
+            .append("stext7", getStext7())
+            .append("objidQy", getObjidQy())
+            .append("stextQy", getStextQy())
+            .append("etlCreatime", getEtlCreatime())
+            .append("dataversion", getDataversion())
+            .append("lineId", getLineId())
+            .append("packageId", getPackageId())
+            .append("businessUnit", getBusinessUnit())
+            .toString();
+    }
+}

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/domain/MetaEmployeeDiy.java

@@ -7,558 +7,663 @@ import com.dgtly.common.core.domain.BaseEntity;
 import java.util.Date;
 
 /**
- * 立邦雇员数据同步对象 meta_employee_diy
- * 
- * @author qxp
- * @date 2020-07-28
+ * MetaEmployeeMapper对象 meta_employee_diy_copy1
+ *
+ * @author dgtly
+ * @date 2023-07-05
  */
 public class MetaEmployeeDiy extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-
+    /** null */
+    @Excel(name = "null")
     private String name;
 
+    /** null */
+    @Excel(name = "null")
     private String loginName;
 
+    /** null */
+    @Excel(name = "null")
     private String email;
 
+    /** null */
+    @Excel(name = "null")
     private String mobile;
 
+    /** null */
+    @Excel(name = "null")
     private String sapEmployeeId;
 
+    /** null */
+    @Excel(name = "null")
     private String sapCostCenterCode;
 
+    /** null */
+    @Excel(name = "null")
     private String sapCostCenter;
 
+    /** null */
+    @Excel(name = "null")
     private String sapCompanyCode;
 
+    /** null */
+    @Excel(name = "null")
     private Long status;
 
-    private String objid1;
-
+    /** null */
+    @Excel(name = "null")
     private String contract;
 
+    /** null */
+    @Excel(name = "null")
     private String contractName;
 
+    /** null */
+    @Excel(name = "null")
     private String contractBegin;
 
+    /** null */
+    @Excel(name = "null")
     private String duty;
 
+    /** null */
+    @Excel(name = "null")
     private String dutyName;
 
+    /** null */
+    @Excel(name = "null")
     private String org;
 
+    /** null */
+    @Excel(name = "null")
     private String orgName;
 
+    /** null */
+    @Excel(name = "null")
     private String employeePost;
 
+    /** null */
+    @Excel(name = "null")
     private String employeePostName;
 
+    /** null */
+    @Excel(name = "null")
     private String posty;
 
+    /** null */
+    @Excel(name = "null")
     private String poste;
 
+    /** null */
+    @Excel(name = "null")
     private String posnc;
 
+    /** null */
+    @Excel(name = "null")
     private String bossEmployeeId;
 
+    /** null */
+    @Excel(name = "null")
     private String bossName;
 
+    /** null */
+    @Excel(name = "null")
     private String bossEmployeePost;
 
+    /** null */
+    @Excel(name = "null")
     private String sex;
 
+    /** null */
+    @Excel(name = "null")
+    private String objid1;
+
+    /** null */
+    @Excel(name = "null")
     private String stext1;
 
+    /** null */
+    @Excel(name = "null")
     private String objid2;
 
+    /** null */
+    @Excel(name = "null")
     private String stext2;
 
+    /** null */
+    @Excel(name = "null")
     private String objid3;
 
+    /** null */
+    @Excel(name = "null")
     private String stext3;
 
+    /** null */
+    @Excel(name = "null")
     private String objid4;
 
+    /** null */
+    @Excel(name = "null")
     private String stext4;
 
+    /** null */
+    @Excel(name = "null")
     private String objid5;
 
+    /** null */
+    @Excel(name = "null")
     private String stext5;
 
+    /** null */
+    @Excel(name = "null")
     private String objid6;
 
+    /** null */
+    @Excel(name = "null")
     private String stext6;
 
+    /** null */
+    @Excel(name = "null")
     private String objid7;
 
+    /** null */
+    @Excel(name = "null")
     private String stext7;
+
+    /** null */
+    @Excel(name = "null")
     private String objidQy;
+
+    /** null */
+    @Excel(name = "null")
     private String stextQy;
-    private String dataversion;
 
+    /** null */
+    @Excel(name = "null", width = 30, dateFormat = "yyyy-MM-dd")
     private Date etlCreatime;
 
+    /** null */
+    @Excel(name = "null")
+    private String dataversion;
 
+    /** null */
+    @Excel(name = "null")
     private String lineId;
 
+    /** null */
+    @Excel(name = "null")
     private String packageId;
 
+    /** null */
+    @Excel(name = "null")
     private String businessUnit;
 
-    public String getBusinessUnit() {
-        return businessUnit;
-    }
-
-    public void setBusinessUnit(String businessUnit) {
-        this.businessUnit = businessUnit;
-    }
-
     public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
-    public void setLoginName(String loginName) 
+    public void setLoginName(String loginName)
     {
         this.loginName = loginName;
     }
 
-    public String getLoginName() 
+    public String getLoginName()
     {
         return loginName;
     }
-    public void setEmail(String email) 
+    public void setEmail(String email)
     {
         this.email = email;
     }
 
-    public String getEmail() 
+    public String getEmail()
     {
         return email;
     }
-    public void setMobile(String mobile) 
+    public void setMobile(String mobile)
     {
         this.mobile = mobile;
     }
 
-    public String getMobile() 
+    public String getMobile()
     {
         return mobile;
     }
-    public void setSapEmployeeId(String sapEmployeeId) 
+    public void setSapEmployeeId(String sapEmployeeId)
     {
         this.sapEmployeeId = sapEmployeeId;
     }
 
-    public String getSapEmployeeId() 
+    public String getSapEmployeeId()
     {
         return sapEmployeeId;
     }
-    public void setSapCostCenterCode(String sapCostCenterCode) 
+    public void setSapCostCenterCode(String sapCostCenterCode)
     {
         this.sapCostCenterCode = sapCostCenterCode;
     }
 
-    public String getSapCostCenterCode() 
+    public String getSapCostCenterCode()
     {
         return sapCostCenterCode;
     }
-    public void setSapCostCenter(String sapCostCenter) 
+    public void setSapCostCenter(String sapCostCenter)
     {
         this.sapCostCenter = sapCostCenter;
     }
 
-    public String getSapCostCenter() 
+    public String getSapCostCenter()
     {
         return sapCostCenter;
     }
-    public void setSapCompanyCode(String sapCompanyCode) 
+    public void setSapCompanyCode(String sapCompanyCode)
     {
         this.sapCompanyCode = sapCompanyCode;
     }
 
-    public String getSapCompanyCode() 
+    public String getSapCompanyCode()
     {
         return sapCompanyCode;
     }
-    public void setStatus(Long status) 
+    public void setStatus(Long status)
     {
         this.status = status;
     }
 
-    public Long getStatus() 
+    public Long getStatus()
     {
         return status;
     }
-    public void setObjid1(String objid1) 
-    {
-        this.objid1 = objid1;
-    }
-
-    public String getObjid1() 
-    {
-        return objid1;
-    }
-    public void setContract(String contract) 
+    public void setContract(String contract)
     {
         this.contract = contract;
     }
 
-    public String getContract() 
+    public String getContract()
     {
         return contract;
     }
-    public void setContractName(String contractName) 
+    public void setContractName(String contractName)
     {
         this.contractName = contractName;
     }
 
-    public String getContractName() 
+    public String getContractName()
     {
         return contractName;
     }
-    public void setContractBegin(String contractBegin) 
+    public void setContractBegin(String contractBegin)
     {
         this.contractBegin = contractBegin;
     }
 
-    public String getContractBegin() 
+    public String getContractBegin()
     {
         return contractBegin;
     }
-    public void setDuty(String duty) 
+    public void setDuty(String duty)
     {
         this.duty = duty;
     }
 
-    public String getDuty() 
+    public String getDuty()
     {
         return duty;
     }
-    public void setDutyName(String dutyName) 
+    public void setDutyName(String dutyName)
     {
         this.dutyName = dutyName;
     }
 
-    public String getDutyName() 
+    public String getDutyName()
     {
         return dutyName;
     }
-    public void setOrg(String org) 
+    public void setOrg(String org)
     {
         this.org = org;
     }
 
-    public String getOrg() 
+    public String getOrg()
     {
         return org;
     }
-    public void setOrgName(String orgName) 
+    public void setOrgName(String orgName)
     {
         this.orgName = orgName;
     }
 
-    public String getOrgName() 
+    public String getOrgName()
     {
         return orgName;
     }
-    public void setEmployeePost(String employeePost) 
+    public void setEmployeePost(String employeePost)
     {
         this.employeePost = employeePost;
     }
 
-    public String getEmployeePost() 
+    public String getEmployeePost()
     {
         return employeePost;
     }
-    public void setEmployeePostName(String employeePostName) 
+    public void setEmployeePostName(String employeePostName)
     {
         this.employeePostName = employeePostName;
     }
 
-    public String getEmployeePostName() 
+    public String getEmployeePostName()
     {
         return employeePostName;
     }
-    public void setPosty(String posty) 
+    public void setPosty(String posty)
     {
         this.posty = posty;
     }
 
-    public String getPosty() 
+    public String getPosty()
     {
         return posty;
     }
-    public void setPoste(String poste) 
+    public void setPoste(String poste)
     {
         this.poste = poste;
     }
 
-    public String getPoste() 
+    public String getPoste()
     {
         return poste;
     }
-    public void setPosnc(String posnc) 
+    public void setPosnc(String posnc)
     {
         this.posnc = posnc;
     }
 
-    public String getPosnc() 
+    public String getPosnc()
     {
         return posnc;
     }
-    public void setBossEmployeeId(String bossEmployeeId) 
+    public void setBossEmployeeId(String bossEmployeeId)
     {
         this.bossEmployeeId = bossEmployeeId;
     }
 
-    public String getBossEmployeeId() 
+    public String getBossEmployeeId()
     {
         return bossEmployeeId;
     }
-    public void setBossName(String bossName) 
+    public void setBossName(String bossName)
     {
         this.bossName = bossName;
     }
 
-    public String getBossName() 
+    public String getBossName()
     {
         return bossName;
     }
-    public void setBossEmployeePost(String bossEmployeePost) 
+    public void setBossEmployeePost(String bossEmployeePost)
     {
         this.bossEmployeePost = bossEmployeePost;
     }
 
-    public String getBossEmployeePost() 
+    public String getBossEmployeePost()
     {
         return bossEmployeePost;
     }
-    public void setSex(String sex) 
+    public void setSex(String sex)
     {
         this.sex = sex;
     }
 
-    public String getSex() 
+    public String getSex()
     {
         return sex;
     }
-    public void setStext1(String stext1) 
+    public void setObjid1(String objid1)
+    {
+        this.objid1 = objid1;
+    }
+
+    public String getObjid1()
+    {
+        return objid1;
+    }
+    public void setStext1(String stext1)
     {
         this.stext1 = stext1;
     }
 
-    public String getStext1() 
+    public String getStext1()
     {
         return stext1;
     }
-    public void setObjid2(String objid2) 
+    public void setObjid2(String objid2)
     {
         this.objid2 = objid2;
     }
 
-    public String getObjid2() 
+    public String getObjid2()
     {
         return objid2;
     }
-    public void setStext2(String stext2) 
+    public void setStext2(String stext2)
     {
         this.stext2 = stext2;
     }
 
-    public String getStext2() 
+    public String getStext2()
     {
         return stext2;
     }
-    public void setObjid3(String objid3) 
+    public void setObjid3(String objid3)
     {
         this.objid3 = objid3;
     }
 
-    public String getObjid3() 
+    public String getObjid3()
     {
         return objid3;
     }
-    public void setStext3(String stext3) 
+    public void setStext3(String stext3)
     {
         this.stext3 = stext3;
     }
 
-    public String getStext3() 
+    public String getStext3()
     {
         return stext3;
     }
-    public void setObjid4(String objid4) 
+    public void setObjid4(String objid4)
     {
         this.objid4 = objid4;
     }
 
-    public String getObjid4() 
+    public String getObjid4()
     {
         return objid4;
     }
-    public void setStext4(String stext4) 
+    public void setStext4(String stext4)
     {
         this.stext4 = stext4;
     }
 
-    public String getStext4() 
+    public String getStext4()
     {
         return stext4;
     }
-    public void setObjid5(String objid5) 
+    public void setObjid5(String objid5)
     {
         this.objid5 = objid5;
     }
 
-    public String getObjid5() 
+    public String getObjid5()
     {
         return objid5;
     }
-    public void setStext5(String stext5) 
+    public void setStext5(String stext5)
     {
         this.stext5 = stext5;
     }
 
-    public String getStext5() 
+    public String getStext5()
     {
         return stext5;
     }
-    public void setObjid6(String objid6) 
+    public void setObjid6(String objid6)
     {
         this.objid6 = objid6;
     }
 
-    public String getObjid6() 
+    public String getObjid6()
     {
         return objid6;
     }
-    public void setDataversion(String dataversion) 
+    public void setStext6(String stext6)
     {
-        this.dataversion = dataversion;
+        this.stext6 = stext6;
     }
 
-    public String getObjid7() {
-        return objid7;
+    public String getStext6()
+    {
+        return stext6;
     }
-
-    public void setObjid7(String objid7) {
+    public void setObjid7(String objid7)
+    {
         this.objid7 = objid7;
     }
 
-    public String getStext7() {
-        return stext7;
+    public String getObjid7()
+    {
+        return objid7;
     }
-
-    public void setStext7(String stext7) {
+    public void setStext7(String stext7)
+    {
         this.stext7 = stext7;
     }
 
-    public String getDataversion()
+    public String getStext7()
     {
-        return dataversion;
+        return stext7;
     }
-    public void setEtlCreatime(Date etlCreatime) 
+    public void setObjidQy(String objidQy)
     {
-        this.etlCreatime = etlCreatime;
+        this.objidQy = objidQy;
     }
 
-    public Date getEtlCreatime() 
+    public String getObjidQy()
     {
-        return etlCreatime;
+        return objidQy;
     }
-    public void setLineId(String lineId) 
+    public void setStextQy(String stextQy)
     {
-        this.lineId = lineId;
+        this.stextQy = stextQy;
     }
 
-    public String getLineId() 
+    public String getStextQy()
     {
-        return lineId;
+        return stextQy;
     }
-    public void setPackageId(String packageId) 
+    public void setEtlCreatime(Date etlCreatime)
     {
-        this.packageId = packageId;
+        this.etlCreatime = etlCreatime;
     }
 
-    public String getPackageId() 
+    public Date getEtlCreatime()
     {
-        return packageId;
+        return etlCreatime;
     }
-
-    public String getStext6() {
-        return stext6;
+    public void setDataversion(String dataversion)
+    {
+        this.dataversion = dataversion;
     }
 
-    public void setStext6(String stext6) {
-        this.stext6 = stext6;
+    public String getDataversion()
+    {
+        return dataversion;
     }
-
-    public String getObjidQy() {
-        return objidQy;
+    public void setLineId(String lineId)
+    {
+        this.lineId = lineId;
     }
 
-    public void setObjidQy(String objidQy) {
-        this.objidQy = objidQy;
+    public String getLineId()
+    {
+        return lineId;
+    }
+    public void setPackageId(String packageId)
+    {
+        this.packageId = packageId;
     }
 
-    public String getStextQy() {
-        return stextQy;
+    public String getPackageId()
+    {
+        return packageId;
+    }
+    public void setBusinessUnit(String businessUnit)
+    {
+        this.businessUnit = businessUnit;
     }
 
-    public void setStextQy(String stextQy) {
-        this.stextQy = stextQy;
+    public String getBusinessUnit()
+    {
+        return businessUnit;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("name", getName())
-            .append("loginName", getLoginName())
-            .append("email", getEmail())
-            .append("mobile", getMobile())
-            .append("sapEmployeeId", getSapEmployeeId())
-            .append("sapCostCenterCode", getSapCostCenterCode())
-            .append("sapCostCenter", getSapCostCenter())
-            .append("sapCompanyCode", getSapCompanyCode())
-            .append("status", getStatus())
-            .append("objid1", getObjid1())
-            .append("contract", getContract())
-            .append("contractName", getContractName())
-            .append("contractBegin", getContractBegin())
-            .append("duty", getDuty())
-            .append("dutyName", getDutyName())
-            .append("org", getOrg())
-            .append("orgName", getOrgName())
-            .append("employeePost", getEmployeePost())
-            .append("employeePostName", getEmployeePostName())
-            .append("posty", getPosty())
-            .append("poste", getPoste())
-            .append("posnc", getPosnc())
-            .append("bossEmployeeId", getBossEmployeeId())
-            .append("bossName", getBossName())
-            .append("bossEmployeePost", getBossEmployeePost())
-            .append("sex", getSex())
-            .append("stext1", getStext1())
-            .append("objid2", getObjid2())
-            .append("stext2", getStext2())
-            .append("objid3", getObjid3())
-            .append("stext3", getStext3())
-            .append("objid4", getObjid4())
-            .append("stext4", getStext4())
-            .append("objid5", getObjid5())
-            .append("stext5", getStext5())
-            .append("objid6", getObjid6())
-            .append("dataversion", getDataversion())
-            .append("etlCreatime", getEtlCreatime())
-            .append("lineId", getLineId())
-            .append("packageId", getPackageId())
-            .toString();
+                .append("name", getName())
+                .append("loginName", getLoginName())
+                .append("email", getEmail())
+                .append("mobile", getMobile())
+                .append("sapEmployeeId", getSapEmployeeId())
+                .append("sapCostCenterCode", getSapCostCenterCode())
+                .append("sapCostCenter", getSapCostCenter())
+                .append("sapCompanyCode", getSapCompanyCode())
+                .append("status", getStatus())
+                .append("contract", getContract())
+                .append("contractName", getContractName())
+                .append("contractBegin", getContractBegin())
+                .append("duty", getDuty())
+                .append("dutyName", getDutyName())
+                .append("org", getOrg())
+                .append("orgName", getOrgName())
+                .append("employeePost", getEmployeePost())
+                .append("employeePostName", getEmployeePostName())
+                .append("posty", getPosty())
+                .append("poste", getPoste())
+                .append("posnc", getPosnc())
+                .append("bossEmployeeId", getBossEmployeeId())
+                .append("bossName", getBossName())
+                .append("bossEmployeePost", getBossEmployeePost())
+                .append("sex", getSex())
+                .append("objid1", getObjid1())
+                .append("stext1", getStext1())
+                .append("objid2", getObjid2())
+                .append("stext2", getStext2())
+                .append("objid3", getObjid3())
+                .append("stext3", getStext3())
+                .append("objid4", getObjid4())
+                .append("stext4", getStext4())
+                .append("objid5", getObjid5())
+                .append("stext5", getStext5())
+                .append("objid6", getObjid6())
+                .append("stext6", getStext6())
+                .append("objid7", getObjid7())
+                .append("stext7", getStext7())
+                .append("objidQy", getObjidQy())
+                .append("stextQy", getStextQy())
+                .append("etlCreatime", getEtlCreatime())
+                .append("dataversion", getDataversion())
+                .append("lineId", getLineId())
+                .append("packageId", getPackageId())
+                .append("businessUnit", getBusinessUnit())
+                .toString();
     }
 }

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/exception/NotFountOrgCodeException.java

@@ -1,6 +1,7 @@
 package com.dgtly.sync.exception;
 
 import com.dgtly.common.exception.base.BaseException;
+import com.dgtly.sync.domain.MetaEmployee;
 import com.dgtly.sync.domain.MetaEmployeeDiy;
 
 public class NotFountOrgCodeException extends BaseException  {
@@ -10,14 +11,14 @@ public class NotFountOrgCodeException extends BaseException  {
     /**
      * 用户信息
      */
-    private MetaEmployeeDiy metaEmployeeDiy;
-    public NotFountOrgCodeException(MetaEmployeeDiy m) {
+    private MetaEmployee metaEmployee;
+    public NotFountOrgCodeException(MetaEmployee m) {
 
         super("sync","500",
                 new Object[] { "用户:"+m.getName(),
                         "packageId:"+m.getPackageId()},null);
         String s = "用户:"+m.getName()+"未查找到相应的组织code";
-        this.metaEmployeeDiy = m;
+        this.metaEmployee = m;
         this.msg = s;
 
     }
@@ -28,7 +29,7 @@ public class NotFountOrgCodeException extends BaseException  {
         return msg;
     }
 
-    public MetaEmployeeDiy getMetaNipponOrgRelation() {
-        return metaEmployeeDiy;
+    public MetaEmployee getMetaNipponOrgRelation() {
+        return metaEmployee;
     }
 }

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/exception/NotOrgNameException.java

@@ -1,6 +1,7 @@
 package com.dgtly.sync.exception;
 
 import com.dgtly.common.exception.base.BaseException;
+import com.dgtly.sync.domain.MetaEmployee;
 import com.dgtly.sync.domain.MetaEmployeeDiy;
 
 public class NotOrgNameException extends BaseException {
@@ -8,7 +9,7 @@ public class NotOrgNameException extends BaseException {
     /**
      * 用户信息
      */
-    private MetaEmployeeDiy metaEmployeeDiy;
+    private MetaEmployee metaEmployee;
 
 
     /**
@@ -16,13 +17,13 @@ public class NotOrgNameException extends BaseException {
      */
     private String msg;
 
-    public NotOrgNameException(MetaEmployeeDiy metaEmployeeDiy){
+    public NotOrgNameException(MetaEmployee metaEmployee){
         super("sync","500",
-                new Object[] { "用户:"+metaEmployeeDiy.getName(),
-                "packageId:"+metaEmployeeDiy.getPackageId()},null);
-        String str = "用户："+metaEmployeeDiy.getName()+"在packageId:"+metaEmployeeDiy.getPackageId()+"次解析中，未能找到所属组织结构";
+                new Object[] { "用户:"+metaEmployee.getName(),
+                "packageId:"+metaEmployee.getPackageId()},null);
+        String str = "用户："+metaEmployee.getName()+"在packageId:"+metaEmployee.getPackageId()+"次解析中，未能找到所属组织结构";
         this.msg = str;
-        this.metaEmployeeDiy = metaEmployeeDiy;
+        this.metaEmployee = metaEmployee;
 
     }
 
@@ -32,7 +33,7 @@ public class NotOrgNameException extends BaseException {
     }
 
 
-    public MetaEmployeeDiy getMetaNipponOrgRelation() {
-        return metaEmployeeDiy;
+    public MetaEmployee getMetaNipponOrgRelation() {
+        return metaEmployee;
     }
 }

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/exception/OutOfDIYPostNameException.java

@@ -1,6 +1,7 @@
 package com.dgtly.sync.exception;
 
 import com.dgtly.common.exception.base.BaseException;
+import com.dgtly.sync.domain.MetaEmployee;
 import com.dgtly.sync.domain.MetaEmployeeDiy;
 
 public class OutOfDIYPostNameException extends BaseException  {
@@ -10,14 +11,14 @@ public class OutOfDIYPostNameException extends BaseException  {
     /**
      * 用户信息
      */
-    private MetaEmployeeDiy metaEmployeeDiy;
-    public OutOfDIYPostNameException(MetaEmployeeDiy m) {
+    private MetaEmployee metaEmployee;
+    public OutOfDIYPostNameException(MetaEmployee m) {
 
         super("sync","500",
                 new Object[] { "用户:"+m.getName(),
                         "packageId:"+m.getPackageId()},null);
         String s = "用户:"+m.getName()+"不在部门岗位筛选列表中";
-        this.metaEmployeeDiy = m;
+        this.metaEmployee = m;
         this.msg = s;
 
     }
@@ -28,7 +29,7 @@ public class OutOfDIYPostNameException extends BaseException  {
         return msg;
     }
 
-    public MetaEmployeeDiy getMetaNipponOrgRelation() {
-        return metaEmployeeDiy;
+    public MetaEmployee getMetaNipponOrgRelation() {
+        return metaEmployee;
     }
 }

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/exception/OutOfLeveLException.java

@@ -1,6 +1,7 @@
 package com.dgtly.sync.exception;
 
 import com.dgtly.common.exception.base.BaseException;
+import com.dgtly.sync.domain.MetaEmployee;
 import com.dgtly.sync.domain.MetaEmployeeDiy;
 
 public class OutOfLeveLException extends BaseException  {
@@ -10,14 +11,14 @@ public class OutOfLeveLException extends BaseException  {
     /**
      * 用户信息
      */
-    private MetaEmployeeDiy metaEmployeeDiy;
-    public OutOfLeveLException(MetaEmployeeDiy m) {
+    private MetaEmployee metaEmployee;
+    public OutOfLeveLException(MetaEmployee m) {
 
         super("sync","500",
                 new Object[] { "用户:"+m.getName(),
                         "packageId:"+m.getPackageId()},null);
         String s = "用户:"+m.getName()+"所在级别不在筛选范围内";
-        this.metaEmployeeDiy = m;
+        this.metaEmployee = m;
         this.msg = s;
 
     }
@@ -28,7 +29,7 @@ public class OutOfLeveLException extends BaseException  {
         return msg;
     }
 
-    public MetaEmployeeDiy getMetaNipponOrgRelation() {
-        return metaEmployeeDiy;
+    public MetaEmployee getMetaNipponOrgRelation() {
+        return metaEmployee;
     }
 }

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/exception/OutOfScopeDIYException.java

@@ -3,6 +3,7 @@ package com.dgtly.sync.exception;
 import com.dgtly.common.exception.base.BaseException;
 import com.dgtly.common.utils.MessageUtils;
 import com.dgtly.common.utils.StringUtils;
+import com.dgtly.sync.domain.MetaEmployee;
 import com.dgtly.sync.domain.MetaEmployeeDiy;
 
 public class OutOfScopeDIYException extends BaseException  {
@@ -12,14 +13,14 @@ public class OutOfScopeDIYException extends BaseException  {
     /**
      * 用户信息
      */
-    private MetaEmployeeDiy metaEmployeeDiy;
-    public OutOfScopeDIYException(MetaEmployeeDiy m) {
+    private MetaEmployee metaEmployee;
+    public OutOfScopeDIYException(MetaEmployee m) {
 
         super("sync","500",
                 new Object[] { "用户:"+m.getName(),
                         "packageId:"+m.getPackageId()},null);
         String s = "用户:"+m.getName()+"不在diy筛选范围内";
-        this.metaEmployeeDiy = m;
+        this.metaEmployee = m;
         this.msg = s;
 
     }
@@ -30,7 +31,7 @@ public class OutOfScopeDIYException extends BaseException  {
         return msg;
     }
 
-    public MetaEmployeeDiy getMetaNipponOrgRelation() {
-        return metaEmployeeDiy;
+    public MetaEmployee getMetaNipponOrgRelation() {
+        return metaEmployee;
     }
 }

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/mapper/MetaEmployeeDiyMapper.java

@@ -1,73 +1,62 @@
+/*
 package com.dgtly.sync.mapper;
 
 import com.dgtly.sync.domain.MetaEmployeeDiy;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+*/
 /**
- * 立邦雇员数据同步Mapper接口
- * 
- * @author qxp
- * @date 2020-07-28
- */
-public interface MetaEmployeeDiyMapper 
+ * MetaEmployeeMapperMapper接口
+ *
+ * @author dgtly
+ * @date 2023-07-05
+ *//*
+
+public interface MetaEmployeeDiyMapper
 {
-    /**
-     * 查询立邦雇员数据同步
-     * 
-     * @param name 立邦雇员数据同步ID
-     * @return 立邦雇员数据同步
-     */
+    */
+/**
+     * 查询MetaEmployeeMapper
+     *
+     * @param name MetaEmployeeMapperID
+     * @return MetaEmployeeMapper
+     *//*
+
     public MetaEmployeeDiy selectMetaEmployeeDiyById(String name);
 
-    /**
-     * 查询立邦雇员数据同步列表
-     * 
-     * @param metaEmployeeDiy 立邦雇员数据同步
-     * @return 立邦雇员数据同步集合
-     */
+    */
+/**
+     * 查询MetaEmployeeMapper列表
+     *
+     * @param
+     * @return MetaEmployeeMapper集合
+     *//*
+
     public List<MetaEmployeeDiy> selectMetaEmployeeDiyList(MetaEmployeeDiy metaEmployeeDiy);
-    //直接查零售下事业部人员
+
+
+
+    */
+/**
+     * @description: 直接查零售下事业部人员
+     * @param:
+     * @return:
+     * @author: njs
+     * @date: 2023/7/5 16:28
+     *//*
+
     public List<MetaEmployeeDiy> selectMetaEmployeeDiyListByDivision();
 
-    /**
+    */
+/**
      * 查询立邦雇员数据同步列表
      *线索报备
      * @param
      * @return 立邦雇员数据同步集合
-     */
-    public List<MetaEmployeeDiy> selectMetaEmployeetClueReporting();
-
-    /**
-     * 新增立邦雇员数据同步
-     * 
-     * @param metaEmployeeDiy 立邦雇员数据同步
-     * @return 结果
-     */
-    public int insertMetaEmployeeDiy(MetaEmployeeDiy metaEmployeeDiy);
+     *//*
 
-    /**
-     * 修改立邦雇员数据同步
-     * 
-     * @param metaEmployeeDiy 立邦雇员数据同步
-     * @return 结果
-     */
-    public int updateMetaEmployeeDiy(MetaEmployeeDiy metaEmployeeDiy);
-
-    /**
-     * 删除立邦雇员数据同步
-     * 
-     * @param name 立邦雇员数据同步ID
-     * @return 结果
-     */
-    public int deleteMetaEmployeeDiyById(String name);
+    public List<MetaEmployeeDiy> selectMetaEmployeetClueReporting();
 
-    /**
-     * 批量删除立邦雇员数据同步
-     * 
-     * @param names 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteMetaEmployeeDiyByIds(String[] names);
 }
+*/

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/mapper/MetaEmployeeMapper.java

@@ -0,0 +1,52 @@
+package com.dgtly.sync.mapper;
+
+import com.dgtly.sync.domain.MetaEmployeeDiy;
+import com.dgtly.sync.domain.MetaEmployee;
+import java.util.List;
+
+/**
+ * MetaEmployeeMapperMapper接口
+ * 
+ * @author dgtly
+ * @date 2023-07-05
+ */
+public interface MetaEmployeeMapper
+{
+    /**
+     * 查询MetaEmployeeMapper
+     * 
+     * @param name MetaEmployeeMapperID
+     * @return MetaEmployeeMapper
+     */
+    public MetaEmployee selectMetaEmployeeDiyCopy1ById(String name);
+
+    /**
+     * 查询MetaEmployeeMapper列表
+     * 
+     * @param
+     * @return MetaEmployeeMapper集合
+     */
+    public List<MetaEmployee> selectMetaEmployeeDiyCopy1List(MetaEmployee metaEmployee);
+
+
+
+
+
+    /**
+     * @description: 直接查零售下事业部人员
+     * @param:
+     * @return:
+     * @author: njs
+     * @date: 2023/7/5 16:28
+     */
+    public List<MetaEmployee> selectMetaEmployeeDiyListByDivision();
+
+    /**
+     * 查询立邦雇员数据同步列表
+     *线索报备
+     * @param
+     * @return 立邦雇员数据同步集合
+     */
+    public List<MetaEmployee> selectMetaEmployeetClueReporting();
+
+}

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/IMetaEmployeeDiyService.java

@@ -1,5 +1,6 @@
 package com.dgtly.sync.service;
 
+import com.dgtly.sync.domain.MetaEmployee;
 import com.dgtly.sync.domain.MetaEmployeeDiy;
 import java.util.List;
 
@@ -9,53 +10,23 @@ import java.util.List;
  * @author qxp
  * @date 2020-07-28
  */
-public interface IMetaEmployeeDiyService 
-{
+public interface IMetaEmployeeDiyService {
     /**
      * 查询立邦雇员数据同步
-     * 
+     *
      * @param name 立邦雇员数据同步ID
      * @return 立邦雇员数据同步
      */
-    public MetaEmployeeDiy selectMetaEmployeeDiyById(String name);
+    public MetaEmployee selectMetaEmployeeDiyById(String name);
 
     /**
      * 查询立邦雇员数据同步列表
-     * 
-     * @param metaEmployeeDiy 立邦雇员数据同步
+     *
+     * @param
      * @return 立邦雇员数据同步集合
      */
-    public List<MetaEmployeeDiy> selectMetaEmployeeDiyList(MetaEmployeeDiy metaEmployeeDiy);
+    public List<MetaEmployee> selectMetaEmployeeDiyList(MetaEmployee metaEmployee);
 
-    /**
-     * 新增立邦雇员数据同步
-     * 
-     * @param metaEmployeeDiy 立邦雇员数据同步
-     * @return 结果
-     */
-    public int insertMetaEmployeeDiy(MetaEmployeeDiy metaEmployeeDiy);
-
-    /**
-     * 修改立邦雇员数据同步
-     * 
-     * @param metaEmployeeDiy 立邦雇员数据同步
-     * @return 结果
-     */
-    public int updateMetaEmployeeDiy(MetaEmployeeDiy metaEmployeeDiy);
-
-    /**
-     * 批量删除立邦雇员数据同步
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteMetaEmployeeDiyByIds(String ids);
 
-    /**
-     * 删除立邦雇员数据同步信息
-     * 
-     * @param name 立邦雇员数据同步ID
-     * @return 结果
-     */
-    public int deleteMetaEmployeeDiyById(String name);
 }
+

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/impl/AnalysisSysUserService.java

@@ -6,12 +6,12 @@ import com.dgtly.common.utils.ShiroSaltUtil;
 import com.dgtly.common.utils.StringUtils;
 import com.dgtly.common.utils.UserIdentityUtil;
 import com.dgtly.common.utils.security.EncryptPassWordClass;
-import com.dgtly.sync.domain.MetaEmployeeDiy;
+import com.dgtly.sync.domain.MetaEmployee;
 import com.dgtly.sync.domain.SyncFailDetail;
 import com.dgtly.sync.domain.SyncLog;
 import com.dgtly.sync.exception.*;
 import com.dgtly.sync.mapper.MetaDiySalesorgtreeMapper;
-import com.dgtly.sync.mapper.MetaEmployeeDiyMapper;
+import com.dgtly.sync.mapper.MetaEmployeeMapper;
 import com.dgtly.sync.mapper.SyncFailDetailMapper;
 import com.dgtly.sync.service.IAnalysisSysUserService;
 import com.dgtly.sync.service.ISyncLogService;
@@ -49,7 +49,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
     @Autowired
     private ISysUserService sysUserService;
     @Autowired
-    private MetaEmployeeDiyMapper metaEmployeeDiyMapper;
+    private MetaEmployeeMapper MetaEmployeeDiyMapper;
     @Autowired
     private MetaDiySalesorgtreeMapper metaDiySalesorgtreeMapper;
     @Autowired
@@ -68,7 +68,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
     @Async
     public SyncLog analysisSysUser(String packageId){
         //解析逻辑件DIY用户逻辑.jpg
-        MetaEmployeeDiy param = new MetaEmployeeDiy();
+        MetaEmployee param = new MetaEmployee();
         if(packageId==null||packageId.trim().equals("")){
             Long l = new Date().getTime();
             packageId = l.toString();
@@ -77,7 +77,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         }
         param.setBusinessUnit("DIY");
 
-        List<MetaEmployeeDiy> metaEmployeeDiys = metaEmployeeDiyMapper.selectMetaEmployeeDiyList(param);
+        List<MetaEmployee> MetaEmployees = MetaEmployeeDiyMapper.selectMetaEmployeeDiyCopy1List(param);
         SyncLog syncLog = new SyncLog();
         syncLog.setSyncType("sysuser");
         syncLog.setStartTime(new Date());
@@ -86,7 +86,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
 
 
         syncLog.setPackageId(packageId);
-        syncLog.setTotalCount((long)metaEmployeeDiys.size());
+        syncLog.setTotalCount((long)MetaEmployees.size());
         List<SyncFailDetail> failDetails = new ArrayList<>();
         long successCount = 0;
         long failCount = 0;
@@ -101,7 +101,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         //Long[] recommendRoleIds = {roleId,recommendRoleId};推荐下单
         Long[] selfRoleIdAndRecommendRoleIds = {recommendRoleId,selfRoleId,roleId};
         Long[] officeRolesIds = {selfRoleId,roleId};
-        if(metaEmployeeDiys.size()>0){
+        if(MetaEmployees.size()>0){
 
             //用户objid3为列表内的内容才为DIY人员
             Set<String> diyObjid3Set =  getConfigValueSet("libang_diyobjid3");
@@ -119,7 +119,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
 
 
 
-            for(MetaEmployeeDiy m:metaEmployeeDiys) {
+            for(MetaEmployee m:MetaEmployees) {
                 try {
                     //todo
 //                    if(!m.getLoginName().equalsIgnoreCase("wangzhen")){
@@ -353,12 +353,12 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         Long l = new Date().getTime();
         String packageId = l.toString();
         //解析零售下事业部人员直接sql查
-        List<MetaEmployeeDiy> metaEmployeeDiys = metaEmployeeDiyMapper.selectMetaEmployeeDiyListByDivision();
+        List<MetaEmployee> MetaEmployees = MetaEmployeeDiyMapper.selectMetaEmployeeDiyListByDivision();
         SyncLog syncLog = new SyncLog();
         syncLog.setSyncType("sysuser");
         syncLog.setStartTime(new Date());
         Set<String> loginNameList = sysUserService.selectAllUserLoginName();
-        syncLog.setTotalCount((long)metaEmployeeDiys.size());
+        syncLog.setTotalCount((long)MetaEmployees.size());
         List<SyncFailDetail> failDetails = new ArrayList<>();
         long successCount = 0;
         long failCount = 0;
@@ -366,8 +366,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         Long roleId = Long.parseLong(configService.selectConfigByKey("libang.user.division.roleid"));
         Long[] roleIds = {roleId};
         Map<Integer,Map<String,Map<String,String>>>  salesTreeMap = getDiySalesOrgTree();
-        if(metaEmployeeDiys.size()>0){
-            for(MetaEmployeeDiy m:metaEmployeeDiys) {
+        if(MetaEmployees.size()>0){
+            for(MetaEmployee m:MetaEmployees) {
                 try {
 
                     /** =============用户基本信息构建 start===============*/
@@ -514,7 +514,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
    /* @Override
     @Async
     public SyncLog analysisSysCwUser(String packageId) {
-        MetaEmployeeDiy param = new MetaEmployeeDiy();
+        MetaEmployee param = new MetaEmployee();
         if (packageId == null || packageId.trim().equals("")) {
             Long l = new Date().getTime();
             packageId = l.toString();
@@ -525,7 +525,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         param.setBusinessUnit("CW");
         param.setStext3("厨卫底材事业部");//厨卫底材事业部
 
-        List<MetaEmployeeDiy> metaEmployeeDiys = metaEmployeeDiyMapper.selectMetaEmployeeDiyList(param);
+        List<MetaEmployee> MetaEmployees = MetaEmployeeMapper.selectMetaEmployeeList(param);
         SyncLog syncLog = new SyncLog();
         syncLog.setSyncType("sysusercw");
         syncLog.setStartTime(new Date());
@@ -533,7 +533,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         Set<String> loginNameList = sysUserService.selectAllUserLoginName();
 
         syncLog.setPackageId(packageId);
-        syncLog.setTotalCount((long) metaEmployeeDiys.size());
+        syncLog.setTotalCount((long) MetaEmployees.size());
         List<SyncFailDetail> failDetails = new ArrayList<>();
         long successCount = 0;
         long failCount = 0;
@@ -541,7 +541,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         Long deptId = Long.parseLong(configService.selectConfigByKey("libang.user.cw.deptid"));
         Long roleId = Long.parseLong(configService.selectConfigByKey("libang.user.cw.roleid"));
         Long[] roleIds = {roleId};
-        if (metaEmployeeDiys.size() > 0) {
+        if (MetaEmployees.size() > 0) {
 
             Set<String> companyPostNameSet = getConfigValueSet("cw_comp_postname");
             Set<String> companyDeptPostNameSet = getConfigValueSet("cw_comp_dept_postname");
@@ -553,7 +553,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
 
             Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiySalesOrgTreeY9();
 
-            for (MetaEmployeeDiy m : metaEmployeeDiys) {
+            for (MetaEmployee m : MetaEmployees) {
                 try {
                     //用户是否属于DIY筛选范围
 //                    if(!diyObjid3Set.contains(m.getStext3())){
@@ -742,7 +742,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
 
     @Override
     public SyncLog analysisSysYSLUser(String packageId) {
-        MetaEmployeeDiy param = new MetaEmployeeDiy();
+        MetaEmployee param = new MetaEmployee();
         if (packageId == null || packageId.trim().equals("")) {
             Long l = new Date().getTime();
             packageId = l.toString();
@@ -753,7 +753,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         param.setBusinessUnit("YSL");
         param.setStext3("雅士利");
 
-        List<MetaEmployeeDiy> metaEmployeeDiys = metaEmployeeDiyMapper.selectMetaEmployeeDiyList(param);
+        List<MetaEmployee> MetaEmployees = MetaEmployeeDiyMapper.selectMetaEmployeeDiyCopy1List(param);
         SyncLog syncLog = new SyncLog();
         syncLog.setSyncType("sysuserysl");
         syncLog.setStartTime(new Date());
@@ -761,7 +761,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         Set<String> loginNameList = sysUserService.selectAllUserLoginName();
 
         syncLog.setPackageId(packageId);
-        syncLog.setTotalCount((long) metaEmployeeDiys.size());
+        syncLog.setTotalCount((long) MetaEmployees.size());
         List<SyncFailDetail> failDetails = new ArrayList<>();
         long successCount = 0;
         long failCount = 0;
@@ -769,7 +769,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         Long deptId = Long.parseLong(configService.selectConfigByKey("libang.user.ysl.deptid"));
         Long roleId = Long.parseLong(configService.selectConfigByKey("libang.user.ysl.roleid"));
         Long[] roleIds = {roleId};
-        if (metaEmployeeDiys.size() > 0) {
+        if (MetaEmployees.size() > 0) {
 
             String deptName = configService.selectConfigByKey("ysl.dept.orgName");
             String deptCode = configService.selectConfigByKey("ysl.dept.orgCode");
@@ -778,7 +778,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
             Set<String> officePostNameSet = getConfigValueSet("ysl_office_postname");
             Set<String> empPostNameSet = getConfigValueSet("ysl_emp_postname");
             Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiyYSLSalesOrgTree();
-            for (MetaEmployeeDiy m : metaEmployeeDiys) {
+            for (MetaEmployee m : MetaEmployees) {
                 try {
 
                     /** =============用户基本信息构建 start===============*/
@@ -944,13 +944,13 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
     public SyncLog analysisSysClueReporting() {
         Long l = new Date().getTime();
         String packageId = l.toString();
-        List<MetaEmployeeDiy> metaEmployeeDiys = metaEmployeeDiyMapper.selectMetaEmployeetClueReporting();
+        List<MetaEmployee> MetaEmployees = MetaEmployeeDiyMapper.selectMetaEmployeetClueReporting();
         SyncLog syncLog = new SyncLog();
         syncLog.setSyncType("sysuserClueReporting");
         syncLog.setStartTime(new Date());
 
         Set<String> loginNameList = sysUserService.selectAllUserLoginName();
-        syncLog.setTotalCount((long) metaEmployeeDiys.size());
+        syncLog.setTotalCount((long) MetaEmployees.size());
         List<SyncFailDetail> failDetails = new ArrayList<>();
         long successCount = 0;
         long failCount = 0;
@@ -958,8 +958,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         Long roleIdsfa = Long.parseLong(configService.selectConfigByKey("libang.user.sfa.roleid"));
         Long deptId = Long.parseLong(configService.selectConfigByKey("libang.user.ClueReporting.deptid"));
         Long roleId = Long.parseLong(configService.selectConfigByKey("libang.user.ClueReporting.roleid"));
-        if (metaEmployeeDiys.size() > 0) {
-            for (MetaEmployeeDiy m : metaEmployeeDiys) {
+        if (MetaEmployees.size() > 0) {
+            for (MetaEmployee m : MetaEmployees) {
                 try {
                     /** =============用户基本信息构建 start===============*/
                     SysUser user = new SysUser();
@@ -1152,7 +1152,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
     }
 
     /**品保中心 diy，cw，ysl 找不到部门的人员线索报备新增**/
-    public void save(SysUser user,MetaEmployeeDiy m){
+    public void save(SysUser user,MetaEmployee m){
         Set<String> sfaPostNameSet = getConfigValueSet("sfa_comp_postname");
         String postName = m.getEmployeePostName();
         Long deptId = Long.parseLong(configService.selectConfigByKey("libang.user.ClueReporting.deptid"));
@@ -1304,7 +1304,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
      * @param m
      * @return
      */
-    public String getStext(MetaEmployeeDiy m){
+    public String getStext(MetaEmployee m){
         if(m.getStext7()!=null&&!m.getStext7().trim().equals("")){
             return m.getStext7();
         }else if(m.getStext6()!=null&&!m.getStext6().trim().equals("")){
@@ -1323,7 +1323,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         throw  new NotOrgNameException(m);
     }
 
-    public String getStextSfa(MetaEmployeeDiy m,String type){
+    public String getStextSfa(MetaEmployee m,String type){
         if("DIY".equals(type)){
          if(m.getStext5()!=null&&!m.getStext5().trim().equals("")){
             return m.getStext5();
@@ -1344,7 +1344,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
      * @param m
      * @return
      */
-    public String getStextSecond(MetaEmployeeDiy m){
+    public String getStextSecond(MetaEmployee m){
         if(m.getStext7()!=null&&!m.getStext7().trim().equals("")){
             if(m.getStext6()!=null&&!m.getStext6().trim().equals("")) {
                 return m.getStext6();

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/impl/MetaEmployeeDiyServiceImpl.java

@@ -1,9 +1,11 @@
 package com.dgtly.sync.service.impl;
 
 import java.util.List;
+
+import com.dgtly.sync.domain.MetaEmployee;
+import com.dgtly.sync.mapper.MetaEmployeeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.dgtly.sync.mapper.MetaEmployeeDiyMapper;
 import com.dgtly.sync.domain.MetaEmployeeDiy;
 import com.dgtly.sync.service.IMetaEmployeeDiyService;
 import com.dgtly.common.core.text.Convert;
@@ -18,7 +20,7 @@ import com.dgtly.common.core.text.Convert;
 public class MetaEmployeeDiyServiceImpl implements IMetaEmployeeDiyService 
 {
     @Autowired
-    private MetaEmployeeDiyMapper metaEmployeeDiyMapper;
+    private MetaEmployeeMapper metaEmployeeDiyMapper;
 
     /**
      * 查询立邦雇员数据同步
@@ -27,68 +29,27 @@ public class MetaEmployeeDiyServiceImpl implements IMetaEmployeeDiyService
      * @return 立邦雇员数据同步
      */
     @Override
-    public MetaEmployeeDiy selectMetaEmployeeDiyById(String name)
+    public MetaEmployee selectMetaEmployeeDiyById(String name)
     {
-        return metaEmployeeDiyMapper.selectMetaEmployeeDiyById(name);
+        return metaEmployeeDiyMapper.selectMetaEmployeeDiyCopy1ById(name);
     }
 
     /**
      * 查询立邦雇员数据同步列表
      * 
-     * @param metaEmployeeDiy 立邦雇员数据同步
+     * @param
      * @return 立邦雇员数据同步
      */
     @Override
-    public List<MetaEmployeeDiy> selectMetaEmployeeDiyList(MetaEmployeeDiy metaEmployeeDiy)
+    public List<MetaEmployee> selectMetaEmployeeDiyList(MetaEmployee metaEmployee)
     {
-        return metaEmployeeDiyMapper.selectMetaEmployeeDiyList(metaEmployeeDiy);
+        return metaEmployeeDiyMapper.selectMetaEmployeeDiyCopy1List(metaEmployee);
     }
 
-    /**
-     * 新增立邦雇员数据同步
-     * 
-     * @param metaEmployeeDiy 立邦雇员数据同步
-     * @return 结果
-     */
-    @Override
-    public int insertMetaEmployeeDiy(MetaEmployeeDiy metaEmployeeDiy)
-    {
-        return metaEmployeeDiyMapper.insertMetaEmployeeDiy(metaEmployeeDiy);
-    }
 
-    /**
-     * 修改立邦雇员数据同步
-     * 
-     * @param metaEmployeeDiy 立邦雇员数据同步
-     * @return 结果
-     */
-    @Override
-    public int updateMetaEmployeeDiy(MetaEmployeeDiy metaEmployeeDiy)
-    {
-        return metaEmployeeDiyMapper.updateMetaEmployeeDiy(metaEmployeeDiy);
-    }
 
-    /**
-     * 删除立邦雇员数据同步对象
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteMetaEmployeeDiyByIds(String ids)
-    {
-        return metaEmployeeDiyMapper.deleteMetaEmployeeDiyByIds(Convert.toStrArray(ids));
-    }
 
-    /**
-     * 删除立邦雇员数据同步信息
-     * 
-     * @param name 立邦雇员数据同步ID
-     * @return 结果
-     */
-    @Override
-    public int deleteMetaEmployeeDiyById(String name)
-    {
-        return metaEmployeeDiyMapper.deleteMetaEmployeeDiyById(name);
-    }
+
+
+
 }