ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -406,8 +406,8 @@ Boolean aBoolean = serviceFundflowService.saveData(serviceFundflow); log.info("sserviceFund保存的的值是-------- :{}", aBoolean); //001审批通过之后，就需要把“办公室主任”的名字填上 if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) { //053审批通过之后，就需要把“办公室主任”的名字填上 if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("053")) { serviceFund.setOfficedirector(user.getNickName()); serviceFund.setUploadStates(1); } ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -489,8 +489,8 @@ } } //001审批通过之后，就需要把“办公室主任”的名字填上 if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) { //053审批通过之后，就需要把“办公室主任”的名字填上 if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("053")) { serviceReimbursement.setOfficedirector(user.getNickName()); serviceReimbursement.setUploadStates(1); } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
@@ -352,7 +352,11 @@ taxMoneyVO.setFundID(serviceFunddetail.getFundid()); taxMoneyVO.setIDCard(serviceFunddetail.getIdcardno()); if (serviceFunddetail.getXh() != null) { taxMoneyVO.setXh(serviceFunddetail.getXh()); // taxMoneyVO.setXh(serviceFunddetail.getXh()); //这个序号，有可能是之前版税的序号，在这里不能再用了 serviceFunddetail.setXh(null); taxMoneyVO.setXh(maxXH); xhMap.put(serviceFunddetail.getIdcardno(), maxXH); } else { taxMoneyVO.setXh(maxXH); xhMap.put(serviceFunddetail.getIdcardno(), maxXH);
