From 647960c44d36b97263fee0325487f9dea8b24307 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 30 十月 2026 16:32:18 +0800
Subject: [PATCH] feat(cnas,inspect): 客户满意度表单与年度汇总导出、委托单费用优惠维护
---
inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml | 10 +
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ClientSatisfaction.java | 52 +++++++
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ClientSatisfactionServiceImpl.java | 193 +++++++++++++++++++++++++++
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java | 37 ++++
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java | 11 +
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java | 10 +
cnas-manage/src/main/java/com/ruoyi/manage/service/ClientSatisfactionService.java | 8 +
cnas-manage/src/main/resources/static/customer-satisfaction-annual-summary.docx | 0
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java | 42 +++++
cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java | 42 ++++++
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderRatesService.java | 14 +
11 files changed, 412 insertions(+), 7 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java
index 87f4519..b94ac1b 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java
@@ -52,6 +52,10 @@
@Operation(summary = "瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�")
@PostMapping("/addClientSatisfaction")
public Result addClientSatisfaction(@RequestBody ClientSatisfaction clientSatisfaction){
+ Result<?> error = fillAssessment(clientSatisfaction);
+ if (error != null) {
+ return error;
+ }
clientSatisfactionService.save(clientSatisfaction);
// 杩斿洖淇濆瓨鍚庣殑璁板綍锛堝惈鑷id锛夛紝鍓嶇鎹涓婁紶鏂板鏃舵殏瀛樼殑鐓х墖
return Result.success(clientSatisfaction);
@@ -64,7 +68,35 @@
@Operation(summary = "瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�")
@PostMapping("/updateClientSatisfaction")
public Result updateClientSatisfaction(@RequestBody ClientSatisfaction clientSatisfaction){
+ Result<?> error = fillAssessment(clientSatisfaction);
+ if (error != null) {
+ return error;
+ }
return Result.success(clientSatisfactionService.updateById(clientSatisfaction));
+ }
+
+ /**
+ * 鏍规嵁10閬撻鐨勮瘎鍒嗚绠楁�诲垎鍜屾弧鎰忓害璇勫畾锛�80鍒嗗強浠ヤ笂涓烘弧鎰忥級
+ */
+ private Result<?> fillAssessment(ClientSatisfaction clientSatisfaction) {
+ Integer[] scores = {clientSatisfaction.getScore1(), clientSatisfaction.getScore2(),
+ clientSatisfaction.getScore3(), clientSatisfaction.getScore4(),
+ clientSatisfaction.getScore5(), clientSatisfaction.getScore6(),
+ clientSatisfaction.getScore7(), clientSatisfaction.getScore8(),
+ clientSatisfaction.getScore9(), clientSatisfaction.getScore10()};
+ int total = 0;
+ for (int i = 0; i < scores.length; i++) {
+ if (scores[i] == null) {
+ return Result.fail("璇峰畬鎴愮" + (i + 1) + "棰樿瘎鍒�");
+ }
+ if (scores[i] < 5 || scores[i] > 10) {
+ return Result.fail("璇勫垎蹇呴』鍦�5鍒�10鍒嗕箣闂�");
+ }
+ total += scores[i];
+ }
+ clientSatisfaction.setTotalScore(total);
+ clientSatisfaction.setSatisfactionResult(total >= 80 ? 0 : 1);
+ return null;
}
/**
@@ -93,6 +125,16 @@
}
/**
+ * 瀹㈡埛婊℃剰搴﹀勾搴︽眹鎬诲鍑�
+ * @param year 姹囨�诲勾搴�
+ */
+ @Operation(summary = "瀹㈡埛婊℃剰搴﹀勾搴︽眹鎬诲鍑�")
+ @GetMapping("/exportAnnualSummary")
+ public void exportAnnualSummary(Integer year, HttpServletResponse response){
+ clientSatisfactionService.exportAnnualSummary(year, response);
+ }
+
+ /**
* 纭瀹㈡埛婊℃剰搴�
* @param clientSatisfaction 瑕佷慨鏀瑰鎴锋弧鎰忓害鐨勭姸鎬佸璞�
* @param userId 淇敼浜篿d
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ClientSatisfaction.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ClientSatisfaction.java
index 66ba1fa..6f97b44 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ClientSatisfaction.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ClientSatisfaction.java
@@ -37,6 +37,58 @@
@Schema(description = "鑱旂郴鐢佃瘽")
private String contactNumber;
+ @Schema(description = "鍦板潃")
+ private String address;
+
+ @Schema(description = "鑱旂郴浜�")
+ private String contactPerson;
+
+ @Schema(description = "绗�1棰樿瘎鍒�")
+ private Integer score1;
+
+ @Schema(description = "绗�2棰樿瘎鍒�")
+ private Integer score2;
+
+ @Schema(description = "绗�3棰樿瘎鍒�")
+ private Integer score3;
+
+ @Schema(description = "绗�4棰樿瘎鍒�")
+ private Integer score4;
+
+ @Schema(description = "绗�5棰樿瘎鍒�")
+ private Integer score5;
+
+ @Schema(description = "绗�6棰樿瘎鍒�")
+ private Integer score6;
+
+ @Schema(description = "绗�7棰樿瘎鍒�")
+ private Integer score7;
+
+ @Schema(description = "绗�8棰樿瘎鍒�")
+ private Integer score8;
+
+ @Schema(description = "绗�9棰樿瘎鍒�")
+ private Integer score9;
+
+ @Schema(description = "绗�10棰樿瘎鍒�")
+ private Integer score10;
+
+ @Schema(description = "鎬诲垎")
+ private Integer totalScore;
+
+ @Schema(description = "婊℃剰搴﹁瘎瀹�, 0:婊℃剰, 1:涓嶆弧鎰�")
+ private Integer satisfactionResult;
+
+ @Schema(description = "瀹為獙瀹ゆ剰瑙�")
+ private String labOpinion;
+
+ @Schema(description = "璐ㄩ噺璐熻矗浜�")
+ private String qualityManager;
+
+ @Schema(description = "瀹為獙瀹ゅ~鍐欐棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate labDate;
+
@Schema(description = "鏈嶅姟鎬佸害, 0:婊℃剰, 1:涓�鑸�, 2:涓嶆弧鎰�")
private Integer serviceAttitude;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ClientSatisfactionService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ClientSatisfactionService.java
index 39c3bcd..e21a396 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ClientSatisfactionService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ClientSatisfactionService.java
@@ -51,6 +51,14 @@
void exportWordClientSatisfaction(Integer clientSatisfactionId, HttpServletResponse response);
/**
+ * 瀹㈡埛婊℃剰搴﹀勾搴︽眹鎬诲鍑�
+ *
+ * @param year 姹囨�诲勾搴�
+ * @param response
+ */
+ void exportAnnualSummary(Integer year, HttpServletResponse response);
+
+ /**
* 纭瀹㈡埛婊℃剰搴�
*
* @param clientSatisfaction 瑕佷慨鏀瑰鎴锋弧鎰忓害鐨勭姸鎬佸璞�
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ClientSatisfactionServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ClientSatisfactionServiceImpl.java
index 8076ea0..5abe5b4 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ClientSatisfactionServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ClientSatisfactionServiceImpl.java
@@ -22,20 +22,37 @@
import com.ruoyi.manage.pojo.ClientSatisfactionAttachment;
import com.ruoyi.manage.service.ClientSatisfactionService;
import com.ruoyi.system.mapper.UserMapper;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFParagraph;
+import org.apache.poi.xwpf.usermodel.XWPFRun;
+import org.apache.poi.xwpf.usermodel.XWPFTable;
+import org.apache.poi.xwpf.usermodel.XWPFTableCell;
+import org.apache.poi.xwpf.usermodel.XWPFTableRow;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPr;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRow;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTc;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
/**
@@ -178,6 +195,182 @@
}
/**
+ * 瀹㈡埛婊℃剰搴﹀勾搴︽眹鎬诲鍑�
+ *
+ * @param year 姹囨�诲勾搴�
+ * @param response
+ */
+ @Override
+ public void exportAnnualSummary(Integer year, HttpServletResponse response) {
+ int summaryYear = year == null ? LocalDate.now().getYear() : year;
+ List<ClientSatisfaction> list = baseMapper.selectList(new QueryWrapper<ClientSatisfaction>().lambda()
+ .ge(ClientSatisfaction::getFillDate, LocalDate.of(summaryYear, 1, 1))
+ .le(ClientSatisfaction::getFillDate, LocalDate.of(summaryYear, 12, 31))
+ .isNotNull(ClientSatisfaction::getTotalScore)
+ .orderByAsc(ClientSatisfaction::getFillDate)
+ .orderByAsc(ClientSatisfaction::getClientSatisfactionId));
+ if (list.isEmpty()) {
+ throw new ErrorException(summaryYear + "骞村害鏆傛棤婊℃剰搴﹁褰�");
+ }
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/customer-satisfaction-annual-summary.docx");
+ if (inputStream == null) {
+ throw new ErrorException("骞村害姹囨�绘ā鏉夸笉瀛樺湪");
+ }
+ try (InputStream is = inputStream) {
+ XWPFDocument loaded = new XWPFDocument(is);
+ XWPFDocument document = fillAnnualSummaryTable(loaded, summaryYear, list);
+ try (XWPFDocument doc = document) {
+ response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+ String fileName = URLEncoder.encode("瀹㈡埛婊℃剰搴﹀勾搴︽眹鎬昏〃_" + summaryYear + "骞�.docx", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName);
+ try (OutputStream os = response.getOutputStream()) {
+ doc.write(os);
+ os.flush();
+ }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new RuntimeException("瀵煎嚭澶辫触");
+ }
+ }
+
+ /**
+ * 鎸夊勾搴︽眹鎬绘ā鏉垮~鍏呮槑缁嗕笌缁熻鏁版嵁
+ */
+ private XWPFDocument fillAnnualSummaryTable(XWPFDocument document, int year, List<ClientSatisfaction> list) throws IOException {
+ XWPFTable table = document.getTables().get(0);
+
+ // 妯℃澘鍥哄畾姣忛〉 17 琛屾槑缁嗭細涓嶈冻涓嶅垹绌鸿锛岃秴杩囧垯鍙﹁捣涓�椤碉紝閲嶅鏍囬涓庤〃澶村悗缁х画濉�
+ int dataStart = 3;
+ int templateRows = 17;
+ int total = list.size();
+ int pages = Math.max(1, (total + templateRows - 1) / templateRows);
+ if (pages > 1) {
+ // 鍦� XML 灞傛彃鍏ョ画椤佃锛涙彃鍏ュ悗闇�閲嶆柊鍔犺浇鏂囨。锛孭OI 鐨勮/鍗曞厓鏍煎寘瑁呯被鎵嶄細鍒锋柊
+ CTTbl ctTbl = table.getCTTbl();
+ CTRow titleRow = table.getRow(0).getCtRow();
+ CTRow headerRow1 = table.getRow(1).getCtRow();
+ CTRow headerRow2 = table.getRow(2).getCtRow();
+ CTRow dataRowSample = table.getRow(dataStart + templateRows - 1).getCtRow();
+ int insertPos = dataStart + templateRows;
+ for (int page = 1; page < pages; page++) {
+ CTRow newTitleRow = ctTbl.insertNewTr(insertPos++);
+ newTitleRow.set(titleRow.copy());
+ removeBookmarks(newTitleRow);
+ pageBreakBefore(newTitleRow);
+ CTRow newHeader1 = ctTbl.insertNewTr(insertPos++);
+ newHeader1.set(headerRow1.copy());
+ CTRow newHeader2 = ctTbl.insertNewTr(insertPos++);
+ newHeader2.set(headerRow2.copy());
+ for (int r = 0; r < templateRows; r++) {
+ CTRow newRow = ctTbl.insertNewTr(insertPos++);
+ newRow.set(dataRowSample.copy());
+ }
+ }
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ document.write(buffer);
+ document.close();
+ document = new XWPFDocument(new ByteArrayInputStream(buffer.toByteArray()));
+ table = document.getTables().get(0);
+ }
+
+ setCellText(table.getRow(0).getCell(0), "姹囨�诲勾搴︼細" + year + "骞�");
+ for (int page = 1; page < pages; page++) {
+ setCellText(table.getRow(page * (templateRows + 3)).getCell(0), "姹囨�诲勾搴︼細" + year + "骞�");
+ }
+
+ int satisfied = 0;
+ for (int i = 0; i < total; i++) {
+ ClientSatisfaction item = list.get(i);
+ boolean isSatisfied = item.getSatisfactionResult() != null
+ ? item.getSatisfactionResult() == 0
+ : item.getTotalScore() != null && item.getTotalScore() >= 80;
+ if (isSatisfied) {
+ satisfied++;
+ }
+ int pageIndex = i / templateRows;
+ int indexInPage = i % templateRows;
+ XWPFTableRow row = table.getRow(dataStart + pageIndex * (templateRows + 3) + indexInPage);
+ setCellText(row.getCell(0), String.valueOf(i + 1));
+ setCellText(row.getCell(1), item.getUnitName());
+ setCellText(row.getCell(2), isSatisfied ? "鈭�" : "");
+ setCellText(row.getCell(3), isSatisfied ? "" : "鈭�");
+ String reason = StringUtils.isNotBlank(item.getLabOpinion()) ? item.getLabOpinion() : item.getRemark();
+ setCellText(row.getCell(4), isSatisfied ? "" : reason);
+ }
+
+ XWPFTableRow statRow = table.getRow(dataStart + (pages - 1) * (templateRows + 3) + templateRows + 2);
+ setCellText(statRow.getCell(0), "鍏� " + total + " 浠�");
+ setCellText(statRow.getCell(1), "鍏� " + satisfied + " 浠�");
+ setCellText(statRow.getCell(2), "鍏� " + (total - satisfied) + " 浠�");
+ String percent = String.format(Locale.ROOT, "%.1f", satisfied * 100.0 / total);
+ if (percent.endsWith(".0")) {
+ percent = percent.substring(0, percent.length() - 2);
+ }
+ setCellText(statRow.getCell(3), percent + "%");
+ return document;
+ }
+
+ /**
+ * 缁〉棣栬璁剧疆娈靛墠鍒嗛〉锛屼繚璇佹瘡椤垫牸瀛愭暟鍥哄畾
+ */
+ private void pageBreakBefore(CTRow row) {
+ if (row.sizeOfTcArray() == 0) {
+ return;
+ }
+ CTTc cell = row.getTcArray(0);
+ if (cell.sizeOfPArray() == 0) {
+ return;
+ }
+ CTP paragraph = cell.getPArray(0);
+ CTPPr pPr = paragraph.isSetPPr() ? paragraph.getPPr() : paragraph.addNewPPr();
+ if (!pPr.isSetPageBreakBefore()) {
+ pPr.addNewPageBreakBefore();
+ }
+ }
+
+ /**
+ * 鍒犻櫎鍏嬮殕琛屽唴鐨勪功绛撅紝閬垮厤鏂囨。鍑虹幇閲嶅涔︾
+ */
+ private void removeBookmarks(CTRow row) {
+ removeBookmarkNodes(row.getDomNode());
+ }
+
+ private void removeBookmarkNodes(Node node) {
+ if (node.getNodeType() == Node.ELEMENT_NODE
+ && ("bookmarkStart".equals(node.getLocalName()) || "bookmarkEnd".equals(node.getLocalName()))) {
+ Node parent = node.getParentNode();
+ if (parent != null) {
+ parent.removeChild(node);
+ }
+ return;
+ }
+ NodeList children = node.getChildNodes();
+ for (int i = children.getLength() - 1; i >= 0; i--) {
+ removeBookmarkNodes(children.item(i));
+ }
+ }
+
+ /**
+ * 濉啓鍗曞厓鏍兼枃鏈紝淇濈暀鍘熸湁娈佃惤鏍煎紡
+ */
+ private void setCellText(XWPFTableCell cell, String text) {
+ while (cell.getParagraphs().size() > 1) {
+ cell.removeParagraph(cell.getParagraphs().size() - 1);
+ }
+ XWPFParagraph paragraph = cell.getParagraphs().get(0);
+ for (int i = paragraph.getRuns().size() - 1; i >= 0; i--) {
+ paragraph.removeRun(i);
+ }
+ XWPFRun run = paragraph.createRun();
+ run.setText(text == null ? "" : text);
+ run.setFontFamily("瀹嬩綋");
+ run.setFontFamily("瀹嬩綋", XWPFRun.FontCharRange.eastAsia);
+ run.setFontSize(10.5);
+ cell.setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
+ }
+
+ /**
* 纭瀹㈡埛婊℃剰搴�
*
* @param clientSatisfaction 瑕佷慨鏀瑰鎴锋弧鎰忓害鐨勭姸鎬佸璞�
diff --git a/cnas-manage/src/main/resources/static/customer-satisfaction-annual-summary.docx b/cnas-manage/src/main/resources/static/customer-satisfaction-annual-summary.docx
new file mode 100644
index 0000000..e61d653
--- /dev/null
+++ b/cnas-manage/src/main/resources/static/customer-satisfaction-annual-summary.docx
Binary files differ
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java
index 89859ab..1e1fdbe 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java
@@ -5,12 +5,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.dto.SampleOrderDto;
+import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.service.InsOrderRatesService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
+import java.math.BigDecimal;
/**
@@ -36,8 +38,44 @@
*/
@Operation(summary = "鏌ヨ璁㈠崟鍒楄〃")
@GetMapping("/selectRatesPage")
- public Result selectInsOrderRates(Page page, SampleOrderDto sampleOrderDto) {
- return Result.success(insOrderRatesService.selectInsOrderRates(page, sampleOrderDto));
+ public Result selectInsOrderRates(Page page, SampleOrderDto sampleOrderDto,
+ String startMonth, String endMonth) {
+ return Result.success(insOrderRatesService.selectInsOrderRates(page, sampleOrderDto, startMonth, endMonth));
+ }
+
+
+ /**
+ * 鏇存柊璐圭敤浼樻儬涓庡娉�
+ * @param insOrder
+ * @return
+ */
+ @Operation(summary = "鏇存柊璐圭敤浼樻儬涓庡娉�")
+ @PostMapping("/updateFee")
+ public Result<?> updateFee(@RequestBody InsOrder insOrder) {
+ if (insOrder.getId() == null) {
+ return Result.fail("璁㈠崟id涓嶈兘涓虹┖");
+ }
+ Integer isDiscount = insOrder.getIsDiscount();
+ if (isDiscount == null || (isDiscount != 0 && isDiscount != 1)) {
+ return Result.fail("鏄惁浼樻儬鍙傛暟涓嶆纭�");
+ }
+ BigDecimal discountAmount = insOrder.getDiscountAmount();
+ if (isDiscount == 1) {
+ if (discountAmount == null) {
+ return Result.fail("鏈変紭鎯犳椂璇峰~鍐欎紭鎯犲悗閲戦");
+ }
+ if (discountAmount.compareTo(BigDecimal.ZERO) < 0) {
+ return Result.fail("浼樻儬鍚庨噾棰濅笉鑳藉皬浜�0");
+ }
+ } else {
+ discountAmount = null;
+ }
+ String feeRemark = insOrder.getFeeRemark();
+ if (feeRemark != null && feeRemark.length() > 500) {
+ return Result.fail("澶囨敞涓嶈兘瓒呰繃500瀛�");
+ }
+ boolean success = insOrderRatesService.updateOrderFee(insOrder.getId(), isDiscount, discountAmount, feeRemark);
+ return success ? Result.success() : Result.fail("淇濆瓨澶辫触锛岃鍗曚笉瀛樺湪");
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java
index b139164..b151a85 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java
@@ -9,6 +9,8 @@
import com.ruoyi.inspect.pojo.InsOrderRates;
import org.apache.ibatis.annotations.Param;
+import java.math.BigDecimal;
+
/**
* 璁㈠崟璐圭敤琛�
*
@@ -24,6 +26,15 @@
IPage<SampleOrderDto> selectInsOrderRates(Page page, @Param("ew") QueryWrapper<SampleOrderDto> ew);
/**
+ * 鏇存柊璁㈠崟鐨勮垂鐢ㄤ紭鎯犱笌澶囨敞
+ * @return
+ */
+ int updateOrderFee(@Param("id") Integer id,
+ @Param("isDiscount") Integer isDiscount,
+ @Param("discountAmount") BigDecimal discountAmount,
+ @Param("feeRemark") String feeRemark);
+
+ /**
* 鏌ヨ璁㈠崟璐圭敤璇︽儏锛堟ā鏉夸环鏍硷級
* @return
*/
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
index a74b48b..4ac0ec1 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
@@ -9,6 +9,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -86,6 +87,15 @@
@Schema(description = "澶囨敞鑻辨枃")
private String remarkEn;
+ @Schema(description = "鏄惁浼樻儬 0鏃� 1鏈�")
+ private Integer isDiscount;
+
+ @Schema(description = "浼樻儬鍚庨噾棰�")
+ private BigDecimal discountAmount;
+
+ @Schema(description = "璐圭敤澶囨敞")
+ private String feeRemark;
+
@Schema(description = "OTC璁㈠崟鍙�")
private String otcCode;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderRatesService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderRatesService.java
index 1e3726f..9043094 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderRatesService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderRatesService.java
@@ -7,6 +7,8 @@
import com.ruoyi.inspect.dto.TemplateRateDto;
import com.ruoyi.inspect.pojo.InsOrderRates;
+import java.math.BigDecimal;
+
/**
* 璁㈠崟璐圭敤琛�
*
@@ -16,12 +18,20 @@
public interface InsOrderRatesService extends IService<InsOrderRates> {
/**
- *
+ * 鏌ヨ璁㈠崟璐圭敤鍒楄〃锛堝彲鎸夐�佹牱鏈堜唤鍖洪棿绛涢�夛級
* @param page
* @param sampleOrderDto
+ * @param startMonth 璧峰鏈堜唤 yyyy-MM
+ * @param endMonth 缁撴潫鏈堜唤 yyyy-MM
* @return
*/
- IPage<SampleOrderDto> selectInsOrderRates(Page page, SampleOrderDto sampleOrderDto);
+ IPage<SampleOrderDto> selectInsOrderRates(Page page, SampleOrderDto sampleOrderDto, String startMonth, String endMonth);
+
+ /**
+ * 鏇存柊璁㈠崟鐨勮垂鐢ㄤ紭鎯犱笌澶囨敞
+ * @return
+ */
+ boolean updateOrderFee(Integer id, Integer isDiscount, BigDecimal discountAmount, String feeRemark);
/**
* 鏌ヨ璁㈠崟璐圭敤璇︽儏锛堟ā鏉夸环鏍硷級
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java
index 9b3066f..49afc1e 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java
@@ -1,15 +1,23 @@
package com.ruoyi.inspect.service.impl;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.SampleOrderDto;
import com.ruoyi.inspect.dto.TemplateRateDto;
import com.ruoyi.inspect.mapper.InsOrderRatesMapper;
import com.ruoyi.inspect.pojo.InsOrderRates;
import com.ruoyi.inspect.service.InsOrderRatesService;
import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.YearMonth;
+import java.time.format.DateTimeParseException;
/**
* 璁㈠崟璐圭敤琛�
@@ -21,14 +29,37 @@
public class InsOrderRatesServiceImpl extends ServiceImpl<InsOrderRatesMapper, InsOrderRates> implements InsOrderRatesService {
/**
- * 鏌ヨ璁㈠崟璐圭敤鍒楄〃
+ * 鏌ヨ璁㈠崟璐圭敤鍒楄〃锛堝彲鎸夐�佹牱鏈堜唤鍖洪棿绛涢�夛級
* @param page
* @param sampleOrderDto
+ * @param startMonth 璧峰鏈堜唤 yyyy-MM
+ * @param endMonth 缁撴潫鏈堜唤 yyyy-MM
* @return
*/
@Override
- public IPage<SampleOrderDto> selectInsOrderRates(Page page, SampleOrderDto sampleOrderDto) {
- return baseMapper.selectInsOrderRates(page, QueryWrappers.queryWrappers(sampleOrderDto));
+ public IPage<SampleOrderDto> selectInsOrderRates(Page page, SampleOrderDto sampleOrderDto, String startMonth, String endMonth) {
+ QueryWrapper<SampleOrderDto> wrapper = QueryWrappers.queryWrappers(sampleOrderDto);
+ if (wrapper == null) {
+ wrapper = Wrappers.query();
+ }
+ if (StrUtil.isNotBlank(startMonth) || StrUtil.isNotBlank(endMonth)) {
+ try {
+ if (StrUtil.isNotBlank(startMonth)) {
+ wrapper.ge("sample_date", YearMonth.parse(startMonth).atDay(1));
+ }
+ if (StrUtil.isNotBlank(endMonth)) {
+ wrapper.le("sample_date", YearMonth.parse(endMonth).atEndOfMonth());
+ }
+ } catch (DateTimeParseException e) {
+ throw new ErrorException("閫佹牱鏃堕棿绛涢�夋牸寮忎笉姝g‘锛屽簲涓� yyyy-MM");
+ }
+ }
+ return baseMapper.selectInsOrderRates(page, wrapper);
+ }
+
+ @Override
+ public boolean updateOrderFee(Integer id, Integer isDiscount, BigDecimal discountAmount, String feeRemark) {
+ return baseMapper.updateOrderFee(id, isDiscount, discountAmount, feeRemark) > 0;
}
@Override
diff --git a/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
index 3db1be3..0778648 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
@@ -22,8 +22,18 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
+ order by a.sample_date desc, a.id desc
</select>
+ <!-- 鏇存柊璁㈠崟鐨勮垂鐢ㄤ紭鎯犱笌澶囨敞 -->
+ <update id="updateOrderFee">
+ update ins_order
+ set is_discount = #{isDiscount},
+ discount_amount = #{discountAmount},
+ fee_remark = #{feeRemark}
+ where id = #{id}
+ </update>
+
<!-- 鏌ヨ璁㈠崟璐圭敤璇︽儏锛堟ā鏉夸环鏍硷級 -->
<select id="selectTemplateRatesDetail" resultType="com.ruoyi.inspect.dto.TemplateRateDto">
select iost.number, iost.name, COALESCE(st.price, 0) as price
--
Gitblit v1.9.3