Merge remote-tracking branch 'origin/dev' into dev

bluejay

2025-04-09 06d2730553811243101503b96620407d68008f54

Merge remote-tracking branch 'origin/dev' into dev

 aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamController.java

@@ -38,7 +38,7 @@
    /**
     * æŸ¥è¯¢ç„Šç¼åˆ—表
     */
    @RequiresPermissions("gasPiping:gasPiping:list")
    @RequiresPermissions("weldSeam:weldSeam:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsWeldSeam apsWeldSeam) {
//        startPage();
@@ -49,7 +49,7 @@
    /**
     * å¯¼å‡ºç„Šç¼åˆ—表
     */
    @RequiresPermissions("gasPiping:gasPiping:export")
    @RequiresPermissions("weldSeam:weldSeam:export")
    @Log(title = "焊缝", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsWeldSeam apsWeldSeam) {
@@ -79,7 +79,7 @@
    /**
     * èŽ·å–焊缝详细信息
     */
    @RequiresPermissions("gasPiping:gasPiping:query")
    @RequiresPermissions("weldSeam:weldSeam:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id) {
        return success(apsWeldSeamService.selectApsWeldSeamById(id));
@@ -88,7 +88,7 @@
    /**
     * æ–°å¢žç„Šç¼
     */
    @RequiresPermissions("gasPiping:gasPiping:add")
    @RequiresPermissions("weldSeam:weldSeam:add")
    @Log(title = "焊缝", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsWeldSeam apsWeldSeam) {
@@ -98,7 +98,7 @@
    /**
     * ä¿®æ”¹ç„Šç¼
     */
    @RequiresPermissions("gasPiping:gasPiping:edit")
    @RequiresPermissions("weldSeam:weldSeam:edit")
    @Log(title = "焊缝", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsWeldSeam apsWeldSeam) {
@@ -108,7 +108,7 @@
    /**
     * åˆ é™¤ç„Šç¼
     */
    @RequiresPermissions("gasPiping:gasPiping:remove")
    @RequiresPermissions("weldSeam:weldSeam:remove")
    @Log(title = "焊缝", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids) {

 aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamStatisticsController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,106 @@
package com.aps.core.controller;

import java.util.List;
import java.io.IOException;

import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsWeldSeamStatistics;
import com.aps.core.service.IApsWeldSeamStatisticsService;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.page.TableDataInfo;

/**
 * ç„Šç¼ç»Ÿè®¡Controller
 * 
 * @author wwj
 * @date 2025-04-09
 */
@RestController
@RequestMapping("/weldSeamStatistics")
public class ApsWeldSeamStatisticsController extends BaseController
{
    @Autowired
    private IApsWeldSeamStatisticsService apsWeldSeamStatisticsService;

    /**
     * æŸ¥è¯¢ç„Šç¼ç»Ÿè®¡åˆ—表
     */
    @RequiresPermissions("weldSeamStatistics:weldSeamStatistics:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsWeldSeamStatistics apsWeldSeamStatistics)
    {
        startPage();
        List<ApsWeldSeamStatistics> list = apsWeldSeamStatisticsService.selectApsWeldSeamStatisticsList(apsWeldSeamStatistics);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºç„Šç¼ç»Ÿè®¡åˆ—表
     */
    @RequiresPermissions("weldSeamStatistics:weldSeamStatistics:export")
    @Log(title = "焊缝统计", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsWeldSeamStatistics apsWeldSeamStatistics)
    {
        List<ApsWeldSeamStatistics> list = apsWeldSeamStatisticsService.selectApsWeldSeamStatisticsList(apsWeldSeamStatistics);
        ExcelUtil<ApsWeldSeamStatistics> util = new ExcelUtil<ApsWeldSeamStatistics>(ApsWeldSeamStatistics.class);
        util.exportExcel(response, list, "焊缝统计数据");
    }

    /**
     * èŽ·å–焊缝统计详细信息
     */
    @RequiresPermissions("weldSeamStatistics:weldSeamStatistics:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id)
    {
        return success(apsWeldSeamStatisticsService.selectApsWeldSeamStatisticsById(id));
    }

    /**
     * æ–°å¢žç„Šç¼ç»Ÿè®¡
     */
    @RequiresPermissions("weldSeamStatistics:weldSeamStatistics:add")
    @Log(title = "焊缝统计", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsWeldSeamStatistics apsWeldSeamStatistics)
    {
        return toAjax(apsWeldSeamStatisticsService.insertApsWeldSeamStatistics(apsWeldSeamStatistics));
    }

    /**
     * ä¿®æ”¹ç„Šç¼ç»Ÿè®¡
     */
    @RequiresPermissions("weldSeamStatistics:weldSeamStatistics:edit")
    @Log(title = "焊缝统计", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsWeldSeamStatistics apsWeldSeamStatistics)
    {
        return toAjax(apsWeldSeamStatisticsService.updateApsWeldSeamStatistics(apsWeldSeamStatistics));
    }

    /**
     * åˆ é™¤ç„Šç¼ç»Ÿè®¡
     */
    @RequiresPermissions("weldSeamStatistics:weldSeamStatistics:remove")
    @Log(title = "焊缝统计", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids)
    {
        return toAjax(apsWeldSeamStatisticsService.deleteApsWeldSeamStatisticsByIds(ids));
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeamStatistics.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,250 @@
package com.aps.core.domain;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;

/**
 * ç„Šç¼ç»Ÿè®¡å¯¹è±¡ aps_weld_seam_statistics
 * 
 * @author wwj
 * @date 2025-04-09
 */
public class ApsWeldSeamStatistics extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** ä¸»é”®id */
    private String id;

    /** å¹´ä»½ */
    @Excel(name = "年份")
    private Long year;

    /** æœˆä»½ */
    @Excel(name = "月份")
    private Long month;

    /** ç”Ÿäº§åŸºåœ° */
    @Excel(name = "生产基地")
    private String productionBase;

    /** ç®¡è·¯è®¢å•éœ€æ±‚ */
    @Excel(name = "管路订单需求")
    private Long pipingOrderRequirement;

    /** æ°”柜订单需求 */
    @Excel(name = "气柜订单需求")
    private Long gasOrderRequirement;

    /** ç®¡è·¯é¢„测需求 */
    @Excel(name = "管路预测需求")
    private Long pipingPredictionRequirement;

    /** æ°”柜预测需求 */
    @Excel(name = "气柜预测需求")
    private Long gasPredictionRequirement;

    /** é¢„留紧急订单产出 */
    @Excel(name = "预留紧急订单产出")
    private Long reserveEmergencyOrderOutput;

    /** åˆè®¡ */
    @Excel(name = "合计")
    private Long total;

    /** å¤©æ•° */
    @Excel(name = "天数")
    private Long days;

    /** éœ€æ±‚日焊缝 */
    @Excel(name = "需求日焊缝")
    private Long requirementDayWeldSeam;

    /** ç”Ÿäº§æ—¥ç„Šç¼ */
    @Excel(name = "生产日焊缝")
    private Long productionDayWeldSeam;

    /** æ˜¯å¦æ»¡è¶³ */
    @Excel(name = "是否满足")
    private String isSatisfy;

    /** åˆ é™¤æ ‡å¿—（0代表存在 2代表删除） */
    private String delFlag;

    public void setId(String id) 
    {
        this.id = id;
    }

    public String getId() 
    {
        return id;
    }

    public void setYear(Long year) 
    {
        this.year = year;
    }

    public Long getYear() 
    {
        return year;
    }

    public void setMonth(Long month) 
    {
        this.month = month;
    }

    public Long getMonth() 
    {
        return month;
    }

    public void setProductionBase(String productionBase) 
    {
        this.productionBase = productionBase;
    }

    public String getProductionBase() 
    {
        return productionBase;
    }

    public void setPipingOrderRequirement(Long pipingOrderRequirement) 
    {
        this.pipingOrderRequirement = pipingOrderRequirement;
    }

    public Long getPipingOrderRequirement() 
    {
        return pipingOrderRequirement;
    }

    public void setGasOrderRequirement(Long gasOrderRequirement) 
    {
        this.gasOrderRequirement = gasOrderRequirement;
    }

    public Long getGasOrderRequirement() 
    {
        return gasOrderRequirement;
    }

    public void setPipingPredictionRequirement(Long pipingPredictionRequirement) 
    {
        this.pipingPredictionRequirement = pipingPredictionRequirement;
    }

    public Long getPipingPredictionRequirement() 
    {
        return pipingPredictionRequirement;
    }

    public void setGasPredictionRequirement(Long gasPredictionRequirement) 
    {
        this.gasPredictionRequirement = gasPredictionRequirement;
    }

    public Long getGasPredictionRequirement() 
    {
        return gasPredictionRequirement;
    }

    public void setReserveEmergencyOrderOutput(Long reserveEmergencyOrderOutput) 
    {
        this.reserveEmergencyOrderOutput = reserveEmergencyOrderOutput;
    }

    public Long getReserveEmergencyOrderOutput() 
    {
        return reserveEmergencyOrderOutput;
    }

    public void setTotal(Long total) 
    {
        this.total = total;
    }

    public Long getTotal() 
    {
        return total;
    }

    public void setDays(Long days) 
    {
        this.days = days;
    }

    public Long getDays() 
    {
        return days;
    }

    public void setRequirementDayWeldSeam(Long requirementDayWeldSeam) 
    {
        this.requirementDayWeldSeam = requirementDayWeldSeam;
    }

    public Long getRequirementDayWeldSeam() 
    {
        return requirementDayWeldSeam;
    }

    public void setProductionDayWeldSeam(Long productionDayWeldSeam) 
    {
        this.productionDayWeldSeam = productionDayWeldSeam;
    }

    public Long getProductionDayWeldSeam() 
    {
        return productionDayWeldSeam;
    }

    public void setIsSatisfy(String isSatisfy) 
    {
        this.isSatisfy = isSatisfy;
    }

    public String getIsSatisfy() 
    {
        return isSatisfy;
    }

    public void setDelFlag(String delFlag) 
    {
        this.delFlag = delFlag;
    }

    public String getDelFlag() 
    {
        return delFlag;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("year", getYear())
            .append("month", getMonth())
            .append("productionBase", getProductionBase())
            .append("pipingOrderRequirement", getPipingOrderRequirement())
            .append("gasOrderRequirement", getGasOrderRequirement())
            .append("pipingPredictionRequirement", getPipingPredictionRequirement())
            .append("gasPredictionRequirement", getGasPredictionRequirement())
            .append("reserveEmergencyOrderOutput", getReserveEmergencyOrderOutput())
            .append("total", getTotal())
            .append("days", getDays())
            .append("requirementDayWeldSeam", getRequirementDayWeldSeam())
            .append("productionDayWeldSeam", getProductionDayWeldSeam())
            .append("isSatisfy", getIsSatisfy())
            .append("delFlag", getDelFlag())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .toString();
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java

@@ -20,6 +20,13 @@
     * @return ç„Šç¼
     */
    public ApsWeldSeam selectApsWeldSeamById(String id);
    /**
     * æŸ¥è¯¢ç„Šç¼
     *
     * @param workOrderNo é€šè¿‡å·¥å•å·æŸ¥è¯¢
     * @return ç„Šç¼
     */
    public ApsWeldSeam selectApsWeldSeamByWorkOrderNo(String workOrderNo);

    /**
     * æŸ¥è¯¢ç„Šç¼åˆ—表

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamStatisticsMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.aps.core.mapper;

import java.util.List;
import com.aps.core.domain.ApsWeldSeamStatistics;

/**
 * ç„Šç¼ç»Ÿè®¡Mapper接口
 * 
 * @author wwj
 * @date 2025-04-09
 */
public interface ApsWeldSeamStatisticsMapper 
{
    /**
     * æŸ¥è¯¢ç„Šç¼ç»Ÿè®¡
     * 
     * @param id ç„Šç¼ç»Ÿè®¡ä¸»é”®
     * @return ç„Šç¼ç»Ÿè®¡
     */
    public ApsWeldSeamStatistics selectApsWeldSeamStatisticsById(String id);

    /**
     * æŸ¥è¯¢ç„Šç¼ç»Ÿè®¡åˆ—表
     * 
     * @param apsWeldSeamStatistics ç„Šç¼ç»Ÿè®¡
     * @return ç„Šç¼ç»Ÿè®¡é›†åˆ
     */
    public List<ApsWeldSeamStatistics> selectApsWeldSeamStatisticsList(ApsWeldSeamStatistics apsWeldSeamStatistics);

    /**
     * æ–°å¢žç„Šç¼ç»Ÿè®¡
     * 
     * @param apsWeldSeamStatistics ç„Šç¼ç»Ÿè®¡
     * @return ç»“æžœ
     */
    public int insertApsWeldSeamStatistics(ApsWeldSeamStatistics apsWeldSeamStatistics);

    /**
     * ä¿®æ”¹ç„Šç¼ç»Ÿè®¡
     * 
     * @param apsWeldSeamStatistics ç„Šç¼ç»Ÿè®¡
     * @return ç»“æžœ
     */
    public int updateApsWeldSeamStatistics(ApsWeldSeamStatistics apsWeldSeamStatistics);

    /**
     * åˆ é™¤ç„Šç¼ç»Ÿè®¡
     * 
     * @param id ç„Šç¼ç»Ÿè®¡ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteApsWeldSeamStatisticsById(String id);

    /**
     * æ‰¹é‡åˆ é™¤ç„Šç¼ç»Ÿè®¡
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteApsWeldSeamStatisticsByIds(String[] ids);
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWeldSeamStatisticsService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.aps.core.service;

import java.util.List;
import com.aps.core.domain.ApsWeldSeamStatistics;

/**
 * ç„Šç¼ç»Ÿè®¡Service接口
 * 
 * @author wwj
 * @date 2025-04-09
 */
public interface IApsWeldSeamStatisticsService 
{
    /**
     * æŸ¥è¯¢ç„Šç¼ç»Ÿè®¡
     * 
     * @param id ç„Šç¼ç»Ÿè®¡ä¸»é”®
     * @return ç„Šç¼ç»Ÿè®¡
     */
    public ApsWeldSeamStatistics selectApsWeldSeamStatisticsById(String id);

    /**
     * æŸ¥è¯¢ç„Šç¼ç»Ÿè®¡åˆ—表
     * 
     * @param apsWeldSeamStatistics ç„Šç¼ç»Ÿè®¡
     * @return ç„Šç¼ç»Ÿè®¡é›†åˆ
     */
    public List<ApsWeldSeamStatistics> selectApsWeldSeamStatisticsList(ApsWeldSeamStatistics apsWeldSeamStatistics);

    /**
     * æ–°å¢žç„Šç¼ç»Ÿè®¡
     * 
     * @param apsWeldSeamStatistics ç„Šç¼ç»Ÿè®¡
     * @return ç»“æžœ
     */
    public int insertApsWeldSeamStatistics(ApsWeldSeamStatistics apsWeldSeamStatistics);

    /**
     * ä¿®æ”¹ç„Šç¼ç»Ÿè®¡
     * 
     * @param apsWeldSeamStatistics ç„Šç¼ç»Ÿè®¡
     * @return ç»“æžœ
     */
    public int updateApsWeldSeamStatistics(ApsWeldSeamStatistics apsWeldSeamStatistics);

    /**
     * æ‰¹é‡åˆ é™¤ç„Šç¼ç»Ÿè®¡
     * 
     * @param ids éœ€è¦åˆ é™¤çš„焊缝统计主键集合
     * @return ç»“æžœ
     */
    public int deleteApsWeldSeamStatisticsByIds(String[] ids);

    /**
     * åˆ é™¤ç„Šç¼ç»Ÿè®¡ä¿¡æ¯
     * 
     * @param id ç„Šç¼ç»Ÿè®¡ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteApsWeldSeamStatisticsById(String id);
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java

@@ -2,6 +2,7 @@

import java.util.List;

import com.aps.common.core.utils.StringUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.core.domain.ApsPartPlan;
import com.aps.core.domain.ApsPartPlanTemp;
@@ -13,6 +14,7 @@
import com.aps.core.mapper.ApsWeldSeamMapper;
import com.aps.core.domain.ApsWeldSeam;
import com.aps.core.service.IApsWeldSeamService;
import org.springframework.transaction.annotation.Transactional;

/**
 * ç„Šç¼Service业务层处理
@@ -112,9 +114,17 @@
            ids[i]=apsWeldSeamTemps.get(i).getId();
            ApsWeldSeam apsWeldSeam=new ApsWeldSeam();
            BeanUtils.copyProperties(apsWeldSeamTemps.get(i), apsWeldSeam);
            apsWeldSeam.setId(IdUtils.fastUUID());
            //插入正式表，并记录
            apsWeldSeamMapper.insertApsWeldSeam(apsWeldSeam);
            //通过工单号查询是否存在数据
            ApsWeldSeam apsWeldSeam1=apsWeldSeamMapper.selectApsWeldSeamByWorkOrderNo(apsWeldSeam.getWorkOrderNo());
            //当工单号存在则更新数据否则插入数据
            if(StringUtils.isNotEmpty(apsWeldSeam1.getId())){
                apsWeldSeam.setId(apsWeldSeam1.getId());
                apsWeldSeamMapper.updateApsWeldSeam(apsWeldSeam);
            }else {
                //插入正式表，并记录
                apsWeldSeam.setId(IdUtils.fastUUID());
                apsWeldSeamMapper.insertApsWeldSeam(apsWeldSeam);
            }
            count++;
        }
        //插入数量与临时表查询一直则删除临时表数据

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,96 @@
package com.aps.core.service.impl;

import java.util.List;
import com.aps.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsWeldSeamStatisticsMapper;
import com.aps.core.domain.ApsWeldSeamStatistics;
import com.aps.core.service.IApsWeldSeamStatisticsService;

/**
 * ç„Šç¼ç»Ÿè®¡Service业务层处理
 * 
 * @author wwj
 * @date 2025-04-09
 */
@Service
public class ApsWeldSeamStatisticsServiceImpl implements IApsWeldSeamStatisticsService 
{
    @Autowired
    private ApsWeldSeamStatisticsMapper apsWeldSeamStatisticsMapper;

    /**
     * æŸ¥è¯¢ç„Šç¼ç»Ÿè®¡
     * 
     * @param id ç„Šç¼ç»Ÿè®¡ä¸»é”®
     * @return ç„Šç¼ç»Ÿè®¡
     */
    @Override
    public ApsWeldSeamStatistics selectApsWeldSeamStatisticsById(String id)
    {
        return apsWeldSeamStatisticsMapper.selectApsWeldSeamStatisticsById(id);
    }

    /**
     * æŸ¥è¯¢ç„Šç¼ç»Ÿè®¡åˆ—表
     * 
     * @param apsWeldSeamStatistics ç„Šç¼ç»Ÿè®¡
     * @return ç„Šç¼ç»Ÿè®¡
     */
    @Override
    public List<ApsWeldSeamStatistics> selectApsWeldSeamStatisticsList(ApsWeldSeamStatistics apsWeldSeamStatistics)
    {
        return apsWeldSeamStatisticsMapper.selectApsWeldSeamStatisticsList(apsWeldSeamStatistics);
    }

    /**
     * æ–°å¢žç„Šç¼ç»Ÿè®¡
     * 
     * @param apsWeldSeamStatistics ç„Šç¼ç»Ÿè®¡
     * @return ç»“æžœ
     */
    @Override
    public int insertApsWeldSeamStatistics(ApsWeldSeamStatistics apsWeldSeamStatistics)
    {
        apsWeldSeamStatistics.setCreateTime(DateUtils.getNowDate());
        return apsWeldSeamStatisticsMapper.insertApsWeldSeamStatistics(apsWeldSeamStatistics);
    }

    /**
     * ä¿®æ”¹ç„Šç¼ç»Ÿè®¡
     * 
     * @param apsWeldSeamStatistics ç„Šç¼ç»Ÿè®¡
     * @return ç»“æžœ
     */
    @Override
    public int updateApsWeldSeamStatistics(ApsWeldSeamStatistics apsWeldSeamStatistics)
    {
        apsWeldSeamStatistics.setUpdateTime(DateUtils.getNowDate());
        return apsWeldSeamStatisticsMapper.updateApsWeldSeamStatistics(apsWeldSeamStatistics);
    }

    /**
     * æ‰¹é‡åˆ é™¤ç„Šç¼ç»Ÿè®¡
     * 
     * @param ids éœ€è¦åˆ é™¤çš„焊缝统计主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsWeldSeamStatisticsByIds(String[] ids)
    {
        return apsWeldSeamStatisticsMapper.deleteApsWeldSeamStatisticsByIds(ids);
    }

    /**
     * åˆ é™¤ç„Šç¼ç»Ÿè®¡ä¿¡æ¯
     * 
     * @param id ç„Šç¼ç»Ÿè®¡ä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsWeldSeamStatisticsById(String id)
    {
        return apsWeldSeamStatisticsMapper.deleteApsWeldSeamStatisticsById(id);
    }
}

 aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml

@@ -62,7 +62,10 @@
        <include refid="selectApsWeldSeamVo"/>
        where id = #{id}
    </select>

    <select id="selectApsWeldSeamByWorkOrderNo" parameterType="String" resultMap="ApsWeldSeamResult">
        <include refid="selectApsWeldSeamVo"/>
        where work_order_no = #{workOrderNo}
    </select>
    <insert id="insertApsWeldSeam" parameterType="ApsWeldSeam">
        insert into aps_weld_seam
        <trim prefix="(" suffix=")" suffixOverrides=",">

 aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,138 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWeldSeamStatisticsMapper">
    
    <resultMap type="ApsWeldSeamStatistics" id="ApsWeldSeamStatisticsResult">
        <result property="id"    column="id"    />
        <result property="year"    column="year"    />
        <result property="month"    column="month"    />
        <result property="productionBase"    column="production_base"    />
        <result property="pipingOrderRequirement"    column="piping_order_requirement"    />
        <result property="gasOrderRequirement"    column="gas_order_requirement"    />
        <result property="pipingPredictionRequirement"    column="piping_prediction_requirement"    />
        <result property="gasPredictionRequirement"    column="gas_prediction_requirement"    />
        <result property="reserveEmergencyOrderOutput"    column="reserve_emergency_order_output"    />
        <result property="total"    column="total"    />
        <result property="days"    column="days"    />
        <result property="requirementDayWeldSeam"    column="requirement_day_weld_seam"    />
        <result property="productionDayWeldSeam"    column="production_day_weld_seam"    />
        <result property="isSatisfy"    column="is_satisfy"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
    </resultMap>

    <sql id="selectApsWeldSeamStatisticsVo">
        select id, year, month, production_base, piping_order_requirement, gas_order_requirement, piping_prediction_requirement, gas_prediction_requirement, reserve_emergency_order_output, total, days, requirement_day_weld_seam, production_day_weld_seam, is_satisfy, del_flag, create_by, create_time, update_by, update_time from aps_weld_seam_statistics
    </sql>

    <select id="selectApsWeldSeamStatisticsList" parameterType="ApsWeldSeamStatistics" resultMap="ApsWeldSeamStatisticsResult">
        <include refid="selectApsWeldSeamStatisticsVo"/>
        <where>  
            <if test="params.beginYear != null and params.beginYear != '' and params.endYear != null and params.endYear != ''"> and year between #{params.beginYear} and #{params.endYear}</if>
            <if test="params.beginMonth != null and params.beginMonth != '' and params.endMonth != null and params.endMonth != ''"> and month between #{params.beginMonth} and #{params.endMonth}</if>
            <if test="productionBase != null  and productionBase != ''"> and production_base like concat('%', #{productionBase}, '%')</if>
            <if test="pipingOrderRequirement != null "> and piping_order_requirement = #{pipingOrderRequirement}</if>
            <if test="gasOrderRequirement != null "> and gas_order_requirement = #{gasOrderRequirement}</if>
            <if test="pipingPredictionRequirement != null "> and piping_prediction_requirement = #{pipingPredictionRequirement}</if>
            <if test="gasPredictionRequirement != null "> and gas_prediction_requirement = #{gasPredictionRequirement}</if>
            <if test="reserveEmergencyOrderOutput != null "> and reserve_emergency_order_output = #{reserveEmergencyOrderOutput}</if>
            <if test="total != null "> and total = #{total}</if>
            <if test="days != null "> and days = #{days}</if>
            <if test="requirementDayWeldSeam != null "> and requirement_day_weld_seam = #{requirementDayWeldSeam}</if>
            <if test="productionDayWeldSeam != null "> and production_day_weld_seam = #{productionDayWeldSeam}</if>
            <if test="isSatisfy != null  and isSatisfy != ''"> and is_satisfy = #{isSatisfy}</if>
        </where>
    </select>
    
    <select id="selectApsWeldSeamStatisticsById" parameterType="String" resultMap="ApsWeldSeamStatisticsResult">
        <include refid="selectApsWeldSeamStatisticsVo"/>
        where id = #{id}
    </select>

    <insert id="insertApsWeldSeamStatistics" parameterType="ApsWeldSeamStatistics">
        insert into aps_weld_seam_statistics
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="year != null">year,</if>
            <if test="month != null">month,</if>
            <if test="productionBase != null">production_base,</if>
            <if test="pipingOrderRequirement != null">piping_order_requirement,</if>
            <if test="gasOrderRequirement != null">gas_order_requirement,</if>
            <if test="pipingPredictionRequirement != null">piping_prediction_requirement,</if>
            <if test="gasPredictionRequirement != null">gas_prediction_requirement,</if>
            <if test="reserveEmergencyOrderOutput != null">reserve_emergency_order_output,</if>
            <if test="total != null">total,</if>
            <if test="days != null">days,</if>
            <if test="requirementDayWeldSeam != null">requirement_day_weld_seam,</if>
            <if test="productionDayWeldSeam != null">production_day_weld_seam,</if>
            <if test="isSatisfy != null">is_satisfy,</if>
            <if test="delFlag != null">del_flag,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="year != null">#{year},</if>
            <if test="month != null">#{month},</if>
            <if test="productionBase != null">#{productionBase},</if>
            <if test="pipingOrderRequirement != null">#{pipingOrderRequirement},</if>
            <if test="gasOrderRequirement != null">#{gasOrderRequirement},</if>
            <if test="pipingPredictionRequirement != null">#{pipingPredictionRequirement},</if>
            <if test="gasPredictionRequirement != null">#{gasPredictionRequirement},</if>
            <if test="reserveEmergencyOrderOutput != null">#{reserveEmergencyOrderOutput},</if>
            <if test="total != null">#{total},</if>
            <if test="days != null">#{days},</if>
            <if test="requirementDayWeldSeam != null">#{requirementDayWeldSeam},</if>
            <if test="productionDayWeldSeam != null">#{productionDayWeldSeam},</if>
            <if test="isSatisfy != null">#{isSatisfy},</if>
            <if test="delFlag != null">#{delFlag},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
         </trim>
    </insert>

    <update id="updateApsWeldSeamStatistics" parameterType="ApsWeldSeamStatistics">
        update aps_weld_seam_statistics
        <trim prefix="SET" suffixOverrides=",">
            <if test="year != null">year = #{year},</if>
            <if test="month != null">month = #{month},</if>
            <if test="productionBase != null">production_base = #{productionBase},</if>
            <if test="pipingOrderRequirement != null">piping_order_requirement = #{pipingOrderRequirement},</if>
            <if test="gasOrderRequirement != null">gas_order_requirement = #{gasOrderRequirement},</if>
            <if test="pipingPredictionRequirement != null">piping_prediction_requirement = #{pipingPredictionRequirement},</if>
            <if test="gasPredictionRequirement != null">gas_prediction_requirement = #{gasPredictionRequirement},</if>
            <if test="reserveEmergencyOrderOutput != null">reserve_emergency_order_output = #{reserveEmergencyOrderOutput},</if>
            <if test="total != null">total = #{total},</if>
            <if test="days != null">days = #{days},</if>
            <if test="requirementDayWeldSeam != null">requirement_day_weld_seam = #{requirementDayWeldSeam},</if>
            <if test="productionDayWeldSeam != null">production_day_weld_seam = #{productionDayWeldSeam},</if>
            <if test="isSatisfy != null">is_satisfy = #{isSatisfy},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteApsWeldSeamStatisticsById" parameterType="String">
        delete from aps_weld_seam_statistics where id = #{id}
    </delete>

    <delete id="deleteApsWeldSeamStatisticsByIds" parameterType="String">
        delete from aps_weld_seam_statistics where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>