FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工作组颜色bug修复

Browse Source
This commit is contained in:
yuezhihang
2022-01-04 14:14:08 +08:00
parent 14fb6c1071
commit e17f8710b1
5 changed files with 190 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java
+6
View File
@@ -63,6 +63,12 @@ public class WgWorkGroupController extends BaseController<WgWorkGroup> {
return wgWorkGroupService.updateData(wgWorkGroupShowDTO); return wgWorkGroupService.updateData(wgWorkGroupShowDTO);
} }
@ApiOperation("修改工作组节点数据")
@PostMapping("/updateDataByWk")
public ResponseMessage<Object> updateDataByWk(@RequestBody WgWorkGroupShowDTO wgWorkGroupShowDTO){
return wgWorkGroupService.updateDataByWk(wgWorkGroupShowDTO);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java
+2
View File
@@ -26,4 +26,6 @@ public interface WgWorkGroupDao extends BaseMapper<WgWorkGroup> {
List<WgWorkGroup> researchDownCheck(@Param(value = "data") String data,@Param(value = "status")String status); List<WgWorkGroup> researchDownCheck(@Param(value = "data") String data,@Param(value = "status")String status);
List<WgWorkGroup> researchDatasCheck(@Param(value = "data") String data,@Param(value = "status")String status);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java
+2
View File
@@ -31,6 +31,8 @@ public interface IWgWorkGroupService extends IService<WgWorkGroup> {
ResponseMessage<Object> updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO); ResponseMessage<Object> updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO);
ResponseMessage<Object> updateDataByWk(WgWorkGroupShowDTO wgWorkGroupShowDTO);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java
+80 -45
View File
@@ -322,30 +322,76 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
@Override @Override
public ResponseMessage<Object> updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO) { public ResponseMessage<Object> updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO) {
List<WgWorkGroup> wgWorkGroupShowDTOS = wgWorkGroupDao.researchDownCheck(wgWorkGroupShowDTO.getId(), "1"); List<WgWorkGroup> wgWorkGroupShowDTOS = wgWorkGroupDao.researchDatasCheck(wgWorkGroupShowDTO.getId(), "0");
if (null != wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size() > 0) { if (null != wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size() > 0) {
return Result.error("工作组处在流程中，无法修改"); return Result.error("工作组处在流程中，无法修改");
} else { } else {
return dealAllDatas(wgWorkGroupShowDTO);
}
}
@Override
public ResponseMessage<Object> updateDataByWk(WgWorkGroupShowDTO wgWorkGroupShowDTO) {
return dealAllDatas(wgWorkGroupShowDTO);
}
private ResponseMessage<Object> dealAllDatas(WgWorkGroupShowDTO wgWorkGroupShowDTO) {
WgWorkGroup wgWorkGroup = new WgWorkGroup(); WgWorkGroup wgWorkGroup = new WgWorkGroup();
BeanUtils.copyProperties(wgWorkGroupShowDTO, wgWorkGroup); BeanUtils.copyProperties(wgWorkGroupShowDTO, wgWorkGroup);
boolean flag = false; boolean flag = false;
flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup); flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup);
if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) { saveBathDept(wgWorkGroupShowDTO, flag);
if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())){ saveBathMeetingUserRelations(wgWorkGroupShowDTO, flag);
List<String> strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); saveBathNetInfo(wgWorkGroupShowDTO, flag);
wgDeptService.removeByIds(strings); saveBathPayInfo(wgWorkGroupShowDTO, flag);
saveBathStandardPolicyInfo(wgWorkGroupShowDTO, flag);
if (flag) {
return Result.success("更新成功");
} else {
return Result.error("无法更新");
} }
List<WgDept> wgDepts=new ArrayList<>();
wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> {
WgDept wgDept=new WgDept();
BeanUtils.copyProperties(wgDeptShow,wgDept);
if (null==wgDept.getWgId()){
wgDept.setWgId(wgWorkGroupShowDTO.getId());
} }
wgDepts.add(wgDept);
private boolean saveBathPayInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) {
if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) {
if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())) {
List<String> strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(",")));
wgPayInfoService.removeByIds(strings);
}
if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()) {
wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> {
if (null == wgPayInfo.getWgId()) {
wgPayInfo.setWgId(wgWorkGroupShowDTO.getId());
}
}); });
flag = wgDeptService.saveOrUpdateBatch(wgDepts);
} }
flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos());
}
return flag;
}
private boolean saveBathNetInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) {
if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) {
if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())) {
List<String> strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(",")));
wgNetInfoService.removeByIds(strings);
}
List<WgNetInfo> wgNetInfos = new ArrayList<>();
wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> {
WgNetInfo wgNetInfo = new WgNetInfo();
BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo);
if (null == wgNetInfo.getWgId()) {
wgNetInfo.setWgId(wgWorkGroupShowDTO.getId());
}
wgNetInfos.add(wgNetInfo);
});
flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos);
}
return flag;
}
private boolean saveBathMeetingUserRelations(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) {
if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) {
if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())) { if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())) {
List<String> strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); List<String> strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(",")));
@@ -373,36 +419,31 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations); wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations);
} }
} }
if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) { return flag;
if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())){
List<String> strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(",")));
wgNetInfoService.removeByIds(strings);
} }
List<WgNetInfo> wgNetInfos = new ArrayList<>();
wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { private boolean saveBathDept(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) {
WgNetInfo wgNetInfo = new WgNetInfo(); if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) {
BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())) {
if (null==wgNetInfo.getWgId()){ List<String> strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(",")));
wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); wgDeptService.removeByIds(strings);
} }
wgNetInfos.add(wgNetInfo); List<WgDept> wgDepts = new ArrayList<>();
wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> {
WgDept wgDept = new WgDept();
BeanUtils.copyProperties(wgDeptShow, wgDept);
if (null == wgDept.getWgId()) {
wgDept.setWgId(wgWorkGroupShowDTO.getId());
}
wgDepts.add(wgDept);
}); });
flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); flag = wgDeptService.saveOrUpdateBatch(wgDepts);
} }
if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { return flag;
if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())){
List<String> strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(",")));
wgPayInfoService.removeByIds(strings);
}
if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){
wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> {
if (null==wgPayInfo.getWgId()){
wgPayInfo.setWgId(wgWorkGroupShowDTO.getId());
}
});
}
flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos());
} }
private boolean saveBathStandardPolicyInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) {
if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) {
if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()) { if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()) {
wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> {
@@ -413,13 +454,7 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
} }
flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos());
} }
return flag;
if (flag) {
return Result.success("更新成功");
} else {
return Result.error("无法更新");
}
}
} }
adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml
+4
View File
@@ -45,6 +45,10 @@
select * from wg_work_group where wg_work_group.pid = #{data} and wg_work_group.status = #{status} select * from wg_work_group where wg_work_group.pid = #{data} and wg_work_group.status = #{status}
</select> </select>
<select id="researchDatasCheck" resultType="com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup">
select * from wg_work_group where wg_work_group.id = #{data} and wg_work_group.status = #{status}
</select>
<select id="researchAllData" resultMap="WgWorkGroups"> <select id="researchAllData" resultMap="WgWorkGroups">
select * from wg_work_group where wg_work_group.type =#{type} select * from wg_work_group where wg_work_group.type =#{type}
</select> </select>