合同计量期删除-增加材料调差判断

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/ContractMeterPeriodVO.java

@@ -35,7 +35,10 @@ public class ContractMeterPeriodVO extends ContractMeterPeriod {
 	@ApiModelProperty(value = "存在数据状态,0不存在，1已存在。如果存在数据则不能删除可以修改")
 	private Integer dataStatus;
 
-	@ApiModelProperty(value = "引用状态,0未引用，1引用。如果被引用就不能删除不能修改")
+	@ApiModelProperty(value = "报表引用状态,0未引用，1引用。如果被引用就不能删除不能修改")
 	private Integer citeStatus;
 
+	@ApiModelProperty(value = "材料引用状态,0未引用，1引用。最后判断引用是合并结果")
+	private Integer citeStatus2;
+
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/ContractMeterPeriodMapper.xml

@@ -40,7 +40,8 @@
     <select id="allPeriod" resultType="org.springblade.meter.vo.ContractMeterPeriodVO">
         select *,
                if((select count(1) from s_middle_meter_apply mma where contract_id = #{contractId} and is_deleted = 0 and mma.contract_period_id = cmp.id)=0,0,1) as dataStatus,
-               if((select count(1) from s_interim_pay_certificate ipc where contract_id = #{contractId} and is_deleted = 0 and ipc.contract_period_id = cmp.id)=0,0,1) as citeStatus
+               if((select count(1) from s_interim_pay_certificate ipc where contract_id = #{contractId} and is_deleted = 0 and ipc.contract_period_id = cmp.id)=0,0,1) as citeStatus,
+               if((select count(1) from s_contract_material_adjust cma where contract_id = #{contractId} and is_deleted = 0 and cma.meter_period_id = cmp.id)=0,0,1) as citeStatus2
         from s_contract_meter_period cmp
         where is_deleted = 0 and contract_id = #{contractId}
         ORDER BY sort

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/ContractMeterPeriodServiceImpl.java

@@ -101,15 +101,21 @@ public class ContractMeterPeriodServiceImpl extends BaseServiceImpl<ContractMete
     }
 
     /**
-     * 计量期列表-全部 材料开工计量期表
+     * 计量期列表-全部
      */
     @Override
     public List<ContractMeterPeriodVO> allPeriod(Long contractId) {
-        return baseMapper.allPeriod(contractId);
+        List<ContractMeterPeriodVO> list = baseMapper.allPeriod(contractId);
+        for (ContractMeterPeriodVO vo : list) {
+            if (vo.getCiteStatus2() == 1){
+                vo.setCiteStatus(1);
+            }
+        }
+        return list;
     }
 
     /**
-     * 计量期列表-未关联报表 材料开工计量期表
+     * 计量期列表-未关联报表
      */
     @Override
     public List<ContractMeterPeriod> conditionPeriod(Long contractId) {

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MeterTreeContractServiceImpl.java

@@ -420,6 +420,9 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
 
         try {
             for (MeterTreeContractSaveDTO selectNode : dataList) {
+                if (StringUtils.isBlank(selectNode.getNodeName())){
+                    throw new ServiceException("有节点未设置名称");
+                }
                 if (selectNode.getIsAddChildNode().equals(0)) {
                     /*================== 不划分子级 ==================*/
                     MeterTreeProject pObj = meterTreeProjectMapper.selectById(selectNode.getLeftNodeId());