Merge branch 'dev' into pre-production

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

@@ -18,7 +18,9 @@ public class IndicatorsVO extends IndicatorsEntity {
 	private Long parentClassifyId;
 
 	private Integer bonusPoin;
+
 	private Integer deductionPoints;
+
 	private String parentClassifyName;
 
 	private List<IndicatorsAnnexEntity> pictures = new ArrayList<>();

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

@@ -0,0 +1,24 @@
+package com.logpm.supervise.vo.api;
+
+import com.logpm.supervise.entity.IndicatorsAnnexEntity;
+import com.logpm.supervise.entity.IndicatorsEntity;
+import com.logpm.supervise.vo.IndicatorsVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class BeIndicatorsVO  {
+	private static final long serialVersionUID = 1L;
+
+
+	private Integer bonusPoin;
+
+	private Integer deductionPoints;
+
+	private List<IndicatorsVO> indicatorsVOS;
+
+
+}

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.logpm.supervise.dto.IndicatorsDTO;
 import com.logpm.supervise.entity.IndicatorsEntity;
 import com.logpm.supervise.vo.IndicatorsVO;
+import com.logpm.supervise.vo.api.BeIndicatorsVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -34,4 +35,11 @@ public interface IndicatorsMapper extends BaseMapper<IndicatorsEntity> {
 	 * @return
 	 */
 	Page<IndicatorsVO> selectBeMyApiIndicators(IPage<IndicatorsVO> page,@Param("params") Map<String, Object> params);
+
+	/**
+	 * 查询我的分数
+	 * @param params
+	 * @return
+	 */
+	BeIndicatorsVO selectMyPoints(Map<String, Object> params);
 }

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

@@ -61,20 +61,7 @@
     <select id="selectBeMyApiIndicators" resultType="com.logpm.supervise.vo.IndicatorsVO">
         SELECT
         si.*,
-        sc.NAME AS classifyName,
-        t.bonusPoin,
-        t.deductionPoints
-        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 deductionPoints,
-        sum( CASE WHEN point &gt; 0 THEN point ELSE 0 END ) AS bonusPoin,
-        id AS id,
-        assess_dept AS assess_dept
-        FROM
-        sup_indicators WHERE
-        assess_dept = #{params.deptId} AND DATE_FORMAT( create_time,'%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) AS t ON t.id = si.id
+        sc.NAME AS classifyName
         WHERE si.assess_dept = #{params.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%')
@@ -82,7 +69,10 @@
         <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
+        GROUP BY si.classify_id
+    </select>
+    <select id="selectMyPoints" resultType="com.logpm.supervise.vo.api.BeIndicatorsVO">
+        select sum(case  when point < 0 then point else 0 end) as deductionPoints , sum(case  when point > 0 then point else 0 end) as bonusPoin from sup_indicators where assess_dept = #{deptId} and DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
     </select>
 
 </mapper>

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

@@ -35,6 +35,7 @@ import com.logpm.supervise.service.IIndicatorsService;
 import com.logpm.supervise.service.IPointsService;
 import com.logpm.supervise.vo.ClassifyVO;
 import com.logpm.supervise.vo.IndicatorsVO;
+import com.logpm.supervise.vo.api.BeIndicatorsVO;
 import com.logpm.supervise.vo.api.ClassifyApiVO;
 import com.logpm.supervise.wrapper.ClassifyWrapper;
 import com.logpm.supervise.wrapper.IndicatorsWrapper;
@@ -309,16 +310,23 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	@Override
 	public R beMyApiIndicatorsDetail(Map<String, Object> params, IPage<IndicatorsVO> page) {
 		BladeUser user = AuthUtil.getUser();
+		BeIndicatorsVO beIndicatorsVO = null;
 		if (Func.isNotEmpty(user)){
 //			params.put("userId",user.getUserId());
 			if (Func.isNotEmpty(user.getDeptId())){
 				params.put("deptId",user.getDeptId());
+				 beIndicatorsVO = indicatorsMapper.selectMyPoints(params);
 			}
 		}
+		//查询分数
+		//查询我被考核的列表
 		Page<IndicatorsVO> indicatorsVOPage = indicatorsMapper.selectBeMyApiIndicators(page, params);
+		if (Func.isNotEmpty(indicatorsVOPage)){
 
+			beIndicatorsVO.setIndicatorsVOS(indicatorsVOPage.getRecords());
+		}
 
-		return R.data(indicatorsVOPage);
+		return R.data(beIndicatorsVO);
 	}
 
 	private List<ClassifyApiVO> getClassifyList(Long pid) {