核账备注

src/main/java/com/fdkankan/sale/entity/RepairCheckAccount.java

@@ -49,6 +49,9 @@ public class RepairCheckAccount implements Serializable {
     @TableField("sys_user_id")
     private Long sysUserId;
 
+    @TableField("remark")
+    private String remark;
+
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
     private String recStatus;

src/main/java/com/fdkankan/sale/service/IRepairCheckAccountService.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IRepairCheckAccountService extends IService<RepairCheckAccount> {
 
+    RepairCheckAccount getByRepairId(String repairId);
 }

src/main/java/com/fdkankan/sale/service/impl/RepairCheckAccountServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.sale.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.sale.entity.RepairCheckAccount;
 import com.fdkankan.sale.mapper.IRepairCheckAccountMapper;
 import com.fdkankan.sale.service.IRepairCheckAccountService;
@@ -17,4 +18,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class RepairCheckAccountServiceImpl extends ServiceImpl<IRepairCheckAccountMapper, RepairCheckAccount> implements IRepairCheckAccountService {
 
+    @Override
+    public RepairCheckAccount getByRepairId(String repairId) {
+        LambdaQueryWrapper<RepairCheckAccount> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RepairCheckAccount::getRepairId,repairId);
+        return getOne(wrapper);
+    }
 }

src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -61,6 +61,8 @@ public class RepairInfoService {
     ISysRoleService roleService;
     @Autowired
     ISysUserService sysUserService;
+    @Autowired
+    IRepairCheckAccountService repairCheckAccountService;
 
 
     public RepairDetailVo getDetailsByRepairId(String repairId,Boolean allPrice) {
@@ -80,6 +82,8 @@ public class RepairInfoService {
         List<Fault> faultList = faultService.getByRepairId(repairId);
         String lastRepairId = repairService.getLastRepairId(repair);
         RepairRegisterVo repairRegisterVo = repairRegisterService.getVoByRepairId(repairId);
+        RepairCheckAccount repairCheckAccount = repairCheckAccountService.getByRepairId(repairId);
+
 
         List<RepairRegisterVo> repairRegisterVoList = repairRegisterService.getVoListByRepairId(repairId);
 
@@ -120,6 +124,7 @@ public class RepairInfoService {
         detailVo.setRepairComment(comment);
         detailVo.setFaultList(faultList);
         detailVo.setLastRepairId(lastRepairId);
+        detailVo.setRepairCheckAccount(repairCheckAccount);
 
         return detailVo;
     }
@@ -160,13 +165,17 @@ public class RepairInfoService {
                     }
 
                     break;
-                case 82: case 90:
+                case 82:
                     RepairPay repairPay = repairPayService.getByRepairId(repairId,1);
                     if(repairPay != null){
                         repairLogVo.setRemark("支付方式："+StatusUtil.getPayTypeStr(repairPay.getPayType()));
-                        repairLogVo.setImagesInfo(repairPay.getPayImg());
                     }
                     break;
+                case 90:
+                    RepairCheckAccount repairCheckAccount = repairCheckAccountService.getByRepairId(repairId);
+                    repairLogVo.setImagesInfo(repairCheckAccount.getCheckAccountImg());
+                    repairLogVo.setRemark("备注："+repairCheckAccount.getRemark());
+                    break;
                 case 110 :  //维修完毕
                     CustomerAddress customerAddress = customerAddressService.getByRepairId(repairId);
                     repairLogVo.setCustomerAddress(customerAddress);

src/main/java/com/fdkankan/sale/vo/response/RepairDetailVo.java

@@ -44,4 +44,5 @@ public class RepairDetailVo {
 
     private Integer haveButton = 0;   // 0无，1有
 
+    private RepairCheckAccount repairCheckAccount;
 }