代码提交

liusheng

18 小时以前 5b6bd2b10c8c87b658b888f4d0384aec3ed491ce

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -59,11 +59,12 @@
    @Autowired
    private IServiceFundService serviceFundService;
    @Autowired
    private IServiceFundSharedService serviceFundSharedService;
    @Autowired
    private IServiceFunddetailService serviceFunddetailService;
    @Autowired
    private IServiceFundflowruleService serviceFundflowruleService;
    @Autowired
    private IServiceFundflowService serviceFundflowService;

    @Autowired
    private IServiceDonatebaseinfoService serviceDonatebaseinfoService;

@@ -71,20 +72,10 @@
    private IServiceReimbursementService serviceReimbursementService;

    @Autowired
    private IServiceSystemmessageService iServiceSystemmessageService;

    @Autowired
    private IServiceExternalpersonService externalpersonService;

    @Autowired
    private ISysPostService postService;


    @Autowired
    private DingTalkService dingTalkService;

    @Autowired
    private ISysUserService sysUserService;

    public ServiceFundController() {
        configuration = new Configuration();
@@ -118,13 +109,32 @@
    @PostMapping("/processlog")
    public AjaxResult processlog(@RequestBody ServiceProcessVO serviceProcessVO) {
        log.info("致远系统流程退回审批日志入参：{}", serviceProcessVO);
        if (serviceProcessVO.getBackCode() == null || StringUtils.isEmpty(serviceProcessVO.getApplytype())) {
        if (serviceProcessVO.getBackCode() == null && StringUtils.isEmpty(serviceProcessVO.getApplytype())) {
            return AjaxResult.error("入能为空,请检查入参!!");
        }

        Boolean processlog = serviceFundService.processlog(serviceProcessVO);
        if (!processlog) return AjaxResult.error("审批记录失败");
        return AjaxResult.success("审批记录成功");
    }

    /**
     * 修改编号与支付方式
     *
     * @param serviceCodeAndPyaWay
     * @return
     */
    @PostMapping("/updatecodepayway")
    public AjaxResult updatecodepay(@RequestBody ServiceCodeAndPyaWay serviceCodeAndPyaWay) {
        log.info("致远系统编号与支付方式入参：{}", serviceCodeAndPyaWay);
        if (StringUtils.isEmpty(serviceCodeAndPyaWay.getApplytype()) || StringUtils.isEmpty(serviceCodeAndPyaWay.getBh()) || StringUtils.isEmpty(serviceCodeAndPyaWay.getZffs())) {
            return AjaxResult.error("入能为空,请检查入参!!");
        }

        Boolean result = serviceFundService.updatecodepay(serviceCodeAndPyaWay);
        if (!result) return AjaxResult.error("修改失败");

        return AjaxResult.success("修改成功");
    }


@@ -323,7 +333,7 @@
    public AjaxResult checkFund(@RequestBody CheckFundVO checkFundVO) {
        log.info("serviceFundController---checkFund的入参值checkFundVO :{}", checkFundVO);
        LoginUser loginUser = getLoginUser();
        Map<String, String> map = serviceFundService.checkFund(checkFundVO,loginUser);
        Map<String, String> map = serviceFundService.checkFund(checkFundVO, loginUser);
        Set<String> keys = map.keySet();
        for (String s : keys) {
            if (!s.equals("200")) return AjaxResult.error(map.get(s));
@@ -454,9 +464,13 @@
        }
        String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());

        String name = "专家劳务费发放申请单_" + dataMap.get("XM") + "_" + newTime;
        String newName = null;
        if (Objects.isNull(dataMap.get("XM"))) {
            newName = dataMap.get("XM").toString().trim();
        }
        String name = "专家劳务费发放申请单_" + newName + "_" + newTime;
        if (dataLW.equals("4")) {
            name = "办公费用申请单_" + dataMap.get("XM") + "_" + newTime;
            name = "办公费用申请单_" + newName + "_" + newTime;
        }

        //输出文档路径及名称