Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement

cement-business/src/main/java/cn/wise/sc/cement/business/controller/NormProductionController.java

@@ -12,12 +12,14 @@ import cn.wise.sc.cement.business.model.vo.ProductionVo;
 import cn.wise.sc.cement.business.model.vo.WorkloadStatisticsVo;
 import cn.wise.sc.cement.business.service.INonStandardValueService;
 import cn.wise.sc.cement.business.service.INormProductionService;
+import cn.wise.sc.cement.business.service.IPrecipriceService;
 import cn.wise.sc.cement.business.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -49,10 +51,14 @@ public class NormProductionController {
 
     final
     INormProductionService iNormProductionService;
-    @Autowired
+    final
+    IPrecipriceService iPrecipriceService;
+    final
     INonStandardValueService inonStandardValueService;
-    public NormProductionController(INormProductionService iNormProductionService) {
+    public NormProductionController(INormProductionService iNormProductionService, IPrecipriceService iPrecipriceService, INonStandardValueService inonStandardValueService) {
         this.iNormProductionService = iNormProductionService;
+        this.iPrecipriceService = iPrecipriceService;
+        this.inonStandardValueService = inonStandardValueService;
     }
 
     @PostMapping("/create")
@@ -98,6 +104,7 @@ public class NormProductionController {
         return iNormProductionService.activeOrForbidden(id);
     }
 
+
     @GetMapping("/statistics")
     @ApiOperation("标准产值统计")
     public BaseResponse<Page<NormProductionStatistics>> normProductionStatistics(String start, String end, String name, Integer groupId, PageQuery pageQuery) {
@@ -110,7 +117,7 @@ public class NormProductionController {
         }
 
         //将list拆分成分页
-        BaseResponse<List<NormProductionStatistics>> baseResponse = iNormProductionService
+        BaseResponse<List<NormProductionStatistics>> baseResponse = iPrecipriceService
                 .normProductionStatistics(startTime, endTime, name, groupId);
         if (baseResponse.getCode() == 200) {
             List<NormProductionStatistics> data = baseResponse.getData();
@@ -119,6 +126,7 @@ public class NormProductionController {
                 return BaseResponse.okData(rts);
             }
         }
+
         return BaseResponse.okData(null);
     }
 
@@ -126,14 +134,15 @@ public class NormProductionController {
     @ApiOperation("标准产值详情")
     public BaseResponse<Page<NormProduction.NormProductionDetail>> normProductionDetails(Integer userId, String start,
                                                                                          String end, PageQuery pageQuery) {
+
+        Assert.notNull(userId,"用户id是必填的!");
         Long startTime = null;
         Long endTime = null;
         if (StrUtil.isNotBlank(start) && StrUtil.isNotBlank(end)) {
             startTime = DateUtil.parseDate(start).getTime();
             endTime = DateUtil.parseDate(end).getTime();
         }
-        List<NormProduction.NormProductionDetail> data = iNormProductionService.normProductionDetails(userId, startTime, endTime);
-
+        List<NormProduction.NormProductionDetail> data = iPrecipriceService.normProductionDetails(userId, startTime, endTime);
         List<NormProduction.NormProductionDetail> collect = data
                 .stream()
                 .filter(arg -> arg.getUserId().intValue() == userId)
@@ -156,7 +165,7 @@ public class NormProductionController {
             endTime = DateUtil.parseDate(end).getTime();
         }
 
-        List<ProductionVo> rts = iNormProductionService.production(name, startTime, endTime, groupId);
+        List<ProductionVo> rts = iPrecipriceService.production(name, startTime, endTime, groupId);
         if (!CollectionUtil.isEmpty(rts)) {
             Set<Integer> ids = new HashSet<>();
             for (ProductionVo productionVo : rts) {
@@ -217,7 +226,7 @@ public class NormProductionController {
             startTime = DateUtil.parseDate(start).getTime();
             endTime = DateUtil.parseDate(end).getTime();
         }
-        iNormProductionService.exportNormProductionDetail(userId, startTime, endTime, response);
+        iPrecipriceService.exportNormProductionDetail(userId, startTime, endTime, response);
     }
 
     @PostMapping("/export/total/production")
@@ -245,7 +254,7 @@ public class NormProductionController {
             endTime = DateUtil.parseDate(end);
         }
 
-        return BaseResponse.okData(iNormProductionService.workloadStatistics(startTime, endTime, userId));
+        return BaseResponse.okData(iPrecipriceService.workloadStatistics(startTime, endTime, userId));
 
     }
 }

cement-business/src/main/java/cn/wise/sc/cement/business/controller/PrecipriceController.java

@@ -17,6 +17,7 @@ import cn.wise.sc.cement.business.service.IPrecipriceService;
 import cn.wise.sc.cement.business.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,12 +45,12 @@ import java.util.stream.Collectors;
  * @since 2020-11-02
  */
 @RestController
+@Api(hidden = true)
 @RequestMapping("/business/preciprice")
 public class PrecipriceController {
 
     @Autowired
     IPrecipriceService iNormProductionService;
-
     @Autowired
     INonStandardValueService inonStandardValueService;
 
@@ -83,6 +84,7 @@ public class PrecipriceController {
                 return BaseResponse.okData(rts);
             }
         }
+
         return BaseResponse.okData(null);
     }
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PrecipriceServiceImpl.java

@@ -20,8 +20,6 @@ import cn.wise.sc.cement.business.entity.SysUser;
 import cn.wise.sc.cement.business.entity.TeamGroup;
 import cn.wise.sc.cement.business.mapper.PrecipriceMapper;
 import cn.wise.sc.cement.business.model.BaseResponse;
-import cn.wise.sc.cement.business.model.PageQuery;
-import cn.wise.sc.cement.business.model.vo.NormProductionVo;
 import cn.wise.sc.cement.business.model.vo.ProductionVo;
 import cn.wise.sc.cement.business.model.vo.WorkloadStatisticsVo;
 import cn.wise.sc.cement.business.service.IEntrustService;
@@ -41,12 +39,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
-
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -64,7 +60,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 /**
  * <p>
  * 服务实现类
@@ -87,29 +82,41 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
     ISysUserService iSysUserService;
     final
     ISysGroupService iSysGroupService;
-    @Autowired
+    final
     ITeamGroupService iTeamGroupService;
-    @Autowired
+    final
     IHandleService iHandleService;
-    @Autowired
+    final
     ISysPostService iSysPostService;
-    @Autowired
+    final
     INonStandardValueService iNonStandardValueService;
-    @Autowired
+    final
     INonStandardApplyService iNonStandardApplyService;
-    @Autowired
+    final
     ISampleDistributionService iSampleDistributionService;
 
     public PrecipriceServiceImpl(IEntrustService iEntrustService,
                                  ISampleService iSampleService,
                                  INormProductionService iNormProductionService,
                                  ISysUserService iSysUserService,
-                                 ISysGroupService iSysGroupService) {
+                                 ISysGroupService iSysGroupService,
+                                 ITeamGroupService iTeamGroupService,
+                                 IHandleService iHandleService,
+                                 ISysPostService iSysPostService,
+                                 INonStandardValueService iNonStandardValueService,
+                                 INonStandardApplyService iNonStandardApplyService,
+                                 ISampleDistributionService iSampleDistributionService) {
         this.iEntrustService = iEntrustService;
         this.iSampleService = iSampleService;
         this.iNormProductionService = iNormProductionService;
         this.iSysUserService = iSysUserService;
         this.iSysGroupService = iSysGroupService;
+        this.iTeamGroupService = iTeamGroupService;
+        this.iHandleService = iHandleService;
+        this.iSysPostService = iSysPostService;
+        this.iNonStandardValueService = iNonStandardValueService;
+        this.iNonStandardApplyService = iNonStandardApplyService;
+        this.iSampleDistributionService = iSampleDistributionService;
     }
 
     @Override
@@ -209,6 +216,7 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
     @Override
     public BaseResponse<List<NormProductionStatistics>> normProductionStatistics(Long start, Long end, String name, Integer groupId) {
 
+        //曲解、心有灵犀、捧着、不争论、心态口才策略
         //统计分样处理的详情
         List<NormProduction.NormProductionDetail> normProductionDetails =
                 normProductionDetails(null, start, end);
@@ -218,7 +226,7 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
             rts.setData(new ArrayList<>());
             return rts;
         }
-
+        //
         Map<Integer, BigDecimal> coefficientMap = new HashMap<>(normProductionDetails.size());
         normProductionDetails
                 .forEach(arg -> {
@@ -334,7 +342,6 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
         List<NonStandardValue> nonStandardValues = iNonStandardValueService.nonValue(startDate, endDate, groupId).getData();
         //标准产值
         List<NormProductionStatistics> productionStatistics = this.normProductionStatistics(start, end, name, groupId).getData();
-
         //以userId找关系
         Set<String> userIds = new HashSet<>();
         nonStandardValues.forEach(arg -> userIds.add(arg.getUserId() + ""));
@@ -406,7 +413,6 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
             return rts.stream().filter(arg -> arg.getGroupId().equals(groupId))
                     .collect(Collectors.toList());
         }
-
         return rts;
     }
 
@@ -558,7 +564,6 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
         for (NonStandardApply nonStandardApply : nonStandardApplies) {
             addCount(nonStandardApply.getStartTime(), map2);
         }
-
         WorkloadStatisticsVo workloadStatisticsVo = new WorkloadStatisticsVo();
         workloadStatisticsVo.setType(0);
         workloadStatisticsVo.setMap(map1);
@@ -568,7 +573,6 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
         List<WorkloadStatisticsVo> rts = new ArrayList<>(2);
         rts.add(workloadStatisticsVo);
         rts.add(workloadStatisticsVo2);
-
         return rts;
     }
 
@@ -637,7 +641,6 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
         for (long i = start; i <= end; i = DateUtil.offsetMonth(DateUtil.date(i), 1).getTime()) {
             map.put(DateUtil.endOfMonth(DateUtil.date(i)).getMonth() + 1 + "", 0);
         }
-
         return map;
     }
 
@@ -647,7 +650,6 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
             start = System.currentTimeMillis();
             start = DateUtil.beginOfYear(DateUtil.date(start)).getTime();
         }
-
         return start;
     }