复制接口增加专业参数

sfd

2025-05-22 b97d997812695c811132ed23a64b3132c5be7123

复制接口增加专业参数

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java

@@ -109,11 +109,12 @@
            // 格式：yyyy-MM
            @RequestParam String date,
            @RequestParam String factory,
            @RequestParam String major,
            // 格式：yyyy-MM
            @RequestParam String toStart,
            // 格式：yyyy-MM
            @RequestParam String toEnd) {
        apsGasPipelineCapacityPlanService.copyPlan(date, factory, toStart, toEnd);
        apsGasPipelineCapacityPlanService.copyPlan(date, factory, major, toStart, toEnd);
        return success();
    }


 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelineMoController.java

@@ -137,6 +137,7 @@
        byte[] file = IOUtils.resourceToByteArray("/templates/气体工单数据模板v1.0.xlsx");
        ByteArrayResource resource = new ByteArrayResource(file);
        return ResponseEntity.ok()
                .header("Access-Control-Expose-Headers", HttpHeaders.CONTENT_DISPOSITION)
                .header(HttpHeaders.CONTENT_DISPOSITION,
                        String.format("attachment;filename=%s", URLEncoder.encode("气体工单数据模板.xlsx", StandardCharsets.UTF_8)))
                .header(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")

 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelinePredictionController.java

@@ -77,6 +77,7 @@
        byte[] file = IOUtils.resourceToByteArray("/templates/气体预测数据模板v1.0.xlsx");
        ByteArrayResource resource = new ByteArrayResource(file);
        return ResponseEntity.ok()
                .header("Access-Control-Expose-Headers", HttpHeaders.CONTENT_DISPOSITION)
                .header(HttpHeaders.CONTENT_DISPOSITION,
                        String.format("attachment;filename=%s", URLEncoder.encode("气体预测数据模板.xlsx", StandardCharsets.UTF_8)))
                .header(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")

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

@@ -62,5 +62,5 @@
     */
    public int deleteApsGasPipelineCapacityPlanByIds(Long[] ids);

    void deleteByDateAndFactory(String year, String month, String factory);
    void deleteByDateAndFactory(String year, String month, String factory, String major);
}

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

@@ -60,5 +60,5 @@
     */
    public int deleteApsGasPipelineCapacityPlanById(Long id);

    void copyPlan(String date, String factory, String toStart, String toEnd);
    void copyPlan(String date, String factory, String major, String toStart, String toEnd);
}

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

@@ -101,7 +101,7 @@
    @SneakyThrows
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void copyPlan(String date, String factory, String toStart, String toEnd) {
    public void copyPlan(String date, String factory, String major, String toStart, String toEnd) {

        String[] dtSrc = date.split("-");
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
@@ -116,6 +116,7 @@
        plan.setYear(Integer.valueOf(dtSrc[0]).toString());
        plan.setMonth(Integer.valueOf(dtSrc[1]).toString());
        plan.setOrgCode(factory);
        plan.setMajor(major);
        List<ApsGasPipelineCapacityPlan> templatePlans = apsGasPipelineCapacityPlanMapper.selectApsGasPipelineCapacityPlanList(plan);
        while (dtStart.before(dtEnd)) {
            String year = dtStart.get(Calendar.YEAR) + "";
@@ -123,7 +124,8 @@
            apsGasPipelineCapacityPlanMapper.deleteByDateAndFactory(
                    year,
                    month,
                    factory
                    factory,
                    major
            );
            templatePlans.forEach(p -> {
                p.setYear(year);

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

@@ -139,5 +139,6 @@
               where year = #{year}
                   and month = #{month}
                   and org_code = #{factory}
                   and major = #{major}
    </delete>
</mapper>