Merge remote-tracking branch 'origin/test' into dev

applications/money/money-server/src/main/java/com/usoftchina/saas/money/MoneyApplicatiion.java

@@ -8,6 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 //import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
@@ -21,6 +22,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableAuthClient
 @MapperScan("com.usoftchina.saas.money.mapper")
 @EnableDynamicDataSource
+@ComponentScan(basePackages = {"com.usoftchina.saas"})
 public class MoneyApplicatiion {
     public static void main(String[] args) {
         SpringApplication.run(MoneyApplicatiion.class, args);

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -522,8 +522,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         }
         //检查最小包装数
         result.setMessage(purchasedetailMapper.checkzxbzs(id));
-        commonService.commonAudit("purchase", "pu_id=" + id, "pu_status",
-                "pu_statuscode", "pu_auditdate", "pu_auditman");
+       /* commonService.commonAudit("purchase", "pu_id=" + id, "pu_status",
+                "pu_statuscode", "pu_auditdate", "pu_auditman");*/
         Purchase purchase = new Purchase();
         //生成更新对象
         purchase.setId(id);
@@ -531,8 +531,11 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchase.setPu_acceptstatuscode(Status.UNTURNIN.name());
         purchase.setUpdateTime(new Date());
         purchase.setUpdaterId(BaseContextHolder.getUserId());
+        purchase.setPu_status(Status.AUDITED.getDisplay());
+        purchase.setPu_statuscode(Status.AUDITED.name());
+        purchase.setPu_auditdate(new Date());
+        purchase.setPu_auditman(BaseContextHolder.getUserName());
         getMapper().updateByPrimaryKeySelective(purchase);
-        //更新存在字段
         //日志
         messageLogService.audit(docBaseDTO);
         return result;

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/StorageApplication.java

@@ -7,6 +7,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
@@ -16,6 +17,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableFeignClients("com.usoftchina.saas")
 @MapperScan("com.usoftchina.saas.storage.mapper")
 @EnableDynamicDataSource
+@ComponentScan(basePackages = {"com.usoftchina.saas"})
 public class StorageApplication {
 
     public static void main(String[] args) {