From 66635aefcff1aa3d9e6cd6210773752414184f14 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 21 四月 2025 17:27:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProfessionalFixedCycleManagement.java | 133 +++++++++++++
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProfessionalFixedCycleManagementController.java | 105 ++++++++++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java | 7
aps-modules/aps-core/src/main/resources/mapper/core/ApsProfessionalFixedCycleManagementMapper.xml | 94 +++++++++
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProfessionalFixedCycleManagementMapper.java | 63 ++++++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialStorageManagement.java | 7
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProfessionalFixedCycleManagementService.java | 61 ++++++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProfessionalFixedCycleManagementServiceImpl.java | 96 +++++++++
8 files changed, 560 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProfessionalFixedCycleManagementController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProfessionalFixedCycleManagementController.java
new file mode 100644
index 0000000..55bdf25
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProfessionalFixedCycleManagementController.java
@@ -0,0 +1,105 @@
+package com.aps.core.controller.basicData;
+
+import com.aps.core.domain.ApsProfessionalFixedCycleManagement;
+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.service.IApsProfessionalFixedCycleManagementService;
+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;
+
+import java.util.List;
+
+/**
+ * 涓撲笟鍥哄畾鍛ㄦ湡绠$悊Controller
+ *
+ * @author ruoyi
+ * @date 2025-04-21
+ */
+@RestController
+@RequestMapping("/professionalFixedCycleManagement")
+public class ApsProfessionalFixedCycleManagementController extends BaseController
+{
+ @Autowired
+ private IApsProfessionalFixedCycleManagementService apsProfessionalFixedCycleManagementService;
+
+ /**
+ * 鏌ヨ涓撲笟鍥哄畾鍛ㄦ湡绠$悊鍒楄〃
+ */
+ @RequiresPermissions("professionalFixedCycleManagement:professionalFixedCycleManagement:list")
+ @GetMapping("/list")
+ public TableDataInfo list(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
+ {
+ startPage();
+ List<ApsProfessionalFixedCycleManagement> list = apsProfessionalFixedCycleManagementService.selectApsProfessionalFixedCycleManagementList(apsProfessionalFixedCycleManagement);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭涓撲笟鍥哄畾鍛ㄦ湡绠$悊鍒楄〃
+ */
+ @RequiresPermissions("professionalFixedCycleManagement:professionalFixedCycleManagement:export")
+ @Log(title = "涓撲笟鍥哄畾鍛ㄦ湡绠$悊", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
+ {
+ List<ApsProfessionalFixedCycleManagement> list = apsProfessionalFixedCycleManagementService.selectApsProfessionalFixedCycleManagementList(apsProfessionalFixedCycleManagement);
+ ExcelUtil<ApsProfessionalFixedCycleManagement> util = new ExcelUtil<ApsProfessionalFixedCycleManagement>(ApsProfessionalFixedCycleManagement.class);
+ util.exportExcel(response, list, "涓撲笟鍥哄畾鍛ㄦ湡绠$悊鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇涓撲笟鍥哄畾鍛ㄦ湡绠$悊璇︾粏淇℃伅
+ */
+ @RequiresPermissions("professionalFixedCycleManagement:professionalFixedCycleManagement:query")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id)
+ {
+ return success(apsProfessionalFixedCycleManagementService.selectApsProfessionalFixedCycleManagementById(id));
+ }
+
+ /**
+ * 鏂板涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ */
+ @RequiresPermissions("professionalFixedCycleManagement:professionalFixedCycleManagement:add")
+ @Log(title = "涓撲笟鍥哄畾鍛ㄦ湡绠$悊", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
+ {
+ return toAjax(apsProfessionalFixedCycleManagementService.insertApsProfessionalFixedCycleManagement(apsProfessionalFixedCycleManagement));
+ }
+
+ /**
+ * 淇敼涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ */
+ @RequiresPermissions("professionalFixedCycleManagement:professionalFixedCycleManagement:edit")
+ @Log(title = "涓撲笟鍥哄畾鍛ㄦ湡绠$悊", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
+ {
+ return toAjax(apsProfessionalFixedCycleManagementService.updateApsProfessionalFixedCycleManagement(apsProfessionalFixedCycleManagement));
+ }
+
+ /**
+ * 鍒犻櫎涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ */
+ @RequiresPermissions("professionalFixedCycleManagement:professionalFixedCycleManagement:remove")
+ @Log(title = "涓撲笟鍥哄畾鍛ㄦ湡绠$悊", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids)
+ {
+ return toAjax(apsProfessionalFixedCycleManagementService.deleteApsProfessionalFixedCycleManagementByIds(ids));
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java
index 8edb675..e97a48c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java
@@ -1,5 +1,6 @@
package com.aps.core.domain;
+import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -50,7 +51,7 @@
/** 鏈�鏃╁彲鎻愬墠鐢熶骇澶╂暟 */
@Excel(name = "鏈�鏃╁彲鎻愬墠鐢熶骇澶╂暟")
- private String advanceProductionDays;
+ private BigDecimal advanceProductionDays;
/** 鎷嗗垎鎵归噺 */
@Excel(name = "鎷嗗垎鎵归噺")
@@ -163,12 +164,12 @@
return versionNumber;
}
- public void setAdvanceProductionDays(String advanceProductionDays)
+ public void setAdvanceProductionDays(BigDecimal advanceProductionDays)
{
this.advanceProductionDays = advanceProductionDays;
}
- public String getAdvanceProductionDays()
+ public BigDecimal getAdvanceProductionDays()
{
return advanceProductionDays;
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialStorageManagement.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialStorageManagement.java
index 5f2693d..7e247ae 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialStorageManagement.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialStorageManagement.java
@@ -1,5 +1,6 @@
package com.aps.core.domain;
+import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -26,7 +27,7 @@
/** 鏁伴噺 */
@Excel(name = "鏁伴噺")
- private Long num;
+ private BigDecimal num;
/** 閫傜敤宸ュ巶 */
@Excel(name = "閫傜敤宸ュ巶")
@@ -61,12 +62,12 @@
return itemNumber;
}
- public void setNum(Long num)
+ public void setNum(BigDecimal num)
{
this.num = num;
}
- public Long getNum()
+ public BigDecimal getNum()
{
return num;
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProfessionalFixedCycleManagement.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProfessionalFixedCycleManagement.java
new file mode 100644
index 0000000..ea7a880
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProfessionalFixedCycleManagement.java
@@ -0,0 +1,133 @@
+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;
+
+import java.util.Date;
+
+/**
+ * 涓撲笟鍥哄畾鍛ㄦ湡绠$悊瀵硅薄 aps_professional_fixed_cycle_management
+ *
+ * @author ruoyi
+ * @date 2025-04-21
+ */
+public class ApsProfessionalFixedCycleManagement extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** id */
+ private String id;
+
+ /** 鏂欏彿 */
+ @Excel(name = "鏂欏彿")
+ private String itemNumber;
+
+ /** 涓撲笟鎻忚堪 */
+ @Excel(name = "涓撲笟鎻忚堪")
+ private String professionalDescription;
+
+ /** 涓撲笟 */
+ @Excel(name = "涓撲笟")
+ private String professional;
+
+ /** 涓撲笟鍥哄畾鍛ㄦ湡 */
+ @Excel(name = "涓撲笟鍥哄畾鍛ㄦ湡")
+ private String professionalFixedCycle;
+
+ /** 闆嗘垚鏃ユ湡 */
+ @Excel(name = "闆嗘垚鏃ユ湡")
+ private Date integrationDate;
+
+ /** 閫傜敤宸ュ巶 */
+ @Excel(name = "閫傜敤宸ュ巶")
+ private String applicableFactories;
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setItemNumber(String itemNumber)
+ {
+ this.itemNumber = itemNumber;
+ }
+
+ public String getItemNumber()
+ {
+ return itemNumber;
+ }
+
+ public void setProfessionalDescription(String professionalDescription)
+ {
+ this.professionalDescription = professionalDescription;
+ }
+
+ public String getProfessionalDescription()
+ {
+ return professionalDescription;
+ }
+
+ public void setProfessional(String professional)
+ {
+ this.professional = professional;
+ }
+
+ public String getProfessional()
+ {
+ return professional;
+ }
+
+ public void setProfessionalFixedCycle(String professionalFixedCycle)
+ {
+ this.professionalFixedCycle = professionalFixedCycle;
+ }
+
+ public String getProfessionalFixedCycle()
+ {
+ return professionalFixedCycle;
+ }
+
+ public void setIntegrationDate(Date integrationDate)
+ {
+ this.integrationDate = integrationDate;
+ }
+
+ public Date getIntegrationDate()
+ {
+ return integrationDate;
+ }
+
+ public void setApplicableFactories(String applicableFactories)
+ {
+ this.applicableFactories = applicableFactories;
+ }
+
+ public String getApplicableFactories()
+ {
+ return applicableFactories;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("itemNumber", getItemNumber())
+ .append("professionalDescription", getProfessionalDescription())
+ .append("professional", getProfessional())
+ .append("professionalFixedCycle", getProfessionalFixedCycle())
+ .append("integrationDate", getIntegrationDate())
+ .append("applicableFactories", getApplicableFactories())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .toString();
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProfessionalFixedCycleManagementMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProfessionalFixedCycleManagementMapper.java
new file mode 100644
index 0000000..3bdafb8
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProfessionalFixedCycleManagementMapper.java
@@ -0,0 +1,63 @@
+package com.aps.core.mapper;
+
+import java.util.List;
+import com.aps.core.domain.ApsProfessionalFixedCycleManagement;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 涓撲笟鍥哄畾鍛ㄦ湡绠$悊Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2025-04-21
+ */
+@Mapper
+public interface ApsProfessionalFixedCycleManagementMapper
+{
+ /**
+ * 鏌ヨ涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ *
+ * @param id 涓撲笟鍥哄畾鍛ㄦ湡绠$悊涓婚敭
+ * @return 涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ */
+ public ApsProfessionalFixedCycleManagement selectApsProfessionalFixedCycleManagementById(String id);
+
+ /**
+ * 鏌ヨ涓撲笟鍥哄畾鍛ㄦ湡绠$悊鍒楄〃
+ *
+ * @param apsProfessionalFixedCycleManagement 涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ * @return 涓撲笟鍥哄畾鍛ㄦ湡绠$悊闆嗗悎
+ */
+ public List<ApsProfessionalFixedCycleManagement> selectApsProfessionalFixedCycleManagementList(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement);
+
+ /**
+ * 鏂板涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ *
+ * @param apsProfessionalFixedCycleManagement 涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ * @return 缁撴灉
+ */
+ public int insertApsProfessionalFixedCycleManagement(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement);
+
+ /**
+ * 淇敼涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ *
+ * @param apsProfessionalFixedCycleManagement 涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ * @return 缁撴灉
+ */
+ public int updateApsProfessionalFixedCycleManagement(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement);
+
+ /**
+ * 鍒犻櫎涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ *
+ * @param id 涓撲笟鍥哄畾鍛ㄦ湡绠$悊涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsProfessionalFixedCycleManagementById(String id);
+
+ /**
+ * 鎵归噺鍒犻櫎涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsProfessionalFixedCycleManagementByIds(String[] ids);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProfessionalFixedCycleManagementService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProfessionalFixedCycleManagementService.java
new file mode 100644
index 0000000..f45dc16
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProfessionalFixedCycleManagementService.java
@@ -0,0 +1,61 @@
+package com.aps.core.service;
+
+import java.util.List;
+import com.aps.core.domain.ApsProfessionalFixedCycleManagement;
+
+/**
+ * 涓撲笟鍥哄畾鍛ㄦ湡绠$悊Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2025-04-21
+ */
+public interface IApsProfessionalFixedCycleManagementService
+{
+ /**
+ * 鏌ヨ涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ *
+ * @param id 涓撲笟鍥哄畾鍛ㄦ湡绠$悊涓婚敭
+ * @return 涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ */
+ public ApsProfessionalFixedCycleManagement selectApsProfessionalFixedCycleManagementById(String id);
+
+ /**
+ * 鏌ヨ涓撲笟鍥哄畾鍛ㄦ湡绠$悊鍒楄〃
+ *
+ * @param apsProfessionalFixedCycleManagement 涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ * @return 涓撲笟鍥哄畾鍛ㄦ湡绠$悊闆嗗悎
+ */
+ public List<ApsProfessionalFixedCycleManagement> selectApsProfessionalFixedCycleManagementList(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement);
+
+ /**
+ * 鏂板涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ *
+ * @param apsProfessionalFixedCycleManagement 涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ * @return 缁撴灉
+ */
+ public int insertApsProfessionalFixedCycleManagement(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement);
+
+ /**
+ * 淇敼涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ *
+ * @param apsProfessionalFixedCycleManagement 涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ * @return 缁撴灉
+ */
+ public int updateApsProfessionalFixedCycleManagement(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement);
+
+ /**
+ * 鎵归噺鍒犻櫎涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑涓撲笟鍥哄畾鍛ㄦ湡绠$悊涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsProfessionalFixedCycleManagementByIds(String[] ids);
+
+ /**
+ * 鍒犻櫎涓撲笟鍥哄畾鍛ㄦ湡绠$悊淇℃伅
+ *
+ * @param id 涓撲笟鍥哄畾鍛ㄦ湡绠$悊涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsProfessionalFixedCycleManagementById(String id);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProfessionalFixedCycleManagementServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProfessionalFixedCycleManagementServiceImpl.java
new file mode 100644
index 0000000..61c7d33
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProfessionalFixedCycleManagementServiceImpl.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.ApsProfessionalFixedCycleManagementMapper;
+import com.aps.core.domain.ApsProfessionalFixedCycleManagement;
+import com.aps.core.service.IApsProfessionalFixedCycleManagementService;
+
+/**
+ * 涓撲笟鍥哄畾鍛ㄦ湡绠$悊Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2025-04-21
+ */
+@Service
+public class ApsProfessionalFixedCycleManagementServiceImpl implements IApsProfessionalFixedCycleManagementService
+{
+ @Autowired
+ private ApsProfessionalFixedCycleManagementMapper apsProfessionalFixedCycleManagementMapper;
+
+ /**
+ * 鏌ヨ涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ *
+ * @param id 涓撲笟鍥哄畾鍛ㄦ湡绠$悊涓婚敭
+ * @return 涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ */
+ @Override
+ public ApsProfessionalFixedCycleManagement selectApsProfessionalFixedCycleManagementById(String id)
+ {
+ return apsProfessionalFixedCycleManagementMapper.selectApsProfessionalFixedCycleManagementById(id);
+ }
+
+ /**
+ * 鏌ヨ涓撲笟鍥哄畾鍛ㄦ湡绠$悊鍒楄〃
+ *
+ * @param apsProfessionalFixedCycleManagement 涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ * @return 涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ */
+ @Override
+ public List<ApsProfessionalFixedCycleManagement> selectApsProfessionalFixedCycleManagementList(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
+ {
+ return apsProfessionalFixedCycleManagementMapper.selectApsProfessionalFixedCycleManagementList(apsProfessionalFixedCycleManagement);
+ }
+
+ /**
+ * 鏂板涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ *
+ * @param apsProfessionalFixedCycleManagement 涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertApsProfessionalFixedCycleManagement(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
+ {
+ apsProfessionalFixedCycleManagement.setCreateTime(DateUtils.getNowDate());
+ return apsProfessionalFixedCycleManagementMapper.insertApsProfessionalFixedCycleManagement(apsProfessionalFixedCycleManagement);
+ }
+
+ /**
+ * 淇敼涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ *
+ * @param apsProfessionalFixedCycleManagement 涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateApsProfessionalFixedCycleManagement(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
+ {
+ apsProfessionalFixedCycleManagement.setUpdateTime(DateUtils.getNowDate());
+ return apsProfessionalFixedCycleManagementMapper.updateApsProfessionalFixedCycleManagement(apsProfessionalFixedCycleManagement);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎涓撲笟鍥哄畾鍛ㄦ湡绠$悊
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑涓撲笟鍥哄畾鍛ㄦ湡绠$悊涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsProfessionalFixedCycleManagementByIds(String[] ids)
+ {
+ return apsProfessionalFixedCycleManagementMapper.deleteApsProfessionalFixedCycleManagementByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎涓撲笟鍥哄畾鍛ㄦ湡绠$悊淇℃伅
+ *
+ * @param id 涓撲笟鍥哄畾鍛ㄦ湡绠$悊涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsProfessionalFixedCycleManagementById(String id)
+ {
+ return apsProfessionalFixedCycleManagementMapper.deleteApsProfessionalFixedCycleManagementById(id);
+ }
+}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsProfessionalFixedCycleManagementMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsProfessionalFixedCycleManagementMapper.xml
new file mode 100644
index 0000000..3da6a4d
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsProfessionalFixedCycleManagementMapper.xml
@@ -0,0 +1,94 @@
+<?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.ApsProfessionalFixedCycleManagementMapper">
+
+ <resultMap type="ApsProfessionalFixedCycleManagement" id="ApsProfessionalFixedCycleManagementResult">
+ <result property="id" column="id" />
+ <result property="itemNumber" column="item_number" />
+ <result property="professionalDescription" column="professional_description" />
+ <result property="professional" column="professional" />
+ <result property="professionalFixedCycle" column="professional_fixed_cycle" />
+ <result property="integrationDate" column="integration_date" />
+ <result property="applicableFactories" column="applicable_factories" />
+ <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="selectApsProfessionalFixedCycleManagementVo">
+ select id, item_number, professional_description, professional, professional_fixed_cycle, integration_date, applicable_factories, create_by, create_time, update_by, update_time from aps_professional_fixed_cycle_management
+ </sql>
+
+ <select id="selectApsProfessionalFixedCycleManagementList" parameterType="ApsProfessionalFixedCycleManagement" resultMap="ApsProfessionalFixedCycleManagementResult">
+ <include refid="selectApsProfessionalFixedCycleManagementVo"/>
+ <where>
+ <if test="itemNumber != null and itemNumber != ''"> and item_number = #{itemNumber}</if>
+ </where>
+ </select>
+
+ <select id="selectApsProfessionalFixedCycleManagementById" parameterType="String" resultMap="ApsProfessionalFixedCycleManagementResult">
+ <include refid="selectApsProfessionalFixedCycleManagementVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertApsProfessionalFixedCycleManagement" parameterType="ApsProfessionalFixedCycleManagement">
+ insert into aps_professional_fixed_cycle_management
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="itemNumber != null">item_number,</if>
+ <if test="professionalDescription != null">professional_description,</if>
+ <if test="professional != null">professional,</if>
+ <if test="professionalFixedCycle != null">professional_fixed_cycle,</if>
+ <if test="integrationDate != null">integration_date,</if>
+ <if test="applicableFactories != null">applicable_factories,</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="itemNumber != null">#{itemNumber},</if>
+ <if test="professionalDescription != null">#{professionalDescription},</if>
+ <if test="professional != null">#{professional},</if>
+ <if test="professionalFixedCycle != null">#{professionalFixedCycle},</if>
+ <if test="integrationDate != null">#{integrationDate},</if>
+ <if test="applicableFactories != null">#{applicableFactories},</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="updateApsProfessionalFixedCycleManagement" parameterType="ApsProfessionalFixedCycleManagement">
+ update aps_professional_fixed_cycle_management
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="itemNumber != null">item_number = #{itemNumber},</if>
+ <if test="professionalDescription != null">professional_description = #{professionalDescription},</if>
+ <if test="professional != null">professional = #{professional},</if>
+ <if test="professionalFixedCycle != null">professional_fixed_cycle = #{professionalFixedCycle},</if>
+ <if test="integrationDate != null">integration_date = #{integrationDate},</if>
+ <if test="applicableFactories != null">applicable_factories = #{applicableFactories},</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="deleteApsProfessionalFixedCycleManagementById" parameterType="String">
+ delete from aps_professional_fixed_cycle_management where id = #{id}
+ </delete>
+
+ <delete id="deleteApsProfessionalFixedCycleManagementByIds" parameterType="String">
+ delete from aps_professional_fixed_cycle_management where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3