Bladeren bron

设计师接口提交

hcst_sunzhen 5 jaren geleden
bovenliggende
commit
b8e24302fe
15 gewijzigde bestanden met toevoegingen van 1200 en 445 verwijderingen
  1. 208 1
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java
  2. 8 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/EffiVideoJob.java
  3. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml
  4. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IPerformanceService2.java
  5. 482 434
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/PerformanceServiceImpl2.java
  6. 243 0
      performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/controller/PlaneProjectCostController.java
  7. 69 0
      performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/entity/PlaneProjectCost.java
  8. 17 0
      performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/mapper/PlaneProjectCostMapper.java
  9. 5 0
      performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/mapper/xml/PlaneProjectCostMapper.xml
  10. 14 0
      performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/service/IPlaneProjectCostService.java
  11. 19 0
      performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/service/impl/PlaneProjectCostServiceImpl.java
  12. 25 0
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/UserDto2.java
  13. 8 0
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/UserEfficientVideoMap.java
  14. 14 6
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/UserEfficientVideoMapMapper.java
  15. 86 0
      performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/xml/UserEfficientVideoMapMapper.xml

+ 208 - 1
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -911,7 +911,7 @@ public class DateUtils extends PropertyEditorSupport {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
         //获取当前月份
-        int month = cal.get(Calendar.MONDAY) + 1;
+        int month = cal.get(Calendar.MONTH) + 1;
         if(month<=3){
             return 1;
         }else if(month <=6){
@@ -925,5 +925,212 @@ public class DateUtils extends PropertyEditorSupport {
         return 0;
     }
 
+    /**
+     * 获取【所在周】周五的时间(周五为一周第一天,周四为一周最后一天)
+     * @param date
+     */
+    public static Date getFriday(Date date){
+        Calendar calendar = new GregorianCalendar();
+        calendar.setTime(date);
+        calendar.setFirstDayOfWeek(Calendar.FRIDAY);
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.FRIDAY);
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        System.out.println(df.format(calendar.getTime()));
+        return calendar.getTime();
+    }
+
+    /**
+     * 获取传入时间的年、月份和季度(周五为每周第一天,周四为每周最后一天)
+     * 获取的是所属年、月、季度,因为很多月份的第一周或最后 一周会包括上一个月或者下一个月的部分日期
+     */
+    public static Map<String,Integer> getYearQuarter(Date date){
+        Map<String,Integer> dateMap = new HashMap<>();
+
+        Calendar calendar = new GregorianCalendar();
+        calendar.setTime(date);
+        int originYear = calendar.get(Calendar.YEAR);
+        int originMonth = calendar.get(Calendar.MONTH);
+        int originQuarter = DateUtils.getQuarter(date); //本月所在季度(按照日期来的)
+
+        Calendar calendar1 = new GregorianCalendar();
+        calendar1.setTime(date);
+        calendar1.setFirstDayOfWeek(Calendar.FRIDAY);
+        //1.判断当天所在周第一天是否跨月
+        calendar1.set(Calendar.DAY_OF_WEEK, Calendar.FRIDAY);
+        int fridayYear = calendar1.get(Calendar.YEAR);
+        int fridayMonth = calendar1.get(Calendar.MONTH);
+        int fridayQuarter = DateUtils.getQuarter(calendar1.getTime());
+
+        //2.判断当天所在周的最后一天是否跨月
+        Calendar calendar2 = new GregorianCalendar();
+        calendar2.setTime(date);
+        calendar2.setFirstDayOfWeek(Calendar.FRIDAY);
+        calendar2.set(Calendar.DAY_OF_WEEK, Calendar.THURSDAY);
+        int thursdayYear = calendar2.get(Calendar.YEAR);
+        int thursdayMonth = calendar2.get(Calendar.MONTH);
+        int thursdayQuarter = DateUtils.getQuarter(calendar2.getTime());
+
+        //如果本周第一天(周五)和当前天不在一个月内,说明周跨月了
+        if(fridayMonth == originMonth && thursdayMonth == originMonth){
+            dateMap.put("year", originYear);
+            dateMap.put("month", originMonth + 1);  //最后一个月是11,应该+1
+            dateMap.put("quarter", originQuarter);
+            return dateMap;
+        }else if(fridayYear < originYear || (fridayYear ==originYear && fridayMonth < originMonth) ){
+            //判断本周有几天在本月,如果是(5,6,7)则就是本月本季度
+            //int lastDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+            calendar1.set(Calendar.DATE, calendar1.getActualMaximum(Calendar.DATE));
+            int lastDateWeek = calendar1.get(Calendar.DAY_OF_WEEK);
+            //判断如果本周所在上个月的最后一天是周五、周六、周日的话,说明本周归属于本月(周五是第一天);否则本周归属于上个季度
+            if(lastDateWeek ==6 || lastDateWeek ==7 || lastDateWeek ==1 ){
+                dateMap.put("year", originYear);
+                dateMap.put("month", originMonth + 1);
+                dateMap.put("quarter",originQuarter);
+            }else{
+                //判断如果本周属于上个月,判断是否跨年
+                if(originYear == fridayYear){
+                    dateMap.put("year", originYear);
+                    dateMap.put("month", originMonth);
+                    //判断是否跨季
+                    if(originQuarter == fridayQuarter){
+                        dateMap.put("quarter",originQuarter);
+                    }else{
+                        dateMap.put("quarter",fridayQuarter);
+                    }
+                }else{
+                    //跨年的话说明这周上年的12月(第四季度)
+                    dateMap.put("year", originYear-1);
+                    dateMap.put("month", 12); //??查看是11,还是12
+                    dateMap.put("quarter",4);
+                }
+            }
+            return dateMap;
+        }else if(originYear < thursdayYear || (originYear == thursdayYear && originMonth < thursdayMonth) ){
+            calendar2.set(Calendar.DATE, 1);
+            int firstDateWeek = calendar2.get(Calendar.DAY_OF_WEEK);
+            //如果跨月的第一天是周二周三周四的话说明这周不跨月,否在进入下个月(季度、年需要再判断)
+            if( firstDateWeek==3 || firstDateWeek==4 || firstDateWeek==5){
+                dateMap.put("year", originYear);
+                dateMap.put("month", originMonth+1);
+                dateMap.put("quarter",originQuarter);
+            }else{
+                if( originYear == thursdayYear ){
+                    dateMap.put("year", originYear);
+                    dateMap.put("month", originMonth + 1 + 1);
+                    //判断是否跨季
+                    if(originQuarter == thursdayQuarter){
+                        dateMap.put("quarter",originQuarter);
+                    }else{
+                        dateMap.put("quarter",thursdayQuarter);
+                    }
+                }else{
+                    //跨年的话说明这周属于明年的1月(第一季度)
+                    dateMap.put("year", originYear+1);
+                    dateMap.put("month", 1);
+                    dateMap.put("quarter",1);
+                }
+            }
+            return dateMap;
+        }
+        return dateMap;
+    }
+
+    /**
+     * 计算季度开始、结束时间
+     * 原则:周五为本周的第一天,下一周的周四为本周的最后一天
+     * @param year
+     * @param quarter
+     */
+    public static Map<String,String> quarterStartEndDate(int year, int quarter){
+        Map<String,String> quarterStartEndDateMap = new HashMap<>();
+
+        Date startDate = null;
+        Date endDate = null;
+
+        int startMonth = 0;
+        int endMonth = 0;
+
+        if(quarter == 1){
+            startMonth = 1;
+            endMonth = 3;
+        }else if(quarter == 2){
+            startMonth = 4;
+            endMonth = 6;
+        }else if(quarter == 3){
+            startMonth = 7;
+            endMonth = 9;
+        }else{
+            startMonth = 10;
+            endMonth = 12;
+        }
+
+        //判断季度第一天的时间(以周为单位,有可能是上个月,也有可能是本月的非1号)
+        Calendar calendar1 = new GregorianCalendar();
+        calendar1.set(Calendar.YEAR,year);
+        calendar1.set(Calendar.MONTH,startMonth-1);
+        calendar1.set(Calendar.DATE,1);
+        calendar1.setFirstDayOfWeek(Calendar.FRIDAY);
+
+        //如果季度第一个月的第一天是周二周三周四,那么这周应该归属于上个季度,否则这周(包括上个月的时间)归属于这个季度
+        int firstDateWeek = calendar1.get(Calendar.DAY_OF_WEEK);
+        if(firstDateWeek ==5 || firstDateWeek ==3 || firstDateWeek ==4 ){
+            calendar1.set(Calendar.DAY_OF_WEEK, Calendar.THURSDAY);
+            startDate = DateUtils.addDay(calendar1.getTime(),1);
+        }else{
+            calendar1.set(Calendar.DAY_OF_WEEK, Calendar.FRIDAY);
+            startDate = calendar1.getTime();
+        }
+
+        //判断季度最后一天的时间(以周为单位,有可能是下个月,也有可能是本月的非最后一天)
+        Calendar calendar2 = new GregorianCalendar();
+        calendar2.set(Calendar.YEAR,year);
+        calendar2.set(Calendar.MONTH,endMonth-1);
+        calendar2.set(Calendar.DATE,1);
+        calendar2.setFirstDayOfWeek(Calendar.FRIDAY);
+
+        //如果一个季度最后一个月最后一天是周五、周六、周日,则这个月最后一周属于下个季度
+        calendar2.set(Calendar.DATE, calendar2.getActualMaximum(Calendar.DATE));
+        int lastDateWeek = calendar2.get(Calendar.DAY_OF_WEEK);
+        if(lastDateWeek ==1 || lastDateWeek ==7 || lastDateWeek ==6){
+            calendar2.set(Calendar.DAY_OF_WEEK, Calendar.FRIDAY);
+            endDate = DateUtils.addDay(calendar2.getTime(),-1);
+        }else{
+            calendar2.set(Calendar.DAY_OF_WEEK, Calendar.THURSDAY);
+            endDate = calendar2.getTime();
+        }
+
+        DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        quarterStartEndDateMap.put("startDate", sdf.format(startDate));
+        quarterStartEndDateMap.put("endDate", sdf.format(endDate));
+        return quarterStartEndDateMap;
+    }
+
+    public static void main(String[] args) throws ParseException {
+        //SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        //Date friDay = DateUtils.getFriday(new Date());
+        //Date effiCalcStart = DateUtils.addDay(friDay,  -14);
+        //System.out.println(sdf.format(effiCalcStart));
+        //Date effiCalcEnd = DateUtils.addDay(friDay,  -1);
+        //System.out.println(sdf.format(effiCalcEnd));
+        //
+        //Date effiEnd = DateUtils.addDay(friDay,  -21);
+        //System.out.println(sdf.format(effiEnd));
+        //Date effiStart = DateUtils.addDay(friDay,  -15);
+        //System.out.println(sdf.format(effiStart));
+
+        Map<String,Integer> map1 = DateUtils.getYearQuarter(DateUtils.parseDate("2020-04-01","yyyy-MM-dd"));
+
+        Map<String,String> map2 = DateUtils.quarterStartEndDate(2019,1);
+
+        for(String key:map2.keySet()){
+            System.out.println(key + ":" + map2.get(key));
+        }
+
+
+
+    }
 
 }
