Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -62,7 +62,7 @@
         <result column="endDate" property="endDate" />
         <collection property="stageCostList"  javaType="java.util.ArrayList"
                     ofType="com.management.platform.entity.vo.StageCost"
-                    select="selectStageSum" column="projectId=id,startDate,endDate"></collection>
+                    select="selectStageSum" column="projectId=id,startDate=startDate,endDate=endDate"></collection>
     </resultMap>
     <resultMap id="CustomerResultMap" type="com.management.platform.entity.vo.CustomerProject" >
         <result column="customer_id" property="customerId" />

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -69,7 +69,7 @@
           </el-select>
         </template>
         <!-- 时间段筛选 -->
-          <template v-if="ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11 || ins == 12">
+          <template v-if="ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11 || ins == 12 || ins == 5">
             <span>
               <span class="demonstration" style="color:#999;padding:0 10px">
                 {{ ins == 15 ? $t('xiang-mu-chuang-jian-shi-jian-duan') : $t('message.period') }}
@@ -1466,6 +1466,8 @@ export default {
             }
             stagestr = stagestr.substring(0,stagestr.length - 1)
             sl.stageNames = stagestr
+            sl.startDate = this.rangeDatas[0]
+            sl.endDate = this.rangeDatas[1]
           }
         } else if (this.ins == 6) {
           fName = this.$t('statisticalreportofovertimework')  + '.xls';
@@ -1955,7 +1957,9 @@ export default {
       let parameter = {
         pageIndex: this.page,
         pageSize: this.size,
-        projectId: this.proJuctId
+        projectId: this.proJuctId,
+        startDate: this.rangeDatas[0],
+        endDate: this.rangeDatas[1],
       }
       if(!e){
         this.stageNames = []
@@ -2362,6 +2366,9 @@ export default {
       if(this.ins == 15) {
         this.getDepartmentsInvolved()
       }
+      if(this.ins == 5) {
+        this.getProjectStages()
+      }
     },
     // 日期
     getCurrentRangeTime() {