解决TravelCost中index.js冲突

zjugis-business/src/main/java/com/zjugis/business/mapper/ContractMapper.java

@@ -66,4 +66,8 @@ public interface ContractMapper extends BaseMapperX<Contract> {
     List<ManagePersonDto> signGroupByPerson(String year);
 
     List<ManagePersonDto> newGroupByPerson(String year);
+
+    BigDecimal getSumContractById(String projectId);
+
+    BigDecimal getSumChildById(String parentId);
 }

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractServiceImpl.java

@@ -19,6 +19,7 @@ import com.zjugis.business.flow.usemoney.controller.vo.UseMoneyDeptRespVO;
 import com.zjugis.business.flow.usemoney.service.UseMoneyDetailService;
 import com.zjugis.business.flow.usemoney.service.UseMoneyService;
 import com.zjugis.business.mapper.ContractMapper;
+import com.zjugis.business.mapper.ProjectAmountMapper;
 import com.zjugis.business.mapper.ProjectMapper;
 import com.zjugis.business.service.*;
 import com.zjugis.framework.common.exception.ServiceException;
@@ -37,6 +38,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -97,6 +99,9 @@ public class ContractServiceImpl implements ContractService{
 
     @Autowired
     private CommonService commonService;
+    @Autowired
+    ProjectAmountMapper projectAmountMapper;
+
 
     @Override
     public String insert(Contract contract) {
@@ -116,7 +121,36 @@ public class ContractServiceImpl implements ContractService{
         Contract contract = new Contract();
         BeanUtils.copyProperties(record,contract);
         updateProjectXsry(record);
-        return contractMapper.updateById(contract);
+        if(contract.getTaxHsjeTotal()!=null){
+            contract.setContractAmount(contract.getTaxHsjeTotal());
+        }
+        int count =contractMapper.updateById(contract);
+        Contract contract1=contractMapper.selectById(contract.getId());
+        ProjectAmount projectAmounts = projectAmountService.selectById(contract1.getProjectId());
+        //更新PROJECT_AMOUNT表
+        ProjectAmount projectAmount=new ProjectAmount();
+        projectAmount.setProjectId(contract1.getProjectId());
+        projectAmount.setContractAmount(contractMapper.getSumContractById(contract1.getProjectId()));
+        projectAmount.setContractBalance(projectAmount.getContractAmount().subtract(projectAmounts.getReceivableAmount()).subtract(projectAmounts.getReturnAmount()));
+        projectAmount.setUpdateTime(LocalDateTime.now());
+        projectAmountMapper.updateById(projectAmount);
+        //如果是有子合同的主合同，更新项目产值和更新PROJECT_AMOUNT的虚拟合同额
+        if(contract1.getContractType()!=null&&contract1.getContractType().equals(1)){
+            //Contract contract2=contractMapper.selectById(contract1.getParentId());
+            BigDecimal child = contractMapper.getSumChildById(contract1.getId());
+            if(child!=null){
+               // Contract parentcon=contractMapper.selectById(contract1.getParentId());
+                Project project=new Project();
+                project.setId(contract1.getProjectId());
+                project.setOutputValue(contract1.getContractAmount().subtract(child));
+                projectMapper.updateById(project);
+                ProjectAmount projectAmount2=new ProjectAmount();
+                projectAmount2.setProjectId(contract1.getProjectId());
+                projectAmount2.setVirtualAmount(child);
+                projectAmountMapper.updateById(projectAmount2);
+            }
+        }
+        return count;
     }
 
     private void updateProjectXsry(ContractRequest record) {

zjugis-business/src/main/resources/mapper/oracle/ContractMapper.xml

@@ -707,4 +707,12 @@
         </where>
         GROUP BY c.AREA_MANAGER_ID
     </select>
+    <select id="getSumContractById" resultType="java.math.BigDecimal">
+        select sum(CONTRACT_AMOUNT) as amount from CONTRACT c
+        where project_id=#{projectId} and c.ISVALID = 1  AND c.FLOW_STATUS IN (90,99)
+    </select>
+    <select id="getSumChildById" resultType="java.math.BigDecimal">
+        select sum(VIRTUAL_AMOUNT) as amount from CONTRACT c
+        where parent_id=#{parentId} and c.ISVALID = 1 AND c.FLOW_STATUS IN (90,99)
+    </select>
 </mapper>

zjugis-business/src/main/resources/templates/AssetProcure/js/agentIndex.js

@@ -272,30 +272,37 @@
         }
         if (!(!isTimes[i].projectName || isTimes[i].projectName.trim() === '')) {
           z.ui.input("[name='AssetProcureDetailDO[" + i + "]$projectName']").setValue(isTimes[i].projectName);
+          $("[name='AssetProcureDetailDO[" + i + "]$projectName']").attr('title',isTimes[i].projectName);
         }
         // if (!(!isTimes[i].projectDeptName || isTimes[i].projectDeptName.trim() === '')) {
         //   z.ui.input("[name='AssetProcureDetailDO[" + i + "]$xmzrbm']").setValue(isTimes[i].projectDeptName);
         // }
         if (!(!isTimes[i].assetNo || isTimes[i].assetNo.trim() === '')) {
           z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetNo']").setValue(isTimes[i].assetNo);
+          $("[name='AssetProcureDetailDO[" + i + "]$assetNo']").attr('title',isTimes[i].assetNo);
         }
         if (!(!isTimes[i].assetName || isTimes[i].assetName.trim() === '')) {
           z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetName']").setValue(isTimes[i].assetName);
+          $("[name='AssetProcureDetailDO[" + i + "]$assetName']").attr('title',isTimes[i].assetName);
         }
         if (!(!isTimes[i].assetType || isTimes[i].assetType.trim() === '')) {
           z.ui.select("[name='AssetProcureDetailDO["+i+"]$assetType']").setValue(isTimes[i].assetType);
+          $("[name='AssetProcureDetailDO[" + i + "]$assetType']").attr('title',isTimes[i].assetType);
         }
         if (!(!isTimes[i].assetModel || isTimes[i].assetModel.trim() === '')) {
           z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetModel']").setValue(isTimes[i].assetModel);
+          $("[name='AssetProcureDetailDO[" + i + "]$assetModel']").attr('title',isTimes[i].assetModel);
         }
         if (!!isTimes[i].amount ) {
           z.ui.input("[name='AssetProcureDetailDO[" + i + "]$amount']").setValue(isTimes[i].amount);
+          $("[name='AssetProcureDetailDO[" + i + "]$amount']").attr('title',isTimes[i].amount);
         }
         // if (!(!isTimes[i].assetConfig || isTimes[i].assetConfig.trim() === '')) {
         //   z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetConfig']").setValue(isTimes[i].assetConfig);
         // }
         if (!(!isTimes[i].bz1 || isTimes[i].bz1.trim() === '')) {
           z.ui.input("[name='AssetProcureDetailDO[" + i + "]$bz1']").setValue(isTimes[i].bz1);
+          $("[name='AssetProcureDetailDO[" + i + "]$bz1']").attr('title',isTimes[i].bz1);
         }
         if (!(!isTimes[i].assetId || isTimes[i].assetId.trim() === '')) {
           $("#editBtn_" + i).find("span").html("编辑")

zjugis-business/src/main/resources/templates/AssetProcure/js/index.js

@@ -225,27 +225,35 @@
         }
         if (!(!isTimes[i].procureTime || isTimes[i].procureTime.trim() === '')) {
           z.ui.date("[name='AssetProcureDetailDO[" + i + "]$procureTime']").setValue(isTimes[i].procureTime);
+          $("[name='AssetProcureDetailDO[" + i + "]$procureTime']").attr('title',isTimes[i].procureTime);
         }
         if (!(!isTimes[i].assetNo || isTimes[i].assetNo.trim() === '')) {
           z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetNo']").setValue(isTimes[i].assetNo);
+          $("[name='AssetProcureDetailDO[" + i + "]$assetNo']").attr('title',isTimes[i].assetNo);
         }
         if (!(!isTimes[i].assetName || isTimes[i].assetName.trim() === '')) {
           z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetName']").setValue(isTimes[i].assetName);
+          $("[name='AssetProcureDetailDO[" + i + "]$assetName']").attr('title',isTimes[i].assetName);
         }
         if (!(!isTimes[i].assetType || isTimes[i].assetType.trim() === '')) {
           z.ui.select("[name='AssetProcureDetailDO["+i+"]$assetType']").setValue(isTimes[i].assetType);
+          $("[name='AssetProcureDetailDO[" + i + "]$assetType']").attr('title',isTimes[i].assetType);
         }
         if (!(!isTimes[i].assetModel || isTimes[i].assetModel.trim() === '')) {
           z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetModel']").setValue(isTimes[i].assetModel);
+          $("[name='AssetProcureDetailDO[" + i + "]$assetModel']").attr('title',isTimes[i].assetModel);
         }
         if (!!isTimes[i].amount ) {
           z.ui.input("[name='AssetProcureDetailDO[" + i + "]$amount']").setValue(isTimes[i].amount);
+          $("[name='AssetProcureDetailDO[" + i + "]$amount']").attr('title',isTimes[i].amount);
         }
         if (!(!isTimes[i].assetConfig || isTimes[i].assetConfig.trim() === '')) {
           z.ui.input("[name='AssetProcureDetailDO[" + i + "]$assetConfig']").setValue(isTimes[i].assetConfig);
+          $("[name='AssetProcureDetailDO[" + i + "]$assetConfig']").attr('title',isTimes[i].assetConfig);
         }
         if (!(!isTimes[i].bz1 || isTimes[i].bz1.trim() === '')) {
           z.ui.input("[name='AssetProcureDetailDO[" + i + "]$bz1']").setValue(isTimes[i].bz1);
+          $("[name='AssetProcureDetailDO[" + i + "]$bz1']").attr('title',isTimes[i].bz1);
         }
         if (!(!isTimes[i].assetId || isTimes[i].assetId.trim() === '')) {
           $("#editBtn_" + i).find("span").html("编辑")

zjugis-business/src/main/resources/templates/OutsourcePurchase/js/index.js

@@ -182,21 +182,27 @@
     }
     if (!(!isTimes[i].purchaseTime || isTimes[i].purchaseTime.trim() === '')) {
       z.ui.date("[name='OutsourcePurchaseDet[" + i + "]$purchaseTime']").setValue(isTimes[i].purchaseTime);
+      $("[name='OutsourcePurchaseDet[" + i + "]$purchaseTime']").attr('title',isTimes[i].purchaseTime);
     }
     if (!(!isTimes[i].assetName || isTimes[i].assetName.trim() === '')) {
       z.ui.input("[name='OutsourcePurchaseDet[" + i + "]$assetName']").setValue(isTimes[i].assetName);
+      $("[name='OutsourcePurchaseDet[" + i + "]$assetName']").attr('title',isTimes[i].assetName);
     }
     if (!(!isTimes[i].assetModel || isTimes[i].assetModel.trim() === '')) {
       z.ui.input("[name='OutsourcePurchaseDet[" + i + "]$assetModel']").setValue(isTimes[i].assetModel);
+      $("[name='OutsourcePurchaseDet[" + i + "]$assetModel']").attr('title',isTimes[i].assetModel);
     }
     if (!(!isTimes[i].totalAmount )) {
       z.ui.input("[name='OutsourcePurchaseDet[" + i + "]$totalAmount']").setValue(isTimes[i].totalAmount);
+      $("[name='OutsourcePurchaseDet[" + i + "]$totalAmount']").attr('title',isTimes[i].totalAmount);
     }
     if (!(!isTimes[i].purchaseCount)) {
       z.ui.input("[name='OutsourcePurchaseDet[" + i + "]$purchaseCount']").setValue(isTimes[i].purchaseCount);
+      $("[name='OutsourcePurchaseDet[" + i + "]$purchaseCount']").attr('title',isTimes[i].purchaseCount);
     }
     if (!(!isTimes[i].bz || isTimes[i].bz.trim() === '')) {
       z.ui.input("[name='OutsourcePurchaseDet[" + i + "]$bz']").setValue(isTimes[i].bz);
+      $("[name='OutsourcePurchaseDet[" + i + "]$bz']").attr('title',isTimes[i].bz);
     }
     if (!(!isTimes[i].outsourcePurchaseId || isTimes[i].outsourcePurchaseId.trim() === '')) {
       $("#editBtn_" + i).find("span").html("编辑")

zjugis-business/src/main/resources/templates/TravelCost/js/index.js

@@ -164,8 +164,10 @@
         trDom.id = "boat_car_" + i;
         trDom.className = 'qjsjClass'
         trDom.innerHTML = '<td class="operation_icon"><span class="up_btn"></span><span class="down_btn"></span></td>'
-            + '<td name="boat_car_seq">' + (i + 1)
-            + '<input type="hidden" name="TravelCostBoatCarDO[' + i + ']$indexCode" value="'+ (i + 1) +'" />'
+            + '<td name="boat_car_seq">' + '<span>' +(i + 1)+ '</span>'
+            + '<div>'
+            + '<input type="hidden" name="TravelCostBoatCarDO[' + i + ']$indexCode" value="'+ (i + 1) +'">'
+            + '</div>'
             + '</td>'
             + '<td>'
             + '<div class="form-flex">'
@@ -641,7 +643,15 @@
         let elementsByName = document.getElementsByName(name);
         for (let i = 0; i < elementsByName.length; i++) {
             const seqElement = elementsByName[i];
-            seqElement.innerHTML = i + 1;
+            if(name==='boat_car_seq'){
+                let spanElement = seqElement.getElementsByTagName("span");
+                spanElement[0].innerHTML = i + 1;
+                let detailInput = seqElement.getElementsByTagName("input");
+                detailInput[0].value = i + 1;
+            } else {
+                seqElement.innerHTML = i + 1;
+            }
+
         }
     }
 

zjugis-business/src/main/resources/templates/UseMoney/js/agentIndex.js

@@ -193,24 +193,31 @@
     }
     if (!(!isTimes[i].projectName || isTimes[i].projectName.trim() === '')) {
       z.ui.input("[name='UserMoneyDetailDO[" + i + "]$projectName']").setValue(isTimes[i].projectName);
+      $("[name='UserMoneyDetailDO[" + i + "]$remark']").attr('title',isTimes[i].projectName);
     }
     if (!(!isTimes[i].projectNo || isTimes[i].projectNo.trim() === '')) {
       z.ui.input("[name='UserMoneyDetailDO[" + i + "]$xmbh']").setValue(isTimes[i].projectNo);
+      $("[name='UserMoneyDetailDO[" + i + "]$xmbh']").attr('title',isTimes[i].projectNo);
     }
     if (!(!isTimes[i].projectDeptName || isTimes[i].projectDeptName.trim() === '')) {
       z.ui.input("[name='UserMoneyDetailDO[" + i + "]$xmzrbm']").setValue(isTimes[i].projectDeptName);
+      $("[name='UserMoneyDetailDO[" + i + "]$xmzrbm']").attr('title',isTimes[i].projectDeptName);
     }
     if (!(!isTimes[i].costContent || isTimes[i].costContent.trim() === '')) {
       z.ui.input("[name='UserMoneyDetailDO[" + i + "]$costContent']").setValue(isTimes[i].costContent);
+      $("[name='UserMoneyDetailDO[" + i + "]$costContent']").attr('title',isTimes[i].costContent);
     }
     if (!(!isTimes[i].invoiceNums )) {
       z.ui.input("[name='UserMoneyDetailDO[" + i + "]$invoiceNums']").setValue(isTimes[i].invoiceNums);
+      $("[name='UserMoneyDetailDO[" + i + "]$invoiceNums']").attr('title',isTimes[i].invoiceNums);
     }
     if (!(!isTimes[i].amount)) {
       z.ui.input("[name='UserMoneyDetailDO[" + i + "]$amount']").setValue(isTimes[i].amount);
+      $("[name='UserMoneyDetailDO[" + i + "]$amount']").attr('title',isTimes[i].amount);
     }
     if (!(!isTimes[i].remark || isTimes[i].remark.trim() === '')) {
       z.ui.input("[name='UserMoneyDetailDO[" + i + "]$remark']").setValue(isTimes[i].remark);
+      $("[name='UserMoneyDetailDO[" + i + "]$remark']").attr('title',isTimes[i].remark);
     }
     if (!(!isTimes[i].useMoneyId || isTimes[i].useMoneyId.trim() === '')) {
       $("#editBtn_" + i).find("span").html("编辑")

zjugis-business/src/main/resources/templates/UseMoney/js/index.js

@@ -161,15 +161,19 @@
     }
     if (!(!isTimes[i].costContent || isTimes[i].costContent.trim() === '')) {
       z.ui.input("[name='UserMoneyDetailDO[" + i + "]$costContent']").setValue(isTimes[i].costContent);
+      $("[name='UserMoneyDetailDO[" + i + "]$costContent']").attr('title',isTimes[i].costContent);
     }
     if (!(!isTimes[i].invoiceNums )) {
       z.ui.input("[name='UserMoneyDetailDO[" + i + "]$invoiceNums']").setValue(isTimes[i].invoiceNums);
+      $("[name='UserMoneyDetailDO[" + i + "]$invoiceNums']").attr('title',isTimes[i].invoiceNums);
     }
     if (!(!isTimes[i].amount)) {
       z.ui.input("[name='UserMoneyDetailDO[" + i + "]$amount']").setValue(isTimes[i].amount);
+      $("[name='UserMoneyDetailDO[" + i + "]$amount']").attr('title',isTimes[i].amount);
     }
     if (!(!isTimes[i].remark || isTimes[i].remark.trim() === '')) {
       z.ui.input("[name='UserMoneyDetailDO[" + i + "]$remark']").setValue(isTimes[i].remark);
+      $("[name='UserMoneyDetailDO[" + i + "]$remark']").attr('title',isTimes[i].remark);
     }
 
     if (!(!isTimes[i].useMoneyId || isTimes[i].useMoneyId.trim() === '')) {