bug修复

commons/src/main/java/com/jzg/commons/entity/account/po/SysUserAccountChangeLog.java

@@ -30,6 +30,7 @@ public class SysUserAccountChangeLog extends BaseModel {
 
     @Serial
     private static final long serialVersionUID = 3689832570825862201L;
+    @TableField
     @ExcelProperty("序号")
     private String id;
 

commons/src/main/java/com/jzg/commons/util/OrderComponents.java

@@ -40,6 +40,12 @@ public class OrderComponents {
         nameMap.put("insFeeOrders.jyCommissionPremium","驾意险手续费费用");
         nameMap.put("insFeeOrders.agreementId","协议id");
 
+        nameMap.put("insFeeOrders.jyFollowRatio","驾意跟单比例");
+        nameMap.put("insFeeOrders.syFollowRatio","商业跟单比例");
+        nameMap.put("insFeeOrders.jqCommissionRatio","交强手续费比例");
+        nameMap.put("insFeeOrders.jqFollowRatio","交强跟单比例");
+        nameMap.put("insFeeOrders.syCommissionRatio","商业手续费比例");
+        nameMap.put("insFeeOrders.jyCommissionRatio","驾意手续费比例");
 
         nameMap.put("costRatio.jqCommissionRatio","交强险手续费比例");
         nameMap.put("costRatio.syCommissionRatio","商业险手续费比例");

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -601,7 +601,7 @@ public class ReceivableController {
             module = "私有/平台协议应收",
             subModule = "订单审核",
             optType = QuoteNumberConstant.QuoteOptType.OPT_TYPE_16,
-            description = "应收调整",
+            description = "批量修改比例",
             orderSpEl = "#batchModifyVo",
             feedbackSpEl = "#ret.code + ' - ' + #ret.msg+ ' - ' + #ret.data"
     )

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserAccountIncomeLogServiceImpl.java

@@ -12,10 +12,12 @@ import com.jzg.organization.mapper.*;
 import com.jzg.organization.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -68,14 +70,19 @@ public class SysUserAccountIncomeLogServiceImpl extends ServiceImpl<SysUserAccou
             log.error(errMsg);
             return HttpResult.error(errMsg);
         }
+        String id = changeLogs.get(0).getId();
+        SysUserAccountChangeLog oldChangeLog = baseMapper.selectById(id);
         SysUserAccountChangeLog res = new  SysUserAccountChangeLog();
+        BeanUtils.copyProperties(oldChangeLog,res);
         res.setBankCardIdTo(changeLog.getBankCardIdTo());
         res.setBankCardNoTo(changeLog.getBankCardNoTo());
         res.setId(changeLogs.get(0).getId());
-        res.setOperType(changeLog.getOperType());
+        res.setUpdateBy(baseController.getUserName());
+        res.setUpdateTime(LocalDateTime.now());
         baseMapper.updateById(res);
         return HttpResult.ok();
     }
+
 }