异常工单金额调整、考核指标项增加部门过滤

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -1216,12 +1216,17 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			List<AftersalesCompletionRecordEntity> list4 = completionRecordService.list(Wrappers.<AftersalesCompletionRecordEntity>query().lambda()
 				.eq(AftersalesCompletionRecordEntity::getWorkOrderId, aftersalesWorkOrder.getId())
 			);
+			if (Func.isNotEmpty(list4)){
+				list4.forEach(i->{
+					BigDecimal bigDecimal = i.getMoney().setScale(2, BigDecimal.ROUND_FLOOR);
+					i.setMoney(bigDecimal);
+				});
+			}
 			aftersalesWorkOrderVO.setCompletionRecordEntities(list4);
 			List<AftersalesCompletionRecipientEntity> list5 = completionRecipientService.list(Wrappers.<AftersalesCompletionRecipientEntity>query().lambda()
 				.eq(AftersalesCompletionRecipientEntity::getWorkOrderId, aftersalesWorkOrder.getId())
 			);
 			aftersalesWorkOrderVO.setCompletionRecipientEntityList(list5);
-
 		}
 
 		return aftersalesWorkOrderVO;

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

@@ -33,8 +33,8 @@ public class ClassifyApi {
 	@GetMapping("/classifyList")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "小程序指标项列表", notes = "传入classify")
-	public R<List<ClassifyApiVO>> classifyList() {
-		List<ClassifyApiVO> detail = classifyService.selectClassifyList();
+	public R<List<ClassifyApiVO>> classifyList(@RequestParam Long deptId) {
+		List<ClassifyApiVO> detail = classifyService.selectClassifyList(deptId);
 		return R.data(detail);
 	}
 

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

@@ -26,5 +26,5 @@ public interface ClassifyMapper extends BaseMapper<ClassifyEntity> {
 	 * @param pid
 	 * @return
 	 */
-	List<ClassifyApiVO> selectAllClassifyList(Long pid);
+	List<ClassifyApiVO> selectAllClassifyList(@Param("pid") Long pid,@Param("exAdminDeptId")Long exAdminDeptId);
 }

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

@@ -62,5 +62,8 @@
         <if test="pid != null and pid != 0">
             and p_id = #{pid}
         </if>
+        <if test="exAdminDeptId != null and exAdminDeptId != ''">
+            and examine_dept_id = #{exAdminDeptId}
+        </if>
     </select>
 </mapper>

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

@@ -58,7 +58,7 @@ public interface IClassifyService extends BaseService<ClassifyEntity> {
 	 * 查询指标项列表
 	 * @return
 	 */
-	List<ClassifyApiVO> selectClassifyList();
+	List<ClassifyApiVO> selectClassifyList(Long deptId);
 
 	/**
 	 * API保存考核信息

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

@@ -223,9 +223,9 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	}
 
 	@Override
-	public List<ClassifyApiVO> selectClassifyList() {
+	public List<ClassifyApiVO> selectClassifyList(Long deptId) {
 		Long pid = 0L;
-		List<ClassifyApiVO> classifyEntities = getClassifyList(pid);
+		List<ClassifyApiVO> classifyEntities = getClassifyList(pid,deptId);
 		for (ClassifyApiVO classifyEntity : classifyEntities) {
 			if (classifyEntity.getPId().equals(0L)) {
 				List<ClassifyApiVO> classifyList = new ArrayList<>();
@@ -491,7 +491,7 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		return R.success("导入成功");
 	}
 
-	private List<ClassifyApiVO> getClassifyList(Long pid) {
-		return baseMapper.selectAllClassifyList(pid);
+	private List<ClassifyApiVO> getClassifyList(Long pid,Long exAdminDeptId) {
+		return baseMapper.selectAllClassifyList(pid,exAdminDeptId);
 	}
 }