Browse Source

客户档案汇总新增计算人次,公出次数与工时

anderx 1 year ago
parent
commit
2b3b36553c

+ 9 - 34
src/main/java/com/goafanti/admin/controller/AdminPreviewApiController.java

@@ -1,48 +1,24 @@
 package com.goafanti.admin.controller;
 
-import java.util.Calendar;
-
-import javax.annotation.Resource;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.goafanti.cognizance.service.OrgActivityCostService;
-import com.goafanti.cognizance.service.OrgActivityService;
-import com.goafanti.cognizance.service.OrgFinanceService;
-import com.goafanti.cognizance.service.OrgHonorDatumService;
-import com.goafanti.cognizance.service.OrgIntellectualPropertyService;
-import com.goafanti.cognizance.service.OrgRatepayService;
-import com.goafanti.cognizance.service.OrgStandardService;
-import com.goafanti.cognizance.service.OrgTechAchievementService;
-import com.goafanti.cognizance.service.OrgTechCenterDetailService;
-import com.goafanti.cognizance.service.OrgTechProductService;
+import com.goafanti.cognizance.service.*;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AttachmentType;
-import com.goafanti.common.model.CopyrightInfo;
-import com.goafanti.common.model.OrgActivity;
-import com.goafanti.common.model.OrgActivityCost;
-import com.goafanti.common.model.OrgFinance;
-import com.goafanti.common.model.OrgHonorDatum;
-import com.goafanti.common.model.OrgHumanResource;
-import com.goafanti.common.model.OrgIntellectualProperty;
-import com.goafanti.common.model.OrgRatepay;
-import com.goafanti.common.model.OrgStandard;
-import com.goafanti.common.model.OrgTechAchievement;
-import com.goafanti.common.model.OrgTechCenterDetail;
-import com.goafanti.common.model.OrgTechProduct;
-import com.goafanti.common.model.PatentInfo;
-import com.goafanti.common.model.TechProject;
+import com.goafanti.common.model.*;
 import com.goafanti.common.utils.SHA256Util;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.copyright.service.CopyrightInfoService;
 import com.goafanti.patent.service.PatentInfoService;
 import com.goafanti.techproject.service.TechProjectService;
 import com.goafanti.user.service.OrgHumanResourceService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Calendar;
 
 @RestController
 @RequestMapping(value = "/api/admin/preview")
@@ -84,7 +60,6 @@ public class AdminPreviewApiController extends CertifyApiController {
 	 * 
 	 * @param id
 	 * @param sign
-	 * @param response
 	 * @return
 	 */
 	@RequestMapping(value = "/patent", method = RequestMethod.GET)

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -1193,7 +1193,7 @@
     <select id="selectCountByUid" resultType="com.goafanti.customer.bo.MyUserDetailsBo">
         select  a.id ,a.aid,c.name  aname,a.release_start as releaseStart,a.duration
         from public_release a  left join admin c on a.aid =c.id
-        where  a.status in  (2) and
+        where  a.status in  (2)
           and a.id in (select DISTINCT prid from public_release_details where uid = #{id})
     </select>
     <select id="selectByMainIdAndReviewer" resultMap="PublicReleaseMap">

+ 9 - 0
src/main/java/com/goafanti/customer/bo/OutSelectUserArchives.java

@@ -33,6 +33,15 @@ public class OutSelectUserArchives {
     private Integer otherCount;
     private Date createTime;
     private Date updateTime;
+    private String publicContent;
+
+    public String getPublicContent() {
+        return publicContent;
+    }
+
+    public void setPublicContent(String publicContent) {
+        this.publicContent = publicContent;
+    }
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     public Date getCreateTime() {

+ 7 - 2
src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -266,8 +267,12 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
         List<OutSelectUserArchives> list = (List<OutSelectUserArchives>) page.getList();
         list.forEach(e ->{
             List<MyUserDetailsBo> myUserDetailsBos = publicReleaseMapper.selectCountByUid(e.getId());
-            myUserDetailsBos.stream().collect(Collectors.toMap(MyUserDetailsBo::getAid, Function.identity(),(e1,e2)->e1))
-                    .values().stream().collect(Collectors.toList());
+            List<MyUserDetailsBo> collect = new ArrayList<>(myUserDetailsBos.stream()
+                    .collect(Collectors.toMap(MyUserDetailsBo::getAid, Function.identity(), (e1, e2) -> e1))
+                    .values());
+            List<BigDecimal> collect1 = myUserDetailsBos.stream().map(item -> BigDecimal.valueOf(item.getDuration())).collect(Collectors.toList());
+            BigDecimal reduce = collect1.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+            e.setPublicContent("人次"+collect.size()+",公出次数"+myUserDetailsBos.size()+",工时"+reduce+"小时");
         });
         return page;
     }