Merge remote-tracking branch 'origin/master' into master

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/ContractMaterialAdjust.java

@@ -54,15 +54,15 @@ public class ContractMaterialAdjust extends BaseEntity {
     @NotNull(message = "请传入合同段id!")
     private Long contractId;
 
-    @ApiModelProperty(value = "材料计量期id")
-    @NotNull(message = "请传入材料计量期id!")
+    @ApiModelProperty(value = "计量期(合同计量期id)未上报")
+    @NotNull(message = "请传入计量期id!")
     private Long meterPeriodId;
 
     @ApiModelProperty(value = "合同材料id")
     @NotNull(message = "请传入合同材料id!")
     private Long contractMaterialId;
 
-    @ApiModelProperty(value = "调差期id(合同计量期id)")
+    @ApiModelProperty(value = "调差期id(合同计量期id)已审批")
     @NotNull(message = "请传入调差期id!")
     private Long contractPeriodId;
 

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/ContractMaterialController.java

@@ -149,7 +149,7 @@ public class ContractMaterialController extends BladeController {
 
 	@PostMapping("/get-all-material3")
 	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "材料调差-当前期未调差材料不分页", notes = "传入合同id,材料计量期id")
+	@ApiOperation(value = "材料调差-当前期未调差材料不分页", notes = "传入合同id,计量期id")
 	public R<List<ContractMaterialVO4>> getAllMaterial3(@RequestBody MaterialListDTO dto) {
 		List<ContractMaterialVO4> list = contractMaterialService.getAllMaterial3(dto);
 		return R.data(list);

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -2577,7 +2577,7 @@ public class TaskController extends BladeController {
 
             /*中间计量期状态修改=已审批*/
             jdbcTemplate.update("UPDATE s_contract_meter_period SET approve_status = 2 WHERE id = ? ", task.getFormDataId());
-            jdbcTemplate.update("UPDATE s_contract_material_adjust SET approve_status = 1 WHERE id = ? ", task.getFormDataId());
+            jdbcTemplate.update("UPDATE s_contract_material_adjust SET approve_status = 1 WHERE meter_period_id = ? ", task.getFormDataId());
 
         } else if (task.getMeterTaskType().equals(2)) {
             List<MaterialMeterFormTask> materialMeterFormTasks = materialMeterFormServiceTask.getBaseMapper().selectList(Wrappers.<MaterialMeterFormTask>lambdaQuery()

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

@@ -7,7 +7,7 @@
         select ifa.project_id,ifa.contract_id,ifa.middle_meter_id,ifa.contract_form_id,ifa.current_meter_total as meterTotal,
                 cif.form_number,cif.form_name,cif.unit,
                 (select meter_number from s_middle_meter_apply mma where mma.id = ifa.middle_meter_id) as meterNumber,
-                (select adjust_factor from s_inventory_form_material ifm where ifm.contract_material_id = #{dto.contractMaterialId}
+                (select adjust_factor from s_inventory_form_material ifm where ifm.is_deleted = 0 and ifm.contract_material_id = #{dto.contractMaterialId}
                                             and ifm.contract_form_id = ifa.contract_form_id) as adjustFactor
         from s_inventory_form_apply ifa left join s_contract_inventory_form cif on ifa.contract_form_id = cif.id
         where ifa.is_deleted = 0 and cif.is_deleted = 0 and ifa.contract_id = #{dto.contractId}