Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/QualityProblemMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 质量问题表 Mapper 接口
@@ -17,7 +18,7 @@ import java.util.List;
 @Repository
 public interface QualityProblemMapper extends BaseMapper<QualityProblem> {
 
-    IPage<QualityProblemDto> getItems(IPage<QualityProblemDto> page,QualityProblemDto qualityProblemDto);
+    IPage<QualityProblemDto> getItems(IPage<QualityProblemDto> page, QualityProblemDto qualityProblemDto, Set<String> projectIds);
 
     QualityProblemDto getInfoBySequenceNbr(String sequenceNbr);
 

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

@@ -32,6 +32,12 @@
             <if test="qualityProblemDto.code != '' and qualityProblemDto.code != null">
                 and qi.`code` like concat("%",qualityProblemDto.code,"%")
             </if>
+            <if test="projectIds != null">
+                and qi.project_id in
+                <foreach collection="projectIds" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/InstallNoticeController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.NoticeStatusEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
+import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
 import com.yeejoin.amos.boot.module.ugp.api.dto.*;
 import com.yeejoin.amos.boot.module.ugp.api.entity.InstallNotice;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
@@ -294,7 +295,9 @@ public class InstallNoticeController extends BaseController {
 		InstallNotice installNotice = installNoticeServiceImpl.getById(sequenceNbr);
 		installNotice.setNoticeStatus(NoticeStatusEnum.已接收.getName());
 		Project project = projectServiceImpl.getById(installNotice.getProjectId());
-		projectInitiationServiceImpl.execute(project.getInstanceId(),installNotice,NoticeStatusEnum.已接收.getStatusId());
+		JSONObject json = JSON.parseObject(JSON.toJSONString(installNotice));
+		json.put(XJConstant.PROCESS_PROJECT_STATE,"告知待审核");
+		projectInitiationServiceImpl.execute(project.getInstanceId(),json,NoticeStatusEnum.已接收.getStatusId());
 		return ResponseHelper.buildResponse(installNoticeServiceImpl.updateById(installNotice));
 	}
 

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

@@ -178,7 +178,8 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
                 projectResource.setResourceId(Long.valueOf(select));
                 BeanUtils.copyProperties(projectResource, Resource);
                 boolean save = this.save(projectResource);
-                if (save || type.equals(设备资源.getName())) {
+                //判断
+                if (save && type.equals(设备资源.getName())) {
                     LambdaQueryWrapper<Equipment> wrapperEquipment = new LambdaQueryWrapper<>();
                     wrapperEquipment.eq(BaseEntity::getSequenceNbr, select);
                     Equipment equipment = new Equipment();

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

@@ -214,9 +214,11 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
                 install=true;
             }
         }
-
-        if(design && install){
-            projectInitiationService.execute(project.getInstanceId(),projectDto,"1");
+        String type = jsonObject.getString("type");
+        if (type != null) {
+            if (design && install) {
+                projectInitiationService.execute(project.getInstanceId(), projectDto, "1");
+            }
         }
         return "ok";
     }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemProcessEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemTypeEnum;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 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;
@@ -12,9 +13,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 质量问题表服务实现类
@@ -34,6 +33,9 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
     @Autowired
     OrgServiceImpl orgService;
 
+    @Autowired
+    ProjectResourceServiceImpl projectResourceService;
+
     /**
      * 分页查询
      */
@@ -50,11 +52,15 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
 
     @Override
     public IPage<QualityProblemDto> getItems(String current, String size,QualityProblemDto qualityProblemDto) {
+        Set<String> projectIds = new HashSet<>();
+        for(Project project:projectResourceService.getProjectList()){
+            projectIds.add(String.valueOf(project.getSequenceNbr()));
+        }
         List<QualityProblemDto> list = new ArrayList<>();
         IPage<QualityProblemDto> page = new Page<>();
         page.setCurrent(Long.parseLong(current));
         page.setSize(Long.parseLong(size));
-        page = qualityProblemMapper.getItems(page,qualityProblemDto);
+        page = qualityProblemMapper.getItems(page,qualityProblemDto,projectIds);
         List<QualityProblemDto> qualityProblemDtoList = page.getRecords();
         for (QualityProblemDto qualityProblemDto1 : qualityProblemDtoList) {
             qualityProblemDto1.setChargerPersonName(orgService.getOrgUsrById(qualityProblemDto1.getChargerPersonId()).getBizOrgName());