Merge branch 'develop_dl_plan6_temp' of…

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java

@@ -347,6 +347,24 @@ public class InputItemController extends AbstractBaseController {
 		List<PointInputItemVo> list = inputItemService.queryCustomInputItem(params.get("itemType").toString(),params.get("nameOrItemNo").toString(),orgCode);
 		return CommonResponseUtil.success(list);
 	}
+
+
+	/**
+	 * 条件查询检查项
+	 *
+	 * @param params
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping (value = "/queryCustomInputItemNew", produces = "application/json;charset=UTF-8")
+	@ApiOperation(value = "条件查询检查项", notes = "条件查询检查项")
+	public CommonResponse queryCustomInputItemNew( @RequestBody HashMap<String,Object> params){
+		ReginParams reginParams = getSelectedOrgInfo();
+		String orgCode = getOrgCode(reginParams);
+		String companyBizOrgCode = reginParams.getPersonIdentity().getCompanyBizOrgCode();
+		List<PointInputItemVo> list = inputItemService.queryCustomInputItemNew(params.get("itemType").toString(),params.get("nameOrItemNo").toString(),orgCode,companyBizOrgCode);
+		return CommonResponseUtil.success(list);
+	}
 	/**
 	 * 条件查询检查项
 	 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/InputItemServiceImpl.java

@@ -233,4 +233,15 @@ public class InputItemServiceImpl implements IInputItemService {
 		return content;
 	}
 
+	@Override
+	public List<PointInputItemVo> queryCustomInputItemNew(String itemType, String nameOrItemNo, String orgCode,String companyBizOrgCode) {
+		HashMap<String,Object> param = new HashMap<>();
+		param.put("itemType",itemType);
+		param.put("nameOrItemNo",nameOrItemNo);
+		param.put("orgCode",orgCode);
+		param.put("bizOrgCode",companyBizOrgCode);
+		List<PointInputItemVo> content = inputItemMapper.queryCustomInputItem(param);
+		return content;
+	}
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IInputItemService.java

@@ -128,4 +128,6 @@ public interface IInputItemService {
 	public Object getCheckClassify(String token, String product, String appKey, String dictCode);
 
 	List<PointInputItemVo>  queryCustomInputItem (String itemType, String nameOrItemNo, String orgCode);
+
+	List<PointInputItemVo>  queryCustomInputItemNew (String itemType, String nameOrItemNo, String orgCode,String companyBizOrgCode);
 }

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -161,6 +161,9 @@
 			<if test="customType!=null and customType !=''">
 			and  custom_type = #{customType}
 			</if>
+			<if test="bizOrgCode!=null and bizOrgCode !=''">
+			and  biz_org_code LIKE CONCAT (#{bizOrgCode},'%')
+			</if>
 		ORDER BY create_date DESC
 	</select>
 	<select id="queryCustomInputItemByPointId" resultType="com.yeejoin.amos.patrol.business.vo.PointInputItemVo">