中间计量申请详情

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

@@ -116,19 +116,19 @@ public class MiddleMeterApplyController extends BladeController {
 		return R.success("新增成功");
 	}
 
-//	/**
-//	 * 获取详情
-//	 */
-//	@GetMapping("/detail")
-//	@ApiOperationSupport(order = 6)
-//	@ApiOperation(value = "获取详情", notes = "传入id，返回详情，修改时回显")
-//	@ApiImplicitParams(value = {
-//			@ApiImplicitParam(name = "id", value = "计量申请id", required = true),
-//	})
-//	public R<MeterInventoryDetailVO> detail(Long id) {
-//		MeterInventoryDetailVO  vo = middleMeterApplyService.detail(id);
-//		return R.data(vo);
-//	}
+	/**
+	 * 获取详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "获取详情", notes = "传入id，返回详情，修改时回显")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "id", value = "计量申请id", required = true),
+	})
+	public R<MiddleMeterApplyVO> detail(Long id) {
+		MiddleMeterApplyVO  vo = middleMeterApplyService.detail(id);
+		return R.data(vo);
+	}
 
 	/**
 	 * 修改 中间计量申请表

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

@@ -49,4 +49,8 @@ public interface MiddleMeterApplyMapper extends BaseMapper<MiddleMeterApply> {
     IPage<MiddleMeterApplyVO> page2(IPage<MiddleMeterApplyVO> iPage,@Param("apply") MiddleMeterApply middleMeterApply);
 
     List<MeterInventoryDetailVO> meterPeriodAllForm(@Param("apply") MiddleMeterApply apply);
+
+    MiddleMeterApplyVO getById(@Param("id") Long id);
+
+    List<MeterInventoryVO> getForm(@Param("id") Long id,@Param("contractId") Long contractId);
 }

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

@@ -81,6 +81,20 @@
         from s_inventory_form_apply ifa left join s_contract_inventory_form cif on ifa.contract_form_id = cif.id
         WHERE ifa.contract_id = #{apply.contractId} and ifa.contract_period_id =#{apply.contractPeriodId} and ifa.is_deleted = 0
     </select>
+    <select id="getById" resultType="org.springblade.meter.vo.MiddleMeterApplyVO">
+        select *
+        from s_middle_meter_apply where id = #{id}
+    </select>
+    <select id="getForm" resultType="org.springblade.meter.vo.MeterInventoryVO">
+        select cif.id,cif.form_number,cif.form_name,cif.current_price,cif.change_total,
+        IFNULL((select sum(build_picture_total) from s_inventory_form_meter where is_deleted = 0 and contract_form_id = cif.id),0) as resolveTotal,
+               ifa.current_meter_total as currentMeterTotal,0 as containChangeTotal,
+               ifa.current_meter_money as currentMeterMoney,
+        (IFNULL((select sum(current_meter_total) from s_inventory_form_apply where is_deleted = 0 and contract_form_id = cif.id),0)) as allMeterTotal
+        from s_inventory_form_apply ifa left join s_contract_inventory_form cif on ifa.contract_form_id = cif.id
+        where ifa.contract_id = #{contractId} and ifa.is_deleted = 0
+        AND ifa.middle_meter_id = #{id}
+    </select>
 
 
 </mapper>

blade-service/blade-meter/src/main/java/org/springblade/meter/service/IMiddleMeterApplyService.java

@@ -55,5 +55,5 @@ public interface IMiddleMeterApplyService extends BaseService<MiddleMeterApply>
 
     List<MeterInventoryDetailVO> formDetail(MiddleMeterApply middleMeterApply);
 
-    MeterInventoryDetailVO detail(Long id);
+    MiddleMeterApplyVO detail(Long id);
 }

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

@@ -311,10 +311,17 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
      * 获取详情
      */
     @Override
-    public MeterInventoryDetailVO detail(Long id) {
+    public MiddleMeterApplyVO detail(Long id) {
         //获取中间计量申请
+        MiddleMeterApplyVO vo = baseMapper.getById(id);
         //获取计量清单列表
+        List<MeterInventoryVO> formList = baseMapper.getForm(id,vo.getContractId());
+        vo.setFormList(formList);
         //获取附件列表
-        return null;
+        List<AttachmentForm> list = attachmentFormService.list(new LambdaQueryWrapper<AttachmentForm>()
+                .eq(AttachmentForm::getContractId, vo.getContractId())
+                .eq(AttachmentForm::getMasterId, id));
+        vo.setFileList(list);
+        return vo;
     }
 }