ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -491,7 +491,7 @@ Integer CheckFlag = 0; Integer RecordStatus = serviceFund.getRecordstatus(); Integer FlowLevel = serviceFund.getFlowlevel(); Integer FlowLevel = serviceFund.getFlowlevel().intValue(); Integer OriginalFlowLevel = FlowLevel; if (checkFundVO.getFlowconclusion() == 1) { CheckFlag = 1; @@ -523,7 +523,7 @@ } serviceFund.setRecordstatus(RecordStatus); serviceFund.setFlowlevel(FlowLevel); serviceFund.setFlowlevel(FlowLevel.longValue()); // serviceFund.setBackflowlevel(serviceFund.getFlowlevel()); ServiceFundflow serviceFundflow = new ServiceFundflow(); @@ -543,7 +543,7 @@ serviceFundflowService.save(serviceFundflow); //001审æ¹éè¿ä¹åï¼å°±éè¦æâåå ¬å®¤ä¸»ä»»âçååå¡«ä¸ if (checkFundVO.getFlowconclusion() == 1 && user.getUserId().equals("001")) { if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) { serviceFund.setOfficedirector(user.getNickName()); } serviceFundService.updateById(serviceFund); @@ -614,17 +614,17 @@ if (!postids.contains(2)) { serviceFund.setRecordstatus(2); if (serviceFund.getBackflowlevel() != null) { serviceFund.setFlowlevel(serviceFund.getBackflowlevel()); serviceFund.setFlowlevel(serviceFund.getBackflowlevel().longValue()); } else { serviceFund.setBackflowlevel(1); serviceFund.setFlowlevel(1); serviceFund.setFlowlevel(1L); } } else { serviceFund.setRecordstatus(0); if (serviceFund.getBackflowlevel() != null) { serviceFund.setFlowlevel(serviceFund.getBackflowlevel()); serviceFund.setFlowlevel(serviceFund.getBackflowlevel().longValue()); } else { serviceFund.setFlowlevel(0); serviceFund.setFlowlevel(0L); serviceFund.setBackflowlevel(0); } @@ -705,6 +705,7 @@ String time = date.substring(0, 10); dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh()); dataMap.put("ZB", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname()); dataMap.put("TBYYMMDD", time); dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount()); dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname()); @@ -1086,6 +1087,7 @@ List<Map<String, Object>> newList = new ArrayList<Map<String, Object>>(); int seqno = 0; dataMap.put("ZB", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname()); dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh()); dataMap.put("TBYYMMDD", time); dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount()); @@ -1115,18 +1117,18 @@ //å¦ææ¯å»çææ¬ï¼åæé¶è¡å¡å ä¸æ¯æ¡æç»çåé¢ if (serviceFund.getApplytype().equals("3")) { i = i + 1; bz += f.getUnitname() == null ? "(" + i + ")" : "(" + i + ")" + f.getUnitname() + "ï¼"; bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "ï¼"; bz += "éé¢ : " + f.getAmount() + "å " + "ï¼"; bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": "; bz += f.getBankcardno() == null ? "" : f.getBankcardno() + "ï¼"; bz += "éé¢ : " + f.getAmount() + "å "; bz += f.getBankcardno() == null ? "" : f.getBankcardno(); bz += "<w:br/>"; } if (serviceFund.getApplytype().equals("4")) { i = i + 1; bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "ï¼"; bz += "éé¢ : " + f.getAmount() + "å " + "ï¼"; bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": "; bz += f.getBankcardno() == null ? "" : f.getBankcardno() + "ï¼"; bz += "éé¢ : " + f.getAmount() + "å "; bz += f.getBankcardno() == null ? "" : f.getBankcardno(); bz += "<w:br/>"; } @@ -1908,6 +1910,7 @@ String date = formatter.format(dt); String time = date.substring(0, 10); dataMap.put("ZB", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname()); dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh()); dataMap.put("TBYYMMDD", time); dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount()); @@ -1964,7 +1967,6 @@ dataMap.put("SHHJ", String.format("%.2f", sh).toString() + ""); dataMap.put("SQZE", String.format("%.2f", sh).toString() + ""); }
@@ -162,13 +162,14 @@ } //æ ¹æ®éé¢çé if (spFinancialExpensesIn.getMoney() != null) { list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getAmountrequested()) == new BigDecimal(spFinancialExpensesIn.getMoney())).collect(Collectors.toList()); list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getAmountrequested()).compareTo(new BigDecimal(spFinancialExpensesIn.getMoney())) == 0).collect(Collectors.toList()); } //æ ¹æ®å建æ¶é´æåº Collections.sort(list, new Comparator<SpFinancialExpensesReimbursementOut>() { @Override public int compare(SpFinancialExpensesReimbursementOut o1, SpFinancialExpensesReimbursementOut o2) { return o2.getCreateTime().compareTo(o1.getCreateTime()); return o1.getCreateTime().compareTo(o2.getCreateTime()); } }); return getCustomDataTable(list, pageNum, pageSize); @@ -629,7 +630,7 @@ } //001审æ¹éè¿ä¹åï¼å°±éè¦æâåå ¬å®¤ä¸»ä»»âçååå¡«ä¸ if (checkFundVO.getFlowconclusion() == 1 && user.getUserId().equals("001")) { if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) { serviceReimbursement.setOfficedirector(user.getNickName()); } @@ -900,6 +901,7 @@ String date = formatter.format(dt); String time = date.substring(0, 10); dataMap.put("ZB", rdInfoByItem.get(0).getDeptmentname() == null ? "" : rdInfoByItem.get(0).getDeptmentname()); dataMap.put("XZBH", rdInfoByItem.get(0).getBh() == null ? "" : rdInfoByItem.get(0).getBh()); dataMap.put("TBYYMMDD", time); dataMap.put("BXDFJ", rdInfoByItem.get(0).getAttachcount() == null ? " " : "" + rdInfoByItem.get(0).getAttachcount()); ruoyi-admin/src/main/resources/template/ר¼ÒÀÍÎñ·Ñ·¢·ÅÉêÇëµ¥(1).ftl
@@ -155,6 +155,50 @@ <w:szCs w:val="24"/> </w:rPr> </w:pPr> <w:r> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="32"/> <w:szCs w:val="32"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidR="00196045"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="22"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidRPr="00D61E43"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="22"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidRPr="00D61E43"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="28"/> <w:szCs w:val="28"/> </w:rPr> <w:t>ç»å«ï¼${ZB}</w:t> </w:r> </w:p> <w:p w14:paraId="02AC4519" w14:textId="77777777" w:rsidR="00D61E43" w:rsidRPr="0039783B" w:rsidRDefault="00D61E43" w:rsidP="00196045"> <w:pPr> ruoyi-admin/src/main/resources/template/Â×Àíר¼ÒÀÍÎñ·Ñ·¢·ÅÉêÇëµ¥.ftl
@@ -169,6 +169,50 @@ <w:szCs w:val="28"/> </w:rPr> </w:pPr> <w:r> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="32"/> <w:szCs w:val="32"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidR="00196045"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="22"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidRPr="00D61E43"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="22"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidRPr="00D61E43"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="28"/> <w:szCs w:val="28"/> </w:rPr> <w:t>ç»å«ï¼${ZB}</w:t> </w:r> </w:p> <w:p w:rsidR="00D61E43" w:rsidRPr="00D61E43" w:rsidRDefault="00D61E43" w:rsidP="00196045"> <w:pPr> ruoyi-admin/src/main/resources/template/°ì¹«·ÑÓÃÉêÇëµ¥.ftl
@@ -221,6 +221,50 @@ <w:szCs w:val="28"/> </w:rPr> </w:pPr> <w:r> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="32"/> <w:szCs w:val="32"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidR="00196045"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="22"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidRPr="00D61E43"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="22"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidRPr="00D61E43"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="28"/> <w:szCs w:val="28"/> </w:rPr> <w:t>ç»å«ï¼${ZB}</w:t> </w:r> </w:p> <w:p w14:paraId="249E373E" w14:textId="77777777" w:rsidR="00D61E43" w:rsidRPr="00D61E43" w:rsidRDefault="00D61E43" w:rsidP="00196045"> ruoyi-admin/src/main/resources/template/ҽѧ³É±¾·ÑÓÃÉêÇëµ¥.ftl
@@ -153,6 +153,7 @@ </w:rPr> <w:t>è´¹ç¨æ¥éå</w:t> </w:r> </w:p> <w:p w:rsidR="004A1007" w:rsidRPr="004A1007" w:rsidRDefault="004A1007" w:rsidP="00D61E43"> <w:pPr> @@ -168,6 +169,50 @@ <w:szCs w:val="28"/> </w:rPr> </w:pPr> <w:r> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="32"/> <w:szCs w:val="32"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidR="00196045"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="22"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidRPr="00D61E43"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="22"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidRPr="00D61E43"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="28"/> <w:szCs w:val="28"/> </w:rPr> <w:t>ç»å«ï¼${ZB}</w:t> </w:r> </w:p> <w:p w:rsidR="00D61E43" w:rsidRPr="00D61E43" w:rsidRDefault="00D61E43" w:rsidP="00196045"> <w:pPr> @@ -1364,7 +1409,7 @@ <w:t>ä¸å¿è´è´£äººï¼</w:t> </w:r> <w:r w:rsidRPr="00D61E43"> <w:t xml:space="preserve"> è´¢å¡å¯é¢é¿ï¼ ä¸å¡å¯é¢é¿ï¼ åå ¬å®¤ä¸»ä»»ï¼ è´¢å¡é¨ä¸»ä»»ï¼ è´¢å¡å®¡æ ¸ï¼</w:t> <w:t xml:space="preserve"> è´¢å¡å¯é¢é¿ï¼${CWFYZ} ä¸å¡å¯é¢é¿ï¼${YWFYZ} åå ¬å®¤ä¸»ä»»ï¼${BGSZR} è´¢å¡é¨ä¸»ä»»ï¼${CWBZR} è´¢å¡å®¡æ ¸ï¼${CWSH}</w:t> </w:r> </w:p> <w:p w:rsidR="00196045" w:rsidRDefault="00196045"> @@ -2739,7 +2784,7 @@ <w:color w:val="000000"/> <w:szCs w:val="21"/> </w:rPr> <w:t>åå ¬å®¤ä¸»ä»»ï¼</w:t> <w:t>åå ¬å®¤ä¸»ä»»ï¼${BGSZR2}</w:t> </w:r> <w:r> <w:rPr> @@ -2770,7 +2815,7 @@ <w:color w:val="000000"/> <w:szCs w:val="21"/> </w:rPr> <w:t xml:space="preserve"> è´¢å¡é¨ä¸»ä»»ï¼</w:t> <w:t xml:space="preserve"> è´¢å¡é¨ä¸»ä»»ï¼${CWBZR2}</w:t> </w:r> <w:r> <w:rPr> @@ -2801,7 +2846,7 @@ <w:color w:val="000000"/> <w:szCs w:val="21"/> </w:rPr> <w:t xml:space="preserve"> è´¢å¡å®¡æ ¸ï¼ </w:t> <w:t xml:space="preserve"> è´¢å¡å®¡æ ¸ï¼${CWSH2} </w:t> </w:r> </w:p> </w:tc> ruoyi-admin/src/main/resources/template/²îÂ÷ѱ¨ÏúÉêÇëµ¥.ftl
@@ -204,6 +204,50 @@ <w:szCs w:val="28"/> </w:rPr> </w:pPr> <w:r> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="32"/> <w:szCs w:val="32"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidR="00196045"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="22"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidRPr="00D61E43"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:b/> <w:bCs/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="22"/> </w:rPr> <w:t xml:space="preserve"> </w:t> </w:r> <w:r w:rsidRPr="00D61E43"> <w:rPr> <w:rFonts w:ascii="å®ä½" w:eastAsia="å®ä½" w:hAnsi="å®ä½" w:cs="å®ä½" w:hint="eastAsia"/> <w:color w:val="000000"/> <w:kern w:val="0"/> <w:sz w:val="28"/> <w:szCs w:val="28"/> </w:rPr> <w:t>ç»å«ï¼${ZB}</w:t> </w:r> </w:p> <w:p w:rsidR="00D61E43" w:rsidRPr="00D61E43" w:rsidRDefault="00D61E43" w:rsidP="00196045"> <w:pPr> ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
@@ -208,7 +208,7 @@ /** å½åå®¡æ ¸çº§å« å¤äºåªä¸ªé¶æ®µ 0ï¼ç³è¯·ï¼1ï¼ä¸çº§å®¡æ ¸ï¼2ï¼äºçº§å®¡æ ¸ï¼3ï¼ä¸çº§å®¡æ ¸ç */ @ApiModelProperty("å½åå®¡æ ¸çº§å«") private int flowlevel; private Long flowlevel; /** * å¤äºåªä¸ªé¶æ®µ 0ï¼ç³è¯·ï¼1ï¼ä¸çº§å®¡æ ¸ï¼2ï¼äºçº§å®¡æ ¸ï¼3ï¼ä¸çº§å®¡æ ¸ç 100ï¼å»é¢è´¢å¡ 199:å»é¢é©³å ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -21,6 +21,7 @@ import com.ruoyi.project.service.IServiceFunddetailService; import com.ruoyi.project.service.IServiceFunddetailSharedService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -104,6 +105,9 @@ if (serviceFund.getUploadtime() != null) { wrappers.eq(ServiceFund::getUploadtime, serviceFund.getUploadtime()); } if (serviceFund.getFlowlevel() != null) { wrappers.eq(ServiceFund::getFlowlevel, serviceFund.getFlowlevel()); } return this.list(wrappers); } @@ -154,7 +158,14 @@ //æ°æ®åéç»è´¢å¡ uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i)); } boolean result = detailSharedService.saveBatch(serviceFunddetailShareds); boolean result = false; for (ServiceFunddetailShared serviceFunddetailShared : serviceFunddetailShareds) { if (ObjectUtils.isNotEmpty(serviceFunddetailShared)) { result = detailSharedService.save(serviceFunddetailShared); } else { log.info("serviceFunddetailShared为空äºï¼ï¼ï¼"); } } return result; }
@@ -39,6 +39,9 @@ if (serviceFundShared.getInfoid() != null){ wrappers.eq(ServiceFundShared::getInfoid ,serviceFundShared.getInfoid()); } if (Long.valueOf(serviceFundShared.getSerfunid()) != null){ wrappers.eq(ServiceFundShared::getSerfunid ,serviceFundShared.getSerfunid()); } if (StringUtils.isNotBlank(serviceFundShared.getDonorno())){ wrappers.eq(ServiceFundShared::getDonorno ,serviceFundShared.getDonorno()); } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailSharedServiceImpl.java
@@ -39,6 +39,9 @@ if (serviceFunddetailShared.getFundid() != null) { wrappers.eq(ServiceFunddetailShared::getFundid, serviceFunddetailShared.getFundid()); } if (serviceFunddetailShared.getFdid() != null) { wrappers.eq(ServiceFunddetailShared::getFdid, serviceFunddetailShared.getFdid()); } if (serviceFunddetailShared.getOrderno() != null) { wrappers.eq(ServiceFunddetailShared::getOrderno, serviceFunddetailShared.getOrderno()); } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -148,7 +148,7 @@ Map<String, Object> columnMap = new HashMap<>(); columnMap.put("rbid", id); //è·å详æ æ°æ® List<ServiceReimbursementdetail> details = serviceReimbursementdetailMapper.selectByMap(columnMap); List<ServiceReimbursementdetail> details = serviceReimbursementdetailMapper.selectByMap(columnMap); log.info("serviceReimbursementdetailMapper.selectByMapæ¹æ³çè¿åå :{}", CollectionUtils.isEmpty(details) ? null : details.size()); //è·åæ¯ä»æ°æ® List<ServiceReimbursementpayee> serviceReimbursementpayees = reimbursementpayeeMapper.selectByMap(columnMap); @@ -173,7 +173,14 @@ uploadOAFileAndUpdateDb(serviceReimbursementdetailShareds.get(i)); } detailSharedService.saveBatch(serviceReimbursementdetailShareds); // detailSharedService.saveBatch(serviceReimbursementdetailShareds); for (ServiceReimbursementdetailShared serviceReimbursementdetailShared : serviceReimbursementdetailShareds) { if (ObjectUtils.isNotEmpty(serviceReimbursementdetailShared)) { detailSharedService.save(serviceReimbursementdetailShared); } else { log.info("serviceReimbursementdetailShared为空äº"); } } //å°serviceReimbursementpayee表éçidèµå¼ç»Rpid; å°serviceReimbursementSharedéçIDèµå¼ç»RBID,并å°serviceReimbursementpayeeShared表éçid置空ï¼ç±æ°æ®åºéæ°çæ for (int i = 0; i < serviceReimbursementpayees.size(); i++) { @@ -181,8 +188,14 @@ serviceReimbursementpayeeShareds.get(i).setRbid(serviceReimbursementShared.getId()); serviceReimbursementpayeeShareds.get(i).setId(null); } payeeSharedService.saveBatch(serviceReimbursementpayeeShareds); for (ServiceReimbursementpayeeShared serviceReimbursementpayeeShared : serviceReimbursementpayeeShareds) { if (ObjectUtils.isNotEmpty(serviceReimbursementpayeeShared)) { payeeSharedService.save(serviceReimbursementpayeeShared); } else { log.info("serviceReimbursementpayeeShared为空äºï¼"); } } return true; } @@ -239,38 +252,40 @@ List<RbDetailFile> parseArray2 = new ArrayList<>(); List<RbDetailFile> parseArray = JSON.parseArray(remShare.getAnnexfiles(), RbDetailFile.class); for (int i = 0; i < parseArray.size(); i++) { RbDetailFile rbDetailFile = parseArray.get(i); if (!CollectionUtils.isEmpty(parseArray)) { for (int i = 0; i < parseArray.size(); i++) { RbDetailFile rbDetailFile = parseArray.get(i); log.info("filePathçä¿®æ¹:{}", filePath); String url = rbDetailFile.getUrl(); //fileç¨çæ¯ç»å¯¹ä½ç½® String substring = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length()); String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload"); System.out.println("reimbursementæå¡çfilePath + substringæ¯ä¹±ç å: " + filePath + substring); File filetest = new File(filePath + substring); try { log.info("请æ±ç¬¬ä¸æ¹çå ¥åstrFile : {}, strFUrl : {}", strFile, filePath); String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl); log.info("第ä¸æ¹ä¼ åçæ°æ®: {}", struploadResult); if (StringUtils.isEmpty(struploadResult)) { log.info("HttpClientKit.sendPostWithFile 请æ±ä¸ºç©ºäº filetest:{}, strFUrl:{} ", filetest, strFUrl); return 0; } log.info("filePathçä¿®æ¹:{}", filePath); String url = rbDetailFile.getUrl(); //fileç¨çæ¯ç»å¯¹ä½ç½® String substring = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length()); String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload"); System.out.println("reimbursementæå¡çfilePath + substringæ¯ä¹±ç å: " + filePath + substring); File filetest = new File(filePath + substring); try { log.info("请æ±ç¬¬ä¸æ¹çå ¥åstrFile : {}, strFUrl : {}", strFile, filePath); String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl); log.info("第ä¸æ¹ä¼ åçæ°æ®: {}", struploadResult); if (StringUtils.isEmpty(struploadResult)) { log.info("HttpClientKit.sendPostWithFile 请æ±ä¸ºç©ºäº filetest:{}, strFUrl:{} ", filetest, strFUrl); return 0; } //è·åfileid JSONObject jsonR = JSONObject.parseObject(struploadResult); JSONArray jsonArr = jsonR.getJSONArray("atts"); log.info("第ä¸æ¹ä¼ åçæ°æ®è·åçatts : {}", jsonArr); for (int j = 0; j < jsonArr.size(); j++) { JSONObject jsonRet = jsonArr.getJSONObject(j); rbDetailFile.setFileid(jsonRet.get("fileUrl").toString()); //è·åfileid JSONObject jsonR = JSONObject.parseObject(struploadResult); JSONArray jsonArr = jsonR.getJSONArray("atts"); log.info("第ä¸æ¹ä¼ åçæ°æ®è·åçatts : {}", jsonArr); for (int j = 0; j < jsonArr.size(); j++) { JSONObject jsonRet = jsonArr.getJSONObject(j); rbDetailFile.setFileid(jsonRet.get("fileUrl").toString()); } } catch (Exception e) { e.printStackTrace(); log.error("HttpClientKit.sendPostWithFile æ¥éäº : " + e.getMessage()); } } catch (Exception e) { e.printStackTrace(); log.error("HttpClientKit.sendPostWithFile æ¥éäº : " + e.getMessage()); parseArray2.add(rbDetailFile); } parseArray2.add(rbDetailFile); } remShare.setAnnexfiles(JSON.toJSONString(parseArray2)); log.info("ServiceReimbursementdetailShared æ¯å¦å ä¸äºfileid : {}", remShare); ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java
@@ -37,6 +37,9 @@ if (StringUtils.isNotBlank(serviceReimbursementShared.getUserno())) { wrappers.eq(ServiceReimbursementShared::getUserno, serviceReimbursementShared.getUserno()); } if (serviceReimbursementShared.getReimid() != null) { wrappers.eq(ServiceReimbursementShared::getReimid, serviceReimbursementShared.getReimid()); } if (StringUtils.isNotBlank(serviceReimbursementShared.getUsername())) { wrappers.like(ServiceReimbursementShared::getUsername, serviceReimbursementShared.getUsername()); } @@ -165,7 +168,7 @@ public List<ServiceReimbursementShared> queryReShareList() { LambdaQueryWrapper<ServiceReimbursementShared> wrappers = Wrappers.lambdaQuery(); wrappers.eq(ServiceReimbursementShared::getDelFlag, 0); // wrappers.isNotNull(ServiceReimbursementShared::getCxrjyj); // wrappers.isNotNull(ServiceReimbursementShared::getCxrjyj); return this.list(wrappers); } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java
@@ -37,6 +37,9 @@ if (serviceReimbursementdetailShared.getRbid() != null){ wrappers.eq(ServiceReimbursementdetailShared::getRbid ,serviceReimbursementdetailShared.getRbid()); } if (serviceReimbursementdetailShared.getRdid() != null){ wrappers.eq(ServiceReimbursementdetailShared::getRdid ,serviceReimbursementdetailShared.getRdid()); } if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getPersontype())){ wrappers.eq(ServiceReimbursementdetailShared::getPersontype ,serviceReimbursementdetailShared.getPersontype()); } ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -1,5 +1,6 @@ package com.ruoyi.quartz.task; import com.ruoyi.common.utils.bean.DtoConversionUtils; import com.ruoyi.project.domain.*; import com.ruoyi.project.service.*; import lombok.extern.slf4j.Slf4j; @@ -7,6 +8,7 @@ import org.springframework.stereotype.Component; import com.ruoyi.common.utils.StringUtils; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -25,6 +27,9 @@ private DingTalkService dingTalkService; @Autowired private IServiceReimbursementService serviceReimbursementService; @Autowired private IServiceTasknumService ServiceTasknumService; @Autowired @@ -36,12 +41,22 @@ @Autowired private IServiceFunddetailSharedService serviceFunddetailSharedService; @Autowired private IServiceFunddetailService serviceFunddetailService; @Autowired private IServiceReimbursementdetailService serviceReimbursementdetailService; @Autowired private IServiceReimbursementdetailSharedService reimbursementdetailSharedService; @Autowired private IServiceFundService serviceFundService; @Autowired private IServiceReimbursementService serviceReimbursementService; // @Autowired // private IServiceReimbursementService serviceReimbursementService; @Autowired private IServiceFundflowService fundflowService; @@ -58,6 +73,109 @@ System.out.println("æ§è¡æ åæ¹æ³"); } // public void checkDBInfo() { // ServiceFund serviceFund = new ServiceFund(); // serviceFund.setFlowlevel(3L); // List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund); // for (ServiceFund serviceFund1 : serviceFunds) { // ServiceFundShared serviceFundShared = new ServiceFundShared(); // serviceFundShared.setSerfunid(serviceFund1.getId()); // List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryList(serviceFundShared); // if (CollectionUtils.isEmpty(serviceFundShareds)) { // ServiceFundShared serviceFundShared1 = DtoConversionUtils.sourceToTarget(serviceFund1, ServiceFundShared.class); // serviceFundShared1.setSerfunid(serviceFund1.getId()); // serviceFundShared1.setId(null); // serviceFundSharedService.save(serviceFundShared1); // } // } // //FUND // List<ServiceFunddetail> serviceFunddetailnew = new ArrayList<>(); // List<ServiceFunddetail> serviceFunddetails = serviceFunddetailService.queryList(new ServiceFunddetail()); // for (ServiceFunddetail serviceFunddetail : serviceFunddetails) { //// if (!ObjectUtils.isEmpty(serviceFunddetail.getAnnexfiles())) { //// serviceFunddetailnew.add(serviceFunddetail); //// } else { // Long fundid = serviceFunddetail.getFundid(); // ServiceFund byId = serviceFundService.getById(fundid); // if (!ObjectUtils.isEmpty(byId)) { // if (byId.getFlowlevel() != null && byId.getFlowlevel() == 3) { // serviceFunddetailnew.add(serviceFunddetail); // } //// } // } // } // for (ServiceFunddetail serviceFunddetail1 : serviceFunddetailnew) { // //éè¦å æ¥ä¸ä¸è¿ä¸ªå¯¹åºçfdidï¼shared表ï¼å¨è¯¦æ å¤ä»½è¡¨æ¯å¦åå¨ // ServiceFunddetailShared serviceFunddetailShared = new ServiceFunddetailShared(); // serviceFunddetailShared.setFdid(serviceFunddetail1.getId()); // List<ServiceFunddetailShared> serviceFunddetailShareds = serviceFunddetailSharedService.queryList(serviceFunddetailShared); // if (CollectionUtils.isEmpty(serviceFunddetailShareds)) { // serviceFundService.addFundSharedInfo(serviceFunddetail1.getFundid()); // } //// ServiceFunddetailShared serviceFunddetailShared = new ServiceFunddetailShared(); //// serviceFunddetailShared.setFdid(serviceFunddetail1.getId()); //// List<ServiceFunddetailShared> serviceFunddetailShareds = serviceFunddetailSharedService.queryList(serviceFunddetailShared); //// if (CollectionUtils.isEmpty(serviceFunddetailShareds)) { //// ServiceFunddetailShared serviceFunddetailShared1 = DtoConversionUtils.sourceToTarget(serviceFunddetail1, ServiceFunddetailShared.class); //// serviceFunddetailShared1.setId(null); //// ServiceFundShared serviceFundShared = new ServiceFundShared(); //// serviceFundShared.setSerfunid(serviceFunddetail1.getFundid()); //// List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryList(serviceFundShared); //// serviceFunddetailShared1.setFundid(serviceFundShareds.get(0).getId()); //// serviceFunddetailShared1.setFdid(serviceFunddetail1.getId()); //// serviceFunddetailSharedService.save(serviceFunddetailShared1); //// } // } // // // //reimbursement // List<ServiceReimbursementdetail> serviceReimbursementdetailsNew = new ArrayList<>(); // List<ServiceReimbursementdetail> serviceReimbursementdetails = serviceReimbursementdetailService.queryList(new ServiceReimbursementdetail()); // for (ServiceReimbursementdetail reimbursementdetail : serviceReimbursementdetails) { //// if (!ObjectUtils.isEmpty(reimbursementdetail.getAnnexfiles())) { //// serviceReimbursementdetailsNew.add(reimbursementdetail); //// } else { // Long rbid = reimbursementdetail.getRbid(); // ServiceReimbursement byId = serviceReimbursementService.getById(rbid); // if (!ObjectUtils.isEmpty(byId)) { // if (byId.getFlowlevel() != null && byId.getFlowlevel() == 3) { // serviceReimbursementdetailsNew.add(reimbursementdetail); // } //// } // } // } // for (ServiceReimbursementdetail serviceReimbursementdetail : serviceReimbursementdetailsNew) { // //éè¦å æ¥ä¸ä¸è¿ä¸ªå¯¹åºçrbidï¼shared表ï¼å¨è¯¦æ å¤ä»½è¡¨æ¯å¦åå¨ // ServiceReimbursementdetailShared serviceReimbursementdetailShared = new ServiceReimbursementdetailShared(); // serviceReimbursementdetailShared.setRdid(serviceReimbursementdetail.getId()); // List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = reimbursementdetailSharedService.queryList(serviceReimbursementdetailShared); // if (CollectionUtils.isEmpty(serviceReimbursementdetailShareds)) { // serviceReimbursementService.addSharedData(serviceReimbursementdetail.getRbid()); // } // } //// ServiceReimbursementdetailShared serviceReimbursementdetailShared = new ServiceReimbursementdetailShared(); //// serviceReimbursementdetailShared.setRdid(serviceReimbursementdetail.getId()); //// if (serviceReimbursementdetail.getRbid() == 872) { //// System.out.println("-------------------"); //// } //// List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = reimbursementdetailSharedService.queryList(serviceReimbursementdetailShared); //// //// if (CollectionUtils.isEmpty(serviceReimbursementdetailShareds)) { //// ServiceReimbursementdetailShared reimbursementdetailShared = DtoConversionUtils.sourceToTarget(serviceReimbursementdetail, ServiceReimbursementdetailShared.class); //// reimbursementdetailShared.setId(null); //// ServiceReimbursementShared serviceReimbursementShared = new ServiceReimbursementShared(); //// serviceReimbursementShared.setReimid(serviceReimbursementdetail.getRbid()); //// List<ServiceReimbursementShared> serviceReimbursementShareds = serviceReimbursementSharedService.queryList(serviceReimbursementShared); //// if (!CollectionUtils.isEmpty(serviceReimbursementShareds) && !ObjectUtils.isEmpty(serviceReimbursementShareds.get(0))) { //// reimbursementdetailShared.setRbid(serviceReimbursementShareds.get(0).getId()); //// reimbursementdetailShared.setRdid(serviceReimbursementdetail.getId()); //// reimbursementdetailSharedService.save(reimbursementdetailShared); //// } //// } //// } // // } public void checkReportInfo() { //æ¥åºææ被å»é¢éåçFundæ°æ® List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList(); @@ -73,7 +191,7 @@ serviceFund.setId(serviceFundShared.getSerfunid()); List<ServiceFund> serviceFunds = serviceFundService.queryList(serviceFund); ServiceFund serviceFund1 = serviceFunds.get(0); serviceFund1.setFlowlevel(100); serviceFund1.setFlowlevel(100L); serviceFund1.setDel_flag(0); serviceFund1.setRecordstatus(-1); serviceFund1.setBackflowlevel(199);
