Merge branch 'dev_import' into develop

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java

@@ -95,7 +95,8 @@ public class ImportTaskServiceImpl implements ImportTaskService {
     @Override
     public PageData<ImportTaskCommonResultDTO> page(ImportTaskCommonFormDTO param) {
         LambdaQueryWrapper<ImportTaskEntity> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ImportTaskEntity::getOperatorId,param.getOperatorId());
+        queryWrapper.eq(ImportTaskEntity::getOperatorId,param.getOperatorId())
+                .orderByDesc(ImportTaskEntity::getStartTime);
         Page<ImportTaskEntity> page = PageHelper.startPage(param.getPageNo(), param.getPageSize(), param.isPage()).doSelectPage(() -> {
             importRecordDao.selectList(queryWrapper);
         });

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java

@@ -176,7 +176,7 @@ public class LatestDraftActInfoResultDTO implements Serializable {
      * 联建单位
      */
     private String unitId;
-
+    private List<String> unitIdList;
     /**
      * 活动目标
      */
@@ -186,4 +186,5 @@ public class LatestDraftActInfoResultDTO implements Serializable {
      * 服务事项
      */
     private String serviceMatter;
+    private List<String> serviceMatterList;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcActivityServiceRelationService.java

@@ -23,7 +23,7 @@ public interface IcActivityServiceRelationService extends BaseService<IcActivity
     List<String> getServiceList(String activityId);
 
     /**
-     * 删除活动所属服务事项
+     * 物理删除活动所属服务事项
      *
      * @Param activityId
      * @Return
@@ -31,4 +31,14 @@ public interface IcActivityServiceRelationService extends BaseService<IcActivity
      * @Date 2022/2/21 16:10
      */
     void deleteByActivity(String activityId);
+
+    /**
+     * 逻辑删除活动所属服务事项
+     *
+     * @Param activityId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/2/21 16:10
+     */
+    void delete(String activityId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcActivityUnitRelationService.java

@@ -23,7 +23,7 @@ public interface IcActivityUnitRelationService extends BaseService<IcActivityUni
     List<String> getUnitList(String activityId);
 
     /**
-     * 删除活动所属单位
+     * 物理删除删除活动所属单位
      *
      * @Param activityId
      * @Return
@@ -31,4 +31,14 @@ public interface IcActivityUnitRelationService extends BaseService<IcActivityUni
      * @Date 2022/2/21 16:10
      */
     void deleteByActivity(String activityId);
+
+    /**
+     * 逻辑删除删除活动所属单位
+     *
+     * @Param activityId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/2/21 16:10
+     */
+    void delete(String activityId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActServiceRelationService.java

@@ -23,7 +23,7 @@ public interface LatestActServiceRelationService extends BaseService<LatestActSe
     List<String> getServiceMatterList(String actId);
 
     /**
-     * 删除活动所属服务事项
+     * 物理删除活动所属服务事项
      *
      * @Param actId
      * @Return
@@ -31,4 +31,14 @@ public interface LatestActServiceRelationService extends BaseService<LatestActSe
      * @Date 2022/2/22 14:54
      */
     void deleteByAct(String actId);
+
+    /**
+     * 逻辑删除活动所属服务事项
+     *
+     * @Param actId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/2/22 14:54
+     */
+    void delete(String actId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LatestActUnitRelationService.java

@@ -23,7 +23,7 @@ public interface LatestActUnitRelationService extends BaseService<LatestActUnitR
     List<String> getUnitList(String actId);
 
     /**
-     * 删除活动所属单位列表
+     * 物理删除活动所属单位列表
      *
      * @Param actId
      * @Return
@@ -32,4 +32,14 @@ public interface LatestActUnitRelationService extends BaseService<LatestActUnitR
      */
     void deleteByAct(String actId);
 
+    /**
+     * 逻辑删除活动所属单位列表
+     *
+     * @Param actId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/2/22 14:54
+     */
+    void delete(String actId)
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcActivityServiceRelationServiceImpl.java

@@ -58,4 +58,21 @@ public class IcActivityServiceRelationServiceImpl extends BaseServiceImpl<IcActi
     public void deleteByActivity(String activityId) {
         baseDao.deleteByActivity(activityId);
     }
+
+    /**
+     * 逻辑删除活动所属服务事项
+     *
+     * @param activityId
+     * @Param activityId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/2/21 16:10
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String activityId) {
+        LambdaQueryWrapper<IcActivityServiceRelationEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcActivityServiceRelationEntity::getActivityId, activityId);
+        baseDao.delete(wrapper);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcActivityUnitRelationServiceImpl.java

@@ -57,4 +57,21 @@ public class IcActivityUnitRelationServiceImpl extends BaseServiceImpl<IcActivit
     public void deleteByActivity(String activityId) {
         baseDao.deleteByActivity(activityId);
     }
+
+    /**
+     * 逻辑删除删除活动所属单位
+     *
+     * @param activityId
+     * @Param activityId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/2/21 16:10
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String activityId) {
+        LambdaQueryWrapper<IcActivityUnitRelationEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcActivityUnitRelationEntity::getActivityId, activityId);
+        baseDao.delete(wrapper);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java

@@ -215,6 +215,8 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
     public void delete(String id) {
         // 逻辑删除（@TableLogic 注解）
         baseDao.deleteById(id);
+        icActivityUnitRelationService.delete(id);
+        icActivityServiceRelationService.delete(id);
     }
 
     /**

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java

@@ -31,6 +31,8 @@ import com.epmet.entity.LatestActInfoEntity;
 import com.epmet.redis.LatestActInfoRedis;
 import com.epmet.service.LatestActContentService;
 import com.epmet.service.LatestActInfoService;
+import com.epmet.service.LatestActServiceRelationService;
+import com.epmet.service.LatestActUnitRelationService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -38,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -56,6 +59,10 @@ public class LatestActInfoServiceImpl extends BaseServiceImpl<LatestActInfoDao,
     private LatestActInfoRedis latestActInfoRedis;
     @Autowired
     private LatestActContentService latestActContentService;
+    @Resource
+    private LatestActServiceRelationService latestActServiceRelationService;
+    @Resource
+    private LatestActUnitRelationService latestActUnitRelationService;
 
     @Override
     public PageData<LatestActInfoDTO> page(Map<String, Object> params) {
@@ -158,6 +165,8 @@ public class LatestActInfoServiceImpl extends BaseServiceImpl<LatestActInfoDao,
             int num=latestActContentService.deleteByActId(entity.getId());
             //删除活动属性: del_flag="1"
             baseDao.updateToDelById(entity.getId());
+            latestActServiceRelationService.delete(entity.getId());
+            latestActUnitRelationService.delete(entity.getId());
         }
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActServiceRelationServiceImpl.java

@@ -58,4 +58,21 @@ public class LatestActServiceRelationServiceImpl extends BaseServiceImpl<LatestA
     public void deleteByAct(String actId) {
         baseDao.deleteByActivity(actId);
     }
+
+    /**
+     * 逻辑删除活动所属服务事项
+     *
+     * @param actId
+     * @Param actId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/2/22 14:54
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String actId) {
+        LambdaQueryWrapper<LatestActServiceRelationEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(LatestActServiceRelationEntity::getActId, actId);
+        baseDao.delete(wrapper);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActUnitRelationServiceImpl.java

@@ -58,4 +58,21 @@ public class LatestActUnitRelationServiceImpl extends BaseServiceImpl<LatestActU
     public void deleteByAct(String actId) {
         baseDao.deleteByActivity(actId);
     }
+
+    /**
+     * 逻辑删除活动所属单位列表
+     *
+     * @param actId
+     * @Param actId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/2/22 14:54
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String actId) {
+        LambdaQueryWrapper<LatestActUnitRelationEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(LatestActUnitRelationEntity::getActId, actId);
+        baseDao.delete(wrapper);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java

@@ -94,6 +94,10 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
             if(null!=latestAct){
                 List<ActDraftContentDTOResultDTO> actContentList=latestActContentService.selectActContentList(latestAct.getActDraftId());
                 latestAct.setActContent(actContentList);
+                List<String> unitList = latestActUnitRelationService.getUnitList(latestAct.getActDraftId());
+                latestAct.setUnitIdList(unitList);
+                List<String> serviceList = latestActServiceRelationService.getServiceMatterList(latestAct.getActDraftId());
+                latestAct.setServiceMatterList(serviceList);
             }
             return latestAct;
         }else{
@@ -332,9 +336,7 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
         latestActInfoDTO.setAuditSwitch(formDTO.getAuditSwitch());
 
         latestActInfoDTO.setActType(formDTO.getActType());
-        latestActInfoDTO.setUnitId(formDTO.getUnitId());
         latestActInfoDTO.setTarget(formDTO.getTarget());
-        latestActInfoDTO.setServiceMatter(formDTO.getServiceMatter());
 
         return latestActInfoDTO;
     }