合同新增 增加中选单位必填 是否是系统内部单位、 验收时间、延期时间 等级联限制功能

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

@@ -1350,7 +1350,6 @@ public class StaBudgetapprovalController extends BaseController {
 
         List<FeeManagemant> list = prjProjectService.getFyglList(paraMap);
         return BaseResult.success("导出成功",list);
-
     }
 
     /**

src/main/java/com/liang/entity/PrjContract.java

@@ -57,6 +57,7 @@ public class PrjContract implements Serializable {
     /**
      * 中选单位
      */
+
     private String zxdw;
 
     /**
@@ -78,148 +79,17 @@ public class PrjContract implements Serializable {
      */
     private String spzt;
 
-    public Double getZq() {
-        return zq;
-    }
-
-    public void setZq(Double zq) {
-        this.zq = zq;
-    }
-
-    public Date getKssj() {
-        return kssj;
-    }
-
-    public void setKssj(Date kssj) {
-        this.kssj = kssj;
-    }
-
-    public Date getJssj() {
-        return jssj;
-    }
-
-    public void setJssj(Date jssj) {
-        this.jssj = jssj;
-    }
-
-    public String getZwmc() {
-        return zwmc;
-    }
-
-    public void setZwmc(String zwmc) {
-        this.zwmc = zwmc;
-    }
-
-    public String getErpbh() {
-        return erpbh;
-    }
-
-    public void setErpbh(String erpbh) {
-        this.erpbh = erpbh;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getHtmc() {
-        return htmc;
-    }
-
-    public void setHtmc(String htmc) {
-        this.htmc = htmc;
-    }
-
-    public String getWj() {
-        return wj;
-    }
-
-    public void setWj(String wj) {
-        this.wj = wj;
-    }
-
-    public Double getHtje() {
-        return htje;
-    }
-
-    public void setHtje(Double htje) {
-        this.htje = htje;
-    }
-
-    public Integer getCjr() {
-        return cjr;
-    }
-
-    public void setCjr(Integer cjr) {
-        this.cjr = cjr;
-    }
-
-    public Date getCjsj() {
-        return cjsj;
-    }
-
-    public void setCjsj(Date cjsj) {
-        this.cjsj = cjsj;
-    }
-
-    public Integer getRws() {
-        return rws;
-    }
-
-    public void setRws(Integer rws) {
-        this.rws = rws;
-    }
-
-    public String getCjrxm() {
-        return cjrxm;
-    }
-
-    public void setCjrxm(String cjrxm) {
-        this.cjrxm = cjrxm;
-    }
-
-    public String getRwsmc() {
-        return rwsmc;
-    }
-
-    public void setRwsmc(String rwsmc) {
-        this.rwsmc = rwsmc;
-    }
-
-    public String getYszl() {
-        return yszl;
-    }
-
-    public void setYszl(String yszl) {
-        this.yszl = yszl;
-    }
-
-    public String getZbpc() {
-        return zbpc;
-    }
+    /**
+     * 已付金额
+     */
+    private Double yfje;
 
-    public void setZbpc(String zbpc) {
-        this.zbpc = zbpc;
-    }
+    private Date yssj;
 
-    public String getZxdw() {
-        return zxdw;
-    }
+    private Integer sfsxtndw;
 
-    public void setZxdw(String Zxdw) {
-        this.zxdw = zxdw;
-    }
+    private Date yqrq;
 
-    public Integer getZT() {
-        return zt;
-    }
 
-    public void setZT(Integer zt) {
-        this.zt = zt;
-    }
 }
 

src/main/resources/mapper/PrjContractDao.xml

@@ -17,6 +17,11 @@
         <result property="jssj" column="JSSJ" jdbcType="VARCHAR"/>
         <result property="zq" column="ZQ" jdbcType="VARCHAR"/>
         <result property="spzt" column="SPZT" jdbcType="VARCHAR"/>
+        <result property="yfje" column="YFJE" jdbcType="DOUBLE"/>
+        <result property="yssj" column="YSSJ" jdbcType="VARCHAR"/>
+        <result property="sfsxtndw" column="SFSXTNDW" jdbcType="INTEGER"/>
+        <result property="yqrq" column="YQRQ" jdbcType="VARCHAR"/>
+
     </resultMap>
 
     <!--查询单个-->
