修改ugp问题

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/ProjectDto.java

@@ -112,4 +112,6 @@ public class ProjectDto  extends BaseDto {
     private String startDateString;
 
     private String companyType;
+
+    private String length;
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/QualityProblemDto.java

@@ -169,4 +169,8 @@ public class QualityProblemDto  extends BaseDto {
     private List handingOpinionList;
 
     private String reviewStatusString;
+
+    private String rectifyWithingName;
+
+    private String reviewStatusName;
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Project.java

@@ -148,4 +148,10 @@ public class Project extends BaseEntity {
      */
     @TableField("remark")
     private String remark;
+
+    /**
+     * 长度
+     */
+    @TableField("length")
+    private String length;
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/InstallationQualityMapper.xml

@@ -26,30 +26,21 @@
 
 
 <select id="findss"   resultMap="result">
-             select
-             pt.name ,
-             pt.address ,
-             pt.progress_status ,
-
-             qy.supervisory_unit_id ,
-             qy.project_id,
-             pt.construction_unit ,
-
-             pt.charge_person ,
-
-             pt.start_date ,
-             pt.submit_date,
-             qy.rec_date
-
-             from
-            tz_ugp_quality_info qy ,
-            tz_ugp_project pt
-            where
-            qy.project_id=pt.sequence_nbr
-            and
-            qy.is_delete =0
-            and
-            pt.is_delete=0
+    SELECT
+    pt.NAME,
+    pt.install_region AS address,
+    pt.progress_status,
+    qy.supervisory_unit_id,
+    pt.construction_unit,
+    pt.charge_person,
+    pt.start_date,
+    pt.submit_date,
+    qy.rec_date
+    FROM
+    tz_ugp_project pt
+    LEFT JOIN tz_ugp_quality_info qy ON qy.project_id = pt.sequence_nbr
+    WHERE
+    pt.`status` = "流程结束！"
     <if test="dto !=null">
         <if test="dto.name !='' and dto.name != null">
             and
@@ -58,7 +49,7 @@
     </if>
 
     <if test="projectId != null and projectId.size > 0">
-        and qy.project_id in
+        and pt.sequence_nbr in
         <foreach collection="projectId" item ="item" index="index" open="(" separator="," close=")">
                     #{item}
                 </foreach>

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/InstallationQualityImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
 import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
 import com.yeejoin.amos.boot.module.ugp.api.dto.PercentOfPassDto;
@@ -77,22 +78,15 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
         Set<String> projectIds = new HashSet<>();
         Long companySequenceNbr = orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr();
         OrgUsr orgUsrById = orgService.getOrgUsrById(String.valueOf(companySequenceNbr));
-        if (orgUsrById.getBizOrgCode().contains(XJConstant.监检)){
-            List<Project> projects = projectMapper.selectList(null);
-            for (Project i:projects){
-                projectIds.add(String.valueOf(i.getSequenceNbr()));
-            }
-            page = mapper.findss(page,pd,projectIds);
-        }else {
 
-            for (Project project : projectResourceService.getProjectList()) {
-                projectIds.add(String.valueOf(project.getSequenceNbr()));
-            }
-            if (ValidationUtil.isEmpty(projectIds)) {
-                return page;
-            }
-            page = mapper.findss(page, pd, projectIds);
+        for (Project project : projectResourceService.getProjectList()) {
+            projectIds.add(String.valueOf(project.getSequenceNbr()));
         }
+        if (ValidationUtil.isEmpty(projectIds)) {
+            return page;
+        }
+        page = mapper.findss(page, pd, projectIds);
+
         List<QualityInfo> qfList = page.getRecords();
         List<PercentOfPassDto> list = new ArrayList<> ( );
 
@@ -137,7 +131,6 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
                 if (weldDtoList != null && weldDtoList.size ( ) > 0) {
                     //获取焊口信息总条数
                     int sum = weldDtoList.size ( );
-
                     List<WeldDto> collect = weldDtoList.stream( ).filter(weldDto -> StageEnum.焊接工艺.getName( ).equals(weldDto.getSuperInspecStatus( )) ||
                             StageEnum.管道耐压.getName( ).equals(weldDto.getSuperInspecStatus( )) ||
                             StageEnum.敷设质量.getName( ).equals(weldDto.getSuperInspecStatus( )) ||
@@ -154,10 +147,9 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
                     String fpy = pass.toString ( ) + "%";
                     //将合格率赋值给数据集合
                     pr.setPercentOfPass (fpy);
-                    //将数据添加到新集合里面
-                    newsData.add (pr);
-
                 }
+                //将数据添加到新集合里面
+                newsData.add (pr);
             }
                 //如果条件name为空的,直接查询全部
                 page.setRecords (newsData);

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/QualityProblemServiceImpl.java

@@ -9,12 +9,17 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.QualityProblemMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IQualityProblemService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.QualityProblemDto;
+import org.apache.lucene.search.similarities.Lambda;
+import org.joda.time.LocalDate;
+import org.joda.time.LocalTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 
 /**
@@ -54,6 +59,8 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
 
     @Override
     public IPage<QualityProblemDto> getItems(String current, String size,QualityProblemDto qualityProblemDto) {
+        LocalDateTime now = LocalDateTime.now();
+        ZoneId zoneId = ZoneId.systemDefault();
         Set<String> projectIds = new HashSet<>();
         for(Project project:projectResourceService.getProjectList()){
             projectIds.add(String.valueOf(project.getSequenceNbr()));
@@ -68,6 +75,35 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
             if(!ValidationUtil.isEmpty(qualityProblemDto1.getLevel())){
                 qualityProblemDto1.setLevel(ProblemTypeEnum.map.get(qualityProblemDto1.getLevel()));
             }
+            //是否限期整改
+            Boolean bool = true;
+            if(!ValidationUtil.isEmpty(qualityProblemDto1.getRectifyWithinTime())){
+                if(!qualityProblemDto1.getRectifyWithinTime()){
+                    bool = false;
+                }
+            }else {
+                if(!ValidationUtil.isEmpty(qualityProblemDto1.getReformLimitDate())){
+                    LocalDateTime localDateTime = LocalDateTime.ofInstant(qualityProblemDto1.getReformLimitDate().toInstant(),zoneId);
+                    if(now.isAfter(localDateTime)){
+                        bool = false;
+                    }
+                }
+            }
+            if(bool){
+                qualityProblemDto1.setRectifyWithingName("是");
+            } else {
+                qualityProblemDto1.setRectifyWithingName("否");
+            }
+
+            //评审意见
+            if(!ValidationUtil.isEmpty(qualityProblemDto1.getReviewStatus())){
+                if(!qualityProblemDto1.getReviewStatus()){
+                    qualityProblemDto1.setReviewStatusName("不存在问题");
+                }else {
+                    qualityProblemDto1.setReviewStatusName("存在问题");
+                }
+            }
+
             if(!ValidationUtil.isEmpty(qualityProblemDto1.getChargerPersonId())){
                 if(!ValidationUtil.isEmpty(orgService.getOrgUsrById(qualityProblemDto1.getChargerPersonId()))){
                     qualityProblemDto1.setChargerPersonName(orgService.getOrgUsrById(qualityProblemDto1.getChargerPersonId()).getBizOrgName());