From 01e4db1415ad1f1b52b40c885c9c2ada5523bab5 Mon Sep 17 00:00:00 2001
From: ZhangYP <zhang.yuanping@esstx.cn>
Date: Mon, 4 Mar 2024 17:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89ABCD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palmte/work/bean/UnderwrittenModeEnum.java   |  8 ++++----
 src/main/java/cn/palmte/work/model/Project.java  |  2 +-
 .../java/cn/palmte/work/model/ProjectBudget.java |  2 +-
 .../cn/palmte/work/service/ProjectService.java   |  1 +
 src/main/resources/sql/fourcal-purge.sql         |  2 +-
 src/main/resources/sql/fourcal.sql               |  2 +-
 .../templates/admin/project_approve.ftl          | 12 ++++++------
 .../templates/admin/project_budget_edit.ftl      | 12 ++++++------
 .../templates/admin/project_estimate_add.ftl     |  6 +++---
 .../templates/admin/project_estimate_edit.ftl    |  6 +++---
 .../resources/templates/admin/project_list.ftl   | 16 ++++++++--------
 .../templates/admin/project_list_approve.ftl     |  8 ++++----
 12 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/src/main/java/cn/palmte/work/bean/UnderwrittenModeEnum.java b/src/main/java/cn/palmte/work/bean/UnderwrittenModeEnum.java
