update

bailuntec-cost-core/src/main/java/com/blt/other/OtherApplication.java

@@ -6,17 +6,19 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+@EnableAsync
 @RestController
 @SpringBootApplication
 @ComponentScan(basePackages = {"com.blt.other", "com.bailuntec"})
 @EnableFeignClients
-@MapperScan(basePackages = {"com.blt.other.module.*.dao","com.blt.other.database.mapper"})
+@MapperScan(basePackages = {"com.blt.other.module.*.dao", "com.blt.other.database.mapper"})
 public class OtherApplication {
 
     public static void main(String[] args) {

bailuntec-cost-core/src/main/java/com/blt/other/common/job/BuyUserSyncJob.java

@@ -22,6 +22,7 @@ public class BuyUserSyncJob extends QuartzJobBean {
 
     /**
      * 获取用户信息 --> 保存到本系统采购员表
+     *
      * @param jobExecutionContext
      * @throws JobExecutionException
      */

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/model/CostDomain.java

@@ -205,8 +205,10 @@ public class CostDomain implements Serializable {
     @ApiModelProperty("费用模版id")
     private Integer costTemplateId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("最后更新时间")
     private LocalDateTime lastModifyDate;
+
     @ApiModelProperty("借支单，还款申请金额，包括已还的和申请中 ，借支单币种。")
     private BigDecimal repaymentAppliedAmount;
 
@@ -219,7 +221,6 @@ public class CostDomain implements Serializable {
     private String lendType;
 
 
-
     //-------------
     @TableField(exist = false)
     private CostTemplate costTemplate;
@@ -234,7 +235,6 @@ public class CostDomain implements Serializable {
     private String costCurrentReviewer;
 
 
-
     public CostDto castToDto() {
 
         StatusMapper statusMapper = SpringContextUtil.getBean(StatusMapper.class);

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/cost/AbstractCostService.java

@@ -189,16 +189,6 @@ public abstract class AbstractCostService implements CostService {
         if (null != costDomain.getCompanyNo()) {
             costDomain.setCompanyName(costCompanyDao.selectByNo(costDomain.getCompanyNo()).getCompanyName());
         }
-        //todo
-//        if (null != costDomain.getKindNo() && !"".equals(costDomain.getKindNo())) {
-//            CostTypeKindDomain costTypeKindDomain = costTypeKindDao.selectByKindNo(costDomain.getKindNo());
-//            if (null != costTypeKindDomain) {
-//                costDomain.setKindName(costTypeKindDomain.getKindName());
-//                costDomain.setTypeName(costTypeKindDomain.getTypeName());
-//                costDomain.setTypeNo(costTypeKindDomain.getTypeNo());
-//            }
-//        }
-
         if (ListUtil.isNotEmpty(costDomain.getAttach())) {
             costDomain.getAttach().forEach(costAttach -> {
                 CostTemplateBaseCol costTemplateBaseCol = costTemplateBaseColMapper.selectById(costAttach.getCostTemplateBaseColId());

bailuntec-cost-core/src/test/java/com/blt/other/OtherApplicationTests.java

@@ -11,6 +11,7 @@ import com.bailuntec.api.bailuntec.oa.response.OaUserResp;
 import com.bailuntec.common.SpringContextUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.blt.other.common.interceptor.mail.MailService;
 import com.blt.other.database.model.CostCompanyDomain;
 import com.blt.other.database.model.CostTypeDomain;
 import com.blt.other.module.auth.dao.OaDepartmentMapper;
@@ -349,5 +350,14 @@ public class OtherApplicationTests {
         });
     }
 
+    @Resource
+    MailService mailService;
+
+    @Test
+    public void testMail() {
+        mailService.sendSimpleMail("robbendev@qq.com", "pre", "test");
+    }
+
+
 }