zhanghl
2025-05-19 8747244dd60a0a1b146ef3ca8f171da6ca7dcf65
钣金工单计划:任务生成完清除批量保存的计划完工日期
已修改4个文件
22 ■■■■ 文件已修改
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireOrderEndDayMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireOrderEndDayServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireOrderEndDayMapper.xml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireOrderEndDayMapper.java
@@ -1,6 +1,5 @@
package com.aps.core.mapper;
import com.aps.core.domain.ApsPlate.ApsPlateOrderPlanDate;
import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireOrderEndDay;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -17,9 +16,8 @@
public interface ApsPlateStandardRequireOrderEndDayMapper extends BaseMapper<ApsPlateStandardRequireOrderEndDay> {
    Integer batchInsert(List<Long> planIds,String createBy);
    Integer batchRemove(List<Long> planIds);
    Integer batchRemoveByPlanId(List<Long> planIds);
    Integer batchRemove();
}
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java
@@ -9,8 +9,10 @@
import com.aps.core.enums.PLAN_TASK_STATUS;
import com.aps.core.enums.PLAN_TASK_TYPE;
import com.aps.core.enums.REDIS_LOCK_KEY;
import com.aps.core.mapper.ApsPlateStandardRequireOrderEndDayMapper;
import com.aps.core.service.ApsPlate.IApsPlateStandardRequireBatchService;
import com.aps.core.service.ApsPlate.IApsPlateStandardRequireService;
import com.aps.core.service.ApsPlateStandardRequireOrderEndDayService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -45,6 +47,9 @@
    @Resource
    RedisLockUtils redisLockUtils;
    @Resource
    ApsPlateStandardRequireOrderEndDayMapper  orderEndDayMapper;
    @Override
    public Page<ApsPlanTask> pagingList(Page<ApsPlanTask> page ,ApsPlanTask task){
@@ -105,6 +110,8 @@
            this.savePlanTask(batchNum);
            apsPlateStandardRequireService.generatorPlan(batchNum);
            this.updateTaskStatus(batchNum, PLAN_TASK_STATUS.FINISHED);
            /*清除已经存在的 工单计划完工时间*/
            orderEndDayMapper.batchRemove();
            log.info("计划任务执行完成!"+batchNum);
            return success();
        }catch (Exception e){
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireOrderEndDayServiceImpl.java
@@ -28,7 +28,7 @@
    @Override
    public int saveBatch(List<Long> planIds)
    {
        mapper.batchRemove(planIds);
        mapper.batchRemoveByPlanId(planIds);
       return mapper.batchInsert(planIds, SecurityUtils.getUsername());
    }
}
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireOrderEndDayMapper.xml
@@ -56,7 +56,7 @@
        from a
    </insert>
    <update id="batchRemove" parameterType="Long">
    <update id="batchRemoveByPlanId" parameterType="Long">
        update aps_plate_standard_require_order_end_day
        set del_flag=1
        where plan_id in
@@ -64,5 +64,10 @@
            #{planId}
        </foreach>
    </update>
    <update id="batchRemove" >
    update aps_plate_standard_require_order_end_day
        set del_flag=1
    where del_flag=0
    </update>
</mapper>