Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluateTaskController.java

@@ -11,6 +11,7 @@ import com.xunmei.core.evaluate.domain.CoreEvaluateTask;
 import com.xunmei.core.evaluate.dto.EvaluateTaskContentDTO;
 import com.xunmei.core.evaluate.dto.EvaluateTaskDTO;
 import com.xunmei.core.evaluate.service.ICoreEvaluateTaskService;
+import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,9 +34,9 @@ public class CoreEvaluateTaskController extends BaseController {
      * 查询外包评价任务列表
      */
     @ApiOperation(value = "查询CoreEvaluateTask列表")
-    @RequiresPermissions("system:task:list")
+    @RequiresPermissions("core:task:list")
     @GetMapping("/list")
-    public TableDataInfo<CoreEvaluateTask> list(EvaluateTaskDTO coreEvaluateTask) {
+    public TableDataInfo<CoreEvaluateTaskVO> list(EvaluateTaskDTO coreEvaluateTask) {
         return coreEvaluateTaskService.selectPage(coreEvaluateTask);
     }
 
@@ -44,7 +45,7 @@ public class CoreEvaluateTaskController extends BaseController {
      * 获取外包评价任务详细信息
      */
     @ApiOperation(value = "获取CoreEvaluateTask详细信息")
-    @RequiresPermissions("system:task:query")
+    @RequiresPermissions("core:task:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(coreEvaluateTaskService.selectCoreEvaluateTaskById(id));
@@ -54,7 +55,7 @@ public class CoreEvaluateTaskController extends BaseController {
      * 新增外包评价任务
      */
     @ApiOperation(value = "新增CoreEvaluateTask")
-    @RequiresPermissions("system:task:add")
+    @RequiresPermissions("core:task:add")
     @Log(title = "外包评价任务", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreEvaluateTask coreEvaluateTask) {
@@ -65,7 +66,7 @@ public class CoreEvaluateTaskController extends BaseController {
      * 修改外包评价任务
      */
     @ApiOperation(value = "修改CoreEvaluateTask")
-    @RequiresPermissions("system:task:edit")
+    @RequiresPermissions("core:task:edit")
     @Log(title = "外包评价任务", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody EvaluateTaskContentDTO evaluateTaskContentDTO) {
@@ -76,7 +77,7 @@ public class CoreEvaluateTaskController extends BaseController {
      * 删除外包评价任务
      */
     @ApiOperation(value = "删除CoreEvaluateTask")
-    @RequiresPermissions("system:task:remove")
+    @RequiresPermissions("core:task:remove")
     @Log(title = "外包评价任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/domain/CoreEvaluateTask.java

@@ -53,7 +53,8 @@ private String evaluateBy;
     /** 外包评价名称 */
             @ApiModelProperty(value = "外包评价名称")
     private String evaluateName;
-
+            @ApiModelProperty(value = "角色")
+private String roleName;
     /** 是否删除 */
             @ApiModelProperty(value = "是否删除")
     private String isDeleted;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluateTaskMapper.java

@@ -7,6 +7,7 @@ import com.xunmei.core.evaluate.domain.CoreEvaluateTask;
 import com.xunmei.core.evaluate.dto.EvaluateQueryDTO;
 import com.xunmei.core.evaluate.dto.EvaluateTaskDTO;
 import com.xunmei.core.evaluate.vo.CoreEvaluatePlanListVO;
+import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -66,6 +67,6 @@ public interface CoreEvaluateTaskMapper extends BaseMapper<CoreEvaluateTask> {
      */
     int deleteCoreEvaluateTaskByIds(Long[] ids);
 
-    Page<CoreEvaluateTask> selectPageList(@Param("page") Page<CoreEvaluateTask> page, @Param("request") EvaluateTaskDTO request);
+    Page<CoreEvaluateTaskVO> selectPageList(@Param("page") Page<CoreEvaluateTaskVO> page, @Param("request") EvaluateTaskDTO request);
 
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/ICoreEvaluateTaskService.java

@@ -73,5 +73,5 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      * @param evaluateTaskDTO 查询条件对象
      * @return Page
      */
-    TableDataInfo<CoreEvaluateTask> selectPage(EvaluateTaskDTO evaluateTaskDTO);
+    TableDataInfo<CoreEvaluateTaskVO> selectPage(EvaluateTaskDTO evaluateTaskDTO);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluatePlanServiceImpl.java

@@ -270,9 +270,17 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
                 coreEvaluateTask.setOrgPath(l.getPath());
                 coreEvaluateTask.setEvaluateName(coreEvaluatePlanVO.getEvaluateName());
                 coreEvaluateTask.setCreateTime(DateUtils.getNowDate());
-                coreEvaluateTask.setCreateBy(coreEvaluatePlanVO.getCreateBy());
+                coreEvaluateTask.setCreateBy(coreEvaluatePlan.getCreateBy());
                 coreEvaluateTask.setStartTime(DateUtils.getNowDate());
                 coreEvaluateTask.setEndTime(endTime);
+                List<Long> roleList = coreEvaluateRoleMapper.getRoleByEvaluateId(id);
+                StringBuilder sb = new StringBuilder();
+                for (Long r : roleList) {
+                    sb.append(r);
+                    sb.append(",");
+                }
+                String newStr = sb.toString().substring(0, sb.toString().length() - 1);
+                coreEvaluateTask.setRoleName(newStr);
                 i = coreEvaluateTaskService.insertCoreEvaluateTask(coreEvaluateTask);
                 if (i < 1) {
                     return i;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -65,8 +65,8 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
     private CoreEvaluateRoleMapper coreEvaluateRoleMapper;
 
     @Override
-    public TableDataInfo<CoreEvaluateTask> selectPage(EvaluateTaskDTO evaluateTaskDTO) {
-        Page<CoreEvaluateTask> page;
+    public TableDataInfo<CoreEvaluateTaskVO> selectPage(EvaluateTaskDTO evaluateTaskDTO) {
+        Page<CoreEvaluateTaskVO> page;
         //分页
         if (evaluateTaskDTO.getPageNum() != null && evaluateTaskDTO.getPageSize() != null) {
             page = new Page<>(evaluateTaskDTO.getPageNum(), evaluateTaskDTO.getPageSize());
@@ -80,6 +80,22 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
             evaluateTaskDTO.setOrgId(null);
         }
         page = baseMapper.selectPageList(page, evaluateTaskDTO);
+        List<CoreEvaluateTaskVO> records = page.getRecords();
+       // List<CoreEvaluateTaskVO> coreEvaluateTaskVOS = new ArrayList<>();
+        for (CoreEvaluateTaskVO c : records) {
+            CoreEvaluateTaskVO coreEvaluateTaskVO = new CoreEvaluateTaskVO();
+            BeanUtils.copyProperties(c, coreEvaluateTaskVO);
+            List<Long> roleIds = new ArrayList<>();
+            if (c.getRoleName().indexOf(",") == -1) {
+                roleIds.add(Long.valueOf(c.getRoleName()));
+            } else {
+                String[] split = c.getRoleName().split(",");
+                for (int i = 0; i < split.length; i++) {
+                    roleIds.add(Long.valueOf(split[i]));
+                }
+            }
+     c.setRoleList(roleIds);
+        }
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);
     }
@@ -189,7 +205,6 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
             e.setTaskId(evaluateTaskContentDTO.getId());
             coreEvaluateTaskContentMapper.insert(e);
         });
-
         coreEvaluateTask.setUpdateTime(DateUtils.getNowDate());
         coreEvaluateTask.setEvaluateBy(SecurityUtils.getUsername());
         coreEvaluateTask.setCompleteTime(DateUtils.getNowDate());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/vo/CoreEvaluateTaskVO.java

@@ -13,4 +13,5 @@ import java.util.List;
 @Data
 public class CoreEvaluateTaskVO extends CoreEvaluateTask {
     List<CoreEvaluateContent> coreEvaluateContentList;
+    List<Long>roleList;
 }

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -66,36 +66,39 @@
             <include refid="selectCoreEvaluateTaskVo"/>
             where id = #{id}
     </select>
-    <select id="selectPageList" resultType="com.xunmei.core.evaluate.domain.CoreEvaluateTask">
-        SELECT
-            id,
-            org_name,
-            role_name,
-            evaluate_name,
-            start_time,
-            end_time,
-            evaluate_by,
-            complete_time,
-            `status`
+    <select id="selectPageList" resultType="com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO">
+SELECT
+        a.id,
+        a.org_name,
+        GROUP_CONCAT( c.role_name ) as roleName,
+        a.evaluate_name,
+        a.start_time,
+        a.end_time,
+        a.evaluate_by,
+        a.complete_time,
+        a.`status`
         FROM
-            core_evaluate_task
+        core_evaluate_task a
+        LEFT JOIN core_evaluate_role b ON b.evaluate_id = a.plan_id
+        LEFT JOIN sys_role c ON c.id = b.role_id
         WHERE
-            is_deleted =0
+        a.	is_deleted =0
         <if test="request.orgId != null ">
-            and org_id = #{request.orgId}
+            and   a.org_id = #{request.orgId}
         </if>
         <if test="request.orgPath != null  and request.orgPath != ''">
-            and org_path like concat( #{request.orgPath}, '%')
+            and   a.org_path like concat( #{request.orgPath}, '%')
         </if>
         <if test="request.evaluateName != null  and request.evaluateName != ''">
-            and evaluate_name like concat('%', #{request.evaluateName}, '%')
+            and   a.evaluate_name like concat('%', #{request.evaluateName}, '%')
         </if>
         <if test="request.status != null ">
-            and status = #{request.status}
+            and   a.status = #{request.status}
         </if>
         <if test="request.startTime != null and request.endTime != null">
-            and start_time &gt;= #{request.startTime} AND end_time &lt;= #{request.endTime}
+            and   a.start_time &gt;= #{request.startTime} AND   a.end_time &lt;= #{request.endTime}
         </if>
+        GROUP BY a.id
     </select>
 
     <insert id="insertCoreEvaluateTask" parameterType="com.xunmei.core.evaluate.domain.CoreEvaluateTask">