Merge branch 'dev' into pre-production

# Conflicts:
#	blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java
#	blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java

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

@@ -76,4 +76,20 @@ public class ClassifyApi {
 		return r;
 	}
 
+
+
+
+
+
+
+
+	@GetMapping("/beMyApiIndicatorsDetail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "我被考核的列表")
+	public R beMyApiIndicatorsDetail(@RequestParam Map<String, Object> params,Query query) {
+		IPage<IndicatorsVO> page = Condition.getPage(query);
+		R r = classifyService.beMyApiIndicatorsDetail(params,page);
+		return r;
+	}
+
 }

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

@@ -26,4 +26,12 @@ public interface IndicatorsMapper extends BaseMapper<IndicatorsEntity> {
 	 * @return
 	 */
     Page<IndicatorsVO> selectMyApiIndicators(IPage<IndicatorsVO> page,@Param("params") Map<String, Object> params);
+
+	/**
+	 * 查询我被考核的列表
+	 * @param page
+	 * @param params
+	 * @return
+	 */
+	Page<IndicatorsVO> selectBeMyApiIndicators(IPage<IndicatorsVO> page, Map<String, Object> params);
 }

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

@@ -58,5 +58,31 @@
             and date_format(si.create_time,'%y%m%d%') <= date_format(#{params.endTime},'%y%m%d%')
         </if>
     </select>
+    <select id="selectBeMyApiIndicators" resultType="com.logpm.supervise.vo.IndicatorsVO">
+        SELECT
+        si.*,
+        sc.NAME AS classifyName,
+        t.加分,
+        t.扣分
+        FROM
+        sup_indicators AS si
+        LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id
+        LEFT JOIN (SELECT
+        sum( CASE WHEN point &lt; 0 THEN point ELSE 0 END ) AS 扣分,
+        sum( CASE WHEN point &gt; 0 THEN point ELSE 0 END ) AS 加分,
+        id AS id,
+        assess_dept AS assess_dept
+        FROM
+        sup_indicators WHERE
+        assess_dept = #{deptId} AND DATE_FORMAT( create_time,'%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) AS t ON t.id = si.id
+        WHERE si.assess_dept = #{deptId}
+        <if test="params.startTime != null and params.startTime != ''" >
+            AND date_format(si.create_time,'%y%m%d%') >= date_format(#{params.startTime},'%y%m%d%')
+        </if>
+        <if test="params.endTime != null and params.endTime != ''" >
+            AND date_format(si.create_time,'%y%m%d%') &lt;= date_format(#{params.endTime},'%y%m%d%')
+        </if>
+        GROUP BY si.assess_dept
+    </select>
 
 </mapper>

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java

@@ -86,4 +86,12 @@ public interface IClassifyService extends BaseService<ClassifyEntity> {
 	 * @return
 	 */
 	R updateApiIndicators(IndicatorsDTO instanceofDTO);
+
+	/**
+	 *
+	 * @param params
+	 * @param page
+	 * @return
+	 */
+	R beMyApiIndicatorsDetail(Map<String, Object> params, IPage<IndicatorsVO> page);
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -301,6 +301,26 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		return R.status(iIndicatorsService.updateById(indicatorsEntity));
 	}
 
+	/**
+	 * @param params
+	 * @param page
+	 * @return
+	 */
+	@Override
+	public R beMyApiIndicatorsDetail(Map<String, Object> params, IPage<IndicatorsVO> page) {
+		BladeUser user = AuthUtil.getUser();
+		if (Func.isNotEmpty(user)){
+//			params.put("userId",user.getUserId());
+			if (Func.isNotEmpty(user.getDeptId())){
+				params.put("deptId",user.getDeptId());
+			}
+		}
+		Page<IndicatorsVO> indicatorsVOPage = indicatorsMapper.selectBeMyApiIndicators(page, params);
+
+
+		return R.data(indicatorsVOPage);
+	}
+
 	private List<ClassifyApiVO> getClassifyList(Long pid) {
 	 return baseMapper.selectAllClassifyList(pid);
 	}