From e700f1074a40c6fd5034eae508cc2a883639d1e7 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 10:51:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairInventorybillListVo.java | 16 +++++ .../asbusrepairbill/AsBusrepairBillRest.java | 7 ++ .../AsBusrepairBillService.java | 68 +++++++++++++++++-- .../AsBusrepairBillInsuranceRecordMapper.java | 50 ++++++++++++++ .../AsBusrepairBillInsuranceRecordMapper.xml | 6 ++ .../AsBusrepairBillInsuranceRecordRest.java | 45 ++++++++++++ ...AsBusrepairBillInsuranceRecordService.java | 50 ++++++++++++++ .../AsBusrepairInventorybillRest.java | 8 +++ 8 files changed, 245 insertions(+), 5 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillListVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.xml create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordRest.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordService.java diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillListVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillListVo.java new file mode 100644 index 0000000000..61a3c5ccb5 --- /dev/null +++ b/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 { + + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java index 88434bc8f0..88f1552a53 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java +++ b/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 sendBack(@RequestBody AsBusrepairBillDto dto) { + return asBusrepairBillService.sendBack(dto); + } + + @PostMapping("/settle") @ApiOperation("结算") ResultBean settle(@RequestBody AsBusrepairBillDto dto) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index 1072558ae8..d6f4de3b6d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/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 { + @Autowired + private AsBusrepairBillInsuranceRecordService asBusrepairBillInsuranceRecordService; @Autowired private AsAppendixService asAppendixService; @Autowired @@ -210,6 +216,7 @@ public class AsBusrepairBillService extends MybatisBaseService 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 insuranceList = new ArrayList<>(); OtherVo otherVo = new OtherVo();//送修人信息 List sitemVos = new ArrayList<>();// 服务项目 List aitemVos = new ArrayList<>();// 附加项目 @@ -454,10 +474,17 @@ public class AsBusrepairBillService extends MybatisBaseService 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 p = PagerUtil.pageToVo(pagging, null); return p; } + + public ResultBean 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(); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.java new file mode 100644 index 0000000000..017f5e3be8 --- /dev/null +++ b/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 { + @Select("select * from as_busrepair_bill_insurance_record where billSid = #{billSid}") + List fetchByBillSid(@Param("billSid") String billSid); + + @Delete("delete from as_busrepair_bill_insurance_record where billSid = #{sid}") + void delByBillSid(String billSid); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.xml new file mode 100644 index 0000000000..2cc260fcb6 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordRest.java new file mode 100644 index 0000000000..62d645d668 --- /dev/null +++ b/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 { + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurancerecord/AsBusrepairBillInsuranceRecordService.java new file mode 100644 index 0000000000..3d98cf3f11 --- /dev/null +++ b/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 { + public List fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java index eeb6a545dd..0c319f612d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java +++ b/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> pageList(@RequestBody PagerQuery pagerQuery) { +// ResultBean> rb = ResultBean.fireFail(); +// PagerVo pv = asBusrepairInventorybillService.pageList(pagerQuery); +// return rb.success().setData(pv); +// } + @PostMapping("/saveOrUpdate") @ApiOperation("保存或修改") ResultBean saveorUpdate(@RequestBody AsBusrepairInventorybillDto dto) { From 972dfc4610115be1966d2effdd68f714d0aabc7b Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 10:54:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=952.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java index f473a9f164..3417e91956 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java +++ b/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 insuranceList; + private List insuranceList = new ArrayList<>(); } From 1f4bac7e0f58d4e1aeefaa0b005e14717e0e9b7d Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 11:00:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=953.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../as/biz/asbusrepairbill/AsBusrepairBillService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index d6f4de3b6d..34f4cfd262 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -383,11 +383,11 @@ public class AsBusrepairBillService extends MybatisBaseService