质保金

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

@@ -203,15 +203,15 @@ public class ContractServiceImpl implements ContractService{
         contracts.removeAll(dbParents);
         Map<String, List<Contract>> map = contracts.stream().collect(Collectors.groupingBy(Contract::getParentId));
         for (Contract dbParent : dbParents) {
-            UseMoneyBondVO qualityMoney = useMoneyDetailService.getBondData(dbParent.getProjectId());
             ContractResponse r = new ContractResponse();
+            BeanUtils.copyProperties(dbParent, r);
+            UseMoneyBondVO qualityMoney = useMoneyDetailService.getBondData(dbParent.getProjectId());
             if(qualityMoney!= null){
                 if(qualityMoney.getTotalAmount() != null){
                     r.setQualityMoney(new BigDecimal(String.valueOf(qualityMoney.getTotalAmount())));
                 }
                 r.setQualityMoneyStatus(qualityMoney.getIWriteOff());
             }
-            BeanUtils.copyProperties(dbParent, r);
             if(!map.isEmpty()) {
                 List<Contract> children = map.get(r.getId());
                 if(children != null && !children.isEmpty()){

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

@@ -73,7 +73,7 @@
                 AND pr.ZRBM_ID = #{params.deptId}
             </if>
         </where>
-        ORDER BY c.CONTRACT_OFF DESC NULLS LAST,c.CONTRACT_ON DESC NULLS LAST,c.ID
+        ORDER BY c.CONTRACT_ON DESC NULLS LAST,c.CREATE_TIME DESC NULLS LAST,c.ID
     </select>
 
     <select id="relContractSize" resultType="int">