码包列表

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListQrPackageReq.java

@@ -30,6 +30,9 @@ public class ListQrPackageReq extends PageReq implements Serializable {
 	@ApiModelProperty("物料id")
 	private Long materialId;
 
+	@ApiModelProperty("物料名称")
+	private String materialName;
+
 	@ApiModelProperty("二维码类型 1-箱码 2-盖码")
 	private Integer qrType;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/UpdateRoleReq.java

@@ -31,6 +31,6 @@ public class UpdateRoleReq implements Serializable {
   private List<String> resourceCodeList;
 
   @ApiModelProperty(value = "激活小程序资源列表（里面只会有2种code: 1-主账号 2-子账号）")
-  private List<Integer> activateMiniAppResourceCodeList;
+  private Integer activateMiniAppResourceCode;
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/RoleManagerServiceImpl.java

@@ -122,6 +122,7 @@ public class RoleManagerServiceImpl implements RoleManagerService {
         }
 
         //2-放入值
+        roleDetail.setRoleCode(roleCode);
         roleDetail.setIsActivateMiniAppMainAccount(isMainAccount);
         roleDetail.setIsActivateMiniAppSubAccount(isSubAccount);
 
@@ -210,9 +211,8 @@ public class RoleManagerServiceImpl implements RoleManagerService {
         userResourceService.saveUserResourceMapping(userRole.getRoleCode(),req.getResourceCodeList());
 
         //4-保存角色明细
-        List<Integer> miniList = req.getActivateMiniAppResourceCodeList();
-        int isMainAccount = miniList!=null && miniList.contains(ActivateMiniAppRoleResourceEnum.MAIN.getCode())?1:0;
-        int isSubAccount = miniList!=null && miniList.contains(ActivateMiniAppRoleResourceEnum.SUB.getCode())?1:0;
+        int isMainAccount = ActivateMiniAppRoleResourceEnum.MAIN.is(req.getActivateMiniAppResourceCode())?1:0;
+        int isSubAccount = ActivateMiniAppRoleResourceEnum.SUB.is(req.getActivateMiniAppResourceCode())?1:0;
         saveRoleDetail(userRole.getRoleCode(),isMainAccount,isSubAccount);
     }
 

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageMapper.xml

@@ -47,7 +47,7 @@
             qp.update_time,
             qp.create_by,
             qp.qr_type,
-            bm.material_name,
+            ifnull(bm.material_name,bo.material_name) as material_name,
             bf.factory_name AS factory_cover_name,
             bcf.name AS box_code_format_name,
             ui.user_name AS create_by_name,
@@ -57,6 +57,7 @@
             LEFT JOIN qr_box_code_format bcf ON qp.box_code_format_id = bcf.id
             LEFT JOIN base_material bm ON qp.material_id = bm.id
             LEFT JOIN base_factory bf ON qp.factory_cover_id = bf.id
+            LEFT JOIN qr_package_booking_order bo on bo.booking_order=qp.booking_order and bo.is_delete=0
             LEFT JOIN user_info ui ON qp.create_by = ui.id
         <where>
             qp.is_delete = 0
@@ -66,6 +67,12 @@
             <if test="param.materialId != null">
                 AND qp.material_id = #{param.materialId}
             </if>
+            <if test="param.materialName != null and param.materialName != '' ">
+                and
+                (bm.material_name like concat('%',#{param.materialName},'%')
+                or
+                bo.material_name like concat('%',#{param.materialName},'%'))
+            </if>
             <if test="param.qrType != null">
                 AND qp.qr_type = #{param.qrType}
             </if>