bug fix

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

-//package com.blt.other.module.cost.controller;
-//
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//@Deprecated
-//@RestController
-//@RequestMapping("cost/list/add/")
-//public class CostListAddController {
-//
-//    private static Logger logger = LoggerFactory.getLogger(CostListAddController.class);
-//
-//}

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

-//package com.blt.other.module.cost.controller;
-//
-//import com.blt.other.common.util.AxiosUtil;
-//import com.bailuntec.cost.api.dto.CostCompanyFinansysDto;
-//import com.blt.other.module.cost.service.CostCompanyFinansysService;
-//import com.blt.other.module.cost.service.CostCompanyService;
-//import com.blt.other.module.cost.vo.CostCompanyVo;
-//import com.blt.other.module.database.model.CostCompanyDomain;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-//@Deprecated
-//@RestController
-//@RequestMapping("cost/list/add")
-//public class CostListAddReceiptController {
-//
-//    @Autowired
-//    private CostCompanyService costCompanyService;
-//
-//    @Autowired
-//    private CostCompanyFinansysService costCompanyFinansysService;
-//
-//    @PostMapping("/getCompanyFinansysByNo")
-//    public Map<String,Object> getCompanyFinansysByNo(HttpServletResponse response, HttpServletRequest request){
-//        AxiosUtil.setCors(response,request);
-//        String companyNo = request.getParameter("companyNo");
-//
-//        CostCompanyDomain companyByCompanyNo = costCompanyService.getCompanyByCompanyNo(companyNo);
-//
-//        CostCompanyVo costCompanyVo = costCompanyFinansysService.getCostCompanyVo(companyByCompanyNo.getValue());
-//        List<CostCompanyFinansysDto> costCompanyFinansysDto = null;
-//        if (null != costCompanyVo){
-//            costCompanyFinansysDto = costCompanyFinansysService.getCostCompanyFinansysDto(costCompanyVo);
-//        }
-//
-//        Map<String,Object> result = new HashMap<>();
-//        result.put("finansysList",costCompanyFinansysDto);
-//        result.put("success",true);
-//        return result;
-//    }
-//
-//    @PostMapping("/getMainFinansys")
-//    public Map<String,Object> getMainFinansys(HttpServletResponse response,HttpServletRequest request){
-//        AxiosUtil.setCors(response,request);
-//        Map<String,Object> result = new HashMap<>();
-//
-//        String mValue = request.getParameter("mValue");
-//        String[] split = mValue.split("~");
-//        CostCompanyVo costCompanyVo = costCompanyFinansysService.getCostCompanyVo(Integer.parseInt(split[0]));
-//        List<CostCompanyFinansysDto> costCompanyFinansysDto = costCompanyFinansysService.getCostCompanyFinansysDto(costCompanyVo);
-//
-//        if (null != costCompanyFinansysDto && costCompanyFinansysDto.size() >= 1){
-//            for (CostCompanyFinansysDto costCompanyFinansys : costCompanyFinansysDto){
-//                if (costCompanyFinansys.getId() == Integer.parseInt(split[1])){
-//                    result.put("success",true);
-//                    result.put("msg","");
-//                    result.put("finansys",costCompanyFinansys);
-//                    return result;
-//                }
-//            }
-//        }
-//        return null;
-//    }
-//}

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

-//package com.blt.other.module.cost.controller;
-//
-//import com.bailuntec.cost.api.dto.CostDto;
-//import com.bailuntec.cost.api.dto.CostListPrintDto;
-//import com.blt.other.module.auth.service.UserService;
-//import com.blt.other.common.util.AxiosUtil;
-//import com.blt.other.common.util.MoneyUtil;
-//import com.blt.other.common.util.MyMapperUtil;
-//import com.blt.other.module.cost.service.CostService;
-//import com.blt.other.module.cost.vo.CostListPrintVo;
-//import com.blt.other.module.database.model.UserDomain;
-//import io.swagger.annotations.Api;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.util.*;
-//
-//
-//@Deprecated
-//@Api(tags = "打印费用单")
-//@RestController
-//@RequestMapping("/cost/list/print")
-//public class CostListPrintController {
-//
-//
-//
-//}

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

-//package com.blt.other.module.cost.controller;
-//
-//import io.swagger.annotations.Api;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//
-//@Deprecated
-//@Api(tags = "费用搜索接口")
-//@RestController
-//@RequestMapping("cost/list")
-//public class CostListSearchController {
-//
-//
-//}

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

@@ -111,7 +111,8 @@ public class CostTemplate implements Serializable {
 
         return !(departmentMinimumReviewAmount.compareTo(BigDecimal.ZERO) > 0 &&
                 amount.compareTo(departmentMinimumReviewAmount) <= 0 &&
-                !cost.getCompanyName().contains("工会"));
+//                !cost.getCompanyName().contains("工会")
+        );
     }
 
     public boolean shouldHrCheck(CostDomain costDomain) {