新增下一步计划字段

src/main/java/cn/palmte/work/controller/backend/ProjectController.java

@@ -152,10 +152,10 @@ public class ProjectController extends BaseController {
         downloadHeader(httpServletResponse, Utils.generateExcelName("项目报表"), "application/octet-stream");
         String[] headers = {"项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "项目合同金额", "项目毛利", "项目毛利率", "项目把握度", "汇智产品金额", "华智产品金额",
                 "华三产品金额", "其他产品金额", "项目当前状态", "行业场景应用", "解决方案", "客户名称", "最终用户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "战略合作对象",
-                "项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称","项目阶段", "项目开始时间", "项目结束时间", "最后更新时间"};
+                "项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称","项目阶段", "当前进度描述", "下一步计划", "项目开始时间", "项目结束时间", "最后更新时间"};
         String[] exportColumns = {"projectNo", "name", "typeDesc", "underwrittenModeStr", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "certaintyStr", "huizhiRound", "huazhiRound",
                 "huasanRound", "ziguangRound", "statusDesc", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer", "contractTimeStr", "bidsTimeStr", "isSecondStr", "signTypeStr", "collaborator",
-                "principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName","stageName", "startDateStr", "endDateStr", "lastUpdateTimeStr"};
+                "principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName","stageName", "stageRemark", "nextPlan", "startDateStr", "endDateStr", "lastUpdateTimeStr"};
         ExportUtils.exportToExcel(headers, exportColumns, 1, 10000,
                 httpServletResponse.getOutputStream(), (pN, pS) -> projectService.list(searchInfo, pN, pS).getList());
     }
@@ -173,10 +173,10 @@ public class ProjectController extends BaseController {
         ExportExcelUtils exportExcelUtils = new ExportExcelUtils();
         String[] headers0 = {"部门名称", "项目编号", "项目名称", "项目类型", "项目计划开始时间", "项目计划结束时间", "垫资模式", "合作对象", "垫资利息", "垫资峰值", "合同金额",
                 "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "项目解决方案", "客户名称", "最终用户名称",
-                "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划","项目阶段"};
+                "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划","项目阶段", "当前进度描述", "下一步计划"};
         String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound",
                 "grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer",
-                "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection","stageName"};
+                "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection","stageName", "stageRemark", "nextPlan"};
         exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）信息", outputStream);
 
         if (project.getStatus() < 5) {
@@ -631,10 +631,10 @@ public class ProjectController extends BaseController {
         downloadHeader(httpServletResponse, Utils.generateExcelName("待我审核项目报表"), "application/octet-stream");
         String[] headers = {"项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "项目合同金额", "项目毛利", "项目毛利率", "项目把握度", "汇智产品金额", "华智产品金额",
                 "华三产品金额", "其他产品金额", "项目当前状态", "行业场景应用", "解决方案", "客户名称", "最终用户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "战略合作对象",
-                "项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称","项目阶段", "项目开始时间", "项目结束时间", "最后更新时间"};
+                "项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称","项目阶段", "当前阶段描述", "下一步计划", "项目开始时间", "项目结束时间", "最后更新时间"};
         String[] exportColumns = {"projectNo", "name", "typeDesc", "underwrittenModeStr", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "certaintyStr", "huizhiRound", "huazhiRound",
                 "huasanRound", "ziguangRound", "statusDesc", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "collaborator",
-                "principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDate","stageName", "endDate", "lastUpdateTime"};
+                "principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName", "stageName", "stageRemark", "nextPlan", "startDate","endDate", "lastUpdateTime"};
         ExportUtils.exportToExcel(headers, exportColumns, 1, 10000,
                 httpServletResponse.getOutputStream(), (pN, pS) -> projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pN, pS).getList());
     }
@@ -1165,10 +1165,10 @@ public class ProjectController extends BaseController {
         ExportExcelUtils exportExcelUtils = new ExportExcelUtils();
         String[] headers0 = {"部门名称", "项目编号", "项目名称", "项目类型", "项目计划开始时间", "项目计划结束时间", "垫资模式", "合作对象", "垫资利息", "垫资峰值",
                 "合同金额", "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "项目解决方案",
-                "客户名称", "最终用户名称", "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划"};
+                "客户名称", "最终用户名称", "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划", "项目阶段", "当前进度描述", "下一步计划"};
         String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmountRound", "advancePeakAmountRound",
                 "contractRound", "grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "resolvePlanStr",
-                "customer", "terminalCustomer", "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection"};
+                "customer", "terminalCustomer", "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "stageName", "stageRemark", "nextPlan"};
         exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）信息", outputStream);
 
         exportExcelUtils.end(outputStream);

src/main/java/cn/palmte/work/model/Project.java

