解决外包履职评价循环引用

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -27,9 +27,10 @@ import com.xunmei.core.evaluate.dto.EvaluateTaskContentDTO;
 import com.xunmei.core.evaluate.dto.EvaluateTaskDTO;
 import com.xunmei.core.evaluate.dto.EvaluateTaskStatisticsDTO;
 import com.xunmei.core.evaluate.mapper.*;
-import com.xunmei.core.evaluate.service.ICoreEvaluatePlanService;
 import com.xunmei.core.evaluate.service.ICoreEvaluateTaskService;
-import com.xunmei.core.evaluate.vo.*;
+import com.xunmei.core.evaluate.vo.CoreEvaluateTaskUserContentVO;
+import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
+import com.xunmei.core.evaluate.vo.EvaluateTaskExportVO;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteRoleService;
 import com.xunmei.system.api.domain.SysOrg;
@@ -70,8 +71,6 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
     @Autowired
     private CoreEvaluateTaskUserMapper coreEvaluateTaskUserMapper;
 
-    @Autowired
-    private ICoreEvaluatePlanService coreEvaluatePlanService;
 
     @Override
     public TableDataInfo<CoreEvaluateTaskVO> selectPage(EvaluateTaskDTO evaluateTaskDTO) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/ResumptionMapper.java

@@ -98,6 +98,9 @@ public interface ResumptionMapper extends BaseMapper<Resumption> {
 
     List<Resumption> selectByEndDateAndPlanType(@Param("startDate") Date startDate,@Param("endDate") Date endDate, @Param("planType") List<Integer> planType, @Param("orgId") Long orgId);
 
+    List<Resumption> selectByYmdDateAndPlanType(@Param("date") Date date, @Param("planType") Integer planType, @Param("orgId") Long orgId);
+
+
 
 
     void batchInsertResumptionData(@Param("list") List<AppResumptionData> list);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -1362,11 +1362,11 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         Map<String, Object> data = new HashMap<>();
         //获取前一天
         //获取营业前的所有履职信息
-        List<Resumption> before = resumptionMapper.selectByYmdDateAndExec(date, 2, orgId);
+        List<Resumption> before = resumptionMapper.selectByYmdDateAndPlanType(date, 1, orgId);
         //获取营业期间的所有履职信息
-        List<Resumption> ing = resumptionMapper.selectByYmdDateAndExec(date, 3, orgId);
+        List<Resumption> ing = resumptionMapper.selectByYmdDateAndPlanType(date, 2, orgId);
         //获取营业终了的所有履职信息
-        List<Resumption> after = resumptionMapper.selectByYmdDateAndExec(date, 4, orgId);
+        List<Resumption> after = resumptionMapper.selectByYmdDateAndPlanType(date, 3, orgId);
         List<AppResumptionDataInfoVo> beforevos = getItems(before);
         List<AppResumptionDataInfoVo> ingvos = getItems(ing);
         List<AppResumptionDataInfoVo> aftervos = getItems(after);

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionMapper.xml

@@ -350,6 +350,16 @@
 <!--          and res.status = 3-->
     </select>
 
+    <select id="selectByYmdDateAndPlanType" resultType="com.xunmei.core.resumption.domain.Resumption">
+        select res.*,pl.plan_exec as planExec,pl.plan_type as planType
+        from core_resumption res
+        left join core_resumption_plan pl on res.plan_id = pl.id
+        where  pl.plan_type = #{planType}
+        and res.ymd_date = DATE(#{date})
+        and res.org_id = #{orgId}
+        <!--          and res.status = 3-->
+    </select>
+
     <select id="selectByYmdDateAndExecList" resultType="com.xunmei.core.resumption.domain.Resumption">
         select res.*,pl.plan_exec as planExec,pl.plan_type as planType
         from core_resumption res