校验和项目资源关联,修改企业审核,修改焊评依赖

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -21,4 +22,6 @@ public interface CompanyMapper extends BaseMapper<Company> {
     IPage<CompanyDto> queryCompanyPage(IPage<CompanyDto> page,Company companyParam);
 
     CompanyDto queryBySeq1(Long sequenceNbr);
+    @Select("select * from tz_ugp_company where sequence_nbr= #{sequenceNbr}")
+    Company  qById(Long sequenceNbr);
 }

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

@@ -222,7 +222,7 @@ public class CompanyController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-	@PostMapping(value = "check")
+	@PostMapping(value = "/check")
 	@ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新，并创建单位及管理员", notes = "根据sequenceNbr更新，并创建单位及管理员")
 	public ResponseModel<Boolean> companyCheck(@RequestBody CompanyDto model,Long sequenceNbr,String bizOrgType) throws Exception{
 		return ResponseHelper.buildResponse(companyServiceImpl.companyCheck(model,sequenceNbr,bizOrgType));

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

@@ -173,12 +173,9 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
         Map<Long, List<Long>> roleSeqsMap = new HashMap<>();
         Map<Long,List<RoleModel>> orgRoles = new HashMap<>();
         Set<String> appCodeSet = new HashSet<>();
-
-
-        Company company = this.getById(sequenceNbr);
-        company.setApproved(model.getApproved());
-
-        if (company.getApproved().equals("已审核")){
+        Company company = companyMapper.selectById(sequenceNbr);
+        if (!ValidationUtil.isEmpty(company)&& "已审核".equals(company.getApproved())){
+            company.setApproved(model.getApproved());
             final CompanyModel companyModel = new CompanyModel();
             AgencyUserModel agencyUserModel = new AgencyUserModel();
 

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

@@ -360,4 +360,22 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
 
         return page;
     }
+
+    public ProjectResource getprojectResource(Long resourceId,Long sequenceNbr,String type){
+        LambdaQueryWrapper<ProjectResource> wrapper = new LambdaQueryWrapper<>();
+        ProjectResource projectResource =null;
+        if (sequenceNbr == null) {
+            wrapper.eq(resourceId!=null,ProjectResource::getResourceId,resourceId)
+                    .eq(!ValidationUtil.isEmpty(type),ProjectResource::getType,type);
+            projectResource=projectResourceMapper.selectOne(wrapper);
+            return projectResource;
+        }
+        if (resourceId == null) {
+            wrapper.eq(resourceId!=null,ProjectResource::getSequenceNbr,sequenceNbr)
+                    .eq(!ValidationUtil.isEmpty(type),ProjectResource::getType,type);
+            projectResource=projectResourceMapper.selectOne(wrapper);
+            return projectResource;
+        }
+       return projectResource;
+    }
 }
\ No newline at end of file

amos-boot-system-ugp/pom.xml

@@ -28,7 +28,8 @@
         <dependency>
             <groupId>fakepath</groupId>
             <artifactId>ugp-welding-evaluation-inspection-sdk</artifactId>
-            <version>1.0</version>
+            <version>1.2.0</version>
+            <type>pom</type>
         </dependency>
     </dependencies>
 </project>