教培计划代码提交

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -213,7 +213,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         int insert = coreEduTrainingPlanMapper.insert(plan);
 
         //如果不是省联社或者办事处，并且是无周期或者立即生效
-        if ((!checkOrgType(plan.getExecOrgType())) && (ObjectUtil.equal(0, plan.getPlanCycle()) || ObjectUtil.equal(0, plan.getBuildTaskNow()))) {
+        if ((!checkOrgType(plan.getExecOrgType())) && (ObjectUtil.equal(0, plan.getPlanCycle()) || ObjectUtil.equal(1, plan.getBuildTaskNow()))) {
             CoreEduTrainingPlanDataVo detailPlanData = this.getCoreEduTrainingPlanDataVo(plan.getId());
             coreEduTrainingTaskService.createTaskForNow(detailPlanData, plan.getStartDate(), plan.getEndDate());
         }
@@ -227,7 +227,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             throw new RuntimeException("当前用户所在机构类型无法确认!");
         }
         //如果是省联社或者办事处则返回1，其他机构类型返回0
-        return ObjectUtil.equal(orgType, 1) || ObjectUtil.equal(orgType, 11);
+        return ObjectUtil.equal(orgType, 1) || ObjectUtil.equal(orgType, 2);
     }
 
     /**

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -66,22 +66,6 @@
 
     <select id="selectPageData" resultType="com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo"
             parameterType="com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto">
-        <!--        <include refid="selectCoreEduTrainingTaskVo"/>-->
-        <!--        <where>-->
-        <!--            <if test="request.title != null  and request.title != ''">-->
-        <!--                and title like concat('%', #{request.title}, '%')-->
-        <!--            </if>-->
-        <!--            <if test="request.type != null ">-->
-        <!--                and type = #{request.type}-->
-        <!--            </if>-->
-        <!--            <if test="request.status != null ">-->
-        <!--                and status = #{request.status}-->
-        <!--            </if>-->
-        <!--            <if test="request.range != null ">-->
-        <!--                and start_date >= #{request.range[0]}-->
-        <!--                and end_date <![CDATA[ <= ]]> #{request.range[1]}-->
-        <!--            </if>-->
-        <!--        </where>-->
         select t.id, plan_id, t.org_id, t.org_name, title, type, status, host_id,u.name as hostName,
         start_date, end_date, t.training_start_date_time,t.training_end_date_time, t.pdf_url as pdfUrl
         from core_edu_training_task t left join sys_user u on t.host_id=u.id
@@ -110,6 +94,7 @@
                 and t.end_date <![CDATA[<=]]> #{request.endTime}
             </if>
         </where>
+        order by t.update_time desc
     </select>
 
     <select id="selectEduTrainingTaskDetail"