增加配货类型

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -1388,10 +1388,11 @@ public class CustomerServiceImpl implements CustomerService {
     @Override
     public List<CustomerCommon> listCustomerCommons(CustomerCommon customerCommon) {
         List<CustomerCommon> customerCommonList  = new ArrayList<>();
-        customerCommonList.add(customerCommon);
-        for (CustomerCommon c : customerCommonList) {
+        //customerCommonList.add(customerCommon);
+        for (int i = 0; i <= 0; i++) {
+            CustomerCommon c = customerCommon;
             RelationOrder relationOrder = new RelationOrder();
-            relationOrder.setRelationId(c.getRelationId());
+            relationOrder.setRelationCustomerId(c.getCustomerId());
             List<RelationOrder> relationOrderList = relationOrderMapper.getRelationOrderList(relationOrder);
             List<SalesOrder> orderList = new ArrayList<>();
             for (RelationOrder ro : relationOrderList) {
@@ -1418,6 +1419,7 @@ public class CustomerServiceImpl implements CustomerService {
             ComplaintSignclosedInfo record = new ComplaintSignclosedInfo();
             record.setSignclosedCustomerId(c.getCustomerId());
             c.setSignclosedInfos(complaintSignclosedInfoMapper.listSignclosed(record));
+            customerCommonList.add(c);
         }
         return customerCommonList;
     }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminAfterSaleController.java

@@ -181,6 +181,7 @@ public class AdminAfterSaleController {
         detectInfo.setIsMaintenance(0);
         detectInfo.setDetectRenovation(0);
         detectInfo.setDetectProcessingResults(0);
+        detectInfo.setAdminId(AdminUtils.getLoginAdminId());
         detectInfo.setSalesmanAdminId(AdminUtils.getLoginAdmin().getAdminSalesId());
         detectInfo.setMaintenanceCutTime(new Date());
         detectInfo.setDetectSource(3);

watero-rst-web/src/main/resources/log4j.properties

@@ -28,6 +28,7 @@ log4j.appender.debugLog.File=D:/log/rst/debug.log
 log4j.appender.debugLog.Append=true
 log4j.appender.debugLog.Threshold=DEBUG
 log4j.appender.debugLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.debugLog.DatePattern='.'yyyy-MM-dd
 log4j.appender.debugLog.layout.ConversionPattern=%d %p [%c] - %m %n
 log4j.appender.debugLog.encoding=UTF-8
 # ACT具体设置