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/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 82fb5ece..fcd93676 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -84,6 +84,15 @@ public class SarPublicIdeaAllController extends BaseController } + + @ApiOperation(value = "增加意见") + @PostMapping("/saveBatchByWk") + public ResponseMessage saveBatchByWk(@RequestBody List 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 .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 .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 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); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java index 80e65918..fc5a877b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java +++ b/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; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java index 6d2b104d..fc79bf30 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java +++ b/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; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java index 72cfc5f8..589fb322 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java +++ b/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; + } 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 { + + private static final Logger logger = LoggerFactory.getLogger(SarItemsStandCompareHisEOController.class); + + @Autowired + private SarItemsCompareHisEODao sarItemsCompareHisEOService; + + @ApiOperation(value = "|SarStandItemsCompareHisEO|分页查询") + @GetMapping("/page") + public ResponseMessage> page(SarStandItemsCompareHisEOPage page) throws Exception { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("STAND_HIS_ID",page.getStandHisId()); + List 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 @@ 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 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index a9f5c8c2..a55a303a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/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 @@