add log

src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java

@@ -41,6 +41,6 @@ public interface EvaluationGroupMapper extends BaseMapper<EvaluationGroup> {
 
     EvaluationGroup selectEvaluationGroupByName(@Param("name") String name);
 
-	void deleteByIds(@Param("ids") List<Long> ids);
+	void deleteByCopyIds(@Param("ids") List<Long> ids);
 
 }

src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java

@@ -48,7 +48,7 @@ public interface EvaluationGroupService extends IService<EvaluationGroup> {
 	//获取考核组里面所有参与的人员信息，去除重复，去除离职
 	List<StaffSimpleInfo> selectAllStaffSimpleInfoByGroupId(EvaluationGroup evaluationGroup);
 
-	void deleteByIds(List<Long> ids);
+	void deleteByCopyIds(List<Long> ids);
 
 	List<CheckStaffDto> checkStaff(EvaluationGroup evaluationGroup);
 }

src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java

@@ -255,8 +255,8 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 
 
 	@Override
-	public void deleteByIds(List<Long> ids) {
+	public void deleteByCopyIds(List<Long> ids) {
-		evaluationGroupMapper.deleteByIds(ids);
+		evaluationGroupMapper.deleteByCopyIds(ids);
 	}
 
 

src/main/java/com/lz/modules/performance/controller/UserTaskController.java

@@ -33,9 +33,10 @@ public class UserTaskController extends AbstractController{
     public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){
         PageUtils pageUtils = null;
         try {
+            //Long userId = getUserId();
             pageUtils = assessService.userTaskList(req, 313L);
         } catch (Exception e) {
-            log.error("获取用户事项异常" ,e);
+            log.error("获取用户事项异常 userId:"  ,e);
             return R.error();
         }
         return R.ok().put("data",pageUtils);

src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java

@@ -115,7 +115,8 @@ public class AssessManagerServiceImpl implements AssessManagerService {
             String[] split = groupIds.split(",");
             List<String> ids = Arrays.asList(split);
             List<Long> collect = ids.stream().map(s -> Long.valueOf(s)).collect(toList());
-            evaluationGroupService.deleteByIds(collect);
+            //删除副本组
+            evaluationGroupService.deleteByCopyIds(collect);
         }
         resultRecordMapper.batchDeleteByStartId(flowStart.getId());
         return ;

src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java

@@ -28,6 +28,7 @@ import com.lz.modules.performance.service.ChartResultService;
 import com.lz.modules.sys.dao.app.ResultRecordMapper;
 import com.lz.modules.sys.entity.app.ResultRecord;
 import com.lz.modules.sys.service.app.ResultRecordService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,6 +41,7 @@ import java.util.*;
  * @Date: 2020/10/14 16:53
  */
 @Service("chartResultService")
+@Slf4j
 public class ChartResultServiceImpl implements ChartResultService {
 
     @Autowired
@@ -70,6 +72,7 @@ public class ChartResultServiceImpl implements ChartResultService {
             //取最近一条记录
             FlowStart flowStart = flowStartMapper.selectRecentlyLimt();
             if(flowStart!=null){
+                log.info("首次进入，默认返回最新记录 flowStartId:" + flowStart.getId());
                 startId = flowStart.getId();
                 defaultTime = flowStart.getName();
                 defaultCycleType = flowStart.getCycleType();

src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java

@@ -89,7 +89,7 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
 
     List<ChartStatistical> countAssessNumByFlowProcess(@Param("req")AssessDetailReq req);
 
-    void batchDeleteByStartIdAndStaffId(@Param("startId")Long startId,@Param("staffIds") List<String> staffIds);
+    int batchDeleteByStartIdAndStaffId(@Param("startId")Long startId,@Param("staffIds") List<String> staffIds);
 
     List<Long> selectToScoreList(@Param("startId")Long startId,@Param("evaluationId")Long evaluationId);
 }

src/main/resources/mapper/flow/EvaluationGroupMapper.xml

@@ -122,9 +122,9 @@
         select * from lz_evaluation_group  where name=#{name} and is_delete = 0 limit 1
     </select>
 
-    <update id="deleteByIds">
+    <update id="deleteByCopyIds">
         update lz_evaluation_group set is_delete = 1 where is_delete=0
-        and id in (
+        and copy_id in (
         <foreach collection="ids" item="id" separator=",">
             #{id}
         </foreach>