新增根据目录和机构编码查看台账报表数据接口

src/main/java/com/keymobile/indicators/api/parameter/ParameterCtrl.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.keymobile.indicators.constant.Constants;
 import com.keymobile.indicators.model.entity.parameter.ParameterCatalog;
 import com.keymobile.indicators.model.entity.parameter.ParameterData;
+import com.keymobile.indicators.model.entity.parameter.ParameterDataReport;
 import com.keymobile.indicators.service.parameter.ParameterService;
 import com.keymobile.indicators.utils.LogManager;
 
@@ -139,10 +140,17 @@ public class ParameterCtrl {
 	
 	@ApiOperation(value = "根据台账目录统计台账数据报表", notes = "根据台账目录统计台账数据报表")
 	@PostMapping(value = "/statisticalData")
-	public String statisticalData(@RequestParam String user,@RequestParam Integer catalogId,
+	public String statisticalData(@RequestParam(required = false) String user,@RequestParam Integer catalogId,
 			@RequestParam String code) throws Exception{
 		parameterService.statisticalParameterDataReport(user, catalogId, code);
 		LogManager.logInfo(Constants.LOG_INDICATOR_PARAMETER_API,"启动统计台账数据报表");
 		return "台账数据报表统计中......";
 	}
+	
+	@ApiOperation(value = "根据台账目录查看台账数据报表", notes = "根据台账目录查看台账数据报表")
+	@PostMapping(value = "/getParameterDataReport")
+	public List<ParameterDataReport> getParameterDataReport(@RequestParam(required = false) String user,
+			@RequestParam Integer catalogId,@RequestParam String code) throws Exception{
+		return parameterService.getParameterDataReport(user, catalogId, code);
+	}
 }

src/main/java/com/keymobile/indicators/model/mapper/parameter/ParameterDataReportMapper.java

@@ -14,4 +14,7 @@ public interface ParameterDataReportMapper extends BaseMapper<ParameterDataRepor
 	public void deleteByCatalogId(@Param("catalogId")Integer catalogId);
 	
 	public void batchSave(@Param("datas")List<ParameterDataReport> datas);
+	
+	public List<ParameterDataReport> getParameterDataReport(@Param("user")String user,
+			@Param("catalogId")Integer catalogId,@Param("code")String code);
 }

src/main/java/com/keymobile/indicators/service/parameter/ParameterService.java

@@ -230,4 +230,10 @@ public class ParameterService {
 			throw new Exception("台账目录不存在");
 		}
 	}
+	
+	//查看指定台帐目录报表数据
+	public List<ParameterDataReport> getParameterDataReport(String user,Integer catalogId,
+			String code) throws Exception{
+		return parameterDataReportMapper.getParameterDataReport(user, catalogId, code);
+	}
 }

src/main/resources/mybatis/mapping/ParameterDataReportMapper.xml

@@ -19,4 +19,17 @@
 			)
 		</foreach>
 	</insert>
+	
+	<select id="getParameterDataReport" resultType="com.keymobile.indicators.model.entity.parameter.ParameterDataReport">
+		select * 
+		from 
+		parameter_data_report 
+		where 
+		catalog_id = #{catalogId} 
+		and code = #{code} 
+		<if test="user!=null">
+    		and report_user = #{user} 
+    	</if>
+    	order by rank asc
+	</select>
 </mapper>
\ No newline at end of file