Merge branch 'develop_master' into FOTON

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