删除合同增加判断

sql/20200423.sql

@@ -0,0 +1,19 @@
+UPDATE ic_contract_floor
+SET del_flag = 0
+WHERE
+	id IN (
+	SELECT
+		a.id
+	FROM
+		(
+		SELECT
+			*
+		FROM
+			ic_contract_floor a
+		WHERE
+			EXISTS ( SELECT update_time FROM ic_contract_floor WHERE a.update_time = update_time GROUP BY update_time HAVING count( * ) >= 2 )
+		) AS a
+	)
+
+
+update project_application set pass = null

src/main/java/platform/modules/carrier/service/IcContractService.java

@@ -216,6 +216,21 @@ public class IcContractService extends BaseService<Contract> {
                     contractFloor.setStatus(Constant.CONTRACT_STATUS.TERMINATE);
                     contractFloor.setTerminate_time(terminate_time);
                     contractFloorService.updateSelective(contractFloor);
+                    //中止合同 更新y_floor 返还面积
+//                    BuildFloor bf = new BuildFloor();
+////                    BuildFloor buildFloor = null;
+////                    bf.setBuilding_id(contractFloor.getBuilding_id());
+////                    bf.setFloor(contractFloor.getFloor());
+////                    bf.setDel_flag(false);
+////                    List<BuildFloor> floor = floorService.findListByWhere(bf);
+////                    if (!CollectionUtils.isEmpty(floor)) {
+////                        buildFloor = floor.get(0);
+////                        Double remain_area = buildFloor.getRemain_area();
+////                        Double area = contractFloor.getArea();
+////                        remain_area += area;
+////                        buildFloor.setRemain_area(remain_area);
+////                    }
+////                    floorService.updateSelective(buildFloor);
                 }
             }
         }
@@ -386,6 +401,9 @@ public class IcContractService extends BaseService<Contract> {
      */
     public void batchDeleteByContractId(Integer id) {
 
+        if (id == null)
+            return;
+
         Contract contract = new Contract();
         contract.setId(id);
         contract.setDel_flag(true);
@@ -489,6 +507,12 @@ public class IcContractService extends BaseService<Contract> {
 
                                     //获取楼层已租面积
                                     total_rent_area += floorService.findRentArea(buildingDto.getId(), floorDto.getFloor());
+
+                                    double temp_remain_area = total_area - total_rent_area;
+                                    if (temp_remain_area < 0) {
+                                        temp_remain_area = 0d;
+                                    }
+                                    total_remain_area += temp_remain_area;
                                 }
                             }
                             buildingDto.setArea(new BigDecimal(total_area).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());

src/main/java/platform/modules/company/dto/StockLandApprovalDto.java

@@ -14,7 +14,9 @@ import platform.modules.government.entity.FileDown;
 public class StockLandApprovalDto {
 
     private Integer apply_id;
+
     private String status;    // 1退回,2通过,3不通过
+
     private String approval_comment;
 
     private String approval_department;//审核部门

src/main/java/platform/modules/company/service/StockLandApproveService.java

@@ -272,7 +272,9 @@ public class StockLandApproveService extends BaseService<StockLand> {
 
         StockLand stockland = stockLandService.findLandApplyById(approval.getApply_id());
         Company company = companyService.findCompanyInfo(stockland.getCompany_id());
-        contractService.batchDeleteByContractId(stockland.getContract_id());
+        if(stockland.getContract_id()!=null){
+            contractService.batchDeleteByContractId(stockland.getContract_id());
+        }
 
         Contract contract = approval.getContract();
         List<ContractFloor> floors = contract.getFloors();