|
|
@@ -16,7 +16,6 @@ import cn.ezhizao.project.business.upgrade.service.IBizWorkOrderUpdateService;
|
|
|
import cn.ezhizao.project.business.workOrder.domain.BizWorkOrder;
|
|
|
import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderService;
|
|
|
import cn.ezhizao.project.fegin.IFeignClient;
|
|
|
-import cn.ezhizao.project.tenant.service.ITenantService;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
@@ -41,7 +40,7 @@ public class crmUpgradeController extends BaseController {
|
|
|
private IBizWorkOrderService bizWorkOrderService;
|
|
|
@Resource
|
|
|
private IFeignClient tenantService;
|
|
|
- @Log(title = "合同导入", businessType = BusinessType.IMPORT)
|
|
|
+ @Log(title = "基础版升级合同导入", businessType = BusinessType.IMPORT)
|
|
|
@PreAuthorize("@ss.hasPermi('business:upgrade:order:import')")
|
|
|
@PostMapping("/order/importLoop")
|
|
|
@Transactional
|
|
|
@@ -75,7 +74,7 @@ public class crmUpgradeController extends BaseController {
|
|
|
@PreAuthorize("@ss.hasPermi('business:upgrade:order:edit')")
|
|
|
@PostMapping("/order/completeUpgrade")
|
|
|
@Transactional
|
|
|
- public AjaxResult completeUpgrade() throws NoSuchFieldException, IllegalAccessException {
|
|
|
+ public AjaxResult completeUpgrade(){
|
|
|
String join = LockKey.join(LockKey.REPOR_UPDATE,getTenantId());
|
|
|
DistributionLock lock = new DistributionLock(join);
|
|
|
String message = "升级成功，请关闭浏览器重新进入";
|
|
|
@@ -105,7 +104,7 @@ public class crmUpgradeController extends BaseController {
|
|
|
query.setType(1);
|
|
|
Long count = bizWorkOrderUpdateService.getToUpLoadCount(query);
|
|
|
if (null != count && count>0L) {
|
|
|
- return success("false");
|
|
|
+ return success("true");
|
|
|
}
|
|
|
return success("false");
|
|
|
}
|
ly