Browse Source

fix 修改定时多线程

Administrator 1 year ago
parent
commit
6db833dc86

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/investment/ZxInvestmentController.java

@@ -82,7 +82,7 @@ public class ZxInvestmentController extends BaseController {
     @Log(title = "政协委员招商引资", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZxInvestment zxInvestment) {
-        return toAjax(zxInvestmentService.updateZxInvestment(zxInvestment));
+        return zxInvestmentService.updateZxInvestment(zxInvestment);
     }
 
     /**

+ 4 - 4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxInvestmentServiceImpl.java

@@ -75,11 +75,11 @@ public class ZxInvestmentServiceImpl implements IZxInvestmentService
     public AjaxResult updateZxInvestment(ZxInvestment zxInvestment)
     {
         ZxInvestment zxInvestmentNew = zxInvestmentMapper.selectZxInvestmentByInvestmentId(zxInvestment.getInvestmentId());
-        if (zxInvestment.getType().equals(TWO) && !Objects.equals(zxInvestmentNew.getType(), ONE)){
-            return AjaxResult.error("已签约或已审核");
+        if (!zxInvestment.getType().equals(zxInvestmentNew.getType()) && zxInvestment.getType().equals(TWO) && !zxInvestmentNew.getType().equals(ONE)){
+            return AjaxResult.error("项目已签约");
         }
-        if (zxInvestment.getType().equals(THR) && !Objects.equals(zxInvestmentNew.getType(), TWO)){
-            return AjaxResult.error("项目未审核");
+        if (!zxInvestment.getType().equals(zxInvestmentNew.getType()) && zxInvestment.getType().equals(THR) && !zxInvestmentNew.getType().equals(TWO)){
+            return AjaxResult.error("项目未审核");
         }
         zxInvestment.setUpdateTime(DateUtils.getNowDate());
          zxInvestmentMapper.updateZxInvestment(zxInvestment);