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

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

@@ -1,6 +1,9 @@
 package com.xunmei.core.evaluate.controller;
 
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -11,14 +14,18 @@ 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.dto.EvaluateTaskStatisticsDTO;
+import com.xunmei.core.evaluate.service.ICoreEvaluatePlanService;
 import com.xunmei.core.evaluate.service.ICoreEvaluateTaskService;
+import com.xunmei.core.evaluate.vo.CoreEvaluatePlanVO;
 import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
+import com.xunmei.core.retrieval.service.impl.CoreMonitoringRetrievalTaskServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -34,6 +41,10 @@ import java.util.Map;
 public class CoreEvaluateTaskController extends BaseController {
     @Autowired
     private ICoreEvaluateTaskService coreEvaluateTaskService;
+    @Autowired
+    private ICoreEvaluatePlanService coreEvaluatePlanService;
+    @Autowired
+    private CoreMonitoringRetrievalTaskServiceImpl coreMonitoringRetrievalTaskService;
 
     /**
      * 查询外包评价任务列表
@@ -59,10 +70,41 @@ public class CoreEvaluateTaskController extends BaseController {
     @RequiresPermissions("core:evaluateTask:list")
     @GetMapping("/statistics")
     public AjaxResult statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
-        AjaxResult ajaxResult =AjaxResult.success();
-        ajaxResult.put(AjaxResult.DATA_TAG,coreEvaluateTaskService.statistics(evaluateTaskStatisticsDTO));
-        LocalDate localDate= LocalDate.now();
-        ajaxResult.put("tittle","押运公司评价情况表("+localDate.getYear()+"年"+localDate.getMonthValue()+"月)");
+        AjaxResult ajaxResult = AjaxResult.success();
+        if (null != evaluateTaskStatisticsDTO.getPlanId()) {
+            CoreEvaluatePlanVO coreEvaluatePlanVO = coreEvaluatePlanService.selectCoreEvaluatePlanById(evaluateTaskStatisticsDTO.getPlanId());
+            LocalDate localDate = LocalDate.now();
+            String dateTitle = null;
+            try {
+                switch (coreEvaluatePlanVO.getEvaluateCycle()) {
+                    case "0":
+                        dateTitle = localDate.getYear() + "年" + localDate.getMonthValue() + "月)";
+                        evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(localDate.getYear() + "-" + localDate.getMonthValue() + "-01 00:00:00", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                        String lastDay = coreMonitoringRetrievalTaskService.getLastDay(localDate.getYear(), localDate.getMonthValue(), "yyyy-MM-dd");
+                        evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(lastDay + " 23:59:59", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                        break;
+                    case "1":
+                        DateTime beginOfQuarter = DateUtil.beginOfQuarter(new java.util.Date());
+                        DateTime endOfQuarter = DateUtil.endOfQuarter(new Date());
+                        evaluateTaskStatisticsDTO.setStartTime(beginOfQuarter);
+                        evaluateTaskStatisticsDTO.setEndTime(endOfQuarter);
+                        int month = localDate.getMonthValue();
+                        int quarter = (month - 1) / 3 + 1;
+                        dateTitle = localDate.getYear() + "年第" + quarter + "季度)";
+                        break;
+                    default:
+                        evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(localDate.getYear() + "-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                        evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(localDate.getYear() + "-12-31 23:59:59", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                        dateTitle = localDate.getYear() + "年)";
+                        break;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            ajaxResult.put("tittle", coreEvaluatePlanVO.getEvaluateName() + "(" + dateTitle);
+        }
+        ajaxResult.put(AjaxResult.DATA_TAG, coreEvaluateTaskService.statistics(evaluateTaskStatisticsDTO));
         return ajaxResult;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/dto/EvaluateTaskStatisticsDTO.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author :LuoWei
  * @date : 2023/10/25
@@ -24,4 +26,6 @@ public class EvaluateTaskStatisticsDTO {
     @ApiModelProperty(value = "每页大小")
     private Long pageSize;
     private Integer type;
+    private Date startTime;
+    private Date endTime;
 }

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

@@ -11,6 +11,7 @@ import com.xunmei.core.evaluate.vo.CoreEvaluatePlanListVO;
 import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -78,5 +79,5 @@ public interface CoreEvaluateTaskMapper extends BaseMapper<CoreEvaluateTask> {
 
     //List<LinkedHashMap> statisticsAll(@Param("request") EvaluateTaskStatisticsDTO request);
     LinkedHashMap statisticsAll(@Param("request") EvaluateTaskStatisticsDTO request);
-    List<Map> getContentByTaskId(@Param("id") Long id);
+    List<Map> getContentByTaskId(@Param("id") Long id,@Param("startTime") Date startTime,@Param("endTime") Date endTime);
 }

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

@@ -129,7 +129,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
             }
             Object id = linkedHashMap.get("id");
             linkedHashMap.remove("id");
-            List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) id);
+            List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) id,evaluateTaskStatisticsDTO.getStartTime(),evaluateTaskStatisticsDTO.getEndTime());
             if (CollectionUtils.isNotEmpty(contentByTaskId)) {
                 int total = 0;
                 for (int l = 0; l < contentByTaskId.size(); l++) {

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

@@ -139,10 +139,13 @@
           IF
               ( b.content_type = 1, 0, SUM( b.score ) ) score
       FROM
-          core_evaluate_task_user_content b
-              LEFT JOIN core_evaluate_task_user a ON a.id = b.task_user_id AND b.`code`!=0
+      core_evaluate_task_user_content b
+      LEFT JOIN core_evaluate_task_user a ON a.id = b.task_user_id
+      AND b.`code` != 0
+      LEFT JOIN core_evaluate_task c ON a.task_id = c.id
       WHERE
-          a.id = #{id}
+      c.start_time <= #{startTime} AND c.end_time >= #{endTime} and
+      a.id = #{id}
       GROUP BY
           b.content
     </select>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -170,6 +170,10 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                     sysOrg1 = baseMapper.selectSysOrgById(baseMapper.selectSysOrgById(baseMapper.selectSysOrgById(s.getParentId()).getParentId()).getParentId());
                 }
             }
+            securityWorkExport.setCity(sysOrg1.getShortName().indexOf("地区行社") == -1 ? sysOrg1.getShortName().substring(0, 2) : sysOrg1.getShortName().split("地区行社")[0]);
+            securityWorkExport.setOrgName(s.getShortName());
+            Integer integer = baseMapper.selectNetworkNumberByPath(s.getPath());
+            securityWorkExport.setNetworkNumber(integer);
         });
         return null;
     }