fix：同步t100客户视图修改；

周鸿
1 parent 2b49a170
Showing 6 changed files with 142 additions and 10 deletions
src/main/java/com/huaheng/pc/config/customer/domain/CustomerErp.java
src/main/java/com/huaheng/pc/config/customer/mapper/CustomerErpMapper.java
src/main/java/com/huaheng/pc/config/customer/service/CustomerErpService.java
src/main/java/com/huaheng/pc/config/customer/service/CustomerServiceImpl.java
src/main/java/com/huaheng/pc/config/supplier/service/SupplierSyncService.java
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
+package com.huaheng.pc.config.customer.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@TableName(value = "erp_mes_pmaa2uc_v")
+public class CustomerErp implements Serializable {
+
+    /**
+     * 企业编号，环境
+     */
+    @TableField(value = "企业编号")
+    @ApiModelProperty(value = "企业编号")
+    private String pmaa000;
+    /**
+     * 交易对象编号/编码
+     */
+    @TableField(value = "交易对象编号")
+    @ApiModelProperty(value = "交易对象编号")
+    private String pmaa001;
+
+
+
+    /**
+     * 交易对象类型：1是供应商，2是客户，3是二者皆是
+     */
+    @TableField(value = "交易对象类型")
+    @ApiModelProperty(value = "交易对象类型")
+    private String pmaa002;
+
+    /**
+     * 供应商、客户名称
+     */
+    @TableField(value = "交易对象简称")
+    @ApiModelProperty(value = "供应商、客户名称")
+    private String pmaal;
+    /**
+     * 最近更新日期
+     */
+    @TableField(value = "最近更改日")
+    @ApiModelProperty(value = "最近更新日期")
+    private Date pmaamodd;
+
+
+}
 \ No newline at end of file
+package com.huaheng.pc.config.customer.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.config.customer.domain.CustomerErp;
+import com.huaheng.pc.config.supplier.domain.SupplierErp;
+
+public interface CustomerErpMapper extends BaseMapper<CustomerErp>
+{
+}
 \ No newline at end of file
+package com.huaheng.pc.config.customer.service;
+
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import com.huaheng.pc.config.customer.domain.CustomerErp;
+import com.huaheng.pc.config.customer.mapper.CustomerErpMapper;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.framework.aspectj.lang.annotation.Ds;
+import com.huaheng.framework.aspectj.lang.constant.DataSourceName;
+import com.huaheng.pc.config.address.domain.Address;
+import com.huaheng.pc.config.supplier.domain.SupplierErp;
+import com.huaheng.pc.config.supplier.mapper.SupplierErpMapper;
+
+
+@Service
+public class CustomerErpService extends ServiceImpl<CustomerErpMapper, CustomerErp>{
+
+    @Resource
+    private CustomerErpMapper customerErpMapper;
+
+
+    SimpleDateFormat sf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+
+    /**
+     * 查找erp数据库的客户数据
+     * @return
+     */
+    @Ds(name= DataSourceName.SLAVE)
+    public List<CustomerErp> findCustomerData(Integer time, Address address,Date syncTimes){
+//        String startTime= DateUtils.getNowPreDays("yyyy-MM-dd HH:mm:ss", 30);
+//        time=time*24*14;
+        // 将Date转换为Instant
+        Instant instant = syncTimes.toInstant();
+        // 将Instant往前推移10分钟
+        Instant newInstant = instant.minus(5, ChronoUnit.MINUTES);
+        // 将新的Instant转换回Date
+        Date newDate = Date.from(newInstant);
+//        String startTime= DateUtils.getNowPreMin("yyyy-MM-dd HH:mm:ss", time);
+//        Date date=null;
+//        try{
+//            date=sf.parse(startTime);
+//        }catch (Exception e){
+//        }
+        QueryWrapper<CustomerErp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("交易对象类型", 2,3);
+//        queryWrapper.isNull("最近更改日");
+        queryWrapper.ge("最近更改日", newDate);
+        queryWrapper.eq("企业编号", address.getUserDef2());
+        queryWrapper.select(" DISTINCT 交易对象编号 as pmaa001, 交易对象类型 AS pmaa002,交易对象简称 AS pmaal, \n" +
+                "最近更改日 AS pmaamodd");
+//        queryWrapper.last(" and rownum<=1");
+        List<CustomerErp> lists = this.list(queryWrapper);
+        return lists;
+    }
+}
@@ -24,11 +24,11 @@ public class CustomerServiceImpl extends ServiceImpl&lt;CustomerMapper, Customer&gt; i
         return this.listMaps(lambda);
     }
  