index 9b75f4e..a549a02 100644
--- a/src/main/java/cn/palmte/work/bean/UnderwrittenModeEnum.java
+++ b/src/main/java/cn/palmte/work/bean/UnderwrittenModeEnum.java
@@ -5,10 +5,10 @@ package cn.palmte.work.bean;
  */
 public enum UnderwrittenModeEnum {
     PLAN_O(-1,""),
-    PLAN_A(1,"A类-不垫资"),
-//    PLAN_B(2,"B类-不垫资（背靠背）"),
-    PLAN_C(3,"B类-垫资（账期覆盖）"),
-    PLAN_D(4,"C类-垫资（账期不覆盖）");
+    PLAN_A(1,"不垫资"),
+//    PLAN_B(2,"不垫资（背靠背）"),
+    PLAN_C(3,"垫资（账期覆盖）"),
+    PLAN_D(4,"垫资（账期不覆盖）");
 
     private int underwrittenMode;
     private String underwrittenModeStr;
diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java
index a6b106a..e1d68c9 100644
--- a/src/main/java/cn/palmte/work/model/Project.java
+++ b/src/main/java/cn/palmte/work/model/Project.java
@@ -93,7 +93,7 @@ public class Project {
     @Temporal(TemporalType.TIMESTAMP)
     private Date endDate;
     /**
-     * 垫资模式：1A类-不垫资（战略合作），2B类-不垫资（背靠背），3C类-垫资（账期覆盖），4D类-垫资（账期不覆盖）
+     * 垫资模式：1不垫资（战略合作），2不垫资（背靠背），3垫资（账期覆盖），4垫资（账期不覆盖）
      */
     @Column(name = "underwritten_mode")
     private int underwrittenMode;
diff --git a/src/main/java/cn/palmte/work/model/ProjectBudget.java b/src/main/java/cn/palmte/work/model/ProjectBudget.java
index 1644b65..388f1a6 100644
--- a/src/main/java/cn/palmte/work/model/ProjectBudget.java
+++ b/src/main/java/cn/palmte/work/model/ProjectBudget.java
@@ -72,7 +72,7 @@ public class ProjectBudget {
     @Temporal(TemporalType.TIMESTAMP)
     private Date endDateBudget;
     /**
-     * 垫资模式：1A类-不垫资（战略合作），2B类-不垫资（背靠背），3C类-垫资（账期覆盖），4D类-垫资（账期不覆盖）
+     * 垫资模式：1不垫资（战略合作），2不垫资（背靠背），3垫资（账期覆盖），4垫资（账期不覆盖）
      */
     @Column(name = "underwritten_mode_budget")
     private int underwrittenModeBudget;
diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index 214ec56..877c794 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -1009,6 +1009,7 @@ public class ProjectService {
         project.setSaleStage(saleStage);
         project.setStageRemark(stageRemark);
         project.setNextPlan(nextPlan);
+        project.setLastUpdateTime(new Date());
         projectRepository.saveAndFlush(project);
         return ResponseMsg.buildSuccessMsg("保存成功");
     }
diff --git a/src/main/resources/sql/fourcal-purge.sql b/src/main/resources/sql/fourcal-purge.sql
index f9fe31e..49ea7c7 100644
--- a/src/main/resources/sql/fourcal-purge.sql
+++ b/src/main/resources/sql/fourcal-purge.sql
@@ -5570,7 +5570,7 @@ CREATE TABLE `project` (
   `dept_name` varchar(255) DEFAULT NULL COMMENT '部门名称',
   `start_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 '客户名称',
   `terminal_customer` varchar(255) NOT NULL COMMENT '最终用户名称',
   `advance_interest_amount` decimal(16,2) NOT NULL COMMENT '垫资利息（元为单位）',
diff --git a/src/main/resources/sql/fourcal.sql b/src/main/resources/sql/fourcal.sql
index bb9e5bc..40c7dcc 100644
--- a/src/main/resources/sql/fourcal.sql
+++ b/src/main/resources/sql/fourcal.sql
@@ -7577,7 +7577,7 @@ CREATE TABLE `project` (
   `dept_name` varchar(255) DEFAULT NULL COMMENT '部门名称',
   `start_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 '客户名称',
   `terminal_customer` varchar(255) NOT NULL COMMENT '最终用户名称',
   `advance_interest_amount` decimal(16,2) NOT NULL COMMENT '垫资利息（元为单位）',
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 71f6553..3a18243 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -240,11 +240,11 @@
                                 <td class="table-title" <#if project.underwrittenMode! <= 2> colspan="5" <#else> colspan="1" </#if> >
                                     <#if project.underwrittenMode??>
                                         <#if (project.underwrittenMode) =1>
-                                            <input readonly value="A类-不垫资"/>
+                                            <input readonly value="不垫资"/>
                                         <#elseif (project.underwrittenMode) =3>
-                                            <input readonly value="B类-垫资（账期覆盖）"/>
+                                            <input readonly value="垫资（账期覆盖）"/>
                                         <#elseif (project.underwrittenMode) =4>
-                                            <input readonly value="C类-垫资（账期不覆盖）"/>
+                                            <input readonly value="垫资（账期不覆盖）"/>
                                         </#if>
                                     <#else>
                                         <input readonly value=""/>
@@ -561,11 +561,11 @@
                                         <td class="table-title" colspan="1" >
                                             <#if projectBudget.underwrittenModeBudget??>
                                                 <#if (projectBudget.underwrittenModeBudget) =1>
-                                                    <input readonly value="A类-不垫资"/>
+                                                    <input readonly value="不垫资"/>
                                                 <#elseif (projectBudget.underwrittenModeBudget) =3>
-                                                    <input readonly value="B类-垫资（账期覆盖）"/>
+                                                    <input readonly value="垫资（账期覆盖）"/>
                                                 <#elseif (projectBudget.underwrittenModeBudget) =4>
-                                                    <input readonly value="C类-垫资（账期不覆盖）"/>
+                                                    <input readonly value="垫资（账期不覆盖）"/>
                                                 </#if>
                                             <#else>
                                                 <input readonly value=""/>
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index a8f7e75..e03780b 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -157,11 +157,11 @@
                             <td class="table-title" <#if project.underwrittenMode! <= 2> colspan="5" <#else> colspan="1" </#if> >
                                 <#if project.underwrittenMode??>
                                     <#if (project.underwrittenMode) =1>
-                                        <input readonly value="A类-不垫资"/>
+                                        <input readonly value="不垫资"/>
                                     <#elseif (project.underwrittenMode) =3>
-                                        <input readonly value="B类-垫资（账期覆盖）"/>
+                                        <input readonly value="垫资（账期覆盖）"/>
                                     <#elseif (project.underwrittenMode) =4>
-                                        <input readonly value="C类-垫资（账期不覆盖）"/>
+                                        <input readonly value="垫资（账期不覆盖）"/>
                                     </#if>
                                 <#else>
                                     <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>
                             <td class="table-title" colspan="1" >
                                 <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="3" <#if projectBudget.underwrittenModeBudget=3>selected</#if>>B类-垫资（账期覆盖）</option>
-                                    <option value="4" <#if projectBudget.underwrittenModeBudget=4>selected</#if>>C类-垫资（账期不覆盖）</option>
+                                    <option value="1" <#if projectBudget.underwrittenModeBudget=1>selected</#if>>不垫资</option>
+                                    <option value="3" <#if projectBudget.underwrittenModeBudget=3>selected</#if>>垫资（账期覆盖）</option>
+                                    <option value="4" <#if projectBudget.underwrittenModeBudget=4>selected</#if>>垫资（账期不覆盖）</option>
                                 </select>
                             </td>
 
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 105b15b..f4d4ae7 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -94,9 +94,9 @@
                                 <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" >
                                     <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()">
-                                        <option value="1" >A类-不垫资</option>
-                                        <option value="3" >B类-垫资（账期覆盖）</option>
-                                        <option value="4" >C类-垫资（账期不覆盖）</option>
+                                        <option value="1" >不垫资</option>
+                                        <option value="3" >垫资（账期覆盖）</option>
+                                        <option value="4" >垫资（账期不覆盖）</option>
                                     </select>
                                 </td>
 
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 3330e4c..b7e1f47 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -98,9 +98,9 @@
                         <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">垫资模式:</span></th>
                         <td class="table-title" colspan="1" >
                             <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="3" <#if project.underwrittenMode=3>selected</#if>>B类-垫资（账期覆盖）</option>
-                                <option value="4" <#if project.underwrittenMode=4>selected</#if>>C类-垫资（账期不覆盖）</option>
+                                <option value="1" <#if project.underwrittenMode=1>selected</#if>>不垫资</option>
+                                <option value="3" <#if project.underwrittenMode=3>selected</#if>>垫资（账期覆盖）</option>
+                                <option value="4" <#if project.underwrittenMode=4>selected</#if>>垫资（账期不覆盖）</option>
                             </select>
                         </td>
 
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 351c09d..26b2ef5 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -296,10 +296,10 @@
                                     <div class="st-col-field">
                                         <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode">
                                             <option value="-1">全部</option>
-                                            <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>A类-不垫资</option>
-                                            <#--                                        <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>B类-不垫资（背靠背）</option>-->
-                                            <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>B类-垫资（账期覆盖）</option>
-                                            <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>C类-垫资（账期不覆盖）</option>
+                                            <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>不垫资</option>
+                                            <#--                                        <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>不垫资（背靠背）</option>-->
+                                            <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>垫资（账期覆盖）</option>
+                                            <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>垫资（账期不覆盖）</option>
                                         </select>
                                     </div>
                                 </div>
@@ -634,10 +634,10 @@
 <#--                                <div class="am-u-sm-10">-->
 <#--                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode">-->
 <#--                                        <option value="-1">全部</option>-->
-<#--                                        <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>A类-不垫资（战略合作）</option>-->
-<#--                                        <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>B类-不垫资（背靠背）</option>-->
-<#--                                        <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>C类-垫资（账期覆盖）</option>-->
-<#--                                        <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>D类-垫资（账期不覆盖）</option>-->
+<#--                                        <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>不垫资（战略合作）</option>-->
+<#--                                        <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>不垫资（背靠背）</option>-->
+<#--                                        <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>垫资（账期覆盖）</option>-->
+<#--                                        <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>垫资（账期不覆盖）</option>-->
 <#--                                    </select>-->
 <#--                                </div>-->
 <#--                            </td>-->
diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl
index 6aa3d85..2354a4c 100644
--- a/src/main/resources/templates/admin/project_list_approve.ftl
+++ b/src/main/resources/templates/admin/project_list_approve.ftl
@@ -233,10 +233,10 @@
                                     <div class="st-col-field">
                                         <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode">
                                             <option value="-1">全部</option>
-                                            <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>A类-不垫资（战略合作）</option>
-                                            <#--                                        <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>B类-不垫资（背靠背）</option>-->
-                                            <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>B类-垫资（账期覆盖）</option>
-                                            <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>C类-垫资（账期不覆盖）</option>
+                                            <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>不垫资（战略合作）</option>
+                                            <#--                                        <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>不垫资（背靠背）</option>-->
+                                            <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>垫资（账期覆盖）</option>
+                                            <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>垫资（账期不覆盖）</option>
                                         </select>
                                     </div>
                                 </div>