非标产值

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

@@ -2,10 +2,12 @@ package cn.wise.sc.cement.business.controller;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.wise.sc.cement.business.entity.NonStandardValue;
 import cn.wise.sc.cement.business.entity.NormProduction;
 import cn.wise.sc.cement.business.entity.NormProductionStatistics;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.vo.NonStandardValueVo;
 import cn.wise.sc.cement.business.model.vo.NormProductionVo;
 import cn.wise.sc.cement.business.model.vo.ProductionVo;
 import cn.wise.sc.cement.business.service.INormProductionService;
@@ -22,7 +24,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -131,7 +136,7 @@ public class NormProductionController {
 
     @GetMapping("/total/production")
     @ApiOperation("总产值统计")
-    public BaseResponse<Page<ProductionVo>> production(PageQuery pageQuery, String name, String start, String end) {
+    public BaseResponse<Page<ProductionVo>> production(PageQuery pageQuery, String name, String start, String end,Integer groupId) {
 
         Long startTime = null;
         Long endTime = null;
@@ -140,7 +145,40 @@ public class NormProductionController {
             endTime = DateUtil.parseDate(end).getTime();
         }
 
-        List<ProductionVo> rts = iNormProductionService.production(name, startTime, endTime);
+        List<ProductionVo> rts = iNormProductionService.production(name, startTime, endTime,groupId);
+        if (!rts.isEmpty()){
+            Set<Integer> ids = new HashSet<>();
+            for (ProductionVo productionVo:rts) {
+                Integer groupId1 = productionVo.getGroupId();
+                ids.add(groupId1);
+            }
+            List<ProductionVo> newRts = new ArrayList<>();
+            for (Integer groupId1:ids){
+                ProductionVo finalNormProduction=new ProductionVo();
+                for (ProductionVo productionVo:rts){
+                    if (productionVo.getGroupId().intValue()==groupId1){
+                        finalNormProduction.setUserId(productionVo.getUserId());
+                        finalNormProduction.setUserName(productionVo.getUserName());
+                        finalNormProduction.setAccount(productionVo.getAccount());
+                        finalNormProduction.setPositionId(productionVo.getPositionId());
+                        finalNormProduction.setPosition(productionVo.getPosition());
+                        finalNormProduction.setTime(productionVo.getTime());
+                        finalNormProduction.setGroupId(productionVo.getGroupId());
+
+                        Double newFinalValue=productionVo.getProductionTotalValue()+finalNormProduction.getProductionTotalValue();
+                        finalNormProduction.setProductionTotalValue(newFinalValue);
+
+                        Double newNonProductionValue=productionVo.getNonProductionValue()+finalNormProduction.getNonProductionValue();
+                        finalNormProduction.setNonProductionValue(newNonProductionValue);
+
+                        Double newProductionValue=productionVo.getProductionValue()+finalNormProduction.getProductionValue();
+                        finalNormProduction.setProductionValue(newProductionValue);
+                    }
+                }
+                newRts.add(finalNormProduction);
+            }
+            rts=newRts;
+        }
 
         return BaseResponse.okData(PageUtil.listConvertToPage(rts, pageQuery));
     }
@@ -173,7 +211,7 @@ public class NormProductionController {
 
     @PostMapping("/export/total/production")
     @ApiOperation("导出总产值")
-    public void exportProduction(String name, String start, String end, HttpServletResponse response) {
+    public void exportProduction(String name, String start, String end,Integer groupId, HttpServletResponse response) {
         Long startTime = null;
         Long endTime = null;
         if (StrUtil.isNotBlank(start) && StrUtil.isNotBlank(end)) {
@@ -181,7 +219,7 @@ public class NormProductionController {
             endTime = DateUtil.parseDate(end).getTime();
         }
 
-        iNormProductionService.exportProduction(name, startTime, endTime, response);
+        iNormProductionService.exportProduction(name, startTime, endTime,groupId, response);
     }
 
 }

cement-business/src/main/java/cn/wise/sc/cement/business/entity/NonStandardValue.java

@@ -69,4 +69,7 @@ public class NonStandardValue implements Serializable {
 	@ApiModelProperty("部门id")
 	private Integer groups;
 
+	@ApiModelProperty("部门名")
+	private String groupName;
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/entity/NormProductionStatistics.java

@@ -28,8 +28,10 @@ public class NormProductionStatistics implements Serializable {
 
     private Long count;
 
-    private Integer coefficient;
+    private Double coefficient;
 
     private Integer groupId;
 
+    private String groupName;
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardValueMapper.xml

@@ -23,17 +23,19 @@
     </sql>
 
     <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.NonStandardValueVo">
-        select na.*,su.name as name,su.username as account,su.group_id as groups
+        select na.*,su.name as name,su.username as account,su.group_id as groups,sg.name as groupname
         from nonstandard_apply na
         LEFT JOIN sys_user su ON su.id = na.user_id
+        LEFT JOIN sys_group sg ON sg.id = su.group_id
         <include refid="where"/>
         order by na.id asc
     </select>
 
     <select id="getList" resultType="cn.wise.sc.cement.business.model.vo.NonStandardValueVo">
-        select na.*,su.name as name,su.username as account,na.start_time as startTime,su.group_id as groups
+        select na.*,su.name as name,su.username as account,na.start_time as startTime,su.group_id as groups,sg.name as groupname
         from nonstandard_apply na
         LEFT JOIN sys_user su ON su.id = na.user_id
+        LEFT JOIN sys_group sg ON sg.id = su.group_id
         <include refid="where"/>
         order by na.id asc
     </select>
@@ -50,9 +52,11 @@
         na.work_type as 工作类别,
         na.work_description as 工作描述,
         na.start_time as 开始时间,
-        su.group_id as 部门id
+        su.group_id as 部门id,
+        sg.name as groupname
         FROM nonstandard_apply na
         left join sys_user su on na.user_id = su.id
+        LEFT JOIN sys_group sg ON sg.id = su.group_id
         <include refid="where" />
         ORDER BY na.id ASC
     </select>

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/NonStandardValueVo.java

@@ -49,6 +49,9 @@ public class NonStandardValueVo {
 	@ApiModelProperty("用户id")
 	private Integer userId;
 
-	@ApiModelProperty("部门")
+	@ApiModelProperty("部门id")
 	private Integer groups;
+
+	@ApiModelProperty("部门名")
+	private String groupName;
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/ProductionVo.java

@@ -31,7 +31,7 @@ public class ProductionVo implements Serializable {
     @ApiModelProperty("统计时间")
     private String time;
     @ApiModelProperty("标准产值")
-    private Integer productionValue = 0;
+    private Double productionValue = 0D;
     @ApiModelProperty("非标准产值")
     private Double nonProductionValue = 0D;
     @ApiModelProperty("总产值")

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

@@ -83,7 +83,7 @@ public interface INormProductionService extends IService<NormProduction> {
      * @param end    结束时间
      * @return 详细信息
      */
-    List<ProductionVo> production(String name,Long start,Long end);
+    List<ProductionVo> production(String name,Long start,Long end,Integer groupId);
 
     /**
      * 导出标准统计
@@ -96,7 +96,7 @@ public interface INormProductionService extends IService<NormProduction> {
     void exportNormProductionStatistics(Long start, Long end,String name,Integer groupId,  HttpServletResponse response);
 
     /**
-     * 导出标准统计详情
+     * 导出个人标准产值详情列表
      * @param userId 用户id
      * @param startTime 开始时间
      * @param endTime 结束时间
@@ -111,5 +111,5 @@ public interface INormProductionService extends IService<NormProduction> {
      * @param endTime 结束时间
      * @param response  响应体
      */
-    void exportProduction(String name, Long startTime, Long endTime,HttpServletResponse response);
+    void exportProduction(String name, Long startTime, Long endTime,Integer groupId,HttpServletResponse response);
 }

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

@@ -84,6 +84,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 					finalNonStandardValue.setName(nonStandardValue.getName());
 					finalNonStandardValue.setAccount(nonStandardValue.getAccount());
 					finalNonStandardValue.setGroups(nonStandardValue.getGroups());
+					finalNonStandardValue.setGroupName(nonStandardValue.getGroupName());
 
 					Integer newId=finalNonStandardValue.getId()+1;
 					finalNonStandardValue.setId(newId);
@@ -126,7 +127,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 
 		if (!CollectionUtils.isEmpty(list)) {
 			Map<String, Object> map = list.get(0);
-			String[] headers = new String[11];
+			String[] headers = new String[12];
 			headers[0] = "序号";
 			headers[1] = "姓名";
 			headers[2] = "账户";
@@ -138,6 +139,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 			headers[8] = "工作描述";
 			headers[9] = "开始时间";
 			headers[10] = "部门id";
+			headers[11] = "部门名";
 
 
 			List<Object[]> datas = new ArrayList<>(list.size());

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

@@ -21,15 +21,7 @@ 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.service.IHandleService;
-import cn.wise.sc.cement.business.service.INonStandardValueService;
-import cn.wise.sc.cement.business.service.INormProductionService;
-import cn.wise.sc.cement.business.service.ISampleCheckTeamService;
-import cn.wise.sc.cement.business.service.ISampleDistributionService;
-import cn.wise.sc.cement.business.service.ISampleHandleService;
-import cn.wise.sc.cement.business.service.ISysPostService;
-import cn.wise.sc.cement.business.service.ISysUserService;
-import cn.wise.sc.cement.business.service.ITeamGroupService;
+import cn.wise.sc.cement.business.service.*;
 import cn.wise.sc.cement.business.util.ExcelUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -70,6 +62,8 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
     final
     ISysUserService iSysUserService;
     final
+    ISysGroupService iSysGroupService;
+    final
     ISampleCheckTeamService iSampleCheckTeamService;
     final
     ITeamGroupService iTeamGroupService;
@@ -83,12 +77,14 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
     public NormProductionServiceImpl(ISampleDistributionService iSampleDistributionService,
                                      ISampleHandleService iSampleHandleService,
                                      ISysUserService iSysUserService,
+                                     ISysGroupService iSysGroupService,
                                      ISampleCheckTeamService iSampleCheckTeamService,
                                      ITeamGroupService iTeamGroupService, IHandleService iHandleService,
                                      ISysPostService iSysPostService, INonStandardValueService iNonStandardValueService) {
         this.iSampleDistributionService = iSampleDistributionService;
         this.iSampleHandleService = iSampleHandleService;
         this.iSysUserService = iSysUserService;
+        this.iSysGroupService = iSysGroupService;
         this.iSampleCheckTeamService = iSampleCheckTeamService;
         this.iTeamGroupService = iTeamGroupService;
         this.iHandleService = iHandleService;
@@ -274,7 +270,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
             }
             NormProductionStatistics productionStatistics = new NormProductionStatistics();
             productionStatistics.setAccount(sysUser.getUsername());
-            productionStatistics.setCoefficient(coefficientMap.get(userId).intValue());
+            productionStatistics.setCoefficient(coefficientMap.get(userId).doubleValue());
             productionStatistics.setTime("/");
             productionStatistics.setCount(normProductionDetails.stream()
                     .filter(arg -> arg.getUserId().intValue() == sysUser.getId())
@@ -378,12 +374,11 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
     }
 
     @Override
-    public List<ProductionVo> production(String name, Long start, Long end) {
+    public List<ProductionVo> production(String name, Long start, Long end,Integer groupId) {
 
 
         Date startDate = null;
         Date endDate = new Date();
-        Integer group=null;
         if (start != null && start != 0) {
             startDate = DateUtil.date(start);
         }
@@ -392,9 +387,9 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
         }
 
         //非标准产值
-        List<NonStandardValue> nonStandardValues = iNonStandardValueService.nonValue(startDate, endDate ,group).getData();
+        List<NonStandardValue> nonStandardValues = iNonStandardValueService.nonValue(startDate, endDate ,groupId).getData();
         //标准产值
-        List<NormProductionStatistics> productionStatistics = this.normProductionStatistics(start, end, name, group).getData();
+        List<NormProductionStatistics> productionStatistics = this.normProductionStatistics(start, end, name, groupId).getData();
         //以userId找关系
         Set<String> userIds = new HashSet<>();
         nonStandardValues.forEach(arg -> userIds.add(arg.getUserId() + ""));
@@ -410,6 +405,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
                     productionVo.setUserName(opt.getUserName());
                     productionVo.setPosition(opt.getPosition());
                     productionVo.setAccount(opt.getAccount());
+                    productionVo.setGroupId(opt.getGroupId());
                 }
             });
             //找到标准产值里面的数据
@@ -451,6 +447,12 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
                     .collect(Collectors.toList());
         }
 
+        //过滤部门id
+        if (groupId != null) {
+            return rts.stream().filter(arg -> arg.getGroupId().equals(groupId))
+                    .collect(Collectors.toList());
+        }
+
         return rts;
     }
 
@@ -497,7 +499,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
     public void exportNormProductionDetail(Integer userId, Long startTime, Long endTime, HttpServletResponse response) {
         List<NormProduction.NormProductionDetail> normProductionDetails = normProductionDetails(userId, startTime, endTime);
         if (CollectionUtil.isNotEmpty(normProductionDetails)) {
-            String[] headers = new String[11];
+            String[] headers = new String[12];
             headers[0] = "序号";
             headers[1] = "名字";
             headers[2] = "检测项目";
@@ -508,12 +510,13 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
             headers[7] = "分样占比";
             headers[8] = "校核占比";
             headers[9] = "报结果占比";
-            headers[10] = "合计";
+            headers[10] = "部门id";
+            headers[11] = "合计";
             List<Object[]> exportData = new ArrayList<>(normProductionDetails.size());
             int count = 0;
             DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 hh:mm:ss");
             for (NormProduction.NormProductionDetail target : normProductionDetails) {
-                Object[] objs = new Object[11];
+                Object[] objs = new Object[12];
                 objs[0] = count++;
                 objs[1] = target.getUserName();
                 objs[2] = target.getGroupTeamName();
@@ -524,7 +527,8 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
                 objs[7] = target.getSeparateRate();
                 objs[8] = target.getAssessRate();
                 objs[9] = target.getReportedResultRate();
-                objs[10] = target.getWorkTimeCoefficient();
+                objs[10] = target.getGroupId();
+                objs[11] = target.getWorkTimeCoefficient();
                 exportData.add(objs);
             }
             ExcelUtil.excelExport("标准产值详情—" + normProductionDetails.get(0).getUserName(), headers, exportData, response);
@@ -532,10 +536,10 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
     }
 
     @Override
-    public void exportProduction(String name, Long startTime, Long endTime, HttpServletResponse response) {
-        List<ProductionVo> data = production(name, startTime, endTime);
+    public void exportProduction(String name, Long startTime, Long endTime,Integer groupId, HttpServletResponse response) {
+        List<ProductionVo> data = production(name, startTime, endTime,groupId);
         if (CollectionUtil.isNotEmpty(data)) {
-            String[] headers = new String[8];
+            String[] headers = new String[9];
             headers[0] = "序号";
             headers[1] = "姓名";
             headers[2] = "账户";
@@ -544,10 +548,11 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
             headers[5] = "标准产值";
             headers[6] = "非标准产值";
             headers[7] = "产值统计";
+            headers[8] = "部门id";
             List<Object[]> exportData = new ArrayList<>(data.size());
             int count = 0;
             for (ProductionVo target : data) {
-                Object[] objs = new Object[8];
+                Object[] objs = new Object[9];
                 objs[0] = count++;
                 objs[1] = target.getUserName();
                 objs[2] = target.getAccount();
@@ -556,6 +561,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
                 objs[5] = target.getProductionValue();
                 objs[6] = target.getNonProductionValue();
                 objs[7] = target.getProductionTotalValue();
+                objs[8] = target.getGroupId();
                 exportData.add(objs);
             }
             ExcelUtil.excelExport("产值统计", headers, exportData, response);