Merge branch 'develop_master' into FOTON

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("原因");
+                }
 
 
                 //从第三行开始填充数据

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java

@@ -84,6 +84,15 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
 
     }
 
+
+    @ApiOperation(value = "增加意见")
+    @PostMapping("/saveBatchByWk")
+    public ResponseMessage saveBatchByWk(@RequestBody List<SarPublicIdeaAll> sar){
+           boolean flag=sarPublicIdeaAllImpl.saveOrUpdateBatch(sar);
+           return Result.success("200",flag);
+
+    }
+
     @ApiOperation(value = "删除意见")
     @GetMapping("/deleteStand")
     public ResponseMessage deleteStand(DelStandDto delStandDto){
@@ -136,6 +145,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
                             .userName(sarPublicIdeaAll.getUserName())
                             .deptName(sarPublicIdeaAll.getDeptName())
                             .state(map.get(sarPublicIdeaAll.getState()))
+                            .cause(sarPublicIdeaAll.getCause())
                             .build();
                     standExcel2.add(getExcelDto);
                 }else {
@@ -146,6 +156,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
                             .reason(sarPublicIdeaAll.getReason())
                             .userName(sarPublicIdeaAll.getUserName())
                             .deptName(sarPublicIdeaAll.getDeptName())
+                            .cause(sarPublicIdeaAll.getCause())
                             .build();
                     standExcel.add(getExcelDto);
                 }
@@ -161,6 +172,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
             if ("1".equals(type)){
                 headList.add(Lists.newArrayList("处理意见"));
             }
+            headList.add(Lists.newArrayList("原因"));
             if ("1".equals(type)) {
                 EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1")
                         .doWrite(standExcel2);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java

@@ -38,6 +38,8 @@ public class GetExcelDto {
 //    @ExcelProperty("提出人")
     private String userName;
 
+    private String cause;
+
 
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java

@@ -37,6 +37,8 @@ public class GetExcelDto2 {
 
     private String state;
 
+    private String cause;
+
 
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java

@@ -75,4 +75,7 @@ public class SarPublicIdeaAll extends BaseEntity {
     @TableField("state")
     private String state;
 
+    @TableField("cause")
+    private String cause;
+
 }

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));
+    }
+
+
+}

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>
 

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml

@@ -6,7 +6,7 @@
         SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,ts_institution.name as department,sar_public_idea_all.old_text,
          sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,
          sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,
-         sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.wk_flag
+         sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.wk_flag,sar_public_idea_all.cause
         FROM sar_public_idea
         INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id
         left join ts_user on ts_user.USID = sar_public_idea_all.user_id
@@ -17,7 +17,8 @@
     <select id="getAllDataByIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
          SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text,sar_public_idea_all.wk_flag,
          sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,
-         sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,sar_public_idea_all.chapter_name as chapterName
+         sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,sar_public_idea_all.chapter_name as chapterName,
+         sar_public_idea_all.cause
          FROM sar_public_idea_all
          left join ts_user on sar_public_idea_all.user_id=ts_user.USID
          left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
@@ -33,7 +34,7 @@
     </select>
 
     <select id="getPublicAllIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state
+        SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause
         FROM sar_public_idea_all
         left join ts_user on ts_user.USID=sar_public_idea_all.user_id
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
@@ -48,7 +49,7 @@
     </select>
 
     <select id="getPublicAllIdeaExport" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state
+        SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause
         FROM sar_public_idea_all
         left join ts_user on ts_user.USID=sar_public_idea_all.user_id
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID