Skip to content

D
dc-cost-system
Commit 4ecf37c4 by huluobin
Options

update

parent 433fdc01
Showing with 176 additions and 158 deletions
bailuntec-cost-core/src/main/java/com/blt/other/module/auth/controller/OaDepartmentController.java
...@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
...@@ -37,5 +38,11 @@ public class OaDepartmentController { ...@@ -37,5 +38,11 @@ public class OaDepartmentController {
return CostResult.success(oaDepartmentList); return CostResult.success(oaDepartmentList);
} }
@ApiOperation("更新部门审核金额")
@GetMapping("/updateDepartmentMinimumReviewAmount")
public CostResult<Void> updateDepartmentMinimumReviewAmount(@RequestParam Integer oaDepartmentId,
@RequestParam BigDecimal amount) {
oaDepartmentService.updateDepartmentMinimumReviewAmount(oaDepartmentId, amount);
return CostResult.success();
}
} }
bailuntec-cost-core/src/main/java/com/blt/other/module/auth/service/IOaDepartmentService.java
...@@ -6,6 +6,7 @@ import com.blt.other.module.auth.dto.request.DepartmentReviewerListReq; ...@@ -6,6 +6,7 @@ import com.blt.other.module.auth.dto.request.DepartmentReviewerListReq;
import com.blt.other.module.auth.model.OaDepartment; import com.blt.other.module.auth.model.OaDepartment;
import org.springframework.lang.NonNull; import org.springframework.lang.NonNull;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
...@@ -45,8 +46,16 @@ public interface IOaDepartmentService extends IService<OaDepartment> { ...@@ -45,8 +46,16 @@ public interface IOaDepartmentService extends IService<OaDepartment> {
* </p> * </p>
* *
* @param userId 当前用户id * @param userId 当前用户id
* @param oaDepartmentId oa公司主体id * @param oaDepartmentId oa部门id
* @param departmentReviewerUserIds 部门审核oa userid list * @param departmentReviewerUserIds 部门审核oa userid list
*/ */
void modifyFinancialReviewer(Integer userId, Integer oaDepartmentId, List<Integer> departmentReviewerUserIds); void modifyFinancialReviewer(Integer userId, Integer oaDepartmentId, List<Integer> departmentReviewerUserIds);
/**
* 更新部门审核金额
*
* @param oaDepartmentId oa部门id
* @param amount 金额
*/
void updateDepartmentMinimumReviewAmount(Integer oaDepartmentId, BigDecimal amount);
} }
bailuntec-cost-core/src/main/java/com/blt/other/module/auth/service/impl/OaDepartmentServiceImpl.java
...@@ -17,6 +17,7 @@ import org.springframework.lang.NonNull; ...@@ -17,6 +17,7 @@ import org.springframework.lang.NonNull;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -95,4 +96,11 @@ public class OaDepartmentServiceImpl extends ServiceImpl<OaDepartmentMapper, OaD ...@@ -95,4 +96,11 @@ public class OaDepartmentServiceImpl extends ServiceImpl<OaDepartmentMapper, OaD
costReviewerMapper.insert(costReviewer); costReviewerMapper.insert(costReviewer);
}); });
} }
@Override
public void updateDepartmentMinimumReviewAmount(Integer oaDepartmentId, BigDecimal amount) {
OaDepartment oaDepartment = baseMapper.selectByDepartmentId(oaDepartmentId);
oaDepartment.setDepartmentMinimumReviewAmount(amount);
baseMapper.updateById(oaDepartment);
}
} }
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/CostListAddController.java
package com.blt.other.module.cost.controller; //package com.blt.other.module.cost.controller;
//
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; //import org.springframework.web.bind.annotation.RestController;
//
@Deprecated //@Deprecated
@RestController //@RestController
@RequestMapping("cost/list/add/") //@RequestMapping("cost/list/add/")
public class CostListAddController { //public class CostListAddController {
//
private static Logger logger = LoggerFactory.getLogger(CostListAddController.class); // 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; //package com.blt.other.module.cost.controller;
//
import com.blt.other.common.util.AxiosUtil; //import com.blt.other.common.util.AxiosUtil;
import com.bailuntec.cost.api.dto.CostCompanyFinansysDto; //import com.bailuntec.cost.api.dto.CostCompanyFinansysDto;
import com.blt.other.module.cost.service.CostCompanyFinansysService; //import com.blt.other.module.cost.service.CostCompanyFinansysService;
import com.blt.other.module.cost.service.CostCompanyService; //import com.blt.other.module.cost.service.CostCompanyService;
import com.blt.other.module.cost.vo.CostCompanyVo; //import com.blt.other.module.cost.vo.CostCompanyVo;
import com.blt.other.module.database.model.CostCompanyDomain; //import com.blt.other.module.database.model.CostCompanyDomain;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; //import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; //import org.springframework.web.bind.annotation.RestController;
//
import javax.servlet.http.HttpServletRequest; //import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; //import javax.servlet.http.HttpServletResponse;
import java.util.HashMap; //import java.util.HashMap;
import java.util.List; //import java.util.List;
import java.util.Map; //import java.util.Map;
//
@Deprecated //@Deprecated
@RestController //@RestController
@RequestMapping("cost/list/add") //@RequestMapping("cost/list/add")
public class CostListAddReceiptController { //public class CostListAddReceiptController {
//
@Autowired // @Autowired
private CostCompanyService costCompanyService; // private CostCompanyService costCompanyService;
//
@Autowired // @Autowired
private CostCompanyFinansysService costCompanyFinansysService; // private CostCompanyFinansysService costCompanyFinansysService;
//
@PostMapping("/getCompanyFinansysByNo") // @PostMapping("/getCompanyFinansysByNo")
public Map<String,Object> getCompanyFinansysByNo(HttpServletResponse response, HttpServletRequest request){ // public Map<String,Object> getCompanyFinansysByNo(HttpServletResponse response, HttpServletRequest request){
AxiosUtil.setCors(response,request); // AxiosUtil.setCors(response,request);
String companyNo = request.getParameter("companyNo"); // String companyNo = request.getParameter("companyNo");
//
CostCompanyDomain companyByCompanyNo = costCompanyService.getCompanyByCompanyNo(companyNo); // CostCompanyDomain companyByCompanyNo = costCompanyService.getCompanyByCompanyNo(companyNo);
//
CostCompanyVo costCompanyVo = costCompanyFinansysService.getCostCompanyVo(companyByCompanyNo.getValue()); // CostCompanyVo costCompanyVo = costCompanyFinansysService.getCostCompanyVo(companyByCompanyNo.getValue());
List<CostCompanyFinansysDto> costCompanyFinansysDto = null; // List<CostCompanyFinansysDto> costCompanyFinansysDto = null;
if (null != costCompanyVo){ // if (null != costCompanyVo){
costCompanyFinansysDto = costCompanyFinansysService.getCostCompanyFinansysDto(costCompanyVo); // costCompanyFinansysDto = costCompanyFinansysService.getCostCompanyFinansysDto(costCompanyVo);
} // }
//
Map<String,Object> result = new HashMap<>(); // Map<String,Object> result = new HashMap<>();
result.put("finansysList",costCompanyFinansysDto); // result.put("finansysList",costCompanyFinansysDto);
result.put("success",true); // result.put("success",true);
return result; // return result;
} // }
//
@PostMapping("/getMainFinansys") // @PostMapping("/getMainFinansys")
public Map<String,Object> getMainFinansys(HttpServletResponse response,HttpServletRequest request){ // public Map<String,Object> getMainFinansys(HttpServletResponse response,HttpServletRequest request){
AxiosUtil.setCors(response,request); // AxiosUtil.setCors(response,request);
Map<String,Object> result = new HashMap<>(); // Map<String,Object> result = new HashMap<>();
//
String mValue = request.getParameter("mValue"); // String mValue = request.getParameter("mValue");
String[] split = mValue.split("~"); // String[] split = mValue.split("~");
CostCompanyVo costCompanyVo = costCompanyFinansysService.getCostCompanyVo(Integer.parseInt(split[0])); // CostCompanyVo costCompanyVo = costCompanyFinansysService.getCostCompanyVo(Integer.parseInt(split[0]));
List<CostCompanyFinansysDto> costCompanyFinansysDto = costCompanyFinansysService.getCostCompanyFinansysDto(costCompanyVo); // List<CostCompanyFinansysDto> costCompanyFinansysDto = costCompanyFinansysService.getCostCompanyFinansysDto(costCompanyVo);
//
if (null != costCompanyFinansysDto && costCompanyFinansysDto.size() >= 1){ // if (null != costCompanyFinansysDto && costCompanyFinansysDto.size() >= 1){
for (CostCompanyFinansysDto costCompanyFinansys : costCompanyFinansysDto){ // for (CostCompanyFinansysDto costCompanyFinansys : costCompanyFinansysDto){
if (costCompanyFinansys.getId() == Integer.parseInt(split[1])){ // if (costCompanyFinansys.getId() == Integer.parseInt(split[1])){
result.put("success",true); // result.put("success",true);
result.put("msg",""); // result.put("msg","");
result.put("finansys",costCompanyFinansys); // result.put("finansys",costCompanyFinansys);
return result; // return result;
} // }
} // }
} // }
return null; // return null;
} // }
} //}
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/CostListPrintController.java
package com.blt.other.module.cost.controller; //package com.blt.other.module.cost.controller;
//
import com.bailuntec.cost.api.dto.CostDto; //import com.bailuntec.cost.api.dto.CostDto;
import com.bailuntec.cost.api.dto.CostListPrintDto; //import com.bailuntec.cost.api.dto.CostListPrintDto;
import com.blt.other.module.auth.service.UserService; //import com.blt.other.module.auth.service.UserService;
import com.blt.other.common.util.AxiosUtil; //import com.blt.other.common.util.AxiosUtil;
import com.blt.other.common.util.MoneyUtil; //import com.blt.other.common.util.MoneyUtil;
import com.blt.other.common.util.MyMapperUtil; //import com.blt.other.common.util.MyMapperUtil;
import com.blt.other.module.cost.service.CostService; //import com.blt.other.module.cost.service.CostService;
import com.blt.other.module.cost.vo.CostListPrintVo; //import com.blt.other.module.cost.vo.CostListPrintVo;
import com.blt.other.module.database.model.UserDomain; //import com.blt.other.module.database.model.UserDomain;
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; //import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; //import org.springframework.web.bind.annotation.RestController;
//
import javax.servlet.http.HttpServletRequest; //import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; //import javax.servlet.http.HttpServletResponse;
import java.util.*; //import java.util.*;
//
//
@Deprecated //@Deprecated
@Api(tags = "打印费用单") //@Api(tags = "打印费用单")
@RestController //@RestController
@RequestMapping("/cost/list/print") //@RequestMapping("/cost/list/print")
public class CostListPrintController { //public class CostListPrintController {
//
//
//
} //}
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/CostListSearchController.java
package com.blt.other.module.cost.controller; //package com.blt.other.module.cost.controller;
//
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; //import org.springframework.web.bind.annotation.RestController;
//
//
@Deprecated //@Deprecated
@Api(tags = "费用搜索接口") //@Api(tags = "费用搜索接口")
@RestController //@RestController
@RequestMapping("cost/list") //@RequestMapping("cost/list")
public class CostListSearchController { //public class CostListSearchController {
//
//
} //}
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/dao/CostTypeKindDao.java
...@@ -50,15 +50,15 @@ public interface CostTypeKindDao { ...@@ -50,15 +50,15 @@ public interface CostTypeKindDao {
*/ */
CostTypeKindDomain selectByKindNo(String costTypeKindNo); CostTypeKindDomain selectByKindNo(String costTypeKindNo);
/** // /**
* 根据费用小类名称和公司名称获取种类信息 // * 根据费用小类名称和公司名称获取种类信息
* // *
* @param kindName // * @param kindName
* @param companyName // * @param companyName
* @return // * @return
*/ // */
@Deprecated // @Deprecated
CostTypeKindDomain selectByKindNameAndCompanyName(String kindName, String companyName); // CostTypeKindDomain selectByKindNameAndCompanyName(String kindName, String companyName);
/** /**
* 根据费用小类名称和公司no获取种类信息 * 根据费用小类名称和公司no获取种类信息
......
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/model/CostDomain.java
...@@ -84,9 +84,9 @@ public class CostDomain implements Serializable { ...@@ -84,9 +84,9 @@ public class CostDomain implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime; private Date createTime;
@ApiModelProperty("关联子单") // @ApiModelProperty("关联子单")
@Deprecated // @Deprecated
private String sonCostNo; // private String sonCostNo;
@ApiModelProperty("关联父单") @ApiModelProperty("关联父单")
private String supCostNo; private String supCostNo;
......
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/CostTypeKindServiceImpl.java
...@@ -38,10 +38,8 @@ public class CostTypeKindServiceImpl implements CostTypeKindService { ...@@ -38,10 +38,8 @@ public class CostTypeKindServiceImpl implements CostTypeKindService {
private StatusMapper statusMapper; private StatusMapper statusMapper;
@Autowired @Autowired
private CostTypeDao costTypeDao; private CostTypeDao costTypeDao;
@Autowired @Autowired
private CostCompanyDao costCompanyDao; private CostCompanyDao costCompanyDao;
@Autowired @Autowired
private UserDao userDao; private UserDao userDao;
...@@ -51,7 +49,6 @@ public class CostTypeKindServiceImpl implements CostTypeKindService { ...@@ -51,7 +49,6 @@ public class CostTypeKindServiceImpl implements CostTypeKindService {
@Override @Override
public List<CostTypeKindDto> getAllKind() { public List<CostTypeKindDto> getAllKind() {
List<CostTypeKindDomain> costTypeKindDomains = costTypeKindDao.selectAll(); List<CostTypeKindDomain> costTypeKindDomains = costTypeKindDao.selectAll();
// logger.warn("获取费用类型列表："+costTypeKindDomains);
return getDtoList(costTypeKindDomains); return getDtoList(costTypeKindDomains);
} }
...@@ -367,8 +364,7 @@ public class CostTypeKindServiceImpl implements CostTypeKindService { ...@@ -367,8 +364,7 @@ public class CostTypeKindServiceImpl implements CostTypeKindService {
} }
private String getCostTypeStatus(String statusname, Integer statuskey) { private String getCostTypeStatus(String statusname, Integer statuskey) {
String statusValue = statusMapper.getStatusValue(statusname, statuskey); return statusMapper.getStatusValue(statusname, statuskey);
return statusValue;
} }
@Override @Override
......
bailuntec-cost-core/src/main/java/com/blt/other/module/database/model/CostPlanDomain.java
...@@ -66,9 +66,10 @@ public class CostPlanDomain implements Serializable { ...@@ -66,9 +66,10 @@ public class CostPlanDomain implements Serializable {
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private Date createTime; private Date createTime;
@ApiModelProperty("关联子单") // @ApiModelProperty("关联子单")
@Deprecated // @Deprecated
private String sonCostNo; // private String sonCostNo;
@ApiModelProperty("关联父单") @ApiModelProperty("关联父单")
private String supCostNo; private String supCostNo;
...@@ -138,9 +139,6 @@ public class CostPlanDomain implements Serializable { ...@@ -138,9 +139,6 @@ public class CostPlanDomain implements Serializable {
/*借还单参数 end*/ /*借还单参数 end*/
@TableField(value = "`attach`", typeHandler = JacksonTypeHandler.class) @TableField(value = "`attach`", typeHandler = JacksonTypeHandler.class)
@ApiModelProperty("附加字段") @ApiModelProperty("附加字段")
private List<CostAttach> attach; private List<CostAttach> attach;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment