付款计划保存系统总金额计算错误问题，合同添加导出列表项

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

@@ -16,6 +16,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
@@ -153,6 +154,7 @@ public class PrjPayplanController extends BaseController {
 
     @ResponseBody
     @RequestMapping(value = "/doAdd1", method = RequestMethod.POST)
+    @Transactional
         public BaseResult doAdd( @RequestBody String data,
                             @RequestParam(required = false,value = "htje")Double htje) {
         List<PrjPayplan> prjPayplanList = JsonTool.parseArray(data, PrjPayplan.class);

src/main/resources/mapper/PrjContractDao.xml

@@ -174,7 +174,8 @@
                 ZT = #{zt},
             </if>
                 KSSJ = #{kssj},
-                JSSJ = #{jssj}
+                JSSJ = #{jssj},
+                YSSJ = #{yssj}
         </set>
         where ID = #{id}
     </update>

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

@@ -54,10 +54,10 @@
                             <div class="layui-input-inline" style="width: 25%">
                                 <input type="text" id="zbpc" name="zbpc" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="招标批次不能为空！">
                             </div>
-                            <label class="layui-form-label required " style="width: 15%">中选单位</label>
+                            <label class="layui-form-label  " style="width: 15%">中选单位</label>
                             <div class="layui-input-inline" style="width: 35%">
                                 <input type="text" id="zxdw" name="zxdw" class="layui-input"
-                                       autocomplete="off" lay-verify="required" lay-reqtext="中标单位不能为空!">
+                                       autocomplete="off">
                             </div>
                         </div>
 
@@ -814,13 +814,15 @@
             var htje =parseFloat($("#htje").val())
             var prjPayplanList =[];
             var count = 0;
+            var sum =0;
             if (!subTopics && subTopics.length === 0) {
                 Message.warning("请先创建付款计划！！！", 1500);
                 return;
             }
             for (let i = 0; i < subTopics.length; i++) {
-                count += parseFloat(subTopics[i].zfje) || 0;
+                sum += parseFloat(subTopics[i].zfje*10000) || 0;
             }
+            count = sum/10000;
             for (const item of subTopics) {
                 var prjPayplan = {
                     "fkxx": item.fkxx,
@@ -833,6 +835,7 @@
                 };
                 prjPayplanList.push(prjPayplan);
             }
+            console.log(sum)
             console.log(count)
             console.log(htje)
             console.log(subTopics)

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

@@ -173,11 +173,22 @@
                     {field: 'htje', width: '8%', title: '合同金额(万元)', align: 'right'},
                     {field: 'yfje',width: '10%',title: '已付金额（万元）',align: 'right'},
                     {field: 'htmc', width: '20%', title: '合同名称'},
+                    {field: 'zbpc', width: '8%', title: '招标批次'},
+                    {field: 'zxdw', width: '8%', title: '中选单位'},
+                    {field: 'sfsxtndw', width: '8%', title: '是否系统内单位', align: 'center', templet: function (d) {
+                            if (0 == d.sfsxtndw) {
+                                return '<span class="layui-badge layui-bg-blue">是</span>';
+                            } else {
+                                return '<span class="layui-badge layui-bg-orange">否</span>';
+                            }
+                        }
+                    },
                     {field: 'zq', width: '6%',title: '周期(月)',align: 'left'},
                     {field: 'kssj',width: '10%',title: '执行周期（开始）',align: 'center'},
                     {field: 'jssj',width: '10%',title: '执行周期（结束）',align: 'center'},
                     {field: 'cjrxm', width: '8%', title: '创建人', align: 'center'},
                     {field: 'cjsj', width: '10%', title: '创建时间', align: 'center'},
+                    {field: 'yssj', width: '10%', title: '验收时间', align: 'center'},
                     {title: '操作',width: '5%',toolbar:'#cz',align: 'center',fixed: 'right'}
                 ]
             ],

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

@@ -99,9 +99,9 @@
                             <div class="layui-input-inline" style="width: 25%">
                                 <input type="text" id="zbpc" name="zbpc" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="招标批次不能为空" th:value="${contract.zbpc}">
                             </div>
-                            <label class="layui-form-label required" style="width: 15%">中选单位</label>
+                            <label class="layui-form-label" style="width: 15%">中选单位</label>
                             <div class="layui-input-inline" style="width: 35%">
-                                <input type="text" id="zxdw" name="zxdw" class="layui-input" autocomplete="off" th:value="${contract.zxdw}" lay-verify="required" lay-reqtext="中选单位不能为空" >
+                                <input type="text" id="zxdw" name="zxdw" class="layui-input" autocomplete="off" th:value="${contract.zxdw}" >
                             </div>
                         </div>
 
@@ -126,9 +126,11 @@
                             </div>
                             <label class="layui-form-label required" style="width: 15%">是否是系统内单位</label>
                             <div class="layui-input-inline" style="width: 10%">
-                                <input type="text" name="sfsxtndw" id="sfsxtndw" placeholder="终止时间" class="layui-input" lay-verify="required" lay-reqtext="结束不能为空"
+                                <input type="text" name="display_sfsxtndw" id="display_sfsxtndw" placeholder="终止时间" class="layui-input" lay-verify="required" lay-reqtext="结束不能为空"
                                        th:value="${contract.sfsxtndw == 0?'是':'否'}"
                                        readonly>
+                                <input type="hidden" name="sfsxtndw" id="sfsxtndw"
+                                       th:value="${contract.sfsxtndw}">
                             </div>
                         </div>
 
@@ -328,6 +330,26 @@
 
             }
         });
+        laydate.render({
+            elem: '#yssj',
+            done: function (value, date, endDate) {
+                sqsj1 = $("#kssj").val();
+                sqsj2 = $("#jssj").val();
+                yssj = $("#yssj").val();
+                if (sqsj1 != '' && yssj != ''){
+                    if (yssj <= sqsj1){
+                        layer.msg('验收时间不能早于或等于合同开始时间！',{icon:2});
+                        $("#yssj").val("");
+
+                    }
+                }else {
+                    layer.msg('请先填写执行周期！',{icon:8});
+                    $("#yssj").val("");
+                }
+
+            }
+        });
+
         // 用于存放表格数据
         var dataHtwj = new Array();
         if ([[${contract.wj}]] != null && [[${contract.wj}]] != "") {
@@ -794,13 +816,15 @@
             var htje =parseFloat($("#htje").val())
             var prjPayplanList =[];
             var count = 0;
+            var sum = 0;
             if (!subTopics && subTopics.length === 0) {
                 Message.warning("请先创建付款计划！！！", 1500);
                 return;
             }
             for (let i = 0; i < subTopics.length; i++) {
-                count += parseFloat(subTopics[i].zfje) || 0;
+                sum += parseFloat(subTopics[i].zfje*10000) || 0;
             }
+            count =sum/10000;
             for (const item of subTopics) {
                 var prjPayplan = {
                     "fkxx": item.fkxx,
@@ -813,6 +837,7 @@
                 };
                 prjPayplanList.push(prjPayplan);
             }
+            console.log(sum)
             console.log(count)
             console.log(htje)
             console.log(subTopics)