Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java

@@ -71,7 +71,7 @@ public class WorkOrderServiceImpl implements WorkOrderService {
         workOrder.setId(UUID.randomUUID().toString());
         workOrder.setDelFlag(false);
         workOrder.setCreateBy(createBy);
-        workOrder.setPayStatus("0");
+        workOrder.setPayStatus("1");
         workOrder.setStatus("0");
         workOrder.setPeopleSeenNum(0);
         workOrder.setCompanyId(createBy);

web/src/main/java/com/jpsoft/employment/modules/base/controller/WorkOrderController.java

@@ -154,7 +154,8 @@ public class WorkOrderController {
 
         try {
             WorkOrder workOrder = workOrderService.get(id);
-            workOrder.setStatus("1");
+            workOrder.setStatus("1");//修改已确认状态
+            workOrder.setPayStatusN("2");//修改已支付状态
             workOrder.setUpdateBy(subject);
             workOrder.setUpdateTime(new Date());
 
@@ -270,12 +271,17 @@ public class WorkOrderController {
         for (WorkOrder workOrder : page) {
             CustomerInfo customerInfo = customerInfoService.get(workOrder.getCompanyId());
             if (customerInfo != null) {
-                workOrder.setCompanyName(customerInfo.getRealName());
+                workOrder.setCompanyName(customerInfo.getCompanyName());
                 String statusN = dataDictionaryService.findNameByCatalogNameAndValue("工单状态",workOrder.getStatus());
                 if(StringUtils.isNotEmpty(statusN)){
                     workOrder.setStatusN(statusN);
                 }
 
+                String payStatusN = dataDictionaryService.findNameByCatalogNameAndValue("支付状态",workOrder.getPayStatus());
+                if(StringUtils.isNotEmpty(payStatusN)){
+                    workOrder.setPayStatusN(payStatusN);
+                }
+
             }
         }
 

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java

@@ -364,7 +364,7 @@ public class CustomerInfoApiController {
             }
 
 
-            //待验收
+            //质保中
             searchParams.put("status", "5");
 
             Map map4 = workOrderService.countByCustomerId(searchParams);