From ba2cf96791f931ea94efec995cd4b8ad6b203471 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Wed, 11 May 2022 20:19:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C=E5=8A=A8?= =?UTF-8?q?=E6=80=81,=E9=97=A8=E6=88=B7=E6=90=9C=E7=B4=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResourceController.java | 9 +- .../modules/resource/dao/ResourceDao.java | 4 + .../resource/service/ResourceService.java | 3 +- .../service/impl/ResourceServiceImpl.java | 37 +++- .../io/renren/modules/sys/dto/SysDeptDTO.java | 22 ++ .../modules/sys/entity/SysDeptEntity.java | 8 + .../controller/WorkDynamicsController.java | 18 +- .../workDynamics/dao/WorkDynamicsDao.java | 4 +- .../workDynamics/dto/WorkDynamicsDTO.java | 6 +- .../entity/WorkDynamicsEntity.java | 6 +- .../workDynamics/excel/WorkDynamicsExcel.java | 2 +- .../service/WorkDynamicsService.java | 1 + .../service/impl/WorkDynamicsServiceImpl.java | 11 +- .../src/main/resources/application-dev.yml | 1 - .../resources/mapper/resource/ResourceDao.xml | 203 ++++++++++-------- .../mapper/workDynamics/WorkDynamicsDao.xml | 15 +- 16 files changed, 237 insertions(+), 113 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java index 495b5bb2..89a9f64d 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java @@ -111,6 +111,13 @@ public class ResourceController { return new Result<>().ok(resourceService.selectRecommend()); } + @PostMapping("/selectDeptList") + @ApiOperation("查询部门企业列表及汇聚能力数量") + @LogOperation("查询部门企业列表及汇聚能力数量") + public Result selectDeptList(@RequestBody JSONObject jsonObject) { + return new Result().ok(resourceService.selectDeptList(jsonObject)); + } + @GetMapping("/updateVisits") @ApiOperation("更新能力访问量") @LogOperation("更新能力访问量") @@ -156,9 +163,7 @@ public class ResourceController { @LogOperation("删除") //@RequiresPermissions("resource:resource:delete") public Result delete(@RequestBody JSONObject jsonObject) { - resourceService.deleteWithAttrs(jsonObject); - return new Result(); } diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java index ef1981a6..5bde08a1 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java @@ -52,4 +52,8 @@ public interface ResourceDao extends BaseDao { * @return */ Long countAllDept(); + + List> selectGroupByDeptId(); + + Integer selectTypeCountByDept(String type); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java index cd507a2d..c49ef1a7 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java @@ -12,7 +12,7 @@ import java.util.Map; /** * 资源表 * - * @author dg + * @author dg * @since 1.0 2022-04-13 */ public interface ResourceService extends CrudService { @@ -39,6 +39,7 @@ public interface ResourceService extends CrudService> getAmountGroupByType(); Long countAllDept(); diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index ee7b0f60..5de3d56a 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 资源表 @@ -221,7 +222,8 @@ public class ResourceServiceImpl extends CrudServiceImpl resourceDTOS = resourceDao.selectMostPopular(selectMap); page.setRecords(resourceDTOS); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag()).eq("type", jsonObject.getString("type")); + queryWrapper.eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag()) + .eq("type", jsonObject.getString("type")); Integer count = resourceDao.selectCount(queryWrapper); page.setTotal(count); return page; @@ -248,8 +250,10 @@ public class ResourceServiceImpl extends CrudServiceImpl resultList = new ArrayList<>(); + HashMap resourceMap = new HashMap<>(); + resourceMap.put("type", "全部能力目录"); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag", 0); + resourceMap.put("total", resourceDao.selectCount(queryWrapper)); + //resourceMap.put("dataList", resourceDao.selectList(queryWrapper)); + resultList.add(resourceMap); + List> typeMapList = resourceDao.selectGroupByDeptId(); + Map>> listMap = typeMapList.stream() + .collect(Collectors.groupingBy(m -> m.get("type").toString())); + listMap.entrySet().stream().forEach(item -> { + HashMap map = new HashMap<>(); + map.put("type", item.getKey()); + map.put("total", resourceDao.selectTypeCountByDept(item.getKey())); + map.put("dataList", item.getValue()); + resultList.add(map); + }); + return resultList; + } } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/sys/dto/SysDeptDTO.java b/renren-admin/src/main/java/io/renren/modules/sys/dto/SysDeptDTO.java index 79ce9d49..a4b0d67f 100644 --- a/renren-admin/src/main/java/io/renren/modules/sys/dto/SysDeptDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/sys/dto/SysDeptDTO.java @@ -37,6 +37,12 @@ public class SysDeptDTO extends TreeNode implements Serializable { @NotBlank(message="{sysdept.name.require}", groups = DefaultGroup.class) private String name; + @ApiModelProperty(value = "类型：1省级部门，2市级部门，3区级部门，4企业") + private Integer type; + + @ApiModelProperty(value = "") + private Long district; + @ApiModelProperty(value = "排序") @Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class) private Integer sort; @@ -76,6 +82,22 @@ public class SysDeptDTO extends TreeNode implements Serializable { this.name = name; } + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Long getDistrict() { + return district; + } + + public void setDistrict(Long district) { + this.district = district; + } + public Integer getSort() { return sort; } diff --git a/renren-admin/src/main/java/io/renren/modules/sys/entity/SysDeptEntity.java b/renren-admin/src/main/java/io/renren/modules/sys/entity/SysDeptEntity.java index 75b90afc..1c10b8a1 100644 --- a/renren-admin/src/main/java/io/renren/modules/sys/entity/SysDeptEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/sys/entity/SysDeptEntity.java @@ -29,6 +29,14 @@ public class SysDeptEntity extends BaseEntity { * 部门名称 */ private String name; + /** + * 类型：1省级部门，2市级部门，3区级部门，4企业 + */ + private Integer type; + /** + * 地区 + */ + private Long district; /** * 排序 */ diff --git a/renren-admin/src/main/java/io/renren/modules/workDynamics/controller/WorkDynamicsController.java b/renren-admin/src/main/java/io/renren/modules/workDynamics/controller/WorkDynamicsController.java index 18eaee7f..21769e9a 100644 --- a/renren-admin/src/main/java/io/renren/modules/workDynamics/controller/WorkDynamicsController.java +++ b/renren-admin/src/main/java/io/renren/modules/workDynamics/controller/WorkDynamicsController.java @@ -17,7 +17,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -26,7 +25,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; - /** * 工作动态 * @@ -34,13 +32,13 @@ import java.util.Map; * @since 1.0 2022-05-06 */ @RestController -@RequestMapping("workDynamics/workdynamics") +@RequestMapping("/workdynamics") @Api(tags="工作动态") public class WorkDynamicsController { @Autowired private WorkDynamicsService workDynamicsService; - @GetMapping("page") + @GetMapping("/page") @ApiOperation("分页") @ApiImplicitParams({ @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") , @@ -55,7 +53,7 @@ public class WorkDynamicsController { return new Result>().ok(page); } - @GetMapping("{id}") + @GetMapping("/select/{id}") @ApiOperation("信息") //@RequiresPermissions("workDynamics:workdynamics:info") public Result get(@PathVariable("id") Long id){ @@ -64,7 +62,7 @@ public class WorkDynamicsController { return new Result().ok(data); } - @PostMapping + @PostMapping("/insert") @ApiOperation("保存") @LogOperation("保存") //@RequiresPermissions("workDynamics:workdynamics:save") @@ -77,7 +75,7 @@ public class WorkDynamicsController { return new Result(); } - @PutMapping + @PutMapping("/update") @ApiOperation("修改") @LogOperation("修改") //@RequiresPermissions("workDynamics:workdynamics:update") @@ -90,7 +88,7 @@ public class WorkDynamicsController { return new Result(); } - @DeleteMapping + @DeleteMapping("/delete") @ApiOperation("删除") @LogOperation("删除") //@RequiresPermissions("workDynamics:workdynamics:delete") @@ -98,12 +96,12 @@ public class WorkDynamicsController { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - workDynamicsService.delete(ids); + workDynamicsService.deleteByIds(ids); return new Result(); } - @GetMapping("export") + @GetMapping("/export") @ApiOperation("导出") @LogOperation("导出") //@RequiresPermissions("workDynamics:workdynamics:export") diff --git a/renren-admin/src/main/java/io/renren/modules/workDynamics/dao/WorkDynamicsDao.java b/renren-admin/src/main/java/io/renren/modules/workDynamics/dao/WorkDynamicsDao.java index 95d8d94e..5a0f93ad 100644 --- a/renren-admin/src/main/java/io/renren/modules/workDynamics/dao/WorkDynamicsDao.java +++ b/renren-admin/src/main/java/io/renren/modules/workDynamics/dao/WorkDynamicsDao.java @@ -3,6 +3,7 @@ package io.renren.modules.workDynamics.dao; import io.renren.common.dao.BaseDao; import io.renren.modules.workDynamics.entity.WorkDynamicsEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 工作动态 @@ -12,5 +13,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface WorkDynamicsDao extends BaseDao { - + + Integer deleteByIds(@Param("ids") Long[] ids); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/workDynamics/dto/WorkDynamicsDTO.java b/renren-admin/src/main/java/io/renren/modules/workDynamics/dto/WorkDynamicsDTO.java index 655cf10d..011b87df 100644 --- a/renren-admin/src/main/java/io/renren/modules/workDynamics/dto/WorkDynamicsDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/workDynamics/dto/WorkDynamicsDTO.java @@ -24,10 +24,10 @@ public class WorkDynamicsDTO implements Serializable { private String title; @ApiModelProperty(value = "导航图保存地址") private String imageUrl; - @ApiModelProperty(value = "文件地址") - private String fileUrl; + @ApiModelProperty(value = "内容") + private String content; @ApiModelProperty(value = "删除标志：0:正常，1:删除，9:其他") - private Integer delFalg; + private Integer delFlag; @ApiModelProperty(value = "创建人") private Long creator; @ApiModelProperty(value = "创建时间") diff --git a/renren-admin/src/main/java/io/renren/modules/workDynamics/entity/WorkDynamicsEntity.java b/renren-admin/src/main/java/io/renren/modules/workDynamics/entity/WorkDynamicsEntity.java index 61c8d229..105bd91d 100644 --- a/renren-admin/src/main/java/io/renren/modules/workDynamics/entity/WorkDynamicsEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/workDynamics/entity/WorkDynamicsEntity.java @@ -31,13 +31,13 @@ public class WorkDynamicsEntity { */ private String imageUrl; /** - * 文件地址 + * 内容 */ - private String fileUrl; + private String content; /** * 删除标志：0:正常，1:删除，9:其他 */ - private Integer delFalg; + private Integer delFlag; /** * 创建人 */ diff --git a/renren-admin/src/main/java/io/renren/modules/workDynamics/excel/WorkDynamicsExcel.java b/renren-admin/src/main/java/io/renren/modules/workDynamics/excel/WorkDynamicsExcel.java index 5baeff92..94161c12 100644 --- a/renren-admin/src/main/java/io/renren/modules/workDynamics/excel/WorkDynamicsExcel.java +++ b/renren-admin/src/main/java/io/renren/modules/workDynamics/excel/WorkDynamicsExcel.java @@ -27,7 +27,7 @@ public class WorkDynamicsExcel { @ExcelProperty(value = "文件地址", index = 3) private String fileUrl; @ExcelProperty(value = "删除标志：0:正常，1:删除，9:其他", index = 4) - private Integer delFalg; + private Integer delFlag; @ExcelProperty(value = "创建人", index = 5) private Long creator; @ExcelProperty(value = "创建时间", index = 6) diff --git a/renren-admin/src/main/java/io/renren/modules/workDynamics/service/WorkDynamicsService.java b/renren-admin/src/main/java/io/renren/modules/workDynamics/service/WorkDynamicsService.java index f45d0b0f..88b96903 100644 --- a/renren-admin/src/main/java/io/renren/modules/workDynamics/service/WorkDynamicsService.java +++ b/renren-admin/src/main/java/io/renren/modules/workDynamics/service/WorkDynamicsService.java @@ -12,4 +12,5 @@ import io.renren.modules.workDynamics.entity.WorkDynamicsEntity; */ public interface WorkDynamicsService extends CrudService { + void deleteByIds(Long[] ids); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/workDynamics/service/impl/WorkDynamicsServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/workDynamics/service/impl/WorkDynamicsServiceImpl.java index 9d56135c..d2830a6f 100644 --- a/renren-admin/src/main/java/io/renren/modules/workDynamics/service/impl/WorkDynamicsServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/workDynamics/service/impl/WorkDynamicsServiceImpl.java @@ -9,6 +9,7 @@ import io.renren.modules.workDynamics.entity.WorkDynamicsEntity; import io.renren.modules.workDynamics.service.WorkDynamicsService; import io.renren.modules.security.user.SecurityUser; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Map; @@ -22,13 +23,21 @@ import java.util.Map; @Service public class WorkDynamicsServiceImpl extends CrudServiceImpl implements WorkDynamicsService { + @Autowired + private WorkDynamicsDao workDynamicsDao; + @Override public QueryWrapper getWrapper(Map params){ QueryWrapper wrapper = new QueryWrapper<>(); - + wrapper.eq("del_flag", 0) + .orderByDesc("create_date"); return wrapper; } + @Override + public void deleteByIds(Long[] ids) { + workDynamicsDao.deleteByIds(ids); + } } \ No newline at end of file diff --git a/renren-admin/src/main/resources/application-dev.yml b/renren-admin/src/main/resources/application-dev.yml index 823b087b..186c5a4b 100644 --- a/renren-admin/src/main/resources/application-dev.yml +++ b/renren-admin/src/main/resources/application-dev.yml @@ -5,7 +5,6 @@ spring: druid: #MySQL driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://15.2.21.238:3310/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false username: root password: Hisense2019 diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 0d7e6dbd..c9398839 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -99,32 +99,31 @@ SELECT tdr.*, tda.*, + IFNULL(taa2.approve_status, '未申请') AS "applyState", IFNULL(trs.score, 0 ) AS "score", IFNULL(taa.applyCount, 0 ) AS "applyCount", IFNULL(trc.collectCount, 0) AS "collectCount", IFNULL(sd.name, '暂无部门信息') AS "deptName", IFNULL(trc2.isCollect, 'false') AS "isCollect", - (IFNULL(tdr.visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(taa.applyCount, 0)+ IFNULL(trc.collectCount, 0)) AS - total + (IFNULL(tdr.visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(taa.applyCount, 0)+ IFNULL(trc.collectCount, 0)) AS total FROM tb_data_resource tdr LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id - LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP - BY resource_id ) trs ON tdr.id = trs.resource_id - LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = - 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id - LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag - = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id - LEFT JOIN ( SELECT resource_id, user_id, ( CASE COUNT( id ) WHEN 1 THEN 'true' ELSE 'false' END ) AS "isCollect" - FROM tb_resource_collection WHERE + LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trs ON tdr.id = trs.resource_id + LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id + LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id + LEFT JOIN ( SELECT resource_id, user_id, ( CASE COUNT( id ) WHEN 1 THEN 'true' ELSE 'false' END ) AS "isCollect" FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 AND user_id = #{dto.creator} GROUP BY resource_id ) trc2 ON tdr.id = trc2.resource_id + LEFT JOIN ( SELECT resource_id, user_id, approve_status FROM t_ability_application WHERE + 1 = 1 AND del_flag = 0 AND user_id = #{dto.creator} + GROUP BY id) taa2 ON tdr.id = taa2.resource_id LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id WHERE 1 = 1 - AND tdr.type = #{dto.type} + AND tdr.type LIKE CONCAT('%',#{dto.type},'%') AND tdr.del_flag = 0 AND tdr.name like CONCAT('%',#{dto.name},'%') @@ -172,60 +171,52 @@ SELECT - tdr.*, - IFNULL(trs.score, 0 ) AS "score", - IFNULL(taa.applyCount, 0 ) AS "applyCount", - IFNULL(trc.collectCount, 0) AS "collectCount", - sd.name AS "deptName", - IFNULL(trc2.isCollect, 'false') AS "isCollect", - IFNULL(taa2.applyState, 'false') AS "applyState", - (IFNULL(visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(applyCount,0)+ IFNULL(collectCount,0)) AS total + tdr.*, + IFNULL(trs.score, 0 ) AS "score", + IFNULL(taa.applyCount, 0 ) AS "applyCount", + IFNULL(trc.collectCount, 0) AS "collectCount", + sd.name AS "deptName", + IFNULL(trc2.isCollect, 'false') AS "isCollect", + IFNULL(taa2.approve_status, '未申请') AS "applyState", + (IFNULL(visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(applyCount,0)+ IFNULL(collectCount,0)) AS total FROM - tb_data_resource tdr - LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP - BY resource_id ) trs ON tdr.id = trs.resource_id - LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = - 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id - LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag - = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id - LEFT JOIN ( SELECT resource_id, user_id, ( CASE COUNT( id ) WHEN 1 THEN 'true' ELSE 'false' END ) AS "isCollect" - FROM tb_resource_collection WHERE - 1 = 1 AND del_flag = 0 AND user_id = #{dto.creator} - GROUP BY resource_id) trc2 ON tdr.id = trc2.resource_id - LEFT JOIN ( SELECT resource_id, user_id, ( CASE approve_status WHEN '通过' THEN 'true' ELSE 'false' END ) AS - "applyState" FROM t_ability_application WHERE - 1 = 1 AND del_flag = 0 AND user_id = #{dto.creator} - GROUP BY id) taa2 ON tdr.id = taa2.resource_id - LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id + tb_data_resource tdr + LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trs ON tdr.id = trs.resource_id + LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id + LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id + LEFT JOIN ( SELECT resource_id, user_id, ( CASE COUNT( id ) WHEN 1 THEN 'true' ELSE 'false' END ) AS "isCollect" FROM tb_resource_collection WHERE + 1 = 1 AND del_flag = 0 AND user_id = #{dto.creator} + GROUP BY resource_id) trc2 ON tdr.id = trc2.resource_id + LEFT JOIN ( SELECT resource_id, approve_status FROM t_ability_application WHERE + 1 = 1 AND del_flag = 0 AND user_id = #{dto.creator} + GROUP BY id) taa2 ON tdr.id = taa2.resource_id + LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id WHERE 1 = 1 - AND tdr.del_flag = 0 - + AND tdr.del_flag = 0 + AND tdr.name LIKE CONCAT('%',#{dto.name},'%') - + AND tdr.type = #{dto.type} - + AND tdr.district_id = #{dto.districtId} + + AND tdr.dept_id = #{dto.deptId} + ORDER BY ${orderField} ${orderType} LIMIT ${pageNum}, ${pageSize} @@ -326,4 +315,50 @@ WHERE del_flag = 0 + + + + \ No newline at end of file diff --git a/renren-admin/src/main/resources/mapper/workDynamics/WorkDynamicsDao.xml b/renren-admin/src/main/resources/mapper/workDynamics/WorkDynamicsDao.xml index 94282efa..a57b1a85 100644 --- a/renren-admin/src/main/resources/mapper/workDynamics/WorkDynamicsDao.xml +++ b/renren-admin/src/main/resources/mapper/workDynamics/WorkDynamicsDao.xml @@ -7,8 +7,8 @@ - - + + @@ -20,4 +20,15 @@ + + update tb_work_dynamics + set del_flag = 1 , + update_date = now() + where 1 = 1 + and id in + + #{item} + + + \ No newline at end of file