@@ -262,6 +262,9 @@ public class Project {
     @Column(name = "stage_remark")
     private String stageRemark;
 
+    @Column(name = "next_plan")
+    private String nextPlan;
+
     @Transient
     private String contractRound;
 
@@ -1101,4 +1104,12 @@ public class Project {
     public void setBidsTimeStr(String bidsTimeStr) {
         this.bidsTimeStr = bidsTimeStr;
     }
+
+    public String getNextPlan() {
+        return nextPlan;
+    }
+
+    public void setNextPlan(String nextPlan) {
+        this.nextPlan = nextPlan;
+    }
 }

src/main/java/cn/palmte/work/service/ProjectService.java

@@ -956,6 +956,7 @@ public class ProjectService {
         JSONObject obj = JSON.parseObject(json);
         int stage = obj.getIntValue("stage");
         String stageRemark = obj.getString("stageRemark");
+        String nextPlan = obj.getString("nextPlan");
 
         Project project = projectRepository.getOne(projectId);
         if(null == project){
@@ -964,6 +965,7 @@ public class ProjectService {
 
         project.setStage(stage);
         project.setStageRemark(stageRemark);
+        project.setNextPlan(nextPlan);
         projectRepository.saveAndFlush(project);
         return ResponseMsg.buildSuccessMsg("保存成功");
     }

src/main/resources/templates/admin/project_approve.ftl

@@ -444,6 +444,13 @@
                                     >${project.stageRemark!}</textarea>
                                 </td>
                             </tr>
+                            <tr class="am-text-nowrap">
+                                <th class="table-title" colspan="1" ><span style="font-size: 15px">下一步计划:</span></th>
+                                <td class="table-title" colspan="5" >
+                                    <textarea rows="3" cols="20" style="border-style:none;background-color: white;" disabled="disabled"
+                                    >${project.nextPlan!}</textarea>
+                                </td>
+                            </tr>
                         </table>
                     </div>
                     <#--  项目预算信息 展示内容  -->

src/main/resources/templates/admin/project_budget_edit.ftl

@@ -361,6 +361,13 @@
                                     >${project.stageRemark!}</textarea>
                             </td>
                         </tr>
+                        <tr class="am-text-nowrap">
+                            <th class="table-title" colspan="1" ><span style="font-size: 15px">下一步计划:</span></th>
+                            <td class="table-title" colspan="5" >
+                                    <textarea rows="3" cols="20" style="border-style:none;background-color: white;" disabled="disabled"
+                                    >${project.nextPlan!}</textarea>
+                            </td>
+                        </tr>
                     </table>
                 </div>
                 <div class="am-tab-panel am-fade am-in am-active" id="tab2">

src/main/resources/templates/admin/project_estimate_add.ftl

@@ -353,6 +353,15 @@
                                     ></textarea>
                                 </td>
                             </tr>
+                            <tr class="am-text-nowrap">
+                                <th class="table-title" colspan="1" ><span style="font-size: 15px">下一步计划:</span></th>
+                                <td class="table-title" colspan="5" >
+                                    <textarea rows="3" cols="20" id="nextPlan" name="nextPlan" maxlength="1000"
+                                              class="am-input" style="border-style:none;" data-validate-async data-validation-message="下一步计划"
+                                              placeholder="下一步计划"
+                                    ></textarea>
+                                </td>
+                            </tr>
                         </table>
 <#--                <div class="am-tabs-bd">-->
 <#--                    <div class="am-tab-panel am-fade am-in" id="tab2">-->

src/main/resources/templates/admin/project_estimate_edit.ftl

@@ -400,6 +400,15 @@
                                     >${project.stageRemark!}</textarea>
                         </td>
                     </tr>
+                    <tr class="am-text-nowrap">
+                        <th class="table-title" colspan="1" ><span style="font-size: 15px">下一步计划:</span></th>
+                        <td class="table-title" colspan="5" >
+                                    <textarea rows="3" cols="20" id="nextPlan" name="nextPlan" maxlength="1000"
+                                              class="am-input" style="border-style:none;" data-validate-async data-validation-message="下一步计划"
+                                              placeholder="下一步计划"
+                                    >${project.stageRemark!}</textarea>
+                        </td>
+                    </tr>
                 </table>
             </div>
         </div>

src/main/resources/templates/admin/project_list.ftl

@@ -1331,6 +1331,15 @@
                     <div class="am-u-sm-3 am-u-md-3 input-msg"></div>
                 </div>
 
+                <div class="am-g am-form-group am-margin-top" style="display: flex;">
+                    <div class="am-u-sm-3 am-u-md-3 am-text-right">
+                        <span style="color: red;">*</span>下一步计划</div>
+                    <div class="am-u-sm-6 am-u-md-6">
+                        <textarea id="nextPlan" minlength="1"  rows="3" cols="40" maxlength="1000" class="am-input"></textarea>
+                    </div>
+                    <div class="am-u-sm-3 am-u-md-3 input-msg"></div>
+                </div>
+
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal" data-am-modal-cancel>关闭</button>
                     <button type="button" class="btn btn-primary" data-am-modal-confirm onclick="stageRefreshSave()">提交</button>
@@ -1731,6 +1740,7 @@
     var stageRefreshSave = function () {
         var stage = $("#modalStage").val();
         var stageRemark = $("#stageRemark").val();
+        var nextPlan = $("#nextPlan").val();
         var projectId = $("#stageProjectId").val();
         if (stage == '') {
             layer.alert("请选择项目阶段");
@@ -1740,10 +1750,15 @@
             layer.alert("请填写当前进度描述");
             return;
         }
+        if (nextPlan == '') {
+            layer.alert("请填写下一步计划");
+            return;
+        }
 
         var params = {
             stage: stage,
-            stageRemark: stageRemark
+            stageRemark: stageRemark,
+            nextPlan: nextPlan
         };
         $.ajax({
             url: '${base}/project/stageRefreshSave/' + projectId,