Qchen 2 ani în urmă
părinte
comite
a6393cf838

+ 9 - 1
src/main/java/com/ydtech/modules/inv/service/impl/InvAccountExcelServiceImpl.java

@@ -59,7 +59,7 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
     String uploadFilePath;
 
     @Override
-    public HttpResult excelAccount(List<String> idList) {
+    public HttpResult excelAccount(List<String> idList) throws IOException {
         List<InvAccountExcel> insAccountExcels = insAccountExcelMapper.selectBatchIds(idList);
         List<InvAccountProfit> list = insAccountProfitService.list();
         if (!insAccountExcels.isEmpty()) {
@@ -97,6 +97,12 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
                 }
             }
             record.setPayMethod(a.toString());
+            if (record.getPayoutAmount() == null) {
+                record.setPayoutAmount("0");
+            }
+            if (record.getPayoutAmount().equals(record.getApplyAmount())) {
+                record.setTransferFlag("0");
+            }
         }
         invAccountExcelIPage.setRecords(records);
         return HttpResult.ok("", invAccountExcelIPage);
@@ -153,12 +159,14 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
             invAccountOperate.setDel(String.valueOf(date.getTime()));
             invAccountOperate.setOutCardNum(outAccountCard.getBankCardNum());
             invAccountOperate.setExcelAccountOperateId(invAccountExcel.getExcelAccountOperateId());
+            invAccountOperate.setApplyAmount(payOutAmount);
 
             InvAccountOperate invAccountOperate1 = insertRevenueAccountOperate(invAccountExcel);
             invAccountOperate1.setEnterCardNum(enterAccountCard.getBankCardNum());
             invAccountOperate1.setOutCardNum(invAccountOperate.getOutCardNum());
             invAccountOperate1.setDel(String.valueOf(date.getTime()));
             invAccountOperate1.setExcelAccountOperateId(invAccountExcel.getExcelAccountOperateId());
+            invAccountOperate1.setApplyAmount(payOutAmount);
 
             //支出信息
             list.add(invAccountOperate);

+ 1 - 0
src/main/java/com/ydtech/modules/inv/utils/TransferUtils.java

@@ -87,6 +87,7 @@ public class TransferUtils {
         BaseController baseController = new BaseController();
         InvAccountOperate operate = operate(insAccountExcel, insAccountOperate);
         operate.setRevenueOutlay("1");
+        operate.setApplyAmount(insAccountExcel.getPayoutAmount());
         operate.setOutProfit(insAccountExcel.getOutProfit());
         operate.setCreateTime(LocalDateTime.now().toString());
         operate.setCreateBy(baseController.getUserName());

+ 1 - 1
src/main/resources/mapper/modules/inv/InvAccountExcelMapper.xml

@@ -178,7 +178,7 @@
             and a.apply_amount = #{inAccountOperateVo.applyAmount}
         </if>
         <if test="inAccountOperateVo.label!= null and inAccountOperateVo.label!= ''">
-            and c.label = #{inAccountOperateVo.label}
+            and c.label like concat('%',#{inAccountOperateVo.label},'%')
         </if>
         order by a.create_time desc
     </select>