@@ -108,8 +113,8 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into prj_Contract(HTMC, WJ, HTJE, CJR, CJSJ, RWS, ZBPC, ZXDW, YSZL,KSSJ,JSSJ,SPZT)
-        values (#{htmc}, #{wj}, #{htje}, #{cjr}, GETDATE(), #{rws}, #{zbpc}, #{zxdw}, #{yszl},#{kssj},#{jssj},#{spzt})
+        insert into prj_Contract(HTMC, WJ, HTJE, CJR, CJSJ, RWS, ZBPC, ZXDW, YSZL,KSSJ,JSSJ,SPZT,SFSXTNDW,YSSJ,YQRQ)
+        values (#{htmc}, #{wj}, #{htje}, #{cjr}, GETDATE(), #{rws}, #{zbpc}, #{zxdw}, #{yszl},#{kssj},#{jssj},#{spzt},#{sfsxtndw},#{yssj},#{yqrq})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
@@ -202,12 +207,21 @@
 
     <!--合同列表-->
     <select id="getContractList" resultMap="PrjContractMap" parameterType="map">
-        select c.*, x.ZWMC as RWSMC, u.name as CJRXM,x.ZWMC,x.ERPBH, DATEDIFF(MONTH, c.kssj, c.jssj) AS ZQ
-        from prj_Contract c
-        left join prj_Project x on x.ID = c.RWS
-        left join sys_user_info u on u.user_id = c.CJR
-        where 1 = 1
-        and c.zt = 1
+        SELECT
+        c.*,
+        x.ZWMC AS RWSMC,
+        u.name AS CJRXM,
+        x.ZWMC,
+        x.ERPBH,
+        COALESCE((select SUM(BCFKJE) FROM sta_PayApproval sp WHERE sp.HT = c.ID AND sp.SPZT != '作废'),0.00) AS YFJE,
+        DATEDIFF( MONTH, c.kssj, c.jssj ) AS ZQ
+        FROM
+        prj_Contract c
+        LEFT JOIN prj_Project x ON x.ID = c.RWS
+        LEFT JOIN sys_user_info u ON u.user_id = c.CJR
+        WHERE
+        1 = 1
+        AND c.zt = 1
         <if test="htmc != null and htmc != ''">
             and c.HTMC like '%'+#{htmc}+'%'
         </if>

src/main/resources/mapper/StaPayapprovalDao.xml

@@ -332,7 +332,7 @@ where
             COALESCE(a.BZJE, 0) / 10000 AS BZJE
         FROM sta_Reimbursement a
         left  JOIN sta_PayApproval b ON a.FYSQ = b.FYSQ
-        WHERE a.FYSQ = #{fysq}
+        WHERE a.FYSQ = #{fysq} and b.SPZT != '作废'
         GROUP BY a.BZJE
 
     </select>

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

@@ -557,7 +557,7 @@
                     bzje = result.bzje
                     }
                 })
