Merge branch 'feature/dangjian'

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ActivityPartyController.java

@@ -65,7 +65,7 @@ public class ActivityPartyController {
         return new Result<ActivityPartyDTO>().ok(data);
     }
 
-    @PostMapping("save")
+    @PostMapping
     public Result save(@RequestBody ActivityPartyDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java

@@ -112,9 +112,7 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(ActivityPartyDTO dto) {
-        if (dto.getAllDeptIds().length == 0) {
-            setDeptId(dto);
-        }
+        setDeptId(dto);
         ActivityPartyEntity entity = ConvertUtils.sourceToTarget(dto, ActivityPartyEntity.class);
         if (null != dto.getReportPartyIds()) {
             String[] partyIds = dto.getReportPartyIds();
@@ -131,9 +129,9 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
             entity.setEndDate(DateUtil.parseDate(dto.getEndDate()));
         }
         Result<ParentAndAllDeptDTO> parentResult = null;
-        if (StringUtils.isNotEmpty(String.valueOf(dto.getDeptId()))) {
-            entity.setDeptId(String.valueOf(dto.getDeptId()));
-            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
+        if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
+            entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+            parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
         } else {
             parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
         }
@@ -152,9 +150,6 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(ActivityPartyDTO dto) {
-        if (dto.getAllDeptIds().length == 0) {
-            setDeptId(dto);
-        }
         ActivityPartyEntity entity = ConvertUtils.sourceToTarget(dto, ActivityPartyEntity.class);
         if (null != dto.getReportPartyIds()) {
             String[] partyIds = dto.getReportPartyIds();
@@ -171,9 +166,9 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
             entity.setEndDate(DateUtil.parseDate(dto.getEndDate()));
         }
         Result<ParentAndAllDeptDTO> parentResult = null;
-        if (StringUtils.isNotEmpty(String.valueOf(dto.getDeptId()))) {
-            entity.setDeptId(String.valueOf(dto.getDeptId()));
-            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
+        if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
+            entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+            parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
         } else {
             parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
         }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java

@@ -83,11 +83,13 @@ public class FlowPartyServiceImpl extends BaseServiceImpl<FlowPartyDao, FlowPart
         String name = (String) params.get(FieldConstant.NAME_HUMP);
         String idCard = (String) params.get(FieldConstant.ID_CARD_HUMP);
         String mobile = (String) params.get(FieldConstant.MOBILE_HUMP);
+        String status = (String) params.get("status");
         QueryWrapper<FlowPartyEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
         wrapper.like(StringUtils.isNotBlank(name), FieldConstant.NAME_HUMP, name);
         wrapper.like(StringUtils.isNotBlank(idCard), FieldConstant.ID_CARD, idCard);
         wrapper.like(StringUtils.isNotBlank(mobile), FieldConstant.MOBILE_HUMP, mobile);
+        wrapper.eq(StringUtils.isNotBlank(status), "STATUS", status);
         return wrapper;
     }