diff --git a/xm-bootstrap/src/main/java/com/xm/AutoConfig.java b/xm-bootstrap/src/main/java/com/xm/AutoConfig.java index 3b013958..40e5e089 100644 --- a/xm-bootstrap/src/main/java/com/xm/AutoConfig.java +++ b/xm-bootstrap/src/main/java/com/xm/AutoConfig.java @@ -10,7 +10,6 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; * 一些默认公共配置 */ @ComponentScan(basePackages={"com.mdp"}) -@EnableAsync @Configuration public class AutoConfig { } diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java index f0ad3bd2..1e6c86d2 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java @@ -268,7 +268,7 @@ public class XmTaskExecuserService extends BaseService { if("6".equals(xmTaskExecuserDB.getSettleStatus())) { throw new BizException(xmTaskExecuser.getUsername()+"已经结算完毕,不能再申请"); } - if(!"0".equals(xmTaskExecuserDB.getSettleStatus()) && !"1".equals(xmTaskExecuserDB.getSettleStatus()) && !"5".equals(xmTaskExecuserDB.getSettleStatus())) { + if( !StringUtils.hasText(xmTaskExecuserDB.getSettleStatus()) && !"0".equals(xmTaskExecuserDB.getSettleStatus()) && !"1".equals(xmTaskExecuserDB.getSettleStatus()) && !"5".equals(xmTaskExecuserDB.getSettleStatus())) { throw new BizException(xmTaskExecuser.getUsername()+"暂时还不能申请结算"); } BigDecimal settleAmount=NumberUtil.getBigDecimal(xmTaskExecuser.getSettleAmount(), BigDecimal.ZERO); diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml index 21e5b33e..f73a1037 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml @@ -105,16 +105,28 @@ group by res.project_id,res.userid,res.username,subject_id,subject_name,biz_month diff --git a/xm-core/src/test/java/com/xm/AutoConfig.java b/xm-core/src/test/java/com/xm/AutoConfig.java index 4c86f2ce..13648a35 100644 --- a/xm-core/src/test/java/com/xm/AutoConfig.java +++ b/xm-core/src/test/java/com/xm/AutoConfig.java @@ -2,6 +2,7 @@ package com.xm; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableAsync; /** * 要使用mdp平台功能,必须 扫码com.mdp包 @@ -9,5 +10,6 @@ import org.springframework.context.annotation.Configuration; */ @ComponentScan(basePackages={"com.mdp"}) @Configuration +@EnableAsync public class AutoConfig { }