inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanQueryDto.java
@@ -23,4 +23,9 @@ * 是否为只查看自己 */ private Boolean viewMySelfFlag; /** * 是否复核 */ private Integer isCheck; } inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -164,6 +164,8 @@ insOrderPlanQueryDto.setViewMySelfFlag(true); insOrderPlanDTO.setUserId(null); } insOrderPlanQueryDto.setIsCheck(insOrderPlanDTO.getIsCheck()); insOrderPlanDTO.setIsCheck(null); insOrderPlanQueryDto.setUserId(SecurityUtils.getUserId().intValue()); IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO),insOrderPlanQueryDto); inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -78,6 +78,7 @@ <result property="radius" column="radius"/> <result property="cableTag" column="cable_tag"/> <result property="structureItemParameterId" column="structure_item_parameter_id"/> <result property="checkUserId" column="check_user_id"/> <collection property="insProductResult" resultMap="insProductResult"/> </resultMap> @@ -159,7 +160,8 @@ ip.dic, ip.sort, ip.cable_tag, ip.structure_item_parameter_id ip.structure_item_parameter_id, ip.check_user_id </sql> @@ -515,6 +517,7 @@ select <include refid="getInsProducSql"/> from ins_product ip left join ins_product_result ipr on ip.id = ipr.ins_product_id left join user ur ON ip.check_user_id = ur.id where ins_sample_id = #{id} and state = 1 and ip.son_laboratory = #{laboratory}