|
@@ -144,18 +144,49 @@ public class TMtActionlistServiceImpl implements ITMtActionlistService
|
|
TMtActionlist tMtActionlist = new TMtActionlist();
|
|
TMtActionlist tMtActionlist = new TMtActionlist();
|
|
tMtActionlist.setMeetingId(meetingId);
|
|
tMtActionlist.setMeetingId(meetingId);
|
|
List<TMtActionlist> list = tMtActionlistMapper.selectTMtActionlistList(tMtActionlist);
|
|
List<TMtActionlist> list = tMtActionlistMapper.selectTMtActionlistList(tMtActionlist);
|
|
- for (TMtActionlist t:list
|
|
|
|
|
|
+ List<SysDictData> dictList = iSysDictTypeService.selectDictDataByType("ACTUALPOST");
|
|
|
|
+
|
|
|
|
+ for (TMtActionlist t : list
|
|
) {
|
|
) {
|
|
- if (StringUtils.isNotEmpty(t.getResponsible())) {
|
|
|
|
- t.setRespName(t.getResponsible());
|
|
|
|
- SysUser user = sysUserService.selectUserByStaffId(t.getResponsible());
|
|
|
|
- if (user != null) {
|
|
|
|
- t.setRespName(user.getNickName());
|
|
|
|
|
|
+ //指定人
|
|
|
|
+ if ("1".equals(t.getIsPerson())) {
|
|
|
|
+ if (StringUtils.isNotEmpty(t.getResponsible())) {
|
|
|
|
+ String[] respArr = t.getResponsible().split(",");
|
|
|
|
+ for (int i = 0; i < respArr.length; i++) {
|
|
|
|
+ SysUser user = sysUserService.selectUserByStaffId(respArr[i]);
|
|
|
|
+ if (user != null) {
|
|
|
|
+ if (i == 0) {
|
|
|
|
+ t.setRespName(user.getNickName());
|
|
|
|
+ } else {
|
|
|
|
+ t.setRespName(t.getRespName() + "," + user.getNickName());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ //指定岗位
|
|
|
|
+ else if ("2".equals(t.getIsPerson())) {
|
|
|
|
+ if (StringUtils.isNotEmpty(t.getPosition())) {
|
|
|
|
+ String[] arr = t.getPosition().split(",");
|
|
|
|
+ for (int i = 0; i < arr.length; i++) {
|
|
|
|
+ if (i == 0) {
|
|
|
|
+ t.setRespName(DictUtils.getDictVale(dictList ,arr[i]));
|
|
|
|
+ }else {
|
|
|
|
+ t.setRespName(t.getRespName() + "," + DictUtils.getDictVale(dictList ,arr[i]));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if (t.getUpdaterCode() != null) {
|
|
|
|
+ SysUser updater = sysUserService.selectUserById(Long.parseLong(t.getUpdaterCode()));
|
|
|
|
+ t.setUpdaterCode(updater.getNickName());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
- List<SysDictData> dictList = iSysDictTypeService.selectDictDataByType("ACTION_STATUS");
|
|
|
|
|
|
+ List<SysDictData> dictList2 = iSysDictTypeService.selectDictDataByType("ACTION_STATUS");
|
|
System.out.println(JSON.toJSONString(dictList));
|
|
System.out.println(JSON.toJSONString(dictList));
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(list)) {
|
|
if (CollectionUtils.isNotEmpty(list)) {
|
|
@@ -166,7 +197,7 @@ public class TMtActionlistServiceImpl implements ITMtActionlistService
|
|
PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(1), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", list.get(i).getRespName());
|
|
PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(1), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", list.get(i).getRespName());
|
|
PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(2), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", list.get(i).getAction());
|
|
PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(2), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", list.get(i).getAction());
|
|
PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(3), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", DateUtils.parseDateToStr("yyyy-MM-dd",list.get(i).getDeadline()));
|
|
PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(3), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", DateUtils.parseDateToStr("yyyy-MM-dd",list.get(i).getDeadline()));
|
|
- PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(4), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", DictUtils.getDictVale(dictList ,list.get(i).getStatus()));
|
|
|
|
|
|
+ PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(4), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", DictUtils.getDictVale(dictList2 ,list.get(i).getStatus()));
|
|
PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(5), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "20", list.get(i).getRemarks());
|
|
PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(5), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "20", list.get(i).getRemarks());
|
|
}
|
|
}
|
|
}
|
|
}
|