Pārlūkot izejas kodu

1.监审任务管理权限
2.任务督办权限

赵越越 1 mēnesi atpakaļ
vecāks
revīzija
cbda7e2062

+ 9 - 0
assistMg/src/main/java/com/hotent/baseInfo/req/CostTaskSearchReq.java

@@ -18,4 +18,13 @@ public class CostTaskSearchReq {
 
     @ApiModelProperty(value = "监审项目名称")
     private String projectName;
+
+    @ApiModelProperty(value = "级别0:省,1:市,2:区(县)")
+    private Integer dataScope;
+    @ApiModelProperty(value = "所属省")
+    private String provinceCode;
+    @ApiModelProperty(value = "所属市")
+    private String cityCode;
+    @ApiModelProperty(value = "所属区、县")
+    private String countyCode;
 }

+ 29 - 0
assistMg/src/main/java/com/hotent/baseInfo/req/CostTaskSearchReqPage.java

@@ -0,0 +1,29 @@
+package com.hotent.baseInfo.req;/**
+ * @program: cbjs-mvue-master
+ * @description:
+ * @author: zhao yue yue
+ * @create: 2025-11-11 10:34
+ */
+
+import com.hotent.base.query.PageBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ *@author: zhao yue yue
+ *@create: 2025-11-11 10:34
+ */
+@ApiModel(value = "任务进度管理查询请求类")
+@Getter
+@Setter
+public class CostTaskSearchReqPage extends PageBean {
+
+    @ApiModelProperty(value = "年度")
+    private String year;
+
+    @ApiModelProperty(value = "监审项目名称")
+    private String projectName;
+
+}

+ 2 - 2
assistMg/src/main/java/com/hotent/project/controller/CostProjectTaskController.java

@@ -85,7 +85,7 @@ public class CostProjectTaskController extends BaseController<CostProjectTaskMan
 	 */
 	@PostMapping("/taskList")
 	@ApiOperation(value = "任务进度管理列表", notes = "任务进度管理列表")
