diff --git a/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java b/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java index f0826ab0..04ff0eae 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java @@ -209,6 +209,8 @@ public class ResourceMountController { } dto.setUndercarriageReason(tResourceUndercarriageApplyDTO.getReason()); dto.setUndercarriageEnclosure(tResourceUndercarriageApplyDTO.getEnclosure()); + dto.setUndercarriageTitle(tResourceUndercarriageApplyDTO.getTitle()); + dto.setUndercarriageUserPhone(tResourceUndercarriageApplyDTO.getPhone()); dto.setDelFlag(ResourceEntityDelFlag.NORMAL.getFlag()); // 设置为正常 dto.setFlowType("资源下架"); String userId = SecurityUser.getUserId().toString(); diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java b/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java index 550984b0..44faeb43 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java @@ -103,12 +103,17 @@ public class ResourceDTO extends AuditingBaseDTO implements Serializable { @ApiModelProperty(value = "附件") private String enclosure; + @ApiModelProperty(value = "下架理由") private String undercarriageReason; @ApiModelProperty(value = "提起下架人员姓名") private String undercarriageUserName; @ApiModelProperty(value = "下架附件") private String undercarriageEnclosure; + @ApiModelProperty(value = "下架申请标题") + private String undercarriageTitle; + @ApiModelProperty(value = "下架申请电话") + private String undercarriageUserPhone; @ApiModelProperty(value = "总体评价") private Integer total; diff --git a/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java b/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java index 37ffb736..9e1f1246 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java @@ -140,6 +140,15 @@ public class ResourceEntity extends BaseEntity { */ private String undercarriageEnclosure; + /** + * 下架申请标题 + */ + private String undercarriageTitle; + /** + * 下架申请电话 + */ + private String undercarriageUserPhone; + /** * 置顶标识 diff --git a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceUndercarriageApplyDTO.java b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceUndercarriageApplyDTO.java index b570ee2b..9d0c8b78 100644 --- a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceUndercarriageApplyDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceUndercarriageApplyDTO.java @@ -26,4 +26,6 @@ public class TResourceUndercarriageApplyDTO extends AuditingBaseDTO implements S private String reason; @ApiModelProperty(value = "下架附件") private String enclosure; + @ApiModelProperty(value = "下架标题") + private String title; } diff --git a/renren-admin/src/main/resources/db/V5.0__resource_add_col.sql b/renren-admin/src/main/resources/db/V5.0__resource_add_col.sql new file mode 100644 index 00000000..7a602efa --- /dev/null +++ b/renren-admin/src/main/resources/db/V5.0__resource_add_col.sql @@ -0,0 +1,3 @@ +alter table `tb_data_resource` +ADD COLUMN `undercarriage_title` varchar(255) NULL comment '下架申请标题' , +ADD COLUMN `undercarriage_phone` varchar(255) NULL comment '下架申请电话'; \ No newline at end of file diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index ab38f832..1a54af31 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -39,6 +39,8 @@ + + @@ -85,6 +87,8 @@ + + @@ -139,7 +143,8 @@ AND user_id = #{dto.creator} GROUP BY id) taa2 ON tdr.id = taa2.resource_id LEFT JOIN ( SELECT resource_id, COUNT( approve_status ) approve_status FROM t_ability_application WHERE 1 = 1 - AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id = + AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id + = taa3.resource_id LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id LEFT JOIN sys_region sr ON sd.district = sr.id @@ -271,7 +276,7 @@ WHERE 1 = 1 AND tdr.del_flag = 0 - AND tdr.type != '知识库' + AND tdr.type != '知识库' AND tdr.type != '赋能案例' AND MATCH (tdr.type) AGAINST ( #{type} IN BOOLEAN MODE) @@ -426,7 +431,8 @@ AND user_id = #{dto.creator} GROUP BY id) taa2 ON tdr.id = taa2.resource_id LEFT JOIN ( SELECT resource_id, COUNT( approve_status ) approve_status FROM t_ability_application WHERE 1 = 1 - AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id = + AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id + = taa3.resource_id LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id LEFT JOIN sys_region sr ON sd.district = sr.id @@ -610,7 +616,8 @@ FROM ( SELECT - ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type", + ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS + "type", sd.NAME AS "deptName", IFNULL( tdr.deptCount, 0 ) AS "deptCount", sd.id AS "deptId", @@ -644,7 +651,8 @@ FROM ( SELECT - ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type", + ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS + "type", IFNULL( tdr.deptCount, 0 ) AS "deptCount" FROM sys_dept sd @@ -682,7 +690,8 @@ FROM ( SELECT - ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type", + ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS + "type", IFNULL( tdr.deptCount, 0) AS "deptCount", IFNULL(sr.name, '暂无该地区') AS "districtName" FROM @@ -1512,7 +1521,7 @@