Merge branch 'dev_supervise' into pre-production

# Conflicts:
#	blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.java
#	blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml
#	blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
#	blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java

@@ -62,11 +62,12 @@ public class ClassifyApi {
 	@GetMapping("/myApiIndicatorsDetail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "我的考核列表")
-	public R myApiIndicatorsDetail(@RequestParam Long Id) {
+	public R myApiIndicatorsDetail(@RequestParam Long id) {
-		R r = classifyService.myApiIndicatorsDetail(Id);
+		R r = classifyService.myApiIndicatorsDetail(id);
 		return r;
 	}
 
+
 	@PostMapping("/updateApiIndicators")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "小程序保存考核内容", notes = "传入classify")
@@ -75,6 +76,18 @@ public class ClassifyApi {
 		return r;
 	}
 
+	@PostMapping("/updateApiIndicators")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "小程序保存考核内容", notes = "传入classify")
+	public R updateApiIndicators(@RequestBody IndicatorsDTO instanceofDTO) {
+		R r = classifyService.updateApiIndicators(instanceofDTO);
+		return r;
+	}
+
+
+
+
+
 
 
 

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml

@@ -8,8 +8,8 @@
     <select id="findListByIndicatorsIdAndType" resultType="com.logpm.supervise.entity.IndicatorsAnnexEntity">
         select *
         from sup_indicators_annex
-        where indicators_id = #{id}
+        and indicators_id = #{id}
-        and `type` = #{type}
+        and type = #{type}
     </select>
 
 </mapper>

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java

@@ -25,5 +25,5 @@ public interface IndicatorsMapper extends BaseMapper<IndicatorsEntity> {
 	 * @param params
 	 * @return
 	 */
-    Page<IndicatorsVO> selectMyApiIndicators(IPage<IndicatorsVO> page, Map<String, Object> params);
+    Page<IndicatorsVO> selectMyApiIndicators(IPage<IndicatorsVO> page,@Param("params") Map<String, Object> params);
 }