-	public CommonResult<List<SumTree<TaskTreeVo>>> getCatalogList(@RequestBody CostTaskSearchReq req) {
+	public CommonResult<List<SumTree<TaskTreeVo>>> getCatalogList(@RequestBody CostTaskSearchReq req) throws Exception {
 		List<CostProjectTask> taskList = baseService.getTaskList(req);
 		List<TaskTreeVo> allList = JsonUtil.getJsonToList(taskList, TaskTreeVo.class);
 		for (int i = 0; i < taskList.size(); i++) {
@@ -106,7 +106,7 @@ public class CostProjectTaskController extends BaseController<CostProjectTaskMan
 	 */
 	@PostMapping("/supervisorList")
 	@ApiOperation(value = "督办事项管理列表", notes = "督办事项管理列表")
-	public CommonResult<List<SumTree<TaskTreeVo>>> supervisorList(@RequestBody CostTaskSearchReq req) {
+	public CommonResult<List<SumTree<TaskTreeVo>>> supervisorList(@RequestBody CostTaskSearchReq req) throws Exception {
 		List<CostProjectTask> taskList = baseService.getTaskList(req);
 		List<TaskTreeVo> allList = JsonUtil.getJsonToList(taskList, TaskTreeVo.class);
 		for (int i = 0; i < taskList.size(); i++) {

+ 10 - 0
assistMg/src/main/java/com/hotent/project/dao/CostProjectTaskDao.java

@@ -2,6 +2,9 @@ package com.hotent.project.dao;
 
 import com.hotent.project.model.CostProjectTask;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 项目任务表 Mapper 接口
@@ -12,4 +15,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CostProjectTaskDao extends BaseMapper<CostProjectTask> {
 
+    List<CostProjectTask> getCostProjectTaskList(
+            @Param("dataScope") Integer dataScope
+            , @Param("provinceCode")  String provinceCode
+            , @Param("cityCode")  String cityCodeh
+            , @Param("countyCode") String countyCode
+            , @Param("year")  String year
+            , @Param("projectName")  String projectName);
 }

+ 1 - 1
assistMg/src/main/java/com/hotent/project/manager/CostProjectTaskManager.java

@@ -20,7 +20,7 @@ import java.util.List;
 public interface CostProjectTaskManager extends BaseManager<CostProjectTask> {
 
 
-	List<CostProjectTask> getTaskList(CostTaskSearchReq req);
+	List<CostProjectTask> getTaskList(CostTaskSearchReq req) throws Exception;
 
 	IPage<CostProjectTask> pageListForReviewTask(CostTaskReviewPageReq req);
 

+ 23 - 3
assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectTaskManagerImpl.java

@@ -20,6 +20,8 @@ import com.hotent.project.model.CostProjectTask;
 import com.hotent.project.model.CostProjectTaskPreliminaryOpinion;
 import com.hotent.project.model.CostProjectTaskProccess;
 import com.hotent.uc.api.model.IUser;
+import com.hotent.uc.manager.UserManager;
+import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,10 +56,25 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
     @Autowired
     private CostProjectTaskPreliminaryOpinionManager preliminaryOpinionManager;
 
+    @Autowired
+    private UserManager userService;
+
 
     @Override
-    public List<CostProjectTask> getTaskList(CostTaskSearchReq req) {
-        LambdaQueryWrapper<CostProjectTask> queryWrapper = new LambdaQueryWrapper<>();
+    public List<CostProjectTask> getTaskList(CostTaskSearchReq req) throws Exception {
+        IUser iUser = ContextUtil.getCurrentUser();
+        User user = userService.getByAccount(iUser.getAccount());
+        req.setDataScope(user.getDataScope());
+        req.setProvinceCode(user.getProvinceCode());
+        req.setCityCode(user.getCityCode());
+        req.setCountyCode(user.getCountyCode());
+        List<CostProjectTask> list =baseMapper.getCostProjectTaskList(req.getDataScope()
+                ,req.getProvinceCode()
+                ,req.getCityCode()
+                ,req.getCountyCode()
+                ,req.getYear()
+                ,req.getProjectName());
+        /*LambdaQueryWrapper<CostProjectTask> queryWrapper = new LambdaQueryWrapper<>();
         if (ObjectUtil.isNotEmpty(req.getYear())) {
             queryWrapper.eq(CostProjectTask::getYear, req.getYear());
         }
@@ -65,7 +82,10 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
             queryWrapper.like(CostProjectTask::getProjectName, req.getProjectName());
         }
         queryWrapper.eq(CostProjectTask::getIsDeleted, BaseConstant.NORMAL_STATUS);
-        return this.list(queryWrapper);
+
+        List<CostProjectTask> list = this.list(queryWrapper);*/
+
+        return list;
     }
 
     @Override

+ 57 - 0
assistMg/src/main/resources/mapper/CostProjectTaskMapper.xml

@@ -0,0 +1,57 @@
+<?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.hotent.project.dao.CostProjectTaskDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hotent.project.model.CostProjectTask">
+        <id column="id" property="id" />
+    	<result column="year" property="year" />
+    	<result column="project_id" property="projectId" />
+        <result column="pid" property="pid" />
+		<result column="project_name" property="projectName" />
+		<result column="audited_unit_id" property="auditedUnitId" />
+        <result column="audited_unit_name" property="auditedUnitName" />
+        <result column="audit_period" property="auditPeriod"/>
+        <result column="source_type" property="sourceType"/>
+    	<result column="audit_type" property="auditType" />
+        <result column="current_node" property="currentNode" />
+		<result column="status" property="status" />
+		<result column="order_num" property="orderNum" />
+		<result column="is_deleted" property="isDeleted" />
+		<result column="is_gd" property="isGd" />
+		<result column="create_time" property="createTime" />
+		<result column="create_by" property="createBy" />
+		<result column="update_time" property="updateTime" />
+		<result column="update_by" property="updateBy" />
+    </resultMap>
+
+
+    <select id="getCostProjectTaskList"
+            resultMap="BaseResultMap">
+        SELECT
+        c.*
+        FROM
+        cost_project_task c,
+        uc_user u
+        WHERE
+        c.create_by=u.ACCOUNT_
+        <if test=" year != null and  year != ''">
+            and c.year=#{year}
+        </if>
+
+        <if test=" projectName != null and  projectName != ''">
+            and c.project_name LIKE CONCAT('%', #{projectName}, '%')
+        </if>
+
+        <if test=" dataScope != null and  dataScope != ''">
+            <if test=" dataScope ==1">
+                and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+            </if>
+            <if test=" dataScope ==2">
+                and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+            </if>
+        </if>
+        ORDER BY c.create_time
+    </select>
+
+</mapper>

+ 1 - 1
base/src/main/resources/config/application.yml

@@ -132,7 +132,7 @@ mybatis-plus:
     call-setters-on-nulls: true
     jdbc-type-for-null: 'null'
     # 打印执行的SQL语句及返回的数据
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     db-config:
       update-strategy: IGNORED # FieldStrategy