code

ruoyi-admin/src/main/java/com/ruoyi/web/controller/agentcenter/AccountingAgentTaskController.java

@@ -17,7 +17,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * 会计任务清单Controller
+ * 会计任务Controller
  * 
  * @author zhao
  * @date 2023-05-06

ruoyi-admin/src/main/java/com/ruoyi/web/controller/agentcenter/AgentTaskController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/agentcenter/ManagerTaskController.java

@@ -1,47 +1,34 @@
 package com.ruoyi.web.controller.agentcenter;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.common.utils.DateUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.agentcenter.domain.TAgentTask;
 import com.ruoyi.agentcenter.service.ITAgentTaskService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
- * 任务清单Controller
+ * 主管任务Controller
  * 
  * @author zhao
  * @date 2023-05-06
  */
 @RestController
-@RequestMapping("/agentcenter/task")
-public class AgentTaskController extends BaseController
+@RequestMapping("/manager/task")
+public class ManagerTaskController extends BaseController
 {
     @Autowired
     private ITAgentTaskService tAgentTaskService;
 
     /**
-     * 获取任务清单列表(按镇村分组)
+     * 全部任务
      */
     @PreAuthorize("@ss.hasPermi('agentcenter:task:list')")
-    @GetMapping(value = "/taskList")
-    public TableDataInfo taskList(TAgentTask task)
+    @GetMapping(value = "/allTaskList")
+    public TableDataInfo allTaskList(TAgentTask task)
     {
         startPage();
         return getDataTable(tAgentTaskService.getTownTaskList(task));

ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/domain/TAgentTask.java

@@ -20,10 +20,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @Accessors(chain = true)
 public class TAgentTask extends BaseEntity
 {
-    public static final String AGENT_STATUS_READY = "1";
-    public static final String AGENT_STATUS_PROCESSING = "2";
-    public static final String AGENT_STATUS_FINISHED = "3";
-    public static final String AGENT_STATUS_AUDITED = "4";
+    public static final String AGENT_STATUS_READY = "1"; // 待分配
+    public static final String AGENT_STATUS_PROCESSING = "2"; // 已分配/处理中
+    public static final String AGENT_STATUS_FINISHED = "3"; // 已完成
+    public static final String AGENT_STATUS_AUDITED = "4"; // 已审核
 
     private static final long serialVersionUID = 1L;
 

ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/impl/TAgentTaskServiceImpl.java

@@ -318,7 +318,7 @@ public class TAgentTaskServiceImpl implements ITAgentTaskService
     @Override
     public List<TAgentTask> getTodoTaskList(TAgentTask tAgentTask)
     {
-        tAgentTask.putParam("agentStatusList", Arrays.asList(TAgentTask.AGENT_STATUS_READY, TAgentTask.AGENT_STATUS_PROCESSING));
+        tAgentTask.setAgentStatus(TAgentTask.AGENT_STATUS_PROCESSING);
         List<TAgentTask> tAgentTasks = tAgentTaskMapper.selectTAgentTaskList(tAgentTask);
         tAgentTasks.forEach((x) -> {
             x.setOtherCount(x.getAllCount() - x.getContracCount() - x.getVoucherCount());

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -214,4 +214,14 @@ public class BaseController
     {
         return getLoginUser().getUser();
     }
+
+    public String getUserOrgCode()
+    {
+        return getLoginUser().getUser().getDept().getOrgCode();
+    }
+
+    public String getUserAgentCenter()
+    {
+        return getLoginUser().getUser().getAgentCenter();
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -321,4 +321,18 @@ public class SysUser extends BaseEntity
             .append("dept", getDept())
             .toString();
     }
+
+    /** 代理中心 */
+    @Excel(name = "代理中心", dictType = "agent_center")
+    private String agentCenter;
+
+    public String getAgentCenter()
+    {
+        return agentCenter;
+    }
+
+    public void setAgentCenter(String agentCenter)
+    {
+        this.agentCenter = agentCenter;
+    }
 }

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"     column="update_by"    />
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
+		<result property="agentCenter"       column="agent_center"       />
         <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
     </resultMap>
@@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.agent_center,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.agent_center, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
@@ -86,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time, u.agent_center
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -103,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time, u.agent_center
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -156,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
+			<if test="agentCenter != null and agentCenter != ''">agent_center,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -170,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
+			<if test="agentCenter != null and agentCenter != ''">#{agentCenter},</if>
  			sysdate()
  		)
 	</insert>
@@ -190,6 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
+			<if test="agentCenter != null">agent_center = #{agentCenter},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}