+
+
+

+ 8 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/EffiVideoJob.java

@@ -1,12 +1,17 @@
 package org.jeecg.modules.ctop.job;
 
 
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.system.service.IPerformanceService2;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 public class EffiVideoJob implements Job {
     @Autowired
     private IPerformanceService2 performanceService;
@@ -19,7 +24,8 @@ public class EffiVideoJob implements Job {
      */
     @Override
     public void execute(JobExecutionContext jobExecutionContext) {
-        performanceService.efficientVideoTask(2);
-        performanceService.efficientVideoTask(1);
+        //有效视频定时任务,默认跑前一天的
+        DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        performanceService.efficientVideoTask(sdf.format(DateUtils.addDay(new Date(), -1)));
     }
 }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml

@@ -8,7 +8,7 @@
 			a.id as userId,
 			a.realname,
 			c.id as roleId,
-			c.role_name
+			c.role_name as roleName
 		from
 		sys_user a
 		left join sys_user_role b on a.id = b.user_id

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IPerformanceService2.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * @date 2019-12-10
  */
 public interface IPerformanceService2 extends IService<Performance> {
-    void efficientVideoTask(int days);
+    void efficientVideoTask(String calcDateStr);
 
     //平台的总有效数量、素材总数、素材有效率、总跑量、当前可获得绩效
     public Map<String,Object> getPerformanceInfo();

File diff suppressed because it is too large
+ 482 - 434
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/PerformanceServiceImpl2.java


+ 243 - 0
performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/controller/PlaneProjectCostController.java

@@ -0,0 +1,243 @@
+package cn.com.ctop.planeprojectcost.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import cn.com.ctop.planeprojectcost.entity.PlaneProjectCost;
+import cn.com.ctop.planeprojectcost.service.IPlaneProjectCostService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * 平面设计项目消耗表
+ * @author jeecg-boot
+ * @date   2019-12-28
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="平面设计项目消耗表")
+@RestController
+@RequestMapping("/planeprojectcost/planeProjectCost")
+public class PlaneProjectCostController {
+	@Autowired
+	private IPlaneProjectCostService planeProjectCostService;
+	
+	/**
+	  * 分页列表查询
+	 * @param planeProjectCost
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "平面设计项目消耗表-分页列表查询")
+	@ApiOperation(value="平面设计项目消耗表-分页列表查询", notes="平面设计项目消耗表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<PlaneProjectCost>> queryPageList(PlaneProjectCost planeProjectCost,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<PlaneProjectCost>> result = new Result<IPage<PlaneProjectCost>>();
+		QueryWrapper<PlaneProjectCost> queryWrapper = QueryGenerator.initQueryWrapper(planeProjectCost, req.getParameterMap());
+		Page<PlaneProjectCost> page = new Page<PlaneProjectCost>(pageNo, pageSize);
+		IPage<PlaneProjectCost> pageList = planeProjectCostService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param planeProjectCost
+	 * @return
+	 */
+	@AutoLog(value = "平面设计项目消耗表-添加")
+	@ApiOperation(value="平面设计项目消耗表-添加", notes="平面设计项目消耗表-添加")
+	@PostMapping(value = "/add")
+	public Result<PlaneProjectCost> add(@RequestBody PlaneProjectCost planeProjectCost) {
+		Result<PlaneProjectCost> result = new Result<PlaneProjectCost>();
+		try {
+			planeProjectCostService.save(planeProjectCost);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param planeProjectCost
+	 * @return
+	 */
+	@AutoLog(value = "平面设计项目消耗表-编辑")
+	@ApiOperation(value="平面设计项目消耗表-编辑", notes="平面设计项目消耗表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<PlaneProjectCost> edit(@RequestBody PlaneProjectCost planeProjectCost) {
+		Result<PlaneProjectCost> result = new Result<PlaneProjectCost>();
+		PlaneProjectCost planeProjectCostEntity = planeProjectCostService.getById(planeProjectCost.getId());
+		if(planeProjectCostEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = planeProjectCostService.updateById(planeProjectCost);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "平面设计项目消耗表-通过id删除")
+	@ApiOperation(value="平面设计项目消耗表-通过id删除", notes="平面设计项目消耗表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			planeProjectCostService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "平面设计项目消耗表-批量删除")
+	@ApiOperation(value="平面设计项目消耗表-批量删除", notes="平面设计项目消耗表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<PlaneProjectCost> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<PlaneProjectCost> result = new Result<PlaneProjectCost>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.planeProjectCostService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "平面设计项目消耗表-通过id查询")
+	@ApiOperation(value="平面设计项目消耗表-通过id查询", notes="平面设计项目消耗表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<PlaneProjectCost> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<PlaneProjectCost> result = new Result<PlaneProjectCost>();
+		PlaneProjectCost planeProjectCost = planeProjectCostService.getById(id);
+		if(planeProjectCost==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(planeProjectCost);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<PlaneProjectCost> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              PlaneProjectCost planeProjectCost = JSON.parseObject(deString, PlaneProjectCost.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(planeProjectCost, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<PlaneProjectCost> pageList = planeProjectCostService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "平面设计项目消耗表列表");
+      mv.addObject(NormalExcelConstants.CLASS, PlaneProjectCost.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("平面设计项目消耗表列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<PlaneProjectCost> listPlaneProjectCosts = ExcelImportUtil.importExcel(file.getInputStream(), PlaneProjectCost.class, params);
+              planeProjectCostService.saveBatch(listPlaneProjectCosts);
+              return Result.ok("文件导入成功!数据行数:" + listPlaneProjectCosts.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败!");
+  }
+
+}

+ 69 - 0
performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/entity/PlaneProjectCost.java

@@ -0,0 +1,69 @@
+package cn.com.ctop.planeprojectcost.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 平面设计项目消耗表
+ * @author jeecg-boot
+ * @date   2019-12-28
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_plane_project_cost")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_plane_project_cost对象", description="平面设计项目消耗表")
+public class PlaneProjectCost {
+
+	/**id*/
+	@TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+	private Integer id;
+	/**ctop_project的id*/
+	@Excel(name = "ctop_project的id", width = 15)
+    @ApiModelProperty(value = "ctop_project的id")
+	private Long projectId;
+	/**sys_user的id*/
+	@Excel(name = "sys_user的id", width = 15)
+    @ApiModelProperty(value = "sys_user的id")
+	private String userId;
+	/**项目消耗*/
+	@Excel(name = "项目消耗", width = 15)
+    @ApiModelProperty(value = "项目消耗")
+	private java.math.BigDecimal projectCost;
+	/**1_快手2_抖音*/
+	@Excel(name = "1_快手2_抖音", width = 15)
+    @ApiModelProperty(value = "1_快手2_抖音")
+	private Integer appType;
+	/**项目总消耗*/
+	@Excel(name = "项目总消耗", width = 15)
+    @ApiModelProperty(value = "项目总消耗")
+	private java.math.BigDecimal projectTotalCost;
+	/**所属年*/
+	@Excel(name = "所属年", width = 15)
+    @ApiModelProperty(value = "所属年")
+	private Integer year;
+	/**所属季度*/
+	@Excel(name = "所属季度", width = 15)
+    @ApiModelProperty(value = "所属季度")
+	private Integer quarter;
+	/**createTime*/
+    @ApiModelProperty(value = "createTime")
+	private Date createTime;
+	/**updateTime*/
+    @ApiModelProperty(value = "updateTime")
+	private Date updateTime;
+}

+ 17 - 0
performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/mapper/PlaneProjectCostMapper.java

@@ -0,0 +1,17 @@
+package cn.com.ctop.planeprojectcost.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import cn.com.ctop.planeprojectcost.entity.PlaneProjectCost;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 平面设计项目消耗表
+ * @author: jeecg-boot
+ * @date:   2019-12-28
+ * @cersion: V1.0
+ */
+public interface PlaneProjectCostMapper extends BaseMapper<PlaneProjectCost> {
+
+}

+ 5 - 0
performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/mapper/xml/PlaneProjectCostMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.planeprojectcost.mapper.PlaneProjectCostMapper">
+
+</mapper>

+ 14 - 0
performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/service/IPlaneProjectCostService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.planeprojectcost.service;
+
+import cn.com.ctop.planeprojectcost.entity.PlaneProjectCost;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 平面设计项目消耗表
+ * @author jeecg-boot
+ * @date   2019-12-28
+ * @version V1.0
+ */
+public interface IPlaneProjectCostService extends IService<PlaneProjectCost> {
+
+}

+ 19 - 0
performance-appraisal/src/main/java/cn/com/ctop/planeprojectcost/service/impl/PlaneProjectCostServiceImpl.java

@@ -0,0 +1,19 @@
+package cn.com.ctop.planeprojectcost.service.impl;
+
+import cn.com.ctop.planeprojectcost.entity.PlaneProjectCost;
+import cn.com.ctop.planeprojectcost.mapper.PlaneProjectCostMapper;
+import cn.com.ctop.planeprojectcost.service.IPlaneProjectCostService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 平面设计项目消耗表
+ * @author jeecg-boot
+ * @date   2019-12-28
+ * @version V1.0
+ */
+@Service
+public class PlaneProjectCostServiceImpl extends ServiceImpl<PlaneProjectCostMapper, PlaneProjectCost> implements IPlaneProjectCostService {
+
+}

+ 25 - 0
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/UserDto2.java

@@ -0,0 +1,25 @@
+package cn.com.ctop.userefficientvideomap.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class UserDto2 implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String userId;
+
+    private String realname;
+
+    private String roleId;
+
+    private String roleName;
+
+    private BigDecimal effiRate;
+
+    private String depId;
+
+}

+ 8 - 0
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/entity/UserEfficientVideoMap.java

@@ -52,6 +52,14 @@ public class UserEfficientVideoMap {
 	@Excel(name = "年", width = 15)
     @ApiModelProperty(value = "年")
 	private Integer year;
+	/**年*/
+	@Excel(name = "月", width = 15)
+	@ApiModelProperty(value = "月")
+	private Integer month;
+	/**计算日期_按照此日期进行所属年月季度的计算的*/
+	@Excel(name = "计算日期", width = 15)
+	@ApiModelProperty(value = "计算日期")
+	private Date calcDate;
 	/**媒体类型1_快手2_头条*/
 	@Excel(name = "媒体类型1_快手2_头条", width = 15)
     @ApiModelProperty(value = "媒体类型1_快手2_头条")

+ 14 - 6
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/UserEfficientVideoMapMapper.java

@@ -1,9 +1,6 @@
 package cn.com.ctop.userefficientvideomap.mapper;
 
-import cn.com.ctop.userefficientvideomap.entity.DesignMaterialInfo;
-import cn.com.ctop.userefficientvideomap.entity.EffiVideoDTO;
-import cn.com.ctop.userefficientvideomap.entity.ProjectDTO;
-import cn.com.ctop.userefficientvideomap.entity.UserEfficientVideoMap;
+import cn.com.ctop.userefficientvideomap.entity.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -20,9 +17,9 @@ import java.util.List;
 @Component
 public interface UserEfficientVideoMapMapper extends BaseMapper<UserEfficientVideoMap> {
 
-    List<EffiVideoDTO> getUserVideoMap(@Param("startDate")String startDate, @Param("endDate")String endDate);
+    List<EffiVideoDTO> getUserVideoMap(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("startCalcDate")String startCalcDate, @Param("endCalcDate")String endCalcDate);
 
-    int getEffiVideoCountBySignature(@Param("signature")String signature);
+    int getEffiVideoCountBySignature(@Param("signature")String signature, @Param("appType")Integer appType);
 
     int getEffiVideoCountByUserId(@Param("year")int year, @Param("quarter")int quarter, @Param("userId")String userId);
 
@@ -48,5 +45,16 @@ public interface UserEfficientVideoMapMapper extends BaseMapper<UserEfficientVid
 
     List<DesignMaterialInfo> getMaterialAccountInfoByMaterialId(@Param("materialId")String materialId, @Param("startDate")String startDate, @Param("endDate")String endDate);
 
+    List<ProjectDTO> getProjects(@Param("mediaId")String mediaId);
 
+    BigDecimal getProjectQuarterCostById(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("projectId")Long projectId);
+
+    List<UserDto2> getPlaneByProjectId(@Param("projectId")Long projectId);
+
+    List<UserDto2> getKuaishouDesignLeaderList();
+
+    List<String> getClip(@Param("depId")String depId);
+
+    BigDecimal getClipQuarterCost(@Param("appType")Integer appType, @Param("quarter")int quarter, @Param("year")int year, @Param("userId")String userId);
 }
+

+ 86 - 0
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/xml/UserEfficientVideoMapMapper.xml

@@ -25,6 +25,8 @@
         where a.signature is not null and b.id is not null
         and DATE_FORMAT(b.create_time,'%Y-%m-%d') &gt;= #{startDate}
         and DATE_FORMAT(b.create_time,'%Y-%m-%d') &lt;= #{endDate}
+        and DATE_FORMAT(a.stat_date,'%Y-%m-%d') &gt;= #{startCalcDate}
+        and DATE_FORMAT(a.stat_date,'%Y-%m-%d') &lt;= #{endCalcDate}
         group by a.signature
         having sum(a.charge) >= 5000
     </select>
@@ -35,6 +37,7 @@
             count(1)
         from ctop_user_efficient_video_map
         where efficient_video_signature = #{signature}
+        and app_type = #{appType}
     </select>
 
     <!-- 根据年、季度、userId获取有效视频数量 -->
@@ -235,5 +238,88 @@
          and DATE_FORMAT(b.create_time,'%Y-%m-%d') &lt;= #{endDate}
     </select>
 
+    <!-- 获取这个人所在的所有项目 -->
+    <select id="getProjects" resultType="cn.com.ctop.userefficientvideomap.entity.ProjectDTO">
+        select
+        project_id as projectId,
+        project_name as projectName
+        from
+        ctop_project
+        where
+        media_id = #{mediaId}
+    </select>
+
+    <!-- 根据projectId计算项目总消耗 -->
+    <select id="getProjectQuarterCostById" resultType="java.math.BigDecimal">
+            select
+            sum(dailiAccount.charge) as charge
+            from
+            ctop_kuaishou_report_daily_account dailiAccount
+            left join
+            ctop_user_allocation allocation on dailiAccount.account_id = allocation.account_id
+        where
+        dailiAccount.project_id = #{projectId}
+        AND
+        dailiAccount.stat_date &gt;= #{startDate}
+        AND
+        dailiAccount.stat_date &lt; #{endDate}
+    </select>
+
+    <select id="getPlaneByProjectId" resultType="cn.com.ctop.userefficientvideomap.entity.UserDto2">
+        select
+        a.user_id as userId,
+        a.user_name as userName,
+        b.id as roleId,
+        b.role_name as roleName
+        from
+        ctop_project_member a
+        left join sys_role b on a.role_code = b.role_code
+        where
+        a.project_id = #{projectId}
+        a.role_code in ('planeLeader','plane')
+    </select>
+
+    <!-- 获取快手设计师leader的信息 -->
+    <select id="getKuaishouDesignLeaderList" resultType="cn.com.ctop.userefficientvideomap.entity.UserDto2">
+            select
+            a.user_id as userId,
+            c.realname as userName,
+            '8d3e2ed58bdedf17716f698ea674da27' as roleId,
+            '设计组长' as roleName,
+            a.dep_id as depId
+        FROM sys_user_depart a
+        left join sys_user c on a.user_id = c.id
+        left join sys_depart b on a.dep_id = b.id
+                    WHERE a.user_id in(
+                        select
+                        user_id
+                        from sys_user_role
+                        WHERE role_id = '8d3e2ed58bdedf17716f698ea674da27'   <!-- 设计师 -->
+                        )
+        and b.parent_id = '4e939124a5f541c88838e49d2a3ea72b'  <!-- 快手设计部 -->
+    </select>
+
+    <!-- 根据部门id -->
+    <select id="getClip" resultType="string">
+        select
+        user_id
+        from
+        sys_user_depart a
+        left join sys_user_role b on a.user_id = b.user_id
+        where a.dep_id = #{depId}
+        and b.role_code = 'clip'
+    </select>
+
+    <select id="getClipQuarterCost" resultType="java.math.BigDecimal">
+            select
+            total_cost
+        from
+        ctop_performance
+        where
+        app_type = #{appType}
+        and quarter = #{quarter}
+        and year = #{year}
+        and user_id = #{userId}
+    </select>
 
 </mapper>