合同编辑时修改合同关联付款的金额，并且合同修改为可以查看部门下的所有合同减少重复创建问题

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

@@ -115,6 +115,7 @@ public class PrjContractController extends BaseController {
                            @RequestParam(required = false, defaultValue = "", value = "kssj")String kssj,
                            @RequestParam(required = false, defaultValue = "", value = "jssj")String jssj) {
         List<SysUserInfo> lists = sysUserInfoService.getDept(id);
+        String deptId = getSysUserInfo().getDeptId();
         PageHelper.startPage(pageNum, pageSize);
         Map<String, Object> paraMap = new HashMap<>();
         paraMap.put("sortName", sortName);
@@ -146,7 +147,7 @@ public class PrjContractController extends BaseController {
                 }
             }
             if(containsKeyField != true){
-                paraMap.put("id",id);
+                paraMap.put("deptId",deptId);
             }
         }
         // 部门的可以查看本部门的 ，主任查看 本部门全部的
@@ -195,11 +196,11 @@ public class PrjContractController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "/doAdd", method = RequestMethod.POST)
     public BaseResult doAdd(PrjContract prjContract) {
-        int count =prjContractService.selectByMcAndHtjr(prjContract);
-        if (count==1){
-            return BaseResult.failure("保存失败，已经存在相同的合同!!");
-        }else if (count>1){
-            return BaseResult.failure("合同保存失败。系统中已存在"+count+"个相同的合同，请联系系统管理员以解决此问题!!!");
+        List<PrjContract> prjContractList =prjContractService.selectByMcAndHtjr(prjContract);
+        if (prjContractList.size()==1){
+            return BaseResult.failure("保存失败，系统已经存在相同的合同,创建人为"+prjContractList.get(0).getCjrxm()+"!!");
+        }else if (prjContractList.size()>1){
+            return BaseResult.failure("合同保存失败。当前创建的合同系统中已存在"+prjContractList.size()+"个相同合同，请联系系统管理员以解决此问题!!!");
         }
         prjContract.setCjr(getSysUserId());
         prjContract.setSpzt("未锁定");
@@ -256,6 +257,8 @@ public class PrjContractController extends BaseController {
     @RequestMapping(value = "/doUpdate", method = RequestMethod.POST)
     public BaseResult doUpdate(PrjContract prjContract) {
         int num = prjContractService.update(prjContract);
+        //修改合同关联的付款金额
+        staPayapprovalService.updateHtje(prjContract);
         if (num > 0) {
             return BaseResult.success("保存成功!", prjContract);
         } else {

src/main/java/com/liang/dao/PrjContractDao.java

@@ -107,6 +107,6 @@ public interface PrjContractDao {
      */
     int updateZt(Map map);
 
-    int selectByMcAndHtjr(PrjContract prjContract);
+    List<PrjContract> selectByMcAndHtjr(PrjContract prjContract);
 }
 

src/main/java/com/liang/dao/StaPayapprovalDao.java

@@ -1,5 +1,6 @@
 package com.liang.dao;
 
+import com.liang.entity.PrjContract;
 import com.liang.entity.PrjProject;
 import com.liang.entity.StaPayapproval;
 import org.apache.ibatis.annotations.Param;
@@ -123,5 +124,7 @@ public interface StaPayapprovalDao {
     List<StaPayapproval> getFkjh(Integer id);
 
     Double selectPayByFkjh(Integer id);
+
+    void updateHtje(PrjContract prjContract);
 }
 

src/main/java/com/liang/service/PrjContractService.java

@@ -86,5 +86,5 @@ public interface PrjContractService {
      */
     int updateSpzt(Map map);
 
-    int selectByMcAndHtjr(PrjContract prjContract);
+    List<PrjContract> selectByMcAndHtjr(PrjContract prjContract);
 }

src/main/java/com/liang/service/StaPayapprovalService.java

@@ -1,9 +1,6 @@
 package com.liang.service;
 
-import com.liang.entity.PrjProject;
-import com.liang.entity.StaBudgetapproval;
-import com.liang.entity.StaPayapproval;
-import com.liang.entity.StaReimbursement;
+import com.liang.entity.*;
 import com.liang.vo.dto.ViewFileVo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -105,4 +102,6 @@ public interface StaPayapprovalService {
 
 
     Double selectPayByFkjh(Integer id);
+
+    void updateHtje(PrjContract prjContract);
 }

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

@@ -116,7 +116,7 @@ public class PrjContractServiceImpl implements PrjContractService {
     }
 
     @Override
-    public int selectByMcAndHtjr(PrjContract prjContract) {
+    public List<PrjContract> selectByMcAndHtjr(PrjContract prjContract) {
         return this.prjContractDao.selectByMcAndHtjr(prjContract);
     }
 }

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

@@ -238,4 +238,9 @@ public class StaPayapprovalServiceImpl implements StaPayapprovalService {
         return staPayapprovalDao.selectPayByFkjh(id);
     }
 
+    @Override
+    public void updateHtje(PrjContract prjContract) {
+        staPayapprovalDao.updateHtje(prjContract);
+    }
+
 }

src/main/resources/mapper/PrjContractDao.xml

@@ -214,7 +214,7 @@
         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,
+        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
@@ -232,8 +232,8 @@
         <if test="rwsmc != null and rwsmc != ''">
             and x.ZWMC like '%'+#{rwsmc}+'%'
         </if>
-        <if test="id != null and id != ''">
-            and u.user_id = #{id}
+        <if test="deptId != null and deptId != ''">
+            and u.dept_id = #{deptId}
         </if>
         <if test="erpbh != null and erpbh != ''">
             and x.erpbh like '%'+#{erpbh}+'%'
@@ -259,8 +259,15 @@
             </otherwise>
         </choose>
     </select>
-    <select id="selectByMcAndHtjr" resultType="java.lang.Integer">
-        SELECT COUNT(*)FROM prj_Contract WHERE HTMC =#{htmc}  AND HTJE =#{htje}
+    <select id="selectByMcAndHtjr" resultType="com.liang.entity.PrjContract">
+        SELECT c.*,
+               u.name AS CJRXM
+        FROM prj_Contract c
+                 LEFT JOIN sys_user_info u ON u.user_id = c.CJR
+        WHERE HTMC LIKE '%'+#{htmc}+'%'
+            AND HTJE = #{htje}
+          AND ZT = 1
     </select>
+
 </mapper>
 

src/main/resources/mapper/StaPayapprovalDao.xml

@@ -311,6 +311,11 @@
         set SPZT = #{spzt}
         where ID = #{id}
     </update>
+    <update id="updateHtje">
+        update sta_PayApproval
+        set HTJE = #{htje}
+        where HT = #{id}
+    </update>
 
 
     <select id="getFksq" resultMap="StaPayapprovalMap">

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

@@ -1715,6 +1715,10 @@
             for (var i = 0; i < dataBudget.length; i++) {
                 if (bm == dataBudget[i].bm) {
                     value = parseFloat(value);
+                    if (value<0){
+                        alert("金额不能为负数或无效的数字，请重新输入！");
+                        value = null;
+                    }
                     // if(isNaN(value))
                     //     value = null;
                     // var rwsys = $("#rwsys").val();