Merge branch 'bo_daily' into dev
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package app.module.core.config.application.util;
|
||||
|
||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
@@ -9,6 +10,8 @@ import java.text.DecimalFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
@Slf4j
|
||||
@@ -87,8 +90,7 @@ public class DailyUtil {
|
||||
* @return true=수정 가능, false=수정 불가
|
||||
*/
|
||||
public boolean isModifiable(LocalDate startDate, LocalDate endDate) {
|
||||
// TODO : 15일로 변경, 테스트를 위해 30일로 진행중
|
||||
LocalDate limitStart = LocalDate.now().minusDays(30);
|
||||
LocalDate limitStart = LocalDate.now().minusDays(15);
|
||||
log.debug("isModifiable @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
|
||||
|
||||
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate));
|
||||
@@ -101,8 +103,7 @@ public class DailyUtil {
|
||||
* @return
|
||||
*/
|
||||
public boolean isRegisterPossible(LocalDate startDate, LocalDate endDate) {
|
||||
// TODO : 15일로 변경, 테스트를 위해 60일로 진행중
|
||||
LocalDate limitStart = LocalDate.now().minusDays(60);
|
||||
LocalDate limitStart = LocalDate.now().minusDays(15);
|
||||
log.debug("isRegisterPossible @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
|
||||
|
||||
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate));
|
||||
@@ -128,4 +129,35 @@ public class DailyUtil {
|
||||
|
||||
return new DecimalFormat("###,###").format(Double.parseDouble(value));
|
||||
}
|
||||
|
||||
/**
|
||||
* 농업 생산물의 UI Code 데이터의 수입부호, 지출부호 조회
|
||||
*
|
||||
* @param uiCodeList UI Code 목록
|
||||
* @param targetCode 조회 코드
|
||||
* @return 수입부호, 지출부호 Map
|
||||
*/
|
||||
public HashMap<String, String> getMarkByFarming(List<UICodeElement> uiCodeList, String targetCode) {
|
||||
String incomeMark = null;
|
||||
String expenseMark = null;
|
||||
if (!"code.record.farming.self".equals(targetCode)) {
|
||||
String returnValue = null;
|
||||
for (UICodeElement codeSetup : uiCodeList) {
|
||||
if (codeSetup.getId().equalsIgnoreCase(targetCode)) {
|
||||
returnValue = codeSetup.getCodeValue();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (returnValue != null) {
|
||||
incomeMark = returnValue.split(",")[0];
|
||||
expenseMark = returnValue.split(",")[1];
|
||||
}
|
||||
}
|
||||
|
||||
HashMap<String, String> returnValue = new HashMap<>();
|
||||
returnValue.put("incomeMark", incomeMark);
|
||||
returnValue.put("expenseMark", expenseMark);
|
||||
return returnValue;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,4 +16,22 @@ public class DailyRecordConstants {
|
||||
* [정책] 외상판매 Y 일 경우 지출부호 91206 적재
|
||||
*/
|
||||
public static final String INCOME_EXPENSE_MARK = "91206";
|
||||
|
||||
/**
|
||||
* 지출의 유형
|
||||
* [정책] 2 고정
|
||||
*/
|
||||
public static final String EXPENSE_CATEGORY = "2";
|
||||
|
||||
/**
|
||||
* 지출의 수입부호
|
||||
* [정책] 외상판매 Y 일 경우 수입부호 52210 적재
|
||||
*/
|
||||
public static final String EXPENSE_INCOME_MARK = "52210";
|
||||
|
||||
/**
|
||||
* 임업생산물의 지출부호
|
||||
* [정책] 81011 고정
|
||||
*/
|
||||
public static final String FORESTRY_EXPENSE_MARK = "81011";
|
||||
}
|
||||
|
||||
@@ -152,7 +152,7 @@ VALUES
|
||||
('code.record.farming', 'code.record', '자가농업 생산물 중 자가소비량', NULL, NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||
('code.record.farming.11', 'code.record.farming', '쌀', '12111,81012', NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||
('code.record.farming.12', 'code.record.farming', '찹쌀', '12111,81012', NULL, true, 1, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||
('code.record.farming.13', 'code.record.farming', '보리', '12111,81012', NULL, true, 2, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||
('code.record.farming.13', 'code.record.farming', '보리', '12112,81012', NULL, true, 2, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||
('code.record.farming.14', 'code.record.farming', '콩', '12114,81012', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||
('code.record.farming.15', 'code.record.farming', '팥', '12114,81012', NULL, true, 4, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||
('code.record.farming.16', 'code.record.farming', '고구마', '12114,81012', NULL, true, 5, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false),
|
||||
|
||||
@@ -45,9 +45,9 @@ DROP TABLE IF EXISTS power_equipment_usage;
|
||||
DROP TABLE IF EXISTS work_input_time;
|
||||
DROP TABLE IF EXISTS work_input;
|
||||
DROP TABLE IF EXISTS monthly_carryover;
|
||||
DROP TABLE IF EXISTS bank_auto_transfer;
|
||||
DROP TABLE IF EXISTS income_expense_record;
|
||||
--DROP TABLE IF EXISTS daily_input_status;
|
||||
DROP TABLE IF EXISTS bank_auto_transfer;
|
||||
DROP TABLE IF EXISTS monthly_input_status;
|
||||
|
||||
-- admin
|
||||
@@ -103,9 +103,11 @@ DROP SEQUENCE IF EXISTS power_equipment_usage_seq;
|
||||
DROP SEQUENCE IF EXISTS work_input_time_seq;
|
||||
DROP SEQUENCE IF EXISTS work_input_seq;
|
||||
DROP SEQUENCE IF EXISTS monthly_carryover_seq;
|
||||
DROP SEQUENCE IF EXISTS bank_auto_transfer_seq;
|
||||
|
||||
DROP SEQUENCE IF EXISTS income_expense_record_seq;
|
||||
DROP SEQUENCE IF EXISTS daily_input_status_seq;
|
||||
|
||||
DROP SEQUENCE IF EXISTS bank_auto_transfer_seq;
|
||||
DROP SEQUENCE IF EXISTS monthly_input_status_seq;
|
||||
|
||||
DROP SEQUENCE IF EXISTS admin_seq;
|
||||
|
||||
@@ -1108,7 +1108,9 @@ CREATE TABLE monthly_input_status (
|
||||
household_seq bigint NOT NULL, -- 임가 일련번호 (FK)
|
||||
month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm)
|
||||
forest_product_status varchar(15), -- 임산물 현황 입력상태 (enum)
|
||||
bank_auto_transfer_status varchar(15), -- 은행 자동이체 내역 입력상태 (enum)
|
||||
bank_auto_transfer_input_status varchar(15),
|
||||
bank_auto_transfer_output_status varchar(15),
|
||||
-- 은행 자동이체 내역 입력상태 (enum)
|
||||
created_at timestamp(6), -- 생성일
|
||||
created_by varchar(255), -- 생성자
|
||||
updated_at timestamp(6), -- 수정일
|
||||
@@ -1119,8 +1121,8 @@ CREATE TABLE monthly_input_status (
|
||||
|
||||
CONSTRAINT monthly_input_status_pkey PRIMARY KEY (id),
|
||||
CONSTRAINT fk_monthly_input_status__household FOREIGN KEY (household_seq) REFERENCES household(seq),
|
||||
CONSTRAINT mis_forest_product_status CHECK (forest_product_status::text = ANY (ARRAY['NONE'::text, 'NOTHING'::text, 'REGISTERED'::text])),
|
||||
CONSTRAINT mis_bank_auto_transfer_status CHECK (bank_auto_transfer_status::text = ANY (ARRAY['NONE'::text, 'NOTHING'::text, 'REGISTERED'::text]))
|
||||
--CONSTRAINT mis_forest_product_status CHECK (forest_product_status::text = ANY (ARRAY['NONE'::text, 'NOTHING'::text, 'REGISTERED'::text])),
|
||||
--CONSTRAINT mis_bank_auto_transfer_status CHECK (bank_auto_transfer_status::text = ANY (ARRAY['NONE'::text, 'NOTHING'::text, 'REGISTERED'::text]))
|
||||
|
||||
);
|
||||
|
||||
@@ -1130,7 +1132,8 @@ COMMENT ON COLUMN monthly_input_status.id IS '일계부 작성상태 ID';
|
||||
COMMENT ON COLUMN monthly_input_status.household_seq IS '임가 일련번호';
|
||||
COMMENT ON COLUMN monthly_input_status.month IS '조사시행 월 (yyyy-mm)';
|
||||
COMMENT ON COLUMN monthly_input_status.forest_product_status IS '임산물 현황 입력상태';
|
||||
COMMENT ON COLUMN monthly_input_status.bank_auto_transfer_status IS '은행 자동이체 내역 입력상태';
|
||||
COMMENT ON COLUMN monthly_input_status.bank_auto_transfer_input_status IS '은행 자동이체 내역 입력상태';
|
||||
COMMENT ON COLUMN monthly_input_status.bank_auto_transfer_output_status IS '은행 자동이체 내역 입력상태';
|
||||
COMMENT ON COLUMN monthly_input_status.created_at IS '생성일';
|
||||
COMMENT ON COLUMN monthly_input_status.created_by IS '생성자';
|
||||
COMMENT ON COLUMN monthly_input_status.updated_at IS '수정일';
|
||||
|
||||
Reference in New Issue
Block a user