更新评价统计计算

agent-manager/db/add.sql

@@ -279,6 +279,7 @@ CREATE TABLE `mortals_agent_staff`  (
 ALTER TABLE mortals_agent_declare ADD COLUMN `agent_user_id`     bigint(20)  DEFAULT NULL COMMENT '代办人id' AFTER submit_time;
 ALTER TABLE mortals_agent_declare ADD COLUMN `agent_user_name`       varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '代办人名称' AFTER agent_user_id;
 ALTER TABLE mortals_agent_declare ADD COLUMN `assign_time`      datetime                                                DEFAULT NULL COMMENT '分派时间' AFTER agent_user_name;
-
+ALTER TABLE mortals_agent_declare ADD COLUMN `assign_user_id`       bigint(20)  DEFAULT NULL COMMENT '分配人id' AFTER AFTER assign_time;
+ALTER TABLE mortals_agent_declare ADD COLUMN `assign_user_name`       varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '分配人名称' AFTER assign_user_id;
 
 ALTER TABLE mortals_agent_user ADD COLUMN `customerId` bigint(20) DEFAULT null COMMENT '代办员工id' AFTER company_id;
\ No newline at end of file

agent-manager/src/main/java/com/mortals/xhx/module/declare/model/DeclareEntity.java

@@ -16,7 +16,7 @@ import lombok.Data;
  * 企业代办申报实体对象
  *
  * @author zxfei
- * @date 2025-05-09
+ * @date 2025-05-12
  */
 @Data
 public class DeclareEntity extends DeclareVo {
@@ -130,6 +130,14 @@ public class DeclareEntity extends DeclareVo {
      * 分派时间
      */
     private Date assignTime;
+    /**
+     * 分配人id
+     */
+    private Long assignUserId;
+    /**
+     * 分配人名称
+     */
+    private String assignUserName;
     /**
      * 企业代办申报图片信息
      */
@@ -185,5 +193,7 @@ public class DeclareEntity extends DeclareVo {
         this.agentUserId = null;
         this.agentUserName = "";
         this.assignTime = null;
+        this.assignUserId = null;
+        this.assignUserName = "";
     }
 }
\ No newline at end of file

agent-manager/src/main/java/com/mortals/xhx/module/declare/model/DeclareQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.declare.model.DeclareEntity;
  * 企业代办申报查询对象
  *
  * @author zxfei
- * @date 2025-05-09
+ * @date 2025-05-12
  */
 public class DeclareQuery extends DeclareEntity {
     /** 开始 主键ID，主键，自增长 */
@@ -281,6 +281,26 @@ public class DeclareQuery extends DeclareEntity {
     /** 结束 分派时间 */
     private String assignTimeEnd;
 
+    /** 开始 分配人id */
+    private Long assignUserIdStart;
+
+    /** 结束 分配人id */
+    private Long assignUserIdEnd;
+
+    /** 增加 分配人id */
+    private Long assignUserIdIncrement;
+
+    /** 分配人id列表 */
+    private List <Long> assignUserIdList;
+
+    /** 分配人id排除列表 */
+    private List <Long> assignUserIdNotList;
+
+    /** 分配人名称 */
+    private List<String> assignUserNameList;
+
+    /** 分配人名称排除列表 */
+    private List <String> assignUserNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<DeclareQuery> orConditionList;
 
@@ -1820,6 +1840,119 @@ public class DeclareQuery extends DeclareEntity {
         this.assignTimeEnd = assignTimeEnd;
     }
 
+    /**
+     * 获取 开始 分配人id
+     * @return assignUserIdStart
+     */
+    public Long getAssignUserIdStart(){
+        return this.assignUserIdStart;
+    }
+
+    /**
+     * 设置 开始 分配人id
+     * @param assignUserIdStart
+     */
+    public void setAssignUserIdStart(Long assignUserIdStart){
+        this.assignUserIdStart = assignUserIdStart;
+    }
+
+    /**
+     * 获取 结束 分配人id
+     * @return $assignUserIdEnd
+     */
+    public Long getAssignUserIdEnd(){
+        return this.assignUserIdEnd;
+    }
+
+    /**
+     * 设置 结束 分配人id
+     * @param assignUserIdEnd
+     */
+    public void setAssignUserIdEnd(Long assignUserIdEnd){
+        this.assignUserIdEnd = assignUserIdEnd;
+    }
+
+    /**
+     * 获取 增加 分配人id
+     * @return assignUserIdIncrement
+     */
+    public Long getAssignUserIdIncrement(){
+        return this.assignUserIdIncrement;
+    }
+
+    /**
+     * 设置 增加 分配人id
+     * @param assignUserIdIncrement
+     */
+    public void setAssignUserIdIncrement(Long assignUserIdIncrement){
+        this.assignUserIdIncrement = assignUserIdIncrement;
+    }
+
+    /**
+     * 获取 分配人id
+     * @return assignUserIdList
+     */
+    public List<Long> getAssignUserIdList(){
+        return this.assignUserIdList;
+    }
+
+    /**
+     * 设置 分配人id
+     * @param assignUserIdList
+     */
+    public void setAssignUserIdList(List<Long> assignUserIdList){
+        this.assignUserIdList = assignUserIdList;
+    }
+
+    /**
+     * 获取 分配人id
+     * @return assignUserIdNotList
+     */
+    public List<Long> getAssignUserIdNotList(){
+        return this.assignUserIdNotList;
+    }
+
+    /**
+     * 设置 分配人id
+     * @param assignUserIdNotList
+     */
+    public void setAssignUserIdNotList(List<Long> assignUserIdNotList){
+        this.assignUserIdNotList = assignUserIdNotList;
+    }
+
+
+    /**
+     * 获取 分配人名称
+     * @return assignUserNameList
+     */
+    public List<String> getAssignUserNameList(){
+        return this.assignUserNameList;
+    }
+
+    /**
+     * 设置 分配人名称
+     * @param assignUserNameList
+     */
+    public void setAssignUserNameList(List<String> assignUserNameList){
+        this.assignUserNameList = assignUserNameList;
+    }
+
+    /**
+     * 获取 分配人名称
+     * @return assignUserNameNotList
+     */
+    public List<String> getAssignUserNameNotList(){
+        return this.assignUserNameNotList;
+    }
+
+    /**
+     * 设置 分配人名称
+     * @param assignUserNameNotList
+     */
+    public void setAssignUserNameNotList(List<String> assignUserNameNotList){
+        this.assignUserNameNotList = assignUserNameNotList;
+    }
+
     /**
      * 设置  主键ID，主键，自增长
      * @param id
@@ -2704,6 +2837,79 @@ public class DeclareQuery extends DeclareEntity {
     }
 
 
+    /**
+     * 设置  分配人id
+     * @param assignUserId
+     */
+    public DeclareQuery assignUserId(Long assignUserId){
+        setAssignUserId(assignUserId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 分配人id
+     * @param assignUserIdStart
+     */
+    public DeclareQuery assignUserIdStart(Long assignUserIdStart){
+        this.assignUserIdStart = assignUserIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 分配人id
+     * @param assignUserIdEnd
+     */
+    public DeclareQuery assignUserIdEnd(Long assignUserIdEnd){
+        this.assignUserIdEnd = assignUserIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 分配人id
+     * @param assignUserIdIncrement
+     */
+    public DeclareQuery assignUserIdIncrement(Long assignUserIdIncrement){
+        this.assignUserIdIncrement = assignUserIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 分配人id
+     * @param assignUserIdList
+     */
+    public DeclareQuery assignUserIdList(List<Long> assignUserIdList){
+        this.assignUserIdList = assignUserIdList;
+        return this;
+    }
+
+    /**
+     * 设置 分配人id
+     * @param assignUserIdNotList
+     */
+    public DeclareQuery assignUserIdNotList(List<Long> assignUserIdNotList){
+        this.assignUserIdNotList = assignUserIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 分配人名称
+     * @param assignUserName
+     */
+    public DeclareQuery assignUserName(String assignUserName){
+        setAssignUserName(assignUserName);
+        return this;
+    }
+
+    /**
+     * 设置 分配人名称
+     * @param assignUserNameList
+     */
+    public DeclareQuery assignUserNameList(List<String> assignUserNameList){
+        this.assignUserNameList = assignUserNameList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

agent-manager/src/main/java/com/mortals/xhx/module/declare/service/impl/DeclareServiceImpl.java

@@ -256,6 +256,9 @@ public class DeclareServiceImpl extends AbstractCRUDServiceImpl<DeclareDao, Decl
         declareEntity.setAgentUserName(staffEntity.getRealName());
         declareEntity.setAssignTime(new Date());
 
+        declareEntity.setAssignUserId(this.getContextUserId(context));
+        declareEntity.setAssignUserName(this.getContextUserName(context));
+
         declareEntity.setDeclareStatus(DeclareStatusEnum.办理中.getValue());
         declareEntity.setUpdateTime(new Date());
         declareEntity.setUpdateUserId(this.getContextUserId(context));