mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去掉ABCD

master
ZhangYP 2024-03-04 17:06:32 +08:00
parent 600ad2a773
commit 01e4db1415
12 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/cn/palmte/work/bean/UnderwrittenModeEnum.java
View File

@ -5,10 +5,10 @@ package cn.palmte.work.bean;
*/ */
public enum UnderwrittenModeEnum { public enum UnderwrittenModeEnum {
PLAN_O(-1,""), PLAN_O(-1,""),
PLAN_A(1,"A类-不垫资"), PLAN_A(1,"不垫资"),
// PLAN_B(2,"B类-不垫资（背靠背）"), // PLAN_B(2,"不垫资（背靠背）"),
PLAN_C(3,"B类-垫资（账期覆盖）"), PLAN_C(3,"垫资（账期覆盖）"),
PLAN_D(4,"C类-垫资（账期不覆盖）"); PLAN_D(4,"垫资（账期不覆盖）");
private int underwrittenMode; private int underwrittenMode;
private String underwrittenModeStr; private String underwrittenModeStr;

2
src/main/java/cn/palmte/work/model/Project.java
View File

@ -93,7 +93,7 @@ public class Project {
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date endDate; private Date endDate;
/** /**
* 垫资模式：1A类-不垫资（战略合作），2B类-不垫资（背靠背），3C类-垫资（账期覆盖），4D类-垫资（账期不覆盖） * 垫资模式：1不垫资（战略合作），2不垫资（背靠背），3垫资（账期覆盖），4垫资（账期不覆盖）
*/ */
@Column(name = "underwritten_mode") @Column(name = "underwritten_mode")
private int underwrittenMode; private int underwrittenMode;

2
src/main/java/cn/palmte/work/model/ProjectBudget.java
View File

@ -72,7 +72,7 @@ public class ProjectBudget {
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date endDateBudget; private Date endDateBudget;
/** /**
* 垫资模式：1A类-不垫资（战略合作），2B类-不垫资（背靠背），3C类-垫资（账期覆盖），4D类-垫资（账期不覆盖） * 垫资模式：1不垫资（战略合作），2不垫资（背靠背），3垫资（账期覆盖），4垫资（账期不覆盖）
*/ */
@Column(name = "underwritten_mode_budget") @Column(name = "underwritten_mode_budget")
private int underwrittenModeBudget; private int underwrittenModeBudget;

1
src/main/java/cn/palmte/work/service/ProjectService.java
View File

@ -1009,6 +1009,7 @@ public class ProjectService {
project.setSaleStage(saleStage); project.setSaleStage(saleStage);
project.setStageRemark(stageRemark); project.setStageRemark(stageRemark);
project.setNextPlan(nextPlan); project.setNextPlan(nextPlan);
project.setLastUpdateTime(new Date());
projectRepository.saveAndFlush(project); projectRepository.saveAndFlush(project);
return ResponseMsg.buildSuccessMsg("保存成功"); return ResponseMsg.buildSuccessMsg("保存成功");
} }

2
src/main/resources/sql/fourcal-purge.sql
View File

@ -5570,7 +5570,7 @@ CREATE TABLE `project` (
`dept_name` varchar(255) DEFAULT NULL COMMENT '部门名称', `dept_name` varchar(255) DEFAULT NULL COMMENT '部门名称',
`start_date` datetime NOT NULL COMMENT '项目开始时间，精确到月', `start_date` datetime NOT NULL COMMENT '项目开始时间，精确到月',
`end_date` datetime NOT NULL COMMENT '项目结束时间，精确到月', `end_date` datetime NOT NULL COMMENT '项目结束时间，精确到月',
`underwritten_mode` int(11) NOT NULL COMMENT '垫资模式：1A类-不垫资（战略合作），2B类-不垫资（背靠背），3C类-垫资（账期覆盖），4D类-垫资（账期不覆盖）', `underwritten_mode` int(11) NOT NULL COMMENT '垫资模式：1不垫资（战略合作），2不垫资（背靠背），3垫资（账期覆盖），4垫资（账期不覆盖）',
`customer` varchar(255) NOT NULL COMMENT '客户名称', `customer` varchar(255) NOT NULL COMMENT '客户名称',
`terminal_customer` varchar(255) NOT NULL COMMENT '最终用户名称', `terminal_customer` varchar(255) NOT NULL COMMENT '最终用户名称',
`advance_interest_amount` decimal(16,2) NOT NULL COMMENT '垫资利息（元为单位）', `advance_interest_amount` decimal(16,2) NOT NULL COMMENT '垫资利息（元为单位）',

2
src/main/resources/sql/fourcal.sql
View File

@ -7577,7 +7577,7 @@ CREATE TABLE `project` (
`dept_name` varchar(255) DEFAULT NULL COMMENT '部门名称', `dept_name` varchar(255) DEFAULT NULL COMMENT '部门名称',
`start_date` datetime NOT NULL COMMENT '项目开始时间，精确到月', `start_date` datetime NOT NULL COMMENT '项目开始时间，精确到月',
`end_date` datetime NOT NULL COMMENT '项目结束时间，精确到月', `end_date` datetime NOT NULL COMMENT '项目结束时间，精确到月',
`underwritten_mode` int(11) NOT NULL COMMENT '垫资模式：1A类-不垫资（战略合作），2B类-不垫资（背靠背），3C类-垫资（账期覆盖），4D类-垫资（账期不覆盖）', `underwritten_mode` int(11) NOT NULL COMMENT '垫资模式：1不垫资（战略合作），2不垫资（背靠背），3垫资（账期覆盖），4垫资（账期不覆盖）',
`customer` varchar(255) NOT NULL COMMENT '客户名称', `customer` varchar(255) NOT NULL COMMENT '客户名称',
`terminal_customer` varchar(255) NOT NULL COMMENT '最终用户名称', `terminal_customer` varchar(255) NOT NULL COMMENT '最终用户名称',
`advance_interest_amount` decimal(16,2) NOT NULL COMMENT '垫资利息（元为单位）', `advance_interest_amount` decimal(16,2) NOT NULL COMMENT '垫资利息（元为单位）',

12
src/main/resources/templates/admin/project_approve.ftl
View File

@ -240,11 +240,11 @@
<td class="table-title" <#if project.underwrittenMode! <= 2> colspan="5" <#else> colspan="1" </#if> > <td class="table-title" <#if project.underwrittenMode! <= 2> colspan="5" <#else> colspan="1" </#if> >
<#if project.underwrittenMode??> <#if project.underwrittenMode??>
<#if (project.underwrittenMode) =1> <#if (project.underwrittenMode) =1>
<input readonly value="A类-不垫资"/> <input readonly value="不垫资"/>
<#elseif (project.underwrittenMode) =3> <#elseif (project.underwrittenMode) =3>
<input readonly value="B类-垫资（账期覆盖）"/> <input readonly value="垫资（账期覆盖）"/>
<#elseif (project.underwrittenMode) =4> <#elseif (project.underwrittenMode) =4>
<input readonly value="C类-垫资（账期不覆盖）"/> <input readonly value="垫资（账期不覆盖）"/>
</#if> </#if>
<#else> <#else>
<input readonly value=""/> <input readonly value=""/>
@ -561,11 +561,11 @@
<td class="table-title" colspan="1" > <td class="table-title" colspan="1" >
<#if projectBudget.underwrittenModeBudget??> <#if projectBudget.underwrittenModeBudget??>
<#if (projectBudget.underwrittenModeBudget) =1> <#if (projectBudget.underwrittenModeBudget) =1>
<input readonly value="A类-不垫资"/> <input readonly value="不垫资"/>
<#elseif (projectBudget.underwrittenModeBudget) =3> <#elseif (projectBudget.underwrittenModeBudget) =3>
<input readonly value="B类-垫资（账期覆盖）"/> <input readonly value="垫资（账期覆盖）"/>
<#elseif (projectBudget.underwrittenModeBudget) =4> <#elseif (projectBudget.underwrittenModeBudget) =4>
<input readonly value="C类-垫资（账期不覆盖）"/> <input readonly value="垫资（账期不覆盖）"/>
</#if> </#if>
<#else> <#else>
<input readonly value=""/> <input readonly value=""/>

12
src/main/resources/templates/admin/project_budget_edit.ftl
View File

@ -157,11 +157,11 @@
<td class="table-title" <#if project.underwrittenMode! <= 2> colspan="5" <#else> colspan="1" </#if> > <td class="table-title" <#if project.underwrittenMode! <= 2> colspan="5" <#else> colspan="1" </#if> >
<#if project.underwrittenMode??> <#if project.underwrittenMode??>
<#if (project.underwrittenMode) =1> <#if (project.underwrittenMode) =1>
<input readonly value="A类-不垫资"/> <input readonly value="不垫资"/>
<#elseif (project.underwrittenMode) =3> <#elseif (project.underwrittenMode) =3>
<input readonly value="B类-垫资（账期覆盖）"/> <input readonly value="垫资（账期覆盖）"/>
<#elseif (project.underwrittenMode) =4> <#elseif (project.underwrittenMode) =4>
<input readonly value="C类-垫资（账期不覆盖）"/> <input readonly value="垫资（账期不覆盖）"/>
</#if> </#if>
<#else> <#else>
<input readonly value=""/> <input readonly value=""/>
@ -454,9 +454,9 @@
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">垫资模式:</span></th> <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">垫资模式:</span></th>
<td class="table-title" colspan="1" > <td class="table-title" colspan="1" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenModeBudget" name="underwrittenModeBudget" onchange="changeCheckB()"> <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenModeBudget" name="underwrittenModeBudget" onchange="changeCheckB()">
<option value="1" <#if projectBudget.underwrittenModeBudget=1>selected</#if>>A类-不垫资</option> <option value="1" <#if projectBudget.underwrittenModeBudget=1>selected</#if>>不垫资</option>
<option value="3" <#if projectBudget.underwrittenModeBudget=3>selected</#if>>B类-垫资（账期覆盖）</option> <option value="3" <#if projectBudget.underwrittenModeBudget=3>selected</#if>>垫资（账期覆盖）</option>
<option value="4" <#if projectBudget.underwrittenModeBudget=4>selected</#if>>C类-垫资（账期不覆盖）</option> <option value="4" <#if projectBudget.underwrittenModeBudget=4>selected</#if>>垫资（账期不覆盖）</option>
</select> </select>
</td> </td>

6
src/main/resources/templates/admin/project_estimate_add.ftl
View File

@ -94,9 +94,9 @@
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">垫资模式:</span></th> <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">垫资模式:</span></th>
<td class="table-title" colspan="1" id="spanMode" > <td class="table-title" colspan="1" id="spanMode" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()"> <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()">
<option value="1" >A类-不垫资</option> <option value="1" >不垫资</option>
<option value="3" >B类-垫资（账期覆盖）</option> <option value="3" >垫资（账期覆盖）</option>
<option value="4" >C类-垫资（账期不覆盖）</option> <option value="4" >垫资（账期不覆盖）</option>
</select> </select>
</td> </td>

6
src/main/resources/templates/admin/project_estimate_edit.ftl
View File

@ -98,9 +98,9 @@
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">垫资模式:</span></th> <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">垫资模式:</span></th>
<td class="table-title" colspan="1" > <td class="table-title" colspan="1" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()"> <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()">
<option value="1" <#if project.underwrittenMode=1>selected</#if>>A类-不垫资</option> <option value="1" <#if project.underwrittenMode=1>selected</#if>>不垫资</option>
<option value="3" <#if project.underwrittenMode=3>selected</#if>>B类-垫资（账期覆盖）</option> <option value="3" <#if project.underwrittenMode=3>selected</#if>>垫资（账期覆盖）</option>
<option value="4" <#if project.underwrittenMode=4>selected</#if>>C类-垫资（账期不覆盖）</option> <option value="4" <#if project.underwrittenMode=4>selected</#if>>垫资（账期不覆盖）</option>
</select> </select>
</td> </td>

16
src/main/resources/templates/admin/project_list.ftl
View File

@ -296,10 +296,10 @@
<div class="st-col-field"> <div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode"> <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode">
<option value="-1">全部</option> <option value="-1">全部</option>
<option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>A类-不垫资</option> <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>不垫资</option>
<#-- <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>B类-不垫资（背靠背）</option>--> <#-- <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>不垫资（背靠背）</option>-->
<option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>B类-垫资（账期覆盖）</option> <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>垫资（账期覆盖）</option>
<option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>C类-垫资（账期不覆盖）</option> <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>垫资（账期不覆盖）</option>
</select> </select>
</div> </div>
</div> </div>
@ -634,10 +634,10 @@
<#-- <div class="am-u-sm-10">--> <#-- <div class="am-u-sm-10">-->
<#-- <select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode">--> <#-- <select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode">-->
<#-- <option value="-1">全部</option>--> <#-- <option value="-1">全部</option>-->
<#-- <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>A类-不垫资（战略合作）</option>--> <#-- <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>不垫资（战略合作）</option>-->
<#-- <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>B类-不垫资（背靠背）</option>--> <#-- <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>不垫资（背靠背）</option>-->
<#-- <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>C类-垫资（账期覆盖）</option>--> <#-- <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>垫资（账期覆盖）</option>-->
<#-- <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>D类-垫资（账期不覆盖）</option>--> <#-- <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>垫资（账期不覆盖）</option>-->
<#-- </select>--> <#-- </select>-->
<#-- </div>--> <#-- </div>-->
<#-- </td>--> <#-- </td>-->

8
src/main/resources/templates/admin/project_list_approve.ftl
View File

@ -233,10 +233,10 @@
<div class="st-col-field"> <div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode"> <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode">
<option value="-1">全部</option> <option value="-1">全部</option>
<option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>A类-不垫资（战略合作）</option> <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>不垫资（战略合作）</option>
<#-- <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>B类-不垫资（背靠背）</option>--> <#-- <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>不垫资（背靠背）</option>-->
<option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>B类-垫资（账期覆盖）</option> <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>垫资（账期覆盖）</option>
<option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>C类-垫资（账期不覆盖）</option> <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>垫资（账期不覆盖）</option>
</select> </select>
</div> </div>
</div> </div>