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/dto/OpenDto.java

@@ -11,7 +11,7 @@ import lombok.Data;
 public class OpenDto {
 
     private String oldPhoto; //原照片
-    private String newPhoto;  //新照片对比
+    private String newPhoto;  //新照片
     private  String accord;     //符合性
      private String   valid;    //有效性
     private  String result;//结果

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

@@ -42,4 +42,5 @@ public class PercentOfPassDto extends BaseDto {
 
 
 
+
 }

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

@@ -23,7 +23,7 @@ public interface VerifyMapper extends BaseMapper<Verify> {
      * @return
      */
 
-    List<Verify> commonality(String stage,SmartListDto smartListDto);
+    List<Verify> commonality(String stage,SmartListDto smartListDto, List listId);
 
     @Select("select * from tz_ugp_verify where target_info = #{targetInfo}")
     Verify selectByTargetInfo(String targetInfo);

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

@@ -55,6 +55,7 @@
             </if>
 
 
+
 </select>
 
 

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

@@ -62,6 +62,13 @@
              pt.code  like '%${smartListDto.projectCode}%'
         </if>
 
+        <if test="listId != null and ! listId.isEmpty() and listId.size() > 0">
+            and vf.project_id in
+            <foreach collection="listId" item="item" index="index" open="(" separator="," close=")">
+                   #{item}
+            </foreach>
+        </if>
+
     </select>
 
 

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

@@ -41,7 +41,7 @@ private InstallationQualityImpl services;
 private WeldServiceImpl weld;
 
    //查看质量监检信息
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/find")
     @ApiOperation(httpMethod = "GET", value = "质量问题闭环管理-安装质量监检信息-质量监检信息", notes = "质量问题闭环管理-安装质量监检信息-质量监检信息")
     public ResponseModel<Page<PercentOfPassDto>> find(@RequestParam(value = "current") int current, @RequestParam

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

@@ -133,7 +133,7 @@ public class VerifyController extends BaseController {
 	 * @return
 	 */
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/selectTubular")
 	@ApiOperation(httpMethod = "GET", value = "焊接管材检验信息列表", notes = "焊接管材检验信息列表")
 	public ResponseModel<Page<SmartListDto>> selectTubular(@RequestParam(value = "current") int current, @RequestParam
@@ -155,7 +155,7 @@ public class VerifyController extends BaseController {
 	 * @return
 	 */
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/selectWorker")
 	@ApiOperation(httpMethod = "GET", value = "查询焊接人员检验信息列表", notes = "查询焊接人员检验信息列表")
 	public ResponseModel<Page<SmartListDto>> selectWorker(@RequestParam(value = "current") int current, @RequestParam
@@ -175,7 +175,7 @@ public class VerifyController extends BaseController {
 	 * @param size
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/selectFacility")
 	@ApiOperation(httpMethod = "GET", value = "查询焊接设备检验信息列表", notes = "查询焊接设备检验信息列表")
 	public ResponseModel<Page<SmartListDto>> selectFacility(@RequestParam(value = "current") int current, @RequestParam
@@ -196,7 +196,7 @@ public class VerifyController extends BaseController {
 	 * @return
 	 */
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/selectCraft")
 	@ApiOperation(httpMethod = "GET", value = "查询焊接工艺检验信息列表", notes = "查询焊接工艺检验信息列表")
 	public ResponseModel<Page<SmartListDto>> selectCraft(@RequestParam(value = "current") int current, @RequestParam
@@ -216,7 +216,7 @@ public class VerifyController extends BaseController {
 	 * @param size
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/selectVoltage")
 	@ApiOperation(httpMethod = "GET", value = "查询管道耐压检验信息列表", notes = "查询管道耐压检验信息列表")
 	public ResponseModel<Page<SmartListDto>> selectVoltage(@RequestParam(value = "current") int current, @RequestParam
@@ -235,7 +235,7 @@ public class VerifyController extends BaseController {
 	 * @param smartListDto
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/depth")
 	@ApiOperation(httpMethod = "GET", value = "敷设质量", notes = "敷设质量")
 	public ResponseModel<Page<SmartListDto>> depth(@RequestParam(value = "current") int current, @RequestParam
@@ -282,7 +282,7 @@ public class VerifyController extends BaseController {
 
 	/**
 	 * cpp
-	 * 主键id查询verity表
+	 * 弹窗详情
 	 *
 	 * @param
 	 * @return
@@ -295,14 +295,6 @@ public class VerifyController extends BaseController {
 	}
 
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@GetMapping(value = "/photo")
-	@ApiOperation(httpMethod = "GET", value = "获取图片", notes = "获取图片")
-	public ResponseModel<Map> photo(@RequestParam Long sequenceNbr) {
-		Map map = new HashMap<>( );
-		map.put("newPhoto", "https://img2.baidu.com/it/u=806791452,2765805606&fm=253&fmt=auto&app=138&f=JPEG?w=350&h=500");
-		return ResponseHelper.buildResponse(map);
-	}
 
 }
 

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

@@ -52,7 +52,6 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
         for (QualityInfo qualityInfo : qfList) {
 
             PercentOfPassDto percentOfPassDto = new PercentOfPassDto ( );
-
             percentOfPassDto.setName (qualityInfo.getProject ( ).getName ( ));
             percentOfPassDto.setAddress (qualityInfo.getProject ( ).getAddress ( ));
             percentOfPassDto.setProgressStatus (qualityInfo.getProject ( ).getProgressStatus ( ));
@@ -115,13 +114,10 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
 
                 }
             }
-
                 //如果条件name为空的,直接查询全部
                 page.setRecords (newsData);
                 page.setTotal (newsData.size ());
                 return page;
-
-
         }
         return page;
     }

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

@@ -181,8 +181,6 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
 
 
 
-
-
     /*焊评审核(后期优化)
      * @return
      */