更改

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillUpdateDto.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.as.api.asbusclaimbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimBillUpdateDto {
+
+    private String sid;
+    @ApiModelProperty("索赔单号")
+    private String billNo;
+    @ApiModelProperty("索赔工时费")
+    private BigDecimal claimHourAmount;
+    @ApiModelProperty("索赔材料费")
+    private BigDecimal claimGoodsAmount;
+    @ApiModelProperty("索赔外出费")
+    private BigDecimal claimOutAmount;
+    @ApiModelProperty("索赔厂家补助")
+    private BigDecimal claimSubsidyAmount;
+    @ApiModelProperty("施救费")
+    private BigDecimal claimRescueAmount;
+    @ApiModelProperty("索赔其他费用")
+    private BigDecimal claimOtherAmount;
+    @ApiModelProperty("状态")
+    private String state;
+    @ApiModelProperty("审核时间")
+    private String auditDate;
+    @ApiModelProperty("保单时间")
+    private String policyDate;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillVo.java

@@ -52,8 +52,11 @@ public class AsBusclaimBillVo {
     @ApiModelProperty("审核状态")
     private String state;
     @ApiModelProperty("审核时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
     private Date auditDate;
+    @ApiModelProperty("保单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date policyDate;
     @ApiModelProperty("开票状态")
     private String invoiceState;
     @ApiModelProperty("应收调整状态")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.java

@@ -37,4 +37,7 @@ public interface AsBusclaimBillMapper extends BaseMapper<AsBusclaimBill> {
     AsBusclaimBill selectByBillNoAndVinNo(@Param("billNo") String billNo,@Param("vinNo") String vinNo);
 
     List<AsBusclaimBillExcelVo> listExcel(@Param(Constants.WRAPPER) QueryWrapper<AsBusclaimBill> qw);
+
+    @Select("select count(*) from as_busclaim_bill where billNo = #{billNo} and sid != #{sid}}")
+    int checkUpdateBillNo(@Param("billNo") String billNo,@Param("sid") String sid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml

@@ -9,6 +9,7 @@
                ab.finishTime,
                ab.settleTime,
                a.auditDate,
+               a.policyDate,
                a.billNo,
                DATE_FORMAT(a.modifyTime, '%Y-%m-%d') as modifyTime,
                a.claimHourAmount,
@@ -18,7 +19,12 @@
                a.claimRescueAmount,
                a.claimOtherAmount,
                a.claimTotalAmount,
-               a.state,
+               when a.state = 0 then '审核不通过'
+               when a.state = 1 then '未提报'
+               when a.state = 2 then '审核通过'
+               when a.state = 3 then '作废'
+               when a.state = 4 then '已驳回'
+               end as state,
                a.invoiceState,
                a.adjustState,
                abbv.vinNo,

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.as.biz.asbusclaimbill;
 
+import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.as.api.asbusclaimbill.*;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListVo;
 import com.yxt.common.base.utils.ExportExcelUtils;
@@ -47,6 +48,12 @@ public class AsBusclaimBillRest {
         return asBusclaimBillService.saveBill(dto);
     }
 
+    @PostMapping("/update")
+    @ApiOperation("编辑保存")
+    ResultBean update(@RequestBody AsBusclaimBillUpdateDto dto) {
+        return asBusclaimBillService.updateAll(dto);
+    }
+
     @PostMapping("/listPage")
     @ApiOperation("厂家索赔单分页列表")
     ResultBean<PagerVo<AsBusclaimBillVo>> listPage(@RequestBody PagerQuery<AsBusclaimBillQuery> pagerQuery) {
@@ -55,6 +62,14 @@ public class AsBusclaimBillRest {
         return rb.success().setData(pv);
     }
 
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        asBusclaimBillService.delBySids(sids);
+        return rb.success();
+    }
+
     @PostMapping("/downloadExcel")
     @ApiOperation(value = "下载模板")
     public void downloadExcel() {
@@ -121,15 +136,19 @@ public class AsBusclaimBillRest {
                 asBusclaimBill.setClaimOutAmount(asBusclaimBillExcelInfo.getClaimOutAmount());
                 asBusclaimBill.setClaimSubsidyAmount(asBusclaimBillExcelInfo.getClaimSubsidyAmount());
                 asBusclaimBill.setClaimOtherAmount(asBusclaimBillExcelInfo.getClaimOtherAmount());
-                if ("审核中".equals(asBusclaimBillExcelInfo.getState())) {
+                if ("审核不通过".equals(asBusclaimBillExcelInfo.getState())) {
                     asBusclaimBill.setState(0);
-                } else if ("已通过".equals(asBusclaimBillExcelInfo.getState())) {
+                } else if ("未提报".equals(asBusclaimBillExcelInfo.getState())) {
                     asBusclaimBill.setState(1);
-                } else if ("未通过".equals(asBusclaimBillExcelInfo.getState())) {
+                } else if ("审核通过".equals(asBusclaimBillExcelInfo.getState())) {
                     asBusclaimBill.setState(2);
                 } else if ("作废".equals(asBusclaimBillExcelInfo.getState())) {
                     asBusclaimBill.setState(3);
+                } else if ("已驳回".equals(asBusclaimBillExcelInfo.getState())) {
+                    asBusclaimBill.setState(4);
                 }
+                asBusclaimBill.setAuditDate(DateUtil.parseDate(asBusclaimBillExcelInfo.getAuditDate()));
+                asBusclaimBill.setPolicyDate(DateUtil.parseDate(asBusclaimBillExcelInfo.getPolicyDate()));
                 asBusclaimBillService.updateById(asBusclaimBill);
             }
             return ResultBean.fireSuccess().setMsg("数据导入成功");
@@ -281,8 +300,8 @@ public class AsBusclaimBillRest {
                     if (StringUtils.isBlank(excelInfo.getState())) {
                         checkWord.add("状态不能为空");
                         break;
-                    } else if (!"审核中".equals(excelInfo.getState()) && !"已通过".equals(excelInfo.getState()) && !"未通过".equals(excelInfo.getState()) && !"作废".equals(excelInfo.getState())) {
+                    } else if (!"审核不通过".equals(excelInfo.getState()) && !"未提报".equals(excelInfo.getState()) && !"审核通过".equals(excelInfo.getState()) && !"作废".equals(excelInfo.getState()) && !"已驳回".equals(excelInfo.getState())) {
-                        checkWord.add("状态必须为(审核中、已通过、未通过、作废)中的其中一种");
+                        checkWord.add("审核状态必须为(审核不通过、未提报、审核通过、作废、已驳回)中的其中一种");
                         break;
                     }
                 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java

@@ -25,6 +25,7 @@ import java.util.List;
  **/
 @Service
 public class AsBusclaimBillService extends MybatisBaseService<AsBusclaimBillMapper, AsBusclaimBill> {
+
     public ResultBean saveBill(AsBusclaimBillDto dto) {
         ResultBean rb = ResultBean.fireFail();
         int i = baseMapper.checkBillNo(dto.getBillNo());
@@ -92,18 +93,10 @@ public class AsBusclaimBillService extends MybatisBaseService<AsBusclaimBillMapp
         return p;
     }
 
-    public int saveList(List<AsBusclaimBill> resultList) {
-        return baseMapper.saveList(resultList);
-    }
-
     public AsBusclaimBill selectByBillNo(String billNo) {
         return baseMapper.selectByBillNo(billNo);
     }
 
-    public int checkBillNo(String billNo) {
-        return baseMapper.checkBillNo(billNo);
-    }
-
     public List<String> selectByRepairBillSid(String repairBillSid) {
         return baseMapper.selectByRepairBillSid(repairBillSid);
     }
@@ -162,4 +155,34 @@ public class AsBusclaimBillService extends MybatisBaseService<AsBusclaimBillMapp
         List<AsBusclaimBillExcelVo> asBusclaimBillExcelVoList = baseMapper.listExcel(qw);
         return asBusclaimBillExcelVoList;
     }
+
+    public ResultBean updateAll(AsBusclaimBillUpdateDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        int i = baseMapper.checkUpdateBillNo(dto.getBillNo(), dto.getSid());
+        if (i > 0) {
+            return rb.setMsg("该索赔单号已存在");
+        }
+        AsBusclaimBill asBusclaimBill = fetchBySid(dto.getSid());
+        asBusclaimBill.setBillNo(dto.getBillNo());
+        asBusclaimBill.setClaimHourAmount(dto.getClaimHourAmount());
+        asBusclaimBill.setClaimGoodsAmount(dto.getClaimGoodsAmount());
+        asBusclaimBill.setClaimOutAmount(dto.getClaimOutAmount());
+        asBusclaimBill.setClaimSubsidyAmount(dto.getClaimSubsidyAmount());
+        asBusclaimBill.setClaimOtherAmount(dto.getClaimOtherAmount());
+        if ("审核不通过".equals(dto.getState())) {
+            asBusclaimBill.setState(0);
+        } else if ("未提报".equals(dto.getState())) {
+            asBusclaimBill.setState(1);
+        } else if ("审核通过".equals(dto.getState())) {
+            asBusclaimBill.setState(2);
+        } else if ("作废".equals(dto.getState())) {
+            asBusclaimBill.setState(3);
+        } else if ("已驳回".equals(dto.getState())) {
+            asBusclaimBill.setState(4);
+        }
+        asBusclaimBill.setAuditDate(DateUtil.parseDate(dto.getAuditDate()));
+        asBusclaimBill.setPolicyDate(DateUtil.parseDate(dto.getPolicyDate()));
+        updateById(asBusclaimBill);
+        return rb.success();
+    }
 }