From fbde67fd7ff673209f5276a05e535cef1e01e98c Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 10 Jan 2022 17:27:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=86=85=E9=83=A8=E5=AF=BC=E5=87=BA=20bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/common/TableToExcel.java  |  5 +++
 .../SarItemsStandCompareHisEOController.java  | 40 +++++++++++++++++++
 .../SarBussionessStandMapper.xml              |  2 +-
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarItemsStandCompareHisEOController.java

diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java
index ff511b51..ad1dec71 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java
@@ -39,6 +39,7 @@ public class TableToExcel {
                 sheet.addMergedRegion(new CellRangeAddress(0,1,5,5));
                 sheet.addMergedRegion(new CellRangeAddress(0,1,6,6));
                 sheet.addMergedRegion(new CellRangeAddress(0,1,7,7));
+                sheet.addMergedRegion(new CellRangeAddress(0,1,8,8));
                 //生成表头行
                 int j=0;
 
@@ -75,6 +76,10 @@ public class TableToExcel {
                     Cell nCell1 = neckRow.createCell(4);
                     nCell1.setCellValue("修改理由");
                 }
+                if (null!=columnMap.get("cause")) {
+                    Cell nCell1 = headRow.createCell(8);
+                    nCell1.setCellValue("原因");
+                }
 
 
                 //从第三行开始填充数据
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarItemsStandCompareHisEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarItemsStandCompareHisEOController.java
new file mode 100644
index 00000000..cacf6ca4
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarItemsStandCompareHisEOController.java
@@ -0,0 +1,40 @@
+package com.adc.da.slrs.standardSplit.controller;
+
+import com.adc.da.base.web.BaseController;
+import com.adc.da.http.PageInfo;
+import com.adc.da.slrs.standardSplit.dao.SarItemsCompareHisEODao;
+import com.adc.da.slrs.standardSplit.entity.SarItemsCompareHisEO;
+import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEO;
+import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEOPage;
+import com.adc.da.slrs.standardSplit.service.SarItemsCompareHisEOService;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.*;
+@RestController
+@RequestMapping("/${restPath}/lawss/sarItemsCompareHis")
+@Api(description = "|SarStandItemsCompareHisEO|")
+public class SarItemsStandCompareHisEOController extends BaseController<SarItemsCompareHisEO> {
+
+    private static final Logger logger = LoggerFactory.getLogger(SarItemsStandCompareHisEOController.class);
+
+    @Autowired
+    private SarItemsCompareHisEODao sarItemsCompareHisEOService;
+
+	@ApiOperation(value = "|SarStandItemsCompareHisEO|分页查询")
+    @GetMapping("/page")
+    public ResponseMessage<PageInfo<SarItemsCompareHisEO>> page(SarStandItemsCompareHisEOPage page) throws Exception {
+        QueryWrapper<SarItemsCompareHisEO> queryWrapper=new QueryWrapper<>();
+        queryWrapper.eq("STAND_HIS_ID",page.getStandHisId());
+        List<SarItemsCompareHisEO> rows = sarItemsCompareHisEOService.selectList(queryWrapper);
+        return Result.success(getPageInfo(page.getPager(), rows));
+    }
+
+
+}
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
index bc5ebed9..396482be 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
@@ -55,7 +55,7 @@
 
     <sql id="Group_Column_List_show" >
      stand_status, replaced_stand_num, replace_stand_num,put_time,
-     issue_time, stand_en_name, stand_name, stand_code,standStatusShow,
+     issue_time, stand_en_name, stand_name, stand_code,stand_status,
      SAR_BUSSIONESS_STAND.id
   </sql>