-    public Customer getCustomerByCode(String code){
-        return this.getOne(new LambdaQueryWrapper<Customer>()
-                .eq(Customer::getCode,code)
-                .eq(Customer::getWarehouseCode,ShiroUtils.getWarehouseCode()));
-    }
+//    public Customer getCustomerByCode(String code){
+//        return this.getOne(new LambdaQueryWrapper<Customer>()
+//                .eq(Customer::getCode,code)
+//                .eq(Customer::getWarehouseCode,ShiroUtils.getWarehouseCode()));
+//    }
  
     public Customer getCustomerByCode(String code,String warehouseCode){
         return this.getOne(new LambdaQueryWrapper<Customer>()
@@ -13,6 +13,8 @@ import com.huaheng.pc.config.address.domain.Address;
 import com.huaheng.pc.config.address.service.AddressService;
 import com.huaheng.pc.config.container.domain.Container;
 import com.huaheng.pc.config.customer.domain.Customer;
+import com.huaheng.pc.config.customer.domain.CustomerErp;
+import com.huaheng.pc.config.customer.service.CustomerErpService;
 import com.huaheng.pc.config.customer.service.CustomerServiceImpl;
 import com.huaheng.pc.config.supplier.domain.Supplier;
 import com.huaheng.pc.config.supplier.mapper.SupplierMapper;
@@ -49,6 +51,8 @@ public class SupplierSyncService extends ServiceImpl&lt;SupplierMapper, Supplier&gt;{
     private SyncTimeService syncTimeService;
     @Resource
     private AddressService addressService;
+    @Resource
+    private CustomerErpService customerErpService;
  
  
     public void syncSupplierData(Integer supplierTime){
@@ -75,7 +79,7 @@ public class SupplierSyncService extends ServiceImpl&lt;SupplierMapper, Supplier&gt;{
         }
         SyncTime syncTime=getTimeByName(syncName);
         Address address=addressService.selectAddressByParam("ERP", QuantityConstant.WAREHOUSE_CS);
-        List<SupplierErp> list=supplierErpService.findCustomerData(customerTime,address,syncTime.getSyncTimes());
+        List<CustomerErp> list=customerErpService.findCustomerData(customerTime,address,syncTime.getSyncTimes());
         System.out.println("======客户数据========"+list.size());
         saveAndUpdateDataCustomer(list);
         syncTimeService.updateStatus("customer",1,date);
@@ -120,16 +124,16 @@ public class SupplierSyncService extends ServiceImpl&lt;SupplierMapper, Supplier&gt;{
     }
  
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    public void saveAndUpdateDataCustomer(List<SupplierErp> list){
+    public void saveAndUpdateDataCustomer(List<CustomerErp> list){
         if(list==null||list.size()==0){
             return ;
         }
         List<Customer> lists=new ArrayList<>();
         for (int a=0;a<list.size();a++){
-            SupplierErp supplierErp=list.get(a);
+            CustomerErp supplierErp=list.get(a);
             Customer customer=new Customer();
             String code=supplierErp.getPmaa001();
-            Customer customer1 = customerService.getCustomerByCode(code);
+            Customer customer1 = customerService.getCustomerByCode(code,null);
             if(customer1!=null){
                 if(StringUtils.isNotEmpty(supplierErp.getPmaal())&&!supplierErp.getPmaal().equals(customer1.getName())){
                     customer.setId(customer1.getId());
@@ -222,7 +222,9 @@ public class TaskHeaderController extends BaseController {
                 .eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)
                 .orderByAsc(TaskHeader::getStatus)
                 .orderByDesc(TaskHeader::getId);
-
+        if (StringUtils.isNotEmpty(taskHeader.getReferenceCode())) {
+            lambdaQueryWrapper.apply(" id in(select taskId from task_detail where referenceCode ='" + taskHeader.getReferenceCode() + "' )");
+        }
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();