update

bailuntec-cost-core/src/main/java/com/blt/other/module/auth/service/IOaUserService.java

@@ -27,4 +27,12 @@ public interface IOaUserService extends IService<OaUser> {
      */
     List<OaUser> queryList(@Nullable Integer primaryDepartmentId,
                            @Nullable Integer oaCompanyId);
+
+    /**
+     * 一级部门审核人
+     *
+     * @param oaUserId 用户id
+     * @return 用户的一级部门审核人
+     */
+    OaUser selectManage(Integer oaUserId);
 }

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

@@ -48,4 +48,14 @@ public class OaUserServiceImpl extends ServiceImpl<OaUserMapper, OaUser> impleme
         oaUserList.addAll(mangeUserList);
         return oaUserList;
     }
+
+    @Override
+    public OaUser selectManage(Integer oaUserId) {
+
+        OaUser costUser = baseMapper.selectByOaUserId(oaUserId);
+        OaDepartment oaDepartment = oaDepartmentMapper.selectByDepartmentId(costUser.getPrimaryDepartmentId());
+        String manageUserName = oaDepartment.getManageUser1();
+
+        return baseMapper.selectByUserName(manageUserName);
+    }
 }

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/cost/CostController.java

@@ -218,16 +218,28 @@ public class CostController {
 
     @ApiOperation("审核费用单列表")
     @GetMapping("/checkCostList")
-    public CostResult<IPage<CostDto>> financialCheckCostList(@RequestParam Integer userid,
-                                                             @RequestParam Integer pageNum,
-                                                             @RequestParam Integer pageSize,
-                                                             @RequestParam @ApiParam("1-财务+最终审核 2-部门审核") Integer type,
-                                                             @RequestParam @ApiParam("1- 全部 2-待审核 3-已手动审核 4-已自动审核") Integer status) {
+    public CostResult<IPage<CostDto>> checkCostList(@RequestParam Integer userid,
+                                                    @RequestParam Integer pageNum,
+                                                    @RequestParam Integer pageSize,
+                                                    @RequestParam @ApiParam("1-财务+最终审核 2-部门审核") Integer type,
+                                                    @RequestParam @ApiParam("1- 全部 2-待审核 3-已手动审核 4-已自动审核") Integer status) {
         costService = CostServiceFactory.getCostService();
         IPage<CostDto> page = costService.checkCostList(userid, pageNum, pageSize, type, status);
         return CostResult.success(page);
     }
 
+    @ApiOperation("审核费用单列表")
+    @GetMapping("/checkCostCount")
+    public CostResult<Long> checkCostCount(@RequestParam Integer userid,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam @ApiParam("1-财务+最终审核 2-部门审核") Integer type,
+                                           @RequestParam @ApiParam("1- 全部 2-待审核 3-已手动审核 4-已自动审核") Integer status) {
+        costService = CostServiceFactory.getCostService();
+        Long count = costService.checkCostList(userid, pageNum, pageSize, type, status).getTotal();
+        return CostResult.success(count);
+    }
+
     @ApiOperation("部门审核通过")
     @GetMapping("/check/departmentCheck")
     public CostResult<Void> departmentCheck(@RequestParam String costNo,

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

 package com.blt.other.module.cost.service;
 
+import com.blt.other.module.auth.model.OaUser;
 import com.blt.other.module.database.model.CostLogDomain;
 
 import java.util.List;
@@ -10,6 +11,8 @@ public interface CostLogService {
 
     Integer save(String costNo, Integer updateUserid, String updateMainNote,Integer type);
 
+    Integer save(String costNo, OaUser oaUser, String updateMainNote, Integer type);
+
     List<CostLogDomain> getListByCostNo(String costNo);
 
     List<String> getListLogs(List<CostLogDomain> logs);

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

@@ -40,12 +40,6 @@ public class CostLogServiceImpl implements CostLogService {
 
         UserDomain user = userDao.selectByuserid(updateUserid);
 
-        if (user == null) {
-            user = new UserDomain();
-            OaUser oaUser = oaUserMapper.selectByOaUserId(updateUserid);
-            user.setUsercode(oaUser.getUserCode());
-            user.setUsername(oaUser.getUserName());
-        }
 
         costLog.setUpdateUsercode(user.getUsercode());
         costLog.setUpdateUsername(user.getUsername());
@@ -58,6 +52,25 @@ public class CostLogServiceImpl implements CostLogService {
     }
 
     @Override
+    public Integer save(String costNo, OaUser oaUser, String updateMainNote, Integer type) {
+        CostLogDomain costLog = new CostLogDomain();
+        costLog.setCostNo(costNo);
+        costLog.setUpdateTime(new Date());
+
+        UserDomain user = userDao.selectByuserid(oaUser.getOaUserId());
+
+
+        costLog.setUpdateUsercode(user.getUsercode());
+        costLog.setUpdateUsername(user.getUsername());
+        costLog.setUpdateUserid(oaUser.getOaUserId());
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        costLog.setUpdateNote(sdf.format(costLog.getUpdateTime()) + "  " + updateMainNote + "  更新人：" + user.getUsername());
+        costLog.setType(type);
+        return costLogDao.insert(costLog);
+    }
+
+    @Override
     public List<CostLogDomain> getListByCostNo(String costNo) {
         return costLogDao.selectByCostNo(costNo);
     }

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

@@ -443,25 +443,10 @@ public abstract class AbstractCostService implements CostService {
         req.setCompanyMainName(cost.getCompanyName());
         req.setTitle(cost.getCostNo());
 
-//        if (cost.getCostNo().startsWith("S")) {
-//            log.info("补差额的付款单：" + cost.getCostNo());
-//            applyMoneyDetail.setName("借支单补差额");
-//            // 审核回调地址(ApplyCallbackUrl)不可为空；
-//            req.setApplyCallbackUrl(lendCostApplyCallBackUrlPost);
-//            // 出纳回调地址(CashierCallbackUrl)不可为空；
-//            req.setCashierCallbackUrl(lendCostCashierCallbackUrlPost);
-//
-//        } else {
-//            // 审核回调地址(ApplyCallbackUrl)不可为空；
-//            req.setApplyCallbackUrl(costApplyCallbackUrlPost);
-//            // 出纳回调地址(CashierCallbackUrl)不可为空；
-//            req.setApplyCallbackUrl(costCashierCallbackUrlPost);
-//        }
         // 币种编号(UnitCode)不可为空；
         req.setUnitCode(cost.getDic());
         // 币种名称(UnitName)不可为空；
         req.setUnitName(cost.getDic());
-        // 交易对象改为付款/收款单位
 
         // 交易对象(TradeObjectID/TradeObjectName)不可为空；
         req.setTradeObjectID(companyByCompanyNo.getValue() + "");
@@ -469,6 +454,7 @@ public abstract class AbstractCostService implements CostService {
         req.setBankCardto(cost.getBankCard());
         // 交易对象账户(BankNameto/BankCardto/BankCardUserto)资料不完整；
         req.setBankCardUserto(cost.getBankCardUser());
+//        req.setBankNameto(cost.getBankName());
         // newOtherPurchase申请来源(SourceCode/SourceTypeCode)不可为空；
         req.setSourceCode("newCost");
         req.setSourceTypeCode("newCostType");
@@ -477,18 +463,6 @@ public abstract class AbstractCostService implements CostService {
         // 预计付款时间 ExpectPayTime
         req.setExpectPayTime(new Date());
 
-
-//        // 申请类型(ApplyType)不存在；申请类型:1#付款;2#收款;3#无需付款;
-//        if (1 == cost.getCostForm()) {
-//            req.setApplyType("" + 1);
-//            applyMoneyDetail.setName("费用单付款");
-//        } else if (2 == cost.getCostForm()) {
-//            req.setApplyType("" + 2);
-//            applyMoneyDetail.setName("费用单收款");
-//        } else if (3 == cost.getCostForm() && 1 == cost.getIsLend()) {
-//            req.setApplyType("" + 1);
-//            applyMoneyDetail.setName("借支单付款");
-//        }
         // 申请人(UserAcctID/UserAcctName)不存在；
         req.setUserAcctID("" + cost.getCreateUserid());
         req.setUserAcctName("" + cost.getCreateUsername());

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

@@ -21,7 +21,6 @@ import org.springframework.stereotype.Component;
 public class CostSubscribe {
 
 
-    @Async
     public void subscribe(CostContext costContext) {
         costContext.handle();
     }

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

@@ -42,6 +42,7 @@ public class Lend1CostServiceImpl extends AbstractCostService implements CostSer
         ApplyMoneyDetail applyMoneyDetail = new ApplyMoneyDetail();
         applyMoneyDetail.setName("借支单付款");
         applyMoneyDetail.setMoney(cost.getAmount());
+
         //todo
         applyMoneyDetail.setMoneyRmb(cost.getAmount());
         applyMoneyDetail.setRemark("");
@@ -50,7 +51,6 @@ public class Lend1CostServiceImpl extends AbstractCostService implements CostSer
         // 出纳申请金额明细(MoneyDetail)不可为空；
         req.setMoneyDetail(applyMoneyDetailList);
 
-
         CwResult<String> cwResult = cwApi.postApply(req);
 
         TofinanceVo tofinanceVo = JsonUtilByJackson.readValue(cwResult.getData().replaceAll("/^['|\"](.*)['|\"]$/", ""), TofinanceVo.class);

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

@@ -5,6 +5,7 @@ import com.bailuntec.api.bailuntec.cw.request.PostApplyReq;
 import com.bailuntec.api.bailuntec.cw.response.CwResult;
 import com.bailuntec.common.BeanUtils;
 import com.bailuntec.common.JsonUtilByJackson;
+import com.blt.other.common.exception.BizRuntimeException;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.service.CostService;
 import com.blt.other.module.cost.vo.TofinanceVo;
@@ -34,7 +35,6 @@ public class PayCostServiceImpl extends AbstractCostService implements CostServi
         // 审核回调地址(ApplyCallbackUrl)不可为空；
         if (cost.getCostNo().startsWith("S")) {
             log.info("补差额的付款单：" + cost.getCostNo());
-//            applyMoneyDetail.setName("借支单补差额");
             // 审核回调地址(ApplyCallbackUrl)不可为空；
             req.setApplyCallbackUrl(lendCostApplyCallBackUrlPost);
             // 出纳回调地址(CashierCallbackUrl)不可为空；
@@ -44,7 +44,7 @@ public class PayCostServiceImpl extends AbstractCostService implements CostServi
             // 审核回调地址(ApplyCallbackUrl)不可为空；
             req.setApplyCallbackUrl(costApplyCallbackUrlPost);
             // 出纳回调地址(CashierCallbackUrl)不可为空；
-            req.setApplyCallbackUrl(costCashierCallbackUrlPost);
+            req.setCashierCallbackUrl(costCashierCallbackUrlPost);
         }
 
         req.setApplyType("" + 1);
@@ -58,14 +58,18 @@ public class PayCostServiceImpl extends AbstractCostService implements CostServi
         applyMoneyDetail.setRemark("");
 
         applyMoneyDetailList.add(applyMoneyDetail);
+
         // 出纳申请金额明细(MoneyDetail)不可为空；
         req.setMoneyDetail(applyMoneyDetailList);
 
 
         CwResult<String> cwResult = cwApi.postApply(req);
 
-        TofinanceVo tofinanceVo = JsonUtilByJackson.readValue(cwResult.getData().replaceAll("/^['|\"](.*)['|\"]$/", ""), TofinanceVo.class);
+        if (!cwResult.getSuccess()) {
+            throw new BizRuntimeException(cwResult.getMessage());
+        }
 
+        TofinanceVo tofinanceVo = JsonUtilByJackson.readValue(cwResult.getData().replaceAll("/^['|\"](.*)['|\"]$/", ""), TofinanceVo.class);
         //保存财务系统调用信息
         CostTofinanceDomain costTofinanceDomain = new CostTofinanceDomain();
         BeanUtils.copyProperties(costTofinanceDomain, tofinanceVo);

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

 package com.blt.other.module.cost.service.impl.costcheck;
 
 import com.blt.other.common.exception.BizRuntimeException;
-import com.blt.other.module.auth.dao.OaDepartmentMapper;
 import com.blt.other.module.auth.model.CostReviewer;
-import com.blt.other.module.auth.model.OaDepartment;
 import com.blt.other.module.auth.model.OaUser;
+import com.blt.other.module.auth.service.IOaUserService;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.model.CostTemplate;
 import com.blt.other.module.database.model.CostLogDomain;
@@ -29,7 +28,7 @@ public class DepartmentCheckState extends CostState {
 
 
     @Resource
-    OaDepartmentMapper oaDepartmentMapper;
+    IOaUserService oaUserService;
 
     @Override
     public void handle() {
@@ -48,16 +47,11 @@ public class DepartmentCheckState extends CostState {
             costDomain.setCostStatus(CostDomain.STATUS_FINANCIAL_CHECK);
             costDao.updateById(costDomain);
 
-            OaUser costUser = oaUserMapper.selectByOaUserId(costDomain.getCreateUserid());
-            OaDepartment oaDepartment = oaDepartmentMapper.selectById(costUser.getPrimaryDepartmentId());
-
-            String manageUserName = oaDepartment.getManageUser1();
-            OaUser oaUser = oaUserMapper.selectByUserName(manageUserName);
 
             //流转状态
             nextState(financialCheckState);
             costSubscribe.subscribe(costContext);
-            costLogService.save(costDomain.getCostNo(), oaUser.getOaUserId(), "基础模版无需部门审核", CostLogDomain.DEPARTMENT_AUTO_PASS);
+            costLogService.save(costDomain.getCostNo(), oaUserService.selectManage(costDomain.getCreateUserid()), "部门审核自动通过", CostLogDomain.DEPARTMENT_AUTO_PASS);
 
             return;
         }
@@ -68,7 +62,7 @@ public class DepartmentCheckState extends CostState {
             if (autoCheck(costDomain)) {
                 costDomain.setCostStatus(CostDomain.STATUS_FINANCIAL_CHECK);
                 costDao.updateById(costDomain);
-                costLogService.save(costDomain.getCostNo(), currentUserId, "部门自动审核通过", CostLogDomain.DEPARTMENT_AUTO_PASS);
+                costLogService.save(costDomain.getCostNo(), oaUserService.selectManage(costDomain.getCreateUserid()), "部门自动审核通过", CostLogDomain.DEPARTMENT_AUTO_PASS);
 
                 //流转状态
                 nextState(financialCheckState);
@@ -79,20 +73,21 @@ public class DepartmentCheckState extends CostState {
 
         //人工审核
         OaUser costUser = oaUserMapper.selectByOaUserId(costDomain.getCreateUserid());
+        if (costContext.currentUserId != null) {
+            //人工审核通过
+            if (costReviewerMapper.queryOne(costUser.getPrimaryDepartmentId(), CostReviewer.departmentReviewer, currentUserId) != null) {
+                costDomain.setCostStatus(CostDomain.STATUS_FINANCIAL_CHECK);
+                costDao.updateById(costDomain);
+                costLogService.save(costDomain.getCostNo(), currentUserId, "部门审核通过", CostLogDomain.DEPARTMENT_AUTO_PASS);
 
-        //人工审核通过
-        if (costReviewerMapper.queryOne(costUser.getPrimaryDepartmentId(), CostReviewer.departmentReviewer, currentUserId) != null) {
-            costDomain.setCostStatus(CostDomain.STATUS_FINANCIAL_CHECK);
-            costDao.updateById(costDomain);
-            costLogService.save(costDomain.getCostNo(), currentUserId, "部门审核通过", CostLogDomain.DEPARTMENT_AUTO_PASS);
-
-            nextState(financialCheckState);
-            //发布到总线尝试下个环节的自动审核
-            costSubscribe.subscribe(costContext);
-        }
-        //人工审核没权限
-        else {
-            throw new BizRuntimeException("current user no authority");
+                nextState(financialCheckState);
+                //发布到总线尝试下个环节的自动审核
+                costSubscribe.subscribe(costContext);
+            }
+            //人工审核没权限
+            else {
+                throw new BizRuntimeException("current user no authority");
+            }
         }
     }
 

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

@@ -2,12 +2,14 @@ package com.blt.other.module.cost.service.impl.costcheck;
 
 import com.blt.other.common.exception.BizRuntimeException;
 import com.blt.other.module.auth.model.CostReviewer;
+import com.blt.other.module.auth.service.IOaUserService;
 import com.blt.other.module.cost.dao.CostCompanyDao;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.model.CostTemplate;
 import com.blt.other.module.database.model.CostCompanyDomain;
 import com.blt.other.module.database.model.CostLogDomain;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -26,7 +28,10 @@ public class FinalCheckState extends CostState {
     UnPayState unPayState;
     @Resource
     CostCompanyDao costCompanyDao;
+    @Resource
+    IOaUserService oaUserService;
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void handle() {
         CostDomain costDomain = costContext.costDomain;
@@ -40,6 +45,10 @@ public class FinalCheckState extends CostState {
 
         //如果是默认模版 不需要最终审核
         if (costTemplate.getIsDefault()) {
+            costDomain.setCostStatus(CostDomain.STATUS_UN_PAY);
+            costDao.updateById(costDomain);
+            costLogService.save(costDomain.getCostNo(), oaUserService.selectManage(costDomain.getCreateUserid()), "部门审核自动通过", CostLogDomain.DEPARTMENT_AUTO_PASS);
+
             //流转状态
             nextState(unPayState);
             //通知财务系统
@@ -63,7 +72,7 @@ public class FinalCheckState extends CostState {
             if (this.autoCheck(costDomain)) {
                 costDomain.setCostStatus(CostDomain.STATUS_UN_PAY);
                 costDao.updateById(costDomain);
-                costLogService.save(costDomain.getCostNo(), currentUserId, "最终审核自动通过", CostLogDomain.FINAL_AUTO_PASS);
+                costLogService.save(costDomain.getCostNo(), oaUserService.selectManage(costDomain.getCreateUserid()), "最终审核自动通过", CostLogDomain.FINAL_AUTO_PASS);
 
                 //流转状态
                 nextState(unPayState);
@@ -74,23 +83,24 @@ public class FinalCheckState extends CostState {
         }
 
         CostCompanyDomain costCompany = costCompanyDao.selectByNo(costDomain.getCompanyNo());
+        if (costContext.currentUserId != null) {
+            //人工审核通过
+            if (costReviewerMapper.queryOne(costCompany.getId(), CostReviewer.finalReviewer, currentUserId) != null) {
+                costDomain.setCostStatus(CostDomain.STATUS_UN_PAY);
+                costDao.updateById(costDomain);
 
-        //人工审核通过
-        if (costReviewerMapper.queryOne(costCompany.getId(), CostReviewer.finalReviewer, currentUserId) != null) {
-            costDomain.setCostStatus(CostDomain.STATUS_UN_PAY);
-            costDao.updateById(costDomain);
-
-            costLogService.save(costDomain.getCostNo(), currentUserId, "最终审核通过", CostLogDomain.FINAL_MANUAL_PASS);
+                costLogService.save(costDomain.getCostNo(), currentUserId, "最终审核通过", CostLogDomain.FINAL_MANUAL_PASS);
 
-            //流转状态
-            nextState(unPayState);
-            //通知财务系统
-            costContext.costService.toFinancial(costDomain);
+                //流转状态
+                nextState(unPayState);
+                //通知财务系统
+                costContext.costService.toFinancial(costDomain);
+            }
 
-        }
-        //人工审核没权限
-        else {
-            throw new BizRuntimeException("current user no authority");
+            //人工审核没权限
+            else {
+                throw new BizRuntimeException("current user no authority");
+            }
         }
     }
 

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

@@ -2,12 +2,14 @@ package com.blt.other.module.cost.service.impl.costcheck;
 
 import com.blt.other.common.exception.BizRuntimeException;
 import com.blt.other.module.auth.model.CostReviewer;
+import com.blt.other.module.auth.service.IOaUserService;
 import com.blt.other.module.cost.dao.CostCompanyDao;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.model.CostTemplate;
 import com.blt.other.module.database.model.CostCompanyDomain;
 import com.blt.other.module.database.model.CostLogDomain;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -27,7 +29,10 @@ public class FinancialCheckState extends CostState {
     FinalCheckState finalCheckState;
     @Resource
     CostCompanyDao costCompanyDao;
+    @Resource
+    IOaUserService oaUserService;
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void handle() {
         CostDomain costDomain = costContext.costDomain;
@@ -45,7 +50,7 @@ public class FinancialCheckState extends CostState {
             if (this.autoCheck(costDomain)) {
                 costDomain.setCostStatus(CostDomain.STATUS_FINAL_CHECK);
                 costDao.updateById(costDomain);
-                costLogService.save(costDomain.getCostNo(), currentUserId, "财务自动审核通过", CostLogDomain.FINANCIAL_AUTO_PASS);
+                costLogService.save(costDomain.getCostNo(), oaUserService.selectManage(costDomain.getCreateUserid()), "财务自动审核通过", CostLogDomain.FINANCIAL_AUTO_PASS);
 
                 //流转状态
                 nextState(finalCheckState);
@@ -57,22 +62,23 @@ public class FinancialCheckState extends CostState {
         }
 
         CostCompanyDomain costCompany = costCompanyDao.selectByNo(costDomain.getCompanyNo());
+        if (costContext.currentUserId != null) {
+            //人工审核通过
+            if (costReviewerMapper.queryOne(costCompany.getId(), CostReviewer.financialReviewer, currentUserId) != null) {
+                costDomain.setCostStatus(CostDomain.STATUS_FINAL_CHECK);
+                costDao.updateById(costDomain);
 
-        //人工审核通过
-        if (costReviewerMapper.queryOne(costCompany.getId(), CostReviewer.financialReviewer, currentUserId) != null) {
-            costDomain.setCostStatus(CostDomain.STATUS_FINAL_CHECK);
-            costDao.updateById(costDomain);
-
-            costLogService.save(costDomain.getCostNo(), currentUserId, "财务审核通过", CostLogDomain.FINANCIAL_MANUAL_PASS);
+                costLogService.save(costDomain.getCostNo(), currentUserId, "财务审核通过", CostLogDomain.FINANCIAL_MANUAL_PASS);
 
-            //流转状态
-            nextState(finalCheckState);
-            //发布到总线尝试下个环节的自动审核
-            costSubscribe.subscribe(costContext);
-        }
-        //人工审核没权限
-        else {
-            throw new BizRuntimeException("current user no authority");
+                //流转状态
+                nextState(finalCheckState);
+                //发布到总线尝试下个环节的自动审核
+                costSubscribe.subscribe(costContext);
+            }
+            //人工审核没权限
+            else {
+                throw new BizRuntimeException("current user no authority");
+            }
         }
     }
 

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/utils/CostUtils.java

 package com.blt.other.module.cost.utils;
 
 import com.bailuntec.common.SpringContextUtil;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.blt.other.module.cost.dao.CostDao;
 import com.blt.other.module.cost.model.CostDomain;
-import com.blt.other.module.cost.service.CostService;
-import com.blt.other.module.cost.service.impl.cost.CostServiceFactory;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -17,6 +16,10 @@ public class CostUtils {
 
     public static String getIdNum() {
 
+        String activeProfile = SpringContextUtil.getString("spring.profiles.active");
+        if (activeProfile.equals("test")) {
+            return IdWorker.getIdStr();
+        }
         NumberFormat nf = NumberFormat.getInstance();
         nf.setGroupingUsed(false);
         nf.setMaximumIntegerDigits(6);
@@ -47,16 +50,6 @@ public class CostUtils {
         return "F" + result;
     }
 
-    /**
-     * 生成费用单号
-     * @return
-     */
-//    public static String getCostNo() {
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmss");
-//        Random random = new Random();
-//        String costNo = "CO"+sdf.format(new Date())+random.nextInt(9);
-//        return costNo;
-//    }
 
     /**
      * 生成 CostDomain 实例
@@ -64,6 +57,7 @@ public class CostUtils {
      * @param request
      * @return
      */
+    @Deprecated
     public static CostDomain createCostDomain(HttpServletRequest request, String costNo) {
         String companyNo = request.getParameter("companyNo");
         String kindNo = request.getParameter("kindNo");
@@ -99,7 +93,7 @@ public class CostUtils {
         }
         String costFormStr = request.getParameter("costForm");
         Integer costForm = null;
-        Integer isTax = 0;
+        int isTax = 0;
         if (null != costFormStr && !"null".equals(costFormStr)) {
             costForm = Integer.parseInt(costFormStr);
             if (1 == costForm) {
@@ -197,10 +191,6 @@ public class CostUtils {
                 }
             }
         }
-//        if (null != isLend && 1 == isLend){
-//            costDomain.setTypeNo(null);
-//            costDomain.setKindNo(null);
-//        }
         return costDomain;
     }
 }

bailuntec-cost-core/src/main/resources/application-test.yml

@@ -5,7 +5,11 @@ spring:
     url: jdbc:mysql://cdb-aanqm573.gz.tencentcdb.com:10120/bailun_other?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true
     username: root
     password: 'Aarob2020#'
-
+    hikari:
+      minimum-idle: 3
+      maximum-pool-size: 10
+      max-lifetime: 30000
+      connection-test-query: 'select 1'
   thymeleaf:
     prefix: classpath:/templates/
     suffix: .html
@@ -15,6 +19,8 @@ spring:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
+  profiles:
+    active: test
 
 #mybatis plus 配置
 mybatis-plus: