1.指标模块代码提交

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

@@ -0,0 +1,17 @@
+package com.logpm.supervise.dto;
+
+import com.logpm.supervise.entity.ClassifyEntity;
+import com.logpm.supervise.entity.PointsEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class ClassifyDTO extends ClassifyEntity {
+
+	private Integer isPid;
+
+	private List<PointsEntity> pointsEntities = new ArrayList<>();
+
+}

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

@@ -0,0 +1,24 @@
+package com.logpm.supervise.dto;
+
+import com.logpm.supervise.entity.IndicatorsEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class IndicatorsDTO extends IndicatorsEntity {
+
+	@ApiModelProperty("当前页")
+	private Integer current;
+	@ApiModelProperty("每页的数量")
+	private Integer size;
+	private Long parentClassifyId;
+
+	private String startDateStr;
+	private String endDateStr;
+
+	private Date start;
+	private Date end;
+
+}

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

@@ -17,10 +17,13 @@
 package com.logpm.supervise.vo;
 
 import com.logpm.supervise.entity.ClassifyEntity;
-import org.springblade.core.tool.node.INode;
+import com.logpm.supervise.entity.PointsEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 分类指标表 视图实体类
  *
@@ -32,4 +35,7 @@ import lombok.EqualsAndHashCode;
 public class ClassifyVO extends ClassifyEntity {
 	private static final long serialVersionUID = 1L;
 
+	private List<PointsEntity> pointsEntities = new ArrayList<>();
+
+
 }

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

@@ -1,12 +1,24 @@
 package com.logpm.supervise.vo;
 
+import com.logpm.supervise.entity.IndicatorsAnnexEntity;
 import com.logpm.supervise.entity.IndicatorsEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class IndicatorsVO extends IndicatorsEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String classifyName;
+
+	private Long parentClassifyId;
+	private String parentClassifyName;
+
+	private List<IndicatorsAnnexEntity> pictures = new ArrayList<>();
+	private List<IndicatorsAnnexEntity> files = new ArrayList<>();
+
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/ClassifyController.java

@@ -18,6 +18,7 @@ package com.logpm.supervise.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.supervise.dto.ClassifyDTO;
 import com.logpm.supervise.entity.ClassifyEntity;
 import com.logpm.supervise.service.IClassifyService;
 import com.logpm.supervise.vo.ClassifyVO;
@@ -26,6 +27,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -36,6 +39,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 分类指标表 控制器
@@ -43,6 +47,7 @@ import java.util.Map;
  * @author logpm
  * @since 2024-01-23
  */
+@Slf4j
 @RestController
 @AllArgsConstructor
 @RequestMapping("/classify")
@@ -69,7 +74,7 @@ public class ClassifyController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入classify")
 	public R<IPage<ClassifyVO>> list(@ApiIgnore @RequestParam Map<String, Object> classify, Query query) {
-		IPage<ClassifyEntity> pages = classifyService.page(Condition.getPage(query), Condition.getQueryWrapper(classify, ClassifyEntity.class));
+		IPage<ClassifyEntity> pages = classifyService.pageList(Condition.getPage(query), classify);
 		return R.data(ClassifyWrapper.build().pageVO(pages));
 	}
 
@@ -115,4 +120,133 @@ public class ClassifyController extends BladeController {
 	}
 
 
