Merge remote-tracking branch 'origin/master_0929' into master_0929

yeqianyong
2 parents c4375ad4 5e7c3f61
Showing 3 changed files with 48 additions and 4 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/CustomerCreditHistoryServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/CustomerCreditServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/car/DraftRequestCarTicketServiceImpl.java
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/CustomerCreditHistoryServiceImpl.java
View file @54912e1
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/CustomerCreditHistoryServiceImpl.java
View file @54912e1
@@ -12,7 +12,9 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.common.utils.StringUtil;
 import java.io.Serializable;
 import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
@@ -43,6 +45,8 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer
     private CustomerService customerService;
     @Resource
     private SysUserService sysUserService;
+    @Resource
+    private SysDataDicItemService sysDataDicItemService;
     // 定义不需要比较的字段
     private static final Set<String> EXCLUDED_FIELDS = new HashSet<>(Arrays.asList(
             "id", "sort", "createById", "createBy", "updateById",
@@ -307,6 +311,27 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer
                             value2 = customer2.getName();
                         }
                     }
+                    //区域
+                    if ("region".equals(fieldName)) {
+                        if (StringUtil.isNotEmpty(data.getRegion())) {
+                            List<SysDataDicItem> sysDataDicItemList = sysDataDicItemService.findByDicCode("CREDIT_ZONE");
+
+                            value1 = sysDataDicItemList.stream()
+                                    .filter(item -> data.getRegion() != null && data.getRegion().equals(item.getCode()))
+                                    .map(SysDataDicItem::getName)
+                                    .findFirst()
+                                    .orElse(data.getRegion());
+                        }
+                        if (StringUtil.isNotEmpty(customerCreditHistory.getRegion())) {
+                            List<SysDataDicItem> sysDataDicItemList = sysDataDicItemService.findByDicCode("CREDIT_ZONE");
+
+                            value2 = sysDataDicItemList.stream()
+                                    .filter(item -> customerCreditHistory.getRegion() != null && customerCreditHistory.getRegion().equals(item.getCode()))
+                                    .map(SysDataDicItem::getName)
+                                    .findFirst()
+                                    .orElse(customerCreditHistory.getRegion());
+                        }
+                    }
                     //企业类型
                     if ("enterpriseType".equals(fieldName)) {
                         if (StringUtil.isNotEmpty(data.getEnterpriseType())) {
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/CustomerCreditServiceImpl.java
View file @54912e1
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/CustomerCreditServiceImpl.java
View file @54912e1
@@ -15,8 +15,10 @@ import com.lframework.starter.web.core.components.redis.RedisHandler;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.*;
 import com.lframework.starter.web.inner.bo.system.user.GetSysUserBo;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.entity.SysDept;
 import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
@@ -97,6 +99,8 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
     private String exportTemplate;
     @Resource
     private TransactorHandler transactorHandler;
+    @Resource
+    private SysDataDicItemService sysDataDicItemService;
     @Override
     public PageResult<CustomerCredit> query(Integer pageIndex, Integer pageSize, QueryCustomerCreditVo vo) {
@@ -1383,6 +1387,17 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
                 }
             }
         }
+        //区域
+        if (StringUtil.isNotEmpty(data.getRegion())) {
+            List<SysDataDicItem> sysDataDicItemList = sysDataDicItemService.findByDicCode("CREDIT_ZONE");
+
+            String regionName = sysDataDicItemList.stream()
+                    .filter(item -> data.getRegion() != null && data.getRegion().equals(item.getCode()))
+                    .map(SysDataDicItem::getName)
+                    .findFirst()
+                    .orElse(data.getRegion());
+            data.setRegion(regionName);
+        }
         if (StringUtil.isNotEmpty(data.getEnterpriseType())) {
             String enterpriseType;
             if ("DEALER".equals(data.getEnterpriseType())) {
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/car/DraftRequestCarTicketServiceImpl.java
View file @54912e1
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/car/DraftRequestCarTicketServiceImpl.java
View file @54912e1
@@ -155,7 +155,9 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
         if (!StringUtil.isBlank(vo.getStatus())) {
             data.setStatus(vo.getStatus());
         } else {
-            data.setStatus("AUDIT");
+            if (!"SHIPMENTSPLAN".equals(vo.getSource())) {
+                data.setStatus("AUDIT");
+            }
         }
         if (!StringUtil.isBlank(vo.getSource())) {
             data.setSource(vo.getSource());
@@ -165,9 +167,11 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
-        //开启审核
-        data.setUpdateById(SecurityUtil.getCurrentUser().getId());
-        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
+        if (!"SHIPMENTSPLAN".equals(vo.getSource())) {
+            //开启审核
+            data.setUpdateById(SecurityUtil.getCurrentUser().getId());
+            flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
+        }
         return data.getId();
     }