Skip to content

A
agent-platform
Commit 6b9f2ddc authored by 赵啸非's avatar 赵啸非
Browse files
Options

更新评价统计计算

parent 97b1a5a2
Hide whitespace changes
Inline Side-by-side
Showing with 335 additions and 7 deletions
agent-manager/db/add.sql
View file @ 6b9f2ddc
......@@ -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
View file @ 6b9f2ddc
......@@ -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
View file @ 6b9f2ddc
......@@ -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
View file @ 6b9f2ddc
......@@ -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));
......
agent-manager/src/main/resources/sqlmap/module/declare/DeclareMapper.xml
View file @ 6b9f2ddc
......@@ -36,6 +36,8 @@
<result property="agentUserId" column="agent_user_id" />
<result property="agentUserName" column="agent_user_name" />
<result property="assignTime" column="assign_time" />
<result property="assignUserId" column="assign_user_id" />
<result property="assignUserName" column="assign_user_name" />
</resultMap>
<!-- 表所有列 -->
......@@ -134,6 +136,12 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('assignTime') or colPickMode == 1 and data.containsKey('assignTime')))">
a.assign_time,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('assignUserId') or colPickMode == 1 and data.containsKey('assignUserId')))">
a.assign_user_id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('assignUserName') or colPickMode == 1 and data.containsKey('assignUserName')))">
a.assign_user_name,
</if>
</trim>
</sql>
<!-- 子表所有列 -->
......@@ -145,18 +153,18 @@
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeclareEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_agent_declare
(matter_id,matter_name,matter_code,area_name,dept_id,dept_name,apply_name,park_id,park_name,category_id,category_code,category_name,content,submit_time,result,fin_time,declare_status,sort,remark,create_user_id,create_user_name,create_time,update_time,company_id,company_name,apply_id,apply_open_id,agent_user_id,agent_user_name,assign_time)
(matter_id,matter_name,matter_code,area_name,dept_id,dept_name,apply_name,park_id,park_name,category_id,category_code,category_name,content,submit_time,result,fin_time,declare_status,sort,remark,create_user_id,create_user_name,create_time,update_time,company_id,company_name,apply_id,apply_open_id,agent_user_id,agent_user_name,assign_time,assign_user_id,assign_user_name)
VALUES
(#{matterId},#{matterName},#{matterCode},#{areaName},#{deptId},#{deptName},#{applyName},#{parkId},#{parkName},#{categoryId},#{categoryCode},#{categoryName},#{content},#{submitTime},#{result},#{finTime},#{declareStatus},#{sort},#{remark},#{createUserId},#{createUserName},#{createTime},#{updateTime},#{companyId},#{companyName},#{applyId},#{applyOpenId},#{agentUserId},#{agentUserName},#{assignTime})
(#{matterId},#{matterName},#{matterCode},#{areaName},#{deptId},#{deptName},#{applyName},#{parkId},#{parkName},#{categoryId},#{categoryCode},#{categoryName},#{content},#{submitTime},#{result},#{finTime},#{declareStatus},#{sort},#{remark},#{createUserId},#{createUserName},#{createTime},#{updateTime},#{companyId},#{companyName},#{applyId},#{applyOpenId},#{agentUserId},#{agentUserName},#{assignTime},#{assignUserId},#{assignUserName})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_agent_declare
(matter_id,matter_name,matter_code,area_name,dept_id,dept_name,apply_name,park_id,park_name,category_id,category_code,category_name,content,submit_time,result,fin_time,declare_status,sort,remark,create_user_id,create_user_name,create_time,update_time,company_id,company_name,apply_id,apply_open_id,agent_user_id,agent_user_name,assign_time)
(matter_id,matter_name,matter_code,area_name,dept_id,dept_name,apply_name,park_id,park_name,category_id,category_code,category_name,content,submit_time,result,fin_time,declare_status,sort,remark,create_user_id,create_user_name,create_time,update_time,company_id,company_name,apply_id,apply_open_id,agent_user_id,agent_user_name,assign_time,assign_user_id,assign_user_name)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.matterId},#{item.matterName},#{item.matterCode},#{item.areaName},#{item.deptId},#{item.deptName},#{item.applyName},#{item.parkId},#{item.parkName},#{item.categoryId},#{item.categoryCode},#{item.categoryName},#{item.content},#{item.submitTime},#{item.result},#{item.finTime},#{item.declareStatus},#{item.sort},#{item.remark},#{item.createUserId},#{item.createUserName},#{item.createTime},#{item.updateTime},#{item.companyId},#{item.companyName},#{item.applyId},#{item.applyOpenId},#{item.agentUserId},#{item.agentUserName},#{item.assignTime})
(#{item.matterId},#{item.matterName},#{item.matterCode},#{item.areaName},#{item.deptId},#{item.deptName},#{item.applyName},#{item.parkId},#{item.parkName},#{item.categoryId},#{item.categoryCode},#{item.categoryName},#{item.content},#{item.submitTime},#{item.result},#{item.finTime},#{item.declareStatus},#{item.sort},#{item.remark},#{item.createUserId},#{item.createUserName},#{item.createTime},#{item.updateTime},#{item.companyId},#{item.companyName},#{item.applyId},#{item.applyOpenId},#{item.agentUserId},#{item.agentUserName},#{item.assignTime},#{item.assignUserId},#{item.assignUserName})
</foreach>
</insert>
......@@ -286,6 +294,15 @@
<if test="(colPickMode==0 and data.containsKey('assignTime')) or (colPickMode==1 and !data.containsKey('assignTime'))">
a.assign_time=#{data.assignTime},
</if>
<if test="(colPickMode==0 and data.containsKey('assignUserId')) or (colPickMode==1 and !data.containsKey('assignUserId'))">
a.assign_user_id=#{data.assignUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('assignUserIdIncrement')) or (colPickMode==1 and !data.containsKey('assignUserIdIncrement'))">
a.assign_user_id=ifnull(a.assign_user_id,0) + #{data.assignUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('assignUserName')) or (colPickMode==1 and !data.containsKey('assignUserName'))">
a.assign_user_name=#{data.assignUserName},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -558,6 +575,25 @@
</if>
</foreach>
</trim>
<trim prefix="assign_user_id=(case" suffix="ELSE assign_user_id end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('assignUserId')) or (colPickMode==1 and !item.containsKey('assignUserId'))">
when a.id=#{item.id} then #{item.assignUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('assignUserIdIncrement')) or (colPickMode==1 and !item.containsKey('assignUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.assign_user_id,0) + #{item.assignUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="assign_user_name=(case" suffix="ELSE assign_user_name end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('assignUserName')) or (colPickMode==1 and !item.containsKey('assignUserName'))">
when a.id=#{item.id} then #{item.assignUserName}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -1366,6 +1402,54 @@
<if test="conditionParamRef.containsKey('assignTimeEnd') and conditionParamRef.assignTimeEnd != null and conditionParamRef.assignTimeEnd!=''">
${_conditionType_} a.assign_time <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.assignTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('assignUserId')">
<if test="conditionParamRef.assignUserId != null ">
${_conditionType_} a.assign_user_id = #{${_conditionParam_}.assignUserId}
</if>
<if test="conditionParamRef.assignUserId == null">
${_conditionType_} a.assign_user_id is null
</if>
</if>
<if test="conditionParamRef.containsKey('assignUserIdList') and conditionParamRef.assignUserIdList.size() > 0">
${_conditionType_} a.assign_user_id in
<foreach collection="conditionParamRef.assignUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('assignUserIdNotList') and conditionParamRef.assignUserIdNotList.size() > 0">
${_conditionType_} a.assign_user_id not in
<foreach collection="conditionParamRef.assignUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('assignUserIdStart') and conditionParamRef.assignUserIdStart != null">
${_conditionType_} a.assign_user_id <![CDATA[ >= ]]> #{${_conditionParam_}.assignUserIdStart}
</if>
<if test="conditionParamRef.containsKey('assignUserIdEnd') and conditionParamRef.assignUserIdEnd != null">
${_conditionType_} a.assign_user_id <![CDATA[ <= ]]> #{${_conditionParam_}.assignUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('assignUserName')">
<if test="conditionParamRef.assignUserName != null and conditionParamRef.assignUserName != ''">
${_conditionType_} a.assign_user_name like #{${_conditionParam_}.assignUserName}
</if>
<if test="conditionParamRef.assignUserName == null">
${_conditionType_} a.assign_user_name is null
</if>
</if>
<if test="conditionParamRef.containsKey('assignUserNameList') and conditionParamRef.assignUserNameList.size() > 0">
${_conditionType_} a.assign_user_name in
<foreach collection="conditionParamRef.assignUserNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('assignUserNameNotList') and conditionParamRef.assignUserNameNotList.size() > 0">
${_conditionType_} a.assign_user_name not in
<foreach collection="conditionParamRef.assignUserNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1447,6 +1531,13 @@
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('assignUserIdList') and conditionParamRef.assignUserIdList.size() > 0">
field(a.assign_user_id,
<foreach collection="conditionParamRef.assignUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
a.${item.colName} ${item.sortKind}
......@@ -1533,6 +1624,13 @@
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('assignUserIdList') and conditionParamRef.assignUserIdList.size() > 0">
field(a.assign_user_id,
<foreach collection="conditionParamRef.assignUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
......@@ -1689,6 +1787,16 @@
<if test='orderCol.assignTime != null and "DESC".equalsIgnoreCase(orderCol.assignTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('assignUserId')">
a.assign_user_id
<if test='orderCol.assignUserId != null and "DESC".equalsIgnoreCase(orderCol.assignUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('assignUserName')">
a.assign_user_name
<if test='orderCol.assignUserName != null and "DESC".equalsIgnoreCase(orderCol.assignUserName)'>DESC</if>
,
</if>
</trim>
</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment