Merge remote-tracking branch 'origin/master'

src/main/java/com/hz/employmentsite/services/impl/baseSettings/InstitutionImpl.java

@@ -154,7 +154,6 @@ public class InstitutionImpl implements InstitutionService {
             }else{
                 PcInstitutionExample contactExample = new PcInstitutionExample();
                 contactExample.or().andInstitutionIDEqualTo(curInstitutionID);
-                pcInstitutionMapper.deleteByExample(contactExample);
                 result += pcInstitutionMapper.deleteByExample(contactExample);
             }
         }

src/main/java/com/hz/employmentsite/services/impl/statistics/StatisticsServiceImpl.java

@@ -302,6 +302,7 @@ public class StatisticsServiceImpl implements StatisticsService {
         for (RegionSystemDataCount sumDatum : sumData) {
             summaryData.setSiteUserCount(summaryData.getSiteUserCount() + sumDatum.getSiteUserCount());
             summaryData.setCompanyCount(summaryData.getCompanyCount() + sumDatum.getCompanyCount());
+            summaryData.setPostCount(summaryData.getPostCount() + sumDatum.getPostCount());
             summaryData.setPostRecruitCount(summaryData.getPostRecruitCount() + sumDatum.getPostRecruitCount());
             summaryData.setJobUserCount(summaryData.getJobUserCount() + sumDatum.getJobUserCount());
         }
@@ -568,7 +569,7 @@ public class StatisticsServiceImpl implements StatisticsService {
     public List<HourNewAddCount> findOneDaySystemDataCount(Date day) {
         List<HourNewAddCount> jobUserCount = statisticsCQuery.findJobUserHourNewAddCount(day);
         List<HourNewAddCount> companyCount = statisticsCQuery.findCompanyHourNewAddCount(day);
-        List<HourNewAddCount> postCount = statisticsCQuery.findPostHourNewAddCount(day);
+        List<HourNewAddCount> postRecruitCount = statisticsCQuery.findPostHourNewAddCount(day);
         Map<Integer, HourNewAddCount> resultMap = new HashMap<>();
 
         // 合并三个结果
@@ -580,9 +581,9 @@ public class StatisticsServiceImpl implements StatisticsService {
             resultMap.computeIfAbsent(item.getHour(), k -> new HourNewAddCount(item.getHour()))
                     .setCompanyCount(item.getCompanyCount());
         });
-        postCount.forEach(item -> {
+        postRecruitCount.forEach(item -> {
             resultMap.computeIfAbsent(item.getHour(), k -> new HourNewAddCount(item.getHour()))
-                    .setPostCount(item.getPostCount());
+                    .setPostRecruitCount(item.getPostRecruitCount());
         });
         return new ArrayList<>(resultMap.values());
     }

src/main/java/com/hz/employmentsite/services/impl/taskAndLog/DoWorkImpl.java

@@ -104,7 +104,6 @@ public class DoWorkImpl implements DoWorkService {
     public Integer delete(List<String> idList){
         PcDoworkExample contactExample = new PcDoworkExample();
         contactExample.or().andDoworkIDIn(idList);
-        pcDoworkMapper.deleteByExample(contactExample);
         return pcDoworkMapper.deleteByExample(contactExample);
     }
 

src/main/java/com/hz/employmentsite/vo/statistics/HourNewAddCount.java

@@ -14,7 +14,7 @@ public class HourNewAddCount {
 
     private int companyCount;
 
-    private int postCount;
+    private int postRecruitCount;
 
     public HourNewAddCount(int hour) {
         this.hour = hour;

src/main/resources/mapping/cquery/StatisticsCQuery.xml

@@ -766,7 +766,7 @@
     <select id="findPostHourNewAddCount" resultType="com.hz.employmentsite.vo.statistics.HourNewAddCount">
         SELECT
             HOUR( CreateTime ) AS `Hour`,
-            COUNT( 1 ) AS postCount
+            SUM( RecruitCount ) AS postRecruitCount
         FROM
             pc_post
         WHERE

vue/src/views/dataScreen/html/sysService.vue

@@ -331,7 +331,7 @@ function loadOneDaySystemDataCount() {
     // 初始化三种数据的数组
     const jobUserArr = new Array(xTitleArr.length).fill(0);
     const companyArr = new Array(xTitleArr.length).fill(0);
-    const postArr = new Array(xTitleArr.length).fill(0);
+    const postRecruitArr = new Array(xTitleArr.length).fill(0);
     // 填充查询数据
     result.forEach((item: any) => {
       if (item.hour >= 0) {
@@ -339,7 +339,7 @@ function loadOneDaySystemDataCount() {
         const index = xTitleArr.findIndex(hour => hour == item.hour);
         jobUserArr[index] = item.jobUserCount;
         companyArr[index] = item.companyCount;
-        postArr[index] = item.postCount;
+        postRecruitArr[index] = item.postRecruitCount;
       }
     });
     // 初始化折线图数据
@@ -356,7 +356,7 @@ function loadOneDaySystemDataCount() {
       {
         name: '岗位个数',
         type: 'line',
-        data: postArr,
+        data: postRecruitArr,
         symbol: 'circle',
         itemStyle: {
           color: "#6cd300"