Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.as.api.asbusrepairbill;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -24,5 +25,5 @@ public class InsuranceVo {
     @ApiModelProperty("责任比例")
     private String responsibilityRatio;
 
-    private List<InsuranceRecordVo> insuranceList;
+    private List<InsuranceRecordVo> insuranceList = new ArrayList<>();
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillListVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.as.api.asbusrepairinventorybill;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/18 10:19
+ */
+@Data
+public class AsBusrepairInventorybillListVo implements Query {
+
+
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java

@@ -54,6 +54,13 @@ public class AsBusrepairBillRest {
         return asBusrepairBillService.sureMaterialFee(dto);
     }
 
+    @PostMapping("/sendBack")
+    @ApiOperation("退回")
+    ResultBean<String> sendBack(@RequestBody AsBusrepairBillDto dto) {
+        return asBusrepairBillService.sendBack(dto);
+    }
+
+
     @PostMapping("/settle")
     @ApiOperation("结算")
     ResultBean<String> settle(@RequestBody AsBusrepairBillDto dto) {

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -9,6 +9,7 @@ import com.yxt.anrui.as.api.asappendix.AsAppendix;
 import com.yxt.anrui.as.api.asbusrepairbill.*;
 import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem;
 import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance;
+import com.yxt.anrui.as.api.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecord;
 import com.yxt.anrui.as.api.asbusrepairbillinvoice.AsBusrepairBillInvoice;
 import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode;
 import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeDto;
@@ -26,7 +27,10 @@ import com.yxt.anrui.as.api.utils.domain.AsBillNo;
 import com.yxt.anrui.as.biz.asappendix.AsAppendixService;
 import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService;
 import com.yxt.anrui.as.biz.asbusrepairbillaitem.AsBusrepairBillAitemService;
+import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceRest;
 import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceService;
+import com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecordRest;
+import com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecordService;
 import com.yxt.anrui.as.biz.asbusrepairbillinvoice.AsBusrepairBillInvoiceService;
 import com.yxt.anrui.as.biz.asbusrepairbillnode.AsBusrepairBillNodeService;
 import com.yxt.anrui.as.biz.asbusrepairbillother.AsBusrepairBillOtherService;
@@ -75,6 +79,8 @@ import java.util.*;
 @Service
 public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMapper, AsBusrepairBill> {
 
+    @Autowired
+    private AsBusrepairBillInsuranceRecordService asBusrepairBillInsuranceRecordService;
     @Autowired
     private AsAppendixService asAppendixService;
     @Autowired
@@ -210,6 +216,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             asBusrepairBillSitemService.delByBillSid(sid);
             asBusrepairBillSitemRepairerService.delByBillSid(sid);
             asBusrepairBillAitemService.delByBillSid(sid);
+            asBusrepairBillInsuranceRecordService.delByBillSid(sid);
             asAppendixService.delByLinkSid(sid);
         } else {
             AsBusrepairBill asBusrepairBill = new AsBusrepairBill();
@@ -277,6 +284,14 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 BeanUtil.copyProperties(dto.getInsuranceVo(), insurance, "id", "sid");
                 insurance.setBillSid(sid);
                 asBusrepairBillInsuranceService.insert(insurance);
+                InsuranceVo insuranceVo = dto.getInsuranceVo();
+                List<InsuranceRecordVo> insuranceList = insuranceVo.getInsuranceList();
+                for (InsuranceRecordVo insuranceRecordVo : insuranceList) {
+                    AsBusrepairBillInsuranceRecord record = new AsBusrepairBillInsuranceRecord();
+                    BeanUtil.copyProperties(insuranceRecordVo, record, "id", "sid");
+                    record.setBillSid(sid);
+                    asBusrepairBillInsuranceRecordService.insert(record);
+                }
             }
             //送修人信息
             if (null != dto.getOtherVo()) {
@@ -367,9 +382,12 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     asAppendix.setAttachType(AsFileEnum.WXGD.getAttachType());
                     asAppendix.setFilePath(filePath);
                     if (name.contains(".")) {
-                        String[] split = name.split(".");
-                        asAppendix.setFileName(split[0]);
-                        asAppendix.setFileType(split[1]);
+                        // 后缀名
+                        String suffixName = name.substring(name.lastIndexOf(".") + 1);
+                        //2021.10.16 截取文件后缀名以外的名字
+                        String prefixName = name.substring(0, name.indexOf("."));
+                        asAppendix.setFileName(prefixName);
+                        asAppendix.setFileType(suffixName);
                     }
                     asAppendixService.save(asAppendix);
                 }
@@ -397,6 +415,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             asBusrepairBillSitemRepairerService.delByBillSid(sid);
             asBusrepairBillAitemService.delByBillSid(sid);
             asBusrepairBillNodeService.delByBillSid(sid);
+            asBusrepairBillInsuranceRecordService.delByBillSid(sid);
         }
         return rb.success();
     }
@@ -442,6 +461,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             }
             InvoiceVo invoiceVo = new InvoiceVo(); //发票信息
             InsuranceVo insuranceVo = new InsuranceVo();//保险信息