-            if (fkje+bcfkje>bzje){
+            if ( (fkje+bcfkje) > bzje){
                 Message.warning('该报账下付款申请已申请总金额已超出报账金额!',2000);
                 return ;
             }

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

@@ -89,7 +89,7 @@
                     {field: 'xmmc', width: '25%', title: '项目名称'},
                     {field: 'sqje',width: '10%',title: '申请金额(元)',align: 'right'},
                     {field: 'bzje',width: '10%',title: '报账金额(元)',align: 'right'},
-                    {field: 'yfje',width: '10%',title: '已付款金额(元)',align: 'right'},
+                    {field: 'yfje',width: '13%',title: '已付款金额(元)',align: 'right'},
                     {field: 'erpbh', width: '15%', title: 'ERP编号'},
                     {field: 'mc', width: '25%', title: '报账名称'},
                     {field: 'fysqmc', width: '25%', title: '费用申请'},

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

@@ -52,14 +52,16 @@
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label required" style="width: 10%">招标批次</label>
                             <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="招标批次不能为空">
+                                <input type="text" id="zbpc" name="zbpc" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="招标批次不能为空！">
                             </div>
-                            <label class="layui-form-label " style="width: 15%">中选单位</label>
+                            <label class="layui-form-label required " style="width: 15%">中选单位</label>
                             <div class="layui-input-inline" style="width: 35%">
-                                <input type="text" id="zxdw" name="zxdw" class="layui-input" autocomplete="off">
+                                <input type="text" id="zxdw" name="zxdw" class="layui-input"
+                                       autocomplete="off" lay-verify="required" lay-reqtext="中标单位不能为空!">
                             </div>
                         </div>
 
+
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label required" style="width: 10%">执行周期</label>
                             <div class="layui-input-inline" style="width: 25%">
@@ -70,6 +72,25 @@
                                 <input type="text" name="jssj" id="jssj" placeholder="终止时间" class="layui-input" lay-verify="required" lay-reqtext="结束不能为空" readonly>
                             </div>
                         </div>
+                        <div class="layui-form-item layui-inline" style="width: 100%">
+                            <label class="layui-form-label required" style="width: 10%">验收时间</label>
+                            <div class="layui-input-inline" style="width: 25%">
+                                <input type="text" id="yssj" name="yssj" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="招标批次不能为空！">
+                            </div>
+                            <label class="layui-form-label required" style="width: 15%">是否是系统内单位</label>
+                            <div class="layui-input-inline" style="width: 10%">
+                                <select name="sfsxtndw" id="sfsxtndw">
+                                    <option value="0">是</option>
+                                    <option value="1">否</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-form-item layui-inline" style="width: 100%;display: none" id="yqrqs" >
+                            <label class="layui-form-label" style="width: 10%">延期日期</label>
+                            <div class="layui-input-inline" style="width: 25%">
+                                <input type="text" id="yqrq" name="yqrq" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
 
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 10%">合同文件</label>
@@ -171,6 +192,8 @@
         var htId = -1;
         var kssj = '',
             jssj = '';
+            yssj = '';
+            yqrq = '';
 
         //申请时间
         laydate.render({
@@ -178,6 +201,18 @@
             done: function (value, date, endDate) {
                 sqsj1 = $("#kssj").val();
                 sqsj2 = $("#jssj").val();
+                yssj = $("#yssj").val();
+                if (sqsj1 == sqsj2){
+                    layer.msg('执行周期开始时间与结束时间不能为同一天！',{icon:2});
+                    $("#kssj").val("");
+
+                }
+                if (yssj != ''){
+                    if (sqsj1 > yssj){
+                        layer.msg('验收时间不能早于或等于合同开始时间！',{icon:2});
+                        $("#yssj").val("");
+                    }
+                }
                 if (sqsj1 != "" && sqsj2 != "") {
                     if (sqsj1 > sqsj2) {
                         Message.warning("起始时间不能晚于终止时间！", 1500);
@@ -192,6 +227,19 @@
             done: function (value, date, endDate) {
                 sqsj1 = $("#kssj").val();
                 sqsj2 = $("#jssj").val();
+                const currentDate = new Date();
+                const sqsj3 = new Date(sqsj2);
+                console.log('时间：'+ currentDate);
+                console.log('时间：'+ sqsj3);
+                if (sqsj3 < currentDate){
+                 $("#yqrqs").css('display','block');
+                }else {
+                    $("#yqrqs").css('display','none');
+                }
+                if (sqsj1 == sqsj2){
+                    layer.msg('执行周期开始时间与结束时间不能为同一天！',{icon:2});
+                    $("#jssj").val("");
+                }
                 if (sqsj1 != "" && sqsj2 != "") {
                     if (sqsj1 > sqsj2) {
                         Message.warning("终止时间不能早于开始时间！", 1500);
@@ -199,6 +247,48 @@
 
                     }
                 }
+
+            }
+        });
+
+        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("");
+
+                    }
+                }
+
+            }
+        });
+        laydate.render({
+            elem: '#yqrq',
+            done: function (value, date, endDate) {
+                sqsj1 = $("#kssj").val();
+                sqsj2 = $("#jssj").val();
+                yssj = $("#yssj").val();
+                yqrq = $("#yqrq").val();
+                // 大于项目执行周期 不能等于
+                if (sqsj1 == '' && yssj == ''){
+                    layer.msg('请先录入执行周期！',{icon:2});
+                    $("#yqrq").val("");
+                }
+                if (yqrq <= sqsj2 ){
+                    layer.msg('延期时间不能小于或等于合同执行结束时间！',{icon:2});
+                    $("#yqrq").val("");
+                }
+                if (yqrq <= sqsj1){
+                    layer.msg('延期时间不能小于或等于合同执行开始时间',{icon:2});
+                    $("#yqrq").val("");
+                }
+
+
             }
         });
         //任务书

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

@@ -163,13 +163,13 @@
                     {field: 'zwmc',width: '20%',title:'项目名称',fixed: 'left'},
                     {field: 'spzt',width: '10%',title: '审批状态',align: 'left'},
                     {field: 'erpbh',width: '10%',title: 'ERP编号',align: 'left'},
-                    {field: 'htmc', width: '20%', title: '合同名称', align: 'left'},
-                    /*{field: 'rwsmc', width: '30%', title: '任务书', align: 'left'},*/
                     {field: 'htje', width: '8%', title: '合同金额(万元)', align: 'right'},
-                    {field: 'cjrxm', width: '8%', title: '创建人', align: 'center'},
+                    {field: 'yfje',width: '10%',title: '已付金额（万元）',align: 'right'},
+                    {field: 'htmc', width: '20%', title: '合同名称'},
                     {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'},
                     {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 " style="width: 15%">中选单位</label>
+                            <label class="layui-form-label required" 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}">
+                                <input type="text" id="zxdw" name="zxdw" class="layui-input" autocomplete="off" th:value="${contract.zxdw}" lay-verify="required" lay-reqtext="中选单位不能为空" >
                             </div>
                         </div>