Merge branch 'bo_household' into 'dev'

[BO] 임가현황 등록 필드 추가, 임가 등록 시 월별 입력상태 fn_monthly_input_status() 실행

See merge request korea-research/korea-research!81
This commit is contained in:
이강선 매니저/ST
2025-07-04 07:42:07 +00:00
22 changed files with 226 additions and 45 deletions

View File

@@ -36,10 +36,9 @@
<if test="industryDetail != null and industryDetail != ''">
industry_detail,
</if>
<!-- <if test="employmentCode != null or employmentCode != ''">-->
<!-- employment_code,-->
<!-- </if>-->
is_panel,
usage_type,
employment_type,
<if test="memo != null and memo != ''">
memo,
</if>
@@ -70,10 +69,9 @@
<if test="industryDetail != null and industryDetail != ''">
#{industryDetail},
</if>
<!-- <if test="employmentCode != null or employmentCode != ''">-->
<!-- #{employmentCode},-->
<!-- </if>-->
#{isPanel},
#{usageType},
#{employmentType},
<if test="memo != null and memo != ''">
#{memo},
</if>

View File

@@ -27,6 +27,8 @@
h.industry_sub_middle AS industrySubMiddleName,
h.industry_detail AS industryDetailName,
h.is_panel AS isPanel,
h.usage_type AS usageType,
h.employment_type AS employmentType,
h.memo AS memo,
r.admin_seq AS researcherSeq,
r.researcher_name AS researcherName,

View File

@@ -31,6 +31,12 @@
industry_detail = #{industryDetail},
</if>
is_panel = #{isPanel},
<if test="usageType != null and usageType != ''">
usage_type = #{usageType},
</if>
<if test="employmentType != null and employmentType != ''">
employment_type = #{employmentType},
</if>
<if test="memo != null and memo != ''">
memo = #{memo},
</if>