+            List<InsuranceRecordVo> insuranceList = new ArrayList<>();
             OtherVo otherVo = new OtherVo();//送修人信息
             List<SitemVo> sitemVos = new ArrayList<>();// 服务项目
             List<AitemVo> aitemVos = new ArrayList<>();// 附加项目
@@ -454,10 +474,17 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             AsBusrepairBillInsurance insurance = asBusrepairBillInsuranceService.fetchByBillSid(sid);
             if (null != insurance) {
                 BeanUtil.copyProperties(insurance, insuranceVo);
-                {
-                    vo.setInsuranceVo(insuranceVo);
+            }
+            List<AsBusrepairBillInsuranceRecord> insuranceRecord = asBusrepairBillInsuranceRecordService.fetchByBillSid(sid);
+            if (!insuranceRecord.isEmpty()) {
+                for (AsBusrepairBillInsuranceRecord record : insuranceRecord) {
+                    InsuranceRecordVo insuranceRecordVo = new InsuranceRecordVo();
+                    BeanUtil.copyProperties(record, insuranceRecordVo);
+                    insuranceList.add(insuranceRecordVo);
                 }
+                insuranceVo.setInsuranceList(insuranceList);
             }
+            vo.setInsuranceVo(insuranceVo);
             AsBusrepairBillOther other = asBusrepairBillOtherService.fetchByBillSid(sid);
             if (null != other) {
                 BeanUtil.copyProperties(other, otherVo);
@@ -1068,4 +1095,35 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         PagerVo<AsBillListReturnGoodsVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public ResultBean<String> sendBack(AsBusrepairBillDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        AsBusrepairBill asBusrepairBill = fetchBySid(sid);
+        Integer nodeCode = null;
+        String nodeName = "";
+        if (asBusrepairBill.getNodeCode() == 5 || asBusrepairBill.getNodeCode() == 4) {
+            nodeCode = 3;
+            nodeName = "维修";
+        } else if (asBusrepairBill.getNodeCode() == 2) {
+            nodeCode = 1;
+            nodeName = "登记";
+        } else if (asBusrepairBill.getNodeCode() == 3) {
+            nodeCode = 2;
+            nodeName = "派工";
+        }
+        asBusrepairBill.setNodeCode(nodeCode);
+        asBusrepairBill.setNodeName(nodeName);
+        asBusrepairBill.setNodeTime(new DateTime());
+        baseMapper.updateById(asBusrepairBill);
+        //新增工单环节信息
+        AsBusrepairBillNode billNode = new AsBusrepairBillNode();
+        billNode.setBillSid(sid);
+        billNode.setCreateByName(dto.getOperator());
+        billNode.setNodeName(nodeName);
+        billNode.setCreateBySid(dto.getOperatorSid());
+        billNode.setNodeCode(nodeCode.toString());
+        asBusrepairBillNodeService.insert(billNode);
+        return rb.success();
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.java

@@ -0,0 +1,50 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance;
+import com.yxt.anrui.as.api.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecord;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsBusrepairBillInsuranceRecordMapper extends BaseMapper<AsBusrepairBillInsuranceRecord> {
+    @Select("select * from as_busrepair_bill_insurance_record where billSid = #{billSid}")
+    List<AsBusrepairBillInsuranceRecord> fetchByBillSid(@Param("billSid") String billSid);
+
+    @Delete("delete from as_busrepair_bill_insurance_record where billSid = #{sid}")
+    void delByBillSid(String billSid);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecordMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordRest.java

@@ -0,0 +1,45 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "维修工单-保险信息")
+@RestController
+@RequestMapping("v1/AsBusrepairBillInsuranceRecord")
+public class AsBusrepairBillInsuranceRecordRest {
+
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordService.java

@@ -0,0 +1,50 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord;
+
+import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance;
+import com.yxt.anrui.as.api.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecord;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsBusrepairBillInsuranceRecordService extends MybatisBaseService<AsBusrepairBillInsuranceRecordMapper, AsBusrepairBillInsuranceRecord> {
+    public List<AsBusrepairBillInsuranceRecord> fetchByBillSid(String billSid) {
+        return baseMapper.fetchByBillSid(billSid);
+    }
+
+    public void delByBillSid(String billSid) {
+        baseMapper.delByBillSid(billSid);
+    }
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java

@@ -36,6 +36,14 @@ public class AsBusrepairInventorybillRest {
         return rb.success().setData(pv);
     }
 
+//    @PostMapping("/listPage")
+//    @ApiOperation("维修领料列表")
+//    ResultBean<PagerVo<AsBusrepairInventorybillVo>> pageList(@RequestBody PagerQuery<AsBusrepairInventorybillQuery> pagerQuery) {
+//        ResultBean<PagerVo<AsBusrepairInventorybillVo>> rb = ResultBean.fireFail();
+//        PagerVo<AsBusrepairInventorybillVo> pv = asBusrepairInventorybillService.pageList(pagerQuery);
+//        return rb.success().setData(pv);
+//    }
+
     @PostMapping("/saveOrUpdate")
     @ApiOperation("保存或修改")
     ResultBean<String> saveorUpdate(@RequestBody AsBusrepairInventorybillDto dto) {