From d0405eabf3c9c3a2f84499ff6adcedac9ed906f1 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 07 Oct 2023 08:58:46 +0800
Subject: [PATCH] ci:添加原始天数
---
screen-api/src/main/java/com/moral/api/entity/AllocationExtension.java | 5 +++++
screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml | 5 +++--
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 38 ++++++++++++++++++++++++++++++++++++++
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 1 +
4 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/AllocationExtension.java b/screen-api/src/main/java/com/moral/api/entity/AllocationExtension.java
index b02f7d6..4c94855 100644
--- a/screen-api/src/main/java/com/moral/api/entity/AllocationExtension.java
+++ b/screen-api/src/main/java/com/moral/api/entity/AllocationExtension.java
@@ -38,6 +38,11 @@
private Integer extensionNum;
/**
+ * ���������������
+ */
+ private Integer extensionOldNum;
+
+ /**
* ������������
*/
private String remake;
diff --git a/screen-api/src/main/java/com/moral/api/service/AllocationService.java b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
index 51278e3..cb74d7c 100644
--- a/screen-api/src/main/java/com/moral/api/service/AllocationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
@@ -25,8 +25,17 @@
void updateAll(AllocationUpdateCond allocationUpdateCond);
+ /**
+ * ������������������ 0������ ������������������
+ * @return
+ */
List<Integer> unitResult();
+ /**
+ * ������������ ������������������������ 1������������������2���������������0������������
+ * ������������������������������
+ * @return
+ */
Integer unitAreaCode();
Map<String, Object> selectUnitView(Map<String,Object> map);
@@ -41,14 +50,38 @@
*/
AllocationExt extOne(Integer id);
+ /**
+ * ������������
+ * @param id
+ * @return
+ */
AllocationExt oneAllocation(Integer id);
+ /**
+ * ������
+ * @param changeCond
+ */
void changeAllocation(AllocationChangeCond changeCond);
+ /**
+ * ������
+ * @param checkCond
+ */
void checkAllocation(AllocationCheckCond checkCond);
+ /**
+ * ������
+ * @param id
+ * @return
+ */
boolean removeById(Integer id);
+ /**
+ * ������
+ * @param id
+ * @param invalidReason
+ * @return
+ */
boolean invalidResult (Integer id,String invalidReason);
/**
@@ -58,5 +91,10 @@
*/
List<AllocationListExt> extList(AllocationListCond allocationListCond);
+ /**
+ * ������������
+ * @param allocationExtensionAddCond
+ * @return
+ */
boolean applyFor (AllocationExtensionAddCond allocationExtensionAddCond);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index d58c404..7a8b8f9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -602,6 +602,7 @@
}
AllocationExtension allocationExtension = allocationExtensionAddCond.convert();
allocationExtension.setState(AllocationExtensionApproveEnum.APPLYING.value);
+ allocationExtension.setExtensionOldNum(allocationExt.getChangeDay());
allocationExtensionService.save(allocationExtension);
fileTableService.upDateResult(allocationExtensionAddCond.getFileList(),allocationExtension.getId(), FileTableEnum.ALLOCATION_EXTENSION.value);
return true;
diff --git a/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
index 52ab9ae..d20106c 100644
--- a/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
@@ -7,6 +7,7 @@
<id column="id" property="id" />
<result column="allocation_id" property="allocationId" />
<result column="extension_num" property="extensionNum" />
+ <result column="extension_old_num" property="extensionOldNum" />
<result column="remake" property="remake" />
<result column="state" property="state" />
<result column="invalid_reason" property="invalidReason" />
@@ -14,12 +15,12 @@
<!-- ��������������������� -->
<sql id="Base_Column_List">
- id, allocation_id, extension_num, remake, state, is_del, is_invalid, invalid_reason, create_id, create_name, create_time, update_id, update_name, update_time
+ id, allocation_id, extension_num, remake, state, is_del, is_invalid, invalid_reason, create_id, create_name, create_time, update_id, update_name, update_time,extension_old_num
</sql>
<!-- ��������������������� -->
<sql id="AllocationExtension_Column_List">
- allocationextension.id, allocationextension.allocation_id, allocationextension.extension_num, allocationextension.remake, allocationextension.state, allocationextension.is_del, allocationextension.is_invalid, allocationextension.invalid_reason, allocationextension.create_id, allocationextension.create_name, allocationextension.create_time, allocationextension.update_id, allocationextension.update_name, allocationextension.update_time
+ allocationextension.id, allocationextension.allocation_id, allocationextension.extension_num, allocationextension.remake, allocationextension.state, allocationextension.is_del, allocationextension.is_invalid, allocationextension.invalid_reason, allocationextension.create_id, allocationextension.create_name, allocationextension.create_time, allocationextension.update_id, allocationextension.update_name, allocationextension.update_time,allocationextension.extension_old_num
</sql>
--
Gitblit v1.8.0