合同模块数据修改完善

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -1,6 +1,5 @@
 package com.liang.controller;
 
-import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -11,13 +10,8 @@ import com.liang.common.enums.PostInfoEnum;
 import com.liang.common.exception.CustomException;
 import com.liang.dao.PrjProjectDao;
 import com.liang.entity.*;
-import com.liang.entity.baobiao.UtilEntity;
-import com.liang.entity.baobiao.staBudgetapprovalutilEntity;
 import com.liang.service.*;
 import io.swagger.annotations.ApiOperation;
-import lombok.Synchronized;
-import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
-import org.apache.poi.hpsf.Decimal;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
@@ -27,9 +21,6 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**

src/main/java/com/liang/service/impl/StaPayapprovalServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -91,6 +92,11 @@ public class StaPayapprovalServiceImpl implements StaPayapprovalService {
         payplan.setFysq(staPayapproval.getFysq());
         prjPayplanService.update(payplan);
 
+        // 合同自动更新当前状态
+        Map<String, Object>maps = new HashMap<>();
+        maps.put("id",staPayapproval.getHt());
+        maps.put("zt","审批结束");
+        prjContractService.updateZt(maps);
         return this.staPayapprovalDao.insert(staPayapproval);
     }
     /**

src/main/resources/mapper/PrjContractDao.xml

@@ -167,12 +167,8 @@
             <if test="zt != null and zt != ''">
                 ZT = #{zt},
             </if>
-
                 KSSJ = #{kssj},
-
-
                 JSSJ = #{jssj}
-
         </set>
         where ID = #{id}
     </update>

src/main/resources/templates/payapply/list.html

@@ -107,9 +107,9 @@
                 <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete">
                     <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>删除
                 </button>
-<!--                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjApprove">-->
-<!--                    <i class="layui-icon layui-icon-ok" style="font-size: 10px;"></i>提交审批-->
-<!--                </button>-->
+                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjApprove">
+                    <i class="layui-icon layui-icon-ok" style="font-size: 10px;"></i>提交审批
+                </button>
                 <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjrevokeApprove">
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>撤销审批
                 </button>
@@ -125,9 +125,9 @@
 <!--                <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nullify">-->
 <!--                    <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>作废-->
 <!--                </button>-->
-<!--                <button class="layui-btn layui-btn-sm" lay-event="exportExcel">-->
-<!--                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表-->
-<!--                </button>-->
+<!--                <button class="layui-btn layui-btn-sm" lay-event="exportExcel">
+                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表
+                </button>-->
             </div>
         </script>
 

src/main/resources/templates/payapply/mylist.html

@@ -116,9 +116,9 @@
                 <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjrevokeApprove">
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>撤销审批
                 </button>
-                <!--                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spOption">-->
-                <!--                    <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>审核-->
-                <!--                </button>-->
+                                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spOption">
+                                    <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>审核
+                                </button>
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spList">
                     <i class="layui-icon layui-icon-list" style="font-size: 10px;"></i>审批列表
                 </button>

src/main/resources/templates/prjcontract/add.html

@@ -118,7 +118,7 @@
             <div class="layui-tab-item" style="min-height: 550px; padding-left: 30px; padding-right: 30px">
                 <form class="layui-form" action="" lay-filter="formDemo">
                     <div class="layui-form layuimini-form">
-                        <div class="layui-btn-group" style="margin-bottom: -8px">
+                        <div class="layui-btn-group" style="margin-bottom: 0.5%">
                             <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
                                     lay-filter="btnAdd2"><i class="layui-icon"></i>新建
                             </button>

src/main/resources/templates/prjcontract/list.html

@@ -90,7 +90,7 @@
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="view">
                     <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>查看
                 </button>
-                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spOption">
+<!--                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spOption">
                     <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>审核
                 </button>
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spList">
@@ -98,7 +98,7 @@
                 </button>
                 <button class="layui-btn layui-btn-sm " lay-event="tjsp">
                     <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>提交审批
-                </button>
+                </button>-->
                 <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete">
                     <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>删除
                 </button>

src/main/resources/templates/prjcontract/update.html

@@ -184,7 +184,7 @@
             <div class="layui-tab-item" style="min-height: 550px; padding-left: 30px; padding-right: 30px">
                 <form class="layui-form" action="" lay-filter="formDemo">
                     <div class="layui-form layuimini-form">
-                        <div class="layui-btn-group" style="margin-bottom: -8px">
+                        <div class="layui-btn-group" style="margin-bottom: 0.5%">
                             <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
                                     lay-filter="btnAdd2"><i class="layui-icon"></i>新建
                             </button>