+	@PostMapping("/addChild")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "添加指标", notes = "传入classify")
+	public R addChild(@RequestBody ClassifyDTO classifyDTO) {
+		String method = "##############addChild: ";
+		log.info(method+"添加指标 参数={}",classifyDTO);
+
+		try{
+			classifyService.addChild(classifyDTO);
+			return R.success("添加成功");
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+	@PostMapping("/findChildDetail")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "查询子类详情", notes = "传入classify")
+	public R findChildDetail(@RequestBody ClassifyDTO classifyDTO) {
+		String method = "##############findChildDetail: ";
+		log.info(method+"添加指标 参数={}",classifyDTO);
+
+		try{
+			Long id = classifyDTO.getId();
+			if(Objects.isNull(id)){
+				log.warn(method+"id不能为空 id={}",id);
+				return R.fail(405,"id不能为空");
+			}
+
+			return classifyService.findChildDetail(classifyDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+	@PostMapping("/updateChild")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "更新指标", notes = "传入classify")
+	public R updateChild(@RequestBody ClassifyDTO classifyDTO) {
+		String method = "##############updateChild: ";
+		log.info(method+"更新指标 参数={}",classifyDTO);
+
+		try{
+
+			Long id = classifyDTO.getId();
+			if(Objects.isNull(id)){
+				log.warn(method+"id不能为空 id={}",id);
+				return R.fail(405,"id不能为空");
+			}
+
+			classifyService.updateChild(classifyDTO);
+			return R.success("更新成功");
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+	@PostMapping("/selectParentCalssifyList")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "查询指标分类", notes = "传入indicatorsDTO")
+	public R selectParentCalssifyList(@RequestBody ClassifyDTO classifyDTO) {
+		String method = "##############selectParentCalssifyList: ";
+		log.info(method+"查询指标分类 参数={}",classifyDTO);
+
+		try{
+
+			return classifyService.selectParentCalssifyList(classifyDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
+	@PostMapping("/selectChildCalssifyList")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "查询指标选项", notes = "传入indicatorsDTO")
+	public R selectChildCalssifyList(@RequestBody ClassifyDTO classifyDTO) {
+		String method = "##############selectChildCalssifyList: ";
+		log.info(method+"查询指标分类 参数={}",classifyDTO);
+
+		try{
+
+			return classifyService.selectChildCalssifyList(classifyDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
+	@PostMapping("/selectPointList")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "查询指标选项", notes = "传入indicatorsDTO")
+	public R selectPointList(@RequestBody ClassifyDTO classifyDTO) {
+		String method = "##############selectPointList: ";
+		log.info(method+"查询指标选项 参数={}",classifyDTO);
+
+		try{
+			return classifyService.selectPointList(classifyDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
+
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/IndicatorsController.java

@@ -0,0 +1,95 @@
+package com.logpm.supervise.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.supervise.dto.IndicatorsDTO;
+import com.logpm.supervise.service.IIndicatorsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/classify")
+@Api(value = "分类指标表", tags = "指标接口")
+public class IndicatorsController {
+
+	private final IIndicatorsService indicatorsService;
+
+	@PostMapping("/findIndicatorsList")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "查询指标列表", notes = "传入indicatorsDTO")
+	public R findIndicatorsList(@RequestBody IndicatorsDTO indicatorsDTO) {
+		String method = "##############findIndicatorsList: ";
+		log.info(method+"添加指标 参数={}",indicatorsDTO);
+
+		try{
+			return indicatorsService.findIndicatorsList(indicatorsDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+	@PostMapping("/findIndicatorsDetail")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "查询指标详情", notes = "传入indicatorsDTO")
+	public R findIndicatorsDetail(@RequestBody IndicatorsDTO indicatorsDTO) {
+		String method = "##############findIndicatorsDetail: ";
+		log.info(method+"查询指标详情 参数={}",indicatorsDTO);
+
+		try{
+			Long id = indicatorsDTO.getId();
+			if(Objects.isNull(id)){
+				log.warn(method+"指标id为空 id={}",id);
+				return R.fail(405,"指标id为空");
+			}
+
+			return indicatorsService.findIndicatorsDetail(indicatorsDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
+	@PostMapping("/updateIndicators")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "更新指标", notes = "传入indicatorsDTO")
+	public R updateIndicators(@RequestBody IndicatorsDTO indicatorsDTO) {
+		String method = "##############updateIndicators: ";
+		log.info(method+"更新指标 参数={}",indicatorsDTO);
+
+		try{
+			Long id = indicatorsDTO.getId();
+			if(Objects.isNull(id)){
+				log.warn(method+"指标id为空 id={}",id);
+				return R.fail(405,"指标id为空");
+			}
+
+			return indicatorsService.updateIndicators(indicatorsDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+}

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

@@ -1,10 +1,20 @@
 package com.logpm.supervise.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.supervise.dto.ClassifyDTO;
 import com.logpm.supervise.entity.ClassifyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
+@Mapper
 public interface ClassifyMapper extends BaseMapper<ClassifyEntity> {
 
+    IPage<ClassifyEntity> pageList(IPage<Object> page, @Param("param") ClassifyDTO classifyDTO);
 
+	List<ClassifyEntity> selectParentCalssifyList(@Param("param") ClassifyDTO classifyDTO);
 
+	List<ClassifyEntity> selectChildCalssifyList(@Param("param") ClassifyDTO classifyDTO);
 }

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

@@ -20,7 +20,37 @@
     </resultMap>
 
 
+    <select id="pageList" resultType="com.logpm.supervise.entity.ClassifyEntity">
+        select *
+        from sup_classify
+        <where>
+            <if test="param.isPid != null and param.isPid ==1 ">
+                and p_id = 0
+            </if>
+            <if test="param.isPid != null and param.isPid ==0 ">
+                and p_id != 0
+            </if>
+            <if test="param.pId != null">
+                and p_id = #{param.pId}
+            </if>
+            <if test="param.name != null and param.name != ''">
+                and `name` like #{param.name}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
 
+    <select id="selectParentCalssifyList" resultType="com.logpm.supervise.entity.ClassifyEntity">
+        select *
+        from sup_classify
+        where p_id = 0
+    </select>
+
+    <select id="selectChildCalssifyList" resultType="com.logpm.supervise.entity.ClassifyEntity">
+        select *
+        from sup_classify
+        where p_id = #{param.pId}
+    </select>
 
 
 </mapper>

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

@@ -0,0 +1,15 @@
+package com.logpm.supervise.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.supervise.entity.IndicatorsAnnexEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface IndicatorsAnnexMapper extends BaseMapper<IndicatorsAnnexEntity> {
+
+
+	List<IndicatorsAnnexEntity> findListByIndicatorsIdAndType(@Param("id") Long id, @Param("type") int type);
+}

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.supervise.mapper.IndicatorsAnnexMapper">
+
+    <select id="findListByIndicatorsIdAndType" resultType="com.logpm.supervise.entity.IndicatorsAnnexEntity">
+        select *
+        from sup_indicators_annex
+        and indicators_id = #{id}
+        and type = #{type}
+    </select>
+
+</mapper>

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

@@ -0,0 +1,18 @@
+package com.logpm.supervise.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.supervise.dto.IndicatorsDTO;
+import com.logpm.supervise.entity.IndicatorsEntity;
+import com.logpm.supervise.vo.IndicatorsVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface IndicatorsMapper extends BaseMapper<IndicatorsEntity> {
+
+
+	IPage<IndicatorsVO> pageList(IPage<Object> page, @Param("param") IndicatorsDTO indicatorsDTO);
+
+	IndicatorsVO findIndicatorsDetail(@Param("id") Long id);
+}

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

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.supervise.mapper.IndicatorsMapper">
+
+    <select id="pageList" resultType="com.logpm.supervise.vo.IndicatorsVO">
+
+        select sc.name classifyName,
+               psc.name parentClassifyName,
+               si.assess_dept_name assessDeptName,
+               si.assess_user_name assessUserName,
+               si.point point,
+               si.remark remark,
+               si.indicators_status indicatorsStatus,
+               si.is_objection isObjection,
+               si.objection_remark objectionRemark
+        from sup_indicators si
+        left join sup_classify sc on sc.id = si.classify_id
+        left join sup_classify psc on psc.id = sc.p_id
+        where 1=1
+        and si.id = #{param.id}
+        <if test="param.assessDept != null">
+            and si.assess_dept = #{param.assessDept}
+        </if>
+        <if test="param.parentClassifyId != null">
+            and psc.id = #{param.parentClassifyId}
+        </if>
+        <if test="param.start != null">
+            and si.create_time &gt;= #{param.start}
+        </if>
+        <if test="param.end != null">
+            and si.create_time &lt;= #{param.end}
+        </if>
+
+    </select>
+
+    <select id="findIndicatorsDetail" resultType="com.logpm.supervise.vo.IndicatorsVO">
+        select si.*,
+               sc.name classifyName,
+               psc.id parentClassifyId,
+               psc.name parentClassifyName
+        from sup_indicators si
+         left join sup_classify sc on sc.id = si.classify_id
+         left join sup_classify psc on psc.id = sc.p_id
+        where 1=1
+          and si.id = #{id}
+    </select>
+
+</mapper>

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

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.supervise.entity.PointsEntity;
 import com.logpm.supervise.vo.PointsVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -41,5 +42,5 @@ public interface PointsMapper extends BaseMapper<PointsEntity> {
 	List<PointsVO> selectPointsPage(IPage page, PointsVO points);
 
 
-
+    void removeByClassifyId(@Param("classifyId") Long classifyId);
 }

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

@@ -22,7 +22,10 @@
         select * from sup_points where is_deleted = 0
     </select>
 
-
+    <delete id="removeByClassifyId">
+        delete from sup_points
+        where classify_id = #{classifyId}
+    </delete>
 
 
 </mapper>

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

@@ -16,12 +16,13 @@
  */
 package com.logpm.supervise.service;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.logpm.supervise.entity.ClassifyEntity;
-import com.logpm.supervise.vo.ClassifyVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.supervise.dto.ClassifyDTO;
+import com.logpm.supervise.entity.ClassifyEntity;
 import org.springblade.core.mp.base.BaseService;
-import java.util.List;
+import org.springblade.core.tool.api.R;
+
+import java.util.Map;
 
 /**
  * 分类指标表 服务类
@@ -32,4 +33,18 @@ import java.util.List;
 public interface IClassifyService extends BaseService<ClassifyEntity> {
 
 
+    IPage<ClassifyEntity> pageList(IPage<Object> page, Map<String, Object> classify);
+
+	void addChild(ClassifyDTO classifyDTO);
+
+	R findChildDetail(ClassifyDTO classifyDTO);
+
+	void updateChild(ClassifyDTO classifyDTO);
+
+	R selectParentCalssifyList(ClassifyDTO classifyDTO);
+
+	R selectChildCalssifyList(ClassifyDTO classifyDTO);
+
+	R selectPointList(ClassifyDTO classifyDTO);
+
 }

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

@@ -0,0 +1,10 @@
+package com.logpm.supervise.service;
+
+import com.logpm.supervise.entity.IndicatorsAnnexEntity;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+
+public interface IIndicatorsAnnexService extends BaseService<IndicatorsAnnexEntity> {
+	List<IndicatorsAnnexEntity> findListByIndicatorsIdAndType(Long id, int type);
+}

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

@@ -0,0 +1,15 @@
+package com.logpm.supervise.service;
+
+import com.logpm.supervise.dto.IndicatorsDTO;
+import com.logpm.supervise.entity.IndicatorsEntity;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
+
+public interface IIndicatorsService extends BaseService<IndicatorsEntity> {
+	R findIndicatorsList(IndicatorsDTO indicatorsDTO);
+
+	R findIndicatorsDetail(IndicatorsDTO indicatorsDTO);
+
+	R updateIndicators(IndicatorsDTO indicatorsDTO);
+
+}

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

@@ -38,6 +38,5 @@ public interface IPointsService extends BaseService<PointsEntity> {
 	IPage<PointsVO> selectPointsPage(IPage<PointsVO> page, PointsVO points);
 
 
-
-
+    void removeByClassifyId(Long classifyId);
 }

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

@@ -16,15 +16,24 @@
  */
 package com.logpm.supervise.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.supervise.dto.ClassifyDTO;
 import com.logpm.supervise.entity.ClassifyEntity;
+import com.logpm.supervise.entity.PointsEntity;
 import com.logpm.supervise.mapper.ClassifyMapper;
-import com.logpm.supervise.vo.ClassifyVO;
 import com.logpm.supervise.service.IClassifyService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.supervise.service.IPointsService;
+import com.logpm.supervise.vo.ClassifyVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springframework.stereotype.Service;
+
 import java.util.List;
+import java.util.Map;
 
 /**
  * 分类指标表 服务实现类
@@ -32,9 +41,110 @@ import java.util.List;
  * @author BladeX
  * @since 2024-01-23
  */
+@Slf4j
 @Service
+@AllArgsConstructor
 public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, ClassifyEntity> implements IClassifyService {
 
+	private final IPointsService pointsService;
+
+
+	@Override
+	public IPage<ClassifyEntity> pageList(IPage<Object> page, Map<String, Object> classify) {
+		Long pId = (Long) classify.get("pId");
+		String name = (String) classify.get("name");
+
+		ClassifyDTO classifyDTO = new ClassifyDTO();
+		classifyDTO.setPId(pId);
+		classifyDTO.setName(name);
+
+		IPage<ClassifyEntity> pages = baseMapper.pageList(page,classifyDTO);
+
+		return pages;
+	}
+
+	@Override
+	public void addChild(ClassifyDTO classifyDTO) {
+
+		ClassifyEntity classifyEntity = new ClassifyEntity();
+		BeanUtil.copy(classifyDTO,classifyEntity);
+		save(classifyEntity);
+
+		List<PointsEntity> pointsEntities = classifyDTO.getPointsEntities();
+		for (PointsEntity pointsEntity : pointsEntities) {
+			pointsEntity.setClassifyId(classifyEntity.getId());
+		}
+		pointsService.saveBatch(pointsEntities);
+
+	}
+
+	@Override
+	public R findChildDetail(ClassifyDTO classifyDTO) {
+		Long id = classifyDTO.getId();
+
+		ClassifyEntity classifyEntity = getById(id);
+		Long pId = classifyEntity.getPId();
+		if(pId.equals(0L)){
+			log.warn("#############findChildDetail：数据为指标分类数据");
+			return R.fail(405,"数据为指标分类数据");
+		}
+
+		ClassifyVO classifyVO = new ClassifyVO();
+		BeanUtil.copy(classifyEntity,classifyVO);
+
+		QueryWrapper<PointsEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("classify_id",id)
+			.eq("is_deleted",0);
+		List<PointsEntity> list = pointsService.list(queryWrapper);
+
+		classifyVO.setPointsEntities(list);
+
+		return R.data(classifyVO);
+	}
+
+	@Override
+	public void updateChild(ClassifyDTO classifyDTO) {
+
+		Long id = classifyDTO.getId();
+
+		ClassifyEntity classifyEntity = getById(id);
+		classifyEntity.setName(classifyDTO.getName());
+		classifyEntity.setDescription(classifyDTO.getDescription());
+		classifyEntity.setRemark(classifyDTO.getRemark());
+		classifyEntity.setPId(classifyDTO.getPId());
+		updateById(classifyEntity);
+
+		//先删除所有积分
+		pointsService.removeByClassifyId(id);
+
+		List<PointsEntity> pointsEntities = classifyDTO.getPointsEntities();
+		for (PointsEntity pointsEntity : pointsEntities) {
+			pointsEntity.setClassifyId(classifyEntity.getId());
+		}
+		pointsService.saveBatch(pointsEntities);
+	}
+
+	@Override
+	public R selectParentCalssifyList(ClassifyDTO classifyDTO) {
+		List<ClassifyEntity> list = baseMapper.selectParentCalssifyList(classifyDTO);
+		return R.data(list);
+	}
+
+	@Override
+	public R selectChildCalssifyList(ClassifyDTO classifyDTO) {
+		List<ClassifyEntity> list = baseMapper.selectChildCalssifyList(classifyDTO);
+		return R.data(list);
+	}
+
+	@Override
+	public R selectPointList(ClassifyDTO classifyDTO) {
+		Long calssifyId = classifyDTO.getId();
 
+		QueryWrapper<PointsEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("classify_id",calssifyId)
+			.eq("is_deleted",0);
+		List<PointsEntity> list = pointsService.list(queryWrapper);
 
+		return R.data(list);
+	}
 }

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

@@ -0,0 +1,21 @@
+package com.logpm.supervise.service.impl;
+
+import com.logpm.supervise.entity.IndicatorsAnnexEntity;
+import com.logpm.supervise.mapper.IndicatorsAnnexMapper;
+import com.logpm.supervise.service.IIndicatorsAnnexService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class IndicatorsAnnexServiceImpl extends BaseServiceImpl<IndicatorsAnnexMapper, IndicatorsAnnexEntity> implements IIndicatorsAnnexService  {
+	@Override
+	public List<IndicatorsAnnexEntity> findListByIndicatorsIdAndType(Long id, int type) {
+		return baseMapper.findListByIndicatorsIdAndType(id,type);
+	}
+}

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

@@ -0,0 +1,89 @@
+package com.logpm.supervise.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.logpm.supervise.dto.IndicatorsDTO;
+import com.logpm.supervise.entity.IndicatorsAnnexEntity;
+import com.logpm.supervise.entity.IndicatorsEntity;
+import com.logpm.supervise.mapper.IndicatorsMapper;
+import com.logpm.supervise.service.IIndicatorsAnnexService;
+import com.logpm.supervise.service.IIndicatorsService;
+import com.logpm.supervise.vo.IndicatorsVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.utils.CommonUtil;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+@AllArgsConstructor
+@Service
+public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, IndicatorsEntity> implements IIndicatorsService {
+
+	private final IIndicatorsAnnexService iIndicatorsAnnexService;
+
+	@Override
+	public R findIndicatorsList(IndicatorsDTO indicatorsDTO) {
+
+		IPage<Object> page = new Page<>();
+		page.setCurrent(indicatorsDTO.getCurrent());
+		page.setSize(indicatorsDTO.getSize());
+
+		String startDateStr = indicatorsDTO.getStartDateStr();
+		String endDateStr = indicatorsDTO.getEndDateStr();
+
+		Date start = CommonUtil.getStartByDateStr(startDateStr);
+		Date end = CommonUtil.getEndByDateStr(endDateStr);
+		indicatorsDTO.setStart(start);
+		indicatorsDTO.setEnd(end);
+
+		IPage<IndicatorsVO> pages = baseMapper.pageList(page,indicatorsDTO);
+
+
+		return R.data(pages);
+	}
+
+	@Override
+	public R findIndicatorsDetail(IndicatorsDTO indicatorsDTO) {
+
+		Long id = indicatorsDTO.getId();
+
+		IndicatorsVO indiactorsVO = baseMapper.findIndicatorsDetail(id);
+
+		List<IndicatorsAnnexEntity> pictures = iIndicatorsAnnexService.findListByIndicatorsIdAndType(id,1);
+		List<IndicatorsAnnexEntity> files = iIndicatorsAnnexService.findListByIndicatorsIdAndType(id,2);
+
+		indiactorsVO.setPictures(pictures);
+		indiactorsVO.setFiles(files);
+
+		return R.data(indiactorsVO);
+	}
+
+	@Override
+	public R updateIndicators(IndicatorsDTO indicatorsDTO) {
+		Long id = indicatorsDTO.getId();
+		IndicatorsEntity indicatorsEntity = getById(id);
+		if(Objects.isNull(indicatorsEntity)){
+			log.warn("###########updateIndicators: 指标信息不存在 id={}",id);
+			return R.fail(405,"指标信息不存在");
+		}
+
+		indicatorsEntity.setAssessDept(indicatorsDTO.getAssessDept());
+		indicatorsEntity.setAssessDeptName(indicatorsDTO.getAssessDeptName());
+		indicatorsEntity.setAssessUserId(indicatorsDTO.getAssessUserId());
+		indicatorsEntity.setAssessUserName(indicatorsDTO.getAssessUserName());
+		indicatorsEntity.setClassifyId(indicatorsDTO.getClassifyId());
+		indicatorsEntity.setPoint(indicatorsDTO.getPoint());
+		indicatorsEntity.setRemark(indicatorsDTO.getRemark());
+		indicatorsEntity.setObjectionRemark(indicatorsDTO.getObjectionRemark());
+
+		updateById(indicatorsEntity);
+		return R.success("更新成功");
+	}
+
+}

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

@@ -38,4 +38,9 @@ public class PointsServiceImpl extends BaseServiceImpl<PointsMapper, PointsEntit
 		return page.setRecords(baseMapper.selectPointsPage(page, points));
 	}
 
+	@Override
+	public void removeByClassifyId(Long classifyId) {
+		baseMapper.removeByClassifyId(classifyId);
+